From 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 14 Jul 2015 19:38:58 +0200 Subject: Imported Upstream version 1.0.4 --- Makefile.am | 4 +- Makefile.in | 8 +- NEWS | 63 + autogen.sh | 2 +- build-aux/tap-driver.sh | 651 +++ build-aux/test-driver | 148 + callouts/77-nm-olpc-mesh.rules | 6 - callouts/Makefile.am | 6 - callouts/Makefile.in | 44 +- callouts/nm-dispatcher-utils.c | 2 +- callouts/nm-dispatcher.c | 29 +- callouts/tests/Makefile.in | 437 +- clients/Makefile.in | 2 + clients/cli/Makefile.in | 2 + clients/cli/common.c | 6 + clients/cli/connections.c | 466 +- clients/cli/devices.c | 352 +- clients/cli/nmcli-completion | 8 +- clients/cli/settings-docs.c | 7 +- clients/cli/settings.c | 857 ++-- clients/cli/settings.h | 8 +- clients/cli/utils.c | 37 +- clients/cli/utils.h | 5 +- clients/common/nm-secret-agent-simple.c | 6 +- clients/tui/Makefile.in | 2 + clients/tui/newt/Makefile.in | 2 + config.h.in | 12 + configure | 361 +- configure.ac | 109 +- data/85-nm-unmanaged.rules | 34 + data/Makefile.am | 7 + data/Makefile.in | 51 +- docs/Makefile.in | 2 + docs/api/Makefile.in | 58 +- docs/api/html/NetworkManager.devhelp2 | 1 - docs/api/html/index.html | 7 +- docs/api/html/ix01.html | 7 +- docs/api/html/license.html | 7 +- docs/api/html/ref-dbus.html | 7 +- docs/api/html/ref-migrating.html | 7 +- docs/api/html/ref-settings.html | 17 +- docs/api/html/secrets-flags.html | 7 +- docs/api/html/spec.html | 10 +- docs/api/html/style.css | 15 +- docs/api/settings-spec.xml | 5 +- docs/api/spec.html | 10 +- docs/api/tmpl/NetworkManager-unused.sgml | 0 docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 58 +- docs/libnm-glib/html/NMAccessPoint.html | 62 +- docs/libnm-glib/html/NMActiveConnection.html | 114 +- docs/libnm-glib/html/NMClient.html | 221 +- docs/libnm-glib/html/NMDHCP4Config.html | 15 +- docs/libnm-glib/html/NMDHCP6Config.html | 15 +- docs/libnm-glib/html/NMDevice.html | 206 +- docs/libnm-glib/html/NMDeviceAdsl.html | 17 +- docs/libnm-glib/html/NMDeviceBond.html | 30 +- docs/libnm-glib/html/NMDeviceBridge.html | 44 +- docs/libnm-glib/html/NMDeviceBt.html | 27 +- docs/libnm-glib/html/NMDeviceEthernet.html | 32 +- docs/libnm-glib/html/NMDeviceGeneric.html | 28 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 22 +- docs/libnm-glib/html/NMDeviceModem.html | 26 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 26 +- docs/libnm-glib/html/NMDeviceTeam.html | 36 +- docs/libnm-glib/html/NMDeviceVlan.html | 35 +- docs/libnm-glib/html/NMDeviceWifi.html | 107 +- docs/libnm-glib/html/NMDeviceWimax.html | 118 +- docs/libnm-glib/html/NMIP4Config.html | 46 +- docs/libnm-glib/html/NMIP6Config.html | 58 +- docs/libnm-glib/html/NMObject.html | 56 +- docs/libnm-glib/html/NMRemoteConnection.html | 87 +- docs/libnm-glib/html/NMRemoteSettings.html | 53 +- docs/libnm-glib/html/NMSecretAgent.html | 84 +- docs/libnm-glib/html/NMVPNConnection.html | 19 +- docs/libnm-glib/html/NMWimaxNsp.html | 25 +- docs/libnm-glib/html/annotation-glossary.html | 11 +- docs/libnm-glib/html/api-index-full.html | 7 +- docs/libnm-glib/html/ch02.html | 7 +- docs/libnm-glib/html/index.html | 7 +- docs/libnm-glib/html/index.sgml | 125 + docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 51 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 85 +- docs/libnm-glib/html/libnm-glib-nm-types.html | 10 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 11 +- docs/libnm-glib/html/libnm-glib.devhelp2 | 124 +- docs/libnm-glib/html/object-tree.html | 7 +- docs/libnm-glib/html/ref-overview.html | 7 +- docs/libnm-glib/html/style.css | 15 +- docs/libnm-glib/tmpl/libnm-glib-unused.sgml | 0 docs/libnm-glib/tmpl/nm-access-point.sgml | 214 - docs/libnm-glib/tmpl/nm-active-connection.sgml | 274 -- docs/libnm-glib/tmpl/nm-client.sgml | 552 --- docs/libnm-glib/tmpl/nm-device-adsl.sgml | 75 - docs/libnm-glib/tmpl/nm-device-bond.sgml | 108 - docs/libnm-glib/tmpl/nm-device-bridge.sgml | 108 - docs/libnm-glib/tmpl/nm-device-bt.sgml | 110 - docs/libnm-glib/tmpl/nm-device-ethernet.sgml | 125 - docs/libnm-glib/tmpl/nm-device-generic.sgml | 82 - docs/libnm-glib/tmpl/nm-device-infiniband.sgml | 93 - docs/libnm-glib/tmpl/nm-device-modem.sgml | 82 - docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml | 107 - docs/libnm-glib/tmpl/nm-device-team.sgml | 108 - docs/libnm-glib/tmpl/nm-device-vlan.sgml | 126 - docs/libnm-glib/tmpl/nm-device-wifi.sgml | 205 - docs/libnm-glib/tmpl/nm-device-wimax.sgml | 199 - docs/libnm-glib/tmpl/nm-device.sgml | 562 --- docs/libnm-glib/tmpl/nm-dhcp4-config.sgml | 60 - docs/libnm-glib/tmpl/nm-dhcp6-config.sgml | 60 - docs/libnm-glib/tmpl/nm-glib-enum-types.sgml | 24 - docs/libnm-glib/tmpl/nm-ip4-config.sgml | 146 - docs/libnm-glib/tmpl/nm-ip6-config.sgml | 149 - docs/libnm-glib/tmpl/nm-object.sgml | 80 - docs/libnm-glib/tmpl/nm-remote-connection.sgml | 172 - docs/libnm-glib/tmpl/nm-remote-settings.sgml | 251 - docs/libnm-glib/tmpl/nm-secret-agent.sgml | 203 - docs/libnm-glib/tmpl/nm-types.sgml | 24 - docs/libnm-glib/tmpl/nm-vpn-connection.sgml | 66 - docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml | 24 - .../tmpl/nm-vpn-plugin-ui-interface.sgml | 178 - docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml | 46 - docs/libnm-glib/tmpl/nm-vpn-plugin.sgml | 155 - docs/libnm-glib/tmpl/nm-wimax-nsp.sgml | 112 - docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 58 +- docs/libnm-util/html/NMConnection.html | 59 +- docs/libnm-util/html/NMSetting.html | 31 +- docs/libnm-util/html/NMSetting8021x.html | 358 +- docs/libnm-util/html/NMSettingAdsl.html | 58 +- docs/libnm-util/html/NMSettingBluetooth.html | 23 +- docs/libnm-util/html/NMSettingBond.html | 70 +- docs/libnm-util/html/NMSettingBridge.html | 94 +- docs/libnm-util/html/NMSettingBridgePort.html | 47 +- docs/libnm-util/html/NMSettingCdma.html | 39 +- docs/libnm-util/html/NMSettingConnection.html | 82 +- docs/libnm-util/html/NMSettingDcb.html | 204 +- docs/libnm-util/html/NMSettingGeneric.html | 18 +- docs/libnm-util/html/NMSettingGsm.html | 98 +- docs/libnm-util/html/NMSettingIP4Config.html | 167 +- docs/libnm-util/html/NMSettingIP6Config.html | 164 +- docs/libnm-util/html/NMSettingInfiniband.html | 47 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 52 +- docs/libnm-util/html/NMSettingPPP.html | 123 +- docs/libnm-util/html/NMSettingPPPOE.html | 35 +- docs/libnm-util/html/NMSettingSerial.html | 41 +- docs/libnm-util/html/NMSettingTeam.html | 33 +- docs/libnm-util/html/NMSettingTeamPort.html | 26 +- docs/libnm-util/html/NMSettingVPN.html | 52 +- docs/libnm-util/html/NMSettingVlan.html | 66 +- docs/libnm-util/html/NMSettingWimax.html | 26 +- docs/libnm-util/html/NMSettingWired.html | 111 +- docs/libnm-util/html/NMSettingWireless.html | 137 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 147 +- docs/libnm-util/html/annotation-glossary.html | 9 +- docs/libnm-util/html/api-index-full.html | 7 +- docs/libnm-util/html/ch01.html | 7 +- docs/libnm-util/html/index.html | 7 +- docs/libnm-util/html/index.sgml | 364 ++ .../libnm-util/html/libnm-util-NetworkManager.html | 112 +- .../html/libnm-util-NetworkManagerVPN.html | 126 +- docs/libnm-util/html/libnm-util-nm-utils.html | 92 +- docs/libnm-util/html/libnm-util.devhelp2 | 364 +- docs/libnm-util/html/object-tree.html | 7 +- docs/libnm-util/html/style.css | 15 +- docs/libnm-util/tmpl/NetworkManager.sgml | 539 --- docs/libnm-util/tmpl/NetworkManagerVPN.sgml | 484 -- docs/libnm-util/tmpl/libnm-util-unused.sgml | 0 docs/libnm-util/tmpl/nm-connection.sgml | 663 --- docs/libnm-util/tmpl/nm-setting-8021x.sgml | 943 ---- docs/libnm-util/tmpl/nm-setting-adsl.sgml | 212 - docs/libnm-util/tmpl/nm-setting-bluetooth.sgml | 112 - docs/libnm-util/tmpl/nm-setting-bond.sgml | 276 -- docs/libnm-util/tmpl/nm-setting-bridge-port.sgml | 113 - docs/libnm-util/tmpl/nm-setting-bridge.sgml | 193 - docs/libnm-util/tmpl/nm-setting-cdma.sgml | 130 - docs/libnm-util/tmpl/nm-setting-connection.sgml | 451 -- docs/libnm-util/tmpl/nm-setting-dcb.sgml | 395 -- docs/libnm-util/tmpl/nm-setting-generic.sgml | 65 - docs/libnm-util/tmpl/nm-setting-gsm.sgml | 283 -- docs/libnm-util/tmpl/nm-setting-infiniband.sgml | 145 - docs/libnm-util/tmpl/nm-setting-ip4-config.sgml | 711 --- docs/libnm-util/tmpl/nm-setting-ip6-config.sgml | 712 --- docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml | 113 - docs/libnm-util/tmpl/nm-setting-ppp.sgml | 354 -- docs/libnm-util/tmpl/nm-setting-pppoe.sgml | 130 - docs/libnm-util/tmpl/nm-setting-serial.sgml | 146 - docs/libnm-util/tmpl/nm-setting-team-port.sgml | 81 - docs/libnm-util/tmpl/nm-setting-team.sgml | 97 - docs/libnm-util/tmpl/nm-setting-vlan.sgml | 249 - docs/libnm-util/tmpl/nm-setting-vpn.sgml | 235 - docs/libnm-util/tmpl/nm-setting-wimax.sgml | 97 - docs/libnm-util/tmpl/nm-setting-wired.sgml | 349 -- .../tmpl/nm-setting-wireless-security.sgml | 476 -- docs/libnm-util/tmpl/nm-setting-wireless.sgml | 402 -- docs/libnm-util/tmpl/nm-setting.sgml | 327 -- docs/libnm-util/tmpl/nm-utils-enum-types.sgml | 24 - docs/libnm-util/tmpl/nm-utils.sgml | 562 --- docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.in | 58 +- docs/libnm/html/NMAccessPoint.html | 60 +- docs/libnm/html/NMActiveConnection.html | 79 +- docs/libnm/html/NMClient.html | 280 +- docs/libnm/html/NMDevice.html | 176 +- docs/libnm/html/NMDeviceAdsl.html | 14 +- docs/libnm/html/NMDeviceBond.html | 24 +- docs/libnm/html/NMDeviceBridge.html | 24 +- docs/libnm/html/NMDeviceBt.html | 24 +- docs/libnm/html/NMDeviceEthernet.html | 29 +- docs/libnm/html/NMDeviceGeneric.html | 19 +- docs/libnm/html/NMDeviceInfiniband.html | 19 +- docs/libnm/html/NMDeviceModem.html | 23 +- docs/libnm/html/NMDeviceOlpcMesh.html | 23 +- docs/libnm/html/NMDeviceTeam.html | 24 +- docs/libnm/html/NMDeviceVlan.html | 28 +- docs/libnm/html/NMDeviceWifi.html | 101 +- docs/libnm/html/NMDeviceWimax.html | 114 +- docs/libnm/html/NMDhcpConfig.html | 21 +- docs/libnm/html/NMIPConfig.html | 44 +- docs/libnm/html/NMObject.html | 20 +- docs/libnm/html/NMRemoteConnection.html | 37 +- docs/libnm/html/NMSecretAgentOld.html | 51 +- docs/libnm/html/NMSetting.html | 25 +- docs/libnm/html/NMSetting8021x.html | 362 +- docs/libnm/html/NMSettingAdsl.html | 55 +- docs/libnm/html/NMSettingBluetooth.html | 20 +- docs/libnm/html/NMSettingBond.html | 53 +- docs/libnm/html/NMSettingBridge.html | 48 +- docs/libnm/html/NMSettingBridgePort.html | 26 +- docs/libnm/html/NMSettingCdma.html | 36 +- docs/libnm/html/NMSettingConnection.html | 206 +- docs/libnm/html/NMSettingDcb.html | 124 +- docs/libnm/html/NMSettingGeneric.html | 9 +- docs/libnm/html/NMSettingGsm.html | 75 +- docs/libnm/html/NMSettingIP4Config.html | 15 +- docs/libnm/html/NMSettingIP6Config.html | 24 +- docs/libnm/html/NMSettingIPConfig.html | 156 +- docs/libnm/html/NMSettingInfiniband.html | 45 +- docs/libnm/html/NMSettingOlpcMesh.html | 38 +- docs/libnm/html/NMSettingPpp.html | 120 +- docs/libnm/html/NMSettingPppoe.html | 32 +- docs/libnm/html/NMSettingSerial.html | 37 +- docs/libnm/html/NMSettingTeam.html | 17 +- docs/libnm/html/NMSettingTeamPort.html | 17 +- docs/libnm/html/NMSettingVlan.html | 50 +- docs/libnm/html/NMSettingVpn.html | 51 +- docs/libnm/html/NMSettingWimax.html | 23 +- docs/libnm/html/NMSettingWired.html | 96 +- docs/libnm/html/NMSettingWireless.html | 112 +- docs/libnm/html/NMSettingWirelessSecurity.html | 138 +- docs/libnm/html/NMSimpleConnection.html | 9 +- docs/libnm/html/NMVpnConnection.html | 19 +- docs/libnm/html/NMVpnEditor.html | 57 +- docs/libnm/html/NMWimaxNsp.html | 25 +- docs/libnm/html/annotation-glossary.html | 9 +- docs/libnm/html/api-index-full.html | 126 +- docs/libnm/html/ch02.html | 7 +- docs/libnm/html/ch03.html | 7 +- docs/libnm/html/ch04.html | 7 +- docs/libnm/html/ch05.html | 7 +- docs/libnm/html/ch06.html | 7 +- docs/libnm/html/index.html | 7 +- docs/libnm/html/index.sgml | 350 ++ docs/libnm/html/libnm-NMConnection.html | 29 +- docs/libnm/html/libnm-nm-dbus-interface.html | 104 +- docs/libnm/html/libnm-nm-errors.html | 73 +- docs/libnm/html/libnm-nm-utils.html | 52 +- docs/libnm/html/libnm-nm-version.html | 74 +- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 126 +- docs/libnm/html/libnm.devhelp2 | 350 +- docs/libnm/html/object-tree.html | 8 +- docs/libnm/html/ref-overview.html | 7 +- docs/libnm/html/style.css | 15 +- docs/libnm/libnm-sections.txt | 38 + docs/libnm/libnm.types | 1 + docs/libnm/tmpl/libnm-unused.sgml | 0 docs/libnm/tmpl/nm-access-point.sgml | 195 - docs/libnm/tmpl/nm-active-connection.sgml | 264 - docs/libnm/tmpl/nm-client.sgml | 798 ---- docs/libnm/tmpl/nm-connection.sgml | 573 --- docs/libnm/tmpl/nm-core-enum-types.sgml | 24 - docs/libnm/tmpl/nm-dbus-interface.sgml | 552 --- docs/libnm/tmpl/nm-device-adsl.sgml | 40 - docs/libnm/tmpl/nm-device-bond.sgml | 72 - docs/libnm/tmpl/nm-device-bridge.sgml | 72 - docs/libnm/tmpl/nm-device-bt.sgml | 72 - docs/libnm/tmpl/nm-device-ethernet.sgml | 88 - docs/libnm/tmpl/nm-device-generic.sgml | 47 - docs/libnm/tmpl/nm-device-infiniband.sgml | 56 - docs/libnm/tmpl/nm-device-modem.sgml | 56 - docs/libnm/tmpl/nm-device-olpc-mesh.sgml | 72 - docs/libnm/tmpl/nm-device-team.sgml | 72 - docs/libnm/tmpl/nm-device-vlan.sgml | 88 - docs/libnm/tmpl/nm-device-wifi.sgml | 179 - docs/libnm/tmpl/nm-device-wimax.sgml | 162 - docs/libnm/tmpl/nm-device.sgml | 553 --- docs/libnm/tmpl/nm-dhcp-config.sgml | 66 - docs/libnm/tmpl/nm-enum-types.sgml | 24 - docs/libnm/tmpl/nm-errors.sgml | 263 - docs/libnm/tmpl/nm-ip-config.sgml | 152 - docs/libnm/tmpl/nm-object.sgml | 47 - docs/libnm/tmpl/nm-remote-connection.sgml | 206 - docs/libnm/tmpl/nm-secret-agent-old.sgml | 197 - docs/libnm/tmpl/nm-setting-8021x.sgml | 918 ---- docs/libnm/tmpl/nm-setting-adsl.sgml | 187 - docs/libnm/tmpl/nm-setting-bluetooth.sgml | 86 - docs/libnm/tmpl/nm-setting-bond.sgml | 233 - docs/libnm/tmpl/nm-setting-bridge-port.sgml | 88 - docs/libnm/tmpl/nm-setting-bridge.sgml | 152 - docs/libnm/tmpl/nm-setting-cdma.sgml | 104 - docs/libnm/tmpl/nm-setting-connection.sgml | 466 -- docs/libnm/tmpl/nm-setting-dcb.sgml | 370 -- docs/libnm/tmpl/nm-setting-generic.sgml | 40 - docs/libnm/tmpl/nm-setting-gsm.sgml | 184 - docs/libnm/tmpl/nm-setting-infiniband.sgml | 129 - docs/libnm/tmpl/nm-setting-ip-config.sgml | 781 --- docs/libnm/tmpl/nm-setting-ip4-config.sgml | 91 - docs/libnm/tmpl/nm-setting-ip6-config.sgml | 108 - docs/libnm/tmpl/nm-setting-olpc-mesh.sgml | 88 - docs/libnm/tmpl/nm-setting-ppp.sgml | 328 -- docs/libnm/tmpl/nm-setting-pppoe.sgml | 104 - docs/libnm/tmpl/nm-setting-serial.sgml | 129 - docs/libnm/tmpl/nm-setting-team-port.sgml | 56 - docs/libnm/tmpl/nm-setting-team.sgml | 56 - docs/libnm/tmpl/nm-setting-vlan.sgml | 207 - docs/libnm/tmpl/nm-setting-vpn.sgml | 210 - docs/libnm/tmpl/nm-setting-wimax.sgml | 72 - docs/libnm/tmpl/nm-setting-wired.sgml | 324 -- docs/libnm/tmpl/nm-setting-wireless-security.sgml | 447 -- docs/libnm/tmpl/nm-setting-wireless.sgml | 359 -- docs/libnm/tmpl/nm-setting.sgml | 238 - docs/libnm/tmpl/nm-simple-connection.sgml | 52 - docs/libnm/tmpl/nm-utils.sgml | 578 --- docs/libnm/tmpl/nm-version.sgml | 158 - docs/libnm/tmpl/nm-vpn-connection.sgml | 56 - docs/libnm/tmpl/nm-vpn-dbus-interface.sgml | 484 -- docs/libnm/tmpl/nm-vpn-editor-plugin.sgml | 169 - docs/libnm/tmpl/nm-wimax-nsp.sgml | 102 - docs/libnm/version.xml | 2 +- examples/C/Makefile.in | 2 + examples/C/glib/Makefile.in | 2 + examples/C/qt/Makefile.in | 2 + examples/Makefile.in | 2 + examples/dispatcher/Makefile.in | 2 + examples/python/Makefile.in | 2 + examples/python/dbus/Makefile.in | 2 + examples/python/gi/Makefile.in | 2 + examples/ruby/Makefile.in | 2 + examples/shell/Makefile.in | 2 + gtk-doc.make | 58 +- include/Makefile.am | 2 +- include/Makefile.in | 4 +- include/nm-glib-compat.h | 87 + include/nm-macros-internal.h | 248 + include/nm-test-utils.h | 123 +- include/nm-utils-internal.h | 176 - introspection/Makefile.in | 2 + introspection/nm-device.xml | 15 + libnm-core/Makefile.in | 61 +- libnm-core/Makefile.libnm-core | 5 + libnm-core/nm-core-enum-types.c | 22 + libnm-core/nm-core-enum-types.h | 2 + libnm-core/nm-core-internal.h | 23 + libnm-core/nm-dbus-interface.h | 4 + libnm-core/nm-keyfile-internal.h | 171 + libnm-core/nm-keyfile-reader.c | 1659 +++++++ libnm-core/nm-keyfile-utils.c | 342 ++ libnm-core/nm-keyfile-utils.h | 79 + libnm-core/nm-keyfile-writer.c | 751 +++ libnm-core/nm-setting-8021x.c | 214 +- libnm-core/nm-setting-8021x.h | 2 + libnm-core/nm-setting-connection.c | 65 +- libnm-core/nm-setting-connection.h | 23 + libnm-core/nm-setting-ip6-config.c | 10 +- libnm-core/nm-setting-private.h | 2 + libnm-core/nm-setting-wireless-security.c | 12 +- libnm-core/nm-setting-wireless.c | 4 +- libnm-core/nm-setting.c | 18 +- libnm-core/nm-utils-private.h | 6 - libnm-core/nm-utils.c | 286 +- libnm-core/nm-version.h | 14 +- libnm-core/nm-version.h.in | 12 +- libnm-core/tests/Makefile.am | 35 +- libnm-core/tests/Makefile.in | 539 ++- libnm-core/tests/certs/test-ca-cert.pem | 27 + libnm-core/tests/certs/test-key-and-cert.pem | 118 + libnm-core/tests/test-general.c | 414 ++ libnm-core/tests/test-keyfile.c | 534 +++ libnm-core/tests/test-secrets.c | 42 +- libnm-core/tests/test-setting-8021x.c | 6 +- libnm-core/tests/test-settings-defaults.c | 25 +- libnm-glib/Makefile.in | 2 + libnm-glib/nm-client.c | 10 +- libnm-glib/nm-remote-settings.c | 11 +- libnm-glib/tests/Makefile.am | 2 +- libnm-glib/tests/Makefile.in | 446 +- libnm-glib/tests/libnm-glib-test-launch.sh | 8 +- libnm-util/Makefile.in | 2 + libnm-util/NetworkManager.h | 4 + libnm-util/nm-setting-8021x.c | 86 +- libnm-util/nm-setting.c | 8 +- libnm-util/nm-utils.c | 2 +- libnm-util/tests/Makefile.in | 472 +- libnm-util/tests/test-general.c | 171 +- libnm-util/tests/test-secrets.c | 42 +- libnm-util/tests/test-settings-defaults.c | 29 +- libnm/Makefile.in | 7 + libnm/libnm.ver | 7 + libnm/nm-dbus-helpers.c | 7 +- libnm/nm-device.c | 3 + libnm/nm-ifcfg-rh-docs.xml | 2 + libnm/nm-property-docs.xml | 5 +- libnm/nm-remote-connection.c | 5 +- libnm/nm-secret-agent-old.c | 1 + libnm/nm-setting-docs.xml | 5 +- libnm/nm-vpn-plugin-old.c | 12 +- libnm/tests/Makefile.am | 2 +- libnm/tests/Makefile.in | 453 +- libnm/tests/libnm-test-launch.sh | 8 +- m4/ax_lib_readline.m4 | 2 +- m4/compiler_warnings.m4 | 2 +- man/Makefile.in | 2 + man/NetworkManager.8 | 15 +- man/NetworkManager.conf.5 | 222 +- man/NetworkManager.conf.xml.in | 224 +- man/nm-settings-ifcfg-rh.5 | 16 +- man/nm-settings-ifcfg-rh.xml | 4 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 20 +- man/nm-settings.xml | 7 +- man/nmcli.1.in | 11 +- po/POTFILES.in | 2 + po/pl.po | 2319 +++++---- policy/Makefile.in | 2 + src/Makefile.am | 30 +- src/Makefile.in | 232 +- src/NetworkManagerUtils.c | 810 +++- src/NetworkManagerUtils.h | 65 +- src/devices/adsl/Makefile.in | 2 + src/devices/adsl/nm-atm-manager.c | 11 +- src/devices/adsl/nm-device-adsl.c | 12 +- src/devices/bluetooth/Makefile.in | 2 + src/devices/bluetooth/nm-bluez-device.c | 9 +- src/devices/bluetooth/nm-bluez-manager.c | 22 +- src/devices/bluetooth/nm-device-bt.c | 66 +- src/devices/nm-device-bond.c | 89 +- src/devices/nm-device-bridge.c | 73 +- src/devices/nm-device-ethernet.c | 256 +- src/devices/nm-device-factory.c | 532 ++- src/devices/nm-device-factory.h | 124 +- src/devices/nm-device-generic.c | 15 +- src/devices/nm-device-gre.c | 22 +- src/devices/nm-device-infiniband.c | 123 +- src/devices/nm-device-macvlan.c | 22 +- src/devices/nm-device-private.h | 3 + src/devices/nm-device-tun.c | 17 +- src/devices/nm-device-veth.c | 35 +- src/devices/nm-device-vlan.c | 348 +- src/devices/nm-device-vxlan.c | 24 +- src/devices/nm-device.c | 1934 +++++--- src/devices/nm-device.h | 43 +- src/devices/team/Makefile.in | 2 + src/devices/team/nm-device-team.c | 67 +- src/devices/team/nm-team-factory.c | 21 +- src/devices/wifi/Makefile.in | 2 + src/devices/wifi/nm-device-olpc-mesh.c | 23 +- src/devices/wifi/nm-device-wifi.c | 234 +- src/devices/wifi/nm-wifi-ap.c | 244 +- src/devices/wifi/nm-wifi-ap.h | 2 +- src/devices/wifi/nm-wifi-factory.c | 17 +- src/devices/wifi/tests/Makefile.in | 437 +- src/devices/wimax/Makefile.in | 2 + src/devices/wimax/nm-wimax-factory.c | 14 +- src/devices/wimax/nm-wimax-util.h | 2 +- src/devices/wwan/Makefile.in | 2 + src/devices/wwan/nm-device-modem.c | 31 +- src/devices/wwan/nm-modem.c | 9 +- src/devices/wwan/nm-wwan-factory.c | 19 +- src/dhcp-manager/Makefile.in | 2 + src/dhcp-manager/nm-dhcp-client.c | 15 +- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 2 +- src/dhcp-manager/nm-dhcp-dhclient.c | 17 +- src/dhcp-manager/nm-dhcp-dhcpcd.c | 17 +- src/dhcp-manager/nm-dhcp-listener.c | 14 +- src/dhcp-manager/systemd-dhcp/nm-sd-adapt.h | 14 + src/dhcp-manager/tests/Makefile.in | 444 +- src/dhcp-manager/tests/test-dhcp-dhclient.c | 2 +- src/dns-manager/nm-dns-manager.c | 159 +- src/dns-manager/nm-dns-plugin.c | 19 +- src/dnsmasq-manager/nm-dnsmasq-manager.c | 21 +- src/dnsmasq-manager/tests/Makefile.in | 437 +- src/main-utils.c | 123 +- src/main-utils.h | 10 +- src/main.c | 51 +- src/nm-activation-request.c | 13 +- src/nm-active-connection.c | 5 +- src/nm-auth-subject.c | 2 +- src/nm-config-data.c | 744 +++ src/nm-config-data.h | 132 + src/nm-config.c | 1191 +++-- src/nm-config.h | 88 +- src/nm-connectivity.c | 299 +- src/nm-connectivity.h | 6 +- src/nm-dbus-manager.c | 3 +- src/nm-dcb.c | 9 +- src/nm-default-route-manager.c | 209 +- src/nm-default-route-manager.h | 4 +- src/nm-dispatcher.c | 2 +- src/nm-enum-types.c | 193 +- src/nm-enum-types.h | 14 +- src/nm-iface-helper.c | 53 +- src/nm-ip4-config.c | 318 +- src/nm-ip4-config.h | 3 +- src/nm-ip6-config.c | 219 +- src/nm-ip6-config.h | 3 +- src/nm-logging.h | 2 +- src/nm-manager.c | 1053 ++-- src/nm-multi-index.c | 441 ++ src/nm-multi-index.h | 109 + src/nm-policy.c | 2 +- src/nm-posix-signals.c | 62 - src/nm-posix-signals.h | 36 - src/nm-route-manager.c | 1214 +++++ src/nm-route-manager.h | 53 + src/nm-types.h | 25 + src/org.freedesktop.NetworkManager.conf | 2 + src/platform/Makefile.in | 2 + src/platform/nm-fake-platform.c | 651 +-- src/platform/nm-linux-platform.c | 5047 +++++++++++--------- src/platform/nm-linux-platform.h | 4 + src/platform/nm-platform-utils.c | 436 ++ src/platform/nm-platform-utils.h | 66 + src/platform/nm-platform.c | 2093 ++++---- src/platform/nm-platform.h | 445 +- src/platform/nmp-object.c | 1924 ++++++++ src/platform/nmp-object.h | 361 ++ src/platform/tests/Makefile.am | 26 +- src/platform/tests/Makefile.in | 545 ++- src/platform/tests/dump.c | 33 +- src/platform/tests/platform.c | 119 +- src/platform/tests/test-address.c | 108 +- src/platform/tests/test-cleanup.c | 48 +- src/platform/tests/test-common.c | 201 +- src/platform/tests/test-common.h | 23 +- src/platform/tests/test-general.c | 67 + src/platform/tests/test-link.c | 435 +- src/platform/tests/test-nmp-object.c | 425 ++ src/platform/tests/test-route.c | 131 +- src/platform/wifi/wifi-utils.c | 9 +- src/platform/wifi/wifi-utils.h | 2 +- src/ppp-manager/Makefile.in | 2 + src/ppp-manager/nm-ppp-manager.c | 23 +- src/rdisc/Makefile.in | 2 + src/rdisc/nm-lndp-rdisc.c | 2 +- src/rdisc/nm-rdisc.c | 34 +- src/rdisc/nm-rdisc.h | 2 +- src/rdisc/tests/Makefile.in | 437 +- src/rdisc/tests/test-rdisc-fake.c | 4 +- src/rdisc/tests/test-rdisc-linux.c | 2 +- src/settings/nm-settings-connection.c | 8 + src/settings/nm-settings.c | 65 +- src/settings/nm-settings.h | 2 + src/settings/plugins/Makefile.in | 2 + src/settings/plugins/example/Makefile.in | 2 + src/settings/plugins/example/plugin.c | 2 +- src/settings/plugins/ibft/Makefile.in | 2 + src/settings/plugins/ibft/reader.c | 46 +- src/settings/plugins/ibft/tests/Makefile.in | 437 +- src/settings/plugins/ifcfg-rh/Makefile.in | 2 + .../plugins/ifcfg-rh/nm-ifcfg-connection.c | 15 +- .../plugins/ifcfg-rh/nm-ifcfg-connection.h | 3 +- src/settings/plugins/ifcfg-rh/plugin.c | 59 +- src/settings/plugins/ifcfg-rh/reader.c | 48 +- src/settings/plugins/ifcfg-rh/reader.h | 3 +- src/settings/plugins/ifcfg-rh/shvar.c | 78 +- src/settings/plugins/ifcfg-rh/shvar.h | 6 +- src/settings/plugins/ifcfg-rh/tests/Makefile.in | 447 +- .../ifcfg-rh/tests/network-scripts/Makefile.in | 2 + .../plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c | 35 +- src/settings/plugins/ifcfg-rh/utils.c | 144 +- src/settings/plugins/ifcfg-rh/utils.h | 3 +- src/settings/plugins/ifcfg-rh/writer.c | 28 +- src/settings/plugins/ifcfg-suse/Makefile.in | 2 + src/settings/plugins/ifnet/Makefile.in | 2 + src/settings/plugins/ifnet/connection_parser.c | 8 +- src/settings/plugins/ifnet/net_parser.c | 4 +- src/settings/plugins/ifnet/net_parser.h | 1 - src/settings/plugins/ifnet/plugin.c | 27 +- src/settings/plugins/ifnet/tests/Makefile.in | 2 + src/settings/plugins/ifnet/tests/test_all.c | 2 +- src/settings/plugins/ifupdown/Makefile.in | 2 + src/settings/plugins/ifupdown/plugin.c | 27 +- src/settings/plugins/ifupdown/tests/Makefile.in | 437 +- src/settings/plugins/keyfile/Makefile.in | 2 + src/settings/plugins/keyfile/common.h | 2 - src/settings/plugins/keyfile/plugin.c | 40 +- src/settings/plugins/keyfile/reader.c | 1349 +----- src/settings/plugins/keyfile/tests/Makefile.in | 440 +- .../plugins/keyfile/tests/keyfiles/Makefile.in | 2 + .../keyfile/tests/keyfiles/Test_Wired_TLS_Blob | 4 +- .../keyfile/tests/keyfiles/Test_Wired_TLS_Old | 6 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 108 +- src/settings/plugins/keyfile/utils.c | 223 +- src/settings/plugins/keyfile/utils.h | 51 +- src/settings/plugins/keyfile/writer.c | 807 +--- src/settings/plugins/keyfile/writer.h | 1 - src/supplicant-manager/nm-call-store.c | 119 - src/supplicant-manager/nm-call-store.h | 41 - src/supplicant-manager/nm-supplicant-config.c | 155 +- src/supplicant-manager/nm-supplicant-config.h | 2 +- src/supplicant-manager/nm-supplicant-interface.c | 1496 +++--- src/supplicant-manager/nm-supplicant-interface.h | 6 +- src/supplicant-manager/nm-supplicant-manager.c | 263 +- src/supplicant-manager/nm-supplicant-manager.h | 9 - src/supplicant-manager/nm-supplicant-types.h | 4 + src/supplicant-manager/tests/Makefile.in | 437 +- .../tests/test-supplicant-config.c | 233 +- src/tests/Makefile.am | 32 + src/tests/Makefile.in | 618 ++- src/tests/config/Makefile.in | 437 +- src/tests/config/NetworkManager.conf | 68 + src/tests/config/conf.d/00-overrides.conf | 46 + src/tests/config/conf.d/10-more.conf | 29 + src/tests/config/conf.d/90-last.conf | 3 + src/tests/config/nm-test-device.c | 2 +- src/tests/config/test-config.c | 253 +- src/tests/test-general-with-expect.c | 459 +- src/tests/test-general.c | 281 +- src/tests/test-ip4-config.c | 8 +- src/tests/test-route-manager.c | 917 ++++ src/vpn-manager/nm-vpn-connection.c | 131 +- src/vpn-manager/nm-vpn-service.c | 17 +- tools/Makefile.in | 2 + tools/run-test-valgrind.sh | 54 +- tools/test-networkmanager-service.py | 2 +- valgrind.suppressions | 60 + vapi/Makefile.in | 2 + 637 files changed, 42425 insertions(+), 49814 deletions(-) create mode 100755 build-aux/tap-driver.sh create mode 100755 build-aux/test-driver delete mode 100644 callouts/77-nm-olpc-mesh.rules create mode 100644 data/85-nm-unmanaged.rules delete mode 100644 docs/api/tmpl/NetworkManager-unused.sgml delete mode 100644 docs/libnm-glib/tmpl/libnm-glib-unused.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-access-point.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-active-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-client.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-adsl.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-bond.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-bridge.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-bt.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-ethernet.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-generic.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-infiniband.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-modem.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-team.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-vlan.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-wifi.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device-wimax.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-device.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-dhcp4-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-dhcp6-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-glib-enum-types.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-ip4-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-ip6-config.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-object.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-remote-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-remote-settings.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-secret-agent.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-types.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-connection.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-vpn-plugin.sgml delete mode 100644 docs/libnm-glib/tmpl/nm-wimax-nsp.sgml delete mode 100644 docs/libnm-util/tmpl/NetworkManager.sgml delete mode 100644 docs/libnm-util/tmpl/NetworkManagerVPN.sgml delete mode 100644 docs/libnm-util/tmpl/libnm-util-unused.sgml delete mode 100644 docs/libnm-util/tmpl/nm-connection.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-8021x.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-adsl.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-bluetooth.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-bond.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-bridge-port.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-bridge.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-cdma.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-connection.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-dcb.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-generic.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-gsm.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-infiniband.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-ip4-config.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-ip6-config.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-ppp.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-pppoe.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-serial.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-team-port.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-team.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-vlan.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-vpn.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wimax.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wired.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wireless-security.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting-wireless.sgml delete mode 100644 docs/libnm-util/tmpl/nm-setting.sgml delete mode 100644 docs/libnm-util/tmpl/nm-utils-enum-types.sgml delete mode 100644 docs/libnm-util/tmpl/nm-utils.sgml delete mode 100644 docs/libnm/tmpl/libnm-unused.sgml delete mode 100644 docs/libnm/tmpl/nm-access-point.sgml delete mode 100644 docs/libnm/tmpl/nm-active-connection.sgml delete mode 100644 docs/libnm/tmpl/nm-client.sgml delete mode 100644 docs/libnm/tmpl/nm-connection.sgml delete mode 100644 docs/libnm/tmpl/nm-core-enum-types.sgml delete mode 100644 docs/libnm/tmpl/nm-dbus-interface.sgml delete mode 100644 docs/libnm/tmpl/nm-device-adsl.sgml delete mode 100644 docs/libnm/tmpl/nm-device-bond.sgml delete mode 100644 docs/libnm/tmpl/nm-device-bridge.sgml delete mode 100644 docs/libnm/tmpl/nm-device-bt.sgml delete mode 100644 docs/libnm/tmpl/nm-device-ethernet.sgml delete mode 100644 docs/libnm/tmpl/nm-device-generic.sgml delete mode 100644 docs/libnm/tmpl/nm-device-infiniband.sgml delete mode 100644 docs/libnm/tmpl/nm-device-modem.sgml delete mode 100644 docs/libnm/tmpl/nm-device-olpc-mesh.sgml delete mode 100644 docs/libnm/tmpl/nm-device-team.sgml delete mode 100644 docs/libnm/tmpl/nm-device-vlan.sgml delete mode 100644 docs/libnm/tmpl/nm-device-wifi.sgml delete mode 100644 docs/libnm/tmpl/nm-device-wimax.sgml delete mode 100644 docs/libnm/tmpl/nm-device.sgml delete mode 100644 docs/libnm/tmpl/nm-dhcp-config.sgml delete mode 100644 docs/libnm/tmpl/nm-enum-types.sgml delete mode 100644 docs/libnm/tmpl/nm-errors.sgml delete mode 100644 docs/libnm/tmpl/nm-ip-config.sgml delete mode 100644 docs/libnm/tmpl/nm-object.sgml delete mode 100644 docs/libnm/tmpl/nm-remote-connection.sgml delete mode 100644 docs/libnm/tmpl/nm-secret-agent-old.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-8021x.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-adsl.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-bluetooth.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-bond.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-bridge-port.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-bridge.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-cdma.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-connection.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-dcb.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-generic.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-gsm.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-infiniband.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-ip-config.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-ip4-config.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-ip6-config.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-olpc-mesh.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-ppp.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-pppoe.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-serial.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-team-port.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-team.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-vlan.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-vpn.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-wimax.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-wired.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-wireless-security.sgml delete mode 100644 docs/libnm/tmpl/nm-setting-wireless.sgml delete mode 100644 docs/libnm/tmpl/nm-setting.sgml delete mode 100644 docs/libnm/tmpl/nm-simple-connection.sgml delete mode 100644 docs/libnm/tmpl/nm-utils.sgml delete mode 100644 docs/libnm/tmpl/nm-version.sgml delete mode 100644 docs/libnm/tmpl/nm-vpn-connection.sgml delete mode 100644 docs/libnm/tmpl/nm-vpn-dbus-interface.sgml delete mode 100644 docs/libnm/tmpl/nm-vpn-editor-plugin.sgml delete mode 100644 docs/libnm/tmpl/nm-wimax-nsp.sgml create mode 100644 include/nm-macros-internal.h delete mode 100644 include/nm-utils-internal.h create mode 100644 libnm-core/nm-keyfile-internal.h create mode 100644 libnm-core/nm-keyfile-reader.c create mode 100644 libnm-core/nm-keyfile-utils.c create mode 100644 libnm-core/nm-keyfile-utils.h create mode 100644 libnm-core/nm-keyfile-writer.c create mode 100644 libnm-core/tests/certs/test-ca-cert.pem create mode 100644 libnm-core/tests/certs/test-key-and-cert.pem create mode 100644 libnm-core/tests/test-keyfile.c create mode 100644 src/nm-config-data.c create mode 100644 src/nm-config-data.h create mode 100644 src/nm-multi-index.c create mode 100644 src/nm-multi-index.h delete mode 100644 src/nm-posix-signals.c delete mode 100644 src/nm-posix-signals.h create mode 100644 src/nm-route-manager.c create mode 100644 src/nm-route-manager.h create mode 100644 src/platform/nm-platform-utils.c create mode 100644 src/platform/nm-platform-utils.h create mode 100644 src/platform/nmp-object.c create mode 100644 src/platform/nmp-object.h create mode 100644 src/platform/tests/test-general.c create mode 100644 src/platform/tests/test-nmp-object.c delete mode 100644 src/supplicant-manager/nm-call-store.c delete mode 100644 src/supplicant-manager/nm-call-store.h create mode 100644 src/tests/test-route-manager.c diff --git a/Makefile.am b/Makefile.am index 18bb6c68..7f66e4ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests=yes \ --with-valgrind=no \ --enable-gtk-doc \ - --enable-more-warnings=yes \ + --enable-more-warnings=error \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ --enable-ifcfg-rh \ @@ -59,8 +59,6 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - CLEANFILES = cscope.in.out cscope.out cscope.po.out cscope: diff --git a/Makefile.in b/Makefile.in index 9214d6f0..e409d1c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -212,6 +212,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ $(top_srcdir)/build-aux/install-sh \ $(top_srcdir)/build-aux/ltmain.sh \ $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/build-aux/tap-driver.sh \ $(top_srcdir)/initscript/Arch/networkmanager.in \ $(top_srcdir)/initscript/Debian/NetworkManager.in \ $(top_srcdir)/initscript/Mandriva/networkmanager.in \ @@ -221,7 +222,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ $(top_srcdir)/initscript/linexa/networkmanager.in ABOUT-NLS \ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ + build-aux/config.rpath build-aux/config.sub \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -269,6 +270,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -382,6 +384,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -559,7 +562,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests=yes \ --with-valgrind=no \ --enable-gtk-doc \ - --enable-more-warnings=yes \ + --enable-more-warnings=error \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ --enable-ifcfg-rh \ @@ -570,7 +573,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} CLEANFILES = cscope.in.out cscope.out cscope.po.out all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/NEWS b/NEWS index 72e53f8e..0c201660 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,66 @@ +=============================================== +NetworkManager-1.0.4 +Overview of changes since NetworkManager-1.0.2 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* The MTU setting from an IPv6 neighbor discovery Router Advertisements is + now ignored if applying it would result in invalid configuration. + +* Some configuration options can now be changed without restarting the + daemon. Notably, this applies to 'dns', 'connectivity' and + 'ignore-carrier' settings. + +* The connection activation was made more robust. If an active connection + is reactivated, the device it's active on takes precedence. If an attempt + is made to activate a connection on a different device than it is active on, + the activation proceeds removing the connection from the active device. + +* The device specifiers in configuration files now support negation via + 'except:' match. + +* Devices that only have IPv6 link-local address are no longer assumed to + be connected. + +* nmcli now provides hints and tab-completion for enumeration properties. + +* If the IPv6 interface tokens are set they are honored when creating an + interface identifier for IPv6 addressing. + +* NetworkManager now maintains correct routing configuration when multiple + interfaces are connected to the same network. + +* The management of devices can now be controlled with udev rules. The veth + devices as well as the virtual Ethernet devices of various + virtualization tools (VMWare, VirtualBox, Parallels Workstation) are + now ignored by default. + +* The IPv6 privacy extensions are now enabled by default and handling of + the ip6-privacy sysctl has been improved. + +* Activating a Bond, Bridge or Team device can now optionally activate the + slave connections as well. The behavior is controlled with + 'connection.autoconnect-slaves' property. + +* The platform support code has been refactored, resulting in better + scalability in large configurations. + +* Changes to network interfaces configuration done outside NetworkManager + are now picked up and exposed to the user via NetworkManager API and tools. + +* A connection can now optionally leave externally configured default route + in place instead of overriding it. The behavior is controlled with + 'ipv4.never-default' and 'ipv6.never-default' properties. + +* Multiple crasher and memory leak bugs in the daemon were fixed. + +* Multiple bugs that could cause the client tools to hang or crash were fixed. + +* nmcli allows multiple devices for 'nmcli device disconnect/delete'. + +* Firewall zone is added to firewalld for device-based VPN connections too. + =============================================== NetworkManager-1.0.2 Overview of changes since NetworkManager-1.0 diff --git a/autogen.sh b/autogen.sh index 141bcf12..5ec9a5aa 100755 --- a/autogen.sh +++ b/autogen.sh @@ -28,5 +28,5 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose cd $olddir if test -z "$NOCONFIGURE"; then - exec $srcdir/configure --enable-maintainer-mode "$@" + exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error "$@" fi diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh new file mode 100755 index 00000000..4254e2b3 --- /dev/null +++ b/build-aux/tap-driver.sh @@ -0,0 +1,651 @@ +#! /bin/sh +# Copyright (C) 2011-2014 Free Software Foundation, 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, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +scriptversion=2013-12-23.17; # UTC + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +me=tap-driver.sh + +fatal () +{ + echo "$me: fatal: $*" >&2 + exit 1 +} + +usage_error () +{ + echo "$me: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat < + # + trap : 1 3 2 13 15 + if test $merge -gt 0; then + exec 2>&1 + else + exec 2>&3 + fi + "$@" + echo $? + ) | LC_ALL=C ${AM_TAP_AWK-awk} \ + -v me="$me" \ + -v test_script_name="$test_name" \ + -v log_file="$log_file" \ + -v trs_file="$trs_file" \ + -v expect_failure="$expect_failure" \ + -v merge="$merge" \ + -v ignore_exit="$ignore_exit" \ + -v comments="$comments" \ + -v diag_string="$diag_string" \ +' +# TODO: the usages of "cat >&3" below could be optimized when using +# GNU awk, and/on on systems that supports /dev/fd/. + +# Implementation note: in what follows, `result_obj` will be an +# associative array that (partly) simulates a TAP result object +# from the `TAP::Parser` perl module. + +## ----------- ## +## FUNCTIONS ## +## ----------- ## + +function fatal(msg) +{ + print me ": " msg | "cat >&2" + exit 1 +} + +function abort(where) +{ + fatal("internal error " where) +} + +# Convert a boolean to a "yes"/"no" string. +function yn(bool) +{ + return bool ? "yes" : "no"; +} + +function add_test_result(result) +{ + if (!test_results_index) + test_results_index = 0 + test_results_list[test_results_index] = result + test_results_index += 1 + test_results_seen[result] = 1; +} + +# Whether the test script should be re-run by "make recheck". +function must_recheck() +{ + for (k in test_results_seen) + if (k != "XFAIL" && k != "PASS" && k != "SKIP") + return 1 + return 0 +} + +# Whether the content of the log file associated to this test should +# be copied into the "global" test-suite.log. +function copy_in_global_log() +{ + for (k in test_results_seen) + if (k != "PASS") + return 1 + return 0 +} + +function get_global_test_result() +{ + if ("ERROR" in test_results_seen) + return "ERROR" + if ("FAIL" in test_results_seen || "XPASS" in test_results_seen) + return "FAIL" + all_skipped = 1 + for (k in test_results_seen) + if (k != "SKIP") + all_skipped = 0 + if (all_skipped) + return "SKIP" + return "PASS"; +} + +function stringify_result_obj(result_obj) +{ + if (result_obj["is_unplanned"] || result_obj["number"] != testno) + return "ERROR" + + if (plan_seen == LATE_PLAN) + return "ERROR" + + if (result_obj["directive"] == "TODO") + return result_obj["is_ok"] ? "XPASS" : "XFAIL" + + if (result_obj["directive"] == "SKIP") + return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL; + + if (length(result_obj["directive"])) + abort("in function stringify_result_obj()") + + return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL +} + +function decorate_result(result) +{ + color_name = color_for_result[result] + if (color_name) + return color_map[color_name] "" result "" color_map["std"] + # If we are not using colorized output, or if we do not know how + # to colorize the given result, we should return it unchanged. + return result +} + +function report(result, details) +{ + if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/) + { + msg = ": " test_script_name + add_test_result(result) + } + else if (result == "#") + { + msg = " " test_script_name ":" + } + else + { + abort("in function report()") + } + if (length(details)) + msg = msg " " details + # Output on console might be colorized. + print decorate_result(result) msg + # Log the result in the log file too, to help debugging (this is + # especially true when said result is a TAP error or "Bail out!"). + print result msg | "cat >&3"; +} + +function testsuite_error(error_message) +{ + report("ERROR", "- " error_message) +} + +function handle_tap_result() +{ + details = result_obj["number"]; + if (length(result_obj["description"])) + details = details " " result_obj["description"] + + if (plan_seen == LATE_PLAN) + { + details = details " # AFTER LATE PLAN"; + } + else if (result_obj["is_unplanned"]) + { + details = details " # UNPLANNED"; + } + else if (result_obj["number"] != testno) + { + details = sprintf("%s # OUT-OF-ORDER (expecting %d)", + details, testno); + } + else if (result_obj["directive"]) + { + details = details " # " result_obj["directive"]; + if (length(result_obj["explanation"])) + details = details " " result_obj["explanation"] + } + + report(stringify_result_obj(result_obj), details) +} + +# `skip_reason` should be empty whenever planned > 0. +function handle_tap_plan(planned, skip_reason) +{ + planned += 0 # Avoid getting confused if, say, `planned` is "00" + if (length(skip_reason) && planned > 0) + abort("in function handle_tap_plan()") + if (plan_seen) + { + # Error, only one plan per stream is acceptable. + testsuite_error("multiple test plans") + return; + } + planned_tests = planned + # The TAP plan can come before or after *all* the TAP results; we speak + # respectively of an "early" or a "late" plan. If we see the plan line + # after at least one TAP result has been seen, assume we have a late + # plan; in this case, any further test result seen after the plan will + # be flagged as an error. + plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN) + # If testno > 0, we have an error ("too many tests run") that will be + # automatically dealt with later, so do not worry about it here. If + # $plan_seen is true, we have an error due to a repeated plan, and that + # has already been dealt with above. Otherwise, we have a valid "plan + # with SKIP" specification, and should report it as a particular kind + # of SKIP result. + if (planned == 0 && testno == 0) + { + if (length(skip_reason)) + skip_reason = "- " skip_reason; + report("SKIP", skip_reason); + } +} + +function extract_tap_comment(line) +{ + if (index(line, diag_string) == 1) + { + # Strip leading `diag_string` from `line`. + line = substr(line, length(diag_string) + 1) + # And strip any leading and trailing whitespace left. + sub("^[ \t]*", "", line) + sub("[ \t]*$", "", line) + # Return what is left (if any). + return line; + } + return ""; +} + +# When this function is called, we know that line is a TAP result line, +# so that it matches the (perl) RE "^(not )?ok\b". +function setup_result_obj(line) +{ + # Get the result, and remove it from the line. + result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0) + sub("^(not )?ok[ \t]*", "", line) + + # If the result has an explicit number, get it and strip it; otherwise, + # automatically assing the next progresive number to it. + if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) + { + match(line, "^[0-9]+") + # The final `+ 0` is to normalize numbers with leading zeros. + result_obj["number"] = substr(line, 1, RLENGTH) + 0 + line = substr(line, RLENGTH + 1) + } + else + { + result_obj["number"] = testno + } + + if (plan_seen == LATE_PLAN) + # No further test results are acceptable after a "late" TAP plan + # has been seen. + result_obj["is_unplanned"] = 1 + else if (plan_seen && testno > planned_tests) + result_obj["is_unplanned"] = 1 + else + result_obj["is_unplanned"] = 0 + + # Strip trailing and leading whitespace. + sub("^[ \t]*", "", line) + sub("[ \t]*$", "", line) + + # This will have to be corrected if we have a "TODO"/"SKIP" directive. + result_obj["description"] = line + result_obj["directive"] = "" + result_obj["explanation"] = "" + + if (index(line, "#") == 0) + return # No possible directive, nothing more to do. + + # Directives are case-insensitive. + rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*" + + # See whether we have the directive, and if yes, where. + pos = match(line, rx "$") + if (!pos) + pos = match(line, rx "[^a-zA-Z0-9_]") + + # If there was no TAP directive, we have nothing more to do. + if (!pos) + return + + # Let`s now see if the TAP directive has been escaped. For example: + # escaped: ok \# SKIP + # not escaped: ok \\# SKIP + # escaped: ok \\\\\# SKIP + # not escaped: ok \ # SKIP + if (substr(line, pos, 1) == "#") + { + bslash_count = 0 + for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--) + bslash_count += 1 + if (bslash_count % 2) + return # Directive was escaped. + } + + # Strip the directive and its explanation (if any) from the test + # description. + result_obj["description"] = substr(line, 1, pos - 1) + # Now remove the test description from the line, that has been dealt + # with already. + line = substr(line, pos) + # Strip the directive, and save its value (normalized to upper case). + sub("^[ \t]*#[ \t]*", "", line) + result_obj["directive"] = toupper(substr(line, 1, 4)) + line = substr(line, 5) + # Now get the explanation for the directive (if any), with leading + # and trailing whitespace removed. + sub("^[ \t]*", "", line) + sub("[ \t]*$", "", line) + result_obj["explanation"] = line +} + +function get_test_exit_message(status) +{ + if (status == 0) + return "" + if (status !~ /^[1-9][0-9]*$/) + abort("getting exit status") + if (status < 127) + exit_details = "" + else if (status == 127) + exit_details = " (command not found?)" + else if (status >= 128 && status <= 255) + exit_details = sprintf(" (terminated by signal %d?)", status - 128) + else if (status > 256 && status <= 384) + # We used to report an "abnormal termination" here, but some Korn + # shells, when a child process die due to signal number n, can leave + # in $? an exit status of 256+n instead of the more standard 128+n. + # Apparently, both behaviours are allowed by POSIX (2008), so be + # prepared to handle them both. See also Austing Group report ID + # 0000051 + exit_details = sprintf(" (terminated by signal %d?)", status - 256) + else + # Never seen in practice. + exit_details = " (abnormal termination)" + return sprintf("exited with status %d%s", status, exit_details) +} + +function write_test_results() +{ + print ":global-test-result: " get_global_test_result() > trs_file + print ":recheck: " yn(must_recheck()) > trs_file + print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file + for (i = 0; i < test_results_index; i += 1) + print ":test-result: " test_results_list[i] > trs_file + close(trs_file); +} + +BEGIN { + +## ------- ## +## SETUP ## +## ------- ## + +'"$init_colors"' + +# Properly initialized once the TAP plan is seen. +planned_tests = 0 + +COOKED_PASS = expect_failure ? "XPASS": "PASS"; +COOKED_FAIL = expect_failure ? "XFAIL": "FAIL"; + +# Enumeration-like constants to remember which kind of plan (if any) +# has been seen. It is important that NO_PLAN evaluates "false" as +# a boolean. +NO_PLAN = 0 +EARLY_PLAN = 1 +LATE_PLAN = 2 + +testno = 0 # Number of test results seen so far. +bailed_out = 0 # Whether a "Bail out!" directive has been seen. + +# Whether the TAP plan has been seen or not, and if yes, which kind +# it is ("early" is seen before any test result, "late" otherwise). +plan_seen = NO_PLAN + +## --------- ## +## PARSING ## +## --------- ## + +is_first_read = 1 + +while (1) + { + # Involutions required so that we are able to read the exit status + # from the last input line. + st = getline + if (st < 0) # I/O error. + fatal("I/O error while reading from input stream") + else if (st == 0) # End-of-input + { + if (is_first_read) + abort("in input loop: only one input line") + break + } + if (is_first_read) + { + is_first_read = 0 + nextline = $0 + continue + } + else + { + curline = nextline + nextline = $0 + $0 = curline + } + # Copy any input line verbatim into the log file. + print | "cat >&3" + # Parsing of TAP input should stop after a "Bail out!" directive. + if (bailed_out) + continue + + # TAP test result. + if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/) + { + testno += 1 + setup_result_obj($0) + handle_tap_result() + } + # TAP plan (normal or "SKIP" without explanation). + else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/) + { + # The next two lines will put the number of planned tests in $0. + sub("^1\\.\\.", "") + sub("[^0-9]*$", "") + handle_tap_plan($0, "") + continue + } + # TAP "SKIP" plan, with an explanation. + else if ($0 ~ /^1\.\.0+[ \t]*#/) + { + # The next lines will put the skip explanation in $0, stripping + # any leading and trailing whitespace. This is a little more + # tricky in truth, since we want to also strip a potential leading + # "SKIP" string from the message. + sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "") + sub("[ \t]*$", ""); + handle_tap_plan(0, $0) + } + # "Bail out!" magic. + # Older versions of prove and TAP::Harness (e.g., 3.17) did not + # recognize a "Bail out!" directive when preceded by leading + # whitespace, but more modern versions (e.g., 3.23) do. So we + # emulate the latter, "more modern" behaviour. + else if ($0 ~ /^[ \t]*Bail out!/) + { + bailed_out = 1 + # Get the bailout message (if any), with leading and trailing + # whitespace stripped. The message remains stored in `$0`. + sub("^[ \t]*Bail out![ \t]*", ""); + sub("[ \t]*$", ""); + # Format the error message for the + bailout_message = "Bail out!" + if (length($0)) + bailout_message = bailout_message " " $0 + testsuite_error(bailout_message) + } + # Maybe we have too look for dianogtic comments too. + else if (comments != 0) + { + comment = extract_tap_comment($0); + if (length(comment)) + report("#", comment); + } + } + +## -------- ## +## FINISH ## +## -------- ## + +# A "Bail out!" directive should cause us to ignore any following TAP +# error, as well as a non-zero exit status from the TAP producer. +if (!bailed_out) + { + if (!plan_seen) + { + testsuite_error("missing test plan") + } + else if (planned_tests != testno) + { + bad_amount = testno > planned_tests ? "many" : "few" + testsuite_error(sprintf("too %s tests run (expected %d, got %d)", + bad_amount, planned_tests, testno)) + } + if (!ignore_exit) + { + # Fetch exit status from the last line. + exit_message = get_test_exit_message(nextline) + if (exit_message) + testsuite_error(exit_message) + } + } + +write_test_results() + +exit 0 + +} # End of "BEGIN" block. +' + +# TODO: document that we consume the file descriptor 3 :-( +} 3>"$log_file" + +test $? -eq 0 || fatal "I/O or internal error" + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/build-aux/test-driver b/build-aux/test-driver new file mode 100755 index 00000000..8e575b01 --- /dev/null +++ b/build-aux/test-driver @@ -0,0 +1,148 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2014 Free Software Foundation, 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, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/callouts/77-nm-olpc-mesh.rules b/callouts/77-nm-olpc-mesh.rules deleted file mode 100644 index a1a1554c..00000000 --- a/callouts/77-nm-olpc-mesh.rules +++ /dev/null @@ -1,6 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# The fact that this device is driven by libertas is not currently exposed -# in the sysfs tree..? -KERNEL=="msh*", SUBSYSTEM=="net", DRIVERS=="usb", ATTRS{idVendor}=="1286", ATTRS{idProduct}=="2001", ENV{ID_NM_OLPC_MESH}="1" - diff --git a/callouts/Makefile.am b/callouts/Makefile.am index f682579e..cc38e01a 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -87,11 +87,6 @@ libtest_dispatcher_envp_la_LIBADD = \ $(GLIB_LIBS) -if WITH_UDEV_DIR -udevrulesdir = $(UDEV_DIR)/rules.d -udevrules_DATA = 77-nm-olpc-mesh.rules -endif - dbusactivationdir = $(datadir)/dbus-1/system-services dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) @@ -115,7 +110,6 @@ CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA) EXTRA_DIST = \ $(dbusservice_DATA) \ - $(udevrules_DATA) \ $(dbusactivation_in_files) \ nm-dispatcher.xml diff --git a/callouts/Makefile.in b/callouts/Makefile.in index 7e5c1f87..cada1e2a 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -132,8 +132,7 @@ am_libtest_dispatcher_envp_la_OBJECTS = \ libtest_dispatcher_envp_la_OBJECTS = \ $(am_libtest_dispatcher_envp_la_OBJECTS) am__installdirs = "$(DESTDIR)$(libexecdir)" \ - "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)" \ - "$(DESTDIR)$(udevrulesdir)" + "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)" PROGRAMS = $(libexec_PROGRAMS) am_nm_avahi_autoipd_action_OBJECTS = \ nm-avahi-autoipd-action.$(OBJEXT) @@ -225,7 +224,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -DATA = $(dbusactivation_DATA) $(dbusservice_DATA) $(udevrules_DATA) +DATA = $(dbusactivation_DATA) $(dbusservice_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -286,6 +285,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -399,6 +399,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -607,8 +608,6 @@ libtest_dispatcher_envp_la_LIBADD = \ $(top_builddir)/libnm/libnm.la \ $(GLIB_LIBS) -@WITH_UDEV_DIR_TRUE@udevrulesdir = $(UDEV_DIR)/rules.d -@WITH_UDEV_DIR_TRUE@udevrules_DATA = 77-nm-olpc-mesh.rules dbusactivationdir = $(datadir)/dbus-1/system-services dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service) @@ -622,7 +621,6 @@ dispatcherdir = $(sysconfdir)/NetworkManager/dispatcher.d CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA) EXTRA_DIST = \ $(dbusservice_DATA) \ - $(udevrules_DATA) \ $(dbusactivation_in_files) \ nm-dispatcher.xml @@ -829,27 +827,6 @@ uninstall-dbusserviceDATA: @list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir) -install-udevrulesDATA: $(udevrules_DATA) - @$(NORMAL_INSTALL) - @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \ - done - -uninstall-udevrulesDATA: - @$(NORMAL_UNINSTALL) - @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -1011,7 +988,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(udevrulesdir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusservicedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1070,8 +1047,7 @@ info: info-recursive info-am: -install-data-am: install-dbusactivationDATA install-dbusserviceDATA \ - install-udevrulesDATA +install-data-am: install-dbusactivationDATA install-dbusserviceDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -1119,7 +1095,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-dbusactivationDATA uninstall-dbusserviceDATA \ - uninstall-libexecPROGRAMS uninstall-udevrulesDATA + uninstall-libexecPROGRAMS .MAKE: $(am__recursive_targets) all check install install-am \ install-data-am install-strip @@ -1135,13 +1111,13 @@ uninstall-am: uninstall-dbusactivationDATA uninstall-dbusserviceDATA \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-libexecPROGRAMS \ install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip install-udevrulesDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am \ uninstall-dbusactivationDATA uninstall-dbusserviceDATA \ - uninstall-libexecPROGRAMS uninstall-udevrulesDATA + uninstall-libexecPROGRAMS .PRECIOUS: Makefile diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index d8a8e8d8..e7a6f6a2 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -377,7 +377,7 @@ nm_dispatcher_utils_construct_envp (const char *action, return NULL; } g_variant_unref (value); - g_variant_lookup (device_props, NMD_DEVICE_PROPS_IP_INTERFACE, "&s", &ip_iface); + (void) g_variant_lookup (device_props, NMD_DEVICE_PROPS_IP_INTERFACE, "&s", &ip_iface); } /* Device type */ diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index 0cd2531d..09eb0d3a 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -294,9 +294,12 @@ script_timeout_cb (gpointer user_data) g_warning ("Script '%s' took too long; killing it.", script->script); - if (kill (script->pid, 0) == 0) - kill (script->pid, SIGKILL); - (void) waitpid (script->pid, NULL, 0); + kill (script->pid, SIGKILL); +again: + if (waitpid (script->pid, NULL, 0) == -1) { + if (errno == EINTR) + goto again; + } script->error = g_strdup_printf ("Script '%s' timed out.", script->script); script->result = DISPATCH_RESULT_TIMEOUT; @@ -361,15 +364,6 @@ check_filename (const char *file_name) return TRUE; } -static void -child_setup (gpointer user_data G_GNUC_UNUSED) -{ - /* We are in the child process at this point */ - /* Give child a different process group to ensure signal separation. */ - pid_t pid = getpid (); - setpgid (pid, pid); -} - #define SCRIPT_TIMEOUT 600 /* 10 minutes */ static void @@ -387,7 +381,7 @@ dispatch_one_script (Request *request) if (request->debug) g_message ("Running script '%s'", script->script); - if (g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, child_setup, request, &script->pid, &error)) { + if (g_spawn_async ("/", argv, request->envp, G_SPAWN_DO_NOT_REAP_CHILD, NULL, request, &script->pid, &error)) { request->script_watch_id = g_child_watch_add (script->pid, (GChildWatchFunc) script_watch_cb, script); request->script_timeout_id = g_timeout_add_seconds (SCRIPT_TIMEOUT, script_timeout_cb, script); } else { @@ -555,8 +549,13 @@ on_name_lost (GDBusConnection *connection, gpointer user_data) { if (!connection) { - g_warning ("Could not get the system bus. Make sure the message bus daemon is running!"); - exit (1); + if (!ever_acquired_name) { + g_warning ("Could not get the system bus. Make sure the message bus daemon is running!"); + exit (1); + } else { + g_message ("System bus stopped. Exiting"); + exit (0); + } } else if (!ever_acquired_name) { g_warning ("Could not acquire the " NM_DISPATCHER_DBUS_SERVICE " service."); exit (1); diff --git a/callouts/tests/Makefile.in b/callouts/tests/Makefile.in index bd3241ce..f02c47dd 100644 --- a/callouts/tests/Makefile.in +++ b/callouts/tests/Makefile.in @@ -208,13 +208,196 @@ am__tty_colors = { \ std=''; \ fi; \ } +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) am__DIST_COMMON = $(srcdir)/Makefile.in \ - $(top_srcdir)/build-aux/depcomp + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -328,6 +511,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -503,7 +687,7 @@ EXTRA_DIST = \ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -634,98 +818,168 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +test-dispatcher-envp.log: test-dispatcher-envp$(EXEEXT) + @p='test-dispatcher-envp$(EXEEXT)'; \ + b='test-dispatcher-envp'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -782,6 +1036,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -877,7 +1134,7 @@ uninstall-am: installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff --git a/clients/Makefile.in b/clients/Makefile.in index b3fa0d99..2d750714 100644 --- a/clients/Makefile.in +++ b/clients/Makefile.in @@ -231,6 +231,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -344,6 +345,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/clients/cli/Makefile.in b/clients/cli/Makefile.in index 657f00ff..34315101 100644 --- a/clients/cli/Makefile.in +++ b/clients/cli/Makefile.in @@ -206,6 +206,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -319,6 +320,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/clients/cli/common.c b/clients/cli/common.c index a47c32e8..97d0bb94 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -708,6 +708,12 @@ nmc_device_reason_to_string (NMDeviceStateReason reason) case NM_DEVICE_STATE_REASON_NEW_ACTIVATION: return _("New connection activation was enqueued"); + case NM_DEVICE_STATE_REASON_PARENT_CHANGED: + return _("The device's parent changed"); + + case NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: + return _("The device parent's management changed"); + default: /* TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) */ return _("Unknown"); diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 9206d9da..8d138bdf 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -49,7 +49,8 @@ #define PROMPT_BOND_MASTER _("Bond master: ") #define PROMPT_TEAM_MASTER _("Team master: ") #define PROMPT_BRIDGE_MASTER _("Bridge master: ") -#define PROMPT_CONNECTION _("Connection (name, UUID, or path): ") +#define PROMPT_CONNECTION _("Connection (name, UUID, or path): ") +#define PROMPT_CONNECTIONS _("Connection(s) (name, UUID, or path): ") static const char *nmc_known_vpns[] = { "openvpn", "vpnc", "pptp", "openconnect", "openswan", "libreswan", @@ -237,6 +238,7 @@ typedef struct { char *con_type; NMConnection *connection; NMSetting *setting; + const char *property; } TabCompletionInfo; static TabCompletionInfo nmc_tab_completion = {NULL, NULL, NULL, NULL}; @@ -1567,6 +1569,7 @@ find_device_for_connection (NmCli *nmc, int i, j; g_return_val_if_fail (nmc != NULL, FALSE); + g_return_val_if_fail (iface || ap || nsp, FALSE); g_return_val_if_fail (device != NULL && *device == NULL, FALSE); g_return_val_if_fail (spec_object != NULL && *spec_object == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -1726,7 +1729,7 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) nm_object_get_path (NM_OBJECT (active))); quit (); } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING - && state == NM_DEVICE_STATE_IP_CONFIG) { + && state >= NM_DEVICE_STATE_IP_CONFIG) { if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"), @@ -2052,7 +2055,7 @@ nmc_activate_connection (NmCli *nmc, g_return_val_if_fail (nmc != NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if (connection) { + if (connection && (ifname || ap || nsp)) { device_found = find_device_for_connection (nmc, connection, ifname, ap, nsp, &device, &spec_object, &local); /* Virtual connection may not have their interfaces created yet */ @@ -2070,7 +2073,7 @@ nmc_activate_connection (NmCli *nmc, _("unknown device '%s'."), ifname); return FALSE; } - } else { + } else if (!connection) { g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_NOT_FOUND, _("neither a valid connection nor device given")); return FALSE; @@ -2239,25 +2242,26 @@ typedef struct { NmCli *nmc; GSList *queue; guint timeout_id; -} DeactivateConnectionInfo; +} ConnectionCbInfo; -static void deactivate_connection_info_finish (DeactivateConnectionInfo *info, - NMActiveConnection *active); +static void connection_cb_info_finish (ConnectionCbInfo *info, + gpointer connection); -static gboolean -down_timeout_cb (gpointer user_data) +static void +connection_removed_cb (NMClient *client, NMConnection *connection, ConnectionCbInfo *info) { - DeactivateConnectionInfo *info = user_data; - - timeout_cb (info->nmc); - deactivate_connection_info_finish (info, NULL); - return G_SOURCE_REMOVE; + if (!g_slist_find (info->queue, connection)) + return; + g_print (_("Connection '%s' (%s) successfully deleted.\n"), + nm_connection_get_id (connection), + nm_connection_get_uuid (connection)); + connection_cb_info_finish (info, connection); } static void down_active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, - DeactivateConnectionInfo *info) + ConnectionCbInfo *info) { if (nm_active_connection_get_state (active) < NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) return; @@ -2267,7 +2271,20 @@ down_active_connection_state_cb (NMActiveConnection *active, g_print (_("Connection '%s' successfully deactivated (D-Bus active path: %s)\n"), nm_active_connection_get_id (active), nm_object_get_path (NM_OBJECT (active))); - deactivate_connection_info_finish (info, active); + g_signal_handlers_disconnect_by_func (G_OBJECT (active), + down_active_connection_state_cb, + info); + connection_cb_info_finish (info, active); +} + +static gboolean +connection_op_timeout_cb (gpointer user_data) +{ + ConnectionCbInfo *info = user_data; + + timeout_cb (info->nmc); + connection_cb_info_finish (info, NULL); + return G_SOURCE_REMOVE; } static void @@ -2279,15 +2296,11 @@ destroy_queue_element (gpointer data) } static void -deactivate_connection_info_finish (DeactivateConnectionInfo *info, - NMActiveConnection *active) -{ - if (active) { - info->queue = g_slist_remove (info->queue, active); - g_signal_handlers_disconnect_by_func (active, - down_active_connection_state_cb, - info); - g_object_unref (active); +connection_cb_info_finish (ConnectionCbInfo *info, gpointer connection) +{ + if (connection) { + info->queue = g_slist_remove (info->queue, connection); + g_object_unref (G_OBJECT (connection)); } else { g_slist_free_full (info->queue, destroy_queue_element); info->queue = NULL; @@ -2298,7 +2311,8 @@ deactivate_connection_info_finish (DeactivateConnectionInfo *info, if (info->timeout_id) g_source_remove (info->timeout_id); - g_slice_free (DeactivateConnectionInfo, info); + g_signal_handlers_disconnect_by_func (info->nmc->client, connection_removed_cb, info); + g_slice_free (ConnectionCbInfo, info); quit (); } @@ -2306,7 +2320,7 @@ static NMCResultCode do_connection_down (NmCli *nmc, int argc, char **argv) { NMActiveConnection *active; - DeactivateConnectionInfo *info = NULL; + ConnectionCbInfo *info = NULL; const GPtrArray *active_cons; GSList *queue = NULL, *iter; char *line = NULL; @@ -2315,10 +2329,13 @@ do_connection_down (NmCli *nmc, int argc, char **argv) int arg_num = argc; int idx = 0; + if (nmc->timeout == -1) + nmc->timeout = 10; + if (argc == 0) { if (nmc->ask) { - line = nmc_readline (PROMPT_CONNECTION); - nmc_string_to_arg_array (line, "", &arg_arr, &arg_num); + line = nmc_readline (PROMPT_CONNECTIONS); + nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); g_free (line); arg_ptr = arg_arr; } @@ -2329,9 +2346,6 @@ do_connection_down (NmCli *nmc, int argc, char **argv) } } - if (nmc->timeout == -1) - nmc->timeout = 10; - /* Get active connections */ active_cons = nm_client_get_active_connections (nmc->client); while (arg_num > 0) { @@ -2351,9 +2365,13 @@ do_connection_down (NmCli *nmc, int argc, char **argv) } active = find_active_connection (active_cons, nmc->connections, selector, *arg_ptr, &idx); - if (active) - queue = g_slist_prepend (queue, active); - else { + if (active) { + /* Check if the connection is unique. */ + /* Calling down for the same connection repeatedly would result in + * NM responding for the last D-Bus call only and we would stall. */ + if (!g_slist_find (queue, active)) + queue = g_slist_prepend (queue, g_object_ref (active)); + } else { g_printerr (_("Error: '%s' is not an active connection.\n"), *arg_ptr); g_string_printf (nmc->return_text, _("Error: not all active connections found.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; @@ -2368,27 +2386,25 @@ do_connection_down (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } - queue = g_slist_reverse (queue); if (nmc->timeout > 0) { nmc->should_wait = TRUE; - info = g_slice_new0 (DeactivateConnectionInfo); + info = g_slice_new0 (ConnectionCbInfo); info->nmc = nmc; - info->timeout_id = g_timeout_add_seconds (nmc->timeout, down_timeout_cb, info); + info->queue = queue; + info->timeout_id = g_timeout_add_seconds (nmc->timeout, connection_op_timeout_cb, info); } for (iter = queue; iter; iter = g_slist_next (iter)) { active = iter->data; - if (info) { - info->queue = g_slist_prepend (info->queue, g_object_ref (active)); + if (info) g_signal_connect (active, "notify::" NM_ACTIVE_CONNECTION_STATE, G_CALLBACK (down_active_connection_state_cb), info); - } /* Now deactivate the connection */ nm_client_deactivate_connection (nmc->client, active, NULL, NULL); @@ -2396,7 +2412,6 @@ do_connection_down (NmCli *nmc, int argc, char **argv) error: g_strfreev (arg_arr); - g_slist_free (queue); return nmc->return_value; } @@ -2862,7 +2877,7 @@ check_valid_enumeration (char **str, } else { char *options; - options = nmc_util_strv_for_display (strings); + options = nmc_util_strv_for_display (strings, TRUE); g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("Error: '%s': '%s' is not a valid %s %s."), what, *str, what_desc, options); @@ -5732,7 +5747,6 @@ uuid_display_hook (char **array, int len, int max_len) int i, max = 0; char *tmp; const char *id; - for (i = 1; i <= len; i++) { con = nmc_find_connection (nmc_tab_completion.nmc->connections, "uuid", array[i], NULL); id = con ? nm_connection_get_id (con) : NULL; @@ -6087,48 +6101,105 @@ should_complete_cmd (const char *line, int end, const char *cmd, return ret; } -static char * -extract_property_name (const char *prompt, const char *line) +/* + * extract_setting_and_property: + * prompt: (in) (allow-none): prompt string, or NULL + * line: (in) (allow-none): line, or NULL + * setting: (out) (transfer full) (array zero-terminated=1): + * return location for setting name + * property: (out) (transfer full) (array zero-terminated=1): + * return location for property name + * + * Extract setting and property names from prompt and/or line. + */ +static void +extract_setting_and_property (const char *prompt, const char *line, + char **setting, char **property) { char *prop = NULL; + char *sett = NULL; - /* If prompt is set take the property name from it, else extract it from line */ - if (!prompt) { - const char *p1; - size_t num; - p1 = strchr (line, '.'); - if (p1) { - p1++; - } else { - size_t n1, n2, n3; - n1 = strspn (line, " \t"); - n2 = strcspn (line+n1, " \t\0") + n1; - n3 = strspn (line+n2, " \t") + n2; - p1 = line + n3; - } - num = strcspn (p1, " \t\0"); - prop = g_strndup (p1, num); - } else { - const char *p1, *dot; - size_t num; + if (prompt) { + /* prompt looks like this: + "nmcli 802-1x>" or "nmcli 802-1x.pac-file>" */ + const char *p1, *p2, *dot; + size_t num1, num2; p1 = strchr (prompt, ' '); - /* prompt looks like this: "nmcli 802-1x>" or "nmcli 802-1x.pac-file>" */ if (p1) { - dot = strchr (p1 + 1, '.'); - p1 = dot ? dot + 1 : p1; - num = strcspn (p1, ">"); - prop = g_strndup (p1, num); + dot = strchr (++p1, '.'); + if (dot) { + p2 = dot + 1; + num1 = strcspn (p1, "."); + num2 = strcspn (p2, ">"); + sett = num1 > 0 ? g_strndup (p1, num1) : NULL; + prop = num2 > 0 ? g_strndup (p2, num2) : NULL; + } else { + num1 = strcspn (p1, ">"); + sett = num1 > 0 ? g_strndup (p1, num1) : NULL; + } } } - return prop; + if (line) { + /* line looks like this: + " set 802-1x.pac-file ..." or " set pac-file ..." */ + const char *p1, *p2, *dot; + size_t n1, n2, n3, n4; + size_t num1, num2, len; + n1 = strspn (line, " \t"); /* white-space */ + n2 = strcspn (line+n1, " \t\0") + n1; /* command */ + n3 = strspn (line+n2, " \t") + n2; /* white-space */ + n4 = strcspn (line+n3, " \t\0") + n3; /* setting/property */ + p1 = line + n3; + len = n4 - n3; + + dot = strchr (p1, '.'); + if (dot && dot < p1 + len) { + p2 = dot + 1; + num1 = strcspn (p1, "."); + num2 = len > num1 + 1 ? len - num1 - 1 : 0; + sett = num1 > 0 ? g_strndup (p1, num1) : sett; + prop = num2 > 0 ? g_strndup (p2, num2) : prop; + } else { + if (!prop) + prop = len > 0 ? g_strndup (p1, len) : NULL; + } + } + + if (setting) + *setting = sett; + else + g_free (sett); + if (property) + *property = prop; + else + g_free (prop); } static gboolean -should_complete_files (const char *prompt, const char *line) +_get_and_check_property (const char *prompt, + const char *line, + const char **array, + const char **array_multi, + gboolean *multi) { char *prop; gboolean found = FALSE; + + extract_setting_and_property (prompt, line, NULL, &prop); + if (prop) { + if (array) + found = !!nmc_string_is_valid (prop, array, NULL); + if (array_multi && multi) + *multi = !!nmc_string_is_valid (prop, array_multi, NULL); + g_free (prop); + } + return found; +} + +static gboolean +should_complete_files (const char *prompt, const char *line) +{ const char *file_properties[] = { /* '802-1x' properties */ "ca-cert", @@ -6144,32 +6215,86 @@ should_complete_files (const char *prompt, const char *line) "config", NULL }; - - prop = extract_property_name (prompt, line); - if (prop) { - found = !!nmc_string_is_valid (prop, file_properties, NULL); - g_free (prop); - } - return found; + return _get_and_check_property (prompt, line, file_properties, NULL, NULL); } static gboolean should_complete_vpn_uuids (const char *prompt, const char *line) { - char *prop; - gboolean found = FALSE; const char *uuid_properties[] = { /* 'connection' properties */ "secondaries", NULL }; + return _get_and_check_property (prompt, line, uuid_properties, NULL, NULL); +} - prop = extract_property_name (prompt, line); - if (prop) { - found = !!nmc_string_is_valid (prop, uuid_properties, NULL); - g_free (prop); - } - return found; +static char *is_property_valid (NMSetting *setting, const char *property, GError **error); +static const char ** +get_allowed_property_values (void) +{ + const NameItem *valid_settings_arr; + const char *setting_name; + NMSetting *setting = NULL; + char *property = NULL; + char *sett = NULL, *prop = NULL; + const char **avals = NULL; + + extract_setting_and_property (rl_prompt, rl_line_buffer, &sett, &prop); + if (sett) { + valid_settings_arr = get_valid_settings_array (nmc_tab_completion.con_type); + setting_name = check_valid_name (sett, valid_settings_arr, NULL); + setting = nmc_setting_new_for_name (setting_name); + } else + setting = nmc_tab_completion.setting ? g_object_ref (nmc_tab_completion.setting) : NULL; + + if (setting && prop) + property = is_property_valid (setting, prop, NULL); + else + property = g_strdup (nmc_tab_completion.property); + + if (setting && property) + avals = nmc_setting_get_property_allowed_values (setting, property); + + g_free (sett); + g_free (prop); + if (setting) + g_object_unref (setting); + g_free (property); + return avals; +} + +static gboolean +should_complete_property_values (const char *prompt, const char *line, gboolean *multi) +{ + /* properties allowing multiple values */ + const char *multi_props[] = { + /* '802-1x' properties */ + NM_SETTING_802_1X_EAP, + /* '802-11-wireless-security' properties */ + NM_SETTING_WIRELESS_SECURITY_PROTO, + NM_SETTING_WIRELESS_SECURITY_PAIRWISE, + NM_SETTING_WIRELESS_SECURITY_GROUP, + /* 'bond' properties */ + NM_SETTING_BOND_OPTIONS, + /* 'ethernet' properties */ + NM_SETTING_WIRED_S390_OPTIONS, + NULL + }; + _get_and_check_property (prompt, line, NULL, multi_props, multi); + return get_allowed_property_values () != NULL; +} + +static char * +gen_property_values (const char *text, int state) +{ + char *ret = NULL; + const char **avals; + + avals = get_allowed_property_values (); + if (avals) + ret = nmc_rl_gen_func_basic (text, state, avals); + return ret; } /* from readline */ @@ -6239,6 +6364,7 @@ nmcli_editor_tab_completion (const char *text, int start, int end) if (!strchr (prompt_tmp, '.')) { int level = g_str_has_prefix (prompt_tmp, "nmcli>") ? 0 : 1; const char *dot = strchr (line, '.'); + gboolean multi; /* Main menu - level 0,1 */ if (start == n1) @@ -6259,9 +6385,12 @@ nmcli_editor_tab_completion (const char *text, int start, int end) } else if (num >= 3) { if (num == 3 && should_complete_files (NULL, line)) rl_attempted_completion_over = 0; - if (should_complete_vpn_uuids (NULL, line)) { + else if (should_complete_vpn_uuids (NULL, line)) { rl_completion_display_matches_hook = uuid_display_hook; generator_func = gen_vpn_uuids; + } else if ( should_complete_property_values (NULL, line, &multi) + && (num == 3 || multi)) { + generator_func = gen_property_values; } } } else if ( ( should_complete_cmd (line, end, "remove", &num, NULL) @@ -6296,6 +6425,8 @@ nmcli_editor_tab_completion (const char *text, int start, int end) if (start == n1) generator_func = gen_nmcli_cmds_submenu; else { + gboolean multi; + if ( should_complete_cmd (line, end, "add", &num, NULL) || should_complete_cmd (line, end, "set", &num, NULL)) { if (num <= 2 && should_complete_files (prompt_tmp, line)) @@ -6303,6 +6434,9 @@ nmcli_editor_tab_completion (const char *text, int start, int end) else if (should_complete_vpn_uuids (prompt_tmp, line)) { rl_completion_display_matches_hook = uuid_display_hook; generator_func = gen_vpn_uuids; + } else if ( should_complete_property_values (prompt_tmp, NULL, &multi) + && (num <= 2 || multi)) { + generator_func = gen_property_values; } } if (should_complete_cmd (line, end, "print", &num, NULL) && num <= 2) @@ -7016,6 +7150,9 @@ property_edit_submenu (NmCli *nmc, gboolean temp_changes; gboolean removed; + /* Set global variable for use in TAB completion */ + nmc_tab_completion.property = prop_name; + prompt = nmc_colorize (nmc->editor_prompt_color, "nmcli %s.%s> ", nm_setting_get_name (curr_setting), prop_name); @@ -7047,9 +7184,16 @@ property_edit_submenu (NmCli *nmc, * ADD adds the new value(s) * single values: : both SET and ADD sets the new value */ - if (!cmd_property_arg) + if (!cmd_property_arg) { + const char **avals = nmc_setting_get_property_allowed_values (curr_setting, prop_name); + if (avals) { + char *avals_str = nmc_util_strv_for_display (avals, FALSE); + g_print (_("Allowed values for '%s' property: %s\n"), + prop_name, avals_str); + g_free (avals_str); + } prop_val_user = nmc_readline (_("Enter '%s' value: "), prop_name); - else + } else prop_val_user = g_strdup (cmd_property_arg); /* nmc_setting_set_property() only adds new value, thus we have to @@ -7078,7 +7222,7 @@ property_edit_submenu (NmCli *nmc, case NMC_EDITOR_SUB_CMD_CHANGE: rl_startup_hook = nmc_rl_set_deftext; - nmc_rl_pre_input_deftext = nmc_setting_get_property_out2in (curr_setting, prop_name, NULL); + nmc_rl_pre_input_deftext = nmc_setting_get_property_parsable (curr_setting, prop_name, NULL); prop_val_user = nmc_readline (_("Edit '%s' value: "), prop_name); nmc_property_get_gvalue (curr_setting, prop_name, &prop_g_value); @@ -7144,6 +7288,8 @@ property_edit_submenu (NmCli *nmc, break; case NMC_EDITOR_SUB_CMD_BACK: + /* Set global variable for use in TAB completion */ + nmc_tab_completion.property = NULL; cmd_property_loop = FALSE; break; @@ -7456,7 +7602,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t if (menu_ctx.level == 1) { const char *prop_name; char *prop_val_user = NULL; - const char *avals; + const char **avals; GError *tmp_err = NULL; prop_name = ask_check_property (cmd_arg, @@ -7466,9 +7612,12 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t break; avals = nmc_setting_get_property_allowed_values (menu_ctx.curr_setting, prop_name); - if (avals) - g_print (_("Allowed values for '%s' property: %s\n"), prop_name, avals); - + if (avals) { + char *avals_str = nmc_util_strv_for_display (avals, FALSE); + g_print (_("Allowed values for '%s' property: %s\n"), + prop_name, avals_str); + g_free (avals_str); + } prop_val_user = nmc_readline (_("Enter '%s' value: "), prop_name); /* Set property value */ @@ -7520,10 +7669,13 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* Ask for value */ if (!cmd_arg_v) { - const char *avals = nmc_setting_get_property_allowed_values (ss, prop_name); - if (avals) - g_print (_("Allowed values for '%s' property: %s\n"), prop_name, avals); - + const char **avals = nmc_setting_get_property_allowed_values (ss, prop_name); + if (avals) { + char *avals_str = nmc_util_strv_for_display (avals, FALSE); + g_print (_("Allowed values for '%s' property: %s\n"), + prop_name, avals_str); + g_free (avals_str); + } cmd_arg_v = nmc_readline (_("Enter '%s' value: "), prop_name); } @@ -8646,52 +8798,44 @@ finish: return nmc->return_value; } - -typedef struct { - NmCli *nmc; - int counter; -} DeleteStateInfo; - static void delete_cb (GObject *con, GAsyncResult *result, gpointer user_data) { - DeleteStateInfo *info = (DeleteStateInfo *) user_data; + ConnectionCbInfo *info = (ConnectionCbInfo *) user_data; GError *error = NULL; if (!nm_remote_connection_delete_finish (NM_REMOTE_CONNECTION (con), result, &error)) { - g_string_printf (info->nmc->return_text, _("Error: Connection deletion failed: %s"), - error->message); + g_string_printf (info->nmc->return_text, _("Error: not all connections deleted.")); + g_printerr (_("Error: Connection deletion failed: %s"), + error->message); g_error_free (error); info->nmc->return_value = NMC_RESULT_ERROR_CON_DEL; - } - - info->counter--; - if (info->counter == 0) { - g_free (info); - quit (); + connection_cb_info_finish (info, con); + } else { + if (info->nmc->nowait_flag) + connection_cb_info_finish (info, con); } } static NMCResultCode do_connection_delete (NmCli *nmc, int argc, char **argv) { - NMConnection *connection = NULL; - DeleteStateInfo *del_info = NULL; - char *line = NULL; + NMConnection *connection; + ConnectionCbInfo *info = NULL; + GSList *queue = NULL, *iter; char **arg_arr = NULL; char **arg_ptr = argv; int arg_num = argc; GString *invalid_cons = NULL; - gboolean del_info_free = FALSE; int pos = 0; - nmc->return_value = NMC_RESULT_SUCCESS; - nmc->should_wait = FALSE; + if (nmc->timeout == -1) + nmc->timeout = 10; if (argc == 0) { if (nmc->ask) { - line = nmc_readline (PROMPT_CONNECTION); - nmc_string_to_arg_array (line, "", &arg_arr, &arg_num); + char *line = nmc_readline (PROMPT_CONNECTIONS); + nmc_string_to_arg_array (line, NULL, TRUE, &arg_arr, &arg_num); g_free (line); arg_ptr = arg_arr; } @@ -8702,11 +8846,6 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) } } - del_info = g_malloc0 (sizeof (DeleteStateInfo)); - del_info->nmc = nmc; - del_info->counter = 0; - del_info_free = TRUE; - while (arg_num > 0) { const char *selector = NULL; @@ -8722,43 +8861,50 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) } connection = nmc_find_connection (nmc->connections, selector, *arg_ptr, &pos); - if (!connection) { - if (nmc->print_output != NMC_PRINT_TERSE) - g_print (_("Error: unknown connection: %s\n"), *arg_ptr); - + if (connection) { + /* Check if the connection is unique. */ + /* Calling delete for the same connection repeatedly would result in + * NM responding for the last D-Bus call only and we would stall. */ + if (!g_slist_find (queue, connection)) + queue = g_slist_prepend (queue, g_object_ref (connection)); + } else { + g_printerr (_("Error: unknown connection '%s'\n"), *arg_ptr); + g_string_printf (nmc->return_text, _("Error: not all active connections found.")); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; if (!invalid_cons) invalid_cons = g_string_new (NULL); g_string_append_printf (invalid_cons, "'%s', ", *arg_ptr); + } - /* take the next argument and continue */ + /* Take next argument (if there's no other connection of the same name) */ + if (!pos) next_arg (&arg_num, &arg_ptr); - continue; - } + } - /* We need to wait a bit so that nmcli's permissions can be checked. - * We will exit when D-Bus return (error) messages are received. - */ - nmc->should_wait = TRUE; + if (!queue) { + g_string_printf (nmc->return_text, _("Error: no connection provided.")); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + goto finish; + } + queue = g_slist_reverse (queue); - /* del_info deallocation is handled in delete_cb() */ - del_info_free = FALSE; + info = g_slice_new0 (ConnectionCbInfo); + info->nmc = nmc; + info->queue = queue; + info->timeout_id = g_timeout_add_seconds (nmc->timeout, connection_op_timeout_cb, info); - del_info->counter++; + nmc->nowait_flag = (nmc->timeout == 0); + nmc->should_wait = TRUE; - /* Delete the connection */ - nm_remote_connection_delete_async (NM_REMOTE_CONNECTION (connection), - NULL, delete_cb, del_info); + g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_REMOVED, + G_CALLBACK (connection_removed_cb), info); - /* Take next argument (if there's no other connection of the same name) */ - if (!pos) - next_arg (&arg_num, &arg_ptr); - } + /* Now delete the connections */ + for (iter = queue; iter; iter = g_slist_next (iter)) + nm_remote_connection_delete_async (NM_REMOTE_CONNECTION (iter->data), + NULL, delete_cb, info); finish: - if (del_info_free) - g_free (del_info); - g_strfreev (arg_arr); - if (invalid_cons) { g_string_truncate (invalid_cons, invalid_cons->len-2); /* truncate trailing ", " */ g_string_printf (nmc->return_text, _("Error: cannot delete unknown connection(s): %s."), @@ -8766,6 +8912,7 @@ finish: nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; g_string_free (invalid_cons, TRUE); } + g_strfreev (arg_arr); return nmc->return_value; } @@ -8881,7 +9028,7 @@ gen_func_connection_names (const char *text, int state) for (i = 0; i < nm_cli.connections->len; i++) { NMConnection *con = NM_CONNECTION (nm_cli.connections->pdata[i]); const char *id = nm_connection_get_id (con); - connections[i++] = id; + connections[i] = id; } connections[i] = NULL; @@ -8900,14 +9047,17 @@ nmcli_con_tab_completion (const char *text, int start, int end) /* Disable readline's default filename completion */ rl_attempted_completion_over = 1; - /* Disable appending space after completion */ - rl_completion_append_character = '\0'; + if (g_strcmp0 (rl_prompt, PROMPT_CONNECTION) == 0) { + /* Disable appending space after completion */ + rl_completion_append_character = '\0'; - if (!is_single_word (rl_line_buffer)) - return NULL; + if (!is_single_word (rl_line_buffer)) + return NULL; - if (g_strcmp0 (rl_prompt, PROMPT_CONNECTION) == 0) generator_func = gen_func_connection_names; + } else if (g_strcmp0 (rl_prompt, PROMPT_CONNECTIONS) == 0) { + generator_func = gen_func_connection_names; + } if (generator_func) match_array = rl_completion_matches (text, generator_func); diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 1633f0ce..979c5906 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -35,7 +35,8 @@ #include "devices.h" /* define some prompts */ -#define PROMPT_INTERFACE _("Interface: ") +#define PROMPT_INTERFACE _("Interface: ") +#define PROMPT_INTERFACES _("Interface(s): ") /* Available fields for 'device status' */ static NmcOutputField nmc_fields_dev_status[] = { @@ -270,8 +271,8 @@ usage (void) " status\n\n" " show []\n\n" " connect \n\n" - " disconnect \n\n" - " delete \n\n" + " disconnect ...\n\n" + " delete ...\n\n" " wifi [list [ifname ] [bssid ]]\n\n" " wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] [ifname ]\n" " [bssid ] [name ] [private yes|no]\n\n" @@ -325,9 +326,9 @@ usage_device_disconnect (void) { g_printerr (_("Usage: nmcli device disconnect { ARGUMENTS | help }\n" "\n" - "ARGUMENTS := \n" + "ARGUMENTS := ...\n" "\n" - "Disconnect the device.\n" + "Disconnect devices.\n" "The command disconnects the device and prevents it from auto-activating\n" "further connections without user/manual intervention.\n\n")); } @@ -337,10 +338,10 @@ usage_device_delete (void) { g_printerr (_("Usage: nmcli device delete { ARGUMENTS | help }\n" "\n" - "ARGUMENTS := \n" + "ARGUMENTS := ...\n" "\n" - "Deletes the software device.\n" - "The command removes the interface. It only works for software devices\n" + "Delete the software devices.\n" + "The command removes the interfaces. It only works for software devices\n" "(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n" "command.\n\n")); } @@ -1638,28 +1639,85 @@ error: return nmc->return_value; } +typedef struct { + NmCli *nmc; + GSList *queue; + guint timeout_id; + gboolean cmd_disconnect; +} DeviceCbInfo; + +static void device_cb_info_finish (DeviceCbInfo *info, NMDevice *device); + +static gboolean +device_op_timeout_cb (gpointer user_data) +{ + DeviceCbInfo *info = user_data; + + timeout_cb (info->nmc); + device_cb_info_finish (info, NULL); + return G_SOURCE_REMOVE; +} + static void -disconnect_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) +device_removed_cb (NMClient *client, NMDevice *device, DeviceCbInfo *info) { - NMDeviceState state; + /* Success: device has been removed. + * It can also happen when disconnecting a software device. + */ + if (!g_slist_find (info->queue, device)) + return; - state = nm_device_get_state (device); + if (info->cmd_disconnect) + g_print (_("Device '%s' successfully disconnected.\n"), + nm_device_get_iface (device)); + else + g_print (_("Device '%s' successfully removed.\n"), + nm_device_get_iface (device)); + device_cb_info_finish (info, device); +} - if (state <= NM_DEVICE_STATE_DISCONNECTED) { - g_signal_handlers_disconnect_by_data (device, user_data); +static void +disconnect_state_cb (NMDevice *device, GParamSpec *pspec, DeviceCbInfo *info) +{ + if (!g_slist_find (info->queue, device)) + return; + + if (nm_device_get_state (device) <= NM_DEVICE_STATE_DISCONNECTED) { g_print (_("Device '%s' successfully disconnected.\n"), nm_device_get_iface (device)); - quit (); + device_cb_info_finish (info, device); } } static void -device_removed_cb (NMClient *client, NMDevice *device, gpointer user_data) +destroy_queue_element (gpointer data) { - /* Success: device has been removed. It happens when disconnecting a software device. */ - g_signal_handlers_disconnect_by_data (client, user_data); - g_print (_("Device '%s' successfully disconnected.\n"), - nm_device_get_iface (device)); + g_signal_handlers_disconnect_matched (data, G_SIGNAL_MATCH_FUNC, 0, 0, 0, + disconnect_state_cb, NULL); + g_object_unref (data); +} + +static void +device_cb_info_finish (DeviceCbInfo *info, NMDevice *device) +{ + if (device) { + GSList *elem = g_slist_find (info->queue, device); + if (!elem) + return; + info->queue = g_slist_delete_link (info->queue, elem); + destroy_queue_element (device); + } else { + g_slist_free_full (info->queue, destroy_queue_element); + info->queue = NULL; + } + + if (info->queue) + return; + + if (info->timeout_id) + g_source_remove (info->timeout_id); + g_signal_handlers_disconnect_by_func (info->nmc->client, device_removed_cb, info); + g_slice_free (DeviceCbInfo, info); quit (); } @@ -1667,18 +1725,20 @@ static void disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) { NMDevice *device = NM_DEVICE (object); - NmCli *nmc = (NmCli *) user_data; + DeviceCbInfo *info = (DeviceCbInfo *) user_data; + NmCli *nmc = info->nmc; NMDeviceState state; GError *error = NULL; if (!nm_device_disconnect_finish (device, result, &error)) { - g_string_printf (nmc->return_text, _("Error: Device '%s' (%s) disconnecting failed: %s"), - nm_device_get_iface (device), - nm_object_get_path (NM_OBJECT (device)), - error->message); + g_string_printf (nmc->return_text, _("Error: not all devices disconnected.")); + g_printerr (_("Error: Device '%s' (%s) disconnecting failed: %s\n"), + nm_device_get_iface (device), + nm_object_get_path (NM_OBJECT (device)), + error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_DEV_DISCONNECT; - quit (); + device_cb_info_finish (info, device); } else { state = nm_device_get_state (device); @@ -1687,16 +1747,11 @@ disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) if (state <= NM_DEVICE_STATE_DISCONNECTED) { if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); - g_print (_("Device '%s' has been disconnected.\n"), nm_device_get_iface (device)); + g_print (_("Device '%s' successfully disconnected.\n"), + nm_device_get_iface (device)); } - quit (); - } else { - g_signal_connect (device, "notify::state", G_CALLBACK (disconnect_state_cb), nmc); - g_signal_connect (nmc->client, NM_CLIENT_DEVICE_REMOVED, G_CALLBACK (device_removed_cb), nmc); - /* Start timer not to loop forever if "notify::state" signal is not issued */ - g_timeout_add_seconds (nmc->timeout, timeout_cb, nmc); + device_cb_info_finish (info, device); } - } } @@ -1704,9 +1759,12 @@ static NMCResultCode do_device_disconnect (NmCli *nmc, int argc, char **argv) { NMDevice **devices; - NMDevice *device = NULL; - const char *ifname = NULL; - char *ifname_ask = NULL; + NMDevice *device; + DeviceCbInfo *info = NULL; + GSList *queue = NULL, *iter; + char **arg_arr = NULL; + char **arg_ptr = argv; + int arg_num = argc; int i; /* Set default timeout for disconnect operation. */ @@ -1714,59 +1772,78 @@ do_device_disconnect (NmCli *nmc, int argc, char **argv) nmc->timeout = 10; if (argc == 0) { - if (nmc->ask) - ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE); - - if (!ifname_ask) { + if (nmc->ask) { + char *line = nmc_readline (PROMPT_INTERFACES); + nmc_string_to_arg_array (line, NULL, FALSE, &arg_arr, &arg_num); + g_free (line); + arg_ptr = arg_arr; + } + if (arg_num == 0) { g_string_printf (nmc->return_text, _("Error: No interface specified.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - } else { - ifname = *argv; - } - - if (!ifname) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - if (next_arg (&argc, &argv) == 0) { - g_string_printf (nmc->return_text, _("Error: extra argument not allowed: '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; } devices = get_devices_sorted (nmc->client); - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); + while (arg_num > 0) { + device = NULL; + for (i = 0; devices[i]; i++) { + if (!g_strcmp0 (nm_device_get_iface (devices[i]), *arg_ptr)) { + device = devices[i]; + break; + } + } - if (!g_strcmp0 (dev_iface, ifname)) - device = candidate; + if (device) { + if (!g_slist_find (queue, device)) + queue = g_slist_prepend (queue, device); + else + g_printerr (_("Warning: argument '%s' is duplicated.\n"), *arg_ptr); + } else { + g_printerr (_("Error: Device '%s' not found.\n"), *arg_ptr); + g_string_printf (nmc->return_text, _("Error: not all devices found.")); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + } + + /* Take next argument */ + next_arg (&arg_num, &arg_ptr); } g_free (devices); - if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + if (!queue) { + g_string_printf (nmc->return_text, _("Error: no valid device provided.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } + queue = g_slist_reverse (queue); + + info = g_slice_new0 (DeviceCbInfo); + info->nmc = nmc; + info->cmd_disconnect = TRUE; + if (nmc->timeout > 0) + info->timeout_id = g_timeout_add_seconds (nmc->timeout, device_op_timeout_cb, info); + + g_signal_connect (nmc->client, NM_CLIENT_DEVICE_REMOVED, + G_CALLBACK (device_removed_cb), info); - /* - * Use nowait_flag instead of should_wait, because exiting has to be postponed - * till disconnect_device_cb() is called, giving NM time to check our permissions. - */ nmc->nowait_flag = (nmc->timeout == 0); nmc->should_wait = TRUE; - nm_device_disconnect_async (device, NULL, disconnect_device_cb, nmc); - /* Start progress indication */ - if (nmc->print_output == NMC_PRINT_PRETTY) - progress_id = g_timeout_add (120, progress_cb, device); + for (iter = queue; iter; iter = g_slist_next (iter)) { + device = iter->data; + + info->queue = g_slist_prepend (info->queue, g_object_ref (device)); + g_signal_connect (device, "notify::" NM_DEVICE_STATE, + G_CALLBACK (disconnect_state_cb), info); + + /* Now disconnect the device */ + nm_device_disconnect_async (device, NULL, disconnect_device_cb, info); + } error: + g_strfreev (arg_arr); + g_slist_free (queue); return nmc->return_value; } @@ -1774,27 +1851,35 @@ static void delete_device_cb (GObject *object, GAsyncResult *result, gpointer user_data) { NMDevice *device = NM_DEVICE (object); - NmCli *nmc = (NmCli *) user_data; + DeviceCbInfo *info = (DeviceCbInfo *) user_data; + NmCli *nmc = info->nmc; GError *error = NULL; if (!nm_device_delete_finish (device, result, &error)) { - g_string_printf (nmc->return_text, _("Error: Device '%s' (%s) deletion failed: %s"), - nm_device_get_iface (device), - nm_object_get_path (NM_OBJECT (device)), - error->message); + g_string_printf (nmc->return_text, _("Error: not all devices deleted.")); + g_printerr (_("Error: Device '%s' (%s) deletion failed: %s\n"), + nm_device_get_iface (device), + nm_object_get_path (NM_OBJECT (device)), + error->message); g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; + device_cb_info_finish (info, device); + } else { + if (nmc->nowait_flag) + device_cb_info_finish (info, device); } - quit (); } static NMCResultCode do_device_delete (NmCli *nmc, int argc, char **argv) { NMDevice **devices; - NMDevice *device = NULL; - const char *ifname = NULL; - char *ifname_ask = NULL; + NMDevice *device; + DeviceCbInfo *info = NULL; + GSList *queue = NULL, *iter; + char **arg_arr = NULL; + char **arg_ptr = argv; + int arg_num = argc; int i; /* Set default timeout for delete operation. */ @@ -1802,64 +1887,82 @@ do_device_delete (NmCli *nmc, int argc, char **argv) nmc->timeout = 10; if (argc == 0) { - if (nmc->ask) - ifname = ifname_ask = nmc_readline (PROMPT_INTERFACE); - - if (!ifname_ask) { + if (nmc->ask) { + char *line = nmc_readline (PROMPT_INTERFACES); + nmc_string_to_arg_array (line, NULL, FALSE, &arg_arr, &arg_num); + g_free (line); + arg_ptr = arg_arr; + } + if (arg_num == 0) { g_string_printf (nmc->return_text, _("Error: No interface specified.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto error; } - } else - ifname = *argv; - - if (!ifname) { - g_string_printf (nmc->return_text, _("Error: No interface specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } - - if (next_arg (&argc, &argv) == 0) { - g_string_printf (nmc->return_text, _("Error: extra argument not allowed: '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; } devices = get_devices_sorted (nmc->client); - for (i = 0; devices[i]; i++) { - NMDevice *candidate = devices[i]; - const char *dev_iface = nm_device_get_iface (candidate); + while (arg_num > 0) { + device = NULL; + for (i = 0; devices[i]; i++) { + if (!g_strcmp0 (nm_device_get_iface (devices[i]), *arg_ptr)) { + device = devices[i]; + break; + } + } - if (!g_strcmp0 (dev_iface, ifname)) - device = candidate; + if (device) { + if (!g_slist_find (queue, device)) { + if (nm_device_is_software (device)) + queue = g_slist_prepend (queue, device); + else { + g_printerr (_("Error: Device '%s' is a hardware device. It can't be deleted.\n"), + *arg_ptr); + g_string_printf (nmc->return_text, _("Error: not all devices valid.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + } + } else + g_printerr (_("Warning: argument '%s' is duplicated.\n"), *arg_ptr); + } else { + g_printerr (_("Error: Device '%s' not found.\n"), *arg_ptr); + g_string_printf (nmc->return_text, _("Error: not all devices found.")); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + } + + /* Take next argument */ + next_arg (&arg_num, &arg_ptr); } g_free (devices); - if (!device) { - g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); + if (!queue) { + g_string_printf (nmc->return_text, _("Error: no valid device provided.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto error; } + queue = g_slist_reverse (queue); - if (!nm_device_is_software (device)) { - g_string_printf (nmc->return_text, _("Error: Device '%s' is a hardware device. It can't be deleted."), ifname); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; - } + info = g_slice_new0 (DeviceCbInfo); + info->nmc = nmc; + if (nmc->timeout > 0) + info->timeout_id = g_timeout_add_seconds (nmc->timeout, device_op_timeout_cb, info); + + g_signal_connect (nmc->client, NM_CLIENT_DEVICE_REMOVED, + G_CALLBACK (device_removed_cb), info); - /* - * Use nowait_flag instead of should_wait, because exiting has to be postponed - * till delete_device_cb() is called, giving NM time to check our permissions. - */ nmc->nowait_flag = (nmc->timeout == 0); nmc->should_wait = TRUE; - nm_device_delete_async (device, NULL, delete_device_cb, nmc); - /* Start progress indication */ - if (nmc->print_output == NMC_PRINT_PRETTY) - progress_id = g_timeout_add (120, progress_cb, device); + for (iter = queue; iter; iter = g_slist_next (iter)) { + device = iter->data; + + info->queue = g_slist_prepend (info->queue, g_object_ref (device)); + + /* Now delete the device */ + nm_device_delete_async (device, NULL, delete_device_cb, info); + } error: + g_strfreev (arg_arr); + g_slist_free (queue); return nmc->return_value; } @@ -2789,7 +2892,7 @@ extern NmCli nm_cli; static char * gen_func_ifnames (const char *text, int state) { - int i, j = 0; + int i; const GPtrArray *devices; const char **ifnames; char *ret; @@ -2803,9 +2906,9 @@ gen_func_ifnames (const char *text, int state) for (i = 0; i < devices->len; i++) { NMDevice *dev = g_ptr_array_index (devices, i); const char *ifname = nm_device_get_iface (dev); - ifnames[j++] = ifname; + ifnames[i] = ifname; } - ifnames[j] = NULL; + ifnames[i] = NULL; ret = nmc_rl_gen_func_basic (text, state, ifnames); @@ -2822,14 +2925,17 @@ nmcli_device_tab_completion (const char *text, int start, int end) /* Disable readline's default filename completion */ rl_attempted_completion_over = 1; - /* Disable appending space after completion */ - rl_completion_append_character = '\0'; + if (g_strcmp0 (rl_prompt, PROMPT_INTERFACE) == 0) { + /* Disable appending space after completion */ + rl_completion_append_character = '\0'; - if (!is_single_word (rl_line_buffer)) - return NULL; + if (!is_single_word (rl_line_buffer)) + return NULL; - if (g_strcmp0 (rl_prompt, PROMPT_INTERFACE) == 0) generator_func = gen_func_ifnames; + } else if (g_strcmp0 (rl_prompt, PROMPT_INTERFACES) == 0) { + generator_func = gen_func_ifnames; + } if (generator_func) match_array = rl_completion_matches (text, generator_func); diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index dce20d13..38d7e585 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -1218,10 +1218,14 @@ _nmcli() fi ;; sh|sho|show| \ - c|co|con|conn|conne|connec|connect| \ + c|co|con|conn|conne|connec|connect) + if [[ ${#words[@]} -eq 3 ]]; then + _nmcli_compl_COMMAND_nl "${words[2]}" "$(_nmcli_dev_status DEVICE)" + fi + ;; d|di|dis|disc|disco|discon|disconn|disconne|disconnec|disconnect| \ de|del|dele|delet|delete) - if [[ ${#words[@]} -eq 3 ]]; then + if [[ ${#words[@]} -ge 3 ]]; then _nmcli_compl_COMMAND_nl "${words[2]}" "$(_nmcli_dev_status DEVICE)" fi ;; diff --git a/clients/cli/settings-docs.c b/clients/cli/settings-docs.c index 1edfddb5..2ed41cb8 100644 --- a/clients/cli/settings-docs.c +++ b/clients/cli/settings-docs.c @@ -83,7 +83,7 @@ NmcPropertyDesc setting_802_1x[] = { { "private-key-password", "The password used to decrypt the private key specified in the \"private-key\" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key." }, { "private-key-password-flags", "Flags indicating how to handle the \"private-key-password\" property." }, { "subject-match", "Substring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed." }, - { "system-ca-certs", "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the \"ca-cert\" and \"phase2-ca-cert\" properties." }, + { "system-ca-certs", "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the \"ca-cert\" and \"phase2-ca-cert\" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides \"ca-cert\" and \"phase2-ca-cert\" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant)." }, }; NmcPropertyDesc setting_802_3_ethernet[] = { @@ -152,6 +152,7 @@ NmcPropertyDesc setting_cdma[] = { NmcPropertyDesc setting_connection[] = { { "autoconnect", "Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection." }, { "autoconnect-priority", "The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority." }, + { "autoconnect-slaves", "Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0." }, { "gateway-ping-timeout", "If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping." }, { "id", "A human readable unique identifier for the connection, like \"Work Wi-Fi\" or \"T-Mobile 3G\"." }, { "interface-name", "The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface." }, @@ -239,7 +240,7 @@ NmcPropertyDesc setting_ipv6[] = { { "gateway", "The gateway associated with this configuration. This is only meaningful if \"addresses\" is also set." }, { "ignore-auto-dns", "When \"method\" is set to \"auto\" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the \"dns\" and \"dns-search\" properties, if any, are used." }, { "ignore-auto-routes", "When \"method\" is set to \"auto\" and this property to TRUE, automatically configured routes are ignored and only routes specified in the \"routes\" property, if any, are used." }, - { "ip6-privacy", "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)." }, + { "ip6-privacy", "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: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to \"-1\" (unknown) means fallback to global configuration \"ipv6.ip6-privacy\". If also global configuration is unspecified or set to \"-1\", fallback to read \"/proc/sys/net/ipv6/conf/default/use_tempaddr\"." }, { "may-fail", "If TRUE, allow overall network configuration to proceed even if the configuration specified by this property 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 on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully." }, { "method", "IP configuration method. NMSettingIP4Config and NMSettingIP6Config both support \"auto\", \"manual\", and \"link-local\". See the subclass-specific documentation for other values. In general, for the \"auto\" method, properties such as \"dns\" and \"routes\" specify information that is added on to the information returned from automatic configuration. The \"ignore-auto-routes\" and \"ignore-auto-dns\" properties modify this behavior. For methods that imply no upstream network, such as \"shared\" or \"link-local\", these properties must be empty." }, { "name", "The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\"." }, @@ -341,7 +342,7 @@ NmcSettingDesc all_settings[] = { { "bridge", setting_bridge, 8 }, { "bridge-port", setting_bridge_port, 4 }, { "cdma", setting_cdma, 5 }, - { "connection", setting_connection, 15 }, + { "connection", setting_connection, 16 }, { "dcb", setting_dcb, 16 }, { "generic", setting_generic, 1 }, { "gsm", setting_gsm, 10 }, diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 09916954..66e6f622 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -29,10 +29,16 @@ #include "common.h" #include "settings.h" #include "nm-glib-compat.h" +#include "nm-macros-internal.h" /* Forward declarations */ static char *wep_key_type_to_string (NMWepKeyType type); +typedef enum { + NMC_PROPERTY_GET_PRETTY, + NMC_PROPERTY_GET_PARSABLE, +} NmcPropertyGetType; + /* Helper macro to define fields */ #define SETTING_FIELD(setting, width) { setting, N_(setting), width, NULL, FALSE, FALSE, 0 } @@ -51,8 +57,9 @@ NmcOutputField nmc_fields_setting_connection[] = { SETTING_FIELD (NM_SETTING_CONNECTION_ZONE, 10), /* 10 */ SETTING_FIELD (NM_SETTING_CONNECTION_MASTER, 20), /* 11 */ SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE, 20), /* 12 */ - SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES, 40), /* 13 */ - SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, 30), /* 14 */ + SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, 13), /* 13 */ + SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES, 40), /* 14 */ + SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, 30), /* 15 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_CONNECTION_ALL "name"","\ @@ -68,6 +75,7 @@ NmcOutputField nmc_fields_setting_connection[] = { NM_SETTING_CONNECTION_ZONE","\ NM_SETTING_CONNECTION_MASTER","\ NM_SETTING_CONNECTION_SLAVE_TYPE","\ + NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES","\ NM_SETTING_CONNECTION_SECONDARIES","\ NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT #define NMC_FIELDS_SETTING_CONNECTION_COMMON NMC_FIELDS_SETTING_CONNECTION_ALL @@ -743,8 +751,11 @@ vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map) } static char * -ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy) +ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy, NmcPropertyGetType get_type) { + if (get_type == NMC_PROPERTY_GET_PARSABLE) + return g_strdup_printf ("%d", ip6_privacy); + switch (ip6_privacy) { case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: return g_strdup_printf (_("%d (disabled)"), ip6_privacy); @@ -758,15 +769,35 @@ ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy) } static char * -secret_flags_to_string (guint32 flags) +autoconnect_slaves_to_string (NMSettingConnectionAutoconnectSlaves autoconnect_slaves, NmcPropertyGetType get_type) +{ + if (get_type == NMC_PROPERTY_GET_PARSABLE) + return g_strdup_printf ("%d", (int) autoconnect_slaves); + + switch (autoconnect_slaves) { + case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO: + return g_strdup_printf (_("%d (no)"), autoconnect_slaves); + case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES: + return g_strdup_printf (_("%d (yes)"), autoconnect_slaves); + case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT: + default: + return g_strdup_printf (_("%d (default)"), autoconnect_slaves); + } +} + +static char * +secret_flags_to_string (guint32 flags, NmcPropertyGetType get_type) { GString *flag_str; + if (get_type == NMC_PROPERTY_GET_PARSABLE) + return g_strdup_printf ("%u", flags); + if (flags == 0) return g_strdup (_("0 (none)")); flag_str = g_string_new (NULL); - g_string_printf (flag_str, "%d (", flags); + g_string_printf (flag_str, "%u (", flags); if (flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED) g_string_append (flag_str, _("agent-owned, ")); @@ -800,7 +831,7 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) /* === property get functions === */ #define DEFINE_GETTER(func_name, property_name) \ static char * \ - func_name (NMSetting *setting) \ + func_name (NMSetting *setting, NmcPropertyGetType get_type) \ { \ char *s; \ GValue val = G_VALUE_INIT; \ @@ -813,7 +844,7 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) #define DEFINE_SECRET_FLAGS_GETTER(func_name, property_name) \ static char * \ - func_name (NMSetting *setting) \ + func_name (NMSetting *setting, NmcPropertyGetType get_type) \ { \ guint v; \ GValue val = G_VALUE_INIT; \ @@ -821,7 +852,7 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) g_object_get_property (G_OBJECT (setting), property_name, &val); \ v = g_value_get_uint (&val); \ g_value_unset (&val); \ - return secret_flags_to_string (v); \ + return secret_flags_to_string (v, get_type); \ } /* --- NM_SETTING_802_1X_SETTING_NAME property get functions --- */ @@ -852,7 +883,7 @@ DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_pin_flags, NM_SETTING_802_1X DEFINE_GETTER (nmc_property_802_1X_get_system_ca_certs, NM_SETTING_802_1X_SYSTEM_CA_CERTS) static char * -nmc_property_802_1X_get_ca_cert (NMSetting *setting) +nmc_property_802_1X_get_ca_cert (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); NMSetting8021xCKScheme scheme; @@ -868,7 +899,7 @@ nmc_property_802_1X_get_ca_cert (NMSetting *setting) } static char * -nmc_property_802_1X_get_client_cert (NMSetting *setting) +nmc_property_802_1X_get_client_cert (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); NMSetting8021xCKScheme scheme; @@ -884,7 +915,7 @@ nmc_property_802_1X_get_client_cert (NMSetting *setting) } static char * -nmc_property_802_1X_get_phase2_ca_cert (NMSetting *setting) +nmc_property_802_1X_get_phase2_ca_cert (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); NMSetting8021xCKScheme scheme; @@ -900,7 +931,7 @@ nmc_property_802_1X_get_phase2_ca_cert (NMSetting *setting) } static char * -nmc_property_802_1X_get_phase2_client_cert (NMSetting *setting) +nmc_property_802_1X_get_phase2_client_cert (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); NMSetting8021xCKScheme scheme; @@ -916,14 +947,14 @@ nmc_property_802_1X_get_phase2_client_cert (NMSetting *setting) } static char * -nmc_property_802_1X_get_password_raw (NMSetting *setting) +nmc_property_802_1X_get_password_raw (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); return bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X)); } static char * -nmc_property_802_1X_get_private_key (NMSetting *setting) +nmc_property_802_1X_get_private_key (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); NMSetting8021xCKScheme scheme; @@ -939,7 +970,7 @@ nmc_property_802_1X_get_private_key (NMSetting *setting) } static char * -nmc_property_802_1X_get_phase2_private_key (NMSetting *setting) +nmc_property_802_1X_get_phase2_private_key (NMSetting *setting, NmcPropertyGetType get_type) { NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting); NMSetting8021xCKScheme scheme; @@ -968,7 +999,7 @@ DEFINE_GETTER (nmc_property_bluetooth_get_bdaddr, NM_SETTING_BLUETOOTH_BDADDR) DEFINE_GETTER (nmc_property_bluetooth_get_type, NM_SETTING_BLUETOOTH_TYPE) static char * -nmc_property_bond_get_options (NMSetting *setting) +nmc_property_bond_get_options (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingBond *s_bond = NM_SETTING_BOND (setting); GString *bond_options_s; @@ -1024,7 +1055,7 @@ DEFINE_GETTER (nmc_property_connection_get_timestamp, NM_SETTING_CONNECTION_TIME DEFINE_GETTER (nmc_property_connection_get_read_only, NM_SETTING_CONNECTION_READ_ONLY) static char * -nmc_property_connection_get_permissions (NMSetting *setting) +nmc_property_connection_get_permissions (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting); GString *perm = NULL; @@ -1046,6 +1077,14 @@ nmc_property_connection_get_permissions (NMSetting *setting) DEFINE_GETTER (nmc_property_connection_get_zone, NM_SETTING_CONNECTION_ZONE) DEFINE_GETTER (nmc_property_connection_get_master, NM_SETTING_CONNECTION_MASTER) DEFINE_GETTER (nmc_property_connection_get_slave_type, NM_SETTING_CONNECTION_SLAVE_TYPE) + +static char * +nmc_property_connection_get_autoconnect_slaves (NMSetting *setting, NmcPropertyGetType get_type) +{ + NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting); + return autoconnect_slaves_to_string (nm_setting_connection_get_autoconnect_slaves (s_con), get_type); +} + DEFINE_GETTER (nmc_property_connection_get_secondaries, NM_SETTING_CONNECTION_SECONDARIES) DEFINE_GETTER (nmc_property_connection_get_gateway_ping_timeout, NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT) @@ -1080,7 +1119,7 @@ dcb_flags_to_string (NMSettingDcbFlags flags) #define DEFINE_DCB_FLAGS_GETTER(func_name, property_name) \ static char * \ - func_name (NMSetting *setting) \ + func_name (NMSetting *setting, NmcPropertyGetType get_type) \ { \ guint v; \ GValue val = G_VALUE_INIT; \ @@ -1099,7 +1138,7 @@ dcb_app_priority_to_string (gint priority) #define DEFINE_DCB_APP_PRIORITY_GETTER(func_name, property_name) \ static char * \ - func_name (NMSetting *setting) \ + func_name (NMSetting *setting, NmcPropertyGetType get_type) \ { \ int v; \ GValue val = G_VALUE_INIT; \ @@ -1112,7 +1151,7 @@ dcb_app_priority_to_string (gint priority) #define DEFINE_DCB_BOOL_GETTER(func_name, getter_func_name) \ static char * \ - func_name (NMSetting *setting) \ + func_name (NMSetting *setting, NmcPropertyGetType get_type) \ { \ NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \ GString *str; \ @@ -1134,7 +1173,7 @@ dcb_app_priority_to_string (gint priority) #define DEFINE_DCB_UINT_GETTER(func_name, getter_func_name) \ static char * \ - func_name (NMSetting *setting) \ + func_name (NMSetting *setting, NmcPropertyGetType get_type) \ { \ NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \ GString *str; \ @@ -1184,7 +1223,7 @@ DEFINE_GETTER (nmc_property_ib_get_mac_address, NM_SETTING_INFINIBAND_MAC_ADDRES DEFINE_GETTER (nmc_property_ib_get_transport_mode, NM_SETTING_INFINIBAND_TRANSPORT_MODE) static char * -nmc_property_ib_get_mtu (NMSetting *setting) +nmc_property_ib_get_mtu (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting); int mtu; @@ -1197,7 +1236,7 @@ nmc_property_ib_get_mtu (NMSetting *setting) } static char * -nmc_property_ib_get_p_key (NMSetting *setting) +nmc_property_ib_get_p_key (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting); int p_key; @@ -1217,7 +1256,7 @@ DEFINE_GETTER (nmc_property_ipv4_get_dns, NM_SETTING_IP_CONFIG_DNS) DEFINE_GETTER (nmc_property_ipv4_get_dns_search, NM_SETTING_IP_CONFIG_DNS_SEARCH) static char * -nmc_property_ip_get_addresses (NMSetting *setting) +nmc_property_ip_get_addresses (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting); GString *printable; @@ -1242,42 +1281,62 @@ nmc_property_ip_get_addresses (NMSetting *setting) } static char * -nmc_property_ipv4_get_routes (NMSetting *setting) +nmc_property_ipvx_get_routes (NMSetting *setting, NmcPropertyGetType get_type) { - NMSettingIPConfig *s_ip4 = NM_SETTING_IP_CONFIG (setting); + NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting); GString *printable; guint32 num_routes, i; NMIPRoute *route; printable = g_string_new (NULL); - num_routes = nm_setting_ip_config_get_num_routes (s_ip4); + num_routes = nm_setting_ip_config_get_num_routes (s_ip); for (i = 0; i < num_routes; i++) { - route = nm_setting_ip_config_get_route (s_ip4, i); + route = nm_setting_ip_config_get_route (s_ip, i); - if (printable->len > 0) - g_string_append (printable, "; "); + if (get_type == NMC_PROPERTY_GET_PARSABLE) { + if (printable->len > 0) + g_string_append (printable, ", "); - g_string_append (printable, "{ "); + g_string_append_printf (printable, "%s/%u", + nm_ip_route_get_dest (route), + nm_ip_route_get_prefix (route)); - g_string_append_printf (printable, "ip = %s/%u", - nm_ip_route_get_dest (route), - nm_ip_route_get_prefix (route)); + if (nm_ip_route_get_next_hop (route)) + g_string_append_printf (printable, " %s", nm_ip_route_get_next_hop (route)); + if (nm_ip_route_get_metric (route) != -1) + g_string_append_printf (printable, " %u", (guint32) nm_ip_route_get_metric (route)); + } else { + if (printable->len > 0) + g_string_append (printable, "; "); - if (nm_ip_route_get_next_hop (route)) { - g_string_append_printf (printable, ", nh = %s", - nm_ip_route_get_next_hop (route)); - } + g_string_append (printable, "{ "); - if (nm_ip_route_get_metric (route) != -1) - g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route)); + g_string_append_printf (printable, "ip = %s/%u", + nm_ip_route_get_dest (route), + nm_ip_route_get_prefix (route)); - g_string_append (printable, " }"); + if (nm_ip_route_get_next_hop (route)) { + g_string_append_printf (printable, ", nh = %s", + nm_ip_route_get_next_hop (route)); + } + + if (nm_ip_route_get_metric (route) != -1) + g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route)); + + g_string_append (printable, " }"); + } } return g_string_free (printable, FALSE); } +static char * +nmc_property_ipv4_get_routes (NMSetting *setting, NmcPropertyGetType get_type) +{ + return nmc_property_ipvx_get_routes (setting, get_type); +} + DEFINE_GETTER (nmc_property_ipv4_get_gateway, NM_SETTING_IP_CONFIG_GATEWAY) DEFINE_GETTER (nmc_property_ipv4_get_route_metric, NM_SETTING_IP_CONFIG_ROUTE_METRIC) DEFINE_GETTER (nmc_property_ipv4_get_ignore_auto_routes, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES) @@ -1294,40 +1353,9 @@ DEFINE_GETTER (nmc_property_ipv6_get_dns, NM_SETTING_IP_CONFIG_DNS) DEFINE_GETTER (nmc_property_ipv6_get_dns_search, NM_SETTING_IP_CONFIG_DNS_SEARCH) static char * -nmc_property_ipv6_get_routes (NMSetting *setting) +nmc_property_ipv6_get_routes (NMSetting *setting, NmcPropertyGetType get_type) { - NMSettingIPConfig *s_ip6 = NM_SETTING_IP_CONFIG (setting); - GString *printable; - guint32 num_routes, i; - NMIPRoute *route; - - printable = g_string_new (NULL); - - num_routes = nm_setting_ip_config_get_num_routes (s_ip6); - for (i = 0; i < num_routes; i++) { - route = nm_setting_ip_config_get_route (s_ip6, i); - - if (printable->len > 0) - g_string_append (printable, "; "); - - g_string_append (printable, "{ "); - - g_string_append_printf (printable, "ip = %s/%u", - nm_ip_route_get_dest (route), - nm_ip_route_get_prefix (route)); - - if (nm_ip_route_get_next_hop (route)) { - g_string_append_printf (printable, ", nh = %s", - nm_ip_route_get_next_hop (route)); - } - - if (nm_ip_route_get_metric (route) != -1) - g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route)); - - g_string_append (printable, " }"); - } - - return g_string_free (printable, FALSE); + return nmc_property_ipvx_get_routes (setting, get_type); } DEFINE_GETTER (nmc_property_ipv6_get_gateway, NM_SETTING_IP_CONFIG_GATEWAY) @@ -1340,10 +1368,10 @@ DEFINE_GETTER (nmc_property_ipv6_get_dhcp_send_hostname, NM_SETTING_IP_CONFIG_DH DEFINE_GETTER (nmc_property_ipv6_get_dhcp_hostname, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME) static char * -nmc_property_ipv6_get_ip6_privacy (NMSetting *setting) +nmc_property_ipv6_get_ip6_privacy (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting); - return ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6)); + return ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6), get_type); } /* --- NM_SETTING_OLPC_MESH_SETTING_NAME property get functions --- */ @@ -1351,7 +1379,7 @@ DEFINE_GETTER (nmc_property_olpc_get_channel, NM_SETTING_OLPC_MESH_CHANNEL) DEFINE_GETTER (nmc_property_olpc_get_anycast_address, NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS) static char * -nmc_property_olpc_get_ssid (NMSetting *setting) +nmc_property_olpc_get_ssid (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH (setting); GBytes *ssid; @@ -1404,21 +1432,21 @@ DEFINE_GETTER (nmc_property_vlan_get_id, NM_SETTING_VLAN_ID) static char * -nmc_property_vlan_get_flags (NMSetting *setting) +nmc_property_vlan_get_flags (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting); return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan)); } static char * -nmc_property_vlan_get_ingress_priority_map (NMSetting *setting) +nmc_property_vlan_get_ingress_priority_map (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting); return vlan_priorities_to_string (s_vlan, NM_VLAN_INGRESS_MAP); } static char * -nmc_property_vlan_get_egress_priority_map (NMSetting *setting) +nmc_property_vlan_get_egress_priority_map (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting); return vlan_priorities_to_string (s_vlan, NM_VLAN_EGRESS_MAP); @@ -1429,7 +1457,7 @@ DEFINE_GETTER (nmc_property_vpn_get_service_type, NM_SETTING_VPN_SERVICE_TYPE) DEFINE_GETTER (nmc_property_vpn_get_user_name, NM_SETTING_VPN_USER_NAME) static char * -nmc_property_vpn_get_data (NMSetting *setting) +nmc_property_vpn_get_data (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVpn *s_vpn = NM_SETTING_VPN (setting); GString *data_item_str; @@ -1441,7 +1469,7 @@ nmc_property_vpn_get_data (NMSetting *setting) } static char * -nmc_property_vpn_get_secrets (NMSetting *setting) +nmc_property_vpn_get_secrets (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVpn *s_vpn = NM_SETTING_VPN (setting); GString *secret_str; @@ -1471,7 +1499,7 @@ DEFINE_GETTER (nmc_property_wired_get_s390_nettype, NM_SETTING_WIRED_S390_NETTYP DEFINE_GETTER (nmc_property_wired_get_s390_options, NM_SETTING_WIRED_S390_OPTIONS) static char * -nmc_property_wired_get_mtu (NMSetting *setting) +nmc_property_wired_get_mtu (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWired *s_wired = NM_SETTING_WIRED (setting); int mtu; @@ -1497,7 +1525,7 @@ DEFINE_GETTER (nmc_property_wireless_get_seen_bssids, NM_SETTING_WIRELESS_SEEN_B DEFINE_GETTER (nmc_property_wireless_get_hidden, NM_SETTING_WIRELESS_HIDDEN) static char * -nmc_property_wireless_get_ssid (NMSetting *setting) +nmc_property_wireless_get_ssid (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting); GBytes *ssid; @@ -1513,7 +1541,7 @@ nmc_property_wireless_get_ssid (NMSetting *setting) } static char * -nmc_property_wireless_get_mtu (NMSetting *setting) +nmc_property_wireless_get_mtu (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting); int mtu; @@ -1540,35 +1568,35 @@ DEFINE_GETTER (nmc_property_wifi_sec_get_leap_password, NM_SETTING_WIRELESS_SECU DEFINE_SECRET_FLAGS_GETTER (nmc_property_wifi_sec_get_leap_password_flags, NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS) static char * -nmc_property_wifi_sec_get_wep_key0 (NMSetting *setting) +nmc_property_wifi_sec_get_wep_key0 (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting); return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 0)); } static char * -nmc_property_wifi_sec_get_wep_key1 (NMSetting *setting) +nmc_property_wifi_sec_get_wep_key1 (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting); return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 1)); } static char * -nmc_property_wifi_sec_get_wep_key2 (NMSetting *setting) +nmc_property_wifi_sec_get_wep_key2 (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting); return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 2)); } static char * -nmc_property_wifi_sec_get_wep_key3 (NMSetting *setting) +nmc_property_wifi_sec_get_wep_key3 (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting); return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 3)); } static char * -nmc_property_wifi_sec_get_wep_key_type (NMSetting *setting) +nmc_property_wifi_sec_get_wep_key_type (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting); return wep_key_type_to_string (nm_setting_wireless_security_get_wep_key_type (s_wireless_sec)); @@ -1601,20 +1629,23 @@ register_nmcli_value_transforms (void) /* Main hash table storing function pointer for manipulating properties */ static GHashTable *nmc_properties = NULL; -typedef char * (*NmcPropertyGetFunc) (NMSetting *); -typedef gboolean (*NmcPropertySetFunc) (NMSetting *, const char *, const char *, GError **); -typedef gboolean (*NmcPropertyRemoveFunc) (NMSetting *, const char *, const char *, guint32, GError **); -typedef const char * (*NmcPropertyDescribeFunc) (NMSetting *, const char *); -typedef const char * (*NmcPropertyValuesFunc) (NMSetting *, const char *); -typedef char * (*NmcPropertyOut2InFunc) (const char *); +typedef char * (*NmcPropertyGetFunc) (NMSetting *, NmcPropertyGetType); +typedef gboolean (*NmcPropertySetFunc) (NMSetting *, const char *, const char *, GError **); +typedef gboolean (*NmcPropertyRemoveFunc) (NMSetting *, const char *, const char *, guint32, GError **); +typedef const char * (*NmcPropertyDescribeFunc) (NMSetting *, const char *); +typedef const char ** (*NmcPropertyValuesFunc) (NMSetting *, const char *); typedef struct { - NmcPropertyGetFunc get_func; /* func getting property values */ - NmcPropertySetFunc set_func; /* func adding/setting property values */ - NmcPropertyRemoveFunc remove_func; /* func removing items from container options */ - NmcPropertyDescribeFunc describe_func; /* func returning property description */ - NmcPropertyValuesFunc values_func; /* func returning allowed property values */ - NmcPropertyOut2InFunc out2in_func; /* func converting property values from output to input format */ + /* The order of the fields is important as they correspond + * to the order as _nmc_add_prop_funcs() passes the arguments. */ +#define NmcPropertyFuncsFields \ + NmcPropertyGetFunc get_func; /* func getting property values */ \ + NmcPropertySetFunc set_func; /* func adding/setting property values */ \ + NmcPropertyRemoveFunc remove_func; /* func removing items from container options */ \ + NmcPropertyDescribeFunc describe_func; /* func returning property description */ \ + NmcPropertyValuesFunc values_func; /* func returning allowed property values */ \ + ; + NmcPropertyFuncsFields } NmcPropertyFuncs; /* @@ -2151,13 +2182,10 @@ check_and_set_string (NMSetting *setting, } #define DEFINE_ALLOWED_VAL_FUNC(def_func, valid_values) \ - static const char * \ + static const char ** \ def_func (NMSetting *setting, const char *prop) \ { \ - static char *values = NULL; \ - if (G_UNLIKELY (values == NULL)) \ - values = g_strjoinv (", ", (char **) valid_values); \ - return values; \ + return valid_values; \ } /* --- generic property setter functions --- */ @@ -2242,6 +2270,22 @@ nmc_property_set_bool (NMSetting *setting, const char *prop, const char *val, GE return TRUE; } +static gboolean +nmc_property_set_trilean (NMSetting *setting, const char *prop, const char *val, GError **error) +{ + long int val_int; + + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + if (!nmc_string_to_int (val, TRUE, -1, 1, &val_int)) { + g_set_error (error, 1, 0, _("'%s' is not a valid value; use -1, 0 or 1"), val); + return FALSE; + } + + g_object_set (setting, prop, val_int, NULL); + return TRUE; +} + static gboolean nmc_property_set_ssid (NMSetting *setting, const char *prop, const char *val, GError **error) { @@ -2412,17 +2456,6 @@ done: return TRUE; \ } -static char * -nmc_property_out2in_cut_paren (const char *out_format) -{ - const char *p; - size_t n; - - p = strstr (out_format, " ("); - n = p ? p - out_format : strlen (out_format); - return g_strndup (out_format, n); -} - /* --- NM_SETTING_CONNECTION_SETTING_NAME property setter functions --- */ #if 0 /* @@ -2672,13 +2705,12 @@ nmc_property_connection_describe_secondaries (NMSetting *setting, const char *pr static gboolean \ def_func (NMSetting *setting, const char *prop, const char *val, GError **error) \ { \ - const char *SCHEME_PATH = "file://"; \ char *val_strip = g_strstrip (g_strdup (val)); \ char *p = val_strip; \ gboolean success; \ \ - if (strncmp (val_strip, SCHEME_PATH, strlen (SCHEME_PATH)) == 0) \ - p += strlen (SCHEME_PATH); \ + if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \ + p += STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \ \ success = set_func (NM_SETTING_802_1X (setting), \ p, \ @@ -2694,14 +2726,13 @@ nmc_property_connection_describe_secondaries (NMSetting *setting, const char *pr def_func (NMSetting *setting, const char *prop, const char *val, GError **error) \ { \ char **strv = NULL; \ - const char *SCHEME_PATH = "file://"; \ char *val_strip = g_strstrip (g_strdup (val)); \ char *p = val_strip; \ const char *path, *password; \ gboolean success; \ \ - if (strncmp (val_strip, SCHEME_PATH, strlen (SCHEME_PATH)) == 0) \ - p += strlen (SCHEME_PATH); \ + if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \ + p += STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \ \ strv = nmc_strsplit_set (p, " \t,", 2); \ path = strv[0]; \ @@ -2728,13 +2759,14 @@ nmc_property_connection_describe_secondaries (NMSetting *setting, const char *pr } /* 'eap' */ +static const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd", NULL }; + DEFINE_SETTER_STR_LIST_MULTI (check_and_add_802_1X_eap, NM_SETTING_802_1X, nm_setting_802_1x_add_eap_method) static gboolean nmc_property_802_1X_set_eap (NMSetting *setting, const char *prop, const char *val, GError **error) { - const char *valid_eap[] = { "leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd", NULL }; return check_and_add_802_1X_eap (setting, prop, val, valid_eap, error); } @@ -2756,6 +2788,8 @@ DEFINE_REMOVER_INDEX_OR_VALUE (nmc_property_802_1X_remove_eap, nm_setting_802_1x_remove_eap_method, _validate_and_remove_eap_method) +DEFINE_ALLOWED_VAL_FUNC (nmc_property_802_1X_allowed_eap, valid_eap) + /* 'ca-cert' */ DEFINE_SETTER_CERT (nmc_property_802_1X_set_ca_cert, nm_setting_802_1x_set_ca_cert) @@ -3056,17 +3090,10 @@ nmc_property_bond_describe_options (NMSetting *setting, const char *prop) return desc; } -static const char * +static const char ** nmc_property_bond_allowed_options (NMSetting *setting, const char *prop) { - const char **valid_options; - static char *allowed_vals = NULL; - - if (G_UNLIKELY (allowed_vals == NULL)) { - valid_options = nm_setting_bond_get_valid_options (NM_SETTING_BOND (setting)); - allowed_vals = g_strjoinv (", ", (char **) valid_options); - } - return allowed_vals; + return nm_setting_bond_get_valid_options (NM_SETTING_BOND (setting)); } /* --- NM_SETTING_INFINIBAND_SETTING_NAME property setter functions --- */ @@ -3426,37 +3453,6 @@ nmc_property_ipv4_describe_routes (NMSetting *setting, const char *prop) " 10.1.2.0/24\n"); } -static char * -nmc_property_out2in_routes (const char *out_format) -{ - GRegex *regex; - GString *str; - char **strv; - int i; - - str = g_string_sized_new (128); - regex = g_regex_new ("\\{ dst = ([^/]+)/([^,]+), nh = ([^,]+), mt = ([^ ]+) \\}", 0, 0, NULL); - - strv = g_regex_split (regex, out_format, 0); - for (i = 1; strv && strv[i] && strv[i+1] && strv[i+2] && strv[i+3]; i=i+5) { - g_string_append (str, strv[i]); /* IP */ - g_string_append_c (str, '/'); - g_string_append (str, strv[i+1]); /* prefix */ - g_string_append_c (str, ' '); - g_string_append (str, strv[i+2]); /* next hop */ - g_string_append_c (str, ' '); - g_string_append (str, strv[i+3]); /* metric */ - g_string_append (str, ", "); - } - if (str->len > 0) - g_string_truncate (str, str->len - 2); - - g_strfreev (strv); - g_regex_unref (regex); - - return g_string_free (str, FALSE); -} - /* --- NM_SETTING_IP6_CONFIG_SETTING_NAME property setter functions --- */ /* 'method' */ static const char *ipv6_valid_methods[] = { @@ -3774,7 +3770,7 @@ nmc_property_olpc_set_channel (NMSetting *setting, const char *prop, const char /* --- NM_SETTING_SERIAL_SETTING_NAME property setter functions --- */ static char * -nmc_property_serial_get_parity (NMSetting *setting) +nmc_property_serial_get_parity (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingSerial *s_serial = NM_SETTING_SERIAL (setting); @@ -4093,17 +4089,10 @@ DEFINE_REMOVER_OPTION (nmc_property_wired_remove_option_s390_options, NM_SETTING_WIRED, nm_setting_wired_remove_s390_option) -static const char * +static const char ** nmc_property_wired_allowed_s390_options (NMSetting *setting, const char *prop) { - const char **valid_options; - static char *allowed_vals = NULL; - - if (G_UNLIKELY (allowed_vals == NULL)) { - valid_options = nm_setting_wired_get_valid_s390_options (NM_SETTING_WIRED (setting)); - allowed_vals = g_strjoinv (", ", (char **) valid_options); - } - return allowed_vals; + return nm_setting_wired_get_valid_s390_options (NM_SETTING_WIRED (setting)); } static const char * @@ -4723,29 +4712,36 @@ DEFINE_ALLOWED_VAL_FUNC (nmc_property_dcb_allowed_app_fcoe_modes, _dcb_valid_fco /*----------------------------------------------------------------------------*/ -static void -nmc_add_prop_funcs (char *key, - NmcPropertyGetFunc get_func, - NmcPropertySetFunc set_func, - NmcPropertyRemoveFunc remove_func, - NmcPropertyDescribeFunc describe_func, - NmcPropertyValuesFunc values_func, - NmcPropertyOut2InFunc out2in_func) +static inline void +_nmc_add_prop_funcs (const char *key, + const NmcPropertyFuncs *item_init) { - NmcPropertyFuncs *item = g_malloc0 (sizeof (NmcPropertyFuncs)); - item->get_func = get_func; - item->set_func = set_func; - item->remove_func = remove_func; - item->describe_func = describe_func; - item->values_func = values_func; - item->out2in_func = out2in_func; + NmcPropertyFuncs *item; - g_hash_table_insert (nmc_properties, key, item); + item = g_malloc (sizeof (NmcPropertyFuncs)); + *item = *item_init; + g_hash_table_insert (nmc_properties, (gpointer) key, item); } +#define nmc_add_prop_funcs(key, ...) \ + G_STMT_START { \ + struct { \ + NmcPropertyFuncsFields; \ + /* The _dummy field is here so that the last argument can be always + * NULL. That means every call to nmc_add_prop_funcs() below ends + * with a separate line "NULL);". */ \ + gpointer _dummy; \ + } _item_init = { \ + __VA_ARGS__ \ + };\ + \ + nm_assert (_item_init._dummy == NULL); \ + _nmc_add_prop_funcs ("" key, (NmcPropertyFuncs *) &_item_init); \ + } G_STMT_END + /* concatenate setting name and property name */ -#define GLUE(A,B) (g_strconcat ((NM_SETTING_##A##_SETTING_NAME),(NM_SETTING_##A##_##B), NULL)) -#define GLUE_IP(A,B) (g_strconcat ((NM_SETTING_IP##A##_CONFIG_SETTING_NAME),(NM_SETTING_IP_CONFIG_##B), NULL)) +#define GLUE(A,B) "" NM_SETTING_##A##_SETTING_NAME "" NM_SETTING_##A##_##B "" +#define GLUE_IP(A,B) "" NM_SETTING_IP##A##_CONFIG_SETTING_NAME "" NM_SETTING_IP_CONFIG_##B "" void nmc_properties_init (void) @@ -4754,7 +4750,7 @@ nmc_properties_init (void) return; /* create properties hash table */ - nmc_properties = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + nmc_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free); /* Add editable properties for NM_SETTING_802_1X_SETTING_NAME */ nmc_add_prop_funcs (GLUE (802_1X, EAP), @@ -4762,7 +4758,7 @@ nmc_properties_init (void) nmc_property_802_1X_set_eap, nmc_property_802_1X_remove_eap, NULL, - NULL, + nmc_property_802_1X_allowed_eap, NULL); nmc_add_prop_funcs (GLUE (802_1X, IDENTITY), nmc_property_802_1X_get_identity, @@ -4903,7 +4899,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_RAW), nmc_property_802_1X_get_password_raw, nmc_property_802_1X_set_password_raw, @@ -4917,7 +4913,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY), nmc_property_802_1X_get_private_key, nmc_property_802_1X_set_private_key, @@ -4938,7 +4934,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY), nmc_property_802_1X_get_phase2_private_key, nmc_property_802_1X_set_phase2_private_key, @@ -4959,7 +4955,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (802_1X, PIN), nmc_property_802_1X_get_pin, nmc_property_set_string, @@ -4973,7 +4969,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (802_1X, SYSTEM_CA_CERTS), nmc_property_802_1X_get_system_ca_certs, nmc_property_set_bool, @@ -5003,7 +4999,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (ADSL, PROTOCOL), nmc_property_adsl_get_protocol, nmc_property_adsl_set_protocol, @@ -5160,7 +5156,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); /* Add editable properties for NM_SETTING_CONNECTION_SETTING_NAME */ nmc_add_prop_funcs (GLUE (CONNECTION, ID), @@ -5247,6 +5243,13 @@ nmc_properties_init (void) NULL, nmc_property_con_allowed_slave_type, NULL); + nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT_SLAVES), + nmc_property_connection_get_autoconnect_slaves, + nmc_property_set_trilean, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (CONNECTION, SECONDARIES), nmc_property_connection_get_secondaries, nmc_property_connection_set_secondaries, @@ -5397,7 +5400,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (GSM, APN), nmc_property_gsm_get_apn, nmc_property_set_string, @@ -5425,7 +5428,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (GSM, HOME_ONLY), nmc_property_gsm_get_home_only, nmc_property_set_bool, @@ -5513,7 +5516,7 @@ nmc_properties_init (void) nmc_property_ipv4_remove_routes, nmc_property_ipv4_describe_routes, NULL, - nmc_property_out2in_routes); + NULL); nmc_add_prop_funcs (GLUE_IP (4, ROUTE_METRIC), nmc_property_ipv4_get_route_metric, nmc_property_set_int64, @@ -5613,7 +5616,7 @@ nmc_properties_init (void) nmc_property_ipv6_remove_routes, nmc_property_ipv6_describe_routes, NULL, - nmc_property_out2in_routes); + NULL); nmc_add_prop_funcs (GLUE_IP (6, ROUTE_METRIC), nmc_property_ipv6_get_route_metric, nmc_property_set_int64, @@ -5655,7 +5658,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE_IP (6, DHCP_SEND_HOSTNAME), nmc_property_ipv6_get_dhcp_send_hostname, nmc_property_set_bool, @@ -5850,7 +5853,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); /* Add editable properties for NM_SETTING_SERIAL_SETTING_NAME */ nmc_add_prop_funcs (GLUE (SERIAL, BAUD), @@ -6257,7 +6260,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY_TYPE), nmc_property_wifi_sec_get_wep_key_type, nmc_property_wifi_set_wep_key_type, @@ -6278,7 +6281,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_PASSWORD), nmc_property_wifi_sec_get_leap_password, nmc_property_set_string, @@ -6292,7 +6295,7 @@ nmc_properties_init (void) NULL, NULL, NULL, - nmc_property_out2in_cut_paren); + NULL); } void @@ -6305,21 +6308,21 @@ nmc_properties_cleanup () static const NmcPropertyFuncs * nmc_properties_find (const char *s_name, const char *p_name) { - NmcPropertyFuncs *item = NULL; char *key; + gsize p_l, s_l; - /* FIXME: maybe it's better to init it globally */ nmc_properties_init (); - key = g_strdup_printf ("%s%s", s_name, p_name); - item = (NmcPropertyFuncs *) g_hash_table_lookup (nmc_properties, key); - g_free (key); - - return item; + s_l = strlen (s_name); + p_l = strlen (p_name); + key = g_alloca (s_l + p_l + 1); + memcpy (&key[ 0], s_name, s_l); + memcpy (&key[s_l], p_name, p_l + 1); + return (NmcPropertyFuncs *) g_hash_table_lookup (nmc_properties, key); } static char * -get_property_val (NMSetting *setting, const char *prop, gboolean convert, GError **error) +get_property_val (NMSetting *setting, const char *prop, NmcPropertyGetType get_type, GError **error) { const NmcPropertyFuncs *item; @@ -6327,15 +6330,8 @@ get_property_val (NMSetting *setting, const char *prop, gboolean convert, GError g_return_val_if_fail (error == NULL || *error == NULL, FALSE); item = nmc_properties_find (nm_setting_get_name (setting), prop); - if (item && item->get_func) { - char *prop_val = item->get_func (setting); - if (convert && item->out2in_func) { - char *converted = item->out2in_func (prop_val); - g_free (prop_val); - return converted; - } else - return prop_val; - } + if (item && item->get_func) + return item->get_func (setting, get_type); g_set_error_literal (error, 1, 0, _("don't know how to get the property value")); return NULL; @@ -6351,17 +6347,17 @@ get_property_val (NMSetting *setting, const char *prop, gboolean convert, GError char * nmc_setting_get_property (NMSetting *setting, const char *prop, GError **error) { - return get_property_val (setting, prop, FALSE, error); + return get_property_val (setting, prop, NMC_PROPERTY_GET_PRETTY, error); } /* - * The same as nmc_setting_get_property(), but in addition converts - * usual output format into a simpler one, used as input in the editor. + * Similar to nmc_setting_get_property(), but returns the property in a string + * format that can be parsed via nmc_setting_set_property(). */ char * -nmc_setting_get_property_out2in (NMSetting *setting, const char *prop, GError **error) +nmc_setting_get_property_parsable (NMSetting *setting, const char *prop, GError **error) { - return get_property_val (setting, prop, TRUE, error); + return get_property_val (setting, prop, NMC_PROPERTY_GET_PARSABLE, error); } /* @@ -6496,7 +6492,7 @@ nmc_setting_get_valid_properties (NMSetting *setting) /* * Return allowed values for 'prop' as a string. */ -const char * +const char ** nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop) { @@ -6593,7 +6589,7 @@ nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value) /*----------------------------------------------------------------------------*/ #define GET_SECRET(show, setting, func) \ - (show ? func (setting) : g_strdup (_(""))) + (show ? func (setting, NMC_PROPERTY_GET_PRETTY) : g_strdup (_(""))) static gboolean setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean secrets) @@ -6613,20 +6609,21 @@ setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_connection_get_id (setting)); - set_val_str (arr, 2, nmc_property_connection_get_uuid (setting)); - set_val_str (arr, 3, nmc_property_connection_get_interface_name (setting)); - set_val_str (arr, 4, nmc_property_connection_get_type (setting)); - set_val_str (arr, 5, nmc_property_connection_get_autoconnect (setting)); - set_val_str (arr, 6, nmc_property_connection_get_autoconnect_priority (setting)); - set_val_str (arr, 7, nmc_property_connection_get_timestamp (setting)); - set_val_str (arr, 8, nmc_property_connection_get_read_only (setting)); - set_val_str (arr, 9, nmc_property_connection_get_permissions (setting)); - set_val_str (arr, 10, nmc_property_connection_get_zone (setting)); - set_val_str (arr, 11, nmc_property_connection_get_master (setting)); - set_val_str (arr, 12, nmc_property_connection_get_slave_type (setting)); - set_val_str (arr, 13, nmc_property_connection_get_secondaries (setting)); - set_val_str (arr, 14, nmc_property_connection_get_gateway_ping_timeout (setting)); + set_val_str (arr, 1, nmc_property_connection_get_id (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_connection_get_uuid (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_connection_get_interface_name (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_connection_get_type (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_connection_get_autoconnect (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_connection_get_autoconnect_priority (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_connection_get_timestamp (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_connection_get_read_only (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_connection_get_permissions (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_connection_get_zone (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_connection_get_master (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_connection_get_slave_type (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_connection_get_autoconnect_slaves (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_connection_get_secondaries (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 15, nmc_property_connection_get_gateway_ping_timeout (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6652,17 +6649,17 @@ setting_wired_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wired_get_port (setting)); - set_val_str (arr, 2, nmc_property_wired_get_speed (setting)); - set_val_str (arr, 3, nmc_property_wired_get_duplex (setting)); - set_val_str (arr, 4, nmc_property_wired_get_auto_negotiate (setting)); - set_val_str (arr, 5, nmc_property_wired_get_mac_address (setting)); - set_val_str (arr, 6, nmc_property_wired_get_cloned_mac_address (setting)); - set_val_str (arr, 7, nmc_property_wired_get_mac_address_blacklist (setting)); - set_val_str (arr, 8, nmc_property_wired_get_mtu (setting)); - set_val_str (arr, 9, nmc_property_wired_get_s390_subchannels (setting)); - set_val_str (arr, 10, nmc_property_wired_get_s390_nettype (setting)); - set_val_str (arr, 11, nmc_property_wired_get_s390_options (setting)); + set_val_str (arr, 1, nmc_property_wired_get_port (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_wired_get_speed (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_wired_get_duplex (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_wired_get_auto_negotiate (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_wired_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_wired_get_cloned_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_wired_get_mac_address_blacklist (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_wired_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_wired_get_s390_subchannels (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_wired_get_s390_nettype (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_wired_get_s390_options (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6688,38 +6685,38 @@ setting_802_1X_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_802_1X_get_eap (setting)); - set_val_str (arr, 2, nmc_property_802_1X_get_identity (setting)); - set_val_str (arr, 3, nmc_property_802_1X_get_anonymous_identity (setting)); - set_val_str (arr, 4, nmc_property_802_1X_get_pac_file (setting)); - set_val_str (arr, 5, nmc_property_802_1X_get_ca_cert (setting)); - set_val_str (arr, 6, nmc_property_802_1X_get_ca_path (setting)); - set_val_str (arr, 7, nmc_property_802_1X_get_subject_match (setting)); - set_val_str (arr, 8, nmc_property_802_1X_get_altsubject_matches (setting)); - set_val_str (arr, 9, nmc_property_802_1X_get_client_cert (setting)); - set_val_str (arr, 10, nmc_property_802_1X_get_phase1_peapver (setting)); - set_val_str (arr, 11, nmc_property_802_1X_get_phase1_peaplabel (setting)); - set_val_str (arr, 12, nmc_property_802_1X_get_phase1_fast_provisioning (setting)); - set_val_str (arr, 13, nmc_property_802_1X_get_phase2_auth (setting)); - set_val_str (arr, 14, nmc_property_802_1X_get_phase2_autheap (setting)); - set_val_str (arr, 15, nmc_property_802_1X_get_phase2_ca_cert (setting)); - set_val_str (arr, 16, nmc_property_802_1X_get_phase2_ca_path (setting)); - set_val_str (arr, 17, nmc_property_802_1X_get_phase2_subject_match (setting)); - set_val_str (arr, 18, nmc_property_802_1X_get_phase2_altsubject_matches (setting)); - set_val_str (arr, 19, nmc_property_802_1X_get_phase2_client_cert (setting)); + set_val_str (arr, 1, nmc_property_802_1X_get_eap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_802_1X_get_identity (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_802_1X_get_anonymous_identity (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_802_1X_get_pac_file (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_802_1X_get_ca_cert (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_802_1X_get_ca_path (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_802_1X_get_subject_match (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_802_1X_get_altsubject_matches (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_802_1X_get_client_cert (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_802_1X_get_phase1_peapver (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_802_1X_get_phase1_peaplabel (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_802_1X_get_phase1_fast_provisioning (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_802_1X_get_phase2_auth (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_802_1X_get_phase2_autheap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 15, nmc_property_802_1X_get_phase2_ca_cert (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 16, nmc_property_802_1X_get_phase2_ca_path (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 17, nmc_property_802_1X_get_phase2_subject_match (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 18, nmc_property_802_1X_get_phase2_altsubject_matches (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 19, nmc_property_802_1X_get_phase2_client_cert (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 20, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password)); - set_val_str (arr, 21, nmc_property_802_1X_get_password_flags (setting)); + set_val_str (arr, 21, nmc_property_802_1X_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 22, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password_raw)); - set_val_str (arr, 23, nmc_property_802_1X_get_password_raw_flags (setting)); - set_val_str (arr, 24, nmc_property_802_1X_get_private_key (setting)); + set_val_str (arr, 23, nmc_property_802_1X_get_password_raw_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 24, nmc_property_802_1X_get_private_key (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 25, GET_SECRET (secrets, setting, nmc_property_802_1X_get_private_key_password)); - set_val_str (arr, 26, nmc_property_802_1X_get_private_key_password_flags (setting)); - set_val_str (arr, 27, nmc_property_802_1X_get_phase2_private_key (setting)); + set_val_str (arr, 26, nmc_property_802_1X_get_private_key_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 27, nmc_property_802_1X_get_phase2_private_key (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 28, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_private_key_password)); - set_val_str (arr, 29, nmc_property_802_1X_get_phase2_private_key_password_flags (setting)); + set_val_str (arr, 29, nmc_property_802_1X_get_phase2_private_key_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 30, GET_SECRET (secrets, setting, nmc_property_802_1X_get_pin)); - set_val_str (arr, 31, nmc_property_802_1X_get_pin_flags (setting)); - set_val_str (arr, 32, nmc_property_802_1X_get_system_ca_certs (setting)); + set_val_str (arr, 31, nmc_property_802_1X_get_pin_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 32, nmc_property_802_1X_get_system_ca_certs (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6745,19 +6742,19 @@ setting_wireless_details (NMSetting *setting, NmCli *nmc, const char *one_prop, arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wireless_get_ssid (setting)); - set_val_str (arr, 2, nmc_property_wireless_get_mode (setting)); - set_val_str (arr, 3, nmc_property_wireless_get_band (setting)); - set_val_str (arr, 4, nmc_property_wireless_get_channel (setting)); - set_val_str (arr, 5, nmc_property_wireless_get_bssid (setting)); - set_val_str (arr, 6, nmc_property_wireless_get_rate (setting)); - set_val_str (arr, 7, nmc_property_wireless_get_tx_power (setting)); - set_val_str (arr, 8, nmc_property_wireless_get_mac_address (setting)); - set_val_str (arr, 9, nmc_property_wireless_get_cloned_mac_address (setting)); - set_val_str (arr, 10, nmc_property_wireless_get_mac_address_blacklist (setting)); - set_val_str (arr, 11, nmc_property_wireless_get_mtu (setting)); - set_val_str (arr, 12, nmc_property_wireless_get_seen_bssids (setting)); - set_val_str (arr, 13, nmc_property_wireless_get_hidden (setting)); + set_val_str (arr, 1, nmc_property_wireless_get_ssid (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_wireless_get_mode (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_wireless_get_band (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_wireless_get_channel (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_wireless_get_bssid (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_wireless_get_rate (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_wireless_get_tx_power (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_wireless_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_wireless_get_cloned_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_wireless_get_mac_address_blacklist (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_wireless_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_wireless_get_seen_bssids (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_wireless_get_hidden (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6783,23 +6780,23 @@ setting_wireless_security_details (NMSetting *setting, NmCli *nmc, const char *o arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wifi_sec_get_key_mgmt (setting)); - set_val_str (arr, 2, nmc_property_wifi_sec_get_wep_tx_keyidx (setting)); - set_val_str (arr, 3, nmc_property_wifi_sec_get_auth_alg (setting)); - set_val_str (arr, 4, nmc_property_wifi_sec_get_proto (setting)); - set_val_str (arr, 5, nmc_property_wifi_sec_get_pairwise (setting)); - set_val_str (arr, 6, nmc_property_wifi_sec_get_group (setting)); - set_val_str (arr, 7, nmc_property_wifi_sec_get_leap_username (setting)); + set_val_str (arr, 1, nmc_property_wifi_sec_get_key_mgmt (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_wifi_sec_get_wep_tx_keyidx (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_wifi_sec_get_auth_alg (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_wifi_sec_get_proto (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_wifi_sec_get_pairwise (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_wifi_sec_get_group (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_wifi_sec_get_leap_username (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 8, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key0)); set_val_str (arr, 9, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key1)); set_val_str (arr, 10, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key2)); set_val_str (arr, 11, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_wep_key3)); - set_val_str (arr, 12, nmc_property_wifi_sec_get_wep_key_flags (setting)); - set_val_str (arr, 13, nmc_property_wifi_sec_get_wep_key_type (setting)); + set_val_str (arr, 12, nmc_property_wifi_sec_get_wep_key_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_wifi_sec_get_wep_key_type (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 14, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_psk)); - set_val_str (arr, 15, nmc_property_wifi_sec_get_psk_flags (setting)); + set_val_str (arr, 15, nmc_property_wifi_sec_get_psk_flags (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 16, GET_SECRET (secrets, setting, nmc_property_wifi_sec_get_leap_password)); - set_val_str (arr, 17, nmc_property_wifi_sec_get_leap_password_flags (setting)); + set_val_str (arr, 17, nmc_property_wifi_sec_get_leap_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6825,20 +6822,20 @@ setting_ip4_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ipv4_get_method (setting)); - set_val_str (arr, 2, nmc_property_ipv4_get_dns (setting)); - set_val_str (arr, 3, nmc_property_ipv4_get_dns_search (setting)); - set_val_str (arr, 4, nmc_property_ip_get_addresses (setting)); - set_val_str (arr, 5, nmc_property_ipv4_get_gateway (setting)); - set_val_str (arr, 6, nmc_property_ipv4_get_routes (setting)); - set_val_str (arr, 7, nmc_property_ipv4_get_route_metric (setting)); - set_val_str (arr, 8, nmc_property_ipv4_get_ignore_auto_routes (setting)); - set_val_str (arr, 9, nmc_property_ipv4_get_ignore_auto_dns (setting)); - set_val_str (arr, 10, nmc_property_ipv4_get_dhcp_client_id (setting)); - set_val_str (arr, 11, nmc_property_ipv4_get_dhcp_send_hostname (setting)); - set_val_str (arr, 12, nmc_property_ipv4_get_dhcp_hostname (setting)); - set_val_str (arr, 13, nmc_property_ipv4_get_never_default (setting)); - set_val_str (arr, 14, nmc_property_ipv4_get_may_fail (setting)); + set_val_str (arr, 1, nmc_property_ipv4_get_method (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_ipv4_get_dns (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_ipv4_get_dns_search (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_ip_get_addresses (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_ipv4_get_gateway (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_ipv4_get_routes (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_ipv4_get_route_metric (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_ipv4_get_ignore_auto_routes (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_ipv4_get_ignore_auto_dns (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_ipv4_get_dhcp_client_id (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_ipv4_get_dhcp_send_hostname (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_ipv4_get_dhcp_hostname (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_ipv4_get_never_default (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_ipv4_get_may_fail (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6864,20 +6861,20 @@ setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ipv6_get_method (setting)); - set_val_str (arr, 2, nmc_property_ipv6_get_dns (setting)); - set_val_str (arr, 3, nmc_property_ipv6_get_dns_search (setting)); - set_val_str (arr, 4, nmc_property_ip_get_addresses (setting)); - set_val_str (arr, 5, nmc_property_ipv6_get_gateway (setting)); - set_val_str (arr, 6, nmc_property_ipv6_get_routes (setting)); - set_val_str (arr, 7, nmc_property_ipv6_get_route_metric (setting)); - set_val_str (arr, 8, nmc_property_ipv6_get_ignore_auto_routes (setting)); - set_val_str (arr, 9, nmc_property_ipv6_get_ignore_auto_dns (setting)); - set_val_str (arr, 10, nmc_property_ipv6_get_never_default (setting)); - set_val_str (arr, 11, nmc_property_ipv6_get_may_fail (setting)); - set_val_str (arr, 12, nmc_property_ipv6_get_ip6_privacy (setting)); - set_val_str (arr, 13, nmc_property_ipv6_get_dhcp_send_hostname (setting)); - set_val_str (arr, 14, nmc_property_ipv6_get_dhcp_hostname (setting)); + set_val_str (arr, 1, nmc_property_ipv6_get_method (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_ipv6_get_dns (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_ipv6_get_dns_search (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_ip_get_addresses (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_ipv6_get_gateway (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_ipv6_get_routes (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_ipv6_get_route_metric (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_ipv6_get_ignore_auto_routes (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_ipv6_get_ignore_auto_dns (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_ipv6_get_never_default (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_ipv6_get_may_fail (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_ipv6_get_ip6_privacy (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_ipv6_get_dhcp_send_hostname (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_ipv6_get_dhcp_hostname (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6903,11 +6900,11 @@ setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_serial_get_baud (setting)); - set_val_str (arr, 2, nmc_property_serial_get_bits (setting)); - set_val_str (arr, 3, nmc_property_serial_get_parity (setting)); - set_val_str (arr, 4, nmc_property_serial_get_stopbits (setting)); - set_val_str (arr, 5, nmc_property_serial_get_send_delay (setting)); + set_val_str (arr, 1, nmc_property_serial_get_baud (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_serial_get_bits (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_serial_get_parity (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_serial_get_stopbits (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_serial_get_send_delay (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6933,24 +6930,24 @@ setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ppp_get_noauth (setting)); - set_val_str (arr, 2, nmc_property_ppp_get_refuse_eap (setting)); - set_val_str (arr, 3, nmc_property_ppp_get_refuse_pap (setting)); - set_val_str (arr, 4, nmc_property_ppp_get_refuse_chap (setting)); - set_val_str (arr, 5, nmc_property_ppp_get_refuse_mschap (setting)); - set_val_str (arr, 6, nmc_property_ppp_get_refuse_mschapv2 (setting)); - set_val_str (arr, 7, nmc_property_ppp_get_nobsdcomp (setting)); - set_val_str (arr, 8, nmc_property_ppp_get_nodeflate (setting)); - set_val_str (arr, 9, nmc_property_ppp_get_no_vj_comp (setting)); - set_val_str (arr, 10, nmc_property_ppp_get_require_mppe (setting)); - set_val_str (arr, 11, nmc_property_ppp_get_require_mppe_128 (setting)); - set_val_str (arr, 12, nmc_property_ppp_get_mppe_stateful (setting)); - set_val_str (arr, 13, nmc_property_ppp_get_crtscts (setting)); - set_val_str (arr, 14, nmc_property_ppp_get_baud (setting)); - set_val_str (arr, 15, nmc_property_ppp_get_mru (setting)); - set_val_str (arr, 16, nmc_property_ppp_get_mtu (setting)); - set_val_str (arr, 17, nmc_property_ppp_get_lcp_echo_failure (setting)); - set_val_str (arr, 18, nmc_property_ppp_get_lcp_echo_interval (setting)); + set_val_str (arr, 1, nmc_property_ppp_get_noauth (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_ppp_get_refuse_eap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_ppp_get_refuse_pap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_ppp_get_refuse_chap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_ppp_get_refuse_mschap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_ppp_get_refuse_mschapv2 (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_ppp_get_nobsdcomp (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_ppp_get_nodeflate (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_ppp_get_no_vj_comp (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_ppp_get_require_mppe (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_ppp_get_require_mppe_128 (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_ppp_get_mppe_stateful (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_ppp_get_crtscts (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_ppp_get_baud (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 15, nmc_property_ppp_get_mru (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 16, nmc_property_ppp_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 17, nmc_property_ppp_get_lcp_echo_failure (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 18, nmc_property_ppp_get_lcp_echo_interval (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6976,10 +6973,10 @@ setting_pppoe_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_pppoe_get_service (setting)); - set_val_str (arr, 2, nmc_property_pppoe_get_username (setting)); + set_val_str (arr, 1, nmc_property_pppoe_get_service (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_pppoe_get_username (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_pppoe_get_password)); - set_val_str (arr, 4, nmc_property_pppoe_get_password_flags (setting)); + set_val_str (arr, 4, nmc_property_pppoe_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7005,15 +7002,15 @@ setting_gsm_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_gsm_get_number (setting)); - set_val_str (arr, 2, nmc_property_gsm_get_username (setting)); + set_val_str (arr, 1, nmc_property_gsm_get_number (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_gsm_get_username (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_gsm_get_password)); - set_val_str (arr, 4, nmc_property_gsm_get_password_flags (setting)); - set_val_str (arr, 5, nmc_property_gsm_get_apn (setting)); - set_val_str (arr, 6, nmc_property_gsm_get_network_id (setting)); + set_val_str (arr, 4, nmc_property_gsm_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_gsm_get_apn (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_gsm_get_network_id (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 7, GET_SECRET (secrets, setting, nmc_property_gsm_get_pin)); - set_val_str (arr, 8, nmc_property_gsm_get_pin_flags (setting)); - set_val_str (arr, 9, nmc_property_gsm_get_home_only (setting)); + set_val_str (arr, 8, nmc_property_gsm_get_pin_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_gsm_get_home_only (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7039,10 +7036,10 @@ setting_cdma_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_cdma_get_number (setting)); - set_val_str (arr, 2, nmc_property_cdma_get_username (setting)); + set_val_str (arr, 1, nmc_property_cdma_get_number (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_cdma_get_username (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 3, GET_SECRET (secrets, setting, nmc_property_cdma_get_password)); - set_val_str (arr, 4, nmc_property_cdma_get_password_flags (setting)); + set_val_str (arr, 4, nmc_property_cdma_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7068,8 +7065,8 @@ setting_bluetooth_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bluetooth_get_bdaddr (setting)); - set_val_str (arr, 2, nmc_property_bluetooth_get_type (setting)); + set_val_str (arr, 1, nmc_property_bluetooth_get_bdaddr (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_bluetooth_get_type (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7095,9 +7092,9 @@ setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_olpc_get_ssid (setting)); - set_val_str (arr, 2, nmc_property_olpc_get_channel (setting)); - set_val_str (arr, 3, nmc_property_olpc_get_anycast_address (setting)); + set_val_str (arr, 1, nmc_property_olpc_get_ssid (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_olpc_get_channel (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_olpc_get_anycast_address (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7123,11 +7120,11 @@ setting_vpn_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_vpn_get_service_type (setting)); - set_val_str (arr, 2, nmc_property_vpn_get_user_name (setting)); - set_val_str (arr, 3, nmc_property_vpn_get_data (setting)); + set_val_str (arr, 1, nmc_property_vpn_get_service_type (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_vpn_get_user_name (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_vpn_get_data (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 4, GET_SECRET (secrets, setting, nmc_property_vpn_get_secrets)); - set_val_str (arr, 5, nmc_property_vpn_get_persistent (setting)); + set_val_str (arr, 5, nmc_property_vpn_get_persistent (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7153,8 +7150,8 @@ setting_wimax_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gb arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_wimax_get_mac_address (setting)); - set_val_str (arr, 2, nmc_property_wimax_get_network_name (setting)); + set_val_str (arr, 1, nmc_property_wimax_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_wimax_get_network_name (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7180,11 +7177,11 @@ setting_infiniband_details (NMSetting *setting, NmCli *nmc, const char *one_pro arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_ib_get_mac_address (setting)); - set_val_str (arr, 2, nmc_property_ib_get_mtu (setting)); - set_val_str (arr, 3, nmc_property_ib_get_transport_mode (setting)); - set_val_str (arr, 4, nmc_property_ib_get_p_key (setting)); - set_val_str (arr, 5, nmc_property_ib_get_parent (setting)); + set_val_str (arr, 1, nmc_property_ib_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_ib_get_mtu (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_ib_get_transport_mode (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_ib_get_p_key (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_ib_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7210,7 +7207,7 @@ setting_bond_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bond_get_options (setting)); + set_val_str (arr, 1, nmc_property_bond_get_options (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7236,11 +7233,11 @@ setting_vlan_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_vlan_get_parent (setting)); - set_val_str (arr, 2, nmc_property_vlan_get_id (setting)); - set_val_str (arr, 3, nmc_property_vlan_get_flags (setting)); - set_val_str (arr, 4, nmc_property_vlan_get_ingress_priority_map (setting)); - set_val_str (arr, 5, nmc_property_vlan_get_egress_priority_map (setting)); + set_val_str (arr, 1, nmc_property_vlan_get_parent (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_vlan_get_id (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_vlan_get_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_vlan_get_ingress_priority_map (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_vlan_get_egress_priority_map (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7266,13 +7263,13 @@ setting_adsl_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_adsl_get_username (setting)); + set_val_str (arr, 1, nmc_property_adsl_get_username (setting, NMC_PROPERTY_GET_PRETTY)); set_val_str (arr, 2, GET_SECRET (secrets, setting, nmc_property_adsl_get_password)); - set_val_str (arr, 3, nmc_property_adsl_get_password_flags (setting)); - set_val_str (arr, 4, nmc_property_adsl_get_protocol (setting)); - set_val_str (arr, 5, nmc_property_adsl_get_encapsulation (setting)); - set_val_str (arr, 6, nmc_property_adsl_get_vpi (setting)); - set_val_str (arr, 7, nmc_property_adsl_get_vci (setting)); + set_val_str (arr, 3, nmc_property_adsl_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_adsl_get_protocol (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_adsl_get_encapsulation (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_adsl_get_vpi (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_adsl_get_vci (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7298,13 +7295,13 @@ setting_bridge_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bridge_get_mac_address (setting)); - set_val_str (arr, 2, nmc_property_bridge_get_stp (setting)); - set_val_str (arr, 3, nmc_property_bridge_get_priority (setting)); - set_val_str (arr, 4, nmc_property_bridge_get_forward_delay (setting)); - set_val_str (arr, 5, nmc_property_bridge_get_hello_time (setting)); - set_val_str (arr, 6, nmc_property_bridge_get_max_age (setting)); - set_val_str (arr, 7, nmc_property_bridge_get_ageing_time (setting)); + set_val_str (arr, 1, nmc_property_bridge_get_mac_address (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_bridge_get_stp (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_bridge_get_priority (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_bridge_get_forward_delay (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_bridge_get_hello_time (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_bridge_get_max_age (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_bridge_get_ageing_time (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7330,9 +7327,9 @@ setting_bridge_port_details (NMSetting *setting, NmCli *nmc, const char *one_pr arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_bridge_port_get_priority (setting)); - set_val_str (arr, 2, nmc_property_bridge_port_get_path_cost (setting)); - set_val_str (arr, 3, nmc_property_bridge_port_get_hairpin_mode (setting)); + set_val_str (arr, 1, nmc_property_bridge_port_get_priority (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_bridge_port_get_path_cost (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_bridge_port_get_hairpin_mode (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7358,7 +7355,7 @@ setting_team_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gbo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_team_get_config (setting)); + set_val_str (arr, 1, nmc_property_team_get_config (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7384,7 +7381,7 @@ setting_team_port_details (NMSetting *setting, NmCli *nmc, const char *one_prop arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_team_port_get_config (setting)); + set_val_str (arr, 1, nmc_property_team_port_get_config (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -7410,21 +7407,21 @@ setting_dcb_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboo arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_str (arr, 0, g_strdup (nm_setting_get_name (setting))); - set_val_str (arr, 1, nmc_property_dcb_get_app_fcoe_flags (setting)); - set_val_str (arr, 2, nmc_property_dcb_get_app_fcoe_priority (setting)); - set_val_str (arr, 3, nmc_property_dcb_get_app_fcoe_mode (setting)); - set_val_str (arr, 4, nmc_property_dcb_get_app_iscsi_flags (setting)); - set_val_str (arr, 5, nmc_property_dcb_get_app_iscsi_priority (setting)); - set_val_str (arr, 6, nmc_property_dcb_get_app_fip_flags (setting)); - set_val_str (arr, 7, nmc_property_dcb_get_app_fip_priority (setting)); - set_val_str (arr, 8, nmc_property_dcb_get_pfc_flags (setting)); - set_val_str (arr, 9, nmc_property_dcb_get_pfc (setting)); - set_val_str (arr, 10, nmc_property_dcb_get_pg_flags (setting)); - set_val_str (arr, 11, nmc_property_dcb_get_pg_group_id (setting)); - set_val_str (arr, 12, nmc_property_dcb_get_pg_group_bandwidth (setting)); - set_val_str (arr, 13, nmc_property_dcb_get_pg_bandwidth (setting)); - set_val_str (arr, 14, nmc_property_dcb_get_pg_strict (setting)); - set_val_str (arr, 15, nmc_property_dcb_get_pg_traffic_class (setting)); + set_val_str (arr, 1, nmc_property_dcb_get_app_fcoe_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 2, nmc_property_dcb_get_app_fcoe_priority (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 3, nmc_property_dcb_get_app_fcoe_mode (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 4, nmc_property_dcb_get_app_iscsi_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 5, nmc_property_dcb_get_app_iscsi_priority (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 6, nmc_property_dcb_get_app_fip_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 7, nmc_property_dcb_get_app_fip_priority (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 8, nmc_property_dcb_get_pfc_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_dcb_get_pfc (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_dcb_get_pg_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_dcb_get_pg_group_id (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_dcb_get_pg_group_bandwidth (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_dcb_get_pg_bandwidth (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_dcb_get_pg_strict (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 15, nmc_property_dcb_get_pg_traffic_class (setting, NMC_PROPERTY_GET_PRETTY)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ diff --git a/clients/cli/settings.h b/clients/cli/settings.h index 3c4c814f..bab00ee9 100644 --- a/clients/cli/settings.h +++ b/clients/cli/settings.h @@ -37,13 +37,13 @@ void nmc_setting_connection_connect_handlers (NMSettingConnection *setting, NMCo char **nmc_setting_get_valid_properties (NMSetting *setting); char *nmc_setting_get_property_desc (NMSetting *setting, const char *prop); -const char *nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop); +const char **nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop); char *nmc_setting_get_property (NMSetting *setting, const char *prop, GError **error); -char *nmc_setting_get_property_out2in (NMSetting *setting, - const char *prop, - GError **error); +char *nmc_setting_get_property_parsable (NMSetting *setting, + const char *prop, + GError **error); gboolean nmc_setting_set_property (NMSetting *setting, const char *prop, const char *val, diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 60cf9f93..dfd002ed 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -454,17 +454,34 @@ nmc_get_user_input (const char *ask_str) * Split string in 'line' according to 'delim' to (argument) array. */ int -nmc_string_to_arg_array (const char *line, const char *delim, char ***argv, int *argc) +nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, + char ***argv, int *argc) { - int i = 0; char **arr; - arr = g_strsplit_set (line ? line : "", delim ? delim : " \t", 0); - while (arr && arr[i]) - i++; + arr = nmc_strsplit_set (line ? line : "", delim ? delim : " \t", 0); + + if (unquote) { + int i = 0; + char *s; + size_t l; + const char *quotes = "\"'"; + + while (arr && arr[i]) { + s = arr[i]; + l = strlen (s); + if (l >= 2) { + if (strchr (quotes, s[0]) && s[l-1] == s[0]) { + memmove (s, s+1, l-2); + s[l-2] = '\0'; + } + } + i++; + } + } - *argc = i; *argv = arr; + *argc = g_strv_length (arr); return 0; } @@ -544,20 +561,22 @@ nmc_util_strv_to_slist (char **strv) * Returns: a newly allocated string. Caller must free it with g_free(). */ char * -nmc_util_strv_for_display (const char **strv) +nmc_util_strv_for_display (const char **strv, gboolean brackets) { GString *result; guint i = 0; result = g_string_sized_new (150); - g_string_append_c (result, '['); + if (brackets) + g_string_append_c (result, '['); while (strv && strv[i]) { if (result->len > 1) g_string_append (result, ", "); g_string_append (result, strv[i]); i++; } - g_string_append_c (result, ']'); + if (brackets) + g_string_append_c (result, ']'); return g_string_free (result, FALSE); } diff --git a/clients/cli/utils.h b/clients/cli/utils.h index fc43b0ed..77e697af 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -69,10 +69,11 @@ void nmc_terminal_show_progress (const char *str); const char *nmc_term_color_sequence (NmcTermColor color); char *nmc_colorize (NmcTermColor color, const char * fmt, ...); char *nmc_get_user_input (const char *ask_str); -int nmc_string_to_arg_array (const char *line, const char *delim, char ***argv, int *argc); +int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, + char ***argv, int *argc); const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); GSList *nmc_util_strv_to_slist (char **strv); -char * nmc_util_strv_for_display (const char **strv); +char * nmc_util_strv_for_display (const char **strv, gboolean brackets); char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); int nmc_string_screen_width (const char *start, const char *end); void set_val_str (NmcOutputField fields_array[], guint32 index, char *value); diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 80022a4d..8eddb440 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -122,10 +122,10 @@ static gboolean strv_has (gchar **haystack, gchar *needle) { - gchar *iter; + gchar **iter; - for (iter = *haystack; iter; iter++) { - if (g_strcmp0 (iter, needle) == 0) + for (iter = haystack; iter && *iter; iter++) { + if (g_strcmp0 (*iter, needle) == 0) return TRUE; } diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in index 4283a754..331461a7 100644 --- a/clients/tui/Makefile.in +++ b/clients/tui/Makefile.in @@ -297,6 +297,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -410,6 +411,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/clients/tui/newt/Makefile.in b/clients/tui/newt/Makefile.in index 1a510bb7..96131a7d 100644 --- a/clients/tui/newt/Makefile.in +++ b/clients/tui/newt/Makefile.in @@ -201,6 +201,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -314,6 +315,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/config.h.in b/config.h.in index 3783b160..689a497e 100644 --- a/config.h.in +++ b/config.h.in @@ -66,6 +66,9 @@ /* Define if libnl has rtnl_link_inet6_get_addr_gen_mode() */ #undef HAVE_LIBNL_INET6_ADDR_GEN_MODE +/* Define if libnl has rtnl_link_inet6_get_token() */ +#undef HAVE_LIBNL_INET6_TOKEN + /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H @@ -145,6 +148,12 @@ /* git commit id of the original source code version */ #undef NM_GIT_SHA +/* Define if more asserts are enabled */ +#undef NM_MORE_ASSERTS + +/* Define if more asserts are enabled */ +#undef NM_MORE_LOGGING + /* Name of package */ #undef PACKAGE @@ -236,6 +245,9 @@ /* Define if you have Teamd control support */ #undef WITH_TEAMDCTL +/* Define if you have Wi-Fi support */ +#undef WITH_WIFI + /* Define if you have WiMAX support */ #undef WITH_WIMAX diff --git a/configure b/configure index 53d73d47..363895c2 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.2. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.4. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='NetworkManager 1.0.2' +PACKAGE_VERSION='1.0.4' +PACKAGE_STRING='NetworkManager 1.0.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -791,6 +791,8 @@ INTROSPECTION_COMPILER INTROSPECTION_SCANNER GUDEV_LIBS GUDEV_CFLAGS +AM_TESTS_FD_REDIRECT +LOG_DRIVER GLIB_LIBS GLIB_CFLAGS HAVE_DBUS_GLIB_100_FALSE @@ -806,6 +808,8 @@ LIBDL LIBM WITH_WEXT_FALSE WITH_WEXT_TRUE +WITH_WIFI_FALSE +WITH_WIFI_TRUE GNOME_CODE_COVERAGE_RULES CODE_COVERAGE_LDFLAGS CODE_COVERAGE_CFLAGS @@ -1029,6 +1033,7 @@ enable_ifnet with_config_plugins_default enable_code_coverage with_dist_version +enable_wifi with_wext enable_introspection enable_qt @@ -1062,11 +1067,14 @@ with_libsoup enable_concheck with_nmtui enable_more_warnings +enable_more_asserts +enable_more_logging enable_lto enable_vala enable_tests with_valgrind with_tests +with_valgrind_suppressions with_html_dir enable_gtk_doc enable_gtk_doc_html @@ -1672,7 +1680,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.0.2 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1742,7 +1750,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.0.2:";; + short | recursive ) echo "Configuration of NetworkManager 1.0.4:";; esac cat <<\_ACEOF @@ -1773,6 +1781,7 @@ Optional Features: --enable-ifupdown enable ifupdown configuration plugin (Debian/Ubuntu) --enable-ifnet enable ifnet configuration plugin (Gentoo) --enable-code-coverage Whether to enable code coverage support + --enable-wifi enable Wi-Fi support --enable-introspection=[no/auto/yes] Enable introspection for this build --enable-qt enable Qt examples @@ -1789,6 +1798,8 @@ Optional Features: --enable-bluez5-dun enable Bluez5 DUN support --enable-concheck enable connectivity checking support --enable-more-warnings Possible values: no/yes/error + --enable-more-asserts Enable more assertions for debugging (default: no) + --enable-more-logging Enable more debug logging (default: no) --enable-lto Enable Link Time Optimization for smaller size (default: no) --enable-vala=[no/auto/yes] @@ -1863,6 +1874,8 @@ Optional Packages: --with-valgrind=yes|no|path Use valgrind to memory-check the tests (default: no) --with-tests Build NetworkManager tests (deprecated) + --with-valgrind-suppressions=path + Use specific valgrind suppression file --with-html-dir=PATH path to installed docs Some influential environment variables: @@ -2019,7 +2032,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.0.2 +NetworkManager configure 1.0.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2563,7 +2576,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.0.2, which was +It was created by NetworkManager $as_me 1.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3433,7 +3446,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.0.2' + VERSION='1.0.4' cat >>confdefs.h <<_ACEOF @@ -16718,9 +16731,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=0 -NM_MICRO_VERSION=2 -NM_VERSION=1.0.2 -NM_GIT_SHA=4e6481cb733611543d22e06831db63b0e23af3f9 +NM_MICRO_VERSION=4 +NM_VERSION=1.0.4 +NM_GIT_SHA=f27429138ff951309556c30c67e2f34e7ed29281 @@ -19923,15 +19936,45 @@ _ACEOF fi +# Check whether --enable-wifi was given. +if test "${enable_wifi+set}" = set; then : + enableval=$enable_wifi; +fi + +if test "${enable_wifi}" != "no"; then + enable_wifi='yes' + +$as_echo "#define WITH_WIFI 1" >>confdefs.h + +else + +$as_echo "#define WITH_WIFI 0" >>confdefs.h + +fi + if test "${enable_wifi}" = "yes"; then + WITH_WIFI_TRUE= + WITH_WIFI_FALSE='#' +else + WITH_WIFI_TRUE='#' + WITH_WIFI_FALSE= +fi + + # Check whether --with-wext was given. if test "${with_wext+set}" = set; then : withval=$with_wext; ac_with_wext=$withval else - ac_with_wext="yes" + ac_with_wext="$enable_wifi" fi +if test "$ac_with_wext" != 'no'; then + ac_with_wext='yes' +fi if test x"$ac_with_wext" = x"yes"; then + if test "$enable_wifi" != "yes"; then + as_fn_error $? "Enabling WEXT support and disabling Wi-Fi makes no sense" "$LINENO" 5 + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel WEXT headers" >&5 $as_echo_n "checking Linux kernel WEXT headers... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20012,17 +20055,18 @@ if test "$ac_have_nl80211" = no; then as_fn_error $? "Linux kernel development header linux/nl80211.h not installed or not functional" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 Critical Protocol Start/Stop" >&5 +if test "$with_wifi" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking Linux kernel nl80211 Critical Protocol Start/Stop" >&5 $as_echo_n "checking Linux kernel nl80211 Critical Protocol Start/Stop... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __user - #define __user - #endif - #include - #include - #include - #include + #define __user + #endif + #include + #include + #include + #include int main () { @@ -20037,8 +20081,11 @@ else ac_have_nl80211_critproto=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211_critproto" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_have_nl80211_critproto" >&5 $as_echo "$ac_have_nl80211_critproto" >&6; } +else + ac_have_nl80211_critproto='no' +fi if test "$ac_have_nl80211_critproto" = yes; then $as_echo "#define HAVE_NL80211_CRITICAL_PROTOCOL_CMDS 1" >>confdefs.h @@ -20614,6 +20661,65 @@ fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } + +if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.37.6 gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.37.6 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.37.6 gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>&1` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.37.6 gmodule-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 $as_echo_n "checking for GLIB... " >&6; } @@ -20703,6 +20809,114 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +fi + LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 +$as_echo_n "checking for GLIB... " >&6; } + +if test -n "$GLIB_CFLAGS"; then + pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GLIB_LIBS"; then + pkg_cv_GLIB_LIBS="$GLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= 2.32 gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= 2.32 gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1` + else + GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-unix-2.0 >= 2.32 gmodule-2.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GLIB_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gio-unix-2.0 >= 2.32 gmodule-2.0) were not met: + +$GLIB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GLIB_CFLAGS +and GLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + LOG_DRIVER='$(top_srcdir)/build-aux/test-driver' + +else + GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS + GLIB_LIBS=$pkg_cv_GLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + LOG_DRIVER='$(top_srcdir)/build-aux/tap-driver.sh' +, + AM_TESTS_FD_REDIRECT='--tap' + fi GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32" @@ -22077,6 +22291,55 @@ $as_echo "#define HAVE_KERNEL_INET6_ADDR_GEN_MODE 0" >>confdefs.h fi +# IPv6 tokenized identifiers support in libnl +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rtnl_link_inet6_get_token in -lnl-route-3" >&5 +$as_echo_n "checking for rtnl_link_inet6_get_token in -lnl-route-3... " >&6; } +if ${ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnl-route-3 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char rtnl_link_inet6_get_token (); +int +main () +{ +return rtnl_link_inet6_get_token (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token=yes +else + ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" >&5 +$as_echo "$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" >&6; } +if test "x$ac_cv_lib_nl_route_3_rtnl_link_inet6_get_token" = xyes; then : + ac_have_ipv6_token="1" +else + ac_have_ipv6_token="0" +fi + + +cat >>confdefs.h <<_ACEOF +#define HAVE_LIBNL_INET6_TOKEN $ac_have_ipv6_token +_ACEOF + + # uuid library pkg_failed=no @@ -22227,7 +22490,7 @@ fi $as_echo "$ax_cv_lib_readline" >&6; } if test -z "$ax_cv_lib_readline"; then - as_fn_error $? "readline library with terminfo support is required (one of ncurses, curses, or termcap)" "$LINENO" 5 + as_fn_error $? "readline library with terminfo support is required (one of readline, edit, or editline, AND one of ncurses, curses, or termcap)" "$LINENO" 5 fi ORIG_LIBS="$LIBS" @@ -23524,11 +23787,11 @@ done test -n "$with_dhcpcd" || with_dhcpcd="no" if test "$with_dhcpcd" != "no"; then - if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd 456789\."; then + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&5 $as_echo "$as_me: WARNING: Cannot use dhcpcd, version 4.x or higher is required" >&2;} with_dhcpcd=no - elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd 6789\."; then + elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then $as_echo "#define DHCPCD_SUPPORTS_IPV6 1" >>confdefs.h @@ -24202,7 +24465,7 @@ fi if test "${enable_more_warnings+set}" = set; then : enableval=$enable_more_warnings; set_more_warnings="$enableval" else - set_more_warnings=error + set_more_warnings=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for more warnings" >&5 @@ -24532,6 +24795,28 @@ $as_echo "no" >&6; } fi +# Check whether --enable-more-asserts was given. +if test "${enable_more_asserts+set}" = set; then : + enableval=$enable_more_asserts; +fi + +if test "${enable_more_asserts}" = "yes"; then + +$as_echo "#define NM_MORE_ASSERTS 1" >>confdefs.h + +fi + +# Check whether --enable-more-logging was given. +if test "${enable_more_logging+set}" = set; then : + enableval=$enable_more_logging; +fi + +if test "${enable_more_logging}" = "yes"; then + +$as_echo "#define NM_MORE_LOGGING 1" >>confdefs.h + +fi + # Check whether --enable-lto was given. if test "${enable_lto+set}" = set; then : enableval=$enable_lto; @@ -24884,8 +25169,21 @@ else REQUIRE_ROOT_TESTS_FALSE= fi + +# Check whether --with-valgrind-suppressions was given. +if test "${with_valgrind_suppressions+set}" = set; then : + withval=$with_valgrind_suppressions; +fi + +if test "$with_valgrind" == no; then + with_valgrind_suppressions= +else + if test "$with_valgrind_suppressions" == ""; then + with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions' + fi +fi if test "$with_valgrind" != "no"; then : - VALGRIND_RULES='TESTS_ENVIRONMENT = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" "$(top_srcdir)/valgrind.suppressions"' + VALGRIND_RULES='LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions" fi if test "${with_valgrind}" != "no"; then @@ -25572,6 +25870,10 @@ if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_F as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_WIFI_TRUE}" && test -z "${WITH_WIFI_FALSE}"; then + as_fn_error $? "conditional \"WITH_WIFI\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${WITH_WEXT_TRUE}" && test -z "${WITH_WEXT_FALSE}"; then as_fn_error $? "conditional \"WITH_WEXT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -26113,7 +26415,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.0.2, which was +This file was extended by NetworkManager $as_me 1.0.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26179,7 +26481,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.0.2 +NetworkManager config.status 1.0.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -28625,6 +28927,7 @@ echo echo "Features:" echo " wext: $ac_with_wext" +echo " wifi: $enable_wifi" echo " wimax: $enable_wimax" echo " ppp: $enable_ppp" echo " modemmanager-1: $with_modem_manager_1" @@ -28654,7 +28957,7 @@ echo echo "Miscellaneous:" echo " documentation: $enable_gtk_doc" echo " tests: $enable_tests" -echo " valgrind: $with_valgrind" +echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " code coverage: $enable_code_coverage" echo " LTO: $enable_lto" echo diff --git a/configure.ac b/configure.ac index 68dff7a8..381b6215 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [0]) -m4_define([nm_micro_version], [2]) +m4_define([nm_micro_version], [4]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) @@ -15,21 +15,9 @@ AC_INIT([NetworkManager], [nm_version], AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) +AC_REQUIRE_AUX_FILE([tap-driver.sh]) -dnl Initialize automake. automake < 1.12 didn't have serial-tests and -dnl gives an error if it sees this, but for automake >= 1.13 -dnl serial-tests is required so we have to include it. Solution is to -dnl test for the version of automake (by running an external command) -dnl and provide it if necessary. Note we have to do this entirely using -dnl m4 macros since automake queries this macro by running -dnl 'autoconf --trace ...'. -m4_define([serial_tests], [ - m4_esyscmd([automake --version | - head -1 | - awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' - ]) -]) -AM_INIT_AUTOMAKE(1.11 serial_tests tar-ustar no-dist-gzip dist-bzip2 -Wno-portability) dnl NB: Do not [quote] this parameter. +AM_INIT_AUTOMAKE(1.12 tar-ustar no-dist-gzip dist-bzip2 -Wno-portability) dnl NB: Do not [quote] this parameter. AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) @@ -145,11 +133,26 @@ if ! test x"$ac_distver" = x""; then AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string]) fi +AC_ARG_ENABLE(wifi, AS_HELP_STRING([--enable-wifi], [enable Wi-Fi support])) +if test "${enable_wifi}" != "no"; then + enable_wifi='yes' + AC_DEFINE(WITH_WIFI, 1, [Define if you have Wi-Fi support]) +else + AC_DEFINE(WITH_WIFI, 0, [Define if you have Wi-Fi support]) +fi +AM_CONDITIONAL(WITH_WIFI, test "${enable_wifi}" = "yes") + dnl dnl Default to using WEXT but allow it to be disabled dnl -AC_ARG_WITH(wext, AS_HELP_STRING([--with-wext=yes], [Enable or disable Linux Wireless Extensions]), ac_with_wext=$withval, ac_with_wext="yes") +AC_ARG_WITH(wext, AS_HELP_STRING([--with-wext=yes], [Enable or disable Linux Wireless Extensions]), ac_with_wext=$withval, ac_with_wext="$enable_wifi") +if test "$ac_with_wext" != 'no'; then + ac_with_wext='yes' +fi if test x"$ac_with_wext" = x"yes"; then + if test "$enable_wifi" != "yes"; then + AC_MSG_ERROR(Enabling WEXT support and disabling Wi-Fi makes no sense) + fi AC_MSG_CHECKING([Linux kernel WEXT headers]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -193,20 +196,24 @@ if test "$ac_have_nl80211" = no; then AC_MSG_ERROR(Linux kernel development header linux/nl80211.h not installed or not functional) fi -AC_MSG_CHECKING([Linux kernel nl80211 Critical Protocol Start/Stop]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#ifndef __user - #define __user - #endif - #include - #include - #include - #include ]], - [[unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++;]])], - [ac_have_nl80211_critproto=yes], - [ac_have_nl80211_critproto=no]) -AC_MSG_RESULT($ac_have_nl80211_critproto) +if test "$with_wifi" = "yes"; then + AC_MSG_CHECKING([Linux kernel nl80211 Critical Protocol Start/Stop]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#ifndef __user + #define __user + #endif + #include + #include + #include + #include ]], + [[unsigned int a = NL80211_CMD_CRIT_PROTOCOL_START; a++;]])], + [ac_have_nl80211_critproto=yes], + [ac_have_nl80211_critproto=no]) + AC_MSG_RESULT($ac_have_nl80211_critproto) +else + ac_have_nl80211_critproto='no' +fi if test "$ac_have_nl80211_critproto" = yes; then AC_DEFINE(HAVE_NL80211_CRITICAL_PROTOCOL_CMDS, 1, [Define if nl80211 has critical protocol support]) else @@ -267,7 +274,11 @@ else fi AM_CONDITIONAL(HAVE_DBUS_GLIB_100, test "${have_dbus_glib_100}" = "yes") -PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32 gmodule-2.0) +PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], + [AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh'), + AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')], + [PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32 gmodule-2.0) + AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')]) dnl GLIB_VERSION_MIN_REQUIRED should match the version above. dnl GLIB_VERSION_MAX_ALLOWED should be set to the same version; @@ -428,6 +439,13 @@ else AC_DEFINE(HAVE_KERNEL_INET6_ADDR_GEN_MODE, 0, [Define if the kernel has IN6_ADDR_GEN_MODE_*]) fi +# IPv6 tokenized identifiers support in libnl +AC_CHECK_LIB([nl-route-3], [rtnl_link_inet6_get_token], + ac_have_ipv6_token="1", + ac_have_ipv6_token="0") +AC_DEFINE_UNQUOTED(HAVE_LIBNL_INET6_TOKEN, + $ac_have_ipv6_token, [Define if libnl has rtnl_link_inet6_get_token()]) + # uuid library PKG_CHECK_MODULES(UUID, uuid) AC_SUBST(UUID_CFLAGS) @@ -685,10 +703,10 @@ fi if test "$with_dhcpcd" = "yes"; then AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin) if test "$with_dhcpcd" != "no"; then - if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [456789]\."; then + if ! $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[456789]]\."; then AC_MSG_WARN([Cannot use dhcpcd, version 4.x or higher is required]) with_dhcpcd=no - elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [6789]\."; then + elif $with_dhcpcd --version 2>&1 | grep -q "^dhcpcd [[6789]]\."; then AC_DEFINE(DHCPCD_SUPPORTS_IPV6, 1, [Define if dhcpcd supports IPv6 (6.x+)]) fi fi @@ -821,6 +839,18 @@ AM_CONDITIONAL(BUILD_NMTUI, test "$build_nmtui" = yes) NM_COMPILER_WARNINGS +AC_ARG_ENABLE(more-asserts, + AS_HELP_STRING([--enable-more-asserts], [Enable more assertions for debugging (default: no)])) +if test "${enable_more_asserts}" = "yes"; then + AC_DEFINE(NM_MORE_ASSERTS, [1], [Define if more asserts are enabled]) +fi + +AC_ARG_ENABLE(more-logging, + AS_HELP_STRING([--enable-more-logging], [Enable more debug logging (default: no)])) +if test "${enable_more_logging}" = "yes"; then + AC_DEFINE(NM_MORE_LOGGING, [1], [Define if more asserts are enabled]) +fi + AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)])) if (test "${enable_lto}" = "yes"); then CFLAGS="-flto $CFLAGS" @@ -852,8 +882,16 @@ AS_IF([test "$with_valgrind" == "yes"], # Add conditionals and substitutions AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" != "no") AM_CONDITIONAL(REQUIRE_ROOT_TESTS, test "$enable_tests" == "root") +AC_ARG_WITH(valgrind-suppressions, AS_HELP_STRING([--with-valgrind-suppressions=path], [Use specific valgrind suppression file])) +if test "$with_valgrind" == no; then + with_valgrind_suppressions= +else + if test "$with_valgrind_suppressions" == ""; then + with_valgrind_suppressions='$(top_srcdir)/valgrind.suppressions' + fi +fi AS_IF([test "$with_valgrind" != "no"], - AC_SUBST(VALGRIND_RULES, 'TESTS_ENVIRONMENT = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" "$(top_srcdir)/valgrind.suppressions"'), + AC_SUBST(VALGRIND_RULES, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"), AC_SUBST(VALGRIND_RULES, [])) AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no") @@ -1048,6 +1086,7 @@ echo echo "Features:" echo " wext: $ac_with_wext" +echo " wifi: $enable_wifi" echo " wimax: $enable_wimax" echo " ppp: $enable_ppp" echo " modemmanager-1: $with_modem_manager_1" @@ -1077,7 +1116,7 @@ echo echo "Miscellaneous:" echo " documentation: $enable_gtk_doc" echo " tests: $enable_tests" -echo " valgrind: $with_valgrind" +echo " valgrind: $with_valgrind $with_valgrind_suppressions" echo " code coverage: $enable_code_coverage" echo " LTO: $enable_lto" echo diff --git a/data/85-nm-unmanaged.rules b/data/85-nm-unmanaged.rules new file mode 100644 index 00000000..aefab5c4 --- /dev/null +++ b/data/85-nm-unmanaged.rules @@ -0,0 +1,34 @@ +# Do not modify this file, it will get overwriten on updates. +# To override or extend the rules place a file in /etc/udev/rules.d + +SUBSYSTEM!="net", GOTO="nm_unmanaged_end" + +# Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?) +ENV{ID_NET_DRIVER}=="?*", GOTO="nm_unmanaged_driver" +DRIVERS=="?*", GOTO="nm_unmanaged_driver" +PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $env{INTERFACE} |/bin/sed -n s/^driver:\ //p'", RESULT=="?*", ENV{ID_NET_DRIVER}="%c" +LABEL="nm_unmanaged_driver" + +# VirtualBox host networking. Out-of-tree driver that looks like an ordinary +# Ethernet. No parent device (lives in /virtual/), no support for ethtool +# to identify the driver, MAC address defaults to 08:00:27:, but can be +# changed. Interface name will have to do, it's always vboxnet*. +ENV{INTERFACE}=="vboxnet[0-9]*", ENV{NM_UNMANAGED}="1" + +# VMWare host networking. Out-of-tree driver that looks like an ordinary +# Ethernet. No parent device (lives in /virtual/), no support for +# ethtool to identify the driver. They have their own MAC prefix that +# can not be changed. +PROGRAM="/bin/cat %S%p/address", RESULT=="00:50:56:*", ENV{INTERFACE}=="vmnet[0-9]*", ENV{NM_UNMANAGED}="1" + +# Parallels Workstation host networking. Out-of-tree driver that looks like +# an ordinary Ethernet. No parent device (lives in /virtual/), no support for +# ethtool to identify the driver and the interface name is too generic. +# However, they have their own MAC prefix that can not be changed. +PROGRAM="/bin/cat %S%p/address", RESULT=="00:1c:42:*", ENV{INTERFACE}=="vnic[0-9]*", ENV{NM_UNMANAGED}="1" + +# Virtual Ethernet device pair. Often used to communicate with a peer interface +# in another net namespace and managed by libvirt, Docker or the like. +ENV{ID_NET_DRIVER}=="veth", ENV{NM_UNMANAGED}="1" + +LABEL="nm_unmanaged_end" diff --git a/data/Makefile.am b/data/Makefile.am index e91361a7..64ff3376 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -34,6 +34,12 @@ endif examplesdir = $(docdir)/examples examples_DATA = server.conf +if WITH_UDEV_DIR +udevrulesdir = $(UDEV_DIR)/rules.d +udevrules_DATA = \ + 85-nm-unmanaged.rules +endif + server.conf: server.conf.in $(edit) $< >$@ @@ -51,6 +57,7 @@ EXTRA_DIST = \ NetworkManager-wait-online-systemd-pre200.service.in \ NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in \ + 85-nm-unmanaged.rules \ server.conf.in CLEANFILES = \ diff --git a/data/Makefile.in b/data/Makefile.in index 51aaa3a3..89a0749b 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -157,8 +157,10 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(servicedir)" \ - "$(DESTDIR)$(systemdsystemunitdir)" -DATA = $(examples_DATA) $(service_DATA) $(systemdsystemunit_DATA) + "$(DESTDIR)$(systemdsystemunitdir)" \ + "$(DESTDIR)$(udevrulesdir)" +DATA = $(examples_DATA) $(service_DATA) $(systemdsystemunit_DATA) \ + $(udevrules_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -166,6 +168,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -279,6 +282,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -432,6 +436,10 @@ with_valgrind = @with_valgrind@ @HAVE_SYSTEMD_TRUE@service_DATA = $(service_in_files:.service.in=.service) examplesdir = $(docdir)/examples examples_DATA = server.conf +@WITH_UDEV_DIR_TRUE@udevrulesdir = $(UDEV_DIR)/rules.d +@WITH_UDEV_DIR_TRUE@udevrules_DATA = \ +@WITH_UDEV_DIR_TRUE@ 85-nm-unmanaged.rules + edit = sed \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@sbindir[@]|$(sbindir)|g' \ @@ -446,6 +454,7 @@ EXTRA_DIST = \ NetworkManager-wait-online-systemd-pre200.service.in \ NetworkManager-dispatcher.service.in \ org.freedesktop.NetworkManager.service.in \ + 85-nm-unmanaged.rules \ server.conf.in CLEANFILES = \ @@ -556,6 +565,27 @@ uninstall-systemdsystemunitDATA: @list='$(systemdsystemunit_DATA)'; test -n "$(systemdsystemunitdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(systemdsystemunitdir)'; $(am__uninstall_files_from_dir) +install-udevrulesDATA: $(udevrules_DATA) + @$(NORMAL_INSTALL) + @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(udevrulesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \ + done + +uninstall-udevrulesDATA: + @$(NORMAL_UNINSTALL) + @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) tags TAGS: ctags CTAGS: @@ -597,7 +627,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdsystemunitdir)"; do \ + for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(udevrulesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -653,7 +683,7 @@ info: info-am info-am: install-data-am: install-examplesDATA install-serviceDATA \ - install-systemdsystemunitDATA + install-systemdsystemunitDATA install-udevrulesDATA install-dvi: install-dvi-am @@ -698,7 +728,7 @@ ps: ps-am ps-am: uninstall-am: uninstall-examplesDATA uninstall-serviceDATA \ - uninstall-systemdsystemunitDATA + uninstall-systemdsystemunitDATA uninstall-udevrulesDATA .MAKE: install-am install-strip @@ -711,11 +741,12 @@ uninstall-am: uninstall-examplesDATA uninstall-serviceDATA \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-serviceDATA install-strip \ - install-systemdsystemunitDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags-am uninstall uninstall-am uninstall-examplesDATA \ - uninstall-serviceDATA uninstall-systemdsystemunitDATA + install-systemdsystemunitDATA install-udevrulesDATA \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-examplesDATA uninstall-serviceDATA \ + uninstall-systemdsystemunitDATA uninstall-udevrulesDATA .PRECIOUS: Makefile diff --git a/docs/Makefile.in b/docs/Makefile.in index 367eedba..6d65e596 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -195,6 +195,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -308,6 +309,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 162643b5..891f0402 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -145,6 +145,7 @@ ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -258,6 +259,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ +LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -455,6 +457,7 @@ GPATH = $(srcdir) TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -463,9 +466,9 @@ SETUP_FILES = \ #################################### EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in \ settings-spec.xsl $(GENERATED_FILES) -DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -501,11 +504,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; -#### templates #### -GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; - #### xml #### GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) @@ -755,18 +753,15 @@ $(REPORT_FILES): sgml-build.stamp setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ + destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp @@ -779,7 +774,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -796,23 +791,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -822,17 +802,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $( sgml.stamp: sgml-build.stamp @true -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -848,11 +828,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -877,13 +857,15 @@ clean-local: @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: @@ -930,9 +912,7 @@ uninstall-local: @HAVE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 79421726..112d9686 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -1,5 +1,4 @@ - diff --git a/docs/api/html/index.html b/docs/api/html/index.html index b227e2ee..c2c59933 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
-

Version 1.0.2 +

Version 1.0.4

Copyright © 2012 The NetworkManager Authors

@@ -72,7 +72,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24
\ No newline at end of file diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index d2c5a387..54a8424f 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -2,13 +2,13 @@ -NetworkManager D-Bus Reference Manual: Index +Index: NetworkManager D-Bus Reference Manual - + @@ -25,7 +25,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24
\ No newline at end of file diff --git a/docs/api/html/license.html b/docs/api/html/license.html index bd063781..b7944bba 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -2,12 +2,12 @@ -NetworkManager D-Bus Reference Manual: Appendix A. License +Appendix A. License: NetworkManager D-Bus Reference Manual - + @@ -379,7 +379,6 @@ Public License instead of this License.

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff --git a/docs/api/html/ref-dbus.html b/docs/api/html/ref-dbus.html index 8bc3817f..8a0b56c7 100644 --- a/docs/api/html/ref-dbus.html +++ b/docs/api/html/ref-dbus.html @@ -2,13 +2,13 @@ -NetworkManager D-Bus Reference Manual: D-Bus API Reference +D-Bus API Reference: NetworkManager D-Bus Reference Manual - + @@ -29,7 +29,6 @@ spec.html
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff --git a/docs/api/html/ref-migrating.html b/docs/api/html/ref-migrating.html index 02fcb588..34f90ebb 100644 --- a/docs/api/html/ref-migrating.html +++ b/docs/api/html/ref-migrating.html @@ -2,13 +2,13 @@ -NetworkManager D-Bus Reference Manual: Migrating from NetworkManager 0.8 to NetworkManager 0.9 +Migrating from NetworkManager 0.8 to NetworkManager 0.9: NetworkManager D-Bus Reference Manual - + @@ -535,7 +535,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 6fca6945..10405a35 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -2,13 +2,13 @@ -NetworkManager D-Bus Reference Manual: Network Configuration Setting Specification +Network Configuration Setting Specification: NetworkManager D-Bus Reference Manual - + @@ -248,7 +248,7 @@ 
system-ca-certs
boolean
FALSE
-When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. +When TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch. The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant). @@ -595,6 +595,12 @@ The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority. +
autoconnect-slaves
+
NMSettingConnectionAutoconnectSlaves (int32)
+

+Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.
+
+
 
gateway-ping-timeout

 
uint32

 
0

@@ -1148,7 +1154,7 @@
 
ip6-privacy

 
NMSettingIP6ConfigPrivacy (int32)

 

-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).
+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: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr".
 
 
 
may-fail

@@ -2039,7 +2045,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
index 2b27c7f8..bb727419 100644
--- a/docs/api/html/secrets-flags.html
+++ b/docs/api/html/secrets-flags.html
@@ -2,13 +2,13 @@
 
 
 
-NetworkManager D-Bus Reference Manual: Secret flag types
+Secret flag types: NetworkManager D-Bus Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -58,7 +58,6 @@
       

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index f7992202..bcd634dd 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,4 +1,4 @@
-NetworkManager D-Bus Interface Specification version 1.0.2
NetworkManager D-Bus Interface Specification
Version 1.0.2
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 1.0.4
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
@@ -811,6 +811,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59

           The SIM PIN was incorrect.
+        
NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60

+          A new connection activation was enqueued.
+        
NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61

+          The device's parent changed.
+        
NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62

+          The device parent's management changed.
         
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
         )
diff --git a/docs/api/html/style.css b/docs/api/html/style.css
index c141ddd2..36754209 100644
--- a/docs/api/html/style.css
+++ b/docs/api/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a  as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index abf8fde1..f1b507fe 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -34,7 +34,7 @@
     private-key-passwordstringThe password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
     private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key-password" property.
     subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.
-    system-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties.
+    system-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
   
   adsl settingKey NameValue TypeDefault ValueValue DescriptionencapsulationstringEncapsulation of ADSL connection.  Can be "vcmux" or "llc".
@@ -83,6 +83,7 @@
   

     
connection settingKey NameValue TypeDefault ValueValue DescriptionautoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
+    autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32)Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.idstringA human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".interface-namestringThe name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
@@ -167,7 +168,7 @@
     gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.ignore-auto-routesbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
-    ip6-privacyNMSettingIP6ConfigPrivacy (int32)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).
+    ip6-privacyNMSettingIP6ConfigPrivacy (int32)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: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr".may-failbooleanTRUEIf TRUE, allow overall network configuration to proceed even if the configuration specified by this property 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 on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.methodstringIP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty.namestringipv6The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired".
diff --git a/docs/api/spec.html b/docs/api/spec.html
index f7992202..bcd634dd 100644
--- a/docs/api/spec.html
+++ b/docs/api/spec.html
@@ -1,4 +1,4 @@
-NetworkManager D-Bus Interface Specification version 1.0.2
NetworkManager D-Bus Interface Specification
Version 1.0.2
Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

+        
NetworkManager D-Bus Interface Specification
Version 1.0.4
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
@@ -811,6 +811,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59

           The SIM PIN was incorrect.
+        
NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60

+          A new connection activation was enqueued.
+        
NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61

+          The device's parent changed.
+        
NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62

+          The device parent's management changed.
         
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
         )
diff --git a/docs/api/tmpl/NetworkManager-unused.sgml b/docs/api/tmpl/NetworkManager-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index 796e69f2..8c0dbdce 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -142,6 +142,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -255,6 +256,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -480,6 +482,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -487,9 +490,9 @@ SETUP_FILES = \
 
 # include common portion ...
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -524,11 +527,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -765,18 +763,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -789,7 +784,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -806,23 +801,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -832,17 +812,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -858,11 +838,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -887,13 +867,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -940,9 +922,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index e0e5660a..9182a27a 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMAccessPoint
+NMAccessPoint: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -270,8 +270,6 @@
 

 

 
Description

-

-

 

 

 
Functions

@@ -333,7 +331,6 @@ nm_access_point_get_flags (
 
Returns

 
 the flags

-

 

 

 

@@ -360,7 +357,6 @@ nm_access_point_get_wpa_flags (
 
Returns

 
 the WPA flags

-

 

@@ -388,7 +384,6 @@ point.

 

 
Returns

 
 the RSN flags

-

 

 
 

@@ -416,7 +411,6 @@ nm_access_point_get_ssid (
Returns

 
 the GByteArray containing the SSID. This is the internal copy used by the
 access point, and must not be modified.

-

 
 
 

@@ -444,7 +438,6 @@ nm_access_point_get_bssid (
Returns

 
 the BSSID of the access point. This is an internal string and must
 not be modified or freed.

-

 
 
 

@@ -471,7 +464,6 @@ nm_access_point_get_frequency (
 
Returns

 
 the frequency

-

 
 
 

@@ -498,7 +490,6 @@ nm_access_point_get_mode (
 
Returns

 
 the mode

-

 
 
 

@@ -525,7 +516,6 @@ nm_access_point_get_max_bitrate (
 
Returns

 
 the maximum bit rate (kbit/s)

-

 
 
 

@@ -552,7 +542,6 @@ nm_access_point_get_strength (
 
Returns

 
 the signal strength

-

 
 
 

@@ -643,7 +632,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this Wi-Fi AP,
 FALSE if it cannot be.

-

 
 
 

@@ -675,7 +663,6 @@ nm_access_point_get_hw_address (
Returns

 
 the hardware address of the access point. This is the internal string used by the
 access point and must not be modified.

-

 
 
 
@@ -685,80 +672,60 @@ access point and must not be modified.

 
NM_ACCESS_POINT_FLAGS

 
#define NM_ACCESS_POINT_FLAGS       "flags"
 

-

-

 
 

 

 
NM_ACCESS_POINT_WPA_FLAGS

 
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 

-

-

 

 

 

 
NM_ACCESS_POINT_RSN_FLAGS

 
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 

-

-

 

 

 

 
NM_ACCESS_POINT_SSID

 
#define NM_ACCESS_POINT_SSID        "ssid"
 

-

-

 

 

 

 
NM_ACCESS_POINT_BSSID

 
#define NM_ACCESS_POINT_BSSID       "bssid"
 

-

-

 

 

 

 
NM_ACCESS_POINT_FREQUENCY

 
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 

-

-

 

 

 

 
NM_ACCESS_POINT_MODE

 
#define NM_ACCESS_POINT_MODE        "mode"
 

-

-

 

 

 

 
NM_ACCESS_POINT_MAX_BITRATE

 
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 

-

-

 

 

 

 
NM_ACCESS_POINT_STRENGTH

 
#define NM_ACCESS_POINT_STRENGTH    "strength"
 

-

-

 

 

 

 
NM_ACCESS_POINT_HW_ADDRESS

 
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 

-

-

 

 
 

@@ -766,7 +733,7 @@ access point and must not be modified.

 

 
The “bssid” property

 
  “bssid”                    gchar *

-

+
The BSSID of the access point.

 
Flags: Read

 
Default value: NULL

 

@@ -774,7 +741,7 @@ access point and must not be modified.

 

 
The “flags” property

 
  “flags”                    guint

-

+
The flags of the access point.

 
Flags: Read

 
Allowed values: <= 1

 
Default value: 0

@@ -783,7 +750,7 @@ access point and must not be modified.

 

 
The “frequency” property

 
  “frequency”                guint

-

+
The frequency of the access point.

 
Flags: Read

 
Allowed values: <= 10000

 
Default value: 0

@@ -792,7 +759,7 @@ access point and must not be modified.

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware address of the access point.

 
Flags: Read

 
Default value: NULL

 

@@ -800,7 +767,7 @@ access point and must not be modified.

 

 
The “max-bitrate” property

 
  “max-bitrate”              guint

-

+
The maximum bit rate of the access point in kbit/s.

 
Flags: Read

 
Default value: 0

 

@@ -808,7 +775,9 @@ access point and must not be modified.

 

 
The “mode” property

 
  “mode”                     guint

-

+
The mode of the access point; either "infrastructure" (a central
+coordinator of the wireless network allowing clients to connect) or
+"ad-hoc" (a network with no central controller).

 
Flags: Read

 
Allowed values: [1,2]

 
Default value: 2

@@ -817,7 +786,7 @@ access point and must not be modified.

 

 
The “rsn-flags” property

 
  “rsn-flags”                guint

-

+
The RSN flags of the access point.

 
Flags: Read

 
Default value: 0

 

@@ -825,14 +794,14 @@ access point and must not be modified.

 

 
The “ssid” property

 
  “ssid”                     NMSsid *

-

+
The SSID of the access point.

 
Flags: Read

 

 

 

 
The “strength” property

 
  “strength”                 guchar

-

+
The current signal strength of the access point.

 
Flags: Read

 
Default value: 0

 

@@ -840,14 +809,13 @@ access point and must not be modified.

 

 
The “wpa-flags” property

 
  “wpa-flags”                guint

-

+
The WPA flags of the access point.

 
Flags: Read

 
Default value: 0

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index d5f1b381..51037dca 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMActiveConnection
+NMActiveConnection: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -344,8 +344,6 @@
 

 

 
Description

-

-

 

 

 
Functions

@@ -411,7 +409,6 @@ nm_active_connection_get_connection ( the object path of the NMConnection which this NMActiveConnection
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.

-

 

 
 

@@ -439,9 +436,8 @@ nm_active_connection_get_id (
Returns

 
 the ID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -468,7 +464,6 @@ nm_active_connection_get_uuid (
Returns

 
 the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

-

 

 
 

@@ -497,9 +492,8 @@ nm_active_connection_get_connection_type
 
Returns

 
 the type of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -527,7 +521,6 @@ nm_active_connection_get_specific_object
 
Returns

 
 the specific object's DBus path. This is the internal string used by the
 connection, and must not be modified.

-

 

 
 

@@ -582,7 +575,6 @@ nm_active_connection_get_state (
 
Returns

 
 the state

-

 
 
 

@@ -610,7 +602,6 @@ nm_active_connection_get_master (
Returns

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

-

 
 
 

@@ -638,7 +629,6 @@ the default IPv4 route and DNS information).

 

 
Returns

 
 TRUE if the active connection is the default IPv4 connection

-

 

 
 

@@ -665,11 +655,11 @@ nm_active_connection_get_ip4_config (
 
Returns

 
 the NMIP4Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 

 
[transfer none]

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -697,10 +687,10 @@ nm_active_connection_get_dhcp4_config (
Returns

 
 the NMDHCP4Config, or NULL if the
 connection does not use DHCP, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

 
[transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -727,7 +717,6 @@ the default IPv6 route and DNS information).

 

 
Returns

 
 TRUE if the active connection is the default IPv6 connection

-

 

 

 

@@ -754,11 +743,11 @@ nm_active_connection_get_ip6_config (
 
Returns

 
 the NMIP6Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 

 
[transfer none]

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -786,10 +775,10 @@ nm_active_connection_get_dhcp6_config (
Returns

 
 the NMDHCP6Config, or NULL if the
 connection does not use DHCPv6, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

 
[transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -815,9 +804,8 @@ nm_active_connection_get_vpn (
 
Returns

 
 TRUE if the active connection is a VPN connection

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -826,120 +814,90 @@ nm_active_connection_get_vpn (
NM_ACTIVE_CONNECTION_CONNECTION

 
#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_ID

 
#define NM_ACTIVE_CONNECTION_ID                  "id"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_UUID

 
#define NM_ACTIVE_CONNECTION_UUID                "uuid"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_TYPE

 
#define NM_ACTIVE_CONNECTION_TYPE                "type"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT

 
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DEVICES

 
#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_STATE

 
#define NM_ACTIVE_CONNECTION_STATE               "state"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DEFAULT

 
#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_IP4_CONFIG

 
#define NM_ACTIVE_CONNECTION_IP4_CONFIG          "ip4-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DHCP4_CONFIG

 
#define NM_ACTIVE_CONNECTION_DHCP4_CONFIG        "dhcp4-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DEFAULT6

 
#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_IP6_CONFIG

 
#define NM_ACTIVE_CONNECTION_IP6_CONFIG          "ip6-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DHCP6_CONFIG

 
#define NM_ACTIVE_CONNECTION_DHCP6_CONFIG        "dhcp6-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_VPN

 
#define NM_ACTIVE_CONNECTION_VPN                 "vpn"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_MASTER

 
#define NM_ACTIVE_CONNECTION_MASTER              "master"
 

-

-

 

 
 

@@ -947,7 +905,7 @@ nm_active_connection_get_vpn (
 
The “connection” property

 
  “connection”               gchar *

-

+
The connection's path of the active connection.

 
Flags: Read

 
Default value: NULL

 

@@ -955,7 +913,7 @@ nm_active_connection_get_vpn (
 
The “default” property

 
  “default”                  gboolean

-

+
Whether the active connection is the default IPv4 one.

 
Flags: Read

 
Default value: FALSE

 
@@ -963,7 +921,7 @@ nm_active_connection_get_vpn (
 
The “default6” property

 
  “default6”                 gboolean

-

+
Whether the active connection is the default IPv6 one.

 
Flags: Read

 
Default value: FALSE

 
@@ -971,55 +929,54 @@ nm_active_connection_get_vpn (
 
The “devices” property

 
  “devices”                  NMObjectArray *

-

 
Flags: Read

 
 

 

 
The “dhcp4-config” property

 
  “dhcp4-config”             NMDHCP4Config *

-

+
The NMDHCP4Config of the connection.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “dhcp6-config” property

 
  “dhcp6-config”             NMDHCP6Config *

-

+
The NMDHCP6Config of the connection.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “id” property

 
  “id”                       gchar *

-

+
The active connection's ID

 
Flags: Read

 
Default value: NULL

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “ip4-config” property

 
  “ip4-config”               NMIP4Config *

-

+
The NMIP4Config of the connection.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “ip6-config” property

 
  “ip6-config”               NMIP6Config *

-

+
The NMIP6Config of the connection.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “master” property

 
  “master”                   gchar *

-

+
The path of the master device if one exists.

 
Flags: Read

 
Default value: NULL

 

@@ -1027,7 +984,7 @@ nm_active_connection_get_vpn (
 
The “specific-object” property

 
  “specific-object”          gchar *

-

+
The specific object's path of the active connection.

 
Flags: Read

 
Default value: NULL

 
@@ -1035,7 +992,7 @@ nm_active_connection_get_vpn (
 
The “state” property

 
  “state”                    guint

-

+
The state of the active connection.

 
Flags: Read

 
Allowed values: <= 3

 
Default value: 0

@@ -1044,16 +1001,16 @@ nm_active_connection_get_vpn (
 
The “type” property

 
  “type”                     gchar *

-

+
The active connection's type

 
Flags: Read

 
Default value: NULL

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

 
The “uuid” property

 
  “uuid”                     gchar *

-

+
The active connection's UUID

 
Flags: Read

 
Default value: NULL

 

@@ -1061,15 +1018,14 @@ nm_active_connection_get_vpn (
 
The “vpn” property

 
  “vpn”                      gboolean

-

+
Whether the active connection is a VPN connection.

 
Flags: Read

 
Default value: FALSE

-
Since 0.9.10

+
Since: 0.9.10

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 23eca511..1f0d4ae2 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMClient
+NMClient: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -570,8 +570,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -583,9 +581,8 @@ nm_client_error_quark (void
 
Returns

 
 the error quark used for NMClient errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -602,7 +599,6 @@ control them.  To access and modify network configuration data, use the
 

 
Returns

 
 a new NMClient or NULL on an error

-

 

 

 

@@ -681,7 +677,6 @@ nm_client_new_finish (GAsyncResul
 

 
Returns

 
 a new NMClient, or NULL on error

-

 

 
 

@@ -796,8 +791,6 @@ or NULL if none is found. 

                        NMActiveConnection *active_connection,
                        GError *error,
                        gpointer user_data);
-

-

 
 

 

@@ -885,8 +878,6 @@ details of the newly added connection. 

                           const char *new_connection_path,
                           GError *error,
                           gpointer user_data);
-

-

 

 

 

@@ -1014,7 +1005,6 @@ nm_client_networking_get_enabled (
 
Returns

 
 TRUE if networking is enabled, FALSE if networking is disabled

-

 

 
 

@@ -1073,7 +1063,6 @@ nm_client_wireless_get_enabled (
 
Returns

 
 TRUE if wireless is enabled

-

 
 
 

@@ -1131,7 +1120,6 @@ nm_client_wireless_hardware_get_enabled
 

 
Returns

 
 TRUE if the wireless hardware is enabled

-

 

 
 

@@ -1158,7 +1146,6 @@ nm_client_wwan_get_enabled (
 
Returns

 
 TRUE if WWAN is enabled

-

 
 
 

@@ -1215,7 +1202,6 @@ nm_client_wwan_hardware_get_enabled (
 
Returns

 
 TRUE if the WWAN hardware is enabled

-

 
 
 

@@ -1242,7 +1228,6 @@ nm_client_wimax_get_enabled (
 
Returns

 
 TRUE if WiMAX is enabled

-

 
 
 

@@ -1299,7 +1284,6 @@ nm_client_wimax_hardware_get_enabled (
 
Returns

 
 TRUE if the WiMAX hardware is enabled

-

 
 
 

@@ -1326,7 +1310,6 @@ nm_client_get_version (
 
Returns

 
 string with the version

-

 
 
 

@@ -1353,7 +1336,6 @@ nm_client_get_state (
 
Returns

 
 the current NMState

-

 
 
 

@@ -1381,9 +1363,8 @@ connections at startup.

 

 
Returns

 
 whether the daemon is still starting up

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1409,7 +1390,6 @@ nm_client_get_manager_running (
 
Returns

 
 TRUE if the daemon is running

-

 

 
 

@@ -1504,7 +1484,6 @@ client can or cannot perform the action the permission represents

 

 
Returns

 
 the permission's result, one of NMClientPermissionResult

-

 

 
 

@@ -1552,9 +1531,8 @@ a list of domains separated by ",". 

 

 
Returns

 
 TRUE on success, FALSE otherwise

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1601,9 +1579,8 @@ domains separated by ",". (NULL or an empty string
 

 
Returns

 
 TRUE on success, FALSE otherwise

-

 

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

@@ -1632,9 +1609,8 @@ connectivity state first before returning any information.

 

 
Returns

 
 the current connectivity state

-

 

-
Since 0.9.8.6

+
Since: 0.9.8.6

 

 

 

@@ -1678,9 +1654,8 @@ if you do not want to block.

 

 
Returns

 
 the (new) current connectivity state

-

 

-
Since 0.9.8.6

+
Since: 0.9.8.6

 

 

 

@@ -1728,7 +1703,7 @@ re-checking, and Since 0.9.8.6

+
Since: 0.9.8.6

 

 

 

@@ -1769,9 +1744,8 @@ call.

 

 
Returns

 
 the (new) current connectivity state

-

 

-
Since 0.9.8.6

+
Since: 0.9.8.6

 

 

 

@@ -1808,7 +1782,7 @@ non-NetworkManager-recognized device, this will return NUL
 any. 

 
[transfer none]

 

-
Since 0.9.8.6

+
Since: 0.9.8.6

 
 

 

@@ -1839,7 +1813,7 @@ currently-activating connection that is expected to become the new
 any. 

 
[transfer none]

 

-
Since 0.9.8.6

+
Since: 0.9.8.6

 
 
 

@@ -1848,128 +1822,96 @@ any. 

 
NM_CLIENT_VERSION

 
#define NM_CLIENT_VERSION "version"
 

-

-

 

 

 

 
NM_CLIENT_STATE

 
#define NM_CLIENT_STATE "state"
 

-

-

 

 

 

 
NM_CLIENT_STARTUP

 
#define NM_CLIENT_STARTUP "startup"
 

-

-

 

 

 

 
NM_CLIENT_MANAGER_RUNNING

 
#define NM_CLIENT_MANAGER_RUNNING "manager-running"
 

-

-

 

 

 

 
NM_CLIENT_NETWORKING_ENABLED

 
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIRELESS_ENABLED

 
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

 
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WWAN_ENABLED

 
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WWAN_HARDWARE_ENABLED

 
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIMAX_ENABLED

 
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIMAX_HARDWARE_ENABLED

 
#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
 

-

-

 

 

 

 
NM_CLIENT_ACTIVE_CONNECTIONS

 
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
 

-

-

 

 

 

 
NM_CLIENT_CONNECTIVITY

 
#define NM_CLIENT_CONNECTIVITY "connectivity"
 

-

-

 

 

 

 
NM_CLIENT_PRIMARY_CONNECTION

 
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
 

-

-

 

 

 

 
NM_CLIENT_ACTIVATING_CONNECTION

 
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 

-

-

 

 

 

 
NM_CLIENT_DEVICES

 
#define NM_CLIENT_DEVICES "devices"
 

-

-

 

 

 

@@ -2176,8 +2118,6 @@ the user requires to obtain a given 
NM_CLIENT_ERROR

 
#define NM_CLIENT_ERROR nm_client_error_quark ()
 

-

-

 

 
 

@@ -2185,40 +2125,42 @@ the user requires to obtain a given 
 
The “activating-connection” property

 
  “activating-connection”    NMActiveConnection *

-

+
The NMActiveConnection of the activating connection that is
+likely to become the new “primary-connection”.

 
Flags: Read

-
Since 0.9.8.6

+
Since: 0.9.8.6

 

 

 

 
The “active-connections” property

 
  “active-connections”       NMObjectArray *

-

+
The active connections.
+Type: GLib.PtrArray

 
Flags: Read

 

 

 

 
The “connectivity” property

 
  “connectivity”             guint

-

+
The network connectivity state.

 
Flags: Read

 
Allowed values: <= 4

 
Default value: 0

-
Since 0.9.8.6

+
Since: 0.9.8.6

 

 

 

 
The “devices” property

 
  “devices”                  NMObjectArray *

-

+
List of known network devices.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “manager-running” property

 
  “manager-running”          gboolean

-

+
Whether the daemon is running.

 
Flags: Read

 
Default value: FALSE

 

@@ -2226,7 +2168,7 @@ the user requires to obtain a given 
 
The “networking-enabled” property

 
  “networking-enabled”       gboolean

-

+
Whether networking is enabled.

 
Flags: Read / Write

 
Default value: TRUE

 
@@ -2234,24 +2176,25 @@ the user requires to obtain a given 
 
The “primary-connection” property

 
  “primary-connection”       NMActiveConnection *

-

+
The NMActiveConnection of the device with the default route;
+see nm_client_get_primary_connection() for more details.

 
Flags: Read

-
Since 0.9.8.6

+
Since: 0.9.8.6

 
 

 

 
The “startup” property

 
  “startup”                  gboolean

-

+
Whether the daemon is still starting up.

 
Flags: Read

 
Default value: FALSE

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “state” property

 
  “state”                    guint

-

+
The current daemon state.

 
Flags: Read

 
Allowed values: <= 70

 
Default value: 0

@@ -2260,7 +2203,7 @@ the user requires to obtain a given 
 
The “version” property

 
  “version”                  gchar *

-

+
The NetworkManager version.

 
Flags: Read

 
Default value: NULL

 

@@ -2268,7 +2211,7 @@ the user requires to obtain a given 
 
The “wimax-enabled” property

 
  “wimax-enabled”            gboolean

-

+
Whether WiMAX functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -2276,7 +2219,7 @@ the user requires to obtain a given 
 
The “wimax-hardware-enabled” property

 
  “wimax-hardware-enabled”   gboolean

-

+
Whether the WiMAX hardware is enabled.

 
Flags: Read

 
Default value: FALSE

 
@@ -2284,7 +2227,7 @@ the user requires to obtain a given 
 
The “wireless-enabled” property

 
  “wireless-enabled”         gboolean

-

+
Whether wireless is enabled.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -2292,7 +2235,7 @@ the user requires to obtain a given 
 
The “wireless-hardware-enabled” property

 
  “wireless-hardware-enabled” gboolean

-

+
Whether the wireless hardware is enabled.

 
Flags: Read

 
Default value: TRUE

 
@@ -2300,7 +2243,7 @@ the user requires to obtain a given 
 
The “wwan-enabled” property

 
  “wwan-enabled”             gboolean

-

+
Whether WWAN functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -2308,7 +2251,7 @@ the user requires to obtain a given 
 
The “wwan-hardware-enabled” property

 
  “wwan-hardware-enabled”    gboolean

-

+
Whether the WWAN hardware is enabled.

 
Flags: Read

 
Default value: FALSE

 
@@ -2321,6 +2264,34 @@ the user requires to obtain a given NMClient *client,
                GObject  *device,
                gpointer  user_data)
+
Notifies that a NMDevice is added.

+

+
Parameters

+

     
     
     
     
     
     
     
     
     
     
 
 

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





client
the client that received the signal
 
device
 the new device. 
[type NMDevice]
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 

@@ -2330,6 +2301,34 @@ user_function (NMClient *client,
                GObject  *device,
                gpointer  user_data)
+
Notifies that a NMDevice is removed.

+

+
Parameters

+

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





client
the client that received the signal
 
device
 the removed device. 
[type NMDevice]
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -2340,12 +2339,44 @@ user_function (guint     permission,
                guint     result,
                gpointer  user_data)
+
Notifies that a permission has changed

+

+
Parameters

+

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





client
the client that received the signal
 
permission
a permission from NMClientPermission
 
result
the permission's result, one of NMClientPermissionResult
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index c400cc6a..87c74fef 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDHCP4Config
+NMDHCP4Config: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -105,8 +105,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -205,7 +203,6 @@ nm_dhcp4_config_get_one_option (
Returns

 
 the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.

-

 

 
 
@@ -215,8 +212,6 @@ configuration, and must not be modified.

 
NM_DHCP4_CONFIG_OPTIONS

 
#define NM_DHCP4_CONFIG_OPTIONS "options"
 

-

-

 
 
 

@@ -224,13 +219,13 @@ configuration, and must not be modified.

 

 
The “options” property

 
  “options”                  GHashTable *

-

+
The GHashTable containing options of the configuration.

+
Type: GLib.HashTable(utf8,GObject.Value)

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index c50a23df..7b322c5e 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDHCP6Config
+NMDHCP6Config: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -105,8 +105,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -205,7 +203,6 @@ nm_dhcp6_config_get_one_option (
Returns

 
 the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.

-

 

 
 
@@ -215,8 +212,6 @@ configuration, and must not be modified.

 
NM_DHCP6_CONFIG_OPTIONS

 
#define NM_DHCP6_CONFIG_OPTIONS "options"
 

-

-

 
 
 

@@ -224,13 +219,13 @@ configuration, and must not be modified.

 

 
The “options” property

 
  “options”                  GHashTable *

-

+
The GHashTable containing options of the configuration.

+
Type: GLib.HashTable(utf8,GObject.Value)

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 2d5281c8..79f87a5d 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDevice
+NMDevice: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -634,8 +634,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -647,9 +645,8 @@ nm_device_error_quark (void
 
Returns

 
 the error quark used for NMDevice errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -711,7 +708,6 @@ nm_device_get_iface (
Returns

 
 the interface of the device. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -740,7 +736,6 @@ when the device is in the ACTIVATED state.

 
Returns

 
 the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.

-

 
 
 

@@ -767,7 +762,6 @@ nm_device_get_device_type (
 
Returns

 
 the device type

-

 
 
 

@@ -796,7 +790,6 @@ nm_device_get_udi (
Returns

 
 the driver of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -852,7 +844,6 @@ nm_device_get_driver_version (
Returns

 
 the version of the device driver. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -880,7 +871,6 @@ nm_device_get_firmware_version (
Returns

 
 the firmware version of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -910,9 +900,8 @@ nm_device_get_type_description (
Returns

 
 the type description of the device. This is the internal
 string used by the device, and must not be modified.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -940,9 +929,8 @@ nm_device_get_hw_address (
Returns

 
 the current MAC of the device, or NULL.
 This is the internal string used by the device, and must not be modified.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -968,7 +956,6 @@ nm_device_get_capabilities (
 
Returns

 
 the capabilities

-

 

 
 

@@ -995,7 +982,6 @@ nm_device_get_managed (
 
Returns

 
 TRUE if the device is managed by NetworkManager

-

 
 
 

@@ -1022,7 +1008,6 @@ nm_device_get_autoconnect (
 
Returns

 
 TRUE if the device is allowed to be autoconnected

-

 
 
 

@@ -1081,7 +1066,6 @@ to be missing.

 
Returns

 
 TRUE if firmware required for the device's operation is likely
 to be missing.

-

 
 
 

@@ -1230,7 +1214,6 @@ nm_device_get_state (
 
Returns

 
 the current device state

-

 
 
 

@@ -1267,7 +1250,6 @@ the state (reason
 

 
Returns

 
 the current device state

-

 

 
 

@@ -1328,7 +1310,7 @@ containing NMRemoteConnecti
 the connection, and must not be modified. 

 
[element-type NMRemoteConnection]

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1359,9 +1341,8 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)

 
 the physical port ID of the device, or NULL if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1387,9 +1368,8 @@ nm_device_get_mtu (
 
Returns

 
 the MTU of the device.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1416,9 +1396,8 @@ nm_device_is_software (
Returns

 
 TRUE if device
 is a software device, FALSE if it is a hardware device.

-

 

-
Since 1.0

+
Since: 1.0

 
 

 

@@ -1445,7 +1424,6 @@ nm_device_get_product (
Returns

 
 the product name of the device. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -1473,7 +1451,6 @@ nm_device_get_vendor (
Returns

 
 the vendor name of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -1503,9 +1480,8 @@ nm_device_get_description (device
 . If either the vendor or the
 product name is unknown, this returns the interface name.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1544,7 +1520,7 @@ devices in devices
 
 the device names. 

 
[transfer full][array zero-terminated=1]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1553,8 +1529,6 @@ devices in devices
 (*NMDeviceCallbackFn) (NMDevice *device,
                        GError *error,
                        gpointer user_data);
-

-

 

 

 

@@ -1633,7 +1607,7 @@ operation completes. 

 
 

 
-
Since 1.0

+
Since: 1.0

 
 

 

@@ -1726,7 +1700,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.

-

 

 
 

@@ -1780,7 +1753,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.

-

 
 
 

@@ -1810,9 +1782,8 @@ that can be used on device
 
Returns

 
 device
 's associated NMSetting type

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1822,8 +1793,6 @@ that can be used on device
                          GError *error,
                          gpointer user_data);
 
NMDeviceDeactivateFn is deprecated and should not be used in newly-written code.

-

-

 

 
 

@@ -1863,192 +1832,144 @@ that can be used on device
 
NM_DEVICE_ERROR

 
#define NM_DEVICE_ERROR nm_device_error_quark ()
 

-

-

 

 

 

 
NM_DEVICE_DEVICE_TYPE

 
#define NM_DEVICE_DEVICE_TYPE "device-type"
 

-

-

 

 

 

 
NM_DEVICE_UDI

 
#define NM_DEVICE_UDI "udi"
 

-

-

 

 

 

 
NM_DEVICE_INTERFACE

 
#define NM_DEVICE_INTERFACE "interface"
 

-

-

 

 

 

 
NM_DEVICE_IP_INTERFACE

 
#define NM_DEVICE_IP_INTERFACE "ip-interface"
 

-

-

 

 

 

 
NM_DEVICE_DRIVER

 
#define NM_DEVICE_DRIVER "driver"
 

-

-

 

 

 

 
NM_DEVICE_DRIVER_VERSION

 
#define NM_DEVICE_DRIVER_VERSION "driver-version"
 

-

-

 

 

 

 
NM_DEVICE_FIRMWARE_VERSION

 
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
 

-

-

 

 

 

 
NM_DEVICE_CAPABILITIES

 
#define NM_DEVICE_CAPABILITIES "capabilities"
 

-

-

 

 

 

 
NM_DEVICE_MANAGED

 
#define NM_DEVICE_MANAGED "managed"
 

-

-

 

 

 

 
NM_DEVICE_AUTOCONNECT

 
#define NM_DEVICE_AUTOCONNECT "autoconnect"
 

-

-

 

 

 

 
NM_DEVICE_FIRMWARE_MISSING

 
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 

-

-

 

 

 

 
NM_DEVICE_IP4_CONFIG

 
#define NM_DEVICE_IP4_CONFIG "ip4-config"
 

-

-

 

 

 

 
NM_DEVICE_DHCP4_CONFIG

 
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 

-

-

 

 

 

 
NM_DEVICE_IP6_CONFIG

 
#define NM_DEVICE_IP6_CONFIG "ip6-config"
 

-

-

 

 

 

 
NM_DEVICE_DHCP6_CONFIG

 
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 

-

-

 

 

 

 
NM_DEVICE_STATE

 
#define NM_DEVICE_STATE "state"
 

-

-

 

 

 

 
NM_DEVICE_STATE_REASON

 
#define NM_DEVICE_STATE_REASON "state-reason"
 

-

-

 

 

 

 
NM_DEVICE_ACTIVE_CONNECTION

 
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
 

-

-

 

 

 

 
NM_DEVICE_AVAILABLE_CONNECTIONS

 
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 

-

-

 

 

 

 
NM_DEVICE_VENDOR

 
#define NM_DEVICE_VENDOR "vendor"
 

-

-

 

 

 

 
NM_DEVICE_PRODUCT

 
#define NM_DEVICE_PRODUCT "product"
 

-

-

 

 

 

 
NM_DEVICE_PHYSICAL_PORT_ID

 
#define NM_DEVICE_PHYSICAL_PORT_ID "physical-port-id"
 

-

-

 

 

 

 
NM_DEVICE_MTU

 
#define NM_DEVICE_MTU "mtu"
 

-

-

 

 
 

@@ -2056,14 +1977,14 @@ that can be used on device
 

 
The “active-connection” property

 
  “active-connection”        NMActiveConnection *

-

+
The NMActiveConnection object that "owns" this device during activation.

 
Flags: Read

 

 

 

 
The “autoconnect” property

 
  “autoconnect”              gboolean

-

+
Whether the device can auto-activate a connection.

 
Flags: Read / Write

 
Default value: TRUE

 

@@ -2071,15 +1992,15 @@ that can be used on device
 

 
The “available-connections” property

 
  “available-connections”    NMObjectArray *

-

+
The available connections (NMRemoteConnection) of the device

 
Flags: Read

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “capabilities” property

 
  “capabilities”             guint

-

+
The capabilities of the device.

 
Flags: Read

 
Default value: 0

 

@@ -2087,7 +2008,7 @@ that can be used on device
 

 
The “device-type” property

 
  “device-type”              guint

-

+
The numeric type of the device.

 
Flags: Read

 
Default value: 0

 

@@ -2095,21 +2016,21 @@ that can be used on device
 

 
The “dhcp4-config” property

 
  “dhcp4-config”             NMDHCP4Config *

-

+
The NMDHCP4Config of the device.

 
Flags: Read

 

 

 

 
The “dhcp6-config” property

 
  “dhcp6-config”             NMDHCP6Config *

-

+
The NMDHCP6Config of the device.

 
Flags: Read

 

 

 

 
The “driver” property

 
  “driver”                   gchar *

-

+
The driver of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2117,7 +2038,7 @@ that can be used on device
 

 
The “driver-version” property

 
  “driver-version”           gchar *

-

+
The version of the device driver.

 
Flags: Read

 
Default value: NULL

 

@@ -2125,7 +2046,8 @@ that can be used on device
 

 
The “firmware-missing” property

 
  “firmware-missing”         gboolean

-

+
When TRUE indicates the device is likely missing firmware required
+for its operation.

 
Flags: Read

 
Default value: FALSE

 

@@ -2133,7 +2055,7 @@ that can be used on device
 

 
The “firmware-version” property

 
  “firmware-version”         gchar *

-

+
The firmware version of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2141,7 +2063,7 @@ that can be used on device
 

 
The “interface” property

 
  “interface”                gchar *

-

+
The interface of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2149,7 +2071,8 @@ that can be used on device
 

 
The “ip-interface” property

 
  “ip-interface”             gchar *

-

+
The IP interface of the device which should be used for all IP-related
+operations like addressing and routing.

 
Flags: Read

 
Default value: NULL

 

@@ -2157,21 +2080,21 @@ that can be used on device
 

 
The “ip4-config” property

 
  “ip4-config”               NMIP4Config *

-

+
The NMIP4Config of the device.

 
Flags: Read

 

 

 

 
The “ip6-config” property

 
  “ip6-config”               NMIP6Config *

-

+
The NMIP6Config of the device.

 
Flags: Read

 

 

 

 
The “managed” property

 
  “managed”                  gboolean

-

+
Whether the device is managed by NetworkManager.

 
Flags: Read

 
Default value: FALSE

 

@@ -2179,25 +2102,26 @@ that can be used on device
 

 
The “mtu” property

 
  “mtu”                      guint

-

+
The MTU of the device.

 
Flags: Read

 
Default value: 1500

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “physical-port-id” property

 
  “physical-port-id”         gchar *

-

+
The physical port ID of the device. (See
+nm_device_get_physical_port_id().)

 
Flags: Read

 
Default value: NULL

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “product” property

 
  “product”                  gchar *

-

+
The product string of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2205,7 +2129,7 @@ that can be used on device
 

 
The “state” property

 
  “state”                    guint

-

+
The state of the device.

 
Flags: Read

 
Default value: 0

 

@@ -2213,14 +2137,19 @@ that can be used on device
 

 
The “state-reason” property

 
  “state-reason”             GValueArray_guint+guint_*

-

+
The state and reason of the device.

 
Flags: Read

 

 

 

 
The “udi” property

 
  “udi”                      gchar *

-

+
An operating-system specific device hardware identifier; this is not
+unique to a specific hardware device across reboots or hotplugs.  It
+is an opaque string which for some device types (Bluetooth, Modem)
+contains an identifier provided by the underlying hardware service daemon
+such as Bluez or ModemManager, and clients can use this property to
+request more information about the device from those services.

 
Flags: Read

 
Default value: NULL

 

@@ -2228,7 +2157,7 @@ that can be used on device
 

 
The “vendor” property

 
  “vendor”                   gchar *

-

+
The vendor string of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2243,12 +2172,49 @@ user_function (guint     old_state,
                guint     reason,
                gpointer  user_data)
+
Notifies the state change of a NMDevice.

+

+
Parameters

+

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





device
the device object that received the signal
 
new_state
the new state of the device
 
old_state
the previous state of the device
 
reason
the reason describing the state change
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index 404fb121..3f108475 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceAdsl
+NMDeviceAdsl: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -116,8 +116,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -129,7 +127,6 @@ nm_device_adsl_error_quark (void<
 

 
Returns

 
 the error quark used for NMDeviceAdsl errors.

-

 

 

 

@@ -191,7 +188,6 @@ nm_device_adsl_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 
@@ -238,16 +234,12 @@ nm_device_adsl_get_carrier (
NM_DEVICE_ADSL_ERROR

 
#define NM_DEVICE_ADSL_ERROR nm_device_adsl_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_ADSL_CARRIER

 
#define NM_DEVICE_ADSL_CARRIER "carrier"
 

-

-

 

 
 

@@ -255,14 +247,13 @@ nm_device_adsl_get_carrier (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index c79364a9..7659084c 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceBond
+NMDeviceBond: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -152,8 +152,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -165,7 +163,6 @@ nm_device_bond_error_quark (void<
 

 
Returns

 
 the error quark used for NMDeviceBond errors.

-

 

 

 

@@ -228,7 +225,6 @@ nm_device_bond_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -255,7 +251,6 @@ nm_device_bond_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 

@@ -288,7 +283,7 @@ nm_device_bond_get_slaves ([element-type NMDevice]

 
-
Since 0.9.6.4

+
Since: 0.9.6.4

 
 
 

@@ -341,32 +336,24 @@ copy used by the device, and must not be modified. 

 
NM_DEVICE_BOND_ERROR

 
#define NM_DEVICE_BOND_ERROR nm_device_bond_error_quark ()
 

-

-

 

 

 

 
NM_DEVICE_BOND_HW_ADDRESS

 
#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_BOND_CARRIER

 
#define NM_DEVICE_BOND_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_BOND_SLAVES

 
#define NM_DEVICE_BOND_SLAVES      "slaves"
 

-

-

 

 
 

@@ -374,7 +361,7 @@ copy used by the device, and must not be modified. 

 

 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -382,7 +369,7 @@ copy used by the device, and must not be modified. 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -390,14 +377,13 @@ copy used by the device, and must not be modified. 

 

 
The “slaves” property

 
  “slaves”                   NMObjectArray *

-

+
The devices (NMDevice) slaved to the bond device.

 
Flags: Read

-
Since 0.9.8

+
Since: 0.9.8

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index 192be733..f0af6d6a 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceBridge
+NMDeviceBridge: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -152,8 +152,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -165,9 +163,8 @@ nm_device_bridge_error_quark (voi
 

 
Returns

 
 the error quark used for NMDeviceBridge errors.

-

 

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

@@ -203,7 +200,7 @@ nm_device_bridge_new ([transfer full]

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -230,9 +227,8 @@ nm_device_bridge_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -258,9 +254,8 @@ nm_device_bridge_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -292,7 +287,7 @@ nm_device_bridge_get_slaves ([element-type NMDevice]

 

-
Since 0.9.8

+
Since: 0.9.8

 
 
 

@@ -339,39 +334,31 @@ copy used by the device, and must not be modified. 

 
 

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

 
NM_DEVICE_BRIDGE_ERROR

 
#define NM_DEVICE_BRIDGE_ERROR nm_device_bridge_error_quark ()
 

-

-

 

 

 

 
NM_DEVICE_BRIDGE_HW_ADDRESS

 
#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_BRIDGE_CARRIER

 
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_BRIDGE_SLAVES

 
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 

-

-

 

 
 

@@ -379,32 +366,31 @@ copy used by the device, and must not be modified. 

 

 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “slaves” property

 
  “slaves”                   NMObjectArray *

-

+
The devices (NMDevice) slaved to the bridge device.

 
Flags: Read

-
Since 0.9.8

+
Since: 0.9.8

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 816f671d..8a0df6b0 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceBt
+NMDeviceBt: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -152,8 +152,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -165,7 +163,6 @@ nm_device_bt_error_quark (void
 
Returns

 
 the error quark used for NMDeviceBt errors.

-

 

 
 

@@ -228,7 +225,6 @@ nm_device_bt_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -255,7 +251,6 @@ nm_device_bt_get_name (
 
Returns

 
 the name of the device

-

 
 
 

@@ -282,7 +277,6 @@ nm_device_bt_get_capabilities (
 
Returns

 
 a combination of NMBluetoothCapabilities

-

 
 
 
@@ -350,32 +344,24 @@ nm_device_bt_get_capabilities (
NM_DEVICE_BT_ERROR

 
#define NM_DEVICE_BT_ERROR nm_device_bt_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_BT_HW_ADDRESS

 
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_BT_NAME

 
#define NM_DEVICE_BT_NAME         "name"
 

-

-

 

 

 

 
NM_DEVICE_BT_CAPABILITIES

 
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 

-

-

 

 
 

@@ -383,7 +369,7 @@ nm_device_bt_get_capabilities (
 
The “bt-capabilities” property

 
  “bt-capabilities”          guint

-

+
The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

 
Flags: Read

 
Default value: 0

 

@@ -391,7 +377,7 @@ nm_device_bt_get_capabilities (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -399,14 +385,13 @@ nm_device_bt_get_capabilities (
 
The “name” property

 
  “name”                     gchar *

-

+
The name of the bluetooth device.

 
Flags: Read

 
Default value: NULL

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index 86f4898c..655a0441 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceEthernet
+NMDeviceEthernet: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -169,8 +169,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -182,7 +180,6 @@ nm_device_ethernet_error_quark (v
 

 
Returns

 
 the error quark used for NMDeviceEthernet errors.

-

 

 

 

@@ -245,7 +242,6 @@ nm_device_ethernet_get_hw_address (
Returns

 
 the active hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -274,7 +270,6 @@ nm_device_ethernet_get_permanent_hw_address
 
Returns

 
 the permanent hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -301,7 +296,6 @@ nm_device_ethernet_get_speed (
 
Returns

 
 the speed of the device

-

 
 
 

@@ -328,7 +322,6 @@ nm_device_ethernet_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 
@@ -389,40 +382,30 @@ nm_device_ethernet_get_carrier (
NM_DEVICE_ETHERNET_ERROR

 
#define NM_DEVICE_ETHERNET_ERROR nm_device_ethernet_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_ETHERNET_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
 

-

-

 

 

 

 
NM_DEVICE_ETHERNET_SPEED

 
#define NM_DEVICE_ETHERNET_SPEED       "speed"
 

-

-

 

 

 

 
NM_DEVICE_ETHERNET_CARRIER

 
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 

-

-

 

 
 

@@ -430,7 +413,7 @@ nm_device_ethernet_get_carrier (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -438,7 +421,7 @@ nm_device_ethernet_get_carrier (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The active hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -446,7 +429,7 @@ nm_device_ethernet_get_carrier (
 
The “perm-hw-address” property

 
  “perm-hw-address”          gchar *

-

+
The permanent hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -454,14 +437,13 @@ nm_device_ethernet_get_carrier (
 
The “speed” property

 
  “speed”                    guint

-

+
The speed of the device.

 
Flags: Read

 
Default value: 0

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html
index e663d8d7..58b7c9ca 100644
--- a/docs/libnm-glib/html/NMDeviceGeneric.html
+++ b/docs/libnm-glib/html/NMDeviceGeneric.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceGeneric
+NMDeviceGeneric: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -128,8 +128,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -141,9 +139,8 @@ nm_device_generic_error_quark (vo
 

 
Returns

 
 the error quark used for NMDeviceGeneric errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -179,7 +176,7 @@ nm_device_generic_new ([transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -206,9 +203,8 @@ nm_device_generic_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -254,24 +250,18 @@ device, and must not be modified.

 
NM_DEVICE_GENERIC_ERROR

 
#define NM_DEVICE_GENERIC_ERROR nm_device_generic_error_quark ()
 

-

-

 

 

 

 
NM_DEVICE_GENERIC_HW_ADDRESS

 
#define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_GENERIC_TYPE_DESCRIPTION

 
#define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 

-

-

 

 
 

@@ -279,7 +269,7 @@ device, and must not be modified.

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -287,14 +277,14 @@ device, and must not be modified.

 

 
The “type-description” property

 
  “type-description”         gchar *

-

+
A description of the specific type of device this is, or NULL
+if not known.

 
Flags: Read

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index 48b6c887..bb9523d5 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceInfiniband
+NMDeviceInfiniband: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -135,8 +135,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -148,7 +146,6 @@ nm_device_infiniband_error_quark (
 
Returns

 
 the error quark used for NMDeviceInfiniband errors.

-

 

 
 

@@ -211,7 +208,6 @@ nm_device_infiniband_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -238,7 +234,6 @@ nm_device_infiniband_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 
@@ -299,24 +294,18 @@ nm_device_infiniband_get_carrier (
NM_DEVICE_INFINIBAND_ERROR

 
#define NM_DEVICE_INFINIBAND_ERROR nm_device_infiniband_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_INFINIBAND_HW_ADDRESS

 
#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_INFINIBAND_CARRIER

 
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 

-

-

 

 
 

@@ -324,7 +313,7 @@ nm_device_infiniband_get_carrier (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -332,14 +321,13 @@ nm_device_infiniband_get_carrier (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 2503475b..15fe2aa1 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceModem
+NMDeviceModem: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -127,8 +127,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -140,7 +138,6 @@ nm_device_modem_error_quark (void
 

 
Returns

 
 the error quark used for NMDeviceModem errors.

-

 

 

 

@@ -170,7 +167,6 @@ may require a firmware reload or reinitialization.

 

 
Returns

 
 the generic access technology families the modem supports

-

 

 
 

@@ -201,7 +197,6 @@ represents the network types the modem can immediately connect to.

 
Returns

 
 the generic access technology families the modem supports without
 a firmware reload or other reinitialization

-

 
 
 
@@ -255,24 +250,18 @@ a firmware reload or other reinitialization

 
NM_DEVICE_MODEM_ERROR

 
#define NM_DEVICE_MODEM_ERROR nm_device_modem_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_MODEM_MODEM_CAPABILITIES

 
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 

-

-

 

 

 

 
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

 
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 

-

-

 

 
 

@@ -280,7 +269,8 @@ a firmware reload or other reinitialization

 

 
The “current-capabilities” property

 
  “current-capabilities”     guint

-

+
The generic family of access technologies the modem currently supports
+without a firmware reload or reinitialization.

 
Flags: Read

 
Default value: 0

 

@@ -288,14 +278,16 @@ a firmware reload or other reinitialization

 

 
The “modem-capabilities” property

 
  “modem-capabilities”       guint

-

+
The generic family of access technologies the modem supports.  Not all
+capabilities are available at the same time however; some modems require
+a firmware reload or other reinitialization to switch between eg
+CDMA/EVDO and GSM/UMTS.

 
Flags: Read

 
Default value: 0

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index a505af82..c48c4e36 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceOlpcMesh
+NMDeviceOlpcMesh: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -153,8 +153,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -166,7 +164,6 @@ nm_device_olpc_mesh_error_quark (
 

 
Returns

 
 the error quark used for NMDeviceOlpcMesh errors.

-

 

 

 

@@ -229,7 +226,6 @@ nm_device_olpc_mesh_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -284,7 +280,6 @@ nm_device_olpc_mesh_get_active_channel
 

 
Returns

 
 active channel of the device

-

 

 
 
@@ -331,32 +326,24 @@ nm_device_olpc_mesh_get_active_channel
 
NM_DEVICE_OLPC_MESH_ERROR

 
#define NM_DEVICE_OLPC_MESH_ERROR nm_device_olpc_mesh_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_OLPC_MESH_HW_ADDRESS

 
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_OLPC_MESH_COMPANION

 
#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 

-

-

 

 

 

 
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

 
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 

-

-

 

 
 

@@ -364,7 +351,7 @@ nm_device_olpc_mesh_get_active_channel
 

 
The “active-channel” property

 
  “active-channel”           guint

-

+
The device's active channel.

 
Flags: Read

 
Default value: 0

 

@@ -372,21 +359,20 @@ nm_device_olpc_mesh_get_active_channel
 

 
The “companion” property

 
  “companion”                NMDeviceWifi *

-

+
The companion device.

 
Flags: Read

 

 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index 0b07f9eb..2195f9aa 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceTeam
+NMDeviceTeam: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -152,8 +152,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -165,9 +163,8 @@ nm_device_team_error_quark (void<
 

 
Returns

 
 the error quark used for NMDeviceTeam errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -203,7 +200,7 @@ nm_device_team_new ([transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -230,9 +227,8 @@ nm_device_team_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -258,9 +254,8 @@ nm_device_team_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -292,7 +287,7 @@ nm_device_team_get_slaves ([element-type NMDevice]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -345,32 +340,24 @@ copy used by the device, and must not be modified. 

 
NM_DEVICE_TEAM_ERROR

 
#define NM_DEVICE_TEAM_ERROR nm_device_team_error_quark ()
 

-

-

 

 

 

 
NM_DEVICE_TEAM_HW_ADDRESS

 
#define NM_DEVICE_TEAM_HW_ADDRESS  "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_TEAM_CARRIER

 
#define NM_DEVICE_TEAM_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_TEAM_SLAVES

 
#define NM_DEVICE_TEAM_SLAVES      "slaves"
 

-

-

 

 
 

@@ -378,7 +365,7 @@ copy used by the device, and must not be modified. 

 

 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -386,7 +373,7 @@ copy used by the device, and must not be modified. 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -394,13 +381,12 @@ copy used by the device, and must not be modified. 

 

 
The “slaves” property

 
  “slaves”                   NMObjectArray *

-

+
The devices (NMDevice) enslaved to the team device.

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index e28b1978..51c89f0d 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceVlan
+NMDeviceVlan: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -170,8 +170,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -183,7 +181,6 @@ nm_device_vlan_error_quark (void<
 

 
Returns

 
 the error quark used for NMDeviceVlan errors.

-

 

 

 

@@ -246,7 +243,6 @@ nm_device_vlan_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -273,7 +269,6 @@ nm_device_vlan_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 

@@ -301,7 +296,7 @@ nm_device_vlan_get_parent ([transfer none]

 
-
Since 1.0

+
Since: 1.0

 
 

 

@@ -326,7 +321,6 @@ nm_device_vlan_get_vlan_id (
 
Returns

 
 the device's VLAN ID

-

 

 
 
@@ -394,40 +388,30 @@ nm_device_vlan_get_vlan_id (
NM_DEVICE_VLAN_ERROR

 
#define NM_DEVICE_VLAN_ERROR nm_device_vlan_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_VLAN_HW_ADDRESS

 
#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_VLAN_CARRIER

 
#define NM_DEVICE_VLAN_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_VLAN_PARENT

 
#define NM_DEVICE_VLAN_PARENT      "parent"
 

-

-

 

 

 

 
NM_DEVICE_VLAN_VLAN_ID

 
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 

-

-

 

 
 

@@ -435,7 +419,7 @@ nm_device_vlan_get_vlan_id (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -443,7 +427,7 @@ nm_device_vlan_get_vlan_id (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -451,15 +435,15 @@ nm_device_vlan_get_vlan_id (
 
The “parent” property

 
  “parent”                   NMDevice *

-

+
The devices's parent device.

 
Flags: Read

-
Since 1.0

+
Since: 1.0

 
 

 

 
The “vlan-id” property

 
  “vlan-id”                  guint

-

+
The device's VLAN ID.

 
Flags: Read

 
Allowed values: <= 4095

 
Default value: 0

@@ -467,7 +451,6 @@ nm_device_vlan_get_vlan_id (
-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index fb153226..d739d92a 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceWifi
+NMDeviceWifi: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -268,8 +268,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -281,7 +279,6 @@ nm_device_wifi_error_quark (void<
 

 
Returns

 
 the error quark used for NMDeviceWifi errors.

-

 

 

 

@@ -344,7 +341,6 @@ nm_device_wifi_get_hw_address (
Returns

 
 the actual hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -373,7 +369,6 @@ nm_device_wifi_get_permanent_hw_address
 
Returns

 
 the permanent hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -400,7 +395,6 @@ nm_device_wifi_get_mode (
 
Returns

 
 the mode

-

 
 
 

@@ -427,7 +421,6 @@ nm_device_wifi_get_bitrate (
 
Returns

 
 the bit rate (kbit/s)

-

 
 
 

@@ -454,7 +447,6 @@ nm_device_wifi_get_capabilities (
 
Returns

 
 the capabilities

-

 
 
 

@@ -557,8 +549,6 @@ The returned array is owned by the client and should not be modified. 

 (*NMDeviceWifiRequestScanFn) (NMDeviceWifi *device,
                               GError *error,
                               gpointer user_data);
-

-

 
 

 

@@ -597,7 +587,7 @@ to get available access points.

 
 

 
-
Since 0.9.8

+
Since: 0.9.8

 
 
 

@@ -673,64 +663,48 @@ required by the connection

 
NM_DEVICE_WIFI_ERROR

 
#define NM_DEVICE_WIFI_ERROR nm_device_wifi_error_quark ()
 

-

-

 

 

 

 
NM_DEVICE_WIFI_HW_ADDRESS

 
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

 
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_MODE

 
#define NM_DEVICE_WIFI_MODE                "mode"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_BITRATE

 
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

 
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_CAPABILITIES

 
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_ACCESS_POINTS

 
#define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 

-

-

 

 
 

@@ -738,22 +712,22 @@ required by the connection

 

 
The “access-points” property

 
  “access-points”            NMObjectArray *

-

+
List of all Wi-Fi access points the device can see.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “active-access-point” property

 
  “active-access-point”      NMAccessPoint *

-

+
The active NMAccessPoint of the device.

 
Flags: Read

 

 

 

 
The “bitrate” property

 
  “bitrate”                  guint

-

+
The bit rate of the device in kbit/s.

 
Flags: Read

 
Default value: 0

 

@@ -761,7 +735,7 @@ required by the connection

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -769,7 +743,7 @@ required by the connection

 

 
The “mode” property

 
  “mode”                     guint

-

+
The mode of the device.

 
Flags: Read

 
Allowed values: <= 3

 
Default value: 2

@@ -778,7 +752,7 @@ required by the connection

 

 
The “perm-hw-address” property

 
  “perm-hw-address”          gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -786,7 +760,7 @@ required by the connection

 

 
The “wireless-capabilities” property

 
  “wireless-capabilities”    guint

-

+
The wireless capabilities of the device.

 
Flags: Read

 
Default value: 0

 

@@ -799,6 +773,34 @@ required by the connection

 user_function (NMDeviceWifi *device,
                GObject      *ap,
                gpointer      user_data)
+
Notifies that a NMAccessPoint is added to the Wi-Fi device.

+

+
Parameters

+

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





device
the Wi-Fi device that received the signal
 
ap
the new access point
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 

@@ -808,12 +810,39 @@ user_function (NMDeviceWifi *device,
                GObject      *ap,
                gpointer      user_data)
+
Notifies that a NMAccessPoint is removed from the Wi-Fi device.

+

+
Parameters

+

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





device
the Wi-Fi device that received the signal
 
ap
the removed access point
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 911ec29b..3ec917bc 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMDeviceWimax
+NMDeviceWimax: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -269,8 +269,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -282,7 +280,6 @@ nm_device_wimax_error_quark (void
 

 
Returns

 
 the error quark used for NMDeviceWimax errors.

-

 

 

 

@@ -345,7 +342,6 @@ nm_device_wimax_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -465,7 +461,6 @@ device is not connected.

 

 
Returns

 
 the center frequency in KHz, or 0

-

 

 
 

@@ -495,7 +490,6 @@ device is not connected.

 

 
Returns

 
 the RSSI in dBm, or 0

-

 

 
 

@@ -524,7 +518,6 @@ meaning when the device is not connected.

 

 
Returns

 
 the CINR in dB, or 0

-

 

 
 

@@ -553,7 +546,6 @@ nm_device_wimax_get_tx_power (
 
Returns

 
 the TX power in dBm, or 0

-

 
 
 

@@ -580,7 +572,6 @@ nm_device_wimax_get_bsid (
 
Returns

 
 the ID of the serving Base Station, or NULL

-

 
 
 
@@ -641,72 +632,54 @@ nm_device_wimax_get_bsid (
NM_DEVICE_WIMAX_ERROR

 
#define NM_DEVICE_WIMAX_ERROR nm_device_wimax_error_quark ()
 

-

-

 
 

 

 
NM_DEVICE_WIMAX_HW_ADDRESS

 
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_ACTIVE_NSP

 
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_CENTER_FREQUENCY

 
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_RSSI

 
#define NM_DEVICE_WIMAX_RSSI             "rssi"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_CINR

 
#define NM_DEVICE_WIMAX_CINR             "cinr"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_TX_POWER

 
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_BSID

 
#define NM_DEVICE_WIMAX_BSID             "bsid"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_NSPS

 
#define NM_DEVICE_WIMAX_NSPS             "nsps"
 

-

-

 

 
 

@@ -714,14 +687,15 @@ nm_device_wimax_get_bsid (
 
The “active-nsp” property

 
  “active-nsp”               NMWimaxNsp *

-

+
The active NMWimaxNsp of the device.

 
Flags: Read

 

 

 

 
The “bsid” property

 
  “bsid”                     gchar *

-

+
The ID of the serving base station as received from the network.  Has
+no meaning when the device is not connected.

 
Flags: Read

 
Default value: NULL

 

@@ -729,7 +703,9 @@ nm_device_wimax_get_bsid (
 
The “center-frequency” property

 
  “center-frequency”         guint

-

+
The center frequency (in KHz) of the radio channel the device is using to
+communicate with the network when connected.  Has no meaning when the
+device is not connected.

 
Flags: Read

 
Default value: 0

 
@@ -737,7 +713,9 @@ nm_device_wimax_get_bsid (
 
The “cinr” property

 
  “cinr”                     gint

-

+
CINR (Carrier to Interference + Noise Ratio) of the current radio link
+in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.

 
Flags: Read

 
Default value: 0

 
@@ -745,7 +723,7 @@ nm_device_wimax_get_bsid (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -753,15 +731,18 @@ nm_device_wimax_get_bsid (
 
The “nsps” property

 
  “nsps”                     NMObjectArray *

-

+
List of all WiMAX Network Service Providers the device can see.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

 
The “rssi” property

 
  “rssi”                     gint

-

+
RSSI of the current radio link in dBm.  This value indicates how strong
+the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.

 
Flags: Read

 
Default value: 0

 

@@ -769,7 +750,9 @@ nm_device_wimax_get_bsid (
 
The “tx-power” property

 
  “tx-power”                 gint

-

+
Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.

 
Flags: Read

 
Default value: 0

 
@@ -782,6 +765,34 @@ nm_device_wimax_get_bsid (NMDeviceWimax *self,
                GObject       *nsp,
                gpointer       user_data)
+
Notifies that a NMWimaxNsp is added to the wimax device.

+

+
Parameters

+

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





self
the wimax device that received the signal
 
nsp
the new NSP
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -791,12 +802,39 @@ user_function (<
 user_function (NMDeviceWimax *self,
                GObject       *nsp,
                gpointer       user_data)
+
Notifies that a NMWimaxNsp is removed from the wimax device.

+

+
Parameters

+

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





self
the wimax device that received the signal
 
nsp
the removed NSP
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index fec85cac..b7b318e1 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMIP4Config
+NMIP4Config: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -201,8 +201,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -264,9 +262,8 @@ nm_ip4_config_get_gateway (
 
Returns

 
 the IP4 address of the gateway.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -409,7 +406,7 @@ nm_ip4_config_get_searches ([element-type utf8]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -447,56 +444,42 @@ modified. 

 
NM_IP4_CONFIG_GATEWAY

 
#define NM_IP4_CONFIG_GATEWAY "gateway"
 

-

-

 

 

 

 
NM_IP4_CONFIG_ADDRESSES

 
#define NM_IP4_CONFIG_ADDRESSES "addresses"
 

-

-

 

 

 

 
NM_IP4_CONFIG_ROUTES

 
#define NM_IP4_CONFIG_ROUTES "routes"
 

-

-

 

 

 

 
NM_IP4_CONFIG_NAMESERVERS

 
#define NM_IP4_CONFIG_NAMESERVERS "nameservers"
 

-

-

 

 

 

 
NM_IP4_CONFIG_DOMAINS

 
#define NM_IP4_CONFIG_DOMAINS "domains"
 

-

-

 

 

 

 
NM_IP4_CONFIG_SEARCHES

 
#define NM_IP4_CONFIG_SEARCHES "searches"
 

-

-

 

 

 

 
NM_IP4_CONFIG_WINS_SERVERS

 
#define NM_IP4_CONFIG_WINS_SERVERS "wins-servers"
 

-

-

 

 
 

@@ -504,58 +487,57 @@ modified. 

 

 
The “addresses” property

 
  “addresses”                gpointer

-

+
The GPtrArray containing NMIP4Addresses of the configuration.

 
Flags: Read

 

 

 

 
The “domains” property

 
  “domains”                  NMStringArray *

-

+
The GPtrArray containing domain strings of the configuration.

 
Flags: Read

 

 

 

 
The “gateway” property

 
  “gateway”                  gchar *

-

+
The IP4 gateway address of the configuration as string.

 
Flags: Read

 
Default value: NULL

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “nameservers” property

 
  “nameservers”              NMUintArray *

-

+
The GArray containing name servers (guint32s) of the configuration.

 
Flags: Read

 

 

 

 
The “routes” property

 
  “routes”                   gpointer

-

+
The GPtrArray containing NMSettingIP4Routes of the configuration.

 
Flags: Read

 

 

 

 
The “searches” property

 
  “searches”                 NMStringArray *

-

+
The GPtrArray containing dns search strings of the configuration.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “wins-servers” property

 
  “wins-servers”             NMUintArray *

-

+
The GArray containing WINS servers (guint32s) of the configuration.

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index 83f5f473..ed97f3e5 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMIP6Config
+NMIP6Config: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -201,8 +201,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -264,9 +262,8 @@ nm_ip6_config_get_gateway (
 
Returns

 
 the IPv6 gateway of the configuration.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -350,9 +347,8 @@ nm_ip6_config_get_num_nameservers (
 
Returns

 
 the number of domain name servers

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -390,7 +386,7 @@ nm_ip6_config_get_nameserver ([array fixed-size=16][element-type guint8][transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -398,8 +394,9 @@ nm_ip6_config_get_nameserver (const GSList *
 nm_ip6_config_get_nameservers (NMIP6Config *config);
 
Gets the domain name servers (DNS).

+
[skip]

 

-
Parameters

+
Parameters

 
@@ -414,11 +411,10 @@ nm_ip6_config_get_nameservers (
 
 

-
Returns

+
Returns

 
 a GSList containing elements of type 'struct in6_addr' which
 contain the addresses of nameservers of the configuration.  This is the
 internal copy used by the configuration and must not be modified.

-

 

 
 

@@ -476,7 +472,7 @@ nm_ip6_config_get_searches ([element-type utf8]

 
-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -485,48 +481,36 @@ This is the internal copy used by the configuration, and must not be modified. <
 
NM_IP6_CONFIG_GATEWAY

 
#define NM_IP6_CONFIG_GATEWAY "gateway"
 

-

-

 

 

 

 
NM_IP6_CONFIG_ADDRESSES

 
#define NM_IP6_CONFIG_ADDRESSES "addresses"
 

-

-

 

 

 

 
NM_IP6_CONFIG_ROUTES

 
#define NM_IP6_CONFIG_ROUTES "routes"
 

-

-

 

 

 

 
NM_IP6_CONFIG_NAMESERVERS

 
#define NM_IP6_CONFIG_NAMESERVERS "nameservers"
 

-

-

 

 

 

 
NM_IP6_CONFIG_DOMAINS

 
#define NM_IP6_CONFIG_DOMAINS "domains"
 

-

-

 

 

 

 
NM_IP6_CONFIG_SEARCHES

 
#define NM_IP6_CONFIG_SEARCHES "searches"
 

-

-

 

 
 

@@ -534,51 +518,55 @@ This is the internal copy used by the configuration, and must not be modified. <
 

 
The “addresses” property

 
  “addresses”                NMIP6AddressObjectArray *

-

+
The GPtrArray containing the IPv6 addresses;  use
+nm_utils_ip6_addresses_from_gvalue() to return a GSList of
+NMSettingIP6Address objects that is more usable than the raw data.

 
Flags: Read

 

 

 

 
The “domains” property

 
  “domains”                  NMStringArray *

-

+
The GPtrArray containing domain strings of the configuration.

 
Flags: Read

 

 

 

 
The “gateway” property

 
  “gateway”                  gchar *

-

+
The IPv6 gateway as string

 
Flags: Read

 
Default value: NULL

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “nameservers” property

 
  “nameservers”              NMIP6AddressArray *

-

+
The GPtrArray containing elements of type 'struct ip6_addr' which
+contain the addresses of nameservers of the configuration.

 
Flags: Read

 

 

 

 
The “routes” property

 
  “routes”                   NMIP6RouteObjectArray *

-

+
The GPtrArray containing the IPv6 routes;  use
+nm_utils_ip6_routes_from_gvalue() to return a GSList of
+NMSettingIP6Address objects that is more usable than the raw data.

 
Flags: Read

 

 

 

 
The “searches” property

 
  “searches”                 NMStringArray *

-

+
The GPtrArray containing dns search strings of the configuration.

 
Flags: Read

-
Since 0.9.10

+
Since: 0.9.10

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 9cc58a6f..296e0b0c 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMObject
+NMObject: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -151,8 +151,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -164,7 +162,6 @@ nm_object_error_quark (void
 
Returns

 
 the error quark used for NMObject errors.

-

 

 
 

@@ -219,7 +216,6 @@ nm_object_get_path (
Returns

 
 the object's path. This is the internal string used by the
 device, and must not be modified.

-

 
 
 
@@ -260,24 +256,18 @@ device, and must not be modified.

 
NM_OBJECT_ERROR

 
#define NM_OBJECT_ERROR nm_object_error_quark ()
 

-

-

 
 

 

 
NM_OBJECT_DBUS_CONNECTION

 
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 

-

-

 

 

 

 
NM_OBJECT_DBUS_PATH

 
#define NM_OBJECT_DBUS_PATH "dbus-path"
 

-

-

 

 
 

@@ -285,14 +275,12 @@ device, and must not be modified.

 

 
The “dbus-connection” property

 
  “dbus-connection”          DBusGConnection *

-

 
Flags: Read / Write / Construct Only

 

 

 

 
The “dbus-path” property

 
  “dbus-path”                gchar *

-

 
Flags: Read / Write / Construct Only

 
Default value: NULL

 

@@ -306,12 +294,48 @@ user_function (gpointer  error,
                gpointer  failed_path,
                gpointer  user_data)
+
Indicates that an error occured while creating an NMObject object
+during property handling of master_object
+.

+
Note: Be aware that the signal is private for libnm-glib's internal
+      use.

+

+
Parameters

+

 
 


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





master_object
the object that received the signal
 
error
the error that occured while creating object
 
failed_path
object path of the failed object
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index 64cd7154..c099c3df 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMRemoteConnection
+NMRemoteConnection: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -235,8 +235,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -244,8 +242,6 @@
 
NM_REMOTE_CONNECTION_ERROR

 
#define NM_REMOTE_CONNECTION_ERROR (nm_remote_connection_error_quark ())
 

-

-

 

 

 

@@ -256,7 +252,6 @@ nm_remote_connection_error_quark (
 
Returns

 
 the error quark used for NMRemoteConnection errors.

-

 

 
 

@@ -373,7 +368,6 @@ nm_remote_connection_new (
 
Returns

 
 the new remote connection object on success, or NULL on failure

-

 
 
 

@@ -456,7 +450,7 @@ commit completes. 

 
 
 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -496,7 +490,7 @@ save completes. 

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -604,9 +598,8 @@ nm_remote_connection_get_unsaved ( TRUE if the remote connection contains changes that have not
 been saved to disk, FALSE if the connection is the same as its on-disk
 representation.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -645,40 +638,30 @@ representation.

 
NM_REMOTE_CONNECTION_UNSAVED

 
#define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 

-

-

 

 

 

 
NM_REMOTE_CONNECTION_UPDATED

 
#define NM_REMOTE_CONNECTION_UPDATED         "updated"
 

-

-

 

 

 

 
NM_REMOTE_CONNECTION_REMOVED

 
#define NM_REMOTE_CONNECTION_REMOVED         "removed"
 

-

-

 

 

 

 
NMRemoteConnectionCommitFunc

 
typedef NMRemoteConnectionResultFunc NMRemoteConnectionCommitFunc;
 

-

-

 

 

 

 
NMRemoteConnectionDeleteFunc

 
typedef NMRemoteConnectionResultFunc NMRemoteConnectionDeleteFunc;
 

-

-

 

 
 

@@ -686,21 +669,19 @@ representation.

 

 
The “bus” property

 
  “bus”                      DBusGConnection *

-

+
The DBusGConnection that the NMRemoteConnection is connected to.

 
Flags: Write / Construct Only

 

 

 

 
The “dbus-connection” property

 
  “dbus-connection”          DBusGConnection *

-

 
Flags: Write / Construct Only

 

 

 

 
The “dbus-path” property

 
  “dbus-path”                gchar *

-

 
Flags: Write / Construct Only

 
Default value: NULL

 

@@ -708,10 +689,11 @@ representation.

 

 
The “unsaved” property

 
  “unsaved”                  gboolean

-

+
TRUE if the remote connection contains changes that have not been saved
+to disk, FALSE if the connection is the same as its on-disk representation.

 
Flags: Read

 
Default value: FALSE

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -721,6 +703,30 @@ representation.

 
void
 user_function (NMRemoteConnection *connection,
                gpointer            user_data)

+
This signal is emitted when a connection is either deleted or becomes
+invisible to the current user.

+

+
Parameters

+

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





connection
a NMConnection
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 

@@ -729,6 +735,30 @@ user_function (void
 user_function (NMRemoteConnection *connection,
                gpointer            user_data)
+
This signal is emitted when a connection changes, and it is
+still visible to the user.

+

+
Parameters

+

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





connection
a NMConnection
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -743,7 +773,6 @@ user_function (
-

-          Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 7f333eb5..10d37ade 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMRemoteSettings
+NMRemoteSettings: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -435,7 +435,6 @@ nm_remote_settings_error_quark (v
 

 
Returns

 
 the error quark used for NMRemoteSettings errors.

-

 

 
 

@@ -446,8 +445,6 @@ nm_remote_settings_error_quark (v
                                       NMRemoteConnection *connection,
                                       GError *error,
                                       gpointer user_data);
-

-

 
 

 

@@ -458,8 +455,6 @@ nm_remote_settings_error_quark (v
                                 char **failures,
                                 GError *error,
                                 gpointer user_data);
-

-

 

 

 

@@ -468,8 +463,6 @@ nm_remote_settings_error_quark (v
 (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
                                      GError *error,
                                      gpointer user_data);
-

-

 

 

 

@@ -498,7 +491,6 @@ want to avoid that.

 

 
Returns

 
 the new remote settings object on success, or NULL on failure

-

 

 

 

@@ -580,7 +572,6 @@ nm_remote_settings_new_finish (GA
 

 
Returns

 
 a new NMRemoteSettings object, or NULL on error

-

 

 
 

@@ -651,7 +642,7 @@ nm_remote_settings_get_connection_by_id
 matching object was found. 

 
[transfer none]

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -786,7 +777,6 @@ added, not the object itself

 

 
Returns

 
 TRUE if the request was successful, FALSE if it failed

-

 

 

 

@@ -839,9 +829,8 @@ added, not the object itself

 

 
Returns

 
 TRUE if the request was successful, FALSE if it failed

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -901,9 +890,8 @@ filenames that failed to load. 

 
 TRUE if NetworkManager at least tried to load filenames
 ,
 FALSE if an error occurred (eg, permission denied).

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -939,9 +927,8 @@ the in-memory state matches the on-disk state.

 

 
Returns

 
 TRUE on success, FALSE on failure

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -991,7 +978,6 @@ hostname operation completes. 

 

 
Returns

 
 TRUE if the request was successful, FALSE if it failed

-

 

 

 
@@ -1049,56 +1035,42 @@ hostname operation completes. 

 
NM_REMOTE_SETTINGS_ERROR

 
#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
 

-

-

 
 

 

 
NM_REMOTE_SETTINGS_BUS

 
#define NM_REMOTE_SETTINGS_BUS             "bus"
 

-

-

 

 

 

 
NM_REMOTE_SETTINGS_SERVICE_RUNNING

 
#define NM_REMOTE_SETTINGS_SERVICE_RUNNING "service-running"
 

-

-

 

 

 

 
NM_REMOTE_SETTINGS_HOSTNAME

 
#define NM_REMOTE_SETTINGS_HOSTNAME        "hostname"
 

-

-

 

 

 

 
NM_REMOTE_SETTINGS_CAN_MODIFY

 
#define NM_REMOTE_SETTINGS_CAN_MODIFY      "can-modify"
 

-

-

 

 

 

 
NM_REMOTE_SETTINGS_NEW_CONNECTION

 
#define NM_REMOTE_SETTINGS_NEW_CONNECTION    "new-connection"
 

-

-

 

 

 

 
NM_REMOTE_SETTINGS_CONNECTIONS_READ

 
#define NM_REMOTE_SETTINGS_CONNECTIONS_READ  "connections-read"
 

-

-

 

 
 

@@ -1106,14 +1078,15 @@ hostname operation completes. 

 

 
The “bus” property

 
  “bus”                      DBusGConnection *

-

+
The DBusGConnection that the NMRemoteSettings is connected to. Defaults
+to the system bus if not specified.

 
Flags: Read / Write / Construct Only

 

 

 

 
The “can-modify” property

 
  “can-modify”               gboolean

-

+
If TRUE, adding and modifying connections is supported.

 
Flags: Read

 
Default value: FALSE

 

@@ -1121,7 +1094,8 @@ hostname operation completes. 

 

 
The “hostname” property

 
  “hostname”                 gchar *

-

+
The machine hostname stored in persistent configuration. This can be
+modified by calling nm_remote_settings_save_hostname().

 
Flags: Read

 
Default value: NULL

 

@@ -1129,7 +1103,7 @@ hostname operation completes. 

 

 
The “service-running” property

 
  “service-running”          gboolean

-

+
Whether the settings service is running.

 
Flags: Read

 
Default value: FALSE

 

@@ -1159,7 +1133,6 @@ user_function (
-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 367c6450..8acd02c1 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMSecretAgent
+NMSecretAgent: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -228,8 +228,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -237,20 +235,12 @@
 
NM_SECRET_AGENT_ERROR

 
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 

-

-

 

 

 

 
nm_secret_agent_error_quark ()

 
GQuark
 nm_secret_agent_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

@@ -299,7 +289,7 @@ something like this:

               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, NM_SETTING_HASH_FLAG_ALL);
+secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
 (call the NMSecretAgentGetSecretsFunc with secrets_hash)
 
@@ -482,7 +472,6 @@ asynchronous operation and its success or failure is indicated via the
 
 a new TRUE if registration was successfully requested (this does
 not mean registration itself was successful), FALSE if registration was not
 successfully requested.

-

 

 
 

@@ -511,7 +500,6 @@ store secrets on behalf of this user.

 

 
Returns

 
 a new TRUE if unregistration was successful, FALSE if it was not.

-

 

 
 

@@ -537,7 +525,6 @@ nm_secret_agent_get_registered (
 
Returns

 
 a TRUE if the agent is registered, FALSE if it is not.

-

 
 
 

@@ -807,7 +794,7 @@ authentication dialogs.

 
 
 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -869,40 +856,30 @@ results or carrier changes.

 
NM_SECRET_AGENT_IDENTIFIER

 
#define NM_SECRET_AGENT_IDENTIFIER          "identifier"
 

-

-

 

 

 

 
NM_SECRET_AGENT_AUTO_REGISTER

 
#define NM_SECRET_AGENT_AUTO_REGISTER       "auto-register"
 

-

-

 

 

 

 
NM_SECRET_AGENT_REGISTERED

 
#define NM_SECRET_AGENT_REGISTERED          "registered"
 

-

-

 

 

 

 
NM_SECRET_AGENT_CAPABILITIES

 
#define NM_SECRET_AGENT_CAPABILITIES        "capabilities"
 

-

-

 

 

 

 
NM_SECRET_AGENT_REGISTRATION_RESULT

 
#define NM_SECRET_AGENT_REGISTRATION_RESULT "registration-result"
 

-

-

 

 
 

@@ -910,7 +887,13 @@ results or carrier changes.

 

 
The “auto-register” property

 
  “auto-register”            gboolean

-

+
If TRUE, the agent will attempt to automatically register itself after
+it is created (via an idle handler) and to re-register itself if
+NetworkManager restarts.  If FALSE, the agent does not automatically
+register with NetworkManager, and nm_secret_agent_register() must be
+called.  If 'auto-register' is TRUE, calling nm_secret_agent_unregister()
+will suppress auto-registration until nm_secret_agent_register() is
+called, which re-enables auto-registration.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -918,14 +901,20 @@ results or carrier changes.

 

 
The “capabilities” property

 
  “capabilities”             NMSecretAgentCapabilities

-

+
A bitfield of NMSecretAgentCapabilities.

 
Flags: Read / Write / Construct

 

 

 

 
The “identifier” property

 
  “identifier”               gchar *

-

+
Identifies this agent; only one agent in each user session may use the
+same identifier.  Identifier formatting follows the same rules as
+D-Bus bus names with the exception that the ':' character is not
+allowed.  The valid set of characters is "A-Z[0-9]_-." and the
+identifier is limited in length to 255 characters with a minimum
+of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+(without quotes).

 
Flags: Read / Write / Construct Only

 
Default value: NULL

 

@@ -933,7 +922,7 @@ results or carrier changes.

 

 
The “registered” property

 
  “registered”               gboolean

-

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

 
Flags: Read

 
Default value: FALSE

 

@@ -946,12 +935,41 @@ results or carrier changes.

 user_function (NMSecretAgent *agent,
                gpointer       error,
                gpointer       user_data)
+
Indicates the result of a registration request; if error
+ is NULL the
+request was successful.

+

+
Parameters

+

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





agent
the agent that received the signal
 
error
the error, if any, that occured while registering
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index c74274ea..7562a519 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMVPNConnection
+NMVPNConnection: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -135,8 +135,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -198,7 +196,6 @@ nm_vpn_connection_get_vpn_state (
 
Returns

 
 the VPN state of the active VPN connection.

-

 

 
 

@@ -226,7 +223,6 @@ nm_vpn_connection_get_banner (
Returns

 
 the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.

-

 
 
 
@@ -236,16 +232,12 @@ string used by the connection, and must not be modified.

 
NM_VPN_CONNECTION_VPN_STATE

 
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 

-

-

 
 

 

 
NM_VPN_CONNECTION_BANNER

 
#define NM_VPN_CONNECTION_BANNER "banner"
 

-

-

 

 
 

@@ -253,7 +245,7 @@ string used by the connection, and must not be modified.

 

 
The “banner” property

 
  “banner”                   gchar *

-

+
The VPN login banner of the active VPN connection.

 
Flags: Read

 
Default value: NULL

 

@@ -261,7 +253,7 @@ string used by the connection, and must not be modified.

 

 
The “vpn-state” property

 
  “vpn-state”                guint

-

+
The VPN state of the active VPN connection.

 
Flags: Read

 
Allowed values: <= 7

 
Default value: 0

@@ -281,7 +273,6 @@ user_function (
-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index a83434a5..91cdbfee 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMWimaxNsp
+NMWimaxNsp: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -155,8 +155,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -218,7 +216,6 @@ nm_wimax_nsp_get_name (
 
Returns

 
 the name

-

 

 
 

@@ -245,7 +242,6 @@ nm_wimax_nsp_get_signal_quality (
 
Returns

 
 the signal quality

-

 
 
 

@@ -272,7 +268,6 @@ nm_wimax_nsp_get_network_type (
 
Returns

 
 the network type

-

 
 
 

@@ -357,7 +352,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this WiMAX NSP,
 FALSE if it cannot be.

-

 
 
 
@@ -367,24 +361,18 @@ against

 
NM_WIMAX_NSP_NAME

 
#define NM_WIMAX_NSP_NAME           "name"
 

-

-

 
 

 

 
NM_WIMAX_NSP_SIGNAL_QUALITY

 
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 

-

-

 

 

 

 
NM_WIMAX_NSP_NETWORK_TYPE

 
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 

-

-

 

 

 

@@ -437,7 +425,7 @@ against

 

 
The “name” property

 
  “name”                     gchar *

-

+
The name of the WiMAX NSP.

 
Flags: Read

 
Default value: NULL

 

@@ -445,7 +433,7 @@ against

 

 
The “network-type” property

 
  “network-type”             guint

-

+
The network type of the WiMAX NSP.

 
Flags: Read

 
Default value: 0

 

@@ -453,7 +441,7 @@ against

 

 
The “signal-quality” property

 
  “signal-quality”           guint

-

+
The signal quality of the WiMAX NSP.

 
Flags: Read

 
Allowed values: <= 100

 
Default value: 0

@@ -461,7 +449,6 @@ against

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html
index 03f6d263..52e56c4d 100644
--- a/docs/libnm-glib/html/annotation-glossary.html
+++ b/docs/libnm-glib/html/annotation-glossary.html
@@ -2,12 +2,12 @@
 
 
 
-libnm-glib Reference Manual: Annotation Glossary
+Annotation Glossary: libnm-glib Reference Manual
 
 
 
 
-
+
 
 
 
@@ -48,6 +48,8 @@
 
S

 
scope async

 
The callback is valid until first called.

+
skip

+
Exposed in C code, not necessarily available in other languages.

 
T

 
transfer container

 
Free data container after the code is done.

@@ -55,9 +57,10 @@
 
Free data after the code is done.

 
transfer none

 
Don't free data after the code is done.

+
type

+
Override the parsed C type with given type.

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html
index 59052d84..1f09388c 100644
--- a/docs/libnm-glib/html/api-index-full.html
+++ b/docs/libnm-glib/html/api-index-full.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: API Index
+API Index: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -2573,7 +2573,6 @@
 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html
index 80d259a7..18b6b1ab 100644
--- a/docs/libnm-glib/html/ch02.html
+++ b/docs/libnm-glib/html/ch02.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: libnm-glib API Reference
+libnm-glib API Reference: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -119,7 +119,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index fb5c1c38..bec4797c 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 

 

 

-      for libnm-glib 1.0.2
+      for libnm-glib 1.0.4
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-glib/0.9/.
@@ -150,7 +150,6 @@
 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 7e412917..5b020fd0 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -63,8 +63,27 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
+
+
 
 
 
@@ -191,6 +210,8 @@
 
 
 
+
+
 
 
 
@@ -256,6 +277,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -288,6 +314,13 @@
 
 
 
+
+
+
+
+
+
+
 
 
 
@@ -319,6 +352,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -339,6 +376,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
@@ -368,6 +411,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -401,6 +449,9 @@
 
 
 
+
+
+
 
 
 
@@ -419,6 +470,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -441,6 +496,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -463,6 +522,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -483,6 +546,9 @@
 
 
 
+
+
+
 
 
 
@@ -502,6 +568,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -523,6 +594,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
@@ -547,6 +624,9 @@
 
 
 
+
+
+
 
 
 
@@ -573,6 +653,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -721,6 +805,8 @@
 
 
 
+
+
 
 
 
@@ -750,6 +836,8 @@
 
 
 
+
+
 
 
 
@@ -790,6 +878,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -831,8 +923,21 @@
 
 
 
+
+
+
+
+
+
 
+
+
+
 
+
+
+
+
 
 
 
@@ -884,6 +989,16 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -902,10 +1017,18 @@
 
 
 
+
+
+
+
 
 
 
 
+
+
+
+
 
 
 
@@ -919,6 +1042,8 @@
 
 
 
+
 
 
 
+
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index b64ade5b..e0523b6f 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMVPNPlugin
+NMVPNPlugin: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -155,8 +155,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -164,36 +162,18 @@
 
nm_vpn_plugin_error_quark ()

 
GQuark
 nm_vpn_plugin_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
nm_vpn_plugin_get_connection ()

 
DBusGConnection *
 nm_vpn_plugin_get_connection (NMVPNPlugin *plugin);

-

-

-

-
Returns

-

-

 

 

 

 
nm_vpn_plugin_get_state ()

 
NMVPNServiceState
 nm_vpn_plugin_get_state (NMVPNPlugin *plugin);

-

-

-

-
Returns

-

-

 

 

 

@@ -201,8 +181,6 @@ nm_vpn_plugin_get_state (NMVPNPlu
 
void
 nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
                          NMVPNServiceState state);

-

-

 

 

 

@@ -243,7 +221,7 @@ information to complete the request.

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -251,8 +229,6 @@ information to complete the request.

 
void
 nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin,
                                 const char *banner);

-

-

 

 

 

@@ -260,8 +236,6 @@ nm_vpn_plugin_set_login_banner (N
 
void
 nm_vpn_plugin_failure (NMVPNPlugin *plugin,
                        NMVPNPluginFailure reason);

-

-

 

 

 

@@ -269,8 +243,6 @@ nm_vpn_plugin_failure (NMVPNPlugi
 
void
 nm_vpn_plugin_set_config (NMVPNPlugin *plugin,
                           GHashTable *config);

-

-

 

 

 

@@ -278,8 +250,6 @@ nm_vpn_plugin_set_config (NMVPNPl
 
void
 nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
                               GHashTable *ip4_config);

-

-

 

 

 

@@ -287,8 +257,6 @@ nm_vpn_plugin_set_ip4_config (NMV
 
void
 nm_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin,
                               GHashTable *ip6_config);

-

-

 

 

 

@@ -296,12 +264,6 @@ nm_vpn_plugin_set_ip6_config (NMV
 
gboolean
 nm_vpn_plugin_disconnect (NMVPNPlugin *plugin,
                           GError **err);

-

-

-

-
Returns

-

-

 

 
 

@@ -310,16 +272,12 @@ nm_vpn_plugin_disconnect (NMVPNPl
 
NM_VPN_PLUGIN_DBUS_SERVICE_NAME

 
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_STATE

 
#define NM_VPN_PLUGIN_STATE             "state"
 

-

-

 

 

 

@@ -423,7 +381,6 @@ nm_vpn_plugin_disconnect (NMVPNPl
 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index 95d75061..e4630fed 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: NMVpnPluginUiWidget
+NMVpnPluginUiWidget: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -163,8 +163,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -172,24 +170,12 @@
 
NMVpnPluginUiFactory ()

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

-

-

-

-
Returns

-

-

 

 

 

 
nm_vpn_plugin_ui_factory ()

 
NMVpnPluginUiInterface *
 nm_vpn_plugin_ui_factory (GError **error);

-

-

-

-
Returns

-

-

 

 

 

@@ -198,12 +184,6 @@ nm_vpn_plugin_ui_factory (GError<
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
                                        NMConnection *connection,
                                        GError **error);
-

-

-

-
Returns

-

-

 

 

 

@@ -211,12 +191,6 @@ nm_vpn_plugin_ui_interface_ui_factory (guint32
 nm_vpn_plugin_ui_interface_get_capabilities
                                (NMVpnPluginUiInterface *iface);
-

-

-

-
Returns

-

-

 

 

 

@@ -225,12 +199,6 @@ nm_vpn_plugin_ui_interface_get_capabilities
 nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
                                    const char *path,
                                    GError **error);
-

-

-

-
Returns

-

-

 

 

 

@@ -240,12 +208,6 @@ nm_vpn_plugin_ui_interface_export (const char *path,
                                    NMConnection *connection,
                                    GError **error);
-

-

-

-
Returns

-

-

 

 

 

@@ -254,12 +216,6 @@ nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
                                 NMConnection *connection);
-

-

-

-
Returns

-

-

 

 

 

@@ -270,12 +226,6 @@ nm_vpn_plugin_ui_interface_delete_connection
                                 NMConnection *connection,
                                 GError **error);
 
nm_vpn_plugin_ui_interface_delete_connection is deprecated and should not be used in newly-written code.

-

-

-

-
Returns

-

-

 

 

 

@@ -283,12 +233,6 @@ nm_vpn_plugin_ui_interface_delete_connection
 
GObject *
 nm_vpn_plugin_ui_widget_interface_get_widget
                                (NMVpnPluginUiWidgetInterface *iface);

-

-

-

-
Returns

-

-

 

 

 

@@ -298,12 +242,6 @@ nm_vpn_plugin_ui_widget_interface_update_connection
                                (NMVpnPluginUiWidgetInterface *iface,
                                 NMConnection *connection,
                                 GError **error);
-

-

-

-
Returns

-

-

 

 

 

@@ -314,12 +252,6 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
                                 NMConnection *connection,
                                 GError **error);
 
nm_vpn_plugin_ui_widget_interface_save_secrets is deprecated and should not be used in newly-written code.

-

-

-

-
Returns

-

-

 

 
 

@@ -373,24 +305,18 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
 
NM_VPN_PLUGIN_UI_INTERFACE_NAME

 
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_UI_INTERFACE_DESC

 
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_UI_INTERFACE_SERVICE

 
#define NM_VPN_PLUGIN_UI_INTERFACE_SERVICE "service"
 

-

-

 

 

 

@@ -408,8 +334,8 @@ information to UI programs.

 
 
 
NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST

- 
- 
+ 
+ 
 
 
 
NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME

@@ -441,7 +367,6 @@ plugin's VPN service daemon

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html
index c8ee10a3..9c3dce35 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-types.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-types.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: nm-types
+nm-types: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -33,18 +33,16 @@
 
 

 
Description

-

-

 

 

 
Functions

+

 

 

 
Types and Values

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
index 0a53334e..b03e5987 100644
--- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
+++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: nm-vpn-plugin-utils
+nm-vpn-plugin-utils: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -60,8 +60,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -105,7 +103,6 @@ an applet when the applet calls the authentication dialog of the VPN plugin.

 

 
Returns

 
 TRUE if reading values was successful, FALSE if not

-

 

 

 

@@ -151,7 +148,6 @@ item in data
 
Returns

 
 TRUE if the flag data item was found and successfully converted
 to flags, FALSE if not

-

 
 
 
@@ -160,7 +156,6 @@ to flags, FALSE if not

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2
index 8c4d8202..00b0f075 100644
--- a/docs/libnm-glib/html/libnm-glib.devhelp2
+++ b/docs/libnm-glib/html/libnm-glib.devhelp2
@@ -1,5 +1,4 @@
 
-
 
   
     
@@ -672,5 +671,128 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 500f78d4..c6ea9297 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: Object Hierarchy
+Object Hierarchy: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -55,7 +55,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html
index d3a8c516..fcd4ec99 100644
--- a/docs/libnm-glib/html/ref-overview.html
+++ b/docs/libnm-glib/html/ref-overview.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-glib Reference Manual: Object Overview
+Object Overview: libnm-glib Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -41,7 +41,6 @@
     

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-glib/html/style.css b/docs/libnm-glib/html/style.css
index c141ddd2..36754209 100644
--- a/docs/libnm-glib/html/style.css
+++ b/docs/libnm-glib/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a  as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/libnm-glib/tmpl/libnm-glib-unused.sgml b/docs/libnm-glib/tmpl/libnm-glib-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/libnm-glib/tmpl/nm-access-point.sgml b/docs/libnm-glib/tmpl/nm-access-point.sgml
deleted file mode 100644
index 2a2ecb1c..00000000
--- a/docs/libnm-glib/tmpl/nm-access-point.sgml
+++ /dev/null
@@ -1,214 +0,0 @@
-
-NMAccessPoint
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@connections: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-active-connection.sgml b/docs/libnm-glib/tmpl/nm-active-connection.sgml
deleted file mode 100644
index 8b52c825..00000000
--- a/docs/libnm-glib/tmpl/nm-active-connection.sgml
+++ /dev/null
@@ -1,274 +0,0 @@
-
-NMActiveConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-client.sgml b/docs/libnm-glib/tmpl/nm-client.sgml
deleted file mode 100644
index cb1adf09..00000000
--- a/docs/libnm-glib/tmpl/nm-client.sgml
+++ /dev/null
@@ -1,552 +0,0 @@
-
-NMClient
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CLIENT_PERMISSION_NONE: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: 
-@NM_CLIENT_PERMISSION_SLEEP_WAKE: 
-@NM_CLIENT_PERMISSION_NETWORK_CONTROL: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: 
-@NM_CLIENT_PERMISSION_LAST: 
-
-
-
-
-
-
-@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
-@NM_CLIENT_PERMISSION_RESULT_YES: 
-@NM_CLIENT_PERMISSION_RESULT_AUTH: 
-@NM_CLIENT_PERMISSION_RESULT_NO: 
-
-
-
-
-
-
-@NM_CLIENT_ERROR_UNKNOWN: 
-@NM_CLIENT_ERROR_MANAGER_NOT_RUNNING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@iface: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@active_connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@connection: 
-@device: 
-@specific_object: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@connection: 
-@new_connection_path: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@partial: 
-@device: 
-@specific_object: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@active: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@sleep_: 
-
-
-
-
-
-
-
-@client: 
-@permission: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-adsl.sgml b/docs/libnm-glib/tmpl/nm-device-adsl.sgml
deleted file mode 100644
index 1c7e14c2..00000000
--- a/docs/libnm-glib/tmpl/nm-device-adsl.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-NMDeviceAdsl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_ADSL_ERROR_UNKNOWN: 
-@NM_DEVICE_ADSL_ERROR_NOT_ADSL_CONNECTION: 
-@NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bond.sgml b/docs/libnm-glib/tmpl/nm-device-bond.sgml
deleted file mode 100644
index 3270d995..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bond.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-NMDeviceBond
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_BOND_ERROR_UNKNOWN: 
-@NM_DEVICE_BOND_ERROR_NOT_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INVALID_BOND_CONNECTION: 
-@NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bridge.sgml b/docs/libnm-glib/tmpl/nm-device-bridge.sgml
deleted file mode 100644
index 65094577..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bridge.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-NMDeviceBridge
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_BRIDGE_ERROR_UNKNOWN: 
-@NM_DEVICE_BRIDGE_ERROR_NOT_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INVALID_BRIDGE_CONNECTION: 
-@NM_DEVICE_BRIDGE_ERROR_INTERFACE_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-bt.sgml b/docs/libnm-glib/tmpl/nm-device-bt.sgml
deleted file mode 100644
index 44a6f692..00000000
--- a/docs/libnm-glib/tmpl/nm-device-bt.sgml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-NMDeviceBt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_BT_ERROR_UNKNOWN: 
-@NM_DEVICE_BT_ERROR_NOT_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_BT_CONNECTION: 
-@NM_DEVICE_BT_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_BT_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml b/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
deleted file mode 100644
index 4d97c189..00000000
--- a/docs/libnm-glib/tmpl/nm-device-ethernet.sgml
+++ /dev/null
@@ -1,125 +0,0 @@
-
-NMDeviceEthernet
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_ETHERNET_ERROR_UNKNOWN: 
-@NM_DEVICE_ETHERNET_ERROR_NOT_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_ETHERNET_CONNECTION: 
-@NM_DEVICE_ETHERNET_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-generic.sgml b/docs/libnm-glib/tmpl/nm-device-generic.sgml
deleted file mode 100644
index c20500bf..00000000
--- a/docs/libnm-glib/tmpl/nm-device-generic.sgml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-NMDeviceGeneric
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_GENERIC_ERROR_UNKNOWN: 
-@NM_DEVICE_GENERIC_ERROR_NOT_GENERIC_CONNECTION: 
-@NM_DEVICE_GENERIC_ERROR_MISSING_INTERFACE_NAME: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml b/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
deleted file mode 100644
index 73a3f3c4..00000000
--- a/docs/libnm-glib/tmpl/nm-device-infiniband.sgml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-NMDeviceInfiniband
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_INFINIBAND_ERROR_UNKNOWN: 
-@NM_DEVICE_INFINIBAND_ERROR_NOT_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_INFINIBAND_CONNECTION: 
-@NM_DEVICE_INFINIBAND_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-modem.sgml b/docs/libnm-glib/tmpl/nm-device-modem.sgml
deleted file mode 100644
index 007c3b42..00000000
--- a/docs/libnm-glib/tmpl/nm-device-modem.sgml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-NMDeviceModem
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_MODEM_ERROR_UNKNOWN: 
-@NM_DEVICE_MODEM_ERROR_NOT_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_INVALID_MODEM_CONNECTION: 
-@NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
deleted file mode 100644
index c8cccb2f..00000000
--- a/docs/libnm-glib/tmpl/nm-device-olpc-mesh.sgml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-NMDeviceOlpcMesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_DEVICE_OLPC_MESH_ERROR_NOT_OLPC_MESH_CONNECTION: 
-@NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-team.sgml b/docs/libnm-glib/tmpl/nm-device-team.sgml
deleted file mode 100644
index abf5ab69..00000000
--- a/docs/libnm-glib/tmpl/nm-device-team.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-NMDeviceTeam
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_TEAM_ERROR_UNKNOWN: 
-@NM_DEVICE_TEAM_ERROR_NOT_TEAM_CONNECTION: 
-@NM_DEVICE_TEAM_ERROR_INVALID_TEAM_CONNECTION: 
-@NM_DEVICE_TEAM_ERROR_INTERFACE_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-vlan.sgml b/docs/libnm-glib/tmpl/nm-device-vlan.sgml
deleted file mode 100644
index 5397d204..00000000
--- a/docs/libnm-glib/tmpl/nm-device-vlan.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-NMDeviceVlan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_VLAN_ERROR_UNKNOWN: 
-@NM_DEVICE_VLAN_ERROR_NOT_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_INVALID_VLAN_CONNECTION: 
-@NM_DEVICE_VLAN_ERROR_ID_MISMATCH: 
-@NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH: 
-@NM_DEVICE_VLAN_ERROR_MAC_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wifi.sgml b/docs/libnm-glib/tmpl/nm-device-wifi.sgml
deleted file mode 100644
index b694b822..00000000
--- a/docs/libnm-glib/tmpl/nm-device-wifi.sgml
+++ /dev/null
@@ -1,205 +0,0 @@
-
-NMDeviceWifi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_WIFI_ERROR_UNKNOWN: 
-@NM_DEVICE_WIFI_ERROR_NOT_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_WIFI_CONNECTION: 
-@NM_DEVICE_WIFI_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIFI_ERROR_MAC_MISMATCH: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_WPA_CAPS: 
-@NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device-wimax.sgml b/docs/libnm-glib/tmpl/nm-device-wimax.sgml
deleted file mode 100644
index acf1ab91..00000000
--- a/docs/libnm-glib/tmpl/nm-device-wimax.sgml
+++ /dev/null
@@ -1,199 +0,0 @@
-
-NMDeviceWimax
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_WIMAX_ERROR_UNKNOWN: 
-@NM_DEVICE_WIMAX_ERROR_NOT_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_WIMAX_CONNECTION: 
-@NM_DEVICE_WIMAX_ERROR_INVALID_DEVICE_MAC: 
-@NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-device.sgml b/docs/libnm-glib/tmpl/nm-device.sgml
deleted file mode 100644
index ef5443e1..00000000
--- a/docs/libnm-glib/tmpl/nm-device.sgml
+++ /dev/null
@@ -1,562 +0,0 @@
-
-NMDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_DEVICE_ERROR_UNKNOWN: 
-@NM_DEVICE_ERROR_INTERFACE_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@autoconnect: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@reason: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@devices: 
-@num_devices: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@connections: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@error: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
deleted file mode 100644
index 4f3d8602..00000000
--- a/docs/libnm-glib/tmpl/nm-dhcp4-config.sgml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-NMDHCP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml b/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
deleted file mode 100644
index 7679b7d9..00000000
--- a/docs/libnm-glib/tmpl/nm-dhcp6-config.sgml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-NMDHCP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml b/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
deleted file mode 100644
index b81a00af..00000000
--- a/docs/libnm-glib/tmpl/nm-glib-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-glib-enum-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip4-config.sgml b/docs/libnm-glib/tmpl/nm-ip4-config.sgml
deleted file mode 100644
index 6b5f91f3..00000000
--- a/docs/libnm-glib/tmpl/nm-ip4-config.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-
-NMIP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-ip6-config.sgml b/docs/libnm-glib/tmpl/nm-ip6-config.sgml
deleted file mode 100644
index f0a95e52..00000000
--- a/docs/libnm-glib/tmpl/nm-ip6-config.sgml
+++ /dev/null
@@ -1,149 +0,0 @@
-
-NMIP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-object.sgml b/docs/libnm-glib/tmpl/nm-object.sgml
deleted file mode 100644
index 7d99e2c0..00000000
--- a/docs/libnm-glib/tmpl/nm-object.sgml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-NMObject
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_OBJECT_ERROR_UNKNOWN: 
-@NM_OBJECT_ERROR_OBJECT_CREATION_FAILURE: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@object: 
-@Returns: 
-
-
-
-
-
-
-
-@object: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-connection.sgml b/docs/libnm-glib/tmpl/nm-remote-connection.sgml
deleted file mode 100644
index f20ef680..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-connection.sgml
+++ /dev/null
@@ -1,172 +0,0 @@
-
-NMRemoteConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_REMOTE_CONNECTION_ERROR_UNKNOWN: 
-@NM_REMOTE_CONNECTION_ERROR_DISCONNECTED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@bus: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-remote-settings.sgml b/docs/libnm-glib/tmpl/nm-remote-settings.sgml
deleted file mode 100644
index 4500e38f..00000000
--- a/docs/libnm-glib/tmpl/nm-remote-settings.sgml
+++ /dev/null
@@ -1,251 +0,0 @@
-
-NMRemoteSettings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_REMOTE_SETTINGS_ERROR_UNKNOWN: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: 
-@NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: 
-@NM_REMOTE_SETTINGS_ERROR_SERVICE_UNAVAILABLE: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@settings: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@settings: 
-@failures: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@settings: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@bus: 
-@Returns: 
-
-
-
-
-
-
-
-@bus: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@id: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@uuid: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@connection: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@filenames: 
-@failures: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@settings: 
-@hostname: 
-@callback: 
-@user_data: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-secret-agent.sgml b/docs/libnm-glib/tmpl/nm-secret-agent.sgml
deleted file mode 100644
index 72f5a573..00000000
--- a/docs/libnm-glib/tmpl/nm-secret-agent.sgml
+++ /dev/null
@@ -1,203 +0,0 @@
-
-NMSecretAgent
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED: 
-@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_CAPABILITY_NONE: 
-@NM_SECRET_AGENT_CAPABILITY_VPN_HINTS: 
-@NM_SECRET_AGENT_CAPABILITY_LAST: 
-
-
-
-
-
-
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@agent: 
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@setting_name: 
-@hints: 
-@flags: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-types.sgml b/docs/libnm-glib/tmpl/nm-types.sgml
deleted file mode 100644
index 18babb0f..00000000
--- a/docs/libnm-glib/tmpl/nm-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml b/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
deleted file mode 100644
index 39d5ecc1..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-connection.sgml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-NMVPNConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@vpn: 
-@Returns: 
-
-
-
-
-
-
-
-@vpn: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml b/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
deleted file mode 100644
index 0f800cac..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-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
deleted file mode 100644
index 1f6635b8..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-ui-interface.sgml
+++ /dev/null
@@ -1,178 +0,0 @@
-
-NMVpnPluginUiWidget
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_VPN_PLUGIN_UI_CAPABILITY_NONE: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT: 
-@NM_VPN_PLUGIN_UI_CAPABILITY_IPV6: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_FIRST: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC: 
-@NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE: 
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@path: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@path: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@iface: 
-@connection: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
deleted file mode 100644
index 3a6536da..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin-utils.sgml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-nm-vpn-plugin-utils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@fd: 
-@out_data: 
-@out_secrets: 
-@Returns: 
-
-
-
-
-
-
-
-@data: 
-@secret_name: 
-@out_flags: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml b/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
deleted file mode 100644
index 4f002dfe..00000000
--- a/docs/libnm-glib/tmpl/nm-vpn-plugin.sgml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-NMVPNPlugin
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@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_INTERACTIVE_NOT_SUPPORTED: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@state: 
-
-
-
-
-
-
-
-@plugin: 
-@message: 
-@hints: 
-
-
-
-
-
-
-
-@plugin: 
-@banner: 
-
-
-
-
-
-
-
-@plugin: 
-@reason: 
-
-
-
-
-
-
-
-@plugin: 
-@config: 
-
-
-
-
-
-
-
-@plugin: 
-@ip4_config: 
-
-
-
-
-
-
-
-@plugin: 
-@ip6_config: 
-
-
-
-
-
-
-
-@plugin: 
-@err: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml b/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
deleted file mode 100644
index 8add56d4..00000000
--- a/docs/libnm-glib/tmpl/nm-wimax-nsp.sgml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-NMWimaxNsp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: 
-@NM_WIMAX_NSP_NETWORK_TYPE_HOME: 
-@NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
-@NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
-
-
-
-
-
-
-@connection: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@connections: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index db9c82eb..1d2ea506 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -142,6 +142,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -255,6 +256,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -478,6 +480,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -485,9 +488,9 @@ SETUP_FILES = \
 
 # include common portion ...
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -522,11 +525,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -763,18 +761,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -787,7 +782,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -804,23 +799,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -830,17 +810,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -856,11 +836,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -885,13 +865,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -938,9 +920,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index 5c288a09..3ef46ffb 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMConnection
+NMConnection: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -633,7 +633,6 @@ nm_connection_error_quark (void
 
Returns

 
 the error quark used for NMConnection errors.

-

 
 
 

@@ -645,7 +644,6 @@ nm_connection_new (void
 
Returns

 
 the new empty NMConnection object

-

 
 
 

@@ -684,7 +682,6 @@ the connection. 

 
 the new NMConnection object, populated with settings created
 from the values in the hash table, or NULL if the connection failed to
 validate

-

 
 
 

@@ -918,7 +915,6 @@ nm_connection_replace_settings (
Returns

 
 TRUE if the settings were valid and added to the connection, FALSE
 if they were not

-

 
 
 

@@ -965,9 +961,8 @@ with

 
Returns

 
 TRUE if the settings were valid and added to the connection, FALSE
 if they were not

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1009,7 +1004,6 @@ each flag's behavior.

 

 
Returns

 
 TRUE if the comparison succeeds, FALSE if it does not

-

 

 

 

@@ -1065,7 +1059,6 @@ differ mapped to one or more of 
Returns

 
 TRUE if the connections contain the same values, FALSE if they do
 not

-

 
 
 

@@ -1108,7 +1101,6 @@ setting and which property failed validation, and how it failed validation.

 

 
Returns

 
 TRUE if the connection is valid, FALSE if it is not

-

 

 
 

@@ -1167,9 +1159,8 @@ why the connection is invalid, if the function returns an error.

 

 
Returns

 
 TRUE if the connection is valid, FALSE if it is not

-

 

-
Since 1.0

+
Since: 1.0

 
 

 

@@ -1212,7 +1203,6 @@ elements. 

 
Returns

 
 the setting name of the NMSetting object which has invalid or
 missing secrets

-

 

 
 

@@ -1332,7 +1322,6 @@ string:GValue of setting property names and secrets of
 
Returns

 
 TRUE if the secrets were successfully updated, FALSE if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)

-

 
 
 

@@ -1393,7 +1382,6 @@ nm_connection_get_path (
Returns

 
 the D-Bus path of the connection, previously set by a call to
 nm_connection_set_path().

-

 
 
 

@@ -1423,7 +1411,6 @@ connection types, this function will return NULL.
 
Returns

 
 Name of the kernel interface or NULL

-

 
 
 

@@ -1454,9 +1441,8 @@ NetworkManager, this is the name of the created interface.

 

 
Returns

 
 Name of the kernel interface or NULL

-

 

-
Since 1.0

+
Since: 1.0

 
 

 

@@ -1496,7 +1482,6 @@ property of the connection and matches that against 
 
Returns

 
 TRUE if the connection is of the given type
 , FALSE if not

-

 

 
 

@@ -1628,7 +1613,6 @@ nm_connection_lookup_setting_type (const 
 
Returns

 
 the GType of the setting's class

-

 
 
 

@@ -1657,7 +1641,6 @@ Useful for figuring out which setting a returned error is for.

 

 
Returns

 
 the GType of the setting's class

-

 

 
 

@@ -1684,7 +1667,6 @@ nm_connection_get_uuid (
 
Returns

 
 the UUID from the connection's 'connection' setting

-

 
 
 

@@ -1711,7 +1693,6 @@ nm_connection_get_id (
 
Returns

 
 the ID from the connection's 'connection' setting

-

 
 
 

@@ -1738,9 +1719,8 @@ nm_connection_get_connection_type (
 
Returns

 
 the type from the connection's 'connection' setting

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1775,7 +1755,7 @@ or NULL if connection
 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1884,7 +1864,7 @@ nm_connection_get_setting_team ( an NMSettingTeam if the connection contains one, otherwise NULL. 

 
[transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1912,7 +1892,7 @@ nm_connection_get_setting_team_port ( an NMSettingTeamPort if the connection contains one, otherwise NULL. 

 
[transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2048,7 +2028,7 @@ nm_connection_get_setting_dcb ( an NMSettingDcb if the connection contains one, otherwise NULL. 

 
[transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2076,7 +2056,7 @@ nm_connection_get_setting_generic ( an NMSettingGeneric if the connection contains one, otherwise NULL. 

 
[transfer none]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2491,32 +2471,24 @@ nm_connection_get_setting_vlan (
NM_CONNECTION_SECRETS_UPDATED

 
#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
 

-

-

 

 

 

 
NM_CONNECTION_SECRETS_CLEARED

 
#define NM_CONNECTION_SECRETS_CLEARED "secrets-cleared"
 

-

-

 

 

 

 
NM_CONNECTION_CHANGED

 
#define NM_CONNECTION_CHANGED         "changed"
 

-

-

 

 

 

 
NM_CONNECTION_PATH

 
#define NM_CONNECTION_PATH "path"
 

-

-

 

 

 

@@ -2582,16 +2554,12 @@ nm_connection_get_setting_vlan (
NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD

 
#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
 

-

-

 

 

 

 
NM_CONNECTION_ERROR

 
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
 

-

-

 

 

 

@@ -2645,7 +2613,7 @@ or when settings are added or removed.

 

 
 
Flags: Run First

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2721,7 +2689,6 @@ updated

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 140fac6a..3ce89683 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSetting
+NMSetting: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -331,7 +331,6 @@ nm_setting_error_quark (void
 
Returns

 
 the error quark used for NMSetting errors.

-

 
 
 

@@ -339,32 +338,24 @@ nm_setting_error_quark (void
NM_SETTING_PARAM_SERIALIZE

 
#define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
 

-

-

 
 

 

 
NM_SETTING_PARAM_REQUIRED

 
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
 

-

-

 

 

 

 
NM_SETTING_PARAM_SECRET

 
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
 

-

-

 

 

 

 
NM_SETTING_PARAM_FUZZY_IGNORE

 
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
 

-

-

 

 

 

@@ -409,7 +400,6 @@ nm_setting_error_quark (void
 
Returns

 
 TRUE to clear the secret, FALSE to not clear the secret

-

 

 
 

@@ -537,7 +527,6 @@ string to GValue mapping of properties that apply to the setting. 

 
Returns

 
 a new NMSetting object populated with the properties from the
 hash table, or NULL on failure

-

 
 
 

@@ -593,7 +582,6 @@ nm_setting_get_name (
Returns

 
 a string containing the type name of the NMSetting object,
 like 'ppp' or 'wireless' or 'wired'.

-

 
 
 

@@ -640,7 +628,6 @@ came. 

 

 
Returns

 
 TRUE if the setting is valid, FALSE if it is not

-

 

 
 

@@ -683,7 +670,6 @@ for a description of each flag's behavior.

 

 
Returns

 
 TRUE if the comparison succeeds, FALSE if it does not

-

 

 
 

@@ -746,7 +732,6 @@ in and the settings differ, a new one is created and returned. 

 

 
Returns

 
 TRUE if the settings contain the same values, FALSE if they do not

-

 

 
 

@@ -815,7 +800,6 @@ output format is not guaranteed to be stable and may change at any time.

 
 an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with g_free()

-

 
 
 

@@ -955,7 +939,6 @@ string to GValue of setting property names and secrets
 
Returns

 
 TRUE if the secrets were successfully updated, FALSE on failure to
 update one or more of the secrets.

-

 
 
 

@@ -1004,7 +987,6 @@ handle that secret.

 
Returns

 
 TRUE on success (if the given secret name was a valid property of
 this setting, and if that property is secret), FALSE if not

-

 
 
 

@@ -1053,7 +1035,6 @@ handle that secret.

 
Returns

 
 TRUE on success (if the given secret name was a valid property of
 this setting, and if that property is secret), FALSE if not

-

 
 
 

@@ -1082,7 +1063,6 @@ needs to use if specified in the settings.

 
Returns

 
 Name of the virtual interface or NULL if the setting does not
 support this feature

-

 
 
 
@@ -1141,16 +1121,12 @@ support this feature

 
NM_SETTING_ERROR

 
#define NM_SETTING_ERROR nm_setting_error_quark ()
 

-

-

 
 

 

 
NM_SETTING_NAME

 
#define NM_SETTING_NAME "name"
 

-

-

 

 

 

@@ -1423,7 +1399,6 @@ example "ppp" or "wireless" or "wired".

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index ba9dbe10..05d9516c 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSetting8021x
+NMSetting8021x: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -968,7 +968,6 @@ nm_setting_802_1x_error_quark (vo
 

 
Returns

 
 the error quark used for NMSetting8021x errors.

-

 

 
 

@@ -980,7 +979,6 @@ nm_setting_802_1x_new (void
 
Returns

 
 the new empty NMSetting8021x object

-

 
 
 

@@ -1011,7 +1009,6 @@ allowed EAP methods.

 

 
Returns

 
 the number of allowed EAP methods

-

 

 
 

@@ -1048,7 +1045,6 @@ nm_setting_802_1x_get_eap_method (
Returns

 
 the name of the allowed EAP method at index i
 

-

 
 
 

@@ -1086,7 +1082,6 @@ allowed EAP methods.

 
Returns

 
 TRUE if the EAP method was successfully added, FALSE if it was
 not a valid method or if it was already allowed.

-

 
 
 

@@ -1153,9 +1148,8 @@ nm_setting_802_1x_remove_eap_method_by_value
 

 
Returns

 
 TRUE if the EAP method was founs and removed, FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1204,7 +1198,6 @@ authenticate the user.  Often this is a username or login name.

 

 
Returns

 
 the user identifier

-

 

 

 

@@ -1235,7 +1228,6 @@ a secure form, if applicable for that EAP method.

 

 
Returns

 
 the anonymous identifier

-

 

 
 

@@ -1262,7 +1254,6 @@ nm_setting_802_1x_get_pac_file (
 
Returns

 
 the PAC file

-

 
 
 

@@ -1294,7 +1285,6 @@ of these properties.

 

 
Returns

 
 TRUE if a system CA certificate path should be used, FALSE if not

-

 

 
 

@@ -1325,7 +1315,6 @@ certificates for verifying the network to client.

 

 
Returns

 
 the CA certificate directory path

-

 

 
 

@@ -1356,7 +1345,6 @@ to add more CA certificates for verifying the network to client.

 

 
Returns

 
 the "phase 2" CA certificate directory path

-

 

 
 

@@ -1385,7 +1373,6 @@ if 
 
Returns

 
 scheme used to store the CA certificate (blob or path)

-

 
 
 

@@ -1417,7 +1404,6 @@ of the network cannot be confirmed by the client.

 

 
Returns

 
 the CA certificate data

-

 

 
 

@@ -1449,7 +1435,6 @@ of the network cannot be confirmed by the client.

 

 
Returns

 
 path to the CA certificate file

-

 

 
 

@@ -1510,7 +1495,6 @@ clears the CA certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -1539,7 +1523,6 @@ nm_setting_802_1x_get_subject_match (NULL no subject verification is to be
 performed.

-

 
 
 

@@ -1568,7 +1551,6 @@ nm_setting_802_1x_get_num_altsubject_matches
 

 
Returns

 
 the number of altsubject-matches entries.

-

 

 
 

@@ -1606,7 +1588,6 @@ nm_setting_802_1x_get_altsubject_match
 
Returns

 
 the altSubjectName match at index i
 

-

 
 
 

@@ -1645,7 +1626,6 @@ server is not verified.

 
Returns

 
 TRUE if the alternative subject name match was
 successfully added, FALSE if it was already allowed.

-

 
 
 

@@ -1714,9 +1694,8 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
Returns

 
 TRUE if the alternative subject name match was found and removed,
 FALSE if it was not.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1768,7 +1747,6 @@ if 
 
Returns

 
 scheme used to store the client certificate (blob or path)

-

 

 
 

@@ -1798,7 +1776,6 @@ authentication method.

 

 
Returns

 
 the client certificate data

-

 

 
 

@@ -1828,7 +1805,6 @@ authentication method.

 

 
Returns

 
 path to the client certificate file

-

 

 
 

@@ -1893,7 +1869,6 @@ clears the client certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -1921,7 +1896,6 @@ nm_setting_802_1x_get_phase1_peapver (“phase1-peapver” property.  Valid
 values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

-

 
 
 

@@ -1952,7 +1926,6 @@ used when authenticating with EAP-PEAP, as contained in the
 “phase1-peaplabel” property.  Valid values are NULL (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.

-

 
 
 

@@ -1981,7 +1954,6 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 
 whether "phase 1" PEAP fast provisioning should be used, as specified
 by the “phase1-fast-provisioning” property.  See the
 wpa_supplicant documentation for more details.

-

 
 
 

@@ -2008,7 +1980,6 @@ nm_setting_802_1x_get_phase2_auth (
Returns

 
 the "phase 2" non-EAP (ex MD5) allowed authentication method as
 specified by the “phase2-auth” property.

-

 
 
 

@@ -2035,7 +2006,6 @@ nm_setting_802_1x_get_phase2_autheap (
Returns

 
 the "phase 2" EAP-based (ex TLS) allowed authentication method as
 specified by the “phase2-autheap” property.

-

 
 
 

@@ -2066,7 +2036,6 @@ use 
 
Returns

 
 scheme used to store the "phase 2" CA certificate (blob or path)

-

 
 
 

@@ -2099,7 +2068,6 @@ of the network cannot be confirmed by the client.

 

 
Returns

 
 the "phase 2" CA certificate data

-

 

 
 

@@ -2132,7 +2100,6 @@ of the network cannot be confirmed by the client.

 

 
Returns

 
 path to the "phase 2" CA certificate file

-

 

 
 

@@ -2193,7 +2160,6 @@ clears the "phase2" CA certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -2223,7 +2189,6 @@ nm_setting_802_1x_get_phase2_subject_match
 the substring to be matched against the subject of the "phase 2"
 authentication server certificate, or NULL no subject verification
 is to be performed.

-

 
 
 

@@ -2252,7 +2217,6 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 

 
Returns

 
 the number of phase2-altsubject-matches entries.

-

 

 
 

@@ -2290,7 +2254,6 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
Returns

 
 the "phase 2" altSubjectName match at index i
 

-

 
 
 

@@ -2330,7 +2293,6 @@ connection

 
Returns

 
 TRUE if the "phase 2" alternative subject name match was
 successfully added, FALSE if it was already allowed.

-

 
 
 

@@ -2399,9 +2361,8 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
Returns

 
 TRUE if the alternative subject name match for "phase 2" was found and removed,
 FALSE if it was not.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2455,7 +2416,6 @@ returned scheme is 
 
Returns

 
 scheme used to store the "phase 2" client certificate (blob or path)

-

 

 
 

@@ -2485,7 +2445,6 @@ authentication method.

 

 
Returns

 
 the "phase 2" client certificate data

-

 

 
 

@@ -2515,7 +2474,6 @@ authentication method.

 

 
Returns

 
 path to the "phase 2" client certificate file

-

 

 
 

@@ -2581,7 +2539,6 @@ clears the "phase2" client certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -2608,7 +2565,6 @@ nm_setting_802_1x_get_password (
Returns

 
 the password used by the authentication method, if any, as specified
 by the “password” property

-

 
 
 

@@ -2634,7 +2590,6 @@ nm_setting_802_1x_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 

@@ -2662,7 +2617,6 @@ nm_setting_802_1x_get_password_raw ( the password used by the authentication method as a
 UTF-8-encoded array of bytes, as specified by the
 “password-raw” property

-

 
 
 

@@ -2690,7 +2644,6 @@ nm_setting_802_1x_get_password_raw_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “password-raw”

-

 
 
 

@@ -2717,7 +2670,6 @@ nm_setting_802_1x_get_pin (
Returns

 
 the PIN used by the authentication method, if any, as specified
 by the “pin” property

-

 
 
 

@@ -2744,7 +2696,6 @@ nm_setting_802_1x_get_pin_flags (
Returns

 
 the NMSettingSecretFlags pertaining to the
 “pin”

-

 
 
 

@@ -2776,7 +2727,6 @@ nm_setting_802_1x_get_private_key_scheme
 

 
Returns

 
 scheme used to store the private key (blob or path)

-

 

 
 

@@ -2809,7 +2759,6 @@ keys should always be encrypted with a private key password.

 

 
Returns

 
 the private key data

-

 

 
 

@@ -2839,7 +2788,6 @@ authentication method.

 

 
Returns

 
 path to the private key file

-

 

 
 

@@ -2927,7 +2875,6 @@ an error is returned.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -2956,7 +2903,6 @@ nm_setting_802_1x_get_private_key_password
 
 the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_private_key(), or the
 “private-key-password” property.

-

 
 
 

@@ -2984,7 +2930,6 @@ nm_setting_802_1x_get_private_key_password_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “private-key-password”

-

 
 
 

@@ -3012,7 +2957,6 @@ nm_setting_802_1x_get_private_key_format
 
Returns

 
 the data format of the private key data stored in the
 “private-key” property

-

 
 
 

@@ -3044,7 +2988,6 @@ scheme is 
 
Returns

 
 scheme used to store the "phase 2" private key (blob or path)

-

 
 
 

@@ -3077,7 +3020,6 @@ keys should always be encrypted with a private key password.

 

 
Returns

 
 the "phase 2" private key data

-

 

 
 

@@ -3107,7 +3049,6 @@ authentication method.

 

 
Returns

 
 path to the "phase 2" private key file

-

 

 
 

@@ -3197,7 +3138,6 @@ an error is returned.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -3226,7 +3166,6 @@ nm_setting_802_1x_get_phase2_private_key_password
 
 the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_phase2_private_key() or the
 “phase2-private-key-password” property.

-

 
 
 

@@ -3254,7 +3193,6 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “phase2-private-key-password”

-

 
 
 

@@ -3282,7 +3220,6 @@ nm_setting_802_1x_get_phase2_private_key_format
 
Returns

 
 the data format of the "phase 2" private key data stored in the
 “phase2-private-key” property

-

 
 
 
@@ -3383,8 +3320,6 @@ to a file containing the certificate or key data

 
NM_SETTING_802_1X_SETTING_NAME

 
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 

-

-

 
 

 

@@ -3429,264 +3364,198 @@ required

 
NM_SETTING_802_1X_ERROR

 
#define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_802_1X_EAP

 
#define NM_SETTING_802_1X_EAP "eap"
 

-

-

 

 

 

 
NM_SETTING_802_1X_IDENTITY

 
#define NM_SETTING_802_1X_IDENTITY "identity"
 

-

-

 

 

 

 
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

 
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PAC_FILE

 
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
 

-

-

 

 

 

 
NM_SETTING_802_1X_CA_CERT

 
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 

-

-

 

 

 

 
NM_SETTING_802_1X_CA_PATH

 
#define NM_SETTING_802_1X_CA_PATH "ca-path"
 

-

-

 

 

 

 
NM_SETTING_802_1X_SUBJECT_MATCH

 
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 

-

-

 

 

 

 
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

 
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 

-

-

 

 

 

 
NM_SETTING_802_1X_CLIENT_CERT

 
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE1_PEAPVER

 
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE1_PEAPLABEL

 
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

 
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_AUTH

 
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_AUTHEAP

 
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_CA_CERT

 
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_CA_PATH

 
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

 
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

 
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

 
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PASSWORD

 
#define NM_SETTING_802_1X_PASSWORD "password"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PASSWORD_FLAGS

 
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 

-

-

 

 

 

 
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_PRIVATE_KEY

 
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

 
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

 
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PIN

 
#define NM_SETTING_802_1X_PIN "pin"
 

-

-

 

 

 

 
NM_SETTING_802_1X_PIN_FLAGS

 
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 

-

-

 

 

 

 
NM_SETTING_802_1X_SYSTEM_CA_CERTS

 
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 

-

-

 

 
 

@@ -3694,14 +3563,18 @@ required

 

 
The “altsubject-matches” property

 
  “altsubject-matches”       GSList_gchararray_ *

-

+
List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server. If the list is empty,
+no verification of the server certificate's altSubjectName is performed.

 
Flags: Read / Write

 

 

 

 
The “anonymous-identity” property

 
  “anonymous-identity”       gchar *

-

+
Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3709,14 +3582,27 @@ required

 

 
The “ca-cert” property

 
  “ca-cert”                  GArray_guchar_ *

-

+
Contains the CA certificate if used by the EAP method specified in the
+“eap” property.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_ca_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “ca-path” property

 
  “ca-path”                  gchar *

-

+
UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the “ca-cert” property.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3724,21 +3610,35 @@ required

 

 
The “client-cert” property

 
  “client-cert”              GArray_guchar_ *

-

+
Contains the client certificate if used by the EAP method specified in
+the “eap” property.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_client_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “eap” property

 
  “eap”                      GSList_gchararray_ *

-

+
The allowed EAP method to be used when authenticating to the network with
+802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd",
+and "fast".  Each method requires different configuration using the
+properties of this setting; refer to wpa_supplicant documentation for the
+allowed combinations.

 
Flags: Read / Write

 

 

 

 
The “identity” property

 
  “identity”                 gchar *

-

+
Identity string for EAP authentication methods.  Often the user's user or
+login name.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3746,7 +3646,7 @@ required

 

 
The “pac-file” property

 
  “pac-file”                 gchar *

-

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

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3754,7 +3654,9 @@ required

 

 
The “password” property

 
  “password”                 gchar *

-

+
UTF-8 encoded password used for EAP authentication methods. If both the
+“password” property and the “password-raw”
+property are specified, “password” is preferred.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3762,7 +3664,7 @@ required

 

 
The “password-flags” property

 
  “password-flags”           guint

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -3771,14 +3673,17 @@ required

 

 
The “password-raw” property

 
  “password-raw”             GArray_guchar_ *

-

+
Password used for EAP authentication methods, given as a byte array to
+allow passwords in other encodings than UTF-8 to be used. If both the
+“password” property and the “password-raw”
+property are specified, “password” is preferred.

 
Flags: Read / Write

 

 

 

 
The “password-raw-flags” property

 
  “password-raw-flags”       guint

-

+
Flags indicating how to handle the “password-raw” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -3787,7 +3692,12 @@ required

 

 
The “phase1-fast-provisioning” property

 
  “phase1-fast-provisioning” gchar *

-

+
Enables or disables in-line provisioning of EAP-FAST credentials when
+FAST is specified as the EAP method in the “eap” property.
+Recognized values are "0" (disabled), "1" (allow unauthenticated
+provisioning), "2" (allow authenticated provisioning), and "3" (allow
+both authenticated and unauthenticated provisioning).  See the
+wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3795,7 +3705,10 @@ required

 

 
The “phase1-peaplabel” property

 
  “phase1-peaplabel”         gchar *

-

+
Forces use of the new PEAP label during key derivation.  Some RADIUS
+servers may require forcing the new PEAP label to interoperate with
+PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
+wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3803,7 +3716,12 @@ required

 

 
The “phase1-peapver” property

 
  “phase1-peapver”           gchar *

-

+
Forces which PEAP version is used when PEAP is set as the EAP method in
+the “eap” property.  When unset, the version reported by
+the server will be used.  Sometimes when using older RADIUS servers, it
+is necessary to force the client to use a particular PEAP version.  To do
+so, this property may be set to "0" or "1" to force that specific PEAP
+version.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3811,14 +3729,22 @@ required

 

 
The “phase2-altsubject-matches” property

 
  “phase2-altsubject-matches” GSList_gchararray_ *

-

+
List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server during the inner
+"phase 2" authentication. If the list is empty, no verification of the
+server certificate's altSubjectName is performed.

 
Flags: Read / Write

 

 

 

 
The “phase2-auth” property

 
  “phase2-auth”              gchar *

-

+
Specifies the allowed "phase 2" inner non-EAP authentication methods when
+an EAP method that uses an inner TLS tunnel is specified in the
+“eap” property.  Recognized non-EAP "phase 2" methods are
+"pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls".
+Each "phase 2" inner method requires specific parameters for successful
+authentication; see the wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3826,7 +3752,12 @@ required

 

 
The “phase2-autheap” property

 
  “phase2-autheap”           gchar *

-

+
Specifies the allowed "phase 2" inner EAP-based authentication methods
+when an EAP method that uses an inner TLS tunnel is specified in the
+“eap” property.  Recognized EAP-based "phase 2" methods are
+"md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method
+requires specific parameters for successful authentication; see the
+wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3834,14 +3765,28 @@ required

 

 
The “phase2-ca-cert” property

 
  “phase2-ca-cert”           GArray_guchar_ *

-

+
Contains the "phase 2" CA certificate if used by the EAP method specified
+in the “phase2-auth” or “phase2-autheap”
+properties.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_phase2_ca_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “phase2-ca-path” property

 
  “phase2-ca-path”           gchar *

-

+
UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the “phase2-ca-cert” property.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3849,21 +3794,56 @@ required

 

 
The “phase2-client-cert” property

 
  “phase2-client-cert”       GArray_guchar_ *

-

+
Contains the "phase 2" client certificate if used by the EAP method
+specified in the “phase2-auth” or
+“phase2-autheap” properties.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_phase2_client_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “phase2-private-key” property

 
  “phase2-private-key”       GArray_guchar_ *

-

+
Contains the "phase 2" inner private key when the
+“phase2-auth” or “phase2-autheap” property is
+set to "tls".

+
Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private keys and
+the blob scheme, this property should be set to the PKCS#12 data and the
+“phase2-private-key-password” property must be set to
+password used to decrypt the PKCS#12 certificate and key. When using
+PKCS#12 files and the path scheme, this property should be set to the
+full UTF-8 encoded path of the key, prefixed with the string "file://"
+and and ending with a terminating NUL byte, and as with the blob scheme
+the “phase2-private-key-password” property must be set to
+the password used to decode the PKCS#12 private key and certificate.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_phase2_private_key() function instead.

 
Flags: Read / Write

 

 

 

 
The “phase2-private-key-password” property

 
  “phase2-private-key-password” gchar *

-

+
The password used to decrypt the "phase 2" private key specified in the
+“phase2-private-key” property when the private key either
+uses the path scheme, or is a PKCS#12 format key.  Setting this property
+directly is not generally necessary except when returning secrets to
+NetworkManager; it is generally set automatically when setting the
+private key by the nm_setting_802_1x_set_phase2_private_key() function.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3871,7 +3851,8 @@ required

 

 
The “phase2-private-key-password-flags” property

 
  “phase2-private-key-password-flags” guint

-

+
Flags indicating how to handle the
+“phase2-private-key-password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -3880,7 +3861,10 @@ required

 

 
The “phase2-subject-match” property

 
  “phase2-subject-match”     gchar *

-

+
Substring to be matched against the subject of the certificate presented
+by the authentication server during the inner "phase 2"
+authentication. When unset, no verification of the authentication server
+certificate's subject is performed.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3888,7 +3872,7 @@ required

 

 
The “pin” property

 
  “pin”                      gchar *

-

+
PIN used for EAP authentication methods.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3896,7 +3880,7 @@ required

 

 
The “pin-flags” property

 
  “pin-flags”                guint

-

+
Flags indicating how to handle the “pin” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -3905,14 +3889,41 @@ required

 

 
The “private-key” property

 
  “private-key”              GArray_guchar_ *

-

+
Contains the private key when the “eap” property is set to
+"tls".

+
Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private keys and
+the blob scheme, this property should be set to the PKCS#12 data and the
+“private-key-password” property must be set to password
+used to decrypt the PKCS#12 certificate and key. When using PKCS#12 files
+and the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and and
+ending with a terminating NUL byte, and as with the blob scheme the
+"private-key-password" property must be set to the password used to
+decode the PKCS#12 private key and certificate.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_private_key() function instead.

+
WARNING: “private-key” is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.

 
Flags: Read / Write

 

 

 

 
The “private-key-password” property

 
  “private-key-password”     gchar *

-

+
The password used to decrypt the private key specified in the
+“private-key” property when the private key either uses the
+path scheme, or if the private key is a PKCS#12 format key.  Setting this
+property directly is not generally necessary except when returning
+secrets to NetworkManager; it is generally set automatically when setting
+the private key by the nm_setting_802_1x_set_private_key() function.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3920,7 +3931,8 @@ required

 

 
The “private-key-password-flags” property

 
  “private-key-password-flags” guint

-

+
Flags indicating how to handle the “private-key-password”
+property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -3929,7 +3941,9 @@ required

 

 
The “subject-match” property

 
  “subject-match”            gchar *

-

+
Substring to be matched against the subject of the certificate presented
+by the authentication server. When unset, no verification of the
+authentication server certificate's subject is performed.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3937,14 +3951,18 @@ required

 

 
The “system-ca-certs” property

 
  “system-ca-certs”          gboolean

-

+
When TRUE, overrides the “ca-path” and
+“phase2-ca-path” properties using the system CA directory
+specified at configure time with the --system-ca-path switch.  The
+certificates in this directory are added to the verification chain in
+addition to any certificates specified by the “ca-cert” and
+“phase2-ca-cert” properties.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index 3b2aef23..165177b5 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingAdsl
+NMSettingAdsl: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -263,7 +263,6 @@ nm_setting_adsl_error_quark (void
 

 
Returns

 
 the error quark used for NMSettingAdsl errors.

-

 

 

 

@@ -275,7 +274,6 @@ nm_setting_adsl_new (void<
 

 
Returns

 
 the new empty NMSettingAdsl object

-

 

 

 

@@ -301,7 +299,6 @@ nm_setting_adsl_get_username (
 
Returns

 
 the “username” property of the setting

-

 

 
 

@@ -327,7 +324,6 @@ nm_setting_adsl_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -353,7 +349,6 @@ nm_setting_adsl_get_protocol (
 
Returns

 
 the “protocol” property of the setting

-

 
 
 

@@ -379,7 +374,6 @@ nm_setting_adsl_get_encapsulation (
 
Returns

 
 the “encapsulation” property of the setting

-

 
 
 

@@ -405,7 +399,6 @@ nm_setting_adsl_get_vpi (
 
Returns

 
 the “vpi” property of the setting

-

 
 
 

@@ -431,7 +424,6 @@ nm_setting_adsl_get_vci (
 
Returns

 
 the “vci” property of the setting

-

 
 
 

@@ -457,7 +449,6 @@ nm_setting_adsl_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -467,8 +458,6 @@ nm_setting_adsl_get_password_flags (
NM_SETTING_ADSL_SETTING_NAME

 
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
 

-

-

 
 

 

@@ -513,104 +502,78 @@ required

 
NM_SETTING_ADSL_ERROR

 
#define NM_SETTING_ADSL_ERROR nm_setting_adsl_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_ADSL_USERNAME

 
#define NM_SETTING_ADSL_USERNAME            "username"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PASSWORD

 
#define NM_SETTING_ADSL_PASSWORD            "password"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PASSWORD_FLAGS

 
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL

 
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
 

-

-

 

 

 

 
NM_SETTING_ADSL_ENCAPSULATION

 
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
 

-

-

 

 

 

 
NM_SETTING_ADSL_VPI

 
#define NM_SETTING_ADSL_VPI                 "vpi"
 

-

-

 

 

 

 
NM_SETTING_ADSL_VCI

 
#define NM_SETTING_ADSL_VCI                 "vci"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL_PPPOA

 
#define NM_SETTING_ADSL_PROTOCOL_PPPOA      "pppoa"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL_PPPOE

 
#define NM_SETTING_ADSL_PROTOCOL_PPPOE      "pppoe"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL_IPOATM

 
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
 

-

-

 

 

 

 
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

 
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 

-

-

 

 

 

 
NM_SETTING_ADSL_ENCAPSULATION_LLC

 
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 

-

-

 

 
 

@@ -618,7 +581,7 @@ required

 

 
The “encapsulation” property

 
  “encapsulation”            gchar *

-

+
Encapsulation of ADSL connection.  Can be "vcmux" or "llc".

 
Flags: Read / Write

 
Default value: NULL

 

@@ -626,7 +589,7 @@ required

 

 
The “password” property

 
  “password”                 gchar *

-

+
Password used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -634,7 +597,7 @@ required

 

 
The “password-flags” property

 
  “password-flags”           guint

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -643,7 +606,7 @@ required

 

 
The “protocol” property

 
  “protocol”                 gchar *

-

+
ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".

 
Flags: Read / Write

 
Default value: NULL

 

@@ -651,7 +614,7 @@ required

 

 
The “username” property

 
  “username”                 gchar *

-

+
Username used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -659,7 +622,7 @@ required

 

 
The “vci” property

 
  “vci”                      guint

-

+
VCI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

 
Default value: 0

@@ -668,7 +631,7 @@ required

 

 
The “vpi” property

 
  “vpi”                      guint

-

+
VPI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

 
Default value: 0

@@ -676,7 +639,6 @@ required

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index cf501a32..b011f98f 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingBluetooth
+NMSettingBluetooth: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -168,7 +168,6 @@ nm_setting_bluetooth_error_quark (
 
Returns

 
 the error quark used for NMSettingBluetooth errors.

-

 

 
 

@@ -208,7 +207,6 @@ describes a connection to.

 

 
Returns

 
 the Bluetooth address

-

 

 
 

@@ -238,7 +236,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).

 
Returns

 
 the type, either NM_SETTING_BLUETOOTH_TYPE_PANU or
 NM_SETTING_BLUETOOTH_TYPE_DUN

-

 
 
 
@@ -248,8 +245,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).

 
NM_SETTING_BLUETOOTH_SETTING_NAME

 
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

-

-

 
 

 

@@ -303,24 +298,18 @@ must also contain an 
NM_SETTING_BLUETOOTH_ERROR

 
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_BLUETOOTH_BDADDR

 
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

-

-

 

 

 

 
NM_SETTING_BLUETOOTH_TYPE

 
#define NM_SETTING_BLUETOOTH_TYPE      "type"
 

-

-

 

 

 

@@ -344,21 +333,21 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.

 

 
The “bdaddr” property

 
  “bdaddr”                   GArray_guchar_ *

-

+
The Bluetooth address of the device.

 
Flags: Read / Write

 

 

 

 
The “type” property

 
  “type”                     gchar *

-

+
Either "dun" for Dial-Up Networking connections or "panu" for Personal
+Area Networking connections to devices supporting the NAP profile.

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index f0dae1ec..8d0e4d48 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingBond
+NMSettingBond: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -271,7 +271,6 @@ nm_setting_bond_error_quark (void
 

 
Returns

 
 the error quark used for NMSettingBond errors.

-

 

 
 

@@ -309,7 +308,6 @@ nm_setting_bond_get_interface_name (
 
Returns

 
 the “interface-name” property of the setting

-

 
 
 

@@ -338,7 +336,6 @@ using 
 
Returns

 
 the number of bonding options

-

 
 
 

@@ -394,7 +391,6 @@ option; this value is owned by the setting and should not be modified. 

 
 TRUE on success if the index was valid and an option was found,
 FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)

-

 
 
 

@@ -432,7 +428,6 @@ nm_setting_bond_get_option_by_name (
Returns

 
 the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified

-

 
 
 

@@ -479,7 +474,6 @@ that conflict with each other.

 
Returns

 
 TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -517,7 +511,6 @@ list.

 
Returns

 
 TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -560,9 +553,8 @@ the name
 is valid for the given name.
 If the name
 is not a valid option, FALSE will be returned.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -623,7 +615,6 @@ nm_setting_bond_get_option_default (
Returns

 
 the value of the bond option if not overridden by an entry in
 the “options” property.

-

 

 
 
@@ -633,8 +624,6 @@ the 
NM_SETTING_BOND_SETTING_NAME

 
#define NM_SETTING_BOND_SETTING_NAME "bond"
 

-

-

 
 

 

@@ -672,13 +661,13 @@ required

 
 
 
NM_SETTING_BOND_ERROR_INVALID_OPTION

- 
- 
+ 
+ 
 
 
 
NM_SETTING_BOND_ERROR_MISSING_OPTION

- 
- 
+ 
+ 
 
 
 

@@ -689,144 +678,108 @@ required

 
NM_SETTING_BOND_ERROR

 
#define NM_SETTING_BOND_ERROR nm_setting_bond_error_quark ()
 

-

-

 
 

 

 
NM_SETTING_BOND_INTERFACE_NAME

 
#define NM_SETTING_BOND_INTERFACE_NAME "interface-name"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTIONS

 
#define NM_SETTING_BOND_OPTIONS "options"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_MODE

 
#define NM_SETTING_BOND_OPTION_MODE             "mode"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_MIIMON

 
#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_DOWNDELAY

 
#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_UPDELAY

 
#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_INTERVAL

 
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

 
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_VALIDATE

 
#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_PRIMARY

 
#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_PRIMARY_RESELECT

 
#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_FAIL_OVER_MAC

 
#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_USE_CARRIER

 
#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_AD_SELECT

 
#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY

 
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_RESEND_IGMP

 
#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_LACP_RATE

 
#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
 

-

-

 

 
 

@@ -834,7 +787,7 @@ required

 

 
The “interface-name” property

 
  “interface-name”           gchar *

-

+
The name of the virtual in-kernel bonding network interface

 
Flags: Read / Write

 
Default value: NULL

 

@@ -842,13 +795,14 @@ required

 

 
The “options” property

 
  “options”                  GHashTable_gchararray+gchararray_*

-

+
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]).

 
Flags: Read / Write

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index a3292475..71cdd58f 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingBridge
+NMSettingBridge: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -260,9 +260,8 @@ nm_setting_bridge_error_quark (vo
 

 
Returns

 
 the error quark used for NMSettingBridge errors.

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -275,7 +274,7 @@ nm_setting_bridge_new (void the new empty NMSettingBridge object. 

 
[transfer full]

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -300,9 +299,8 @@ nm_setting_bridge_get_interface_name (
 
Returns

 
 the “interface-name” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -327,9 +325,8 @@ nm_setting_bridge_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -354,9 +351,8 @@ nm_setting_bridge_get_stp (
 
Returns

 
 the “stp” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -381,9 +377,8 @@ nm_setting_bridge_get_priority (
 
Returns

 
 the “priority” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -408,9 +403,8 @@ nm_setting_bridge_get_forward_delay (
 
Returns

 
 the “forward-delay” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -435,9 +429,8 @@ nm_setting_bridge_get_hello_time (
 
Returns

 
 the “hello-time” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -462,9 +455,8 @@ nm_setting_bridge_get_max_age (
 
Returns

 
 the “max-age” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -489,9 +481,8 @@ nm_setting_bridge_get_ageing_time (
 
Returns

 
 the “ageing-time” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 
 

@@ -500,8 +491,6 @@ nm_setting_bridge_get_ageing_time (
NM_SETTING_BRIDGE_SETTING_NAME

 
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 

-

-

 

 

 

@@ -540,79 +529,61 @@ required

 
 

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

 
NM_SETTING_BRIDGE_ERROR

 
#define NM_SETTING_BRIDGE_ERROR nm_setting_bridge_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_INTERFACE_NAME

 
#define NM_SETTING_BRIDGE_INTERFACE_NAME "interface-name"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_MAC_ADDRESS

 
#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_STP

 
#define NM_SETTING_BRIDGE_STP            "stp"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PRIORITY

 
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_FORWARD_DELAY

 
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_HELLO_TIME

 
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_MAX_AGE

 
#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_AGEING_TIME

 
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 

-

-

 

 
 

@@ -620,82 +591,85 @@ required

 

 
The “ageing-time” property

 
  “ageing-time”              guint

-

+
The Ethernet MAC address aging time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 1000000

 
Default value: 300

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “forward-delay” property

 
  “forward-delay”            guint

-

+
The Spanning Tree Protocol (STP) forwarding delay, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 30

 
Default value: 15

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “hello-time” property

 
  “hello-time”               guint

-

+
The Spanning Tree Protocol (STP) hello time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 10

 
Default value: 2

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “interface-name” property

 
  “interface-name”           gchar *

-

+
The name of the virtual in-kernel bridging network interface

 
Flags: Read / Write

 
Default value: NULL

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “mac-address” property

 
  “mac-address”              GArray_guchar_ *

-

+
If specified, the MAC address of bridge. When creating a new bridge, this
+MAC address will be set. When matching an existing (outside
+NetworkManager created) bridge, this MAC address must match.

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “max-age” property

 
  “max-age”                  guint

-

+
The Spanning Tree Protocol (STP) maximum message age, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 40

 
Default value: 20

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “priority” property

 
  “priority”                 guint

-

+
Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.

 
Flags: Read / Write / Construct

 
Allowed values: <= 65535

 
Default value: 32768

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “stp” property

 
  “stp”                      gboolean

-

+
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

 
Flags: Read / Write / Construct

 
Default value: TRUE

-
Since 0.9.8

+
Since: 0.9.8

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index 00f8ce21..bc204181 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingBridgePort
+NMSettingBridgePort: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -175,9 +175,8 @@ nm_setting_bridge_port_error_quark (
 
Returns

 
 the error quark used for NMSettingBridgePort errors.

-

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -190,7 +189,7 @@ nm_setting_bridge_port_new (void<
 
 the new empty NMSettingBridgePort object. 

 
[transfer full]

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -215,9 +214,8 @@ nm_setting_bridge_port_get_priority (
 
Returns

 
 the “priority” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -242,9 +240,8 @@ nm_setting_bridge_port_get_path_cost (
 
Returns

 
 the “path-cost” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -270,9 +267,8 @@ nm_setting_bridge_port_get_hairpin_mode
 

 
Returns

 
 the “hairpin-mode” property of the setting

-

 

-
Since 0.9.8

+
Since: 0.9.8

 

 
 

@@ -281,8 +277,6 @@ nm_setting_bridge_port_get_hairpin_mode
 
NM_SETTING_BRIDGE_PORT_SETTING_NAME

 
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
 

-

-

 

 

 

@@ -321,39 +315,31 @@ is required

 
 

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

 
NM_SETTING_BRIDGE_PORT_ERROR

 
#define NM_SETTING_BRIDGE_PORT_ERROR nm_setting_bridge_port_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PORT_PRIORITY

 
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PORT_PATH_COST

 
#define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

 
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 

-

-

 

 
 

@@ -361,35 +347,36 @@ is required

 

 
The “hairpin-mode” property

 
  “hairpin-mode”             gboolean

-

+
Enables or disabled "hairpin mode" for the port, which allows frames to
+be sent back out through the port the frame was received on.

 
Flags: Read / Write

 
Default value: FALSE

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “path-cost” property

 
  “path-cost”                guint

-

+
The Spanning Tree Protocol (STP) port cost for destinations via this
+port.

 
Flags: Read / Write / Construct

 
Allowed values: <= 65535

 
Default value: 100

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “priority” property

 
  “priority”                 guint

-

+
The Spanning Tree Protocol (STP) priority of this bridge port.

 
Flags: Read / Write / Construct

 
Allowed values: <= 63

 
Default value: 32

-
Since 0.9.8

+
Since: 0.9.8

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index e0d32198..43980d9d 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingCdma
+NMSettingCdma: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -193,7 +193,6 @@ nm_setting_cdma_error_quark (void
 

 
Returns

 
 the error quark used for NMSettingCdma errors.

-

 

 
 

@@ -205,7 +204,6 @@ nm_setting_cdma_new (void<
 

 
Returns

 
 the new empty NMSettingCdma object

-

 

 
 

@@ -231,7 +229,6 @@ nm_setting_cdma_get_number (
 
Returns

 
 the “number” property of the setting

-

 
 
 

@@ -257,7 +254,6 @@ nm_setting_cdma_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -283,7 +279,6 @@ nm_setting_cdma_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -309,7 +304,6 @@ nm_setting_cdma_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -319,8 +313,6 @@ nm_setting_cdma_get_password_flags (
NM_SETTING_CDMA_SETTING_NAME

 
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 

-

-

 
 

 

@@ -373,40 +365,30 @@ 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"
 

-

-

 

 

 

 
NM_SETTING_CDMA_USERNAME

 
#define NM_SETTING_CDMA_USERNAME       "username"
 

-

-

 

 

 

 
NM_SETTING_CDMA_PASSWORD

 
#define NM_SETTING_CDMA_PASSWORD       "password"
 

-

-

 

 

 

 
NM_SETTING_CDMA_PASSWORD_FLAGS

 
#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 

-

-

 

 
 

@@ -414,7 +396,9 @@ is missing in the connection

 

 
The “number” property

 
  “number”                   gchar *

-

+
The number to dial to establish the connection to the CDMA-based mobile
+broadband network, if any.  If not specified, the default number (777)
+is used when required.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -422,7 +406,9 @@ is missing in the connection

 

 
The “password” property

 
  “password”                 gchar *

-

+
The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -430,7 +416,7 @@ is missing in the connection

 

 
The “password-flags” property

 
  “password-flags”           guint

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -439,14 +425,15 @@ is missing in the connection

 

 
The “username” property

 
  “username”                 gchar *

-

+
The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index f029e3c0..ba73eb00 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingConnection
+NMSettingConnection: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -432,7 +432,6 @@ nm_setting_connection_error_quark (
 
Returns

 
 the error quark used for NMSettingConnection errors.

-

 
 
 

@@ -444,7 +443,6 @@ nm_setting_connection_new (void
 
Returns

 
 the new empty NMSettingConnection object

-

 
 
 

@@ -471,7 +469,6 @@ nm_setting_connection_get_id (
 
Returns

 
 the connection ID

-

 
 
 

@@ -498,7 +495,6 @@ nm_setting_connection_get_uuid (
 
Returns

 
 the connection UUID

-

 
 
 

@@ -526,9 +522,8 @@ nm_setting_connection_get_interface_name
 

 
Returns

 
 the connection's interface name

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -555,7 +550,6 @@ nm_setting_connection_get_connection_type
 

 
Returns

 
 the connection type

-

 

 

 

@@ -582,7 +576,6 @@ nm_setting_connection_get_autoconnect (
 
Returns

 
 the connection's autoconnect behavior

-

 
 
 

@@ -609,7 +602,6 @@ nm_setting_connection_get_timestamp (
 
Returns

 
 the connection's timestamp

-

 
 
 

@@ -636,7 +628,6 @@ nm_setting_connection_get_read_only (
 
Returns

 
 TRUE if the connection is read-only, FALSE if it is not

-

 
 
 

@@ -665,7 +656,6 @@ property of this setting.

 

 
Returns

 
 the number of permissions entires

-

 

 
 

@@ -722,7 +712,6 @@ of this setting.

 
Returns

 
 TRUE if a permission was returned, FALSE if idx
 was invalid

-

 
 
 

@@ -749,7 +738,6 @@ nm_setting_connection_get_zone (
 
Returns

 
 the trust level of a connection

-

 
 
 

@@ -786,7 +774,6 @@ nm_setting_connection_permissions_user_allowed
 
Returns

 
 TRUE if the requested user is allowed to view this connection,
 FALSE if the given user is not allowed to view this connection

-

 
 
 

@@ -841,7 +828,6 @@ list, FALSE if ptypepitem
 was invalid or it the permission was already
 present in the list

-

 
 
 

@@ -925,9 +911,8 @@ be a username. See 
 
Returns

 
 TRUE if the permission was found and removed; FALSE if it was not.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -954,7 +939,6 @@ nm_setting_connection_get_master (
Returns

 
 interface name of the master device or UUID of the master
 connection.

-

 

 
 

@@ -991,7 +975,6 @@ against setting
 
Returns

 
 TRUE if connection is of the given slave type
 

-

 
 
 

@@ -1018,7 +1001,6 @@ nm_setting_connection_get_slave_type (
 
Returns

 
 the type of slave this connection is, if any

-

 
 
 

@@ -1045,9 +1027,8 @@ nm_setting_connection_get_num_secondaries
 

 
Returns

 
 the number of configured secondary connection UUIDs

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1081,9 +1062,8 @@ nm_setting_connection_get_secondary (
Returns

 
 the secondary connection UUID at index idx
 

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1118,9 +1098,8 @@ nm_setting_connection_add_secondary (
Returns

 
 TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1153,7 +1132,7 @@ nm_setting_connection_remove_secondary
 
 

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1189,9 +1168,8 @@ nm_setting_connection_remove_secondary_by_value
 

 
Returns

 
 TRUE if the secondary connection UUID was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -1218,9 +1196,8 @@ nm_setting_connection_get_gateway_ping_timeout
 
Returns

 
 the value contained in the “gateway-ping-timeout”
 property.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -1229,8 +1206,6 @@ property.

 
NM_SETTING_CONNECTION_SETTING_NAME

 
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

-

-

 

 

 

@@ -1295,112 +1270,84 @@ property.

 
NM_SETTING_CONNECTION_ERROR

 
#define NM_SETTING_CONNECTION_ERROR nm_setting_connection_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_ID

 
#define NM_SETTING_CONNECTION_ID             "id"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_UUID

 
#define NM_SETTING_CONNECTION_UUID           "uuid"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_INTERFACE_NAME

 
#define NM_SETTING_CONNECTION_INTERFACE_NAME "interface-name"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_TYPE

 
#define NM_SETTING_CONNECTION_TYPE           "type"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_AUTOCONNECT

 
#define NM_SETTING_CONNECTION_AUTOCONNECT    "autoconnect"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_TIMESTAMP

 
#define NM_SETTING_CONNECTION_TIMESTAMP      "timestamp"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_READ_ONLY

 
#define NM_SETTING_CONNECTION_READ_ONLY      "read-only"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_PERMISSIONS

 
#define NM_SETTING_CONNECTION_PERMISSIONS    "permissions"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_ZONE

 
#define NM_SETTING_CONNECTION_ZONE           "zone"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_MASTER

 
#define NM_SETTING_CONNECTION_MASTER         "master"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_SLAVE_TYPE

 
#define NM_SETTING_CONNECTION_SLAVE_TYPE     "slave-type"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_SECONDARIES

 
#define NM_SETTING_CONNECTION_SECONDARIES    "secondaries"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT

 
#define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout"
 

-

-

 

 

 

@@ -1431,7 +1378,7 @@ timeout is reached, or an IP gateway replies to a ping.

 
Flags: Read / Write / Construct

 
Allowed values: <= 30

 
Default value: 0

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -1457,7 +1404,7 @@ can be used with, and if interface names change or are reordered the
 connection may be applied to the wrong interface.

 
Flags: Read / Write

 
Default value: NULL

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -1501,7 +1448,7 @@ connection is read-only and cannot be modified.

 connection itself is activated. Currently only VPN connections are
 supported.

 
Flags: Read / Write

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

@@ -1570,7 +1517,6 @@ firewall.

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 8f2d90ea..5cd1cd53 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingDcb
+NMSettingDcb: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -449,9 +449,8 @@ nm_setting_dcb_error_quark (void<
 

 
Returns

 
 the error quark used for NMSettingDcb errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -464,7 +463,7 @@ nm_setting_dcb_new (void the new empty NMSettingDcb object. 

 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -489,9 +488,8 @@ nm_setting_dcb_get_app_fcoe_flags (
 
Returns

 
 the “app-fcoe-flags” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -516,9 +514,8 @@ nm_setting_dcb_get_app_fcoe_priority (
 
Returns

 
 the “app-fcoe-priority” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -543,9 +540,8 @@ nm_setting_dcb_get_app_fcoe_mode (
 
Returns

 
 the “app-fcoe-mode” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -570,9 +566,8 @@ nm_setting_dcb_get_app_iscsi_flags (
 
Returns

 
 the “app-iscsi-flags” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -597,9 +592,8 @@ nm_setting_dcb_get_app_iscsi_priority (
 
Returns

 
 the “app-iscsi-priority” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -624,9 +618,8 @@ nm_setting_dcb_get_app_fip_flags (
 
Returns

 
 the “app-fip-flags” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -651,9 +644,8 @@ nm_setting_dcb_get_app_fip_priority (
 
Returns

 
 the “app-fip-priority” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -679,9 +671,8 @@ nm_setting_dcb_get_priority_flow_control_flags
 

 
Returns

 
 the “priority-flow-control-flags” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -717,9 +708,8 @@ nm_setting_dcb_get_priority_flow_control
 
 TRUE if flow control is enabled for the given user_priority
 ,
 FALSE if not enabled

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -758,7 +748,7 @@ the 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -784,9 +774,8 @@ nm_setting_dcb_get_priority_group_flags
 

 
Returns

 
 the “priority-group-flags” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -822,9 +811,8 @@ nm_setting_dcb_get_priority_group_id (“priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -864,7 +852,7 @@ unrestricted group.

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -901,9 +889,8 @@ nm_setting_dcb_get_priority_group_bandwidth
 .  These values are
 only valid when “priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -943,7 +930,7 @@ to

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -979,9 +966,8 @@ nm_setting_dcb_get_priority_bandwidth (“priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1021,7 +1007,7 @@ allowed to use within its priority group

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1058,9 +1044,8 @@ nm_setting_dcb_get_priority_strict_bandwidth
 may use all of the bandwidth allocated to its
 assigned group, or FALSE if not. These values are only valid when
 “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1101,7 +1086,7 @@ its priority group, or FALSE if not

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1138,9 +1123,8 @@ nm_setting_dcb_get_priority_traffic_class
 . These values are only
 valid when “priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1150,8 +1134,6 @@ nm_setting_dcb_set_priority_traffic_class
                                (NMSettingDcb *setting,
                                 guint user_priority,
                                 guint traffic_class);
-

-

 

 
 

@@ -1160,8 +1142,6 @@ nm_setting_dcb_set_priority_traffic_class
 
NM_SETTING_DCB_SETTING_NAME

 
#define NM_SETTING_DCB_SETTING_NAME "dcb"
 

-

-

 

 

 

@@ -1206,8 +1186,6 @@ required

 
NM_SETTING_DCB_ERROR

 
#define NM_SETTING_DCB_ERROR nm_setting_dcb_error_quark ()
 

-

-

 

 

 

@@ -1254,7 +1232,7 @@ peer configuration advertisements

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1262,7 +1240,7 @@ peer configuration advertisements

 
#define NM_SETTING_DCB_FCOE_MODE_FABRIC  "fabric"
 

 
Indicates that the FCoE controller should use "fabric" mode (default)

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -1270,127 +1248,97 @@ peer configuration advertisements

 
#define NM_SETTING_DCB_FCOE_MODE_VN2VN   "vn2vn"
 

 
Indicates that the FCoE controller should use "VN2VN" mode.

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
NM_SETTING_DCB_APP_FCOE_FLAGS

 
#define NM_SETTING_DCB_APP_FCOE_FLAGS         "app-fcoe-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FCOE_PRIORITY

 
#define NM_SETTING_DCB_APP_FCOE_PRIORITY      "app-fcoe-priority"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FCOE_MODE

 
#define NM_SETTING_DCB_APP_FCOE_MODE          "app-fcoe-mode"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_ISCSI_FLAGS

 
#define NM_SETTING_DCB_APP_ISCSI_FLAGS        "app-iscsi-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_ISCSI_PRIORITY

 
#define NM_SETTING_DCB_APP_ISCSI_PRIORITY     "app-iscsi-priority"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FIP_FLAGS

 
#define NM_SETTING_DCB_APP_FIP_FLAGS          "app-fip-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FIP_PRIORITY

 
#define NM_SETTING_DCB_APP_FIP_PRIORITY       "app-fip-priority"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS

 
#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS  "priority-flow-control-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_FLOW_CONTROL

 
#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL        "priority-flow-control"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_GROUP_FLAGS

 
#define NM_SETTING_DCB_PRIORITY_GROUP_FLAGS      "priority-group-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_GROUP_ID

 
#define NM_SETTING_DCB_PRIORITY_GROUP_ID         "priority-group-id"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH

 
#define NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH  "priority-group-bandwidth"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_BANDWIDTH

 
#define NM_SETTING_DCB_PRIORITY_BANDWIDTH        "priority-bandwidth"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH

 
#define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS

 
#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 

-

-

 

 
 

@@ -1398,143 +1346,177 @@ peer configuration advertisements

 

 
The “app-fcoe-flags” property

 
  “app-fcoe-flags”           guint

-

+
Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may
+be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “app-fcoe-mode” property

 
  “app-fcoe-mode”            gchar *

-

+
The FCoE controller mode; either NM_SETTING_DCB_FCOE_MODE_FABRIC
+(default) or NM_SETTING_DCB_FCOE_MODE_VN2VN.

 
Flags: Read / Write / Construct

 
Default value: "fabric"

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “app-fcoe-priority” property

 
  “app-fcoe-priority”        gint

-

+
The highest User Priority (0 - 7) which FCoE frames should use, or -1 for
+default priority.  Only used when the “app-fcoe-flags”
+property includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,7]

 
Default value: -1

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “app-fip-flags” property

 
  “app-fip-flags”            guint

-

+
Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may
+be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “app-fip-priority” property

 
  “app-fip-priority”         gint

-

+
The highest User Priority (0 - 7) which FIP frames should use, or -1 for
+default priority.  Only used when the “app-fip-flags”
+property includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,7]

 
Default value: -1

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “app-iscsi-flags” property

 
  “app-iscsi-flags”          guint

-

+
Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags
+may be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “app-iscsi-priority” property

 
  “app-iscsi-priority”       gint

-

+
The highest User Priority (0 - 7) which iSCSI frames should use, or -1
+for default priority. Only used when the “app-iscsi-flags”
+property includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,7]

 
Default value: -1

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-bandwidth” property

 
  “priority-bandwidth”       GArray_guint_ *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates the percentage of bandwidth of
+the priority's assigned group that the priority may use.  The sum of all
+percentages for priorities which belong to the same group must total 100
+percent.

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-flow-control” property

 
  “priority-flow-control”    GArray_guint_ *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates whether or not the corresponding
+priority should transmit priority pause.  Allowed values are 0 (do not
+transmit pause) and 1 (transmit pause).

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-flow-control-flags” property

 
  “priority-flow-control-flags” guint

-

+
Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC).
+Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-group-bandwidth” property

 
  “priority-group-bandwidth” GArray_guint_ *

-

+
An array of 8 uint values, where the array index corresponds to the
+Priority Group ID (0 - 7) and the value indicates the percentage of link
+bandwidth allocated to that group.  Allowed values are 0 - 100, and the
+sum of all values must total 100 percent.

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-group-flags” property

 
  “priority-group-flags”     guint

-

+
Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be
+any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-group-id” property

 
  “priority-group-id”        GArray_guint_ *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed
+Priority Group ID values are 0 - 7 or 15 for the unrestricted group.

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-strict-bandwidth” property

 
  “priority-strict-bandwidth” GArray_guint_ *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates whether or not the priority may
+use all of the bandwidth allocated to its assigned group.  Allowed values
+are 0 (the priority may not utilize all bandwidth) or 1 (the priority may
+utilize all bandwidth).

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

 
The “priority-traffic-class” property

 
  “priority-traffic-class”   GArray_guint_ *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates the traffic class (0 - 7) to
+which the priority is mapped.

 
Flags: Read / Write

-
Since 0.9.10

+
Since: 0.9.10

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index d7f571b1..b6cc9066 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingGeneric
+NMSettingGeneric: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -114,9 +114,8 @@ nm_setting_generic_error_quark (v
 

 
Returns

 
 the error quark used for NMSettingGeneric errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -129,7 +128,7 @@ nm_setting_generic_new (void the new empty NMSettingGeneric object. 

 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -138,8 +137,6 @@ nm_setting_generic_new (void
NM_SETTING_GENERIC_SETTING_NAME

 
#define NM_SETTING_GENERIC_SETTING_NAME "generic"
 

-

-

 

 

 

@@ -178,20 +175,17 @@ is required

 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

 
NM_SETTING_GENERIC_ERROR

 
#define NM_SETTING_GENERIC_ERROR nm_setting_generic_error_quark ()
 

-

-

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 39aa12d1..1e725b02 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingGsm
+NMSettingGsm: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -326,7 +326,6 @@ nm_setting_gsm_error_quark (void<
 

 
Returns

 
 the error quark used for NMSettingGsm errors.

-

 

 
 

@@ -349,7 +348,6 @@ nm_setting_gsm_new (void
 
Returns

 
 the new empty NMSettingGsm object

-

 
 
 

@@ -375,7 +373,6 @@ nm_setting_gsm_get_number (
 
Returns

 
 the “number” property of the setting

-

 
 
 

@@ -401,7 +398,6 @@ nm_setting_gsm_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -427,7 +423,6 @@ nm_setting_gsm_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -453,7 +448,6 @@ nm_setting_gsm_get_apn (
 
Returns

 
 the “apn” property of the setting

-

 
 
 

@@ -479,7 +473,6 @@ nm_setting_gsm_get_network_id (
 
Returns

 
 the “network-id” property of the setting

-

 
 
 

@@ -505,7 +498,6 @@ nm_setting_gsm_get_pin (
 
Returns

 
 the “pin” property of the setting

-

 
 
 

@@ -531,7 +523,6 @@ nm_setting_gsm_get_home_only (
 
Returns

 
 the “home-only” property of the setting

-

 
 
 

@@ -557,7 +548,6 @@ nm_setting_gsm_get_pin_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “pin”

-

 
 
 

@@ -583,7 +573,6 @@ nm_setting_gsm_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 

@@ -613,7 +602,6 @@ nm_setting_gsm_get_network_type (
 
Returns

 
 the “network-type” property of the setting

-

 
 
 

@@ -643,7 +631,6 @@ nm_setting_gsm_get_allowed_bands (
 
Returns

 
 the “allowed-bands” property of the setting

-

 
 
 
@@ -653,8 +640,6 @@ nm_setting_gsm_get_allowed_bands (
NM_SETTING_GSM_SETTING_NAME

 
#define NM_SETTING_GSM_SETTING_NAME "gsm"
 

-

-

 
 

 

@@ -707,96 +692,72 @@ is missing in the connection

 
NM_SETTING_GSM_ERROR

 
#define NM_SETTING_GSM_ERROR nm_setting_gsm_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_GSM_NUMBER

 
#define NM_SETTING_GSM_NUMBER         "number"
 

-

-

 

 

 

 
NM_SETTING_GSM_USERNAME

 
#define NM_SETTING_GSM_USERNAME       "username"
 

-

-

 

 

 

 
NM_SETTING_GSM_PASSWORD

 
#define NM_SETTING_GSM_PASSWORD       "password"
 

-

-

 

 

 

 
NM_SETTING_GSM_PASSWORD_FLAGS

 
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 

-

-

 

 

 

 
NM_SETTING_GSM_APN

 
#define NM_SETTING_GSM_APN            "apn"
 

-

-

 

 

 

 
NM_SETTING_GSM_NETWORK_ID

 
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 

-

-

 

 

 

 
NM_SETTING_GSM_PIN

 
#define NM_SETTING_GSM_PIN            "pin"
 

-

-

 

 

 

 
NM_SETTING_GSM_PIN_FLAGS

 
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 

-

-

 

 

 

 
NM_SETTING_GSM_HOME_ONLY

 
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 

-

-

 

 

 

 
NM_SETTING_GSM_ALLOWED_BANDS

 
#define NM_SETTING_GSM_ALLOWED_BANDS  "allowed-bands"
 

-

-

 

 

 

 
NM_SETTING_GSM_NETWORK_TYPE

 
#define NM_SETTING_GSM_NETWORK_TYPE   "network-type"
 

-

-

 

 

 

@@ -1008,7 +969,9 @@ the device may use when connecting to this network.

 

 
The “allowed-bands” property

 
  “allowed-bands”            guint

-

+
Bitfield of allowed frequency bands.  Note that not all devices allow
+frequency band control.  Permitted values are those specified by
+NMSettingGsmNetworkBand.

 

 
NMSettingGsm:allowed-bands has been deprecated since version 0.9.10 and should not be used in newly-written code.

 
No longer used. Band setting should be done by
@@ -1022,7 +985,13 @@ talking to ModemManager directly.

 

 
The “apn” property

 
  “apn”                      gchar *

-

+
The GPRS Access Point Name specifying the APN used when establishing a
+data session with the GSM-based network.  The APN often determines how
+the user will be billed for their network usage and whether the user has
+access to the Internet or just a provider-specific walled-garden, so it
+is important to use the correct APN for the user's mobile broadband plan.
+The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
+03.60 Section 14.9.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1030,7 +999,8 @@ talking to ModemManager directly.

 

 
The “home-only” property

 
  “home-only”                gboolean

-

+
When TRUE, only connections to the home network will be allowed.
+Connections to roaming networks will not be made.

 
Flags: Read / Write

 
Default value: FALSE

 

@@ -1038,7 +1008,11 @@ talking to ModemManager directly.

 

 
The “network-id” property

 
  “network-id”               gchar *

-

+
The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
+registration.  If the Network ID is specified, NetworkManager will
+attempt to force the device to register only on the specified network.
+This can be used to ensure that the device does not roam when direct
+roaming control of the device is not otherwise possible.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1046,7 +1020,15 @@ talking to ModemManager directly.

 

 
The “network-type” property

 
  “network-type”             gint

-

+
Network preference to force the device to only use specific network
+technologies. The permitted values are NM_SETTING_GSM_NETWORK_TYPE_ANY,
+NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA,
+NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE,
+NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA,
+NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE,
+NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G, and
+NM_SETTING_GSM_NETWORK_TYPE_4G.  Note that not all devices allow network
+preference control.

 

 
NMSettingGsm:network-type has been deprecated since version 0.9.10 and should not be used in newly-written code.

 
No longer used. Network type setting should be done
@@ -1060,7 +1042,10 @@ by talking to ModemManager directly.

 

 
The “number” property

 
  “number”                   gchar *

-

+
Number to dial when establishing a PPP data session with the GSM-based
+mobile broadband network.  Many modems do not require PPP for connections
+to the mobile network and thus this property should be left blank, which
+allows NetworkManager to select the appropriate settings automatically.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1068,7 +1053,9 @@ by talking to ModemManager directly.

 

 
The “password” property

 
  “password”                 gchar *

-

+
The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1076,7 +1063,7 @@ by talking to ModemManager directly.

 

 
The “password-flags” property

 
  “password-flags”           guint

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -1085,7 +1072,9 @@ by talking to ModemManager directly.

 

 
The “pin” property

 
  “pin”                      gchar *

-

+
If the SIM is locked with a PIN it must be unlocked before any other
+operations are requested.  Specify the PIN here to allow operation of the
+device.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1093,7 +1082,7 @@ by talking to ModemManager directly.

 

 
The “pin-flags” property

 
  “pin-flags”                guint

-

+
Flags indicating how to handle the “pin” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -1102,14 +1091,15 @@ by talking to ModemManager directly.

 

 
The “username” property

 
  “username”                 gchar *

-

+
The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index c96dc86d..08d29926 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingIP4Config
+NMSettingIP4Config: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -723,7 +723,6 @@ nm_setting_ip4_config_error_quark (
 
Returns

 
 the error quark used for NMSettingIP4Config errors.

-

 

 

 

@@ -843,7 +842,6 @@ to.

 

 
Returns

 
 TRUE if the objects contain the same values, FALSE if they do not.

-

 

 

 

@@ -870,7 +868,6 @@ nm_ip4_address_get_address (
 
Returns

 
 the IPv4 address in network byte order

-

 

 
 

@@ -928,7 +925,6 @@ object.

 

 
Returns

 
 the IPv4 address prefix

-

 

 
 

@@ -985,7 +981,6 @@ nm_ip4_address_get_gateway (
 
Returns

 
 the IPv4 gateway address in network byte order

-

 
 
 

@@ -1135,7 +1130,6 @@ to.

 

 
Returns

 
 TRUE if the objects contain the same values, FALSE if they do not.

-

 

 
 

@@ -1162,7 +1156,6 @@ nm_ip4_route_get_dest (
 
Returns

 
 the IPv4 address in network byte order

-

 
 
 

@@ -1219,7 +1212,6 @@ nm_ip4_route_get_prefix (
 
Returns

 
 the IPv4 prefix

-

 
 
 

@@ -1276,7 +1268,6 @@ nm_ip4_route_get_next_hop (
 
Returns

 
 the IPv4 address in network byte order

-

 
 
 

@@ -1334,7 +1325,6 @@ nm_ip4_route_get_metric (
 
Returns

 
 the route metric

-

 
 
 

@@ -1403,7 +1393,6 @@ nm_setting_ip4_config_get_method (
 
Returns

 
 the “method” property of the setting

-

 
 
 

@@ -1429,7 +1418,6 @@ nm_setting_ip4_config_get_num_dns (
 
Returns

 
 the number of configured DNS servers

-

 
 
 

@@ -1465,7 +1453,6 @@ nm_setting_ip4_config_get_dns ( the IPv4 address (network byte order) of the DNS server at index
 i
 

-

 
 
 

@@ -1501,7 +1488,6 @@ nm_setting_ip4_config_add_dns (
Returns

 
 TRUE if the DNS server was added; FALSE if the server was already
 known

-

 
 
 

@@ -1570,9 +1556,8 @@ nm_setting_ip4_config_remove_dns_by_value
 
Returns

 
 TRUE if the DNS server was found and removed; FALSE if it was not.
 domain was already known

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1620,7 +1605,6 @@ nm_setting_ip4_config_get_num_dns_searches
 

 
Returns

 
 the number of configured DNS search domains

-

 

 

 

@@ -1655,7 +1639,6 @@ nm_setting_ip4_config_get_dns_search (
Returns

 
 the DNS search domain at index i
 

-

 
 
 

@@ -1691,7 +1674,6 @@ nm_setting_ip4_config_add_dns_search (
Returns

 
 TRUE if the DNS search domain was added; FALSE if the search
 domain was already known

-

 
 
 

@@ -1761,7 +1743,6 @@ nm_setting_ip4_config_remove_dns_search_by_value
 
Returns

 
 TRUE if the DNS search domain was found and removed; FALSE if it was not.

 
Since 0.9.10

-

 
 
 

@@ -1811,7 +1792,6 @@ nm_setting_ip4_config_get_num_addresses
 

 
Returns

 
 the number of configured addresses

-

 

 
 

@@ -1846,7 +1826,6 @@ nm_setting_ip4_config_get_address (
Returns

 
 the address at index i
 

-

 
 
 

@@ -1883,7 +1862,6 @@ given address is duplicated internally and is not changed by this function.

 
Returns

 
 TRUE if the address was added; FALSE if the address was already
 known.

-

 
 
 

@@ -1951,9 +1929,8 @@ nm_setting_ip4_config_remove_address_by_value
 

 
Returns

 
 TRUE if the address was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2000,7 +1977,6 @@ nm_setting_ip4_config_get_num_routes (
 
Returns

 
 the number of configured routes

-

 

 
 

@@ -2035,7 +2011,6 @@ nm_setting_ip4_config_get_route (
Returns

 
 the route at index i
 

-

 
 
 

@@ -2071,7 +2046,6 @@ given route is duplicated internally and is not changed by this function.

 

 
Returns

 
 TRUE if the route was added; FALSE if the route was already known.

-

 

 
 

@@ -2139,9 +2113,8 @@ nm_setting_ip4_config_remove_route_by_value
 

 
Returns

 
 TRUE if the route was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2192,9 +2165,8 @@ property.

 
Returns

 
 the route metric that is used for IPv4 routes that don't explicitly
 specify a metric. See “route-metric” for more details.

-

 

-
Since 1.0

+
Since: 1.0

 
 

 

@@ -2223,7 +2195,6 @@ property.

 
Returns

 
 TRUE if automatically configured (ie via DHCP) routes should be
 ignored.

-

 

 
 

@@ -2253,7 +2224,6 @@ property.

 
Returns

 
 TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.

-

 
 
 

@@ -2283,7 +2253,6 @@ property.

 
Returns

 
 the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.

-

 
 
 

@@ -2314,7 +2283,6 @@ property.

 
 TRUE if NetworkManager should send the machine hostname to the
 DHCP server when requesting addresses to allow the server to automatically
 update DNS information for this machine.

-

 
 
 

@@ -2343,7 +2311,6 @@ property.

 

 
Returns

 
 the configured hostname to send to the DHCP server

-

 

 
 

@@ -2373,7 +2340,6 @@ property.

 
Returns

 
 TRUE if this connection should never be the default connection
 for IPv4 addressing

-

 
 
 

@@ -2402,7 +2368,6 @@ property.

 
Returns

 
 TRUE if this connection doesn't require IPv4 addressing to complete
 for the connection to succeed.

-

 
 
 
@@ -2412,8 +2377,6 @@ for the connection to succeed.

 
NM_SETTING_IP4_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

-

-

 
 

 

@@ -2466,112 +2429,84 @@ 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_METHOD

 
#define NM_SETTING_IP4_CONFIG_METHOD             "method"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_DNS

 
#define NM_SETTING_IP4_CONFIG_DNS                "dns"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP4_CONFIG_DNS_SEARCH         "dns-search"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_ADDRESSES

 
#define NM_SETTING_IP4_CONFIG_ADDRESSES          "addresses"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_ROUTES

 
#define NM_SETTING_IP4_CONFIG_ROUTES             "routes"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_ROUTE_METRIC

 
#define NM_SETTING_IP4_CONFIG_ROUTE_METRIC       "route-metric"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

 
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME

 
#define NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME

 
#define NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP4_CONFIG_NEVER_DEFAULT      "never-default"
 

-

-

 

 

 

 
NM_SETTING_IP4_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP4_CONFIG_MAY_FAIL           "may-fail"
 

-

-

 

 

 

@@ -2623,14 +2558,22 @@ through that interface to the default network.

 

 
The “addresses” property

 
  “addresses”                GPtrArray_GArray_guint__ *

-

+
Array of IPv4 address structures.  Each IPv4 address structure is
+composed of 3 32-bit values; the first being the IPv4 address (network
+byte order), the second the prefix (1 - 32), and last the IPv4 gateway
+(network byte order). The gateway may be left as 0 if no gateway exists
+for that subnet.  For the "auto" method, given IP addresses are appended
+to those returned by automatic configuration.  Addresses cannot be used
+with the "shared", "link-local", or "disabled" methods as addressing is
+either automatic or disabled with these methods.

 
Flags: Read / Write

 

 

 

 
The “dhcp-client-id” property

 
  “dhcp-client-id”           gchar *

-

+
A string sent to the DHCP server to identify the local machine which the
+DHCP server may use to customize the DHCP lease and options.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -2638,7 +2581,8 @@ through that interface to the default network.

 

 
The “dhcp-hostname” property

 
  “dhcp-hostname”            gchar *

-

+
If the “dhcp-send-hostname” property is TRUE, then the
+specified name will be sent to the DHCP server when acquiring a lease.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -2646,7 +2590,11 @@ through that interface to the default network.

 

 
The “dhcp-send-hostname” property

 
  “dhcp-send-hostname”       gboolean

-

+
If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
+Some DHCP servers use this hostname to update DNS databases, essentially
+providing a static hostname for the computer.  If the
+“dhcp-hostname” property is empty and this property is
+TRUE, the current persistent hostname of the computer is sent.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -2654,21 +2602,34 @@ through that interface to the default network.

 

 
The “dns” property

 
  “dns”                      GArray_guint_ *

-

+
List of DNS servers (network byte order).  For the "auto" method, these
+DNS servers are appended to those (if any) returned by automatic
+configuration.  DNS servers cannot be used with the "shared",
+"link-local", or "disabled" methods as there is no upstream network.  In
+all other methods, these DNS servers are used as the only DNS servers for
+this connection.

 
Flags: Read / Write

 

 

 

 
The “dns-search” property

 
  “dns-search”               GSList_gchararray_ *

-

+
List of DNS search domains.  For the "auto" method, these search domains
+are appended to those returned by automatic configuration. Search domains
+cannot be used with the "shared", "link-local", or "disabled" methods as
+there is no upstream network.  In all other methods, these search domains
+are used as the only search domains for this connection.

 
Flags: Read / Write

 

 

 

 
The “ignore-auto-dns” property

 
  “ignore-auto-dns”          gboolean

-

+
When the method is set to "auto" and this property to TRUE,
+automatically configured nameservers and search domains are ignored and
+only nameservers and search domains specified in the
+“dns” and “dns-search” properties, if
+any, are used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -2676,7 +2637,9 @@ through that interface to the default network.

 

 
The “ignore-auto-routes” property

 
  “ignore-auto-routes”       gboolean

-

+
When the method is set to "auto" and this property to TRUE,
+automatically configured routes are ignored and only routes specified in
+the “routes” property, if any, are used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -2684,7 +2647,12 @@ through that interface to the default network.

 

 
The “may-fail” property

 
  “may-fail”                 gboolean

-

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

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -2692,7 +2660,18 @@ through that interface to the default network.

 

 
The “method” property

 
  “method”                   gchar *

-

+
IPv4 configuration method.  If "auto" is specified then the appropriate
+automatic method (DHCP, PPP, etc) is used for the interface and most
+other properties can be left unset.  If "link-local" is specified, then a
+link-local address in the 169.254/16 range will be assigned to the
+interface.  If "manual" is specified, static IP addressing is used and at
+least one IP address must be given in the "addresses" property.  If
+"shared" is specified (indicating that this connection will provide
+network access to other computers) then the interface is assigned an
+address in the 10.42.x.1/24 range and a DHCP and forwarding DNS server
+are started, and the interface is NAT-ed to the current default network
+connection.  "disabled" means IPv4 will not be used on this connection.
+This property must be set.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -2700,7 +2679,8 @@ through that interface to the default network.

 

 
The “never-default” property

 
  “never-default”            gboolean

-

+
If TRUE, this connection will never be the default IPv4 connection,
+meaning it will never be assigned the default route by NetworkManager.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -2708,23 +2688,36 @@ through that interface to the default network.

 

 
The “route-metric” property

 
  “route-metric”             gint64

-

+
The default metric for routes that don't explicitly specify a metric.
+The default value -1 means that the metric is choosen automatically
+based on the device type.
+The metric applies to dynamic routes, manual (static) routes that
+don't have an explicit metric setting, address prefix routes, and
+the default route.
+As the linux kernel accepts zero (0) as a valid metric, zero is
+a valid value.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,4294967295]

 
Default value: -1

-
Since 1.0

+
Since: 1.0

 

 

 

 
The “routes” property

 
  “routes”                   GPtrArray_GArray_guint__ *

-

+
Array of IPv4 route structures.  Each IPv4 route structure is composed of
+4 32-bit values; the first being the destination IPv4 network or address
+(network byte order), the second the destination network or address
+prefix (1 - 32), the third being the next-hop (network byte order) if
+any, and the fourth being the route metric. For the "auto" method, given
+IP routes are appended to those returned by automatic configuration.
+Routes cannot be used with the "shared", "link-local", or "disabled"
+methods because there is no upstream network.

 
Flags: Read / Write

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 67b63a87..eb42de11 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingIP6Config
+NMSettingIP6Config: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -708,7 +708,6 @@ nm_setting_ip6_config_error_quark (
 
Returns

 
 the error quark used for NMSettingIP6Config errors.

-

 
 
 

@@ -828,7 +827,6 @@ to.

 

 
Returns

 
 TRUE if the objects contain the same values, FALSE if they do not.

-

 

 
 

@@ -912,7 +910,6 @@ nm_ip6_address_get_prefix (
 
Returns

 
 the IPv6 address prefix

-

 
 
 

@@ -1119,7 +1116,6 @@ to.

 

 
Returns

 
 TRUE if the objects contain the same values, FALSE if they do not.

-

 

 
 

@@ -1203,7 +1199,6 @@ nm_ip6_route_get_prefix (
 
Returns

 
 the IPv6 prefix

-

 
 
 

@@ -1318,7 +1313,6 @@ nm_ip6_route_get_metric (
 
Returns

 
 the route metric

-

 
 
 

@@ -1387,7 +1381,6 @@ nm_setting_ip6_config_get_method (
 
Returns

 
 the “method” property of the setting

-

 
 
 

@@ -1413,7 +1406,6 @@ nm_setting_ip6_config_get_num_dns (
 
Returns

 
 the number of configured DNS servers

-

 
 
 

@@ -1484,7 +1476,6 @@ nm_setting_ip6_config_add_dns (
Returns

 
 TRUE if the DNS server was added; FALSE if the server was already
 known

-

 
 
 

@@ -1552,9 +1543,8 @@ nm_setting_ip6_config_remove_dns_by_value
 

 
Returns

 
 TRUE if the DNS server was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1602,7 +1592,6 @@ nm_setting_ip6_config_get_num_dns_searches
 

 
Returns

 
 the number of configured DNS search domains

-

 

 

 

@@ -1637,7 +1626,6 @@ nm_setting_ip6_config_get_dns_search (
Returns

 
 the DNS search domain at index i
 

-

 
 
 

@@ -1673,7 +1661,6 @@ nm_setting_ip6_config_add_dns_search (
Returns

 
 TRUE if the DNS search domain was added; FALSE if the search
 domain was already known

-

 
 
 

@@ -1743,7 +1730,6 @@ nm_setting_ip6_config_remove_dns_search_by_value
 
Returns

 
 TRUE if the DNS search domain was found and removed; FALSE if it was not.

 
Since 0.9.10

-

 
 
 

@@ -1793,7 +1779,6 @@ nm_setting_ip6_config_get_num_addresses
 

 
Returns

 
 the number of configured addresses

-

 

 
 

@@ -1828,7 +1813,6 @@ nm_setting_ip6_config_get_address (
Returns

 
 the address at index i
 

-

 
 
 

@@ -1865,7 +1849,6 @@ given address is duplicated internally and is not changed by this function.

 
Returns

 
 TRUE if the address was added; FALSE if the address was already
 known.

-

 
 
 

@@ -1933,9 +1916,8 @@ nm_setting_ip6_config_remove_address_by_value
 

 
Returns

 
 TRUE if the address was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1982,7 +1964,6 @@ nm_setting_ip6_config_get_num_routes (
 
Returns

 
 the number of configured routes

-

 

 
 

@@ -2017,7 +1998,6 @@ nm_setting_ip6_config_get_route (
Returns

 
 the route at index i
 

-

 
 
 

@@ -2053,7 +2033,6 @@ given route is duplicated internally and is not changed by this function.

 

 
Returns

 
 TRUE if the route was added; FALSE if the route was already known.

-

 

 
 

@@ -2121,9 +2100,8 @@ nm_setting_ip6_config_remove_route_by_value
 

 
Returns

 
 TRUE if the route was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2174,7 +2152,6 @@ property.

 
Returns

 
 TRUE if automatically configured (ie via DHCP) routes should be
 ignored.

-

 

 
 

@@ -2204,9 +2181,8 @@ property.

 
Returns

 
 the route metric that is used for IPv6 routes that don't explicitly
 specify a metric. See “route-metric” for more details.

-

 
-
Since 1.0

+
Since: 1.0

 
 

 

@@ -2235,7 +2211,6 @@ property.

 
Returns

 
 TRUE if automatically configured (ie via DHCP or router
 advertisements) DNS information should be ignored.

-

 

 
 

@@ -2264,9 +2239,8 @@ property.

 

 
Returns

 
 the configured hostname to send to the DHCP server

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -2295,7 +2269,6 @@ property.

 
Returns

 
 TRUE if this connection should never be the default connection
 for IPv6 addressing

-

 

 
 

@@ -2324,7 +2297,6 @@ property.

 
Returns

 
 TRUE if this connection doesn't require IPv6 addressing to complete
 for the connection to succeed.

-

 
 
 

@@ -2352,7 +2324,6 @@ property.

 

 
Returns

 
 IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).

-

 

 
 
@@ -2362,8 +2333,6 @@ property.

 
NM_SETTING_IP6_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 

-

-

 
 

 

@@ -2416,104 +2385,78 @@ 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_METHOD

 
#define NM_SETTING_IP6_CONFIG_METHOD             "method"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_DNS

 
#define NM_SETTING_IP6_CONFIG_DNS                "dns"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP6_CONFIG_DNS_SEARCH         "dns-search"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_ADDRESSES

 
#define NM_SETTING_IP6_CONFIG_ADDRESSES          "addresses"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_ROUTES

 
#define NM_SETTING_IP6_CONFIG_ROUTES             "routes"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_ROUTE_METRIC

 
#define NM_SETTING_IP6_CONFIG_ROUTE_METRIC       "route-metric"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP6_CONFIG_NEVER_DEFAULT      "never-default"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP6_CONFIG_MAY_FAIL           "may-fail"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

 
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
 

-

-

 

 

 

 
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME

 
#define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

-

-

 

 

 

@@ -2623,37 +2566,61 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “addresses” property

 
  “addresses”                GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar___*

-

+
Array of IPv6 address structures.  Each IPv6 address structure is
+composed of 3 members, the first being a byte array containing the IPv6
+address (network byte order), the second a 32-bit integer containing the
+IPv6 address prefix, and the third a byte array containing the IPv6
+address (network byte order) of the gateway associated with this address,
+if any.  If no gateway is given, the third element should be given as all
+zeros.  For the "auto" method, given IP addresses are appended to those
+returned by automatic configuration.  Addresses cannot be used with the
+"shared" or "link-local" methods as the interface is automatically
+assigned an address with these methods.

 
Flags: Read / Write

 

 

 

 
The “dhcp-hostname” property

 
  “dhcp-hostname”            gchar *

-

+
The specified name will be sent to the DHCP server when acquiring a
+lease.

 
Flags: Read / Write

 
Default value: NULL

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

 
The “dns” property

 
  “dns”                      GPtrArray_GArray_guchar__ *

-

+
Array of DNS servers, where each member of the array is a byte array
+containing the IPv6 address of the DNS server (in network byte order).
+For the "auto" method, these DNS servers are appended to those (if any)
+returned by automatic configuration.  DNS servers cannot be used with the
+"shared" or "link-local" methods as there is no usptream network. In all
+other methods, these DNS servers are used as the only DNS servers for
+this connection.

 
Flags: Read / Write

 

 

 

 
The “dns-search” property

 
  “dns-search”               GSList_gchararray_ *

-

+
List of DNS search domains.  For the "auto" method, these search domains
+are appended to those returned by automatic configuration. Search domains
+cannot be used with the "shared" or "link-local" methods as there is no
+upstream network.  In all other methods, these search domains are used as
+the only search domains for this connection.

 
Flags: Read / Write

 

 

 

 
The “ignore-auto-dns” property

 
  “ignore-auto-dns”          gboolean

-

+
When the method is set to "auto" or "dhcp" and this property is set to
+TRUE, automatically configured nameservers and search domains are
+ignored and only nameservers and search domains specified in the
+“dns” and “dns-search” properties, if
+any, are used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -2661,7 +2628,9 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “ignore-auto-routes” property

 
  “ignore-auto-routes”       gboolean

-

+
When the method is set to "auto" or "dhcp" and this property is set to
+TRUE, automatically configured routes are ignored and only routes
+specified in the “routes” property, if any, are used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -2669,7 +2638,13 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “ip6-privacy” property

 
  “ip6-privacy”              gint

-

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

 
Flags: Read / Write / Construct

 
Allowed values: [-1,2]

 
Default value: -1

@@ -2678,7 +2653,12 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “may-fail” property

 
  “may-fail”                 gboolean

-

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

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -2686,7 +2666,16 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “method” property

 
  “method”                   gchar *

-

+
IPv6 configuration method.  If "auto" is specified then the appropriate
+automatic method (PPP, router advertisement, etc) is used for the device
+and most other properties can be left unset.  To force the use of DHCP
+only, specify "dhcp"; this method is only valid for Ethernet- based
+hardware.  If "link-local" is specified, then an IPv6 link-local address
+will be assigned to the interface.  If "manual" is specified, static IP
+addressing is used and at least one IP address must be given in the
+"addresses" property.  If "ignore" is specified, IPv6 configuration is
+not done. This property must be set.  Note: the "shared" method is not
+yet supported.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -2694,7 +2683,9 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “never-default” property

 
  “never-default”            gboolean

-

+
If TRUE, this connection will never be the default IPv6 connection,
+meaning it will never be assigned the default IPv6 route by
+NetworkManager.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -2702,23 +2693,36 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “route-metric” property

 
  “route-metric”             gint64

-

+
The default metric for routes that don't explicitly specify a metric.
+The default value -1 means that the metric is choosen automatically
+based on the device type.
+The metric applies to dynamic routes, manual (static) routes that
+don't have an explicit metric setting, address prefix routes, and
+the default route.
+As the linux kernel replaces zero (0) by 1024 (user-default), setting
+this property to 0 means effectively setting it to 1024.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,4294967295]

 
Default value: -1

-
Since 1.0

+
Since: 1.0

 

 

 

 
The “routes” property

 
  “routes”                   GPtrArray_GValueArray_GArray_guchar_+guint+GArray_guchar_+guint__*

-

+
Array of IPv6 route structures.  Each IPv6 route structure is composed of
+4 members; the first being the destination IPv6 network or address
+(network byte order) as a byte array, the second the destination network
+or address IPv6 prefix, the third being the next-hop IPv6 address
+(network byte order) if any, and the fourth being the route metric. For
+the "auto" method, given IP routes are appended to those returned by
+automatic configuration.  Routes cannot be used with the "shared" or
+"link-local" methods because there is no upstream network.

 
Flags: Read / Write

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index f61fe6f7..82db623e 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingInfiniband
+NMSettingInfiniband: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -209,7 +209,6 @@ nm_setting_infiniband_error_quark (
 
Returns

 
 the error quark used for NMSettingInfiniband errors.

-

 
 
 

@@ -247,7 +246,6 @@ nm_setting_infiniband_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -273,7 +271,6 @@ nm_setting_infiniband_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 
 
 

@@ -302,7 +299,6 @@ nm_setting_infiniband_get_transport_mode
 

 
Returns

 
 the IPoIB transport mode

-

 

 
 

@@ -331,7 +327,6 @@ a 16-bit unsigned integer.

 

 
Returns

 
 the IPoIB P_Key

-

 

 
 

@@ -358,7 +353,6 @@ nm_setting_infiniband_get_parent (
 
Returns

 
 the parent interface name

-

 
 
 
@@ -368,8 +362,6 @@ nm_setting_infiniband_get_parent (
NM_SETTING_INFINIBAND_SETTING_NAME

 
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
 

-

-

 
 

 

@@ -414,48 +406,36 @@ required

 
NM_SETTING_INFINIBAND_ERROR

 
#define NM_SETTING_INFINIBAND_ERROR nm_setting_infiniband_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_MAC_ADDRESS

 
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_MTU

 
#define NM_SETTING_INFINIBAND_MTU            "mtu"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_TRANSPORT_MODE

 
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_P_KEY

 
#define NM_SETTING_INFINIBAND_P_KEY          "p-key"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_PARENT

 
#define NM_SETTING_INFINIBAND_PARENT         "parent"
 

-

-

 

 
 

@@ -463,14 +443,17 @@ required

 

 
The “mac-address” property

 
  “mac-address”              GArray_guchar_ *

-

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

 
Flags: Read / Write

 

 

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -478,7 +461,10 @@ required

 

 
The “p-key” property

 
  “p-key”                    gint

-

+
The InfiniBand P_Key to use for this device. A value of -1 means to use
+the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit
+unsigned integer, whose high bit is set if it is a "full membership"
+P_Key.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,65535]

 
Default value: -1

@@ -487,7 +473,10 @@ required

 

 
The “parent” property

 
  “parent”                   gchar *

-

+
The interface name of the parent device of this device. Normally NULL,
+but if the “p_key” property is set, then you must
+specify the base device by setting either this property or
+“mac-address”.

 
Flags: Read / Write / Construct

 
Default value: NULL

 

@@ -495,14 +484,14 @@ required

 

 
The “transport-mode” property

 
  “transport-mode”           gchar *

-

+
The IP-over-InfiniBand transport mode. Either "datagram" or
+"connected".

 
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index c43b6dd8..d9a5d1d0 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingOlpcMesh
+NMSettingOlpcMesh: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -157,8 +157,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -166,12 +164,6 @@
 
nm_setting_olpc_mesh_error_quark ()

 
GQuark
 nm_setting_olpc_mesh_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

@@ -182,7 +174,6 @@ nm_setting_olpc_mesh_new (void
 
Returns

 
 the new empty NMSettingOlpcMesh object

-

 

 
 

@@ -190,24 +181,12 @@ nm_setting_olpc_mesh_new (void
nm_setting_olpc_mesh_get_ssid ()

 
const GByteArray *
 nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);

-

-

-

-
Returns

-

-

 
 

 

 
nm_setting_olpc_mesh_get_channel ()

 
guint32
 nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);

-

-

-

-
Returns

-

-

 

 

 

@@ -215,12 +194,6 @@ nm_setting_olpc_mesh_get_channel (const GByteArray *
 nm_setting_olpc_mesh_get_dhcp_anycast_address
                                (NMSettingOlpcMesh *setting);
-

-

-

-
Returns

-

-

 

 
 

@@ -229,8 +202,6 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 
NM_SETTING_OLPC_MESH_SETTING_NAME

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

-

-

 

 

 

@@ -275,32 +246,24 @@ required

 
NM_SETTING_OLPC_MESH_ERROR

 
#define NM_SETTING_OLPC_MESH_ERROR nm_setting_olpc_mesh_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_OLPC_MESH_SSID

 
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 

-

-

 

 

 

 
NM_SETTING_OLPC_MESH_CHANNEL

 
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

-

-

 

 

 

 
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

 
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

-

-

 

 
 

@@ -308,7 +271,7 @@ required

 

 
The “channel” property

 
  “channel”                  guint

-

+
Channel on which the mesh network to join is located.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -316,20 +279,21 @@ required

 

 
The “dhcp-anycast-address” property

 
  “dhcp-anycast-address”     GArray_guchar_ *

-

+
Anycast DHCP MAC address used when requesting an IP address via DHCP.
+The specific anycast address used determines which DHCP server class
+answers the request.

 
Flags: Read / Write

 

 

 

 
The “ssid” property

 
  “ssid”                     GArray_guchar_ *

-

+
SSID of the mesh network to join.

 
Flags: Read / Write

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index d71e91f5..c66bd595 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingPPP
+NMSettingPPP: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -432,7 +432,6 @@ nm_setting_ppp_error_quark (void<
 

 
Returns

 
 the error quark used for NMSettingPPP errors.

-

 

 
 

@@ -470,7 +469,6 @@ nm_setting_ppp_get_noauth (
 
Returns

 
 the “noauth” property of the setting

-

 
 
 

@@ -496,7 +494,6 @@ nm_setting_ppp_get_refuse_eap (
 
Returns

 
 the “refuse-eap” property of the setting

-

 
 
 

@@ -522,7 +519,6 @@ nm_setting_ppp_get_refuse_pap (
 
Returns

 
 the “refuse-pap” property of the setting

-

 
 
 

@@ -548,7 +544,6 @@ nm_setting_ppp_get_refuse_chap (
 
Returns

 
 the “refuse-chap” property of the setting

-

 
 
 

@@ -574,7 +569,6 @@ nm_setting_ppp_get_refuse_mschap (
 
Returns

 
 the “refuse-mschap” property of the setting

-

 
 
 

@@ -600,7 +594,6 @@ nm_setting_ppp_get_refuse_mschapv2 (
 
Returns

 
 the “refuse-mschapv2” property of the setting

-

 
 
 

@@ -626,7 +619,6 @@ nm_setting_ppp_get_nobsdcomp (
 
Returns

 
 the “nobsdcomp” property of the setting

-

 
 
 

@@ -652,7 +644,6 @@ nm_setting_ppp_get_nodeflate (
 
Returns

 
 the “nodeflate” property of the setting

-

 
 
 

@@ -678,7 +669,6 @@ nm_setting_ppp_get_no_vj_comp (
 
Returns

 
 the “no-vj-comp” property of the setting

-

 
 
 

@@ -704,7 +694,6 @@ nm_setting_ppp_get_require_mppe (
 
Returns

 
 the “require-mppe” property of the setting

-

 
 
 

@@ -730,7 +719,6 @@ nm_setting_ppp_get_require_mppe_128 (
 
Returns

 
 the “require-mppe-128” property of the setting

-

 
 
 

@@ -756,7 +744,6 @@ nm_setting_ppp_get_mppe_stateful (
 
Returns

 
 the “mppe-stateful” property of the setting

-

 
 
 

@@ -782,7 +769,6 @@ nm_setting_ppp_get_crtscts (
 
Returns

 
 the “crtscts” property of the setting

-

 
 
 

@@ -808,7 +794,6 @@ nm_setting_ppp_get_baud (
 
Returns

 
 the “baud” property of the setting

-

 
 
 

@@ -834,7 +819,6 @@ nm_setting_ppp_get_mru (
 
Returns

 
 the “mru” property of the setting

-

 
 
 

@@ -860,7 +844,6 @@ nm_setting_ppp_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 
 
 

@@ -886,7 +869,6 @@ nm_setting_ppp_get_lcp_echo_failure (
 
Returns

 
 the “lcp-echo-failure” property of the setting

-

 
 
 

@@ -912,7 +894,6 @@ nm_setting_ppp_get_lcp_echo_interval (
 
Returns

 
 the “lcp-echo-interval” property of the setting

-

 
 
 
@@ -922,8 +903,6 @@ nm_setting_ppp_get_lcp_echo_interval (
NM_SETTING_PPP_SETTING_NAME

 
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

-

-

 
 

 

@@ -976,152 +955,114 @@ with other setting configuration parameters

 
NM_SETTING_PPP_ERROR

 
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_PPP_NOAUTH

 
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_EAP

 
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_PAP

 
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_CHAP

 
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_MSCHAP

 
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_MSCHAPV2

 
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

-

-

 

 

 

 
NM_SETTING_PPP_NOBSDCOMP

 
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 

-

-

 

 

 

 
NM_SETTING_PPP_NODEFLATE

 
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 

-

-

 

 

 

 
NM_SETTING_PPP_NO_VJ_COMP

 
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 

-

-

 

 

 

 
NM_SETTING_PPP_REQUIRE_MPPE

 
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

-

-

 

 

 

 
NM_SETTING_PPP_REQUIRE_MPPE_128

 
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

-

-

 

 

 

 
NM_SETTING_PPP_MPPE_STATEFUL

 
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

-

-

 

 

 

 
NM_SETTING_PPP_CRTSCTS

 
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

-

-

 

 

 

 
NM_SETTING_PPP_BAUD

 
#define NM_SETTING_PPP_BAUD              "baud"
 

-

-

 

 

 

 
NM_SETTING_PPP_MRU

 
#define NM_SETTING_PPP_MRU               "mru"
 

-

-

 

 

 

 
NM_SETTING_PPP_MTU

 
#define NM_SETTING_PPP_MTU               "mtu"
 

-

-

 

 

 

 
NM_SETTING_PPP_LCP_ECHO_FAILURE

 
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

-

-

 

 

 

 
NM_SETTING_PPP_LCP_ECHO_INTERVAL

 
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

-

-

 

 
 

@@ -1129,7 +1070,9 @@ with other setting configuration parameters

 

 
The “baud” property

 
  “baud”                     guint

-

+
If non-zero, instruct pppd to set the serial port to the specified
+baudrate.  This value should normally be left as 0 to automatically
+choose the speed.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1137,7 +1080,9 @@ with other setting configuration parameters

 

 
The “crtscts” property

 
  “crtscts”                  gboolean

-

+
If TRUE, specify that pppd should set the serial port to use hardware
+flow control with RTS and CTS signals.  This value should normally be set
+to FALSE.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1145,7 +1090,10 @@ with other setting configuration parameters

 

 
The “lcp-echo-failure” property

 
  “lcp-echo-failure”         guint

-

+
If non-zero, instruct pppd to presume the connection to the peer has
+failed if the specified number of LCP echo-requests go unanswered by the
+peer.  The "lcp-echo-interval" property must also be set to a non-zero
+value if this property is used.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1153,7 +1101,10 @@ with other setting configuration parameters

 

 
The “lcp-echo-interval” property

 
  “lcp-echo-interval”        guint

-

+
If non-zero, instruct pppd to send an LCP echo-request frame to the peer
+every n seconds (where n is the specified value).  Note that some PPP
+peers will respond to echo requests and some will not, and it is not
+possible to autodetect this.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1161,7 +1112,8 @@ with other setting configuration parameters

 

 
The “mppe-stateful” property

 
  “mppe-stateful”            gboolean

-

+
If TRUE, stateful MPPE is used.  See pppd documentation for more
+information on stateful MPPE.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1169,7 +1121,9 @@ with other setting configuration parameters

 

 
The “mru” property

 
  “mru”                      guint

-

+
If non-zero, instruct pppd to request that the peer send packets no
+larger than the specified size.  If non-zero, the MRU should be between
+128 and 16384.

 
Flags: Read / Write / Construct

 
Allowed values: <= 16384

 
Default value: 0

@@ -1178,7 +1132,8 @@ with other setting configuration parameters

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, instruct pppd to send packets no larger than the specified
+size.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1186,7 +1141,7 @@ with other setting configuration parameters

 

 
The “no-vj-comp” property

 
  “no-vj-comp”               gboolean

-

+
If TRUE, Van Jacobsen TCP header compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1194,7 +1149,9 @@ with other setting configuration parameters

 

 
The “noauth” property

 
  “noauth”                   gboolean

-

+
If TRUE, do not require the other side (usually the PPP server) to
+authenticate itself to the client.  If FALSE, require authentication
+from the remote side.  In almost all cases, this should be TRUE.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -1202,7 +1159,7 @@ with other setting configuration parameters

 

 
The “nobsdcomp” property

 
  “nobsdcomp”                gboolean

-

+
If TRUE, BSD compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1210,7 +1167,7 @@ with other setting configuration parameters

 

 
The “nodeflate” property

 
  “nodeflate”                gboolean

-

+
If TRUE, "deflate" compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1218,7 +1175,7 @@ with other setting configuration parameters

 

 
The “refuse-chap” property

 
  “refuse-chap”              gboolean

-

+
If TRUE, the CHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1226,7 +1183,7 @@ with other setting configuration parameters

 

 
The “refuse-eap” property

 
  “refuse-eap”               gboolean

-

+
If TRUE, the EAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1234,7 +1191,7 @@ with other setting configuration parameters

 

 
The “refuse-mschap” property

 
  “refuse-mschap”            gboolean

-

+
If TRUE, the MSCHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1242,7 +1199,7 @@ with other setting configuration parameters

 

 
The “refuse-mschapv2” property

 
  “refuse-mschapv2”          gboolean

-

+
If TRUE, the MSCHAPv2 authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1250,7 +1207,7 @@ with other setting configuration parameters

 

 
The “refuse-pap” property

 
  “refuse-pap”               gboolean

-

+
If TRUE, the PAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1258,7 +1215,10 @@ with other setting configuration parameters

 

 
The “require-mppe” property

 
  “require-mppe”             gboolean

-

+
If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+the PPP session.  If either 64-bit or 128-bit MPPE is not available the
+session will fail.  Note that MPPE is not used on mobile broadband
+connections.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -1266,14 +1226,15 @@ with other setting configuration parameters

 

 
The “require-mppe-128” property

 
  “require-mppe-128”         gboolean

-

+
If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+required for the PPP session, and the "require-mppe" property must also
+be set to TRUE.  If 128-bit MPPE is not available the session will fail.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 97d3edde..c7abaffe 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingPPPOE
+NMSettingPPPOE: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -193,7 +193,6 @@ nm_setting_pppoe_error_quark (voi
 

 
Returns

 
 the error quark used for NMSettingPPPOE errors.

-

 

 
 

@@ -231,7 +230,6 @@ nm_setting_pppoe_get_service (
 
Returns

 
 the “service” property of the setting

-

 
 
 

@@ -257,7 +255,6 @@ nm_setting_pppoe_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -283,7 +280,6 @@ nm_setting_pppoe_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -309,7 +305,6 @@ nm_setting_pppoe_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -319,8 +314,6 @@ nm_setting_pppoe_get_password_flags (
NM_SETTING_PPPOE_SETTING_NAME

 
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

-

-

 
 

 

@@ -373,40 +366,30 @@ 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_SERVICE

 
#define NM_SETTING_PPPOE_SERVICE        "service"
 

-

-

 

 

 

 
NM_SETTING_PPPOE_USERNAME

 
#define NM_SETTING_PPPOE_USERNAME       "username"
 

-

-

 

 

 

 
NM_SETTING_PPPOE_PASSWORD

 
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

-

-

 

 

 

 
NM_SETTING_PPPOE_PASSWORD_FLAGS

 
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 

-

-

 

 
 

@@ -414,7 +397,7 @@ did not contain a required PPP setting for PPP related options

 

 
The “password” property

 
  “password”                 gchar *

-

+
Password used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -422,7 +405,7 @@ did not contain a required PPP setting for PPP related options

 

 
The “password-flags” property

 
  “password-flags”           guint

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -431,7 +414,10 @@ did not contain a required PPP setting for PPP related options

 

 
The “service” property

 
  “service”                  gchar *

-

+
If specified, instruct PPPoE to only initiate sessions with access
+concentrators that provide the specified service.  For most providers,
+this should be left blank.  It is only required if there are multiple
+access concentrators or a specific service is known to be required.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -439,14 +425,13 @@ did not contain a required PPP setting for PPP related options

 

 
The “username” property

 
  “username”                 gchar *

-

+
Username used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 6e9ede6a..43c21e9e 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingSerial
+NMSettingSerial: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -211,7 +211,6 @@ nm_setting_serial_error_quark (vo
 

 
Returns

 
 the error quark used for NMSettingSerial errors.

-

 

 
 

@@ -249,7 +248,6 @@ nm_setting_serial_get_baud (
 
Returns

 
 the “baud” property of the setting

-

 
 
 

@@ -275,7 +273,6 @@ nm_setting_serial_get_bits (
 
Returns

 
 the “bits” property of the setting

-

 
 
 

@@ -301,7 +298,6 @@ nm_setting_serial_get_parity (
 
Returns

 
 the “parity” property of the setting

-

 
 
 

@@ -327,7 +323,6 @@ nm_setting_serial_get_stopbits (
 
Returns

 
 the “stopbits” property of the setting

-

 
 
 

@@ -353,7 +348,6 @@ nm_setting_serial_get_send_delay (
 
Returns

 
 the “send-delay” property of the setting

-

 
 
 
@@ -363,8 +357,6 @@ nm_setting_serial_get_send_delay (
NM_SETTING_SERIAL_SETTING_NAME

 
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

-

-

 
 

 

@@ -417,48 +409,36 @@ setting requires the connection to contain an 
NM_SETTING_SERIAL_ERROR

 
#define NM_SETTING_SERIAL_ERROR nm_setting_serial_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_BITS

 
#define NM_SETTING_SERIAL_BITS "bits"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_PARITY

 
#define NM_SETTING_SERIAL_PARITY "parity"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_STOPBITS

 
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_SEND_DELAY

 
#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 

-

-

 

 
 

@@ -466,7 +446,9 @@ setting requires the connection to contain an 
 
The “baud” property

 
  “baud”                     guint

-

+
Speed to use for communication over the serial port.  Note that this
+value usually has no effect for mobile broadband modems as they generally
+ignore speed settings and use the highest available speed.

 
Flags: Read / Write / Construct

 
Default value: 57600

 

@@ -474,7 +456,7 @@ setting requires the connection to contain an 
 
The “bits” property

 
  “bits”                     guint

-

+
Byte-width of the serial communication. The 8 in "8n1" for example.

 
Flags: Read / Write / Construct

 
Allowed values: [5,8]

 
Default value: 8

@@ -483,7 +465,8 @@ setting requires the connection to contain an 
 
The “parity” property

 
  “parity”                   gchar

-

+
Parity setting of the serial port.  Either 'E' for even parity, 'o' for
+odd parity, or 'n' for no parity.

 
Flags: Read / Write / Construct

 
Allowed values: [69,111]

 
Default value: 110

@@ -492,7 +475,7 @@ setting requires the connection to contain an 
 
The “send-delay” property

 
  “send-delay”               guint64

-

+
Time to delay between each byte sent to the modem, in microseconds.

 
Flags: Read / Write / Construct

 
Default value: 0

 
@@ -500,7 +483,8 @@ setting requires the connection to contain an 
 
The “stopbits” property

 
  “stopbits”                 guint

-

+
Number of stop bits for communication on the serial port.  Either 1 or 2.
+The 1 in "8n1" for example.

 
Flags: Read / Write / Construct

 
Allowed values: [1,2]

 
Default value: 1

@@ -508,7 +492,6 @@ setting requires the connection to contain an 
-

-          Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index fb7ee6a7..2e40a312 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingTeam
+NMSettingTeam: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -158,9 +158,8 @@ nm_setting_team_error_quark (void
 

 
Returns

 
 the error quark used for NMSettingTeam errors.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -173,7 +172,7 @@ nm_setting_team_new (void<
 
 the new empty NMSettingTeam object. 

 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -198,9 +197,8 @@ nm_setting_team_get_interface_name (
 
Returns

 
 the “interface-name” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -225,9 +223,8 @@ nm_setting_team_get_config (
 
Returns

 
 the “config” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -236,8 +233,6 @@ nm_setting_team_get_config (
NM_SETTING_TEAM_SETTING_NAME

 
#define NM_SETTING_TEAM_SETTING_NAME "team"
 

-

-

 

 

 

@@ -282,24 +277,18 @@ required

 
NM_SETTING_TEAM_ERROR

 
#define NM_SETTING_TEAM_ERROR nm_setting_team_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_TEAM_INTERFACE_NAME

 
#define NM_SETTING_TEAM_INTERFACE_NAME "interface-name"
 

-

-

 

 

 

 
NM_SETTING_TEAM_CONFIG

 
#define NM_SETTING_TEAM_CONFIG "config"
 

-

-

 

 
 

@@ -307,7 +296,10 @@ required

 

 
The “config” property

 
  “config”                   gchar *

-

+
The JSON configuration for the team network interface.  The property
+should contain raw JSON configuration data suitable for teamd, because
+the value is passed directly to teamd. If not specified, the default
+configuration is used.  See man teamd.conf for the format details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -315,14 +307,13 @@ required

 

 
The “interface-name” property

 
  “interface-name”           gchar *

-

+
The name of the virtual in-kernel team network interface

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index f29e7b88..c08a4eb0 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingTeamPort
+NMSettingTeamPort: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -139,9 +139,8 @@ nm_setting_team_port_error_quark (
 
Returns

 
 the error quark used for NMSettingTeamPort errors.

-

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -154,7 +153,7 @@ nm_setting_team_port_new (void the new empty NMSettingTeamPort object. 

 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -179,9 +178,8 @@ nm_setting_team_port_get_config (
 
Returns

 
 the “config” property of the setting

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -190,8 +188,6 @@ nm_setting_team_port_get_config (
NM_SETTING_TEAM_PORT_SETTING_NAME

 
#define NM_SETTING_TEAM_PORT_SETTING_NAME "team-port"
 

-

-

 

 

 

@@ -236,16 +232,12 @@ is required

 
NM_SETTING_TEAM_PORT_ERROR

 
#define NM_SETTING_TEAM_PORT_ERROR nm_setting_team_port_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_TEAM_PORT_CONFIG

 
#define NM_SETTING_TEAM_PORT_CONFIG     "config"
 

-

-

 

 
 

@@ -253,14 +245,16 @@ is required

 

 
The “config” property

 
  “config”                   gchar *

-

+
The JSON configuration for the team port. The property should contain raw
+JSON configuration data suitable for teamd, because the value is passed
+directly to teamd. If not specified, the default configuration is
+used. See man teamd.conf for the format details.

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 52bf704f..7f44ba65 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingVPN
+NMSettingVPN: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -284,7 +284,6 @@ nm_setting_vpn_error_quark (void<
 

 
Returns

 
 the error quark used for NMSettingVPN errors.

-

 

 
 

@@ -360,7 +359,6 @@ plugin that should be used to connect to this VPN.

 

 
Returns

 
 the VPN plugin's service name

-

 

 
 

@@ -386,7 +384,6 @@ nm_setting_vpn_get_user_name (
 
Returns

 
 the “user-name” property of the setting

-

 
 
 

@@ -412,7 +409,6 @@ nm_setting_vpn_get_persistent (
 
Returns

 
 the “persistent” property of the setting

-

 
 
 

@@ -439,7 +435,6 @@ nm_setting_vpn_get_num_data_items (
 
Returns

 
 the number of VPN plugin specific configuration data items

-

 
 
 

@@ -517,7 +512,6 @@ by 
 
Returns

 
 the data item, if any

-

 
 
 

@@ -554,7 +548,6 @@ nm_setting_vpn_remove_data_item (
Returns

 
 TRUE if the data item was found and removed from the internal list,
 FALSE if it was not.

-

 
 
 

@@ -621,7 +614,6 @@ nm_setting_vpn_get_num_secrets (
 
Returns

 
 the number of VPN plugin specific secrets

-

 
 
 

@@ -698,7 +690,6 @@ by 
 
Returns

 
 the secret, if any

-

 
 
 

@@ -735,7 +726,6 @@ nm_setting_vpn_remove_secret (
Returns

 
 TRUE if the secret was found and removed from the internal list,
 FALSE if it was not.

-

 
 
 

@@ -785,8 +775,6 @@ iteration will not be part of the iteration.

 
NM_SETTING_VPN_SETTING_NAME

 
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

-

-

 
 

 

@@ -831,48 +819,36 @@ required

 
NM_SETTING_VPN_ERROR

 
#define NM_SETTING_VPN_ERROR nm_setting_vpn_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_VPN_SERVICE_TYPE

 
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

-

-

 

 

 

 
NM_SETTING_VPN_USER_NAME

 
#define NM_SETTING_VPN_USER_NAME    "user-name"
 

-

-

 

 

 

 
NM_SETTING_VPN_PERSISTENT

 
#define NM_SETTING_VPN_PERSISTENT   "persistent"
 

-

-

 

 

 

 
NM_SETTING_VPN_DATA

 
#define NM_SETTING_VPN_DATA         "data"
 

-

-

 

 

 

 
NM_SETTING_VPN_SECRETS

 
#define NM_SETTING_VPN_SECRETS      "secrets"
 

-

-

 

 
 

@@ -880,14 +856,17 @@ required

 

 
The “data” property

 
  “data”                     GHashTable_gchararray+gchararray_*

-

+
Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
+values must be strings.

 
Flags: Read / Write

 

 

 

 
The “persistent” property

 
  “persistent”               gboolean

-

+
If the VPN service supports persistence, and this property is TRUE,
+the VPN will attempt to stay connected across link changes and outages,
+until explicitly disconnected.

 
Flags: Read / Write

 
Default value: FALSE

 

@@ -895,14 +874,17 @@ required

 

 
The “secrets” property

 
  “secrets”                  GHashTable_gchararray+gchararray_*

-

+
Dictionary of key/value pairs of VPN plugin specific secrets like
+passwords or private keys.  Both keys and values must be strings.

 
Flags: Read / Write

 

 

 

 
The “service-type” property

 
  “service-type”             gchar *

-

+
D-Bus service name of the VPN plugin that this setting uses to connect to
+its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
+plugin.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -910,14 +892,18 @@ required

 

 
The “user-name” property

 
  “user-name”                gchar *

-

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

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index be791417..35e0e7a9 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingVlan
+NMSettingVlan: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -286,7 +286,6 @@ nm_setting_vlan_error_quark (void
 

 
Returns

 
 the error quark used for NMSettingVlan errors.

-

 

 
 

@@ -324,7 +323,6 @@ nm_setting_vlan_get_interface_name (
 
Returns

 
 the “interface_name” property of the setting

-

 
 
 

@@ -350,7 +348,6 @@ nm_setting_vlan_get_parent (
 
Returns

 
 the “parent” property of the setting

-

 
 
 

@@ -376,7 +373,6 @@ nm_setting_vlan_get_id (
 
Returns

 
 the “id” property of the setting

-

 
 
 

@@ -402,7 +398,6 @@ nm_setting_vlan_get_flags (
 
Returns

 
 the “flags” property of the setting

-

 
 
 

@@ -439,7 +434,6 @@ properties of this setting.

 

 
Returns

 
 return the number of ingress/egress priority entries, -1 if error

-

 

 
 

@@ -493,7 +487,6 @@ or 
 
Returns

 
 TRUE if a priority map was returned, FALSE if error

-

 
 
 

@@ -558,7 +551,6 @@ to

 
Returns

 
 TRUE if the new priority mapping was successfully added to the
 list, FALSE if error

-

 
 
 

@@ -652,9 +644,8 @@ to

 

 
Returns

 
 TRUE if the priority mapping was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -699,9 +690,8 @@ properties.

 

 
Returns

 
 TRUE if the priority mapping was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -775,7 +765,6 @@ the Linux SKB priorities to 802.1p priorities.

 
Returns

 
 TRUE if the entry was successfully added to the list, or it
 overwrote the old value, FALSE if error

-

 

 
 
@@ -785,8 +774,6 @@ overwrote the old value, FALSE if error

 
NM_SETTING_VLAN_SETTING_NAME

 
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
 

-

-

 
 

 

@@ -839,56 +826,42 @@ overwrote the old value, FALSE if error

 
NM_SETTING_VLAN_ERROR

 
#define NM_SETTING_VLAN_ERROR nm_setting_vlan_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_VLAN_INTERFACE_NAME

 
#define NM_SETTING_VLAN_INTERFACE_NAME       "interface-name"
 

-

-

 

 

 

 
NM_SETTING_VLAN_PARENT

 
#define NM_SETTING_VLAN_PARENT               "parent"
 

-

-

 

 

 

 
NM_SETTING_VLAN_ID

 
#define NM_SETTING_VLAN_ID                   "id"
 

-

-

 

 

 

 
NM_SETTING_VLAN_FLAGS

 
#define NM_SETTING_VLAN_FLAGS                "flags"
 

-

-

 

 

 

 
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP

 
#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 

-

-

 

 

 

 
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

 
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 

-

-

 

 

 

@@ -970,14 +943,20 @@ to 802.1p priorities used in VLANs.

 

 
The “egress-priority-map” property

 
  “egress-priority-map”      GSList_gchararray_ *

-

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

 
Flags: Read / Write

 

 

 

 
The “flags” property

 
  “flags”                    guint

-

+
One or more flags which control the behavior and features of the VLAN
+interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (reordering of
+output packet headers), NM_VLAN_FLAG_GVRP (use of the GVRP protocol),
+and NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its
+master device's operating state).

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -985,7 +964,8 @@ to 802.1p priorities used in VLANs.

 

 
The “id” property

 
  “id”                       guint

-

+
The VLAN identifier that the interface created by this connection should
+be assigned.

 
Flags: Read / Write / Construct

 
Allowed values: <= 4095

 
Default value: 0

@@ -994,14 +974,20 @@ to 802.1p priorities used in VLANs.

 

 
The “ingress-priority-map” property

 
  “ingress-priority-map”     GSList_gchararray_ *

-

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

 
Flags: Read / Write

 

 

 

 
The “interface-name” property

 
  “interface-name”           gchar *

-

+
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, eg "eth2.1". The
+parent interface may be given by the “parent” property or by
+the “mac-address” property of an NMSettingWired setting.

 
Flags: Read / Write / Construct

 
Default value: NULL

 

@@ -1009,14 +995,16 @@ to 802.1p priorities used in VLANs.

 

 
The “parent” property

 
  “parent”                   gchar *

-

+
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 an NMSettingWired setting
+with a “mac-address” property.

 
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 6d0035fb..1b10df76 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingWimax
+NMSettingWimax: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -158,7 +158,6 @@ nm_setting_wimax_error_quark (voi
 

 
Returns

 
 the error quark used for NMSettingWimax errors.

-

 

 
 

@@ -170,7 +169,6 @@ nm_setting_wimax_new (void
 

 
Returns

 
 the new empty NMSettingWimax object

-

 

 
 

@@ -198,7 +196,6 @@ specific WiMAX network this setting describes a connection to.

 

 
Returns

 
 the WiMAX NSP name

-

 

 
 

@@ -226,7 +223,6 @@ to.

 

 
Returns

 
 the MAC address

-

 

 
 
@@ -236,8 +232,6 @@ to.

 
NM_SETTING_WIMAX_SETTING_NAME

 
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 

-

-

 
 

 

@@ -282,24 +276,18 @@ required

 
NM_SETTING_WIMAX_ERROR

 
#define NM_SETTING_WIMAX_ERROR nm_setting_wimax_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_WIMAX_NETWORK_NAME

 
#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 

-

-

 

 

 

 
NM_SETTING_WIMAX_MAC_ADDRESS

 
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 

-

-

 

 
 

@@ -307,21 +295,23 @@ required

 

 
The “mac-address” property

 
  “mac-address”              GArray_guchar_ *

-

+
If specified, this connection will only apply to the WiMAX device whose
+MAC address matches. This property does not change the MAC address of the
+device (known as MAC spoofing).

 
Flags: Read / Write

 

 

 

 
The “network-name” property

 
  “network-name”             gchar *

-

+
Network Service Provider (NSP) name of the WiMAX network this connection
+should use.

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 3b0bfc3f..75184b1b 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingWired
+NMSettingWired: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -396,7 +396,6 @@ nm_setting_wired_error_quark (voi
 

 
Returns

 
 the error quark used for NMSettingWired errors.

-

 

 
 

@@ -434,7 +433,6 @@ nm_setting_wired_get_port (
 
Returns

 
 the “port” property of the setting

-

 
 
 

@@ -460,7 +458,6 @@ nm_setting_wired_get_speed (
 
Returns

 
 the “speed” property of the setting

-

 
 
 

@@ -486,7 +483,6 @@ nm_setting_wired_get_duplex (
 
Returns

 
 the “duplex” property of the setting

-

 
 
 

@@ -512,7 +508,6 @@ nm_setting_wired_get_auto_negotiate (
 
Returns

 
 the “auto-negotiate” property of the setting

-

 
 
 

@@ -538,7 +533,6 @@ nm_setting_wired_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -565,7 +559,6 @@ nm_setting_wired_get_cloned_mac_address
 

 
Returns

 
 the “cloned-mac-address” property of the setting

-

 

 
 

@@ -620,9 +613,8 @@ nm_setting_wired_get_num_mac_blacklist_items
 

 
Returns

 
 the number of blacklisted MAC addresses

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -658,9 +650,8 @@ nm_setting_wired_get_mac_blacklist_item
 
 the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -696,9 +687,8 @@ nm_setting_wired_add_mac_blacklist_item
 
Returns

 
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -731,7 +721,7 @@ nm_setting_wired_remove_mac_blacklist_item
 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -768,9 +758,8 @@ the blacklist

 

 
Returns

 
 TRUE if the MAC address was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -794,7 +783,7 @@ nm_setting_wired_clear_mac_blacklist_items
 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -819,7 +808,6 @@ nm_setting_wired_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 

 
 

@@ -877,7 +865,6 @@ of 'qeth', 'lcs', or 'ctc'.

 

 
Returns

 
 the s390 device type

-

 

 
 

@@ -906,7 +893,6 @@ option individually using 
 
Returns

 
 the number of s390-specific device options

-

 
 
 

@@ -962,7 +948,6 @@ option; this value is owned by the setting and should not be modified. 

 
 TRUE on success if the index was valid and an option was found,
 FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)

-

 
 
 

@@ -1001,7 +986,6 @@ nm_setting_wired_get_s390_option_by_key
 
Returns

 
 the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified

-

 
 
 

@@ -1046,7 +1030,6 @@ may already exist.

 
Returns

 
 TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -1084,7 +1067,6 @@ list.

 
Returns

 
 TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -1114,7 +1096,7 @@ nm_setting_wired_get_valid_s390_options
 
 a NULL-terminated array of strings of valid s390 options. 

 
[transfer none]

 
-
Since 0.9.10

+
Since: 0.9.10

 
 
 

@@ -1123,8 +1105,6 @@ nm_setting_wired_get_valid_s390_options
 
NM_SETTING_WIRED_SETTING_NAME

 
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

-

-

 

 

 

@@ -1169,96 +1149,72 @@ required

 
NM_SETTING_WIRED_ERROR

 
#define NM_SETTING_WIRED_ERROR nm_setting_wired_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_WIRED_PORT

 
#define NM_SETTING_WIRED_PORT "port"
 

-

-

 

 

 

 
NM_SETTING_WIRED_SPEED

 
#define NM_SETTING_WIRED_SPEED "speed"
 

-

-

 

 

 

 
NM_SETTING_WIRED_DUPLEX

 
#define NM_SETTING_WIRED_DUPLEX "duplex"
 

-

-

 

 

 

 
NM_SETTING_WIRED_AUTO_NEGOTIATE

 
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

-

-

 

 

 

 
NM_SETTING_WIRED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

 
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

-

-

 

 

 

 
NM_SETTING_WIRED_MTU

 
#define NM_SETTING_WIRED_MTU "mtu"
 

-

-

 

 

 

 
NM_SETTING_WIRED_S390_SUBCHANNELS

 
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 

-

-

 

 

 

 
NM_SETTING_WIRED_S390_NETTYPE

 
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 

-

-

 

 

 

 
NM_SETTING_WIRED_S390_OPTIONS

 
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 

-

-

 

 
 

@@ -1266,7 +1222,9 @@ required

 

 
The “auto-negotiate” property

 
  “auto-negotiate”           gboolean

-

+
If TRUE, allow auto-negotiation of port speed and duplex mode.  If
+FALSE, do not allow auto-negotiation, in which case the "speed" and
+"duplex" properties should be set.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -1274,14 +1232,16 @@ required

 

 
The “cloned-mac-address” property

 
  “cloned-mac-address”       GArray_guchar_ *

-

+
If specified, request that the device use this MAC address instead of its
+permanent MAC address.  This is known as MAC cloning or spoofing.

 
Flags: Read / Write

 

 

 

 
The “duplex” property

 
  “duplex”                   gchar *

-

+
If specified, request that the device only use the specified duplex mode.
+Either "half" or "full".

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1289,21 +1249,27 @@ required

 

 
The “mac-address” property

 
  “mac-address”              GArray_guchar_ *

-

+
If specified, this connection will only apply to the Ethernet device
+whose permanent MAC address matches. This property does not change the
+MAC address of the device (i.e. MAC spoofing).

 
Flags: Read / Write

 

 

 

 
The “mac-address-blacklist” property

 
  “mac-address-blacklist”    GSList_gchararray_ *

-

+
If specified, this connection will never apply to the Ethernet device
+whose permanent MAC address matches an address in the list.  Each MAC
+address is in the standard hex-digits-and-colons notation
+(00:11:22:33:44:55).

 
Flags: Read / Write

 

 

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1311,7 +1277,10 @@ required

 

 
The “port” property

 
  “port”                     gchar *

-

+
Specific port type to use if multiple the device supports multiple
+attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit
+Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface.
+If the device supports only one port type, this setting is ignored.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1319,7 +1288,8 @@ required

 

 
The “s390-nettype” property

 
  “s390-nettype”             gchar *

-

+
s390 network device type; one of "qeth", "lcs", or "ctc", representing
+the different types of virtual network devices available on s390 systems.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1327,28 +1297,37 @@ required

 

 
The “s390-options” property

 
  “s390-options”             GHashTable_gchararray+gchararray_*

-

+
Dictionary of key/value pairs of s390-specific device options.  Both keys
+and values must be strings.  Allowed keys include "portno", "layer2",
+"portname", "protocol", among others.  Key names must contain only
+alphanumeric characters (ie, [a-zA-Z0-9]).

 
Flags: Read / Write

 

 

 

 
The “s390-subchannels” property

 
  “s390-subchannels”         GPtrArray_gchararray_ *

-

+
Identifies specific subchannels that this network device uses for
+communication with z/VM or s390 host.  Like the
+“mac-address” property for non-z/VM devices, this property
+can be used to ensure this connection only applies to the network device
+that uses these subchannels.  The list should contain exactly 3 strings,
+and each string may only be composed of hexadecimal characters and the
+period (.) character.

 
Flags: Read / Write

 

 

 

 
The “speed” property

 
  “speed”                    guint

-

+
If non-zero, request that the device use only the specified speed.  In
+Mbit/s, ie 100 == 100Mbit/s.

 
Flags: Read / Write / Construct

 
Default value: 0

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index f668698a..4642d621 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingWireless
+NMSettingWireless: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -445,7 +445,6 @@ nm_setting_wireless_error_quark (
 

 
Returns

 
 the error quark used for NMSettingWireless errors.

-

 

 
 

@@ -483,7 +482,6 @@ nm_setting_wireless_get_ssid (
 
Returns

 
 the “ssid” property of the setting

-

 
 
 

@@ -509,7 +507,6 @@ nm_setting_wireless_get_mode (
 
Returns

 
 the “mode” property of the setting

-

 
 
 

@@ -535,7 +532,6 @@ nm_setting_wireless_get_band (
 
Returns

 
 the “band” property of the setting

-

 
 
 

@@ -561,7 +557,6 @@ nm_setting_wireless_get_channel (
 
Returns

 
 the “channel” property of the setting

-

 
 
 

@@ -587,7 +582,6 @@ nm_setting_wireless_get_bssid (
 
Returns

 
 the “bssid” property of the setting

-

 
 
 

@@ -613,7 +607,6 @@ nm_setting_wireless_get_rate (
 
Returns

 
 the “rate” property of the setting

-

 
 
 

@@ -639,7 +632,6 @@ nm_setting_wireless_get_tx_power (
 
Returns

 
 the “tx-power” property of the setting

-

 
 
 

@@ -665,7 +657,6 @@ nm_setting_wireless_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -692,7 +683,6 @@ nm_setting_wireless_get_cloned_mac_address
 

 
Returns

 
 the “cloned-mac-address” property of the setting

-

 

 
 

@@ -747,9 +737,8 @@ nm_setting_wireless_get_num_mac_blacklist_items
 

 
Returns

 
 the number of blacklisted MAC addresses

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -785,9 +774,8 @@ nm_setting_wireless_get_mac_blacklist_item
 
 the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -823,9 +811,8 @@ nm_setting_wireless_add_mac_blacklist_item
 
Returns

 
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -858,7 +845,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -895,9 +882,8 @@ the blacklist

 

 
Returns

 
 TRUE if the MAC address was found and removed; FALSE if it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -921,7 +907,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 
 

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -946,7 +932,6 @@ nm_setting_wireless_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 

 
 

@@ -972,7 +957,6 @@ nm_setting_wireless_get_hidden (
 
Returns

 
 the “hidden” property of the setting

-

 
 
 

@@ -1011,7 +995,6 @@ not be preserved.

 
Returns

 
 TRUE if bssid
 was already known, FALSE if not

-

 
 
 

@@ -1038,7 +1021,6 @@ nm_setting_wireless_get_num_seen_bssids
 

 
Returns

 
 the number of BSSIDs in the previously seen BSSID list

-

 

 
 

@@ -1073,7 +1055,6 @@ nm_setting_wireless_get_seen_bssid (
Returns

 
 the BSSID at index i
 

-

 
 
 

@@ -1141,7 +1122,6 @@ capabilities

 
Returns

 
 TRUE if the given settings are compatible with the access point's
 security flags and mode, FALSE if they are not.

-

 
 
 

@@ -1172,7 +1152,6 @@ the presence of NM_SETTING_WIRELESS_SECURITY_SETTING_NAME in the connection.

 

 
Returns

 
 the “security” property of the setting

-

 

 
 
@@ -1182,8 +1161,6 @@ the presence of NM_SETTING_WIRELESS_SECURITY_SETTING_NAME in the connection.

 
NM_SETTING_WIRELESS_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

-

-

 
 

 

@@ -1244,120 +1221,90 @@ set to a value that requires the 
NM_SETTING_WIRELESS_ERROR

 
#define NM_SETTING_WIRELESS_ERROR nm_setting_wireless_error_quark ()
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SSID

 
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MODE

 
#define NM_SETTING_WIRELESS_MODE        "mode"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_BAND

 
#define NM_SETTING_WIRELESS_BAND        "band"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_CHANNEL

 
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_BSSID

 
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_RATE

 
#define NM_SETTING_WIRELESS_RATE        "rate"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_TX_POWER

 
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MTU

 
#define NM_SETTING_WIRELESS_MTU         "mtu"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SEEN_BSSIDS

 
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_HIDDEN

 
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SEC

 
#define NM_SETTING_WIRELESS_SEC         "security"
 

-

-

 

 

 

@@ -1373,7 +1320,7 @@ set to a value that requires the Since 0.9.8

+
Since: 0.9.8

 

 

 

@@ -1389,7 +1336,12 @@ for this connection.

 

 
The “band” property

 
  “band”                     gchar *

-

+
802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
+"bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
+to the specific band, i.e. if "a" is specified, the device will not
+associate with the same network in the 2.4GHz band even if the network's
+settings are compatible.  This setting depends on specific driver
+capability and may not work with all drivers.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1397,14 +1349,20 @@ for this connection.

 

 
The “bssid” property

 
  “bssid”                    GArray_guchar_ *

-

+
If specified, directs the device to only associate with the given access
+point.  This capability is highly driver dependent and not supported by
+all devices.  Note: this property does not control the BSSID used when
+creating an Ad-Hoc network and is unlikely to in the future.

 
Flags: Read / Write

 

 

 

 
The “channel” property

 
  “channel”                  guint

-

+
Wireless channel to use for the Wi-Fi connection.  The device will only
+join (or create for Ad-Hoc networks) a Wi-Fi network on the specified
+channel.  Because channel numbers overlap between bands, this property
+also requires the "band" property to be set.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1412,14 +1370,19 @@ for this connection.

 

 
The “cloned-mac-address” property

 
  “cloned-mac-address”       GArray_guchar_ *

-

+
If specified, request that the Wi-Fi device use this MAC address instead
+of its permanent MAC address.  This is known as MAC cloning or spoofing.

 
Flags: Read / Write

 

 

 

 
The “hidden” property

 
  “hidden”                   gboolean

-

+
If TRUE, indicates this network is a non-broadcasting network that hides
+its SSID.  In this case various workarounds may take place, such as
+probe-scanning the SSID for more reliable network discovery.  However,
+these workarounds expose inherent insecurities with hidden SSID networks,
+and thus hidden SSID networks should be used with caution.

 
Flags: Read / Write

 
Default value: FALSE

 

@@ -1427,21 +1390,26 @@ for this connection.

 

 
The “mac-address” property

 
  “mac-address”              GArray_guchar_ *

-

+
If specified, this connection will only apply to the Wi-Fi device whose
+permanent MAC address matches. This property does not change the MAC
+address of the device (i.e. MAC spoofing).

 
Flags: Read / Write

 

 

 

 
The “mac-address-blacklist” property

 
  “mac-address-blacklist”    GSList_gchararray_ *

-

+
A list of permanent MAC addresses of Wi-Fi devices to which this
+connection should never apply.  Each MAC address should be given in the
+standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").

 
Flags: Read / Write

 

 

 

 
The “mode” property

 
  “mode”                     gchar *

-

+
Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
+infrastructure is assumed.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1449,7 +1417,8 @@ for this connection.

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1457,7 +1426,10 @@ for this connection.

 

 
The “rate” property

 
  “rate”                     guint

-

+
If non-zero, directs the device to only use the specified bitrate for
+communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
+Mbit/s.  This property is highly driver dependent and not all devices
+support setting a static bitrate.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1465,7 +1437,10 @@ for this connection.

 

 
The “security” property

 
  “security”                 gchar *

-

+
If the wireless connection has any security restrictions, like 802.1x,
+WEP, or WPA, set this property to
+NM_SETTING_WIRELESS_SECURITY_SETTING_NAME and ensure the connection
+contains a valid NMSettingWirelessSecurity setting.

 

 
NMSettingWireless:security has been deprecated since version 0.9.10 and should not be used in newly-written code.

 
No longer used. Security restrictions are recognized
@@ -1479,28 +1454,34 @@ connection.

 

 
The “seen-bssids” property

 
  “seen-bssids”              GSList_gchararray_ *

-

+
A list of BSSIDs (each BSSID formatted as a MAC address like
+"00:11:22:33:44:55") that have been detected as part of the Wi-Fi
+network.  NetworkManager internally tracks previously seen BSSIDs. The
+property is only meant for reading and reflects the BSSID list of
+NetworkManager. The changes you make to this property will not be
+preserved.

 
Flags: Read / Write

 

 

 

 
The “ssid” property

 
  “ssid”                     GArray_guchar_ *

-

+
SSID of the Wi-Fi network. Must be specified.

 
Flags: Read / Write

 

 

 

 
The “tx-power” property

 
  “tx-power”                 guint

-

+
If non-zero, directs the device to use the specified transmit power.
+Units are dBm.  This property is highly driver dependent and not all
+devices support setting a static transmit power.

 
Flags: Read / Write / Construct

 
Default value: 0

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 6f4b21a9..d091dda2 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NMSettingWirelessSecurity
+NMSettingWirelessSecurity: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -537,7 +537,6 @@ nm_setting_wireless_security_error_quark
 

 
Returns

 
 the error quark used for NMSettingWired errors.

-

 

 
 

@@ -576,7 +575,6 @@ nm_setting_wireless_security_get_key_mgmt
 

 
Returns

 
 the “key-mgmt” property of the setting

-

 

 
 

@@ -604,7 +602,6 @@ nm_setting_wireless_security_get_num_protos
 
Returns

 
 the number of security protocols this connection allows when
 connecting to secure Wi-Fi networks

-

 
 
 

@@ -640,7 +637,6 @@ nm_setting_wireless_security_get_proto
 
Returns

 
 the protocol at index i
 

-

 
 
 

@@ -682,7 +678,6 @@ with the access point.

 
Returns

 
 TRUE if the protocol was new and and was added to the allowed
 protocol list, or FALSE if it was already in the list

-

 
 
 

@@ -749,9 +744,8 @@ nm_setting_wireless_security_remove_proto_by_value
 

 
Returns

 
 TRUE if the protocol was found and removed; FALSE it it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -801,7 +795,6 @@ nm_setting_wireless_security_get_num_pairwise
 

 
Returns

 
 the number of pairwise encryption algorithms in the allowed list

-

 

 

 

@@ -839,7 +832,6 @@ list.

 
Returns

 
 the pairwise encryption algorithm at index i
 

-

 
 
 

@@ -879,7 +871,6 @@ compatible with this connection.

 
Returns

 
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

-

 
 
 

@@ -948,9 +939,8 @@ algorithm list.

 

 
Returns

 
 TRUE if the encryption algorith was found and removed; FALSE it it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1000,7 +990,6 @@ nm_setting_wireless_security_get_num_groups
 

 
Returns

 
 the number of groupwise encryption algorithms in the allowed list

-

 

 

 

@@ -1038,7 +1027,6 @@ list.

 
Returns

 
 the groupwise encryption algorithm at index i
 

-

 
 
 

@@ -1079,7 +1067,6 @@ compatible with this connection.

 
Returns

 
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

-

 
 
 

@@ -1149,9 +1136,8 @@ algorithm list.

 

 
Returns

 
 TRUE if the algorithm was found and removed; FALSE it it was not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -1200,7 +1186,6 @@ nm_setting_wireless_security_get_psk (
 
Returns

 
 the “psk” property of the setting

-

 

 
 

@@ -1228,7 +1213,6 @@ nm_setting_wireless_security_get_psk_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “psk”

-

 
 
 

@@ -1255,7 +1239,6 @@ nm_setting_wireless_security_get_leap_username
 

 
Returns

 
 the “leap-username” property of the setting

-

 

 
 

@@ -1282,7 +1265,6 @@ nm_setting_wireless_security_get_leap_password
 

 
Returns

 
 the “leap-password” property of the setting

-

 

 
 

@@ -1310,7 +1292,6 @@ nm_setting_wireless_security_get_leap_password_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “leap-password”

-

 
 
 

@@ -1345,7 +1326,6 @@ nm_setting_wireless_security_get_wep_key
 

 
Returns

 
 the WEP key at the given index

-

 

 
 

@@ -1411,7 +1391,6 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 

 
Returns

 
 the “wep-tx-keyidx” property of the setting

-

 

 
 

@@ -1438,7 +1417,6 @@ nm_setting_wireless_security_get_auth_alg
 

 
Returns

 
 the “auth-alg” property of the setting

-

 

 
 

@@ -1465,7 +1443,6 @@ nm_setting_wireless_security_get_wep_key_flags
 

 
Returns

 
 the NMSettingSecretFlags pertaining to the all WEP keys

-

 

 
 

@@ -1492,7 +1469,6 @@ nm_setting_wireless_security_get_wep_key_type
 

 
Returns

 
 the “wep-key-type” property of the setting

-

 

 
 
@@ -1502,8 +1478,6 @@ nm_setting_wireless_security_get_wep_key_type
 
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

-

-

 
 

 

@@ -1581,8 +1555,6 @@ encryption protocol

 
NM_SETTING_WIRELESS_SECURITY_ERROR

 
#define NM_SETTING_WIRELESS_SECURITY_ERROR nm_setting_wireless_security_error_quark ()
 

-

-

 

 

 

@@ -1648,136 +1620,102 @@ the actual WEP key using the MD5 hash algorithm.

 
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

 
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

 
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PROTO

 
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

 
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_GROUP

 
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PSK

 
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

 
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 

-

-

 

 
 

@@ -1785,7 +1723,11 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “auth-alg” property

 
  “auth-alg”                 gchar *

-

+
When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the
+802.11 authentication algorithm required by the AP here.  One of "open"
+for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When
+using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
+"leap-username" and "leap-password" properties must be specified.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1793,14 +1735,20 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “group” property

 
  “group”                    GSList_gchararray_ *

-

+
A list of group/broadcast encryption algorithms which prevents
+connections to Wi-Fi networks that do not utilize one of the algorithms
+in the list.  For maximum compatibility leave this property empty.  Each
+list element may be one of "wep40", "wep104", "tkip", or "ccmp".

 
Flags: Read / Write

 

 

 

 
The “key-mgmt” property

 
  “key-mgmt”                 gchar *

-

+
Key management used for the connection.  One of "none" (WEP), "ieee8021x"
+(Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
+WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
+any Wi-Fi connection that uses security.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1808,7 +1756,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “leap-password” property

 
  “leap-password”            gchar *

-

+
The login password for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1816,7 +1765,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “leap-password-flags” property

 
  “leap-password-flags”      guint

-

+
Flags indicating how to handle the
+“leap-password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -1825,7 +1775,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “leap-username” property

 
  “leap-username”            gchar *

-

+
The login username for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1833,21 +1784,31 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “pairwise” property

 
  “pairwise”                 GSList_gchararray_ *

-

+
A list of pairwise encryption algorithms which prevents connections to
+Wi-Fi networks that do not utilize one of the algorithms in the list.
+For maximum compatibility leave this property empty.  Each list element
+may be one of "tkip" or "ccmp".

 
Flags: Read / Write

 

 

 

 
The “proto” property

 
  “proto”                    GSList_gchararray_ *

-

+
List of strings specifying the allowed WPA protocol versions to use.
+Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If
+not specified, both WPA and RSN connections are allowed.

 
Flags: Read / Write

 

 

 

 
The “psk” property

 
  “psk”                      gchar *

-

+
Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
+must contain only hexadecimal characters and is interpreted as a
+hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
+characters (as specified in the 802.11i standard) and is interpreted as a
+WPA passphrase, and is hashed to derive the actual WPA-PSK used when
+connecting to the Wi-Fi network.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1855,7 +1816,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “psk-flags” property

 
  “psk-flags”                guint

-

+
Flags indicating how to handle the “psk”
+property.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -1864,7 +1826,9 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key-flags” property

 
  “wep-key-flags”            guint

-

+
Flags indicating how to handle the “wep-key0”,
+“wep-key1”, “wep-key2”,
+and “wep-key3” properties.

 
Flags: Read / Write

 
Allowed values: <= 7

 
Default value: 0

@@ -1873,7 +1837,12 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key-type” property

 
  “wep-key-type”             guint

-

+
Controls the interpretation of WEP keys.  Allowed values are
+NM_WEP_KEY_TYPE_KEY, in which case the key is either a 10- or
+26-character hexadecimal string, or a 5- or 13-character ASCII password;
+or NM_WEP_KEY_TYPE_PASSPHRASE, in which case the passphrase is provided
+as a string and will be hashed using the de-facto MD5 method to derive
+the actual WEP key.

 
Flags: Read / Write / Construct

 
Allowed values: <= 2

 
Default value: 0

@@ -1882,7 +1851,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key0” property

 
  “wep-key0”                 gchar *

-

+
Index 0 WEP key.  This is the WEP key used in most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1890,7 +1860,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key1” property

 
  “wep-key1”                 gchar *

-

+
Index 1 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1898,7 +1869,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key2” property

 
  “wep-key2”                 gchar *

-

+
Index 2 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1906,7 +1878,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key3” property

 
  “wep-key3”                 gchar *

-

+
Index 3 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1914,7 +1887,10 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-tx-keyidx” property

 
  “wep-tx-keyidx”            guint

-

+
When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key
+index is used by the AP, put that WEP key index here.  Valid values are 0
+(default key) through 3.  Note that some consumer access points (like the
+Linksys WRT54G) number the keys 1 - 4.

 
Flags: Read / Write / Construct

 
Allowed values: <= 3

 
Default value: 0

@@ -1922,7 +1898,6 @@ the actual WEP key using the MD5 hash algorithm.

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html
index fbcda20a..76baf202 100644
--- a/docs/libnm-util/html/annotation-glossary.html
+++ b/docs/libnm-util/html/annotation-glossary.html
@@ -2,12 +2,12 @@
 
 
 
-libnm-util Reference Manual: Annotation Glossary
+Annotation Glossary: libnm-util Reference Manual
 
 
 
 
-
+
 
 
 
@@ -53,6 +53,8 @@
 
S

 
scope call

 
The callback is valid only during the call to the method.

+
skip

+
Exposed in C code, not necessarily available in other languages.

 
T

 
transfer container

 
Free data container after the code is done.

@@ -62,7 +64,6 @@
 
Don't free data after the code is done.

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index 228ba8e6..b7b0aaf5 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: API Index
+API Index: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -5220,7 +5220,6 @@
 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html
index ef2dca61..44d6c268 100644
--- a/docs/libnm-util/html/ch01.html
+++ b/docs/libnm-util/html/ch01.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: libnm-util API Reference
+libnm-util API Reference: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -122,7 +122,6 @@ that require PPP to deliver IP capability
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 36815443..7be22883 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 

 

 

-      for libnm-util 1.0.2
+      for libnm-util 1.0.4
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/0.9/.
@@ -152,7 +152,6 @@ that require PPP to deliver IP capability
 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml
index 417ba768..77fff963 100644
--- a/docs/libnm-util/html/index.sgml
+++ b/docs/libnm-util/html/index.sgml
@@ -73,6 +73,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -115,13 +120,37 @@
 
 
 
+
+
+
+
 
 
 
+
+
+
+
 
+
+
+
+
+
+
+
+
 
 
+
+
+
 
+
+
+
+
+
 
 
 
@@ -160,6 +189,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -224,6 +258,9 @@
 
 
 
+
+
+
 
 
 
@@ -284,6 +321,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -360,8 +402,19 @@
 
 
 
+
+
+
+
+
+
+
 
 
+
+
+
+
 
 
 
@@ -412,6 +465,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -438,6 +495,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -467,6 +528,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -502,6 +567,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -515,7 +584,29 @@
 
 
 
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -543,6 +634,9 @@
 
 
 
+
+
+
 
 
 
@@ -571,6 +665,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -613,6 +712,9 @@
 
 
 
+
+
+
 
 
 
@@ -647,6 +749,9 @@
 
 
 
+
+
+
 
 
 
@@ -670,6 +775,9 @@
 
 
 
+
+
+
 
 
 
@@ -690,6 +798,9 @@
 
 
 
+
+
+
 
 
 
@@ -706,6 +817,9 @@
 
 
 
+
+
+
 
 
 
@@ -725,6 +839,9 @@
 
 
 
+
+
+
 
 
 
@@ -762,6 +879,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -770,7 +891,12 @@
 
 
 
+
+
 
+
+
+
 
 
 
@@ -793,6 +919,9 @@
 
 
 
+
+
+
 
 
 
@@ -821,6 +950,9 @@
 
 
 
+
+
+
 
 
 
@@ -876,8 +1008,15 @@
 
 
 
+
+
+
 
 
+
+
+
+
 
 
 
@@ -990,9 +1129,19 @@
 
 
 
+
+
+
+
 
+
+
+
 
 
+
+
+
 
 
 
@@ -1131,6 +1280,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1235,6 +1388,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1255,6 +1412,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1299,6 +1460,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1354,6 +1519,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1391,6 +1560,9 @@
 
 
 
+
+
+
 
 
 
@@ -1464,6 +1636,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1512,19 +1693,171 @@
 
 
 
+
+
+
+
+
+
+
+
 
 
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
 
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
+
+
+
 
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
 
 
 
@@ -1556,9 +1889,39 @@
 
 
 
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
 
 
 
@@ -1599,6 +1962,7 @@
 
 
 
+
 
 
 
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index bbad114b..1154416a 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NetworkManager
+NetworkManager: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -260,11 +260,10 @@
 
 

 
Description

-

-

 

 

 
Functions

+

 

 

 
Types and Values

@@ -272,320 +271,240 @@
 
NM_DBUS_SERVICE

 
#define NM_DBUS_SERVICE                     "org.freedesktop.NetworkManager"
 

-

-

 

 

 

 
NM_DBUS_PATH

 
#define NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE

 
#define NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE

 
#define NM_DBUS_INTERFACE_DEVICE            NM_DBUS_INTERFACE ".Device"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_WIRED

 
#define NM_DBUS_INTERFACE_DEVICE_WIRED      NM_DBUS_INTERFACE_DEVICE ".Wired"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_ADSL

 
#define NM_DBUS_INTERFACE_DEVICE_ADSL       NM_DBUS_INTERFACE_DEVICE ".Adsl"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_WIRELESS

 
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS   NM_DBUS_INTERFACE_DEVICE ".Wireless"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH

 
#define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH  NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH

 
#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH  NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
 

-

-

 

 

 

 
NM_DBUS_PATH_ACCESS_POINT

 
#define NM_DBUS_PATH_ACCESS_POINT           NM_DBUS_PATH "/AccessPoint"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_ACCESS_POINT

 
#define NM_DBUS_INTERFACE_ACCESS_POINT      NM_DBUS_INTERFACE ".AccessPoint"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_MODEM

 
#define NM_DBUS_INTERFACE_DEVICE_MODEM      NM_DBUS_INTERFACE_DEVICE ".Modem"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_WIMAX

 
#define NM_DBUS_INTERFACE_DEVICE_WIMAX      NM_DBUS_INTERFACE_DEVICE ".WiMax"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_WIMAX_NSP

 
#define NM_DBUS_INTERFACE_WIMAX_NSP         NM_DBUS_INTERFACE ".WiMax.Nsp"
 

-

-

 

 

 

 
NM_DBUS_PATH_WIMAX_NSP

 
#define NM_DBUS_PATH_WIMAX_NSP              NM_DBUS_PATH "/Nsp"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_ACTIVE_CONNECTION

 
#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_IP4_CONFIG

 
#define NM_DBUS_INTERFACE_IP4_CONFIG        NM_DBUS_INTERFACE ".IP4Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DHCP4_CONFIG

 
#define NM_DBUS_INTERFACE_DHCP4_CONFIG      NM_DBUS_INTERFACE ".DHCP4Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_IP6_CONFIG

 
#define NM_DBUS_INTERFACE_IP6_CONFIG        NM_DBUS_INTERFACE ".IP6Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DHCP6_CONFIG

 
#define NM_DBUS_INTERFACE_DHCP6_CONFIG      NM_DBUS_INTERFACE ".DHCP6Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_INFINIBAND

 
#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_BOND

 
#define NM_DBUS_INTERFACE_DEVICE_BOND       NM_DBUS_INTERFACE_DEVICE ".Bond"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_TEAM

 
#define NM_DBUS_INTERFACE_DEVICE_TEAM       NM_DBUS_INTERFACE_DEVICE ".Team"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_VLAN

 
#define NM_DBUS_INTERFACE_DEVICE_VLAN       NM_DBUS_INTERFACE_DEVICE ".Vlan"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_BRIDGE

 
#define NM_DBUS_INTERFACE_DEVICE_BRIDGE     NM_DBUS_INTERFACE_DEVICE ".Bridge"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_GENERIC

 
#define NM_DBUS_INTERFACE_DEVICE_GENERIC    NM_DBUS_INTERFACE_DEVICE ".Generic"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_VETH

 
#define NM_DBUS_INTERFACE_DEVICE_VETH       NM_DBUS_INTERFACE_DEVICE ".Veth"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_TUN

 
#define NM_DBUS_INTERFACE_DEVICE_TUN        NM_DBUS_INTERFACE_DEVICE ".Tun"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_MACVLAN

 
#define NM_DBUS_INTERFACE_DEVICE_MACVLAN    NM_DBUS_INTERFACE_DEVICE ".Macvlan"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_VXLAN

 
#define NM_DBUS_INTERFACE_DEVICE_VXLAN      NM_DBUS_INTERFACE_DEVICE ".Vxlan"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_GRE

 
#define NM_DBUS_INTERFACE_DEVICE_GRE        NM_DBUS_INTERFACE_DEVICE ".Gre"
 

-

-

 

 

 

 
NM_DBUS_IFACE_SETTINGS

 
#define NM_DBUS_IFACE_SETTINGS            "org.freedesktop.NetworkManager.Settings"
 

-

-

 

 

 

 
NM_DBUS_PATH_SETTINGS

 
#define NM_DBUS_PATH_SETTINGS             "/org/freedesktop/NetworkManager/Settings"
 

-

-

 

 

 

 
NM_DBUS_IFACE_SETTINGS_CONNECTION

 
#define NM_DBUS_IFACE_SETTINGS_CONNECTION "org.freedesktop.NetworkManager.Settings.Connection"
 

-

-

 

 

 

 
NM_DBUS_PATH_SETTINGS_CONNECTION

 
#define NM_DBUS_PATH_SETTINGS_CONNECTION  "/org/freedesktop/NetworkManager/Settings/Connection"
 

-

-

 

 

 

 
NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS

 
#define NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS "org.freedesktop.NetworkManager.Settings.Connection.Secrets"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_AGENT_MANAGER

 
#define NM_DBUS_INTERFACE_AGENT_MANAGER   NM_DBUS_INTERFACE ".AgentManager"
 

-

-

 

 

 

 
NM_DBUS_PATH_AGENT_MANAGER

 
#define NM_DBUS_PATH_AGENT_MANAGER        "/org/freedesktop/NetworkManager/AgentManager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_SECRET_AGENT

 
#define NM_DBUS_INTERFACE_SECRET_AGENT    NM_DBUS_INTERFACE ".SecretAgent"
 

-

-

 

 

 

 
NM_DBUS_PATH_SECRET_AGENT

 
#define NM_DBUS_PATH_SECRET_AGENT         "/org/freedesktop/NetworkManager/SecretAgent"
 

-

-

 

 

 

@@ -666,8 +585,6 @@
 
NM_STATE_CONNECTED

 
#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
 

-

-

 

 

 

@@ -723,7 +640,7 @@
 
 

 
-
Since 0.9.8.6

+
Since: 0.9.8.6

 
 

 

@@ -1865,10 +1782,24 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

  
 
 
-
NM_DEVICE_STATE_REASON_LAST

- 
+
NM_DEVICE_STATE_REASON_PARENT_CHANGED

+
+
the device's parent changed

+
+ 
+
+
+
NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED

+
+
the device parent's management changed

+
  
 
+
+
NM_DEVICE_STATE_REASON_LAST

+ 
+ 
+
 
 

 
@@ -1933,7 +1864,6 @@ network.

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
index 3d488c04..cee007fc 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: NetworkManagerVPN
+NetworkManagerVPN: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -292,11 +292,10 @@
 
 

 
Description

-

-

 

 

 
Functions

+

 

 

 
Types and Values

@@ -304,200 +303,150 @@
 
NM_DBUS_PATH_VPN

 
#define NM_DBUS_PATH_VPN                  "/org/freedesktop/NetworkManager/VPN/Manager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_VPN

 
#define NM_DBUS_INTERFACE_VPN             "org.freedesktop.NetworkManager.VPN.Manager"
 

-

-

 

 

 

 
NM_DBUS_PATH_VPN_CONNECTION

 
#define NM_DBUS_PATH_VPN_CONNECTION       "/org/freedesktop/NetworkManager/VPN/Connection"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_VPN_CONNECTION

 
#define NM_DBUS_INTERFACE_VPN_CONNECTION  "org.freedesktop.NetworkManager.VPN.Connection"
 

-

-

 

 

 

 
NM_VPN_DBUS_PLUGIN_PATH

 
#define NM_VPN_DBUS_PLUGIN_PATH           "/org/freedesktop/NetworkManager/VPN/Plugin"
 

-

-

 

 

 

 
NM_VPN_DBUS_PLUGIN_INTERFACE

 
#define NM_VPN_DBUS_PLUGIN_INTERFACE      "org.freedesktop.NetworkManager.VPN.Plugin"
 

-

-

 

 

 

 
NM_DBUS_NO_ACTIVE_VPN_CONNECTION

 
#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
 

-

-

 

 

 

 
NM_DBUS_NO_VPN_CONNECTIONS

 
#define NM_DBUS_NO_VPN_CONNECTIONS       "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
 

-

-

 

 

 

 
NM_DBUS_INVALID_VPN_CONNECTION

 
#define NM_DBUS_INVALID_VPN_CONNECTION   "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
 

-

-

 

 

 

 
NM_DBUS_VPN_ERROR_PREFIX

 
#define NM_DBUS_VPN_ERROR_PREFIX              "org.freedesktop.NetworkManager.VPN.Error"
 

-

-

 

 

 

 
NM_DBUS_VPN_STARTING_IN_PROGRESS

 
#define NM_DBUS_VPN_STARTING_IN_PROGRESS      "StartingInProgress"
 

-

-

 

 

 

 
NM_DBUS_VPN_ALREADY_STARTED

 
#define NM_DBUS_VPN_ALREADY_STARTED           "AlreadyStarted"
 

-

-

 

 

 

 
NM_DBUS_VPN_STOPPING_IN_PROGRESS

 
#define NM_DBUS_VPN_STOPPING_IN_PROGRESS      "StoppingInProgress"
 

-

-

 

 

 

 
NM_DBUS_VPN_ALREADY_STOPPED

 
#define NM_DBUS_VPN_ALREADY_STOPPED           "AlreadyStopped"
 

-

-

 

 

 

 
NM_DBUS_VPN_WRONG_STATE

 
#define NM_DBUS_VPN_WRONG_STATE               "WrongState"
 

-

-

 

 

 

 
NM_DBUS_VPN_BAD_ARGUMENTS

 
#define NM_DBUS_VPN_BAD_ARGUMENTS             "BadArguments"
 

-

-

 

 

 

 
NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED

 
#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_LOGIN_BANNER

 
#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER   "LoginBanner"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_LOGIN_FAILED

 
#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED   "LoginFailed"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED

 
#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED  "LaunchFailed"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_CONNECT_FAILED

 
#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD

 
#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD

 
#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD  "IPConfigBad"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_STATE_CHANGE

 
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE   "StateChange"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_IP4_CONFIG

 
#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG     "IP4Config"
 

-

-

 

 

 

@@ -803,269 +752,202 @@
 
NM_VPN_PLUGIN_CONFIG_TUNDEV

 
#define NM_VPN_PLUGIN_CONFIG_TUNDEV      "tundev"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_BANNER

 
#define NM_VPN_PLUGIN_CONFIG_BANNER      "banner"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY

 
#define NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY "gateway"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_MTU

 
#define NM_VPN_PLUGIN_CONFIG_MTU         "mtu"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_HAS_IP4

 
#define NM_VPN_PLUGIN_CONFIG_HAS_IP4     "has-ip4"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_HAS_IP6

 
#define NM_VPN_PLUGIN_CONFIG_HAS_IP6     "has-ip6"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CAN_PERSIST

 
#define NM_VPN_PLUGIN_CAN_PERSIST        "can-persist"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY

 
#define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS     "address"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_PTP

 
#define NM_VPN_PLUGIN_IP4_CONFIG_PTP         "ptp"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_PREFIX

 
#define NM_VPN_PLUGIN_IP4_CONFIG_PREFIX      "prefix"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_DNS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_DNS         "dns"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_NBNS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_NBNS        "nbns"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_MSS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_MSS         "mss"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN

 
#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN      "domain"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS     "domains"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_ROUTES

 
#define NM_VPN_PLUGIN_IP4_CONFIG_ROUTES      "routes"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT

 
#define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY

 
#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY   NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_BANNER

 
#define NM_VPN_PLUGIN_IP4_CONFIG_BANNER      NM_VPN_PLUGIN_CONFIG_BANNER
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY

 
#define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_MTU

 
#define NM_VPN_PLUGIN_IP4_CONFIG_MTU         NM_VPN_PLUGIN_CONFIG_MTU
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV

 
#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV      NM_VPN_PLUGIN_CONFIG_TUNDEV
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY

 
#define NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY "internal-gateway"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS     "address"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_PTP

 
#define NM_VPN_PLUGIN_IP6_CONFIG_PTP         "ptp"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_PREFIX

 
#define NM_VPN_PLUGIN_IP6_CONFIG_PREFIX      "prefix"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_DNS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_DNS         "dns"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_MSS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_MSS         "mss"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN

 
#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN      "domain"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS     "domains"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_ROUTES

 
#define NM_VPN_PLUGIN_IP6_CONFIG_ROUTES      "routes"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT

 
#define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 

-

-

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index bdd5ddbd..9507d0ab 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: nm-utils
+nm-utils: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -520,7 +520,6 @@ uses libnm-util.  This function can be called more than once.

 

 
Returns

 
 TRUE if the initialization was successful, FALSE on failure.

-

 

 
 

@@ -566,7 +565,6 @@ number of known SSID-cloaking methods.

 

 
Returns

 
 TRUE if the SSID is "empty", FALSE if it is not

-

 

 
 

@@ -606,7 +604,6 @@ be used for display of SSIDs.

 
Returns

 
 pointer to the escaped SSID, which uses an internal static buffer
 and will be overwritten by subsequent calls to this function

-

 
 
 

@@ -652,7 +649,6 @@ NULLs, even though that is functionally pointless.

 

 
Returns

 
 TRUE if the SSIDs are the same, FALSE if they are not

-

 

 
 

@@ -741,8 +737,9 @@ nm_utils_slist_free (GSListuse g_slist_free_full().

 
 
Utility function to free a GSList.

+
[skip]

 

-
Parameters

+
Parameters

 
@@ -840,7 +837,6 @@ e.g. (TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
 , FALSE if they are not

-

 
 
 

@@ -881,9 +877,8 @@ e.g.  TRUE if the device capabilities are compatible with the desired
 type
 , FALSE if they are not.

-

 
-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -919,9 +914,8 @@ nm_utils_wep_key_valid (const cha
 
Returns

 
 TRUE if key
 is a WEP key, FALSE if not

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -949,9 +943,8 @@ nm_utils_wpa_psk_valid (const cha
 
Returns

 
 TRUE if psk
 is a WPA PSK, FALSE if not

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -1110,7 +1103,6 @@ nm_utils_ip4_netmask_to_prefix (g
 

 
Returns

 
 the CIDR prefix represented by the netmask

-

 

 

 

@@ -1136,7 +1128,6 @@ nm_utils_ip4_prefix_to_netmask (g
 

 
Returns

 
 the netmask represented by the prefix, in network byte order

-

 

 
 

@@ -1166,7 +1157,6 @@ falls in the predefined classes.

 

 
Returns

 
 the default class prefix for the given IP

-

 

 
 

@@ -1311,8 +1301,9 @@ which should be unset by the caller (when no longer needed) with
 nm_utils_ip6_dns_from_gvalue (const GValue *value);
 
Converts a GValue containing a GPtrArray of IP6 DNS, represented as
 GByteArrays into a GSList of struct in6_addrs.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1327,9 +1318,8 @@ nm_utils_ip6_dns_from_gvalue (const 
-
Returns

+
Returns

 
 a GSList of IP6 addresses.

-

 
 
 

@@ -1343,8 +1333,9 @@ in6_addr structs into a GPtrArray of 
+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1377,7 +1368,6 @@ nm_utils_uuid_generate (void
Returns

 
 a newly allocated UUID suitable for use as the NMSettingConnection
 object's “id”: property.  Should be freed with g_free()

-

 
 
 

@@ -1406,7 +1396,6 @@ nm_utils_uuid_generate_from_string (const 
Returns

 
 a newly allocated UUID suitable for use as the NMSettingConnection
 object's “id”: property

-

 
 
 

@@ -1538,7 +1527,6 @@ nm_utils_file_is_pkcs12 (const ch
 

 
Returns

 
 TRUE if the file is PKCS#12, FALSE if it is not

-

 

 
 

@@ -1547,12 +1535,6 @@ nm_utils_file_is_pkcs12 (const ch
 
gboolean
 (*NMUtilsFileSearchInPathsPredicate) (const char *filename,
                                       gpointer user_data);

-

-

-

-
Returns

-

-

 
 

 

@@ -1659,7 +1641,6 @@ nm_utils_wifi_freq_to_channel (gu
 

 
Returns

 
 the channel represented by the frequency or 0

-

 

 

 

@@ -1696,7 +1677,6 @@ nm_utils_wifi_channel_to_freq (gu
 
 the frequency represented by the channel of the band,
 or -1 when the freq is invalid, or 0 when the band
 is invalid

-

 
 
 

@@ -1737,7 +1717,6 @@ nm_utils_wifi_find_next_channel (
 

 
Returns

 
 the next channel in the specified direction or 0

-

 

 
 

@@ -1772,7 +1751,6 @@ nm_utils_wifi_is_channel_valid (g
 

 
Returns

 
 TRUE or FALSE

-

 

 
 

@@ -1801,7 +1779,6 @@ nm_utils_hwaddr_len (int t
 

 
Returns

 
 the positive length, or -1 if the type is unknown/unsupported.

-

 

 
 

@@ -1840,7 +1817,6 @@ a length; but you can just use ARPHRD_ETHER or
 ARPHRD_INFINIBAND.  If the length is unexpected, return -1
 (unsupported type/length).

-

 
 
 

@@ -1970,7 +1946,6 @@ instead of a type.

 
 buffer
 , or NULL if asc
 couldn't be parsed

-

 
 
 

@@ -2010,7 +1985,7 @@ nm_utils_hwaddr_ntoa_len (gconstp
 . 

 
[transfer full]

 
-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2059,9 +2034,8 @@ the size of the buffer in bytes.

 couldn't be parsed
 or would be shorter or longer than length
 .

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2090,9 +2064,8 @@ nm_utils_hwaddr_valid (const char
 
 TRUE if asc
 appears to be a valid hardware address
 of some type, FALSE if not.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2140,7 +2113,7 @@ array

 . 

 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2167,9 +2140,8 @@ nm_utils_hex2byte (const char
Returns

 
 a byte, or -1 if hex
 doesn't represent a hex byte

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2209,7 +2181,7 @@ string (it has to be even)

 
 a array of bytes, or NULL on error. 

 
[transfer full]

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2236,9 +2208,8 @@ function in net/core/dev.c.

 

 
Returns

 
 TRUE if interface name is valid, otherwise FALSE is returned.

-

 

-
Since 0.9.8

+
Since: 0.9.8

 

 

 

@@ -2266,9 +2237,8 @@ nm_utils_is_uuid (const char
Returns

 
 TRUE if str
 is a UUID, FALSE if not

-

 

-
Since 0.9.8

+
Since: 0.9.8

 
 

 

@@ -2277,8 +2247,9 @@ is a UUID, FALSE if not

 nm_utils_inet4_ntop (in_addr_t inaddr,
                      char *dst);
 
Wrapper for inet_ntop.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -2309,13 +2280,12 @@ buffer to avoid these issues.

 

 
 


 

 

-
Returns

+
Returns

 
 the input buffer dst
 , or a pointer to an
 internal, static buffer. This function cannot fail.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 
 

 

@@ -2324,8 +2294,9 @@ internal, static buffer. This function cannot fail.

 nm_utils_inet6_ntop (const struct in6_addr *in6addr,
                      char *dst);
 
Wrapper for inet_ntop.

+
[skip]

 

-
Parameters

+
Parameters

 
@@ -2356,15 +2327,14 @@ buffer to avoid these issues.

 
 

 

 

 

-
Returns

+
Returns

 
 the input buffer dst
 , or a pointer to an
 internal, static buffer. NULL is not allowed as in6addr
 ,
 otherwise, this function cannot fail.

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 

 

@@ -2419,9 +2389,8 @@ underlying device driver.

 

 
Returns

 
 TRUE or FALSE

-

 

-
Since 0.9.10

+
Since: 0.9.10

 

 
 

@@ -2529,7 +2498,6 @@ for both 
 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/libnm-util.devhelp2 b/docs/libnm-util/html/libnm-util.devhelp2
index 144f60eb..2530e827 100644
--- a/docs/libnm-util/html/libnm-util.devhelp2
+++ b/docs/libnm-util/html/libnm-util.devhelp2
@@ -1,5 +1,4 @@
 
-
 
   
     
@@ -1332,5 +1331,368 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 0efce8c7..9c2eaa40 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -2,13 +2,13 @@
 
 
 
-libnm-util Reference Manual: Object Hierarchy
+Object Hierarchy: libnm-util Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -103,7 +103,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm-util/html/style.css b/docs/libnm-util/html/style.css
index c141ddd2..36754209 100644
--- a/docs/libnm-util/html/style.css
+++ b/docs/libnm-util/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a  as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/libnm-util/tmpl/NetworkManager.sgml b/docs/libnm-util/tmpl/NetworkManager.sgml
deleted file mode 100644
index 008d08b8..00000000
--- a/docs/libnm-util/tmpl/NetworkManager.sgml
+++ /dev/null
@@ -1,539 +0,0 @@
-
-NetworkManager
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_STATE_UNKNOWN: 
-@NM_STATE_ASLEEP: 
-@NM_STATE_DISCONNECTED: 
-@NM_STATE_DISCONNECTING: 
-@NM_STATE_CONNECTING: 
-@NM_STATE_CONNECTED_LOCAL: 
-@NM_STATE_CONNECTED_SITE: 
-@NM_STATE_CONNECTED_GLOBAL: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CONNECTIVITY_UNKNOWN: 
-@NM_CONNECTIVITY_NONE: 
-@NM_CONNECTIVITY_PORTAL: 
-@NM_CONNECTIVITY_LIMITED: 
-@NM_CONNECTIVITY_FULL: 
-
-
-
-
-
-
-@NM_DEVICE_TYPE_UNKNOWN: 
-@NM_DEVICE_TYPE_ETHERNET: 
-@NM_DEVICE_TYPE_WIFI: 
-@NM_DEVICE_TYPE_UNUSED1: 
-@NM_DEVICE_TYPE_UNUSED2: 
-@NM_DEVICE_TYPE_BT: 
-@NM_DEVICE_TYPE_OLPC_MESH: 
-@NM_DEVICE_TYPE_WIMAX: 
-@NM_DEVICE_TYPE_MODEM: 
-@NM_DEVICE_TYPE_INFINIBAND: 
-@NM_DEVICE_TYPE_BOND: 
-@NM_DEVICE_TYPE_VLAN: 
-@NM_DEVICE_TYPE_ADSL: 
-@NM_DEVICE_TYPE_BRIDGE: 
-@NM_DEVICE_TYPE_GENERIC: 
-@NM_DEVICE_TYPE_TEAM: 
-
-
-
-
-
-
-@NM_DEVICE_CAP_NONE: 
-@NM_DEVICE_CAP_NM_SUPPORTED: 
-@NM_DEVICE_CAP_CARRIER_DETECT: 
-@NM_DEVICE_CAP_IS_SOFTWARE: 
-
-
-
-
-
-
-@NM_WIFI_DEVICE_CAP_NONE: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP40: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP104: 
-@NM_WIFI_DEVICE_CAP_CIPHER_TKIP: 
-@NM_WIFI_DEVICE_CAP_CIPHER_CCMP: 
-@NM_WIFI_DEVICE_CAP_WPA: 
-@NM_WIFI_DEVICE_CAP_RSN: 
-@NM_WIFI_DEVICE_CAP_AP: 
-@NM_WIFI_DEVICE_CAP_ADHOC: 
-@NM_WIFI_DEVICE_CAP_FREQ_VALID: 
-@NM_WIFI_DEVICE_CAP_FREQ_2GHZ: 
-@NM_WIFI_DEVICE_CAP_FREQ_5GHZ: 
-
-
-
-
-
-
-@NM_802_11_AP_FLAGS_NONE: 
-@NM_802_11_AP_FLAGS_PRIVACY: 
-
-
-
-
-
-
-@NM_802_11_AP_SEC_NONE: 
-@NM_802_11_AP_SEC_PAIR_WEP40: 
-@NM_802_11_AP_SEC_PAIR_WEP104: 
-@NM_802_11_AP_SEC_PAIR_TKIP: 
-@NM_802_11_AP_SEC_PAIR_CCMP: 
-@NM_802_11_AP_SEC_GROUP_WEP40: 
-@NM_802_11_AP_SEC_GROUP_WEP104: 
-@NM_802_11_AP_SEC_GROUP_TKIP: 
-@NM_802_11_AP_SEC_GROUP_CCMP: 
-@NM_802_11_AP_SEC_KEY_MGMT_PSK: 
-@NM_802_11_AP_SEC_KEY_MGMT_802_1X: 
-
-
-
-
-
-
-@NM_802_11_MODE_UNKNOWN: 
-@NM_802_11_MODE_ADHOC: 
-@NM_802_11_MODE_INFRA: 
-@NM_802_11_MODE_AP: 
-
-
-
-
-
-
-@NM_BT_CAPABILITY_NONE: 
-@NM_BT_CAPABILITY_DUN: 
-@NM_BT_CAPABILITY_NAP: 
-
-
-
-
-
-
-@NM_DEVICE_MODEM_CAPABILITY_NONE: 
-@NM_DEVICE_MODEM_CAPABILITY_POTS: 
-@NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO: 
-@NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: 
-@NM_DEVICE_MODEM_CAPABILITY_LTE: 
-
-
-
-
-
-
-@NM_DEVICE_STATE_UNKNOWN: 
-@NM_DEVICE_STATE_UNMANAGED: 
-@NM_DEVICE_STATE_UNAVAILABLE: 
-@NM_DEVICE_STATE_DISCONNECTED: 
-@NM_DEVICE_STATE_PREPARE: 
-@NM_DEVICE_STATE_CONFIG: 
-@NM_DEVICE_STATE_NEED_AUTH: 
-@NM_DEVICE_STATE_IP_CONFIG: 
-@NM_DEVICE_STATE_IP_CHECK: 
-@NM_DEVICE_STATE_SECONDARIES: 
-@NM_DEVICE_STATE_ACTIVATED: 
-@NM_DEVICE_STATE_DEACTIVATING: 
-@NM_DEVICE_STATE_FAILED: 
-
-
-
-
-
-
-@NM_DEVICE_STATE_REASON_NONE: 
-@NM_DEVICE_STATE_REASON_UNKNOWN: 
-@NM_DEVICE_STATE_REASON_NOW_MANAGED: 
-@NM_DEVICE_STATE_REASON_NOW_UNMANAGED: 
-@NM_DEVICE_STATE_REASON_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: 
-@NM_DEVICE_STATE_REASON_NO_SECRETS: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_PPP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_PPP_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_PPP_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_ERROR: 
-@NM_DEVICE_STATE_REASON_DHCP_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_START_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_ERROR: 
-@NM_DEVICE_STATE_REASON_AUTOIP_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_BUSY: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_APN_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: 
-@NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: 
-@NM_DEVICE_STATE_REASON_REMOVED: 
-@NM_DEVICE_STATE_REASON_SLEEPING: 
-@NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: 
-@NM_DEVICE_STATE_REASON_USER_REQUESTED: 
-@NM_DEVICE_STATE_REASON_CARRIER: 
-@NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_BT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: 
-@NM_DEVICE_STATE_REASON_INFINIBAND_MODE: 
-@NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: 
-@NM_DEVICE_STATE_REASON_BR2684_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: 
-@NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: 
-@NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: 
-@NM_DEVICE_STATE_REASON_NEW_ACTIVATION: 
-@NM_DEVICE_STATE_REASON_LAST: 
-
-
-
-
-
-
-@NM_ACTIVE_CONNECTION_STATE_UNKNOWN: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATED: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: 
-
diff --git a/docs/libnm-util/tmpl/NetworkManagerVPN.sgml b/docs/libnm-util/tmpl/NetworkManagerVPN.sgml
deleted file mode 100644
index 03b7f316..00000000
--- a/docs/libnm-util/tmpl/NetworkManagerVPN.sgml
+++ /dev/null
@@ -1,484 +0,0 @@
-
-NetworkManagerVPN
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VPN_SERVICE_STATE_UNKNOWN: 
-@NM_VPN_SERVICE_STATE_INIT: 
-@NM_VPN_SERVICE_STATE_SHUTDOWN: 
-@NM_VPN_SERVICE_STATE_STARTING: 
-@NM_VPN_SERVICE_STATE_STARTED: 
-@NM_VPN_SERVICE_STATE_STOPPING: 
-@NM_VPN_SERVICE_STATE_STOPPED: 
-
-
-
-
-
-
-@NM_VPN_CONNECTION_STATE_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_PREPARE: 
-@NM_VPN_CONNECTION_STATE_NEED_AUTH: 
-@NM_VPN_CONNECTION_STATE_CONNECT: 
-@NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: 
-@NM_VPN_CONNECTION_STATE_ACTIVATED: 
-@NM_VPN_CONNECTION_STATE_FAILED: 
-@NM_VPN_CONNECTION_STATE_DISCONNECTED: 
-
-
-
-
-
-
-@NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_REASON_NONE: 
-@NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: 
-@NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: 
-@NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: 
-
-
-
-
-
-
-@NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-util/tmpl/libnm-util-unused.sgml b/docs/libnm-util/tmpl/libnm-util-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/libnm-util/tmpl/nm-connection.sgml b/docs/libnm-util/tmpl/nm-connection.sgml
deleted file mode 100644
index 27d34bb6..00000000
--- a/docs/libnm-util/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,663 +0,0 @@
-
-NMConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CONNECTION_ERROR_UNKNOWN: 
-@NM_CONNECTION_ERROR_CONNECTION_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_CONNECTION_TYPE_INVALID: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_INVALID_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@nmconnection: the object which received the signal.
-
-
-
-
-
-
-@nmconnection: the object which received the signal.
-
-
-
-
-
-
-@nmconnection: the object which received the signal.
-@arg1: 
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@hash: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@setting: 
-
-
-
-
-
-
-
-@connection: 
-@setting_type: 
-
-
-
-
-
-
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@new_connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@parameters: 
-@modified: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@connection: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@path: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@error_quark: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-8021x.sgml b/docs/libnm-util/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index a5b6f315..00000000
--- a/docs/libnm-util/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,943 +0,0 @@
-
-NMSetting8021x
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_802_1X_ERROR_UNKNOWN: 
-@NM_SETTING_802_1X_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_802_1X_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@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
deleted file mode 100644
index aa9a1661..00000000
--- a/docs/libnm-util/tmpl/nm-setting-adsl.sgml
+++ /dev/null
@@ -1,212 +0,0 @@
-
-NMSettingAdsl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_ADSL_ERROR_UNKNOWN: 
-@NM_SETTING_ADSL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_ADSL_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml b/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index 058e98fc..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-NMSettingBluetooth
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_BLUETOOTH_ERROR_UNKNOWN: 
-@NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bond.sgml b/docs/libnm-util/tmpl/nm-setting-bond.sgml
deleted file mode 100644
index 2131ced0..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bond.sgml
+++ /dev/null
@@ -1,276 +0,0 @@
-
-NMSettingBond
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@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: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_name: 
-@out_value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml b/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
deleted file mode 100644
index ebbed6db..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge-port.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-NMSettingBridgePort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_BRIDGE_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_PORT_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-bridge.sgml b/docs/libnm-util/tmpl/nm-setting-bridge.sgml
deleted file mode 100644
index 1b14c3d8..00000000
--- a/docs/libnm-util/tmpl/nm-setting-bridge.sgml
+++ /dev/null
@@ -1,193 +0,0 @@
-
-NMSettingBridge
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_BRIDGE_ERROR_UNKNOWN: 
-@NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-cdma.sgml b/docs/libnm-util/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index fdcad0de..00000000
--- a/docs/libnm-util/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-NMSettingCdma
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_CDMA_ERROR_UNKNOWN: 
-@NM_SETTING_CDMA_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-connection.sgml b/docs/libnm-util/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index 732527f6..00000000
--- a/docs/libnm-util/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,451 +0,0 @@
-
-NMSettingConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_CONNECTION_ERROR_UNKNOWN: 
-@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: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_ptype: 
-@out_pitem: 
-@out_detail: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@uname: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-dcb.sgml b/docs/libnm-util/tmpl/nm-setting-dcb.sgml
deleted file mode 100644
index f7b8abb1..00000000
--- a/docs/libnm-util/tmpl/nm-setting-dcb.sgml
+++ /dev/null
@@ -1,395 +0,0 @@
-
-NMSettingDcb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_DCB_ERROR_UNKNOWN: 
-@NM_SETTING_DCB_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_DCB_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SETTING_DCB_FLAG_NONE: 
-@NM_SETTING_DCB_FLAG_ENABLE: 
-@NM_SETTING_DCB_FLAG_ADVERTISE: 
-@NM_SETTING_DCB_FLAG_WILLING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@enabled: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@group_id: 
-
-
-
-
-
-
-
-@setting: 
-@group_id: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@group_id: 
-@bandwidth_percent: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@bandwidth_percent: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@strict: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@traffic_class: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-generic.sgml b/docs/libnm-util/tmpl/nm-setting-generic.sgml
deleted file mode 100644
index 2c88c208..00000000
--- a/docs/libnm-util/tmpl/nm-setting-generic.sgml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-NMSettingGeneric
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_GENERIC_ERROR_UNKNOWN: 
-@NM_SETTING_GENERIC_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GENERIC_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-gsm.sgml b/docs/libnm-util/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index 6dc2d3bf..00000000
--- a/docs/libnm-util/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,283 +0,0 @@
-
-NMSettingGsm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_GSM_ERROR_UNKNOWN: 
-@NM_SETTING_GSM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_GSM_NETWORK_TYPE_ANY: 
-@NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: 
-@NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: 
-@NM_SETTING_GSM_NETWORK_TYPE_4G: 
-
-
-
-
-
-
-@NM_SETTING_GSM_BAND_UNKNOWN: 
-@NM_SETTING_GSM_BAND_ANY: 
-@NM_SETTING_GSM_BAND_EGSM: 
-@NM_SETTING_GSM_BAND_DCS: 
-@NM_SETTING_GSM_BAND_PCS: 
-@NM_SETTING_GSM_BAND_G850: 
-@NM_SETTING_GSM_BAND_U2100: 
-@NM_SETTING_GSM_BAND_U1800: 
-@NM_SETTING_GSM_BAND_U17IV: 
-@NM_SETTING_GSM_BAND_U800: 
-@NM_SETTING_GSM_BAND_U850: 
-@NM_SETTING_GSM_BAND_U900: 
-@NM_SETTING_GSM_BAND_U17IX: 
-@NM_SETTING_GSM_BAND_U1900: 
-@NM_SETTING_GSM_BAND_U2600: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml b/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
deleted file mode 100644
index 7a695cdd..00000000
--- a/docs/libnm-util/tmpl/nm-setting-infiniband.sgml
+++ /dev/null
@@ -1,145 +0,0 @@
-
-NMSettingInfiniband
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_INFINIBAND_ERROR_UNKNOWN: 
-@NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index e035c493..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,711 +0,0 @@
-
-NMSettingIP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@prefix: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@gateway: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@prefix: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@metric: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml b/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 1f089c63..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,712 +0,0 @@
-
-NMSettingIP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN: 
-@NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@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: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@prefix: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@gateway: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@source: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@prefix: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@metric: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@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
deleted file mode 100644
index c3971303..00000000
--- a/docs/libnm-util/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-NMSettingOlpcMesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_OLPC_MESH_ERROR_UNKNOWN: 
-@NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-ppp.sgml b/docs/libnm-util/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index ccf4f0d9..00000000
--- a/docs/libnm-util/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,354 +0,0 @@
-
-NMSettingPPP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_PPP_ERROR_UNKNOWN: 
-@NM_SETTING_PPP_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPP_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml b/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index f34ba1d2..00000000
--- a/docs/libnm-util/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-NMSettingPPPOE
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_PPPOE_ERROR_UNKNOWN: 
-@NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-serial.sgml b/docs/libnm-util/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index fcd7e170..00000000
--- a/docs/libnm-util/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,146 +0,0 @@
-
-NMSettingSerial
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_SERIAL_ERROR_UNKNOWN: 
-@NM_SETTING_SERIAL_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-team-port.sgml b/docs/libnm-util/tmpl/nm-setting-team-port.sgml
deleted file mode 100644
index 37ed15ee..00000000
--- a/docs/libnm-util/tmpl/nm-setting-team-port.sgml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-NMSettingTeamPort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_TEAM_PORT_ERROR_UNKNOWN: 
-@NM_SETTING_TEAM_PORT_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_TEAM_PORT_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-team.sgml b/docs/libnm-util/tmpl/nm-setting-team.sgml
deleted file mode 100644
index 161fc193..00000000
--- a/docs/libnm-util/tmpl/nm-setting-team.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-NMSettingTeam
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_TEAM_ERROR_UNKNOWN: 
-@NM_SETTING_TEAM_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_TEAM_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vlan.sgml b/docs/libnm-util/tmpl/nm-setting-vlan.sgml
deleted file mode 100644
index 79053ea5..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vlan.sgml
+++ /dev/null
@@ -1,249 +0,0 @@
-
-NMSettingVlan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_VLAN_ERROR_UNKNOWN: 
-@NM_SETTING_VLAN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_MISSING_PROPERTY: 
-@NM_SETTING_VLAN_ERROR_INVALID_PARENT: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
-
-
-
-
-
-
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@idx: 
-@out_from: 
-@out_to: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-vpn.sgml b/docs/libnm-util/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index 3d2b9a3a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,235 +0,0 @@
-
-NMSettingVPN
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_VPN_ERROR_UNKNOWN: 
-@NM_SETTING_VPN_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_VPN_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@key: 
-@value: 
-@user_data: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@item: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@secret: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wimax.sgml b/docs/libnm-util/tmpl/nm-setting-wimax.sgml
deleted file mode 100644
index ebfbd61a..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wimax.sgml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-NMSettingWimax
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIMAX_ERROR_UNKNOWN: 
-@NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wired.sgml b/docs/libnm-util/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index fe4f2d32..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,349 +0,0 @@
-
-NMSettingWired
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIRED_ERROR_UNKNOWN: 
-@NM_SETTING_WIRED_ERROR_INVALID_PROPERTY: 
-@NM_SETTING_WIRED_ERROR_MISSING_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml b/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index dea50cd7..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,476 +0,0 @@
-
-NMSettingWirelessSecurity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN: 
-@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: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@group: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@group: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@key: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting-wireless.sgml b/docs/libnm-util/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index 08c526b1..00000000
--- a/docs/libnm-util/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,402 +0,0 @@
-
-NMSettingWireless
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_WIRELESS_ERROR_UNKNOWN: 
-@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: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/tmpl/nm-setting.sgml b/docs/libnm-util/tmpl/nm-setting.sgml
deleted file mode 100644
index 61a3bdc2..00000000
--- a/docs/libnm-util/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,327 +0,0 @@
-
-NMSetting
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_ERROR_UNKNOWN: 
-@NM_SETTING_ERROR_PROPERTY_NOT_FOUND: 
-@NM_SETTING_ERROR_PROPERTY_NOT_SECRET: 
-@NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_SECRET_FLAG_NONE: 
-@NM_SETTING_SECRET_FLAG_AGENT_OWNED: 
-@NM_SETTING_SECRET_FLAG_NOT_SAVED: 
-@NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
-
-
-
-
-
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-
-
-
-
-
-@NM_SETTING_HASH_FLAG_ALL: 
-@NM_SETTING_HASH_FLAG_NO_SECRETS: 
-@NM_SETTING_HASH_FLAG_ONLY_SECRETS: 
-
-
-
-
-
-
-@setting: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@setting_type: 
-@hash: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@all_settings: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-@NM_SETTING_DIFF_RESULT_IN_A_DEFAULT: 
-@NM_SETTING_DIFF_RESULT_IN_B_DEFAULT: 
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@secret_name: 
-@flags: 
-@error: 
-@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
deleted file mode 100644
index 82025822..00000000
--- a/docs/libnm-util/tmpl/nm-utils-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-utils-enum-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm-util/tmpl/nm-utils.sgml b/docs/libnm-util/tmpl/nm-utils.sgml
deleted file mode 100644
index 2bb22046..00000000
--- a/docs/libnm-util/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,562 +0,0 @@
-
-nm-utils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid1: 
-@ssid2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid: 
-@Returns: 
-
-
-
-
-
-
-
-@hash: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@elem_destroy_fn: 
-
-
-
-
-
-
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-
-
-
-
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@wifi_caps: 
-@Returns: 
-
-
-
-
-
-
-
-@key: 
-@wep_type: 
-@Returns: 
-
-
-
-
-
-
-
-@psk: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@netmask: 
-@Returns: 
-
-
-
-
-
-
-
-@prefix: 
-@Returns: 
-
-
-
-
-
-
-
-@ip: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@list: 
-@value: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@s: 
-@Returns: 
-
-
-
-
-
-
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@data: 
-@in_password: 
-@out_password: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@filename: 
-@Returns: 
-
-
-
-
-
-
-
-@filename: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@progname: 
-@try_first: 
-@paths: 
-@file_test_flags: 
-@predicate: 
-@user_data: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@freq: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@addr: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@type: 
-@buffer: 
-@Returns: 
-
-
-
-
-
-
-
-@addr: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@buffer: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@Returns: 
-
-
-
-
-
-
-
-@bytes: 
-@len: 
-@final_len: 
-@Returns: 
-
-
-
-
-
-
-
-@hex: 
-@Returns: 
-
-
-
-
-
-
-
-@hex: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@str: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@inaddr: 
-@dst: 
-@Returns: 
-
-
-
-
-
-
-
-@in6addr: 
-@dst: 
-@Returns: 
-
-
-
-
-
-
-
-@virtual_type: 
-@other_type: 
-@Returns: 
-
-
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index 04cec2f1..54ad3287 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -142,6 +142,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -255,6 +256,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -495,6 +497,7 @@ GPATH = $(srcdir)
 TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -502,9 +505,9 @@ SETUP_FILES = \
 
 # include common portion ...
 EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
-DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = \
 	$(DOC_MODULE).args 	 \
@@ -539,11 +542,6 @@ GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V))
 GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_INTROSPECT_0 = @echo "  DOC   Introspecting gobjects";
 
-#### templates ####
-GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0 = @echo "  DOC   Rebuilding template files";
-
 #### xml ####
 GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
@@ -780,18 +778,15 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
@@ -804,7 +799,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -821,23 +816,8 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -847,17 +827,17 @@ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(
 sgml.stamp: sgml-build.stamp
 	@true
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -873,11 +853,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -902,13 +882,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -955,9 +937,7 @@ uninstall-local:
 @HAVE_GTK_DOC_FALSE@	@false
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 8391ef44..1daa7c01 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMAccessPoint
+NMAccessPoint: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -256,8 +256,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -284,7 +282,6 @@ nm_access_point_get_flags (
 
Returns

 
 the flags

-

 

 
 

@@ -311,7 +308,6 @@ nm_access_point_get_wpa_flags (
 
Returns

 
 the WPA flags

-

 
 
 

@@ -339,7 +335,6 @@ point.

 

 
Returns

 
 the RSN flags

-

 

 
 

@@ -395,7 +390,6 @@ nm_access_point_get_bssid (
Returns

 
 the BSSID of the access point. This is an internal string and must
 not be modified or freed.

-

 
 
 

@@ -422,7 +416,6 @@ nm_access_point_get_frequency (
 
Returns

 
 the frequency

-

 
 
 

@@ -449,7 +442,6 @@ nm_access_point_get_mode (
 
Returns

 
 the mode

-

 
 
 

@@ -476,7 +468,6 @@ nm_access_point_get_max_bitrate (
 
Returns

 
 the maximum bit rate (kbit/s)

-

 
 
 

@@ -503,7 +494,6 @@ nm_access_point_get_strength (
 
Returns

 
 the signal strength

-

 
 
 

@@ -592,7 +582,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this Wi-Fi AP,
 FALSE if it cannot be.

-

 
 
 
@@ -602,80 +591,60 @@ against

 
NM_ACCESS_POINT_FLAGS

 
#define NM_ACCESS_POINT_FLAGS       "flags"
 

-

-

 
 

 

 
NM_ACCESS_POINT_WPA_FLAGS

 
#define NM_ACCESS_POINT_WPA_FLAGS   "wpa-flags"
 

-

-

 

 

 

 
NM_ACCESS_POINT_RSN_FLAGS

 
#define NM_ACCESS_POINT_RSN_FLAGS   "rsn-flags"
 

-

-

 

 

 

 
NM_ACCESS_POINT_SSID

 
#define NM_ACCESS_POINT_SSID        "ssid"
 

-

-

 

 

 

 
NM_ACCESS_POINT_BSSID

 
#define NM_ACCESS_POINT_BSSID       "bssid"
 

-

-

 

 

 

 
NM_ACCESS_POINT_FREQUENCY

 
#define NM_ACCESS_POINT_FREQUENCY   "frequency"
 

-

-

 

 

 

 
NM_ACCESS_POINT_MODE

 
#define NM_ACCESS_POINT_MODE        "mode"
 

-

-

 

 

 

 
NM_ACCESS_POINT_MAX_BITRATE

 
#define NM_ACCESS_POINT_MAX_BITRATE "max-bitrate"
 

-

-

 

 

 

 
NM_ACCESS_POINT_STRENGTH

 
#define NM_ACCESS_POINT_STRENGTH    "strength"
 

-

-

 

 

 

 
NM_ACCESS_POINT_HW_ADDRESS

 
#define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 

-

-

 

 
 

@@ -683,7 +652,7 @@ against

 

 
The “bssid” property

 
  “bssid”                    gchar *

-

+
The BSSID of the access point.

 
Flags: Read

 
Default value: NULL

 

@@ -691,14 +660,14 @@ against

 

 
The “flags” property

 
  “flags”                    NM80211ApFlags

-

+
The flags of the access point.

 
Flags: Read

 

 

 

 
The “frequency” property

 
  “frequency”                guint

-

+
The frequency of the access point.

 
Flags: Read

 
Allowed values: <= 10000

 
Default value: 0

@@ -707,7 +676,7 @@ against

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
Alias for “bssid”.

 

 
NMAccessPoint:hw-address has been deprecated since version 1.0 and should not be used in newly-written code.

 
use “bssid”.

@@ -719,7 +688,7 @@ against

 

 
The “max-bitrate” property

 
  “max-bitrate”              guint

-

+
The maximum bit rate of the access point in kbit/s.

 
Flags: Read

 
Default value: 0

 

@@ -727,7 +696,9 @@ against

 

 
The “mode” property

 
  “mode”                     NM80211Mode

-

+
The mode of the access point; either "infrastructure" (a central
+coordinator of the wireless network allowing clients to connect) or
+"ad-hoc" (a network with no central controller).

 
Flags: Read

 
Default value: NM_802_11_MODE_INFRA

 

@@ -735,21 +706,21 @@ against

 

 
The “rsn-flags” property

 
  “rsn-flags”                NM80211ApSecurityFlags

-

+
The RSN flags of the access point.

 
Flags: Read

 

 

 

 
The “ssid” property

 
  “ssid”                     GBytes *

-

+
The SSID of the access point, or NULL if it is not known.

 
Flags: Read

 

 

 

 
The “strength” property

 
  “strength”                 guchar

-

+
The current signal strength of the access point.

 
Flags: Read

 
Default value: 0

 

@@ -757,13 +728,12 @@ against

 

 
The “wpa-flags” property

 
  “wpa-flags”                NM80211ApSecurityFlags

-

+
The WPA flags of the access point.

 
Flags: Read

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index bbe1a3fe..a059c180 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMActiveConnection
+NMActiveConnection: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -338,8 +338,6 @@
 

 

 
Description

-

-

 

 

 
Functions

@@ -396,7 +394,6 @@ nm_active_connection_get_id (
Returns

 
 the ID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

-

 

 
 

@@ -424,7 +421,6 @@ nm_active_connection_get_uuid (
Returns

 
 the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

-

 
 
 

@@ -453,7 +449,6 @@ nm_active_connection_get_connection_type
 
Returns

 
 the type of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

-

 
 
 

@@ -488,7 +483,6 @@ resolve it with 
Returns

 
 the specific object's D-Bus path. This is the internal string used
 by the connection, and must not be modified.

-

 
 
 

@@ -543,7 +537,6 @@ nm_active_connection_get_state (
 
Returns

 
 the state

-

 
 
 

@@ -598,7 +591,6 @@ the default IPv4 route and DNS information).

 

 
Returns

 
 TRUE if the active connection is the default IPv4 connection

-

 

 
 

@@ -684,7 +676,6 @@ the default IPv6 route and DNS information).

 

 
Returns

 
 TRUE if the active connection is the default IPv6 connection

-

 

 
 

@@ -769,7 +760,6 @@ nm_active_connection_get_vpn (
 
Returns

 
 TRUE if the active connection is a VPN connection

-

 
 
 
@@ -779,120 +769,90 @@ nm_active_connection_get_vpn (
NM_ACTIVE_CONNECTION_CONNECTION

 
#define NM_ACTIVE_CONNECTION_CONNECTION           "connection"
 

-

-

 
 

 

 
NM_ACTIVE_CONNECTION_ID

 
#define NM_ACTIVE_CONNECTION_ID                   "id"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_UUID

 
#define NM_ACTIVE_CONNECTION_UUID                 "uuid"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_TYPE

 
#define NM_ACTIVE_CONNECTION_TYPE                 "type"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH

 
#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH "specific-object-path"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DEVICES

 
#define NM_ACTIVE_CONNECTION_DEVICES              "devices"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_STATE

 
#define NM_ACTIVE_CONNECTION_STATE                "state"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DEFAULT

 
#define NM_ACTIVE_CONNECTION_DEFAULT              "default"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_IP4_CONFIG

 
#define NM_ACTIVE_CONNECTION_IP4_CONFIG           "ip4-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DHCP4_CONFIG

 
#define NM_ACTIVE_CONNECTION_DHCP4_CONFIG         "dhcp4-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DEFAULT6

 
#define NM_ACTIVE_CONNECTION_DEFAULT6             "default6"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_IP6_CONFIG

 
#define NM_ACTIVE_CONNECTION_IP6_CONFIG           "ip6-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_DHCP6_CONFIG

 
#define NM_ACTIVE_CONNECTION_DHCP6_CONFIG         "dhcp6-config"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_VPN

 
#define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 

-

-

 

 

 

 
NM_ACTIVE_CONNECTION_MASTER

 
#define NM_ACTIVE_CONNECTION_MASTER               "master"
 

-

-

 

 
 

@@ -900,14 +860,14 @@ nm_active_connection_get_vpn (
 
The “connection” property

 
  “connection”               NMRemoteConnection *

-

+
The connection that this is an active instance of.

 
Flags: Read

 

 

 

 
The “default” property

 
  “default”                  gboolean

-

+
Whether the active connection is the default IPv4 one.

 
Flags: Read

 
Default value: FALSE

 

@@ -915,7 +875,7 @@ nm_active_connection_get_vpn (
 
The “default6” property

 
  “default6”                 gboolean

-

+
Whether the active connection is the default IPv6 one.

 
Flags: Read

 
Default value: FALSE

 
@@ -923,28 +883,29 @@ nm_active_connection_get_vpn (
 
The “devices” property

 
  “devices”                  GPtrArray *

-

+
The devices of the active connection.

+
Element-type: NMDevice

 
Flags: Read

 
 

 

 
The “dhcp4-config” property

 
  “dhcp4-config”             NMDhcpConfig *

-

+
The IPv4 NMDhcpConfig of the connection.

 
Flags: Read

 

 

 

 
The “dhcp6-config” property

 
  “dhcp6-config”             NMDhcpConfig *

-

+
The IPv6 NMDhcpConfig of the connection.

 
Flags: Read

 

 

 

 
The “id” property

 
  “id”                       gchar *

-

+
The active connection's ID

 
Flags: Read

 
Default value: NULL

 

@@ -952,28 +913,29 @@ nm_active_connection_get_vpn (
 
The “ip4-config” property

 
  “ip4-config”               NMIPConfig *

-

+
The IPv4 NMIPConfig of the connection.

 
Flags: Read

 
 

 

 
The “ip6-config” property

 
  “ip6-config”               NMIPConfig *

-

+
The IPv6 NMIPConfig of the connection.

 
Flags: Read

 

 

 

 
The “master” property

 
  “master”                   NMDevice *

-

+
The master device if one exists.

 
Flags: Read

 

 

 

 
The “specific-object-path” property

 
  “specific-object-path”     gchar *

-

+
The path to the "specific object" of the active connection; see
+nm_active_connection_get_specific_object_path() for more details.

 
Flags: Read

 
Default value: NULL

 

@@ -981,7 +943,7 @@ nm_active_connection_get_vpn (
 
The “state” property

 
  “state”                    NMActiveConnectionState

-

+
The state of the active connection.

 
Flags: Read

 
Default value: NM_ACTIVE_CONNECTION_STATE_UNKNOWN

 
@@ -989,7 +951,7 @@ nm_active_connection_get_vpn (
 
The “type” property

 
  “type”                     gchar *

-

+
The active connection's type

 
Flags: Read

 
Default value: NULL

 
@@ -997,7 +959,7 @@ nm_active_connection_get_vpn (
 
The “uuid” property

 
  “uuid”                     gchar *

-

+
The active connection's UUID

 
Flags: Read

 
Default value: NULL

 
@@ -1005,14 +967,13 @@ nm_active_connection_get_vpn (
 
The “vpn” property

 
  “vpn”                      gboolean

-

+
Whether the active connection is a VPN connection.

 
Flags: Read

 
Default value: FALSE

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index b038c231..950d7251 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMClient
+NMClient: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -759,8 +759,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -772,7 +770,6 @@ nm_client_error_quark (void
 
Returns

 
 the error quark used for NMClient errors.

-

 

 
 

@@ -810,7 +807,6 @@ that.

 

 
Returns

 
 a new NMClient or NULL on an error

-

 

 
 

@@ -886,7 +882,6 @@ nm_client_new_finish (GAsyncResul
 

 
Returns

 
 a new NMClient, or NULL on error

-

 

 
 

@@ -913,7 +908,6 @@ nm_client_get_version (
 
Returns

 
 string with the version (or NULL if NetworkManager is not running)

-

 
 
 

@@ -940,7 +934,6 @@ nm_client_get_state (
 
Returns

 
 the current NMState

-

 
 
 

@@ -968,7 +961,6 @@ connections at startup.

 

 
Returns

 
 whether the daemon is still starting up

-

 

 
 

@@ -995,7 +987,6 @@ nm_client_get_nm_running (
 
Returns

 
 TRUE if the daemon is running

-

 
 
 

@@ -1022,7 +1013,6 @@ nm_client_networking_get_enabled (
 
Returns

 
 TRUE if networking is enabled, FALSE if networking is disabled

-

 
 
 

@@ -1065,7 +1055,6 @@ all controlled interfaces are available for activation.

 

 
Returns

 
 TRUE on success, FALSE otherwise

-

 

 
 

@@ -1092,7 +1081,6 @@ nm_client_wireless_get_enabled (
 
Returns

 
 TRUE if wireless is enabled

-

 
 
 

@@ -1150,7 +1138,6 @@ nm_client_wireless_hardware_get_enabled
 

 
Returns

 
 TRUE if the wireless hardware is enabled

-

 

 
 

@@ -1177,7 +1164,6 @@ nm_client_wwan_get_enabled (
 
Returns

 
 TRUE if WWAN is enabled

-

 
 
 

@@ -1234,7 +1220,6 @@ nm_client_wwan_hardware_get_enabled (
 
Returns

 
 TRUE if the WWAN hardware is enabled

-

 
 
 

@@ -1261,7 +1246,6 @@ nm_client_wimax_get_enabled (
 
Returns

 
 TRUE if WiMAX is enabled

-

 
 
 

@@ -1318,7 +1302,6 @@ nm_client_wimax_hardware_get_enabled (
 
Returns

 
 TRUE if the WiMAX hardware is enabled

-

 
 
 

@@ -1366,7 +1349,6 @@ a list of domains separated by ",". 

 

 
Returns

 
 TRUE on success, FALSE otherwise

-

 

 
 

@@ -1414,7 +1396,6 @@ domains separated by ",". (NULL or an empty string
 

 
Returns

 
 TRUE on success, FALSE otherwise

-

 

 
 

@@ -1450,7 +1431,6 @@ client can or cannot perform the action the permission represents

 

 
Returns

 
 the permission's result, one of NMClientPermissionResult

-

 

 
 

@@ -1480,7 +1460,6 @@ connectivity state first before returning any information.

 

 
Returns

 
 the current connectivity state

-

 

 
 

@@ -1525,7 +1504,6 @@ if you do not want to block.

 

 
Returns

 
 the (new) current connectivity state

-

 

 
 

@@ -1614,7 +1592,6 @@ call.

 

 
Returns

 
 the (new) current connectivity state

-

 

 
 

@@ -1663,7 +1640,6 @@ clear any existing persistent hostname. 

 

 
Returns

 
 TRUE if the request was successful, FALSE if it failed

-

 

 
 

@@ -1755,7 +1731,6 @@ nm_client_save_hostname_finish (
 
Returns

 
 TRUE if the request was successful, FALSE if it failed

-

 
 
 

@@ -2256,7 +2231,6 @@ nm_client_deactivate_connection (
 
Returns

 
 success or failure

-

 
 
 

@@ -2347,7 +2321,6 @@ nm_client_deactivate_connection_finish
 

 
Returns

 
 success or failure

-

 

 
 

@@ -2668,7 +2641,6 @@ filenames that failed to load. 

 
 TRUE if NetworkManager at least tried to load filenames
 ,
 FALSE if an error occurred (eg, permission denied).

-

 
 
 

@@ -2770,7 +2742,6 @@ filenames that failed to load. 

 
 TRUE if NetworkManager at least tried to load filenames
 ,
 FALSE if an error occurred (eg, permission denied).

-

 
 
 

@@ -2813,7 +2784,6 @@ the in-memory state matches the on-disk state.

 

 
Returns

 
 TRUE on success, FALSE on failure

-

 

 
 

@@ -2899,7 +2869,6 @@ nm_client_reload_connections_finish (
 
Returns

 
 TRUE on success, FALSE on failure

-

 
 
 
@@ -2909,192 +2878,144 @@ nm_client_reload_connections_finish (
NM_CLIENT_VERSION

 
#define NM_CLIENT_VERSION "version"
 

-

-

 
 

 

 
NM_CLIENT_STATE

 
#define NM_CLIENT_STATE "state"
 

-

-

 

 

 

 
NM_CLIENT_STARTUP

 
#define NM_CLIENT_STARTUP "startup"
 

-

-

 

 

 

 
NM_CLIENT_NM_RUNNING

 
#define NM_CLIENT_NM_RUNNING "nm-running"
 

-

-

 

 

 

 
NM_CLIENT_NETWORKING_ENABLED

 
#define NM_CLIENT_NETWORKING_ENABLED "networking-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIRELESS_ENABLED

 
#define NM_CLIENT_WIRELESS_ENABLED "wireless-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIRELESS_HARDWARE_ENABLED

 
#define NM_CLIENT_WIRELESS_HARDWARE_ENABLED "wireless-hardware-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WWAN_ENABLED

 
#define NM_CLIENT_WWAN_ENABLED "wwan-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WWAN_HARDWARE_ENABLED

 
#define NM_CLIENT_WWAN_HARDWARE_ENABLED "wwan-hardware-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIMAX_ENABLED

 
#define NM_CLIENT_WIMAX_ENABLED "wimax-enabled"
 

-

-

 

 

 

 
NM_CLIENT_WIMAX_HARDWARE_ENABLED

 
#define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled"
 

-

-

 

 

 

 
NM_CLIENT_ACTIVE_CONNECTIONS

 
#define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections"
 

-

-

 

 

 

 
NM_CLIENT_CONNECTIVITY

 
#define NM_CLIENT_CONNECTIVITY "connectivity"
 

-

-

 

 

 

 
NM_CLIENT_PRIMARY_CONNECTION

 
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
 

-

-

 

 

 

 
NM_CLIENT_ACTIVATING_CONNECTION

 
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
 

-

-

 

 

 

 
NM_CLIENT_DEVICES

 
#define NM_CLIENT_DEVICES "devices"
 

-

-

 

 

 

 
NM_CLIENT_CONNECTIONS

 
#define NM_CLIENT_CONNECTIONS "connections"
 

-

-

 

 

 

 
NM_CLIENT_HOSTNAME

 
#define NM_CLIENT_HOSTNAME "hostname"
 

-

-

 

 

 

 
NM_CLIENT_CAN_MODIFY

 
#define NM_CLIENT_CAN_MODIFY "can-modify"
 

-

-

 

 

 

 
NM_CLIENT_DEVICE_ADDED

 
#define NM_CLIENT_DEVICE_ADDED "device-added"
 

-

-

 

 

 

 
NM_CLIENT_DEVICE_REMOVED

 
#define NM_CLIENT_DEVICE_REMOVED "device-removed"
 

-

-

 

 

 

 
NM_CLIENT_PERMISSION_CHANGED

 
#define NM_CLIENT_PERMISSION_CHANGED "permission-changed"
 

-

-

 

 

 

 
NM_CLIENT_CONNECTION_ADDED

 
#define NM_CLIENT_CONNECTION_ADDED "connection-added"
 

-

-

 

 

 

 
NM_CLIENT_CONNECTION_REMOVED

 
#define NM_CLIENT_CONNECTION_REMOVED "connection-removed"
 

-

-

 

 

 

@@ -3313,8 +3234,6 @@ the user requires to obtain a given 
NM_CLIENT_ERROR

 
#define NM_CLIENT_ERROR nm_client_error_quark ()
 

-

-

 

 
 

@@ -3322,21 +3241,23 @@ the user requires to obtain a given 
 
The “activating-connection” property

 
  “activating-connection”    NMActiveConnection *

-

+
The NMActiveConnection of the activating connection that is
+likely to become the new “primary-connection”.

 
Flags: Read

 

 

 

 
The “active-connections” property

 
  “active-connections”       GPtrArray *

-

+
The active connections.

+
Element-type: NMActiveConnection

 
Flags: Read

 

 

 

 
The “can-modify” property

 
  “can-modify”               gboolean

-

+
If TRUE, adding and modifying connections is supported.

 
Flags: Read

 
Default value: FALSE

 

@@ -3344,14 +3265,18 @@ the user requires to obtain a given 
 
The “connections” property

 
  “connections”              GPtrArray *

-

+
The list of configured connections that are available to the user. (Note
+that this differs from the underlying D-Bus property, which may also
+contain the object paths of connections that the user does not have
+permission to read the details of.)

+
Element-type: NMRemoteConnection

 
Flags: Read

 
 

 

 
The “connectivity” property

 
  “connectivity”             NMConnectivityState

-

+
The network connectivity state.

 
Flags: Read

 
Default value: NM_CONNECTIVITY_UNKNOWN

 

@@ -3359,14 +3284,16 @@ the user requires to obtain a given 
 
The “devices” property

 
  “devices”                  GPtrArray *

-

+
List of known network devices.

+
Element-type: NMDevice

 
Flags: Read

 
 

 

 
The “hostname” property

 
  “hostname”                 gchar *

-

+
The machine hostname stored in persistent configuration. This can be
+modified by calling nm_client_save_hostname().

 
Flags: Read

 
Default value: NULL

 

@@ -3374,7 +3301,7 @@ the user requires to obtain a given 
 
The “networking-enabled” property

 
  “networking-enabled”       gboolean

-

+
Whether networking is enabled.

 
Flags: Read / Write

 
Default value: TRUE

 
@@ -3382,7 +3309,7 @@ the user requires to obtain a given 
 
The “nm-running” property

 
  “nm-running”               gboolean

-

+
Whether the daemon is running.

 
Flags: Read

 
Default value: FALSE

 
@@ -3390,14 +3317,15 @@ the user requires to obtain a given 
 
The “primary-connection” property

 
  “primary-connection”       NMActiveConnection *

-

+
The NMActiveConnection of the device with the default route;
+see nm_client_get_primary_connection() for more details.

 
Flags: Read

 
 

 

 
The “startup” property

 
  “startup”                  gboolean

-

+
Whether the daemon is still starting up.

 
Flags: Read

 
Default value: FALSE

 

@@ -3405,7 +3333,7 @@ the user requires to obtain a given 
 
The “state” property

 
  “state”                    NMState

-

+
The current daemon state.

 
Flags: Read

 
Default value: NM_STATE_UNKNOWN

 
@@ -3413,7 +3341,7 @@ the user requires to obtain a given 
 
The “version” property

 
  “version”                  gchar *

-

+
The NetworkManager version.

 
Flags: Read

 
Default value: NULL

 
@@ -3421,7 +3349,7 @@ the user requires to obtain a given 
 
The “wimax-enabled” property

 
  “wimax-enabled”            gboolean

-

+
Whether WiMAX functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -3429,7 +3357,7 @@ the user requires to obtain a given 
 
The “wimax-hardware-enabled” property

 
  “wimax-hardware-enabled”   gboolean

-

+
Whether the WiMAX hardware is enabled.

 
Flags: Read

 
Default value: FALSE

 
@@ -3437,7 +3365,7 @@ the user requires to obtain a given 
 
The “wireless-enabled” property

 
  “wireless-enabled”         gboolean

-

+
Whether wireless is enabled.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -3445,7 +3373,7 @@ the user requires to obtain a given 
 
The “wireless-hardware-enabled” property

 
  “wireless-hardware-enabled” gboolean

-

+
Whether the wireless hardware is enabled.

 
Flags: Read

 
Default value: TRUE

 
@@ -3453,7 +3381,7 @@ the user requires to obtain a given 
 
The “wwan-enabled” property

 
  “wwan-enabled”             gboolean

-

+
Whether WWAN functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -3461,7 +3389,7 @@ the user requires to obtain a given 
 
The “wwan-hardware-enabled” property

 
  “wwan-hardware-enabled”    gboolean

-

+
Whether the WWAN hardware is enabled.

 
Flags: Read

 
Default value: FALSE

 
@@ -3474,6 +3402,34 @@ the user requires to obtain a given NMClient           *client,
                NMRemoteConnection *connection,
                gpointer            user_data)
+
Notifies that a NMConnection has been added.

+

+
Parameters

+

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





client
the settings object that received the signal
 
connection
the new connection
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -3483,6 +3439,34 @@ user_function (NMClient           *client,
                NMRemoteConnection *connection,
                gpointer            user_data)
+
Notifies that a NMConnection has been removed.

+

+
Parameters

+

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





client
the settings object that received the signal
 
connection
the removed connection
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -3492,6 +3476,34 @@ user_function (NMClient *client,
                GObject  *device,
                gpointer  user_data)
+
Notifies that a NMDevice is added.

+

+
Parameters

+

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





client
the client that received the signal
 
device
 the new device. 
[type NMDevice]
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -3501,6 +3513,34 @@ user_function (NMClient *client,
                GObject  *device,
                gpointer  user_data)
+
Notifies that a NMDevice is removed.

+

+
Parameters

+

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





client
the client that received the signal
 
device
 the removed device. 
[type NMDevice]
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -3511,12 +3551,44 @@ user_function (guint     permission,
                guint     result,
                gpointer  user_data)
+
Notifies that a permission has changed

+

+
Parameters

+

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





client
the client that received the signal
 
permission
a permission from NMClientPermission
 
result
the permission's result, one of NMClientPermissionResult
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 13cae2db..8065247c 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDevice
+NMDevice: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -626,8 +626,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -655,7 +653,6 @@ nm_device_get_iface (
Returns

 
 the interface of the device. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -684,7 +681,6 @@ when the device is in the ACTIVATED state.

 
Returns

 
 the IP traffic interface of the device. This is the internal string
 used by the device, and must not be modified.

-

 
 
 

@@ -711,7 +707,6 @@ nm_device_get_device_type (
 
Returns

 
 the device type

-

 
 
 

@@ -740,7 +735,6 @@ nm_device_get_udi (
Returns

 
 the driver of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -796,7 +789,6 @@ nm_device_get_driver_version (
Returns

 
 the version of the device driver. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -824,7 +816,6 @@ nm_device_get_firmware_version (
Returns

 
 the firmware version of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -854,7 +845,6 @@ nm_device_get_type_description (
Returns

 
 the type description of the device. This is the internal
 string used by the device, and must not be modified.

-

 
 
 

@@ -883,7 +873,6 @@ nm_device_get_hw_address (
Returns

 
 the current MAC of the device, or NULL.
 This is the internal string used by the device, and must not be modified.

-

 
 
 

@@ -910,7 +899,6 @@ nm_device_get_capabilities (
 
Returns

 
 the capabilities

-

 
 
 

@@ -937,7 +925,6 @@ nm_device_get_managed (
 
Returns

 
 TRUE if the device is managed by NetworkManager

-

 
 
 

@@ -964,7 +951,6 @@ nm_device_get_autoconnect (
 
Returns

 
 TRUE if the device is allowed to be autoconnected

-

 
 
 

@@ -1023,7 +1009,6 @@ to be missing.

 
Returns

 
 TRUE if firmware required for the device's operation is likely
 to be missing.

-

 
 
 

@@ -1169,7 +1154,6 @@ nm_device_get_state (
 
Returns

 
 the current device state

-

 
 
 

@@ -1196,7 +1180,6 @@ nm_device_get_state_reason (
 
Returns

 
 the reason for entering the current device state

-

 
 
 

@@ -1287,7 +1270,6 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)

 
 the physical port ID of the device, or NULL if the port
 ID is unknown. This is the internal string used by the device and
 must not be modified.

-

 
 
 

@@ -1314,7 +1296,6 @@ nm_device_get_mtu (
 
Returns

 
 the MTU of the device.

-

 
 
 

@@ -1342,7 +1323,6 @@ nm_device_is_software (
Returns

 
 TRUE if device
 is a software device, FALSE if it is a hardware device.

-

 
 
 

@@ -1370,7 +1350,6 @@ nm_device_get_product (
Returns

 
 the product name of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -1398,7 +1377,6 @@ nm_device_get_vendor (
Returns

 
 the vendor name of the device. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -1428,7 +1406,6 @@ nm_device_get_description (device
 . If either the vendor or the
 product name is unknown, this returns the interface name.

-

 
 
 

@@ -1510,7 +1487,6 @@ request.

 
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -1597,7 +1573,6 @@ nm_device_disconnect_finish (
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -1639,7 +1614,6 @@ nm_device_delete (
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -1725,7 +1699,6 @@ nm_device_delete_finish (
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -1817,7 +1790,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.

-

 
 
 

@@ -1871,7 +1843,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this device, FALSE
 if is incompatible with the device's capabilities and characteristics.

-

 
 
 

@@ -1901,7 +1872,6 @@ that can be used on device
 
Returns

 
 device
 's associated NMSetting type

-

 
 
 
@@ -1911,184 +1881,138 @@ that can be used on device
 
NM_DEVICE_DEVICE_TYPE

 
#define NM_DEVICE_DEVICE_TYPE "device-type"
 

-

-

 
 

 

 
NM_DEVICE_UDI

 
#define NM_DEVICE_UDI "udi"
 

-

-

 

 

 

 
NM_DEVICE_INTERFACE

 
#define NM_DEVICE_INTERFACE "interface"
 

-

-

 

 

 

 
NM_DEVICE_IP_INTERFACE

 
#define NM_DEVICE_IP_INTERFACE "ip-interface"
 

-

-

 

 

 

 
NM_DEVICE_DRIVER

 
#define NM_DEVICE_DRIVER "driver"
 

-

-

 

 

 

 
NM_DEVICE_DRIVER_VERSION

 
#define NM_DEVICE_DRIVER_VERSION "driver-version"
 

-

-

 

 

 

 
NM_DEVICE_FIRMWARE_VERSION

 
#define NM_DEVICE_FIRMWARE_VERSION "firmware-version"
 

-

-

 

 

 

 
NM_DEVICE_CAPABILITIES

 
#define NM_DEVICE_CAPABILITIES "capabilities"
 

-

-

 

 

 

 
NM_DEVICE_MANAGED

 
#define NM_DEVICE_MANAGED "managed"
 

-

-

 

 

 

 
NM_DEVICE_AUTOCONNECT

 
#define NM_DEVICE_AUTOCONNECT "autoconnect"
 

-

-

 

 

 

 
NM_DEVICE_FIRMWARE_MISSING

 
#define NM_DEVICE_FIRMWARE_MISSING "firmware-missing"
 

-

-

 

 

 

 
NM_DEVICE_IP4_CONFIG

 
#define NM_DEVICE_IP4_CONFIG "ip4-config"
 

-

-

 

 

 

 
NM_DEVICE_DHCP4_CONFIG

 
#define NM_DEVICE_DHCP4_CONFIG "dhcp4-config"
 

-

-

 

 

 

 
NM_DEVICE_IP6_CONFIG

 
#define NM_DEVICE_IP6_CONFIG "ip6-config"
 

-

-

 

 

 

 
NM_DEVICE_DHCP6_CONFIG

 
#define NM_DEVICE_DHCP6_CONFIG "dhcp6-config"
 

-

-

 

 

 

 
NM_DEVICE_STATE

 
#define NM_DEVICE_STATE "state"
 

-

-

 

 

 

 
NM_DEVICE_STATE_REASON

 
#define NM_DEVICE_STATE_REASON "state-reason"
 

-

-

 

 

 

 
NM_DEVICE_ACTIVE_CONNECTION

 
#define NM_DEVICE_ACTIVE_CONNECTION "active-connection"
 

-

-

 

 

 

 
NM_DEVICE_AVAILABLE_CONNECTIONS

 
#define NM_DEVICE_AVAILABLE_CONNECTIONS "available-connections"
 

-

-

 

 

 

 
NM_DEVICE_VENDOR

 
#define NM_DEVICE_VENDOR "vendor"
 

-

-

 

 

 

 
NM_DEVICE_PRODUCT

 
#define NM_DEVICE_PRODUCT "product"
 

-

-

 

 

 

 
NM_DEVICE_PHYSICAL_PORT_ID

 
#define NM_DEVICE_PHYSICAL_PORT_ID "physical-port-id"
 

-

-

 

 

 

 
NM_DEVICE_MTU

 
#define NM_DEVICE_MTU "mtu"
 

-

-

 

 
 

@@ -2096,14 +2020,14 @@ that can be used on device
 

 
The “active-connection” property

 
  “active-connection”        NMActiveConnection *

-

+
The NMActiveConnection object that "owns" this device during activation.

 
Flags: Read

 

 

 

 
The “autoconnect” property

 
  “autoconnect”              gboolean

-

+
Whether the device can auto-activate a connection.

 
Flags: Read / Write

 
Default value: TRUE

 

@@ -2111,21 +2035,22 @@ that can be used on device
 

 
The “available-connections” property

 
  “available-connections”    GPtrArray *

-

+
The available connections of the device

+
Element-type: NMRemoteConnection

 
Flags: Read

 

 

 

 
The “capabilities” property

 
  “capabilities”             NMDeviceCapabilities

-

+
The capabilities of the device.

 
Flags: Read

 

 

 

 
The “device-type” property

 
  “device-type”              NMDeviceType

-

+
The numeric type of the device.

 
Flags: Read

 
Default value: NM_DEVICE_TYPE_UNKNOWN

 

@@ -2133,21 +2058,21 @@ that can be used on device
 

 
The “dhcp4-config” property

 
  “dhcp4-config”             NMDhcpConfig *

-

+
The IPv4 NMDhcpConfig of the device.

 
Flags: Read

 

 

 

 
The “dhcp6-config” property

 
  “dhcp6-config”             NMDhcpConfig *

-

+
The IPv6 NMDhcpConfig of the device.

 
Flags: Read

 

 

 

 
The “driver” property

 
  “driver”                   gchar *

-

+
The driver of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2155,7 +2080,7 @@ that can be used on device
 

 
The “driver-version” property

 
  “driver-version”           gchar *

-

+
The version of the device driver.

 
Flags: Read

 
Default value: NULL

 

@@ -2163,7 +2088,8 @@ that can be used on device
 

 
The “firmware-missing” property

 
  “firmware-missing”         gboolean

-

+
When TRUE indicates the device is likely missing firmware required
+for its operation.

 
Flags: Read

 
Default value: FALSE

 

@@ -2171,7 +2097,7 @@ that can be used on device
 

 
The “firmware-version” property

 
  “firmware-version”         gchar *

-

+
The firmware version of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2179,7 +2105,7 @@ that can be used on device
 

 
The “interface” property

 
  “interface”                gchar *

-

+
The interface of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2187,7 +2113,8 @@ that can be used on device
 

 
The “ip-interface” property

 
  “ip-interface”             gchar *

-

+
The IP interface of the device which should be used for all IP-related
+operations like addressing and routing.

 
Flags: Read

 
Default value: NULL

 

@@ -2195,21 +2122,21 @@ that can be used on device
 

 
The “ip4-config” property

 
  “ip4-config”               NMIPConfig *

-

+
The NMIP4Config of the device.

 
Flags: Read

 

 

 

 
The “ip6-config” property

 
  “ip6-config”               NMIPConfig *

-

+
The IPv6 NMIPConfig of the device.

 
Flags: Read

 

 

 

 
The “managed” property

 
  “managed”                  gboolean

-

+
Whether the device is managed by NetworkManager.

 
Flags: Read

 
Default value: FALSE

 

@@ -2217,7 +2144,7 @@ that can be used on device
 

 
The “mtu” property

 
  “mtu”                      guint

-

+
The MTU of the device.

 
Flags: Read

 
Default value: 1500

 

@@ -2225,7 +2152,8 @@ that can be used on device
 

 
The “physical-port-id” property

 
  “physical-port-id”         gchar *

-

+
The physical port ID of the device. (See
+nm_device_get_physical_port_id().)

 
Flags: Read

 
Default value: NULL

 

@@ -2233,7 +2161,7 @@ that can be used on device
 

 
The “product” property

 
  “product”                  gchar *

-

+
The product string of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2241,7 +2169,7 @@ that can be used on device
 

 
The “state” property

 
  “state”                    NMDeviceState

-

+
The state of the device.

 
Flags: Read

 
Default value: NM_DEVICE_STATE_UNKNOWN

 

@@ -2249,7 +2177,7 @@ that can be used on device
 

 
The “state-reason” property

 
  “state-reason”             guint

-

+
The reason for the device state.

 
Flags: Read

 
Default value: 0

 

@@ -2257,7 +2185,12 @@ that can be used on device
 

 
The “udi” property

 
  “udi”                      gchar *

-

+
An operating-system specific device hardware identifier; this is not
+unique to a specific hardware device across reboots or hotplugs.  It
+is an opaque string which for some device types (Bluetooth, Modem)
+contains an identifier provided by the underlying hardware service daemon
+such as Bluez or ModemManager, and clients can use this property to
+request more information about the device from those services.

 
Flags: Read

 
Default value: NULL

 

@@ -2265,7 +2198,7 @@ that can be used on device
 

 
The “vendor” property

 
  “vendor”                   gchar *

-

+
The vendor string of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -2280,12 +2213,49 @@ user_function (guint     old_state,
                guint     reason,
                gpointer  user_data)
+
Notifies the state change of a NMDevice.

+

+
Parameters

+

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





device
the device object that received the signal
 
new_state
the new state of the device
 
old_state
the previous state of the device
 
reason
the reason describing the state change
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index 168d4ad8..7c9c5612 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceAdsl
+NMDeviceAdsl: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -88,8 +88,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -116,7 +114,6 @@ nm_device_adsl_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 

 
 
@@ -126,8 +123,6 @@ nm_device_adsl_get_carrier (
NM_DEVICE_ADSL_CARRIER

 
#define NM_DEVICE_ADSL_CARRIER "carrier"
 

-

-

 
 
 

@@ -135,14 +130,13 @@ nm_device_adsl_get_carrier (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index 03023581..b99d8ba3 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceBond
+NMDeviceBond: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -128,8 +128,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -157,7 +155,6 @@ nm_device_bond_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -184,7 +181,6 @@ nm_device_bond_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 

@@ -225,24 +221,18 @@ copy used by the device, and must not be modified. 

 
NM_DEVICE_BOND_HW_ADDRESS

 
#define NM_DEVICE_BOND_HW_ADDRESS  "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_BOND_CARRIER

 
#define NM_DEVICE_BOND_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_BOND_SLAVES

 
#define NM_DEVICE_BOND_SLAVES      "slaves"
 

-

-

 

 
 

@@ -250,7 +240,7 @@ copy used by the device, and must not be modified. 

 

 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -258,7 +248,7 @@ copy used by the device, and must not be modified. 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -266,13 +256,13 @@ copy used by the device, and must not be modified. 

 

 
The “slaves” property

 
  “slaves”                   GPtrArray *

-

+
The devices slaved to the bond device.

+
Element-type: NMDevice

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 6fd332de..dee83c75 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceBridge
+NMDeviceBridge: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -128,8 +128,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -157,7 +155,6 @@ nm_device_bridge_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -184,7 +181,6 @@ nm_device_bridge_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 

@@ -225,24 +221,18 @@ copy used by the device, and must not be modified. 

 
NM_DEVICE_BRIDGE_HW_ADDRESS

 
#define NM_DEVICE_BRIDGE_HW_ADDRESS  "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_BRIDGE_CARRIER

 
#define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_BRIDGE_SLAVES

 
#define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 

-

-

 

 
 

@@ -250,7 +240,7 @@ copy used by the device, and must not be modified. 

 

 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -258,7 +248,7 @@ copy used by the device, and must not be modified. 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -266,13 +256,13 @@ copy used by the device, and must not be modified. 

 

 
The “slaves” property

 
  “slaves”                   GPtrArray *

-

+
The devices slaved to the bridge device.

+
Element-type: NMDevice

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index 8aad8df8..b8cb2689 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceBt
+NMDeviceBt: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -128,8 +128,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -157,7 +155,6 @@ nm_device_bt_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -184,7 +181,6 @@ nm_device_bt_get_name (
 
Returns

 
 the name of the device

-

 
 
 

@@ -211,7 +207,6 @@ nm_device_bt_get_capabilities (
 
Returns

 
 a combination of NMBluetoothCapabilities

-

 
 
 
@@ -221,24 +216,18 @@ nm_device_bt_get_capabilities (
NM_DEVICE_BT_HW_ADDRESS

 
#define NM_DEVICE_BT_HW_ADDRESS   "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_BT_NAME

 
#define NM_DEVICE_BT_NAME         "name"
 

-

-

 

 

 

 
NM_DEVICE_BT_CAPABILITIES

 
#define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 

-

-

 

 
 

@@ -246,14 +235,14 @@ nm_device_bt_get_capabilities (
 
The “bt-capabilities” property

 
  “bt-capabilities”          NMBluetoothCapabilities

-

+
The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

 
Flags: Read

 

 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -261,14 +250,13 @@ nm_device_bt_get_capabilities (
 
The “name” property

 
  “name”                     gchar *

-

+
The name of the bluetooth device.

 
Flags: Read

 
Default value: NULL

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html
index 2beee10d..04e68bda 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceEthernet
+NMDeviceEthernet: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -145,8 +145,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -174,7 +172,6 @@ nm_device_ethernet_get_hw_address (
Returns

 
 the active hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -203,7 +200,6 @@ nm_device_ethernet_get_permanent_hw_address
 
Returns

 
 the permanent hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -230,7 +226,6 @@ nm_device_ethernet_get_speed (
 
Returns

 
 the speed of the device

-

 
 
 

@@ -257,7 +252,6 @@ nm_device_ethernet_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 
@@ -267,32 +261,24 @@ nm_device_ethernet_get_carrier (
NM_DEVICE_ETHERNET_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_HW_ADDRESS  "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS

 
#define NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS "perm-hw-address"
 

-

-

 

 

 

 
NM_DEVICE_ETHERNET_SPEED

 
#define NM_DEVICE_ETHERNET_SPEED       "speed"
 

-

-

 

 

 

 
NM_DEVICE_ETHERNET_CARRIER

 
#define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 

-

-

 

 
 

@@ -300,7 +286,7 @@ nm_device_ethernet_get_carrier (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -308,7 +294,7 @@ nm_device_ethernet_get_carrier (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The active hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -316,7 +302,7 @@ nm_device_ethernet_get_carrier (
 
The “perm-hw-address” property

 
  “perm-hw-address”          gchar *

-

+
The permanent hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -324,14 +310,13 @@ nm_device_ethernet_get_carrier (
 
The “speed” property

 
  “speed”                    guint

-

+
The speed of the device.

 
Flags: Read

 
Default value: 0

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index 28a8bb86..8144c52f 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceGeneric
+NMDeviceGeneric: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -102,8 +102,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -131,7 +129,6 @@ nm_device_generic_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 
@@ -141,16 +138,12 @@ device, and must not be modified.

 
NM_DEVICE_GENERIC_HW_ADDRESS

 
#define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_GENERIC_TYPE_DESCRIPTION

 
#define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 

-

-

 

 
 

@@ -158,7 +151,7 @@ device, and must not be modified.

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -166,14 +159,14 @@ device, and must not be modified.

 

 
The “type-description” property

 
  “type-description”         gchar *

-

+
A description of the specific type of device this is, or NULL
+if not known.

 
Flags: Read

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index 60783944..310d8550 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceInfiniband
+NMDeviceInfiniband: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -111,8 +111,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -140,7 +138,6 @@ nm_device_infiniband_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -167,7 +164,6 @@ nm_device_infiniband_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 
@@ -177,16 +173,12 @@ nm_device_infiniband_get_carrier (
NM_DEVICE_INFINIBAND_HW_ADDRESS

 
#define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_INFINIBAND_CARRIER

 
#define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 

-

-

 

 
 

@@ -194,7 +186,7 @@ nm_device_infiniband_get_carrier (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -202,14 +194,13 @@ nm_device_infiniband_get_carrier (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index 49cd12df..63f1dbf6 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceModem
+NMDeviceModem: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -111,8 +111,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -142,7 +140,6 @@ may require a firmware reload or reinitialization.

 

 
Returns

 
 the generic access technology families the modem supports

-

 

 

 

@@ -173,7 +170,6 @@ represents the network types the modem can immediately connect to.

 
Returns

 
 the generic access technology families the modem supports without
 a firmware reload or other reinitialization

-

 
 
 
@@ -183,16 +179,12 @@ a firmware reload or other reinitialization

 
NM_DEVICE_MODEM_MODEM_CAPABILITIES

 
#define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 

-

-

 
 

 

 
NM_DEVICE_MODEM_CURRENT_CAPABILITIES

 
#define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 

-

-

 

 
 

@@ -200,20 +192,23 @@ a firmware reload or other reinitialization

 

 
The “current-capabilities” property

 
  “current-capabilities”     NMDeviceModemCapabilities

-

+
The generic family of access technologies the modem currently supports
+without a firmware reload or reinitialization.

 
Flags: Read

 

 

 

 
The “modem-capabilities” property

 
  “modem-capabilities”       NMDeviceModemCapabilities

-

+
The generic family of access technologies the modem supports.  Not all
+capabilities are available at the same time however; some modems require
+a firmware reload or other reinitialization to switch between eg
+CDMA/EVDO and GSM/UMTS.

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index 0bdbf9aa..1e4e036a 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceOlpcMesh
+NMDeviceOlpcMesh: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -129,8 +129,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -158,7 +156,6 @@ nm_device_olpc_mesh_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -213,7 +210,6 @@ nm_device_olpc_mesh_get_active_channel
 

 
Returns

 
 active channel of the device

-

 

 
 
@@ -223,24 +219,18 @@ nm_device_olpc_mesh_get_active_channel
 
NM_DEVICE_OLPC_MESH_HW_ADDRESS

 
#define NM_DEVICE_OLPC_MESH_HW_ADDRESS     "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_OLPC_MESH_COMPANION

 
#define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 

-

-

 

 

 

 
NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL

 
#define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 

-

-

 

 
 

@@ -248,7 +238,7 @@ nm_device_olpc_mesh_get_active_channel
 

 
The “active-channel” property

 
  “active-channel”           guint

-

+
The device's active channel.

 
Flags: Read

 
Default value: 0

 

@@ -256,21 +246,20 @@ nm_device_olpc_mesh_get_active_channel
 

 
The “companion” property

 
  “companion”                NMDeviceWifi *

-

+
The companion device.

 
Flags: Read

 

 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index ded0ca8f..9290d518 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceTeam
+NMDeviceTeam: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -128,8 +128,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -157,7 +155,6 @@ nm_device_team_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -184,7 +181,6 @@ nm_device_team_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 

@@ -225,24 +221,18 @@ copy used by the device, and must not be modified. 

 
NM_DEVICE_TEAM_HW_ADDRESS

 
#define NM_DEVICE_TEAM_HW_ADDRESS  "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_TEAM_CARRIER

 
#define NM_DEVICE_TEAM_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_TEAM_SLAVES

 
#define NM_DEVICE_TEAM_SLAVES      "slaves"
 

-

-

 

 
 

@@ -250,7 +240,7 @@ copy used by the device, and must not be modified. 

 

 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -258,7 +248,7 @@ copy used by the device, and must not be modified. 

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -266,13 +256,13 @@ copy used by the device, and must not be modified. 

 

 
The “slaves” property

 
  “slaves”                   GPtrArray *

-

+
The devices enslaved to the team device.

+
Element-type: NMDevice

 
Flags: Read

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 3febf838..1101eb80 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceVlan
+NMDeviceVlan: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -146,8 +146,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -175,7 +173,6 @@ nm_device_vlan_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -202,7 +199,6 @@ nm_device_vlan_get_carrier (
 
Returns

 
 TRUE if the device has carrier

-

 
 
 

@@ -254,7 +250,6 @@ nm_device_vlan_get_vlan_id (
 
Returns

 
 the device's VLAN ID

-

 
 
 
@@ -264,32 +259,24 @@ nm_device_vlan_get_vlan_id (
NM_DEVICE_VLAN_HW_ADDRESS

 
#define NM_DEVICE_VLAN_HW_ADDRESS  "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_VLAN_CARRIER

 
#define NM_DEVICE_VLAN_CARRIER     "carrier"
 

-

-

 

 

 

 
NM_DEVICE_VLAN_PARENT

 
#define NM_DEVICE_VLAN_PARENT      "parent"
 

-

-

 

 

 

 
NM_DEVICE_VLAN_VLAN_ID

 
#define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 

-

-

 

 
 

@@ -297,7 +284,7 @@ nm_device_vlan_get_vlan_id (
 
The “carrier” property

 
  “carrier”                  gboolean

-

+
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

 

@@ -305,7 +292,7 @@ nm_device_vlan_get_vlan_id (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -313,14 +300,14 @@ nm_device_vlan_get_vlan_id (
 
The “parent” property

 
  “parent”                   NMDevice *

-

+
The devices's parent device.

 
Flags: Read

 
 

 

 
The “vlan-id” property

 
  “vlan-id”                  guint

-

+
The device's VLAN ID.

 
Flags: Read

 
Allowed values: <= 4095

 
Default value: 0

@@ -328,7 +315,6 @@ nm_device_vlan_get_vlan_id (
-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index 6bbad017..db0dca47 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceWifi
+NMDeviceWifi: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -252,8 +252,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -281,7 +279,6 @@ nm_device_wifi_get_hw_address (
Returns

 
 the actual hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -310,7 +307,6 @@ nm_device_wifi_get_permanent_hw_address
 
Returns

 
 the permanent hardware address. This is the internal string used by the
 device, and must not be modified.

-

 
 
 

@@ -337,7 +333,6 @@ nm_device_wifi_get_mode (
 
Returns

 
 the mode

-

 
 
 

@@ -364,7 +359,6 @@ nm_device_wifi_get_bitrate (
 
Returns

 
 the bit rate (kbit/s)

-

 
 
 

@@ -391,7 +385,6 @@ nm_device_wifi_get_capabilities (
 
Returns

 
 the capabilities

-

 
 
 

@@ -530,7 +523,6 @@ after that for the scan to complete.

 
 TRUE on success, FALSE on error, in which case error
 will be
 set.

-

 
 
 

@@ -620,7 +612,6 @@ nm_device_wifi_request_scan_finish ( TRUE on success, FALSE on error, in which case error
 will be
 set.

-

 
 
 
@@ -630,56 +621,42 @@ set.

 
NM_DEVICE_WIFI_HW_ADDRESS

 
#define NM_DEVICE_WIFI_HW_ADDRESS          "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS

 
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_MODE

 
#define NM_DEVICE_WIFI_MODE                "mode"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_BITRATE

 
#define NM_DEVICE_WIFI_BITRATE             "bitrate"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT

 
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_CAPABILITIES

 
#define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 

-

-

 

 

 

 
NM_DEVICE_WIFI_ACCESS_POINTS

 
#define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 

-

-

 

 
 

@@ -687,21 +664,22 @@ set.

 

 
The “access-points” property

 
  “access-points”            GPtrArray *

-

+
List of all Wi-Fi access points the device can see.

+
Element-type: NMAccessPoint

 
Flags: Read

 

 

 

 
The “active-access-point” property

 
  “active-access-point”      NMAccessPoint *

-

+
The active NMAccessPoint of the device.

 
Flags: Read

 

 

 

 
The “bitrate” property

 
  “bitrate”                  guint

-

+
The bit rate of the device in kbit/s.

 
Flags: Read

 
Default value: 0

 

@@ -709,7 +687,7 @@ set.

 

 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -717,7 +695,7 @@ set.

 

 
The “mode” property

 
  “mode”                     NM80211Mode

-

+
The mode of the device.

 
Flags: Read

 
Default value: NM_802_11_MODE_UNKNOWN

 

@@ -725,7 +703,7 @@ set.

 

 
The “perm-hw-address” property

 
  “perm-hw-address”          gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 

@@ -733,7 +711,7 @@ set.

 

 
The “wireless-capabilities” property

 
  “wireless-capabilities”    NMDeviceWifiCapabilities

-

+
The wireless capabilities of the device.

 
Flags: Read

 

 

@@ -745,6 +723,34 @@ set.

 user_function (NMDeviceWifi *device,
                GObject      *ap,
                gpointer      user_data)
+
Notifies that a NMAccessPoint is added to the Wi-Fi device.

+

+
Parameters

+

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





device
the Wi-Fi device that received the signal
 
ap
the new access point
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -754,12 +760,39 @@ user_function (NMDeviceWifi *device,
                GObject      *ap,
                gpointer      user_data)
+
Notifies that a NMAccessPoint is removed from the Wi-Fi device.

+

+
Parameters

+

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





device
the Wi-Fi device that received the signal
 
ap
the removed access point
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index f1d58b57..4fc7c558 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDeviceWimax
+NMDeviceWimax: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -245,8 +245,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -274,7 +272,6 @@ nm_device_wimax_get_hw_address (
Returns

 
 the hardware address. This is the internal string used by the
 device, and must not be modified.

-

 

 
 

@@ -394,7 +391,6 @@ device is not connected.

 

 
Returns

 
 the center frequency in KHz, or 0

-

 

 
 

@@ -424,7 +420,6 @@ device is not connected.

 

 
Returns

 
 the RSSI in dBm, or 0

-

 

 
 

@@ -453,7 +448,6 @@ meaning when the device is not connected.

 

 
Returns

 
 the CINR in dB, or 0

-

 

 
 

@@ -482,7 +476,6 @@ nm_device_wimax_get_tx_power (
 
Returns

 
 the TX power in dBm, or 0

-

 
 
 

@@ -509,7 +502,6 @@ nm_device_wimax_get_bsid (
 
Returns

 
 the ID of the serving Base Station, or NULL

-

 
 
 
@@ -519,64 +511,48 @@ nm_device_wimax_get_bsid (
NM_DEVICE_WIMAX_HW_ADDRESS

 
#define NM_DEVICE_WIMAX_HW_ADDRESS       "hw-address"
 

-

-

 
 

 

 
NM_DEVICE_WIMAX_ACTIVE_NSP

 
#define NM_DEVICE_WIMAX_ACTIVE_NSP       "active-nsp"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_CENTER_FREQUENCY

 
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_RSSI

 
#define NM_DEVICE_WIMAX_RSSI             "rssi"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_CINR

 
#define NM_DEVICE_WIMAX_CINR             "cinr"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_TX_POWER

 
#define NM_DEVICE_WIMAX_TX_POWER         "tx-power"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_BSID

 
#define NM_DEVICE_WIMAX_BSID             "bsid"
 

-

-

 

 

 

 
NM_DEVICE_WIMAX_NSPS

 
#define NM_DEVICE_WIMAX_NSPS             "nsps"
 

-

-

 

 
 

@@ -584,14 +560,15 @@ nm_device_wimax_get_bsid (
 
The “active-nsp” property

 
  “active-nsp”               NMWimaxNsp *

-

+
The active NMWimaxNsp of the device.

 
Flags: Read

 

 

 

 
The “bsid” property

 
  “bsid”                     gchar *

-

+
The ID of the serving base station as received from the network.  Has
+no meaning when the device is not connected.

 
Flags: Read

 
Default value: NULL

 

@@ -599,7 +576,9 @@ nm_device_wimax_get_bsid (
 
The “center-frequency” property

 
  “center-frequency”         guint

-

+
The center frequency (in KHz) of the radio channel the device is using to
+communicate with the network when connected.  Has no meaning when the
+device is not connected.

 
Flags: Read

 
Default value: 0

 
@@ -607,7 +586,9 @@ nm_device_wimax_get_bsid (
 
The “cinr” property

 
  “cinr”                     gint

-

+
CINR (Carrier to Interference + Noise Ratio) of the current radio link
+in dB.  CINR is a more accurate measure of radio link quality.  Has no
+meaning when the device is not connected.

 
Flags: Read

 
Default value: 0

 
@@ -615,7 +596,7 @@ nm_device_wimax_get_bsid (
 
The “hw-address” property

 
  “hw-address”               gchar *

-

+
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

 
@@ -623,14 +604,18 @@ nm_device_wimax_get_bsid (
 
The “nsps” property

 
  “nsps”                     GPtrArray *

-

+
List of all WiMAX Network Service Providers the device can see.

+
Element-type: NMWimaxNsp

 
Flags: Read

 
 

 

 
The “rssi” property

 
  “rssi”                     gint

-

+
RSSI of the current radio link in dBm.  This value indicates how strong
+the raw received RF signal from the base station is, but does not
+indicate the overall quality of the radio link.  Has no meaning when the
+device is not connected.

 
Flags: Read

 
Default value: 0

 

@@ -638,7 +623,9 @@ nm_device_wimax_get_bsid (
 
The “tx-power” property

 
  “tx-power”                 gint

-

+
Average power of the last burst transmitted by the device, in units of
+0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+-5.5 dBm.  Has no meaning when the device is not connected.

 
Flags: Read

 
Default value: 0

 
@@ -651,6 +638,34 @@ nm_device_wimax_get_bsid (NMDeviceWimax *self,
                GObject       *nsp,
                gpointer       user_data)
+
Notifies that a NMWimaxNsp is added to the wimax device.

+

+
Parameters

+

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





self
the wimax device that received the signal
 
nsp
the new NSP
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 

@@ -660,12 +675,39 @@ user_function (<
 user_function (NMDeviceWimax *self,
                GObject       *nsp,
                gpointer       user_data)
+
Notifies that a NMWimaxNsp is removed from the wimax device.

+

+
Parameters

+

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





self
the wimax device that received the signal
 
nsp
the removed NSP
 
user_data
user data set when the signal handler was connected.
 

+

 
Flags: Run First

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 3a4a0229..a1e97a8a 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMDhcpConfig
+NMDhcpConfig: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -118,8 +118,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -147,7 +145,6 @@ nm_dhcp_config_get_family (
Returns

 
 the IP address family; either AF_INET or
 AF_INET6

-

 

 
 

@@ -212,7 +209,6 @@ nm_dhcp_config_get_one_option (
Returns

 
 the configuration option's value. This is the internal string used by the
 configuration, and must not be modified.

-

 
 
 
@@ -222,16 +218,12 @@ configuration, and must not be modified.

 
NM_DHCP_CONFIG_FAMILY

 
#define NM_DHCP_CONFIG_FAMILY  "family"
 

-

-

 
 

 

 
NM_DHCP_CONFIG_OPTIONS

 
#define NM_DHCP_CONFIG_OPTIONS "options"
 

-

-

 

 
 

@@ -239,7 +231,8 @@ configuration, and must not be modified.

 

 
The “family” property

 
  “family”                   gint

-

+
The IP address family of the configuration; either
+AF_INET or AF_INET6.

 
Flags: Read

 
Allowed values: [0,255]

 
Default value: 0

@@ -248,13 +241,13 @@ configuration, and must not be modified.

 

 
The “options” property

 
  “options”                  GHashTable *

-

+
The GHashTable containing options of the configuration.

+
Type: GLib.HashTable(utf8,utf8)

 
Flags: Read

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index a93213ab..9a32ecb6 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMIPConfig
+NMIPConfig: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -210,8 +210,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -239,7 +237,6 @@ nm_ip_config_get_family (
Returns

 
 the IP address family; either AF_INET or
 AF_INET6

-

 

 
 

@@ -445,64 +442,48 @@ nm_ip_config_get_wins_servers (
NM_IP_CONFIG_FAMILY

 
#define NM_IP_CONFIG_FAMILY "family"
 

-

-

 
 

 

 
NM_IP_CONFIG_GATEWAY

 
#define NM_IP_CONFIG_GATEWAY "gateway"
 

-

-

 

 

 

 
NM_IP_CONFIG_ADDRESSES

 
#define NM_IP_CONFIG_ADDRESSES "addresses"
 

-

-

 

 

 

 
NM_IP_CONFIG_ROUTES

 
#define NM_IP_CONFIG_ROUTES "routes"
 

-

-

 

 

 

 
NM_IP_CONFIG_NAMESERVERS

 
#define NM_IP_CONFIG_NAMESERVERS "nameservers"
 

-

-

 

 

 

 
NM_IP_CONFIG_DOMAINS

 
#define NM_IP_CONFIG_DOMAINS "domains"
 

-

-

 

 

 

 
NM_IP_CONFIG_SEARCHES

 
#define NM_IP_CONFIG_SEARCHES "searches"
 

-

-

 

 

 

 
NM_IP_CONFIG_WINS_SERVERS

 
#define NM_IP_CONFIG_WINS_SERVERS "wins-servers"
 

-

-

 

 
 

@@ -510,21 +491,22 @@ nm_ip_config_get_wins_servers (
 
The “addresses” property

 
  “addresses”                GPtrArray *

-

+
A GPtrArray containing the addresses (NMIPAddress) of the configuration.

 
Flags: Read

 

 

 

 
The “domains” property

 
  “domains”                  GStrv

-

+
The array containing domain strings of the configuration.

 
Flags: Read

 

 

 

 
The “family” property

 
  “family”                   gint

-

+
The IP address family of the configuration; either
+AF_INET or AF_INET6.

 
Flags: Read

 
Allowed values: [0,255]

 
Default value: 0

@@ -533,7 +515,7 @@ nm_ip_config_get_wins_servers (
 
The “gateway” property

 
  “gateway”                  gchar *

-

+
The IP gateway address of the configuration as string.

 
Flags: Read

 
Default value: NULL

 

@@ -541,34 +523,34 @@ nm_ip_config_get_wins_servers (
 
The “nameservers” property

 
  “nameservers”              GStrv

-

+
The array containing name server IP addresses of the configuration.

 
Flags: Read

 
 

 

 
The “routes” property

 
  “routes”                   GPtrArray *

-

+
A GPtrArray containing the routes (NMIPRoute) of the configuration.

 
Flags: Read

 

 

 

 
The “searches” property

 
  “searches”                 GStrv

-

+
The array containing DNS search strings of the configuration.

 
Flags: Read

 

 

 

 
The “wins-servers” property

 
  “wins-servers”             GStrv

-

+
The array containing WINS server IP addresses of the configuration.
+(This will always be empty for IPv6 configurations.)

 
Flags: Read

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index 38da67a0..c9779152 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMObject
+NMObject: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -112,8 +112,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -141,7 +139,6 @@ nm_object_get_path (
Returns

 
 the object's path. This is the internal string used by the
 device, and must not be modified.

-

 

 
 
@@ -151,16 +148,12 @@ device, and must not be modified.

 
NM_OBJECT_PATH

 
#define NM_OBJECT_PATH "path"
 

-

-

 
 

 

 
NM_OBJECT_DBUS_CONNECTION

 
#define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 

-

-

 

 
 

@@ -168,14 +161,14 @@ device, and must not be modified.

 

 
The “dbus-connection” property

 
  “dbus-connection”          GDBusConnection *

-

+
The GDBusConnection of the object.

+
[skip]

 
Flags: Read / Write / Construct Only

 

 

 

 
The “nm-running-internal” property

 
  “nm-running-internal”      gboolean

-

 
Flags: Read

 
Default value: FALSE

 

@@ -183,14 +176,13 @@ device, and must not be modified.

 

 
The “path” property

 
  “path”                     gchar *

-

+
The D-Bus object path.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index 0bead3ba..d413162d 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMRemoteConnection
+NMRemoteConnection: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -214,8 +214,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -267,7 +265,6 @@ disk; if FALSE, then only the in-memory representat
 
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 

 
 

@@ -365,7 +362,6 @@ nm_remote_connection_commit_changes_finish
 
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -408,7 +404,6 @@ been written to disk, or if the connection has never been saved.

 
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -494,7 +489,6 @@ nm_remote_connection_save_finish (
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -536,7 +530,6 @@ nm_remote_connection_delete (
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -621,7 +614,6 @@ nm_remote_connection_delete_finish (
Returns

 
 TRUE on success, FALSE on error, in which case error
 will be set.

-

 
 
 

@@ -671,7 +663,6 @@ not a simple property accessor.

 
 a GVariant of type NM_VARIANT_TYPE_CONNECTION containing
 connection
 's secrets, or NULL on error.

-

 
 
 

@@ -793,7 +784,6 @@ nm_remote_connection_get_unsaved ( TRUE if the remote connection contains changes that have not
 been saved to disk, FALSE if the connection is the same as its on-disk
 representation.

-

 
 
 

@@ -828,7 +818,6 @@ reference to it.)

 
Returns

 
 TRUE if the remote connection is visible to the current
 user, FALSE if not.

-

 
 
 
@@ -838,32 +827,24 @@ user, FALSE if not.

 
NM_REMOTE_CONNECTION_DBUS_CONNECTION

 
#define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection"
 

-

-

 
 

 

 
NM_REMOTE_CONNECTION_PATH

 
#define NM_REMOTE_CONNECTION_PATH            "path"
 

-

-

 

 

 

 
NM_REMOTE_CONNECTION_UNSAVED

 
#define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 

-

-

 

 

 

 
NM_REMOTE_CONNECTION_VISIBLE

 
#define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 

-

-

 

 
 

@@ -871,7 +852,8 @@ user, FALSE if not.

 

 
The “unsaved” property

 
  “unsaved”                  gboolean

-

+
TRUE if the remote connection contains changes that have not been saved
+to disk, FALSE if the connection is the same as its on-disk representation.

 
Flags: Read

 
Default value: FALSE

 

@@ -879,14 +861,19 @@ user, FALSE if not.

 

 
The “visible” property

 
  “visible”                  gboolean

-

+
TRUE if the remote connection is visible to the current user, FALSE if
+not.  If the connection is not visible then it is essentially useless; it
+will not contain any settings, and operations such as
+nm_remote_connection_save() and nm_remote_connection_delete() will always
+fail. (NMRemoteSettings will not normally return non-visible connections
+to callers, but it is possible for a connection's visibility to change
+after you already have a reference to it.)

 
Flags: Read

 
Default value: FALSE

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index 4eb3641b..ab20b0eb 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSecretAgentOld
+NMSecretAgentOld: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -216,8 +216,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -267,7 +265,7 @@ something like this:

               NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
               NULL);
 nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);
+secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);
 
 (call the NMSecretAgentOldGetSecretsFunc with secrets_dict)
 
@@ -461,7 +459,6 @@ registered, or in the process of registering.

 

 
Returns

 
 TRUE if registration was successful, FALSE on error.

-

 

 

 

@@ -549,7 +546,6 @@ nm_secret_agent_old_register_finish (
 
Returns

 
 TRUE if registration was successful, FALSE on error.

-

 
 
 

@@ -594,7 +590,6 @@ registered.

 

 
Returns

 
 TRUE if unregistration was successful, FALSE on error

-

 

 
 

@@ -682,7 +677,6 @@ nm_secret_agent_old_unregister_finish (
 
Returns

 
 TRUE if unregistration was successful, FALSE on error.

-

 
 
 

@@ -708,7 +702,6 @@ nm_secret_agent_old_get_registered (
 
Returns

 
 a TRUE if the agent is registered, FALSE if it is not.

-

 
 
 

@@ -879,32 +872,24 @@ nm_secret_agent_old_delete_secrets (
NM_SECRET_AGENT_OLD_IDENTIFIER

 
#define NM_SECRET_AGENT_OLD_IDENTIFIER          "identifier"
 

-

-

 
 

 

 
NM_SECRET_AGENT_OLD_AUTO_REGISTER

 
#define NM_SECRET_AGENT_OLD_AUTO_REGISTER       "auto-register"
 

-

-

 

 

 

 
NM_SECRET_AGENT_OLD_REGISTERED

 
#define NM_SECRET_AGENT_OLD_REGISTERED          "registered"
 

-

-

 

 

 

 
NM_SECRET_AGENT_OLD_CAPABILITIES

 
#define NM_SECRET_AGENT_OLD_CAPABILITIES        "capabilities"
 

-

-

 

 
 

@@ -912,7 +897,20 @@ nm_secret_agent_old_delete_secrets (
 
The “auto-register” property

 
  “auto-register”            gboolean

-

+
If TRUE (the default), the agent will always be registered when
+NetworkManager is running; if NetworkManager exits and restarts, the
+agent will re-register itself automatically.

+
In particular, if this property is TRUE at construct time, then the
+agent will register itself with NetworkManager during
+construction/initialization, and initialization will fail with an error
+if the agent is unable to register itself.

+
If the property is FALSE, the agent will not automatically register with
+NetworkManager, and nm_secret_agent_old_register() or
+nm_secret_agent_old_register_async() must be called to register it.

+
Calling nm_secret_agent_old_unregister() will suppress auto-registration
+until nm_secret_agent_old_register() is called, which re-enables
+auto-registration. This ensures that the agent remains un-registered when
+you expect it to be unregistered.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -920,14 +918,20 @@ nm_secret_agent_old_delete_secrets (
 
The “capabilities” property

 
  “capabilities”             NMSecretAgentCapabilities

-

+
A bitfield of NMSecretAgentCapabilities.

 
Flags: Read / Write / Construct

 
 

 

 
The “identifier” property

 
  “identifier”               gchar *

-

+
Identifies this agent; only one agent in each user session may use the
+same identifier.  Identifier formatting follows the same rules as
+D-Bus bus names with the exception that the ':' character is not
+allowed.  The valid set of characters is "A-Z[0-9]_-." and the
+identifier is limited in length to 255 characters with a minimum
+of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+(without quotes).

 
Flags: Read / Write / Construct Only

 
Default value: NULL

 

@@ -935,14 +939,13 @@ nm_secret_agent_old_delete_secrets (
 
The “registered” property

 
  “registered”               gboolean

-

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

 
Flags: Read

 
Default value: FALSE

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index 5e5d535b..43757b42 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSetting
+NMSetting: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -256,24 +256,18 @@ of properties and allowed values.

 
NM_SETTING_PARAM_REQUIRED

 
#define NM_SETTING_PARAM_REQUIRED     (1 << (1 + G_PARAM_USER_SHIFT))
 

-

-

 
 

 

 
NM_SETTING_PARAM_SECRET

 
#define NM_SETTING_PARAM_SECRET       (1 << (2 + G_PARAM_USER_SHIFT))
 

-

-

 

 

 

 
NM_SETTING_PARAM_FUZZY_IGNORE

 
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT))
 

-

-

 

 

 

@@ -318,7 +312,6 @@ of properties and allowed values.

 

 
Returns

 
 TRUE to clear the secret, FALSE to not clear the secret

-

 

 

 

@@ -395,7 +388,6 @@ nm_setting_lookup_type (const cha
 
 the GType of the setting's class, or G_TYPE_INVALID if
 name
 is not recognized.

-

 
 
 

@@ -451,7 +443,6 @@ nm_setting_get_name (
Returns

 
 a string containing the type name of the NMSetting object,
 like 'ppp' or 'wireless' or 'wired'.

-

 
 
 

@@ -499,7 +490,6 @@ is being verified in isolation. 

 

 
Returns

 
 TRUE if the setting is valid, FALSE if it is not

-

 

 
 

@@ -542,7 +532,6 @@ for a description of each flag's behavior.

 

 
Returns

 
 TRUE if the comparison succeeds, FALSE if it does not

-

 

 
 

@@ -605,7 +594,6 @@ in and the settings differ, a new one is created and returned. 

 

 
Returns

 
 TRUE if the settings contain the same values, FALSE if they do not

-

 

 
 

@@ -674,7 +662,6 @@ output format is not guaranteed to be stable and may change at any time.

 
 an allocated string containing a textual representation of the
 setting's properties and values (including secrets!), which the caller should
 free with g_free()

-

 
 
 

@@ -723,7 +710,6 @@ handle that secret.

 
Returns

 
 TRUE on success (if the given secret name was a valid property of
 this setting, and if that property is secret), FALSE if not

-

 
 
 

@@ -772,7 +758,6 @@ handle that secret.

 
Returns

 
 TRUE on success (if the given secret name was a valid property of
 this setting, and if that property is secret), FALSE if not

-

 
 
 

@@ -812,7 +797,6 @@ to get the type of

 
 the D-Bus marshalling type of property
 on setting
 .

-

 
 
 
@@ -822,8 +806,6 @@ on setting
 
NM_SETTING_NAME

 
#define NM_SETTING_NAME "name"
 

-

-

 
 

 

@@ -1064,7 +1046,6 @@ example "ppp" or "wireless" or "wired".

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index ba6aa73f..f9e3ae1b 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSetting8021x
+NMSetting8021x: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -767,6 +767,10 @@
 
 
 
+#define
+NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH
+
+
 enum
 NMSetting8021xCKFormat
 
@@ -950,7 +954,6 @@ nm_setting_802_1x_new (void
 
Returns

 
 the new empty NMSetting8021x object

-

 
 
 

@@ -981,7 +984,6 @@ allowed EAP methods.

 

 
Returns

 
 the number of allowed EAP methods

-

 

 
 

@@ -1018,7 +1020,6 @@ nm_setting_802_1x_get_eap_method (
Returns

 
 the name of the allowed EAP method at index i
 

-

 
 
 

@@ -1056,7 +1057,6 @@ allowed EAP methods.

 
Returns

 
 TRUE if the EAP method was successfully added, FALSE if it was
 not a valid method or if it was already allowed.

-

 
 
 

@@ -1123,7 +1123,6 @@ nm_setting_802_1x_remove_eap_method_by_value
 

 
Returns

 
 TRUE if the EAP method was founs and removed, FALSE if it was not.

-

 

 
 

@@ -1173,7 +1172,6 @@ authenticate the user.  Often this is a username or login name.

 

 
Returns

 
 the user identifier

-

 

 
 

@@ -1204,7 +1202,6 @@ a secure form, if applicable for that EAP method.

 

 
Returns

 
 the anonymous identifier

-

 

 
 

@@ -1231,7 +1228,6 @@ nm_setting_802_1x_get_pac_file (
 
Returns

 
 the PAC file

-

 
 
 

@@ -1263,7 +1259,6 @@ of these properties.

 

 
Returns

 
 TRUE if a system CA certificate path should be used, FALSE if not

-

 

 
 

@@ -1294,7 +1289,6 @@ certificates for verifying the network to client.

 

 
Returns

 
 the CA certificate directory path

-

 

 
 

@@ -1325,7 +1319,6 @@ to add more CA certificates for verifying the network to client.

 

 
Returns

 
 the "phase 2" CA certificate directory path

-

 

 
 

@@ -1354,7 +1347,6 @@ if 
 
Returns

 
 scheme used to store the CA certificate (blob or path)

-

 
 
 

@@ -1418,7 +1410,6 @@ of the network cannot be confirmed by the client.

 

 
Returns

 
 path to the CA certificate file

-

 

 
 

@@ -1479,7 +1470,6 @@ clears the CA certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -1508,7 +1498,6 @@ nm_setting_802_1x_get_subject_match (NULL no subject verification is to be
 performed.

-

 
 
 

@@ -1537,7 +1526,6 @@ nm_setting_802_1x_get_num_altsubject_matches
 

 
Returns

 
 the number of altsubject-matches entries.

-

 

 
 

@@ -1575,7 +1563,6 @@ nm_setting_802_1x_get_altsubject_match
 
Returns

 
 the altSubjectName match at index i
 

-

 
 
 

@@ -1614,7 +1601,6 @@ server is not verified.

 
Returns

 
 TRUE if the alternative subject name match was
 successfully added, FALSE if it was already allowed.

-

 
 
 

@@ -1683,7 +1669,6 @@ nm_setting_802_1x_remove_altsubject_match_by_value
 
Returns

 
 TRUE if the alternative subject name match was found and removed,
 FALSE if it was not.

-

 
 
 

@@ -1736,7 +1721,6 @@ if 
 
Returns

 
 scheme used to store the client certificate (blob or path)

-

 
 
 

@@ -1796,7 +1780,6 @@ authentication method.

 

 
Returns

 
 path to the client certificate file

-

 

 
 

@@ -1861,7 +1844,6 @@ clears the client certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -1889,7 +1871,6 @@ nm_setting_802_1x_get_phase1_peapver (“phase1-peapver” property.  Valid
 values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

-

 
 
 

@@ -1920,7 +1901,6 @@ used when authenticating with EAP-PEAP, as contained in the
 “phase1-peaplabel” property.  Valid values are NULL (unset),
 "0" (use old-style label), and "1" (use new-style label).  See the
 wpa_supplicant documentation for more details.

-

 
 
 

@@ -1949,7 +1929,6 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 
 whether "phase 1" PEAP fast provisioning should be used, as specified
 by the “phase1-fast-provisioning” property.  See the
 wpa_supplicant documentation for more details.

-

 
 
 

@@ -1976,7 +1955,6 @@ nm_setting_802_1x_get_phase2_auth (
Returns

 
 the "phase 2" non-EAP (ex MD5) allowed authentication method as
 specified by the “phase2-auth” property.

-

 
 
 

@@ -2003,7 +1981,6 @@ nm_setting_802_1x_get_phase2_autheap (
Returns

 
 the "phase 2" EAP-based (ex TLS) allowed authentication method as
 specified by the “phase2-autheap” property.

-

 
 
 

@@ -2034,7 +2011,6 @@ use 
 
Returns

 
 scheme used to store the "phase 2" CA certificate (blob or path)

-

 
 
 

@@ -2100,7 +2076,6 @@ of the network cannot be confirmed by the client.

 

 
Returns

 
 path to the "phase 2" CA certificate file

-

 

 
 

@@ -2161,7 +2136,6 @@ clears the "phase2" CA certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -2191,7 +2165,6 @@ nm_setting_802_1x_get_phase2_subject_match
 the substring to be matched against the subject of the "phase 2"
 authentication server certificate, or NULL no subject verification
 is to be performed.

-

 
 
 

@@ -2220,7 +2193,6 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 

 
Returns

 
 the number of phase2-altsubject-matches entries.

-

 

 
 

@@ -2258,7 +2230,6 @@ nm_setting_802_1x_get_phase2_altsubject_match
 
Returns

 
 the "phase 2" altSubjectName match at index i
 

-

 
 
 

@@ -2298,7 +2269,6 @@ connection

 
Returns

 
 TRUE if the "phase 2" alternative subject name match was
 successfully added, FALSE if it was already allowed.

-

 
 
 

@@ -2367,7 +2337,6 @@ nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 
Returns

 
 TRUE if the alternative subject name match for "phase 2" was found and removed,
 FALSE if it was not.

-

 
 
 

@@ -2422,7 +2391,6 @@ returned scheme is 
 
Returns

 
 scheme used to store the "phase 2" client certificate (blob or path)

-

 
 
 

@@ -2482,7 +2450,6 @@ authentication method.

 

 
Returns

 
 path to the "phase 2" client certificate file

-

 

 
 

@@ -2548,7 +2515,6 @@ clears the "phase2" client certificate.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -2575,7 +2541,6 @@ nm_setting_802_1x_get_password (
Returns

 
 the password used by the authentication method, if any, as specified
 by the “password” property

-

 
 
 

@@ -2601,7 +2566,6 @@ nm_setting_802_1x_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 

@@ -2657,7 +2621,6 @@ nm_setting_802_1x_get_password_raw_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “password-raw”

-

 
 
 

@@ -2684,7 +2647,6 @@ nm_setting_802_1x_get_pin (
Returns

 
 the PIN used by the authentication method, if any, as specified
 by the “pin” property

-

 
 
 

@@ -2711,7 +2673,6 @@ nm_setting_802_1x_get_pin_flags (
Returns

 
 the NMSettingSecretFlags pertaining to the
 “pin”

-

 
 
 

@@ -2743,7 +2704,6 @@ nm_setting_802_1x_get_private_key_scheme
 

 
Returns

 
 scheme used to store the private key (blob or path)

-

 

 
 

@@ -2806,7 +2766,6 @@ authentication method.

 

 
Returns

 
 path to the private key file

-

 

 
 

@@ -2894,7 +2853,6 @@ an error is returned.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -2923,7 +2881,6 @@ nm_setting_802_1x_get_private_key_password
 
 the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_private_key(), or the
 “private-key-password” property.

-

 
 
 

@@ -2951,7 +2908,6 @@ nm_setting_802_1x_get_private_key_password_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “private-key-password”

-

 
 
 

@@ -2979,7 +2935,6 @@ nm_setting_802_1x_get_private_key_format
 
Returns

 
 the data format of the private key data stored in the
 “private-key” property

-

 
 
 

@@ -3011,7 +2966,6 @@ scheme is 
 
Returns

 
 scheme used to store the "phase 2" private key (blob or path)

-

 
 
 

@@ -3074,7 +3028,6 @@ authentication method.

 

 
Returns

 
 path to the "phase 2" private key file

-

 

 
 

@@ -3164,7 +3117,6 @@ an error is returned.

 

 
Returns

 
 TRUE if the operation succeeded, FALSE if it was unsuccessful

-

 

 
 

@@ -3193,7 +3145,6 @@ nm_setting_802_1x_get_phase2_private_key_password
 
 the private key password used to decrypt the private key if
 previously set with nm_setting_802_1x_set_phase2_private_key() or the
 “phase2-private-key-password” property.

-

 
 
 

@@ -3221,7 +3172,6 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “phase2-private-key-password”

-

 
 
 

@@ -3249,18 +3199,23 @@ nm_setting_802_1x_get_phase2_private_key_format
 
Returns

 
 the data format of the "phase 2" private key data stored in the
 “phase2-private-key” property

-

 
 
 
 

 
Types and Values

 

+
NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH

+
#define NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH "file://"
+

+

+

+

 
enum NMSetting8021xCKFormat

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

 

-
Members

+
Members

 
@@ -3309,7 +3264,7 @@ and private key

 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

-
Members

+
Members

 

 
 

 
@@ -3350,264 +3305,198 @@ to a file containing the certificate or key data
NM_SETTING_802_1X_SETTING_NAME
#define NM_SETTING_802_1X_SETTING_NAME "802-1x"
 

-

-

 
NM_SETTING_802_1X_EAP

 
#define NM_SETTING_802_1X_EAP "eap"
 

-

-

 

 
NM_SETTING_802_1X_IDENTITY

 
#define NM_SETTING_802_1X_IDENTITY "identity"
 

-

-

 

 
NM_SETTING_802_1X_ANONYMOUS_IDENTITY

 
#define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
 

-

-

 

 
NM_SETTING_802_1X_PAC_FILE

 
#define NM_SETTING_802_1X_PAC_FILE "pac-file"
 

-

-

 

 
NM_SETTING_802_1X_CA_CERT

 
#define NM_SETTING_802_1X_CA_CERT "ca-cert"
 

-

-

 

 
NM_SETTING_802_1X_CA_PATH

 
#define NM_SETTING_802_1X_CA_PATH "ca-path"
 

-

-

 

 
NM_SETTING_802_1X_SUBJECT_MATCH

 
#define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 

-

-

 

 
NM_SETTING_802_1X_ALTSUBJECT_MATCHES

 
#define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
 

-

-

 

 
NM_SETTING_802_1X_CLIENT_CERT

 
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 

-

-

 

 
NM_SETTING_802_1X_PHASE1_PEAPVER

 
#define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 

-

-

 

 
NM_SETTING_802_1X_PHASE1_PEAPLABEL

 
#define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
 

-

-

 

 
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING

 
#define NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING "phase1-fast-provisioning"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_AUTH

 
#define NM_SETTING_802_1X_PHASE2_AUTH "phase2-auth"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_AUTHEAP

 
#define NM_SETTING_802_1X_PHASE2_AUTHEAP "phase2-autheap"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_CA_CERT

 
#define NM_SETTING_802_1X_PHASE2_CA_CERT "phase2-ca-cert"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_CA_PATH

 
#define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH

 
#define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES

 
#define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

 
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 

-

-

 

 
NM_SETTING_802_1X_PASSWORD

 
#define NM_SETTING_802_1X_PASSWORD "password"
 

-

-

 

 
NM_SETTING_802_1X_PASSWORD_FLAGS

 
#define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
 

-

-

 

 
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_PRIVATE_KEY

 
#define NM_SETTING_802_1X_PRIVATE_KEY "private-key"
 

-

-

 

 
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD

 
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD "private-key-password"
 

-

-

 

 
NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS

 
#define NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS "private-key-password-flags"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY "phase2-private-key"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD "phase2-private-key-password"
 

-

-

 

 
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS

 
#define NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS "phase2-private-key-password-flags"
 

-

-

 

 
NM_SETTING_802_1X_PIN

 
#define NM_SETTING_802_1X_PIN "pin"
 

-

-

 

 
NM_SETTING_802_1X_PIN_FLAGS

 
#define NM_SETTING_802_1X_PIN_FLAGS "pin-flags"
 

-

-

 

 
NM_SETTING_802_1X_SYSTEM_CA_CERTS

 
#define NM_SETTING_802_1X_SYSTEM_CA_CERTS "system-ca-certs"
 

-

-

 

@@ -3615,14 +3504,18 @@ to a file containing the certificate or key data

 

 
The “altsubject-matches” property

 
  “altsubject-matches”       GStrv

-

+
List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server. If the list is empty,
+no verification of the server certificate's altSubjectName is performed.

 
Flags: Read / Write

 

 

 

 
The “anonymous-identity” property

 
  “anonymous-identity”       gchar *

-

+
Anonymous identity string for EAP authentication methods.  Used as the
+unencrypted identity with EAP types that support different tunneled
+identity like EAP-TTLS.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3630,14 +3523,27 @@ to a file containing the certificate or key data

 

 
The “ca-cert” property

 
  “ca-cert”                  GBytes *

-

+
Contains the CA certificate if used by the EAP method specified in the
+“eap” property.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_ca_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “ca-path” property

 
  “ca-path”                  gchar *

-

+
UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the “ca-cert” property.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3645,21 +3551,35 @@ to a file containing the certificate or key data

 

 
The “client-cert” property

 
  “client-cert”              GBytes *

-

+
Contains the client certificate if used by the EAP method specified in
+the “eap” property.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_client_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “eap” property

 
  “eap”                      GStrv

-

+
The allowed EAP method to be used when authenticating to the network with
+802.1x.  Valid methods are: "leap", "md5", "tls", "peap", "ttls", "pwd",
+and "fast".  Each method requires different configuration using the
+properties of this setting; refer to wpa_supplicant documentation for the
+allowed combinations.

 
Flags: Read / Write

 

 

 

 
The “identity” property

 
  “identity”                 gchar *

-

+
Identity string for EAP authentication methods.  Often the user's user or
+login name.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3667,7 +3587,7 @@ to a file containing the certificate or key data

 

 
The “pac-file” property

 
  “pac-file”                 gchar *

-

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

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3675,7 +3595,9 @@ to a file containing the certificate or key data

 

 
The “password” property

 
  “password”                 gchar *

-

+
UTF-8 encoded password used for EAP authentication methods. If both the
+“password” property and the “password-raw”
+property are specified, “password” is preferred.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3683,28 +3605,36 @@ to a file containing the certificate or key data

 

 
The “password-flags” property

 
  “password-flags”           NMSettingSecretFlags

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 

 

 

 
The “password-raw” property

 
  “password-raw”             GBytes *

-

+
Password used for EAP authentication methods, given as a byte array to
+allow passwords in other encodings than UTF-8 to be used. If both the
+“password” property and the “password-raw”
+property are specified, “password” is preferred.

 
Flags: Read / Write

 

 

 

 
The “password-raw-flags” property

 
  “password-raw-flags”       NMSettingSecretFlags

-

+
Flags indicating how to handle the “password-raw” property.

 
Flags: Read / Write

 

 

 

 
The “phase1-fast-provisioning” property

 
  “phase1-fast-provisioning” gchar *

-

+
Enables or disables in-line provisioning of EAP-FAST credentials when
+FAST is specified as the EAP method in the “eap” property.
+Recognized values are "0" (disabled), "1" (allow unauthenticated
+provisioning), "2" (allow authenticated provisioning), and "3" (allow
+both authenticated and unauthenticated provisioning).  See the
+wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3712,7 +3642,10 @@ to a file containing the certificate or key data

 

 
The “phase1-peaplabel” property

 
  “phase1-peaplabel”         gchar *

-

+
Forces use of the new PEAP label during key derivation.  Some RADIUS
+servers may require forcing the new PEAP label to interoperate with
+PEAPv1.  Set to "1" to force use of the new PEAP label.  See the
+wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3720,7 +3653,12 @@ to a file containing the certificate or key data

 

 
The “phase1-peapver” property

 
  “phase1-peapver”           gchar *

-

+
Forces which PEAP version is used when PEAP is set as the EAP method in
+the “eap” property.  When unset, the version reported by
+the server will be used.  Sometimes when using older RADIUS servers, it
+is necessary to force the client to use a particular PEAP version.  To do
+so, this property may be set to "0" or "1" to force that specific PEAP
+version.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3728,14 +3666,22 @@ to a file containing the certificate or key data

 

 
The “phase2-altsubject-matches” property

 
  “phase2-altsubject-matches” GStrv

-

+
List of strings to be matched against the altSubjectName of the
+certificate presented by the authentication server during the inner
+"phase 2" authentication. If the list is empty, no verification of the
+server certificate's altSubjectName is performed.

 
Flags: Read / Write

 

 

 

 
The “phase2-auth” property

 
  “phase2-auth”              gchar *

-

+
Specifies the allowed "phase 2" inner non-EAP authentication methods when
+an EAP method that uses an inner TLS tunnel is specified in the
+“eap” property.  Recognized non-EAP "phase 2" methods are
+"pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", and "tls".
+Each "phase 2" inner method requires specific parameters for successful
+authentication; see the wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3743,7 +3689,12 @@ to a file containing the certificate or key data

 

 
The “phase2-autheap” property

 
  “phase2-autheap”           gchar *

-

+
Specifies the allowed "phase 2" inner EAP-based authentication methods
+when an EAP method that uses an inner TLS tunnel is specified in the
+“eap” property.  Recognized EAP-based "phase 2" methods are
+"md5", "mschapv2", "otp", "gtc", and "tls". Each "phase 2" inner method
+requires specific parameters for successful authentication; see the
+wpa_supplicant documentation for more details.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3751,14 +3702,28 @@ to a file containing the certificate or key data

 

 
The “phase2-ca-cert” property

 
  “phase2-ca-cert”           GBytes *

-

+
Contains the "phase 2" CA certificate if used by the EAP method specified
+in the “phase2-auth” or “phase2-autheap”
+properties.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_phase2_ca_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “phase2-ca-path” property

 
  “phase2-ca-path”           gchar *

-

+
UTF-8 encoded path to a directory containing PEM or DER formatted
+certificates to be added to the verification chain in addition to the
+certificate specified in the “phase2-ca-cert” property.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3766,21 +3731,58 @@ to a file containing the certificate or key data

 

 
The “phase2-client-cert” property

 
  “phase2-client-cert”       GBytes *

-

+
Contains the "phase 2" client certificate if used by the EAP method
+specified in the “phase2-auth” or
+“phase2-autheap” properties.

+
Certificate data is specified using a "scheme"; two are currently
+supported: blob and path. When using the blob scheme (which is backwards
+compatible with NM 0.7.x) this property should be set to the
+certificate's DER encoded data. When using the path scheme, this property
+should be set to the full UTF-8 encoded path of the certificate, prefixed
+with the string "file://" and ending with a terminating NUL byte. This
+property can be unset even if the EAP method supports CA certificates,
+but this allows man-in-the-middle attacks and is NOT recommended.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_phase2_client_cert() function instead.

 
Flags: Read / Write

 

 

 

 
The “phase2-private-key” property

 
  “phase2-private-key”       GBytes *

-

+
Contains the "phase 2" inner private key when the
+“phase2-auth” or “phase2-autheap” property is
+set to "tls".

+
Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private
+keys and the blob scheme, this property should be set to the
+PKCS#12 data and the “phase2-private-key-password”
+property must be set to password used to decrypt the PKCS#12
+certificate and key. When using PKCS#12 files and the path
+scheme, this property should be set to the full UTF-8 encoded path of the
+key, prefixed with the string "file://" and and ending with a terminating
+NUL byte, and as with the blob scheme the
+“phase2-private-key-password” property must be set to the
+password used to decode the PKCS#12 private key and certificate.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_phase2_private_key() function instead.

 
Flags: Read / Write

 

 

 

 
The “phase2-private-key-password” property

 
  “phase2-private-key-password” gchar *

-

+
The password used to decrypt the "phase 2" private key specified in the
+“phase2-private-key” property when the private key either
+uses the path scheme, or is a PKCS#12 format key.  Setting this
+property directly is not generally necessary except when returning
+secrets to NetworkManager; it is generally set automatically when setting
+the private key by the nm_setting_802_1x_set_phase2_private_key()
+function.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3788,14 +3790,18 @@ to a file containing the certificate or key data

 

 
The “phase2-private-key-password-flags” property

 
  “phase2-private-key-password-flags” NMSettingSecretFlags

-

+
Flags indicating how to handle the
+“phase2-private-key-password” property.

 
Flags: Read / Write

 

 

 

 
The “phase2-subject-match” property

 
  “phase2-subject-match”     gchar *

-

+
Substring to be matched against the subject of the certificate presented
+by the authentication server during the inner "phase 2"
+authentication. When unset, no verification of the authentication server
+certificate's subject is performed.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3803,7 +3809,7 @@ to a file containing the certificate or key data

 

 
The “pin” property

 
  “pin”                      gchar *

-

+
PIN used for EAP authentication methods.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3811,21 +3817,49 @@ to a file containing the certificate or key data

 

 
The “pin-flags” property

 
  “pin-flags”                NMSettingSecretFlags

-

+
Flags indicating how to handle the “pin” property.

 
Flags: Read / Write

 

 

 

 
The “private-key” property

 
  “private-key”              GBytes *

-

+
Contains the private key when the “eap” property is set to
+"tls".

+
Key data is specified using a "scheme"; two are currently supported: blob
+and path. When using the blob scheme and private keys, this property
+should be set to the key's encrypted PEM encoded data. When using private
+keys with the path scheme, this property should be set to the full UTF-8
+encoded path of the key, prefixed with the string "file://" and ending
+with a terminating NUL byte. When using PKCS#12 format private
+keys and the blob scheme, this property should be set to the
+PKCS#12 data and the “private-key-password”
+property must be set to password used to decrypt the PKCS#12
+certificate and key. When using PKCS#12 files and the path
+scheme, this property should be set to the full UTF-8 encoded path of the
+key, prefixed with the string "file://" and and ending with a terminating
+NUL byte, and as with the blob scheme the "private-key-password" property
+must be set to the password used to decode the PKCS#12 private
+key and certificate.

+
Setting this property directly is discouraged; use the
+nm_setting_802_1x_set_private_key() function instead.

+
WARNING: “private-key” is not a "secret" property, and thus
+unencrypted private key data using the BLOB scheme may be readable by
+unprivileged users.  Private keys should always be encrypted with a
+private key password to prevent unauthorized access to unencrypted
+private key data.

 
Flags: Read / Write

 

 

 

 
The “private-key-password” property

 
  “private-key-password”     gchar *

-

+
The password used to decrypt the private key specified in the
+“private-key” property when the private key either uses the
+path scheme, or if the private key is a PKCS#12 format key.  Setting this
+property directly is not generally necessary except when returning
+secrets to NetworkManager; it is generally set automatically when setting
+the private key by the nm_setting_802_1x_set_private_key() function.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3833,14 +3867,17 @@ to a file containing the certificate or key data

 

 
The “private-key-password-flags” property

 
  “private-key-password-flags” NMSettingSecretFlags

-

+
Flags indicating how to handle the “private-key-password”
+property.

 
Flags: Read / Write

 

 

 

 
The “subject-match” property

 
  “subject-match”            gchar *

-

+
Substring to be matched against the subject of the certificate presented
+by the authentication server. When unset, no verification of the
+authentication server certificate's subject is performed.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3848,14 +3885,21 @@ to a file containing the certificate or key data

 

 
The “system-ca-certs” property

 
  “system-ca-certs”          gboolean

-

+
When TRUE, overrides the “ca-path” and
+“phase2-ca-path” properties using the system CA directory
+specified at configure time with the --system-ca-path switch.  The
+certificates in this directory are added to the verification chain in
+addition to any certificates specified by the “ca-cert” and
+“phase2-ca-cert” properties. If the path provided with
+--system-ca-path is rather a file name (bundle of trusted CA certificates),
+it overrides “ca-cert” and “phase2-ca-cert”
+properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index f96005af..3b890722 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -2,13 +2,13 @@
 
-libnm Reference Manual: NMSettingAdsl
+NMSettingAdsl: libnm Reference Manual
-
+
@@ -240,7 +240,6 @@ nm_setting_adsl_new (void<
 

 
Returns

 
 the new empty NMSettingAdsl object

-

 

 
 

@@ -266,7 +265,6 @@ nm_setting_adsl_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -292,7 +290,6 @@ nm_setting_adsl_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -318,7 +315,6 @@ nm_setting_adsl_get_protocol (
 
Returns

 
 the “protocol” property of the setting

-

 
 
 

@@ -344,7 +340,6 @@ nm_setting_adsl_get_encapsulation (
 
Returns

 
 the “encapsulation” property of the setting

-

 
 
 

@@ -370,7 +365,6 @@ nm_setting_adsl_get_vpi (
 
Returns

 
 the “vpi” property of the setting

-

 
 
 

@@ -396,7 +390,6 @@ nm_setting_adsl_get_vci (
 
Returns

 
 the “vci” property of the setting

-

 
 
 

@@ -422,7 +415,6 @@ nm_setting_adsl_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -432,104 +424,78 @@ nm_setting_adsl_get_password_flags (
NM_SETTING_ADSL_SETTING_NAME

 
#define NM_SETTING_ADSL_SETTING_NAME "adsl"
 

-

-

 
 

 

 
NM_SETTING_ADSL_USERNAME

 
#define NM_SETTING_ADSL_USERNAME            "username"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PASSWORD

 
#define NM_SETTING_ADSL_PASSWORD            "password"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PASSWORD_FLAGS

 
#define NM_SETTING_ADSL_PASSWORD_FLAGS      "password-flags"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL

 
#define NM_SETTING_ADSL_PROTOCOL            "protocol"
 

-

-

 

 

 

 
NM_SETTING_ADSL_ENCAPSULATION

 
#define NM_SETTING_ADSL_ENCAPSULATION       "encapsulation"
 

-

-

 

 

 

 
NM_SETTING_ADSL_VPI

 
#define NM_SETTING_ADSL_VPI                 "vpi"
 

-

-

 

 

 

 
NM_SETTING_ADSL_VCI

 
#define NM_SETTING_ADSL_VCI                 "vci"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL_PPPOA

 
#define NM_SETTING_ADSL_PROTOCOL_PPPOA      "pppoa"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL_PPPOE

 
#define NM_SETTING_ADSL_PROTOCOL_PPPOE      "pppoe"
 

-

-

 

 

 

 
NM_SETTING_ADSL_PROTOCOL_IPOATM

 
#define NM_SETTING_ADSL_PROTOCOL_IPOATM     "ipoatm"
 

-

-

 

 

 

 
NM_SETTING_ADSL_ENCAPSULATION_VCMUX

 
#define NM_SETTING_ADSL_ENCAPSULATION_VCMUX "vcmux"
 

-

-

 

 

 

 
NM_SETTING_ADSL_ENCAPSULATION_LLC

 
#define NM_SETTING_ADSL_ENCAPSULATION_LLC   "llc"
 

-

-

 

 
 

@@ -537,7 +503,7 @@ nm_setting_adsl_get_password_flags (
 
The “encapsulation” property

 
  “encapsulation”            gchar *

-

+
Encapsulation of ADSL connection.  Can be "vcmux" or "llc".

 
Flags: Read / Write

 
Default value: NULL

 

@@ -545,7 +511,7 @@ nm_setting_adsl_get_password_flags (
 
The “password” property

 
  “password”                 gchar *

-

+
Password used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -553,14 +519,14 @@ nm_setting_adsl_get_password_flags (
 
The “password-flags” property

 
  “password-flags”           NMSettingSecretFlags

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
 

 

 
The “protocol” property

 
  “protocol”                 gchar *

-

+
ADSL connection protocol.  Can be "pppoa", "pppoe" or "ipoatm".

 
Flags: Read / Write

 
Default value: NULL

 

@@ -568,7 +534,7 @@ nm_setting_adsl_get_password_flags (
 
The “username” property

 
  “username”                 gchar *

-

+
Username used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -576,7 +542,7 @@ nm_setting_adsl_get_password_flags (
 
The “vci” property

 
  “vci”                      guint

-

+
VCI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

 
Default value: 0

@@ -585,7 +551,7 @@ nm_setting_adsl_get_password_flags (
 
The “vpi” property

 
  “vpi”                      guint

-

+
VPI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

 
Default value: 0

@@ -593,7 +559,6 @@ nm_setting_adsl_get_password_flags (
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index 89118318..dc9095c9 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingBluetooth
+NMSettingBluetooth: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -173,7 +173,6 @@ describes a connection to.

 

 
Returns

 
 the Bluetooth address

-

 

 
 

@@ -203,7 +202,6 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).

 
Returns

 
 the type, either NM_SETTING_BLUETOOTH_TYPE_PANU or
 NM_SETTING_BLUETOOTH_TYPE_DUN

-

 
 
 
@@ -213,24 +211,18 @@ either DUN to a DUN-capable device or PANU to a NAP-capable device).

 
NM_SETTING_BLUETOOTH_SETTING_NAME

 
#define NM_SETTING_BLUETOOTH_SETTING_NAME "bluetooth"
 

-

-

 
 

 

 
NM_SETTING_BLUETOOTH_BDADDR

 
#define NM_SETTING_BLUETOOTH_BDADDR    "bdaddr"
 

-

-

 

 

 

 
NM_SETTING_BLUETOOTH_TYPE

 
#define NM_SETTING_BLUETOOTH_TYPE      "type"
 

-

-

 

 

 

@@ -254,7 +246,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.

 

 
The “bdaddr” property

 
  “bdaddr”                   gchar *

-

+
The Bluetooth address of the device.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -262,14 +254,14 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.

 

 
The “type” property

 
  “type”                     gchar *

-

+
Either "dun" for Dial-Up Networking connections or "panu" for Personal
+Area Networking connections to devices supporting the NAP profile.

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 3df3d490..edf00c34 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingBond
+NMSettingBond: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -259,7 +259,6 @@ using 
 
Returns

 
 the number of bonding options

-

 
 
 

@@ -316,7 +315,6 @@ modified. 

 
 TRUE on success if the index was valid and an option was found,
 FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)

-

 
 
 

@@ -354,7 +352,6 @@ nm_setting_bond_get_option_by_name (
Returns

 
 the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified

-

 
 
 

@@ -401,7 +398,6 @@ that conflict with each other.

 
Returns

 
 TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -439,7 +435,6 @@ list.

 
Returns

 
 TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -482,7 +477,6 @@ the name
 is valid for the given name.
 If the name
 is not a valid option, FALSE will be returned.

-

 
 
 

@@ -544,7 +538,6 @@ nm_setting_bond_get_option_default (
Returns

 
 the value of the bond option if not overridden by an entry in
 the “options” property.

-

 
 
 
@@ -554,136 +547,102 @@ the 
NM_SETTING_BOND_SETTING_NAME

 
#define NM_SETTING_BOND_SETTING_NAME "bond"
 

-

-

 
 

 

 
NM_SETTING_BOND_OPTIONS

 
#define NM_SETTING_BOND_OPTIONS "options"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_MODE

 
#define NM_SETTING_BOND_OPTION_MODE             "mode"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_MIIMON

 
#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_DOWNDELAY

 
#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_UPDELAY

 
#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_INTERVAL

 
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

 
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_VALIDATE

 
#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_PRIMARY

 
#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_PRIMARY_RESELECT

 
#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_FAIL_OVER_MAC

 
#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_USE_CARRIER

 
#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_AD_SELECT

 
#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY

 
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_RESEND_IGMP

 
#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
 

-

-

 

 

 

 
NM_SETTING_BOND_OPTION_LACP_RATE

 
#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
 

-

-

 

 
 

@@ -691,13 +650,15 @@ the 
 
The “options” property

 
  “options”                  GHashTable *

-

+
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]).

+
Type: GHashTable(utf8,utf8)

 
Flags: Read / Write

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index addccbb4..05bbe151 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingBridge
+NMSettingBridge: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -246,7 +246,6 @@ nm_setting_bridge_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -272,7 +271,6 @@ nm_setting_bridge_get_stp (
 
Returns

 
 the “stp” property of the setting

-

 
 
 

@@ -298,7 +296,6 @@ nm_setting_bridge_get_priority (
 
Returns

 
 the “priority” property of the setting

-

 
 
 

@@ -324,7 +321,6 @@ nm_setting_bridge_get_forward_delay (
 
Returns

 
 the “forward-delay” property of the setting

-

 
 
 

@@ -350,7 +346,6 @@ nm_setting_bridge_get_hello_time (
 
Returns

 
 the “hello-time” property of the setting

-

 
 
 

@@ -376,7 +371,6 @@ nm_setting_bridge_get_max_age (
 
Returns

 
 the “max-age” property of the setting

-

 
 
 

@@ -402,7 +396,6 @@ nm_setting_bridge_get_ageing_time (
 
Returns

 
 the “ageing-time” property of the setting

-

 
 
 
@@ -412,64 +405,48 @@ nm_setting_bridge_get_ageing_time (
NM_SETTING_BRIDGE_SETTING_NAME

 
#define NM_SETTING_BRIDGE_SETTING_NAME "bridge"
 

-

-

 
 

 

 
NM_SETTING_BRIDGE_MAC_ADDRESS

 
#define NM_SETTING_BRIDGE_MAC_ADDRESS    "mac-address"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_STP

 
#define NM_SETTING_BRIDGE_STP            "stp"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PRIORITY

 
#define NM_SETTING_BRIDGE_PRIORITY       "priority"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_FORWARD_DELAY

 
#define NM_SETTING_BRIDGE_FORWARD_DELAY  "forward-delay"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_HELLO_TIME

 
#define NM_SETTING_BRIDGE_HELLO_TIME     "hello-time"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_MAX_AGE

 
#define NM_SETTING_BRIDGE_MAX_AGE        "max-age"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_AGEING_TIME

 
#define NM_SETTING_BRIDGE_AGEING_TIME    "ageing-time"
 

-

-

 

 
 

@@ -477,7 +454,7 @@ nm_setting_bridge_get_ageing_time (
 
The “ageing-time” property

 
  “ageing-time”              guint

-

+
The Ethernet MAC address aging time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 1000000

 
Default value: 300

@@ -486,7 +463,7 @@ nm_setting_bridge_get_ageing_time (
 
The “forward-delay” property

 
  “forward-delay”            guint

-

+
The Spanning Tree Protocol (STP) forwarding delay, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 30

 
Default value: 15

@@ -495,7 +472,7 @@ nm_setting_bridge_get_ageing_time (
 
The “hello-time” property

 
  “hello-time”               guint

-

+
The Spanning Tree Protocol (STP) hello time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 10

 
Default value: 2

@@ -504,7 +481,9 @@ nm_setting_bridge_get_ageing_time (
 
The “mac-address” property

 
  “mac-address”              gchar *

-

+
If specified, the MAC address of bridge. When creating a new bridge, this
+MAC address will be set. When matching an existing (outside
+NetworkManager created) bridge, this MAC address must match.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -512,7 +491,7 @@ nm_setting_bridge_get_ageing_time (
 
The “max-age” property

 
  “max-age”                  guint

-

+
The Spanning Tree Protocol (STP) maximum message age, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 40

 
Default value: 20

@@ -521,7 +500,9 @@ nm_setting_bridge_get_ageing_time (
 
The “priority” property

 
  “priority”                 guint

-

+
Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower
+values are "better"; the lowest priority bridge will be elected the root
+bridge.

 
Flags: Read / Write / Construct

 
Allowed values: <= 65535

 
Default value: 32768

@@ -530,14 +511,13 @@ nm_setting_bridge_get_ageing_time (
 
The “stp” property

 
  “stp”                      gboolean

-

+
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index c2c4f18b..b6aee68e 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingBridgePort
+NMSettingBridgePort: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -178,7 +178,6 @@ nm_setting_bridge_port_get_priority (
 
Returns

 
 the “priority” property of the setting

-

 
 
 

@@ -204,7 +203,6 @@ nm_setting_bridge_port_get_path_cost (
 
Returns

 
 the “path-cost” property of the setting

-

 
 
 

@@ -231,7 +229,6 @@ nm_setting_bridge_port_get_hairpin_mode
 

 
Returns

 
 the “hairpin-mode” property of the setting

-

 

 
 
@@ -241,32 +238,24 @@ nm_setting_bridge_port_get_hairpin_mode
 
NM_SETTING_BRIDGE_PORT_SETTING_NAME

 
#define NM_SETTING_BRIDGE_PORT_SETTING_NAME "bridge-port"
 

-

-

 
 

 

 
NM_SETTING_BRIDGE_PORT_PRIORITY

 
#define NM_SETTING_BRIDGE_PORT_PRIORITY     "priority"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PORT_PATH_COST

 
#define NM_SETTING_BRIDGE_PORT_PATH_COST    "path-cost"
 

-

-

 

 

 

 
NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE

 
#define NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE "hairpin-mode"
 

-

-

 

 
 

@@ -274,7 +263,8 @@ nm_setting_bridge_port_get_hairpin_mode
 

 
The “hairpin-mode” property

 
  “hairpin-mode”             gboolean

-

+
Enables or disabled "hairpin mode" for the port, which allows frames to
+be sent back out through the port the frame was received on.

 
Flags: Read / Write

 
Default value: FALSE

 

@@ -282,7 +272,8 @@ nm_setting_bridge_port_get_hairpin_mode
 

 
The “path-cost” property

 
  “path-cost”                guint

-

+
The Spanning Tree Protocol (STP) port cost for destinations via this
+port.

 
Flags: Read / Write / Construct

 
Allowed values: <= 65535

 
Default value: 100

@@ -291,7 +282,7 @@ nm_setting_bridge_port_get_hairpin_mode
 

 
The “priority” property

 
  “priority”                 guint

-

+
The Spanning Tree Protocol (STP) priority of this bridge port.

 
Flags: Read / Write / Construct

 
Allowed values: <= 63

 
Default value: 32

@@ -299,7 +290,6 @@ nm_setting_bridge_port_get_hairpin_mode
 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 23dd4122..18180f06 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingCdma
+NMSettingCdma: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -170,7 +170,6 @@ nm_setting_cdma_new (void<
 

 
Returns

 
 the new empty NMSettingCdma object

-

 

 
 

@@ -196,7 +195,6 @@ nm_setting_cdma_get_number (
 
Returns

 
 the “number” property of the setting

-

 
 
 

@@ -222,7 +220,6 @@ nm_setting_cdma_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -248,7 +245,6 @@ nm_setting_cdma_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -274,7 +270,6 @@ nm_setting_cdma_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -284,40 +279,30 @@ nm_setting_cdma_get_password_flags (
NM_SETTING_CDMA_SETTING_NAME

 
#define NM_SETTING_CDMA_SETTING_NAME "cdma"
 

-

-

 
 

 

 
NM_SETTING_CDMA_NUMBER

 
#define NM_SETTING_CDMA_NUMBER         "number"
 

-

-

 

 

 

 
NM_SETTING_CDMA_USERNAME

 
#define NM_SETTING_CDMA_USERNAME       "username"
 

-

-

 

 

 

 
NM_SETTING_CDMA_PASSWORD

 
#define NM_SETTING_CDMA_PASSWORD       "password"
 

-

-

 

 

 

 
NM_SETTING_CDMA_PASSWORD_FLAGS

 
#define NM_SETTING_CDMA_PASSWORD_FLAGS "password-flags"
 

-

-

 

 
 

@@ -325,7 +310,9 @@ nm_setting_cdma_get_password_flags (
 
The “number” property

 
  “number”                   gchar *

-

+
The number to dial to establish the connection to the CDMA-based mobile
+broadband network, if any.  If not specified, the default number (777)
+is used when required.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -333,7 +320,9 @@ nm_setting_cdma_get_password_flags (
 
The “password” property

 
  “password”                 gchar *

-

+
The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -341,21 +330,22 @@ nm_setting_cdma_get_password_flags (
 
The “password-flags” property

 
  “password-flags”           NMSettingSecretFlags

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
 

 

 
The “username” property

 
  “username”                 gchar *

-

+
The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index ebb16ae9..f33e2b88 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingConnection
+NMSettingConnection: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -188,6 +188,14 @@
 
 
+
+
+
+
+
+
+
+
+
@@ -399,6 +412,10 @@
 
+
+
+
+
@@ -406,6 +423,10 @@
 
+
+
+
+
@@ -414,7 +435,9 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GEnum
+    ╰── NMSettingConnectionAutoconnectSlaves
+    GObject
     ╰── NMSetting
         ╰── NMSettingConnection
 

@@ -436,7 +459,6 @@ nm_setting_connection_new (void
 
Returns

 
 the new empty NMSettingConnection object

-

 

 
 

@@ -463,7 +485,6 @@ nm_setting_connection_get_id (
 
Returns

 
 the connection ID

-

 
 
 

@@ -490,7 +511,6 @@ nm_setting_connection_get_uuid (
 
Returns

 
 the connection UUID

-

 
 
 

@@ -518,7 +538,6 @@ nm_setting_connection_get_interface_name
 

 
Returns

 
 the connection's interface name

-

 

 
 

@@ -546,7 +565,6 @@ nm_setting_connection_get_connection_type
 

 
Returns

 
 the connection type

-

 

 
 

@@ -573,7 +591,6 @@ nm_setting_connection_get_autoconnect (
 
Returns

 
 the connection's autoconnect behavior

-

 
 
 

@@ -602,7 +619,6 @@ The higher number, the higher priority.

 

 
Returns

 
 the connection's autoconnect priority

-

 

 
 

@@ -629,7 +645,6 @@ nm_setting_connection_get_timestamp (
 
Returns

 
 the connection's timestamp

-

 
 
 

@@ -656,7 +671,6 @@ nm_setting_connection_get_read_only (
 
Returns

 
 TRUE if the connection is read-only, FALSE if it is not

-

 
 
 

@@ -685,7 +699,6 @@ property of this setting.

 

 
Returns

 
 the number of permissions entires

-

 

 
 

@@ -742,7 +755,6 @@ of this setting.

 
Returns

 
 TRUE if a permission was returned, FALSE if idx
 was invalid

-

 
 
 

@@ -769,7 +781,6 @@ nm_setting_connection_get_zone (
 
Returns

 
 the trust level of a connection

-

 
 
 

@@ -806,7 +817,6 @@ nm_setting_connection_permissions_user_allowed
 
Returns

 
 TRUE if the requested user is allowed to view this connection,
 FALSE if the given user is not allowed to view this connection

-

 
 
 

@@ -861,7 +871,6 @@ list, FALSE if ptypepitem
 was invalid or it the permission was already
 present in the list

-

 
 
 

@@ -945,7 +954,6 @@ be a username. See 
 
Returns

 
 TRUE if the permission was found and removed; FALSE if it was not.

-

 
 
 

@@ -973,7 +981,6 @@ nm_setting_connection_get_master (
Returns

 
 interface name of the master device or UUID of the master
 connection.

-

 
 
 

@@ -1010,7 +1017,6 @@ against setting
 
Returns

 
 TRUE if connection is of the given slave type
 

-

 
 
 

@@ -1037,17 +1043,45 @@ nm_setting_connection_get_slave_type (
 
Returns

 
 the type of slave this connection is, if any

-

 
 
 

 

+
nm_setting_connection_get_autoconnect_slaves ()

+
NMSettingConnectionAutoconnectSlaves
+nm_setting_connection_get_autoconnect_slaves
+                               (NMSettingConnection *setting);

+
Returns the “autoconnect-slaves” property of the connection.

+

+
Parameters

+

 
 

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
+NMSettingConnectionAutoconnectSlaves
+
+nm_setting_connection_get_autoconnect_slaves ()
+

 guint32
 
 
@@ -256,6 +264,11 @@
 Read / Write / Construct
 

 
NMSettingConnectionAutoconnectSlavesautoconnect-slavesRead / Write / Construct

 guint
 gateway-ping-timeout
 Read / Write / Construct

 

 #defineNM_SETTING_CONNECTION_AUTOCONNECT_SLAVES
#define
 NM_SETTING_CONNECTION_SECONDARIES
 

 
NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT
 

 
enumNMSettingConnectionAutoconnectSlaves

 struct
 NMSettingConnection
 

+++++
+
+
+
+
+
+





setting
the NMSettingConnection
 

+

+

+
Returns

+
 whether slaves of the connection should be activated together
+with the connection.

+

+
Since: 1.0.4

+

+

+

 
nm_setting_connection_get_num_secondaries ()

 
guint32
 nm_setting_connection_get_num_secondaries
                                (NMSettingConnection *setting);

 

-
Parameters

+
Parameters

 
@@ -1062,9 +1096,8 @@ nm_setting_connection_get_num_secondaries
 

 
 


 

 

-
Returns

+
Returns

 
 the number of configured secondary connection UUIDs

-

 

 

 

@@ -1074,7 +1107,7 @@ nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
                                      guint32 idx);
 

-
Parameters

+
Parameters

 
@@ -1096,10 +1129,9 @@ nm_setting_connection_get_secondary (
 
 

-
Returns

+
Returns

 
 the secondary connection UUID at index idx
 

-

 

 
 

@@ -1110,7 +1142,7 @@ nm_setting_connection_add_secondary (const char *sec_uuid);
 
Adds a new secondary connetion UUID to the setting.

 

-
Parameters

+
Parameters

 

 
 

@@ -1132,10 +1164,9 @@ nm_setting_connection_add_secondary (
 
 

-
Returns

+
Returns

 
 TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present

-

 

 
 

@@ -1148,7 +1179,7 @@ nm_setting_connection_remove_secondary
 
Removes the secondary coonnection UUID at index idx
 .

 

-
Parameters

+
Parameters

 

 
 

@@ -1180,7 +1211,7 @@ nm_setting_connection_remove_secondary_by_value
 
Removes the secondary coonnection UUID sec_uuid
 .

 

-
Parameters

+
Parameters

 

 
 

@@ -1202,9 +1233,8 @@ nm_setting_connection_remove_secondary_by_value
 

 
 


 

 

-
Returns

+
Returns

 
 TRUE if the secondary connection UUID was found and removed; FALSE if it was not.

-

 

 

 

@@ -1214,7 +1244,7 @@ nm_setting_connection_remove_secondary_by_value
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);
 

-
Parameters

+
Parameters

 
@@ -1229,10 +1259,9 @@ nm_setting_connection_get_gateway_ping_timeout
 

 
 


 

 

-
Returns

+
Returns

 
 the value contained in the “gateway-ping-timeout”
 property.

-

 

 
 
@@ -1242,144 +1271,155 @@ property.

 
NM_SETTING_CONNECTION_SETTING_NAME

 
#define NM_SETTING_CONNECTION_SETTING_NAME "connection"
 

-

-

 
 

 

 
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN

 
#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MIN -999
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX

 
#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_MAX 999
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT

 
#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY_DEFAULT 0
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_ID

 
#define NM_SETTING_CONNECTION_ID             "id"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_UUID

 
#define NM_SETTING_CONNECTION_UUID           "uuid"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_INTERFACE_NAME

 
#define NM_SETTING_CONNECTION_INTERFACE_NAME "interface-name"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_TYPE

 
#define NM_SETTING_CONNECTION_TYPE           "type"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_AUTOCONNECT

 
#define NM_SETTING_CONNECTION_AUTOCONNECT    "autoconnect"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY

 
#define NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY "autoconnect-priority"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_TIMESTAMP

 
#define NM_SETTING_CONNECTION_TIMESTAMP      "timestamp"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_READ_ONLY

 
#define NM_SETTING_CONNECTION_READ_ONLY      "read-only"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_PERMISSIONS

 
#define NM_SETTING_CONNECTION_PERMISSIONS    "permissions"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_ZONE

 
#define NM_SETTING_CONNECTION_ZONE           "zone"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_MASTER

 
#define NM_SETTING_CONNECTION_MASTER         "master"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_SLAVE_TYPE

 
#define NM_SETTING_CONNECTION_SLAVE_TYPE     "slave-type"
 

-

-

+

+

+

+
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES

+
#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves"
+

 

 

 

 
NM_SETTING_CONNECTION_SECONDARIES

 
#define NM_SETTING_CONNECTION_SECONDARIES    "secondaries"
 

-

-

 

 

 

 
NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT

 
#define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout"
 

-

-

+

+

+

+
enum NMSettingConnectionAutoconnectSlaves

+
NMSettingConnectionAutoconnectSlaves values indicate whether slave connections
+should be activated when master is activated.

+

+
Members

+

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





NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT

+
default value

+		 
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO

+
slaves are not brought up when
+  master is activated

+		 
NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES

+
slaves are brought up when
+  master is activated

+		 

+

 

 

 

@@ -1414,12 +1454,27 @@ The higher number means higher priority.

 

 

 

+
The “autoconnect-slaves” property

+
  “autoconnect-slaves”       NMSettingConnectionAutoconnectSlaves

+
Whether or not slaves of this connection should be automatically brought up
+when NetworkManager activates this connection. This only has a real effect
+for master connections.
+The permitted values are: 0: leave slave connections untouched,
+1: activate all the slave connections with this connection, -1: default.
+If -1 (default) is set, global connection.autoconnect-slaves is read to
+determine the real value. If it is default as well, this fallbacks to 0.

+
Flags: Read / Write / Construct

+
Default value: NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT

+
Since: 1.0.4

+

+

+

 
The “gateway-ping-timeout” property

 
  “gateway-ping-timeout”     guint

 
If greater than zero, delay success of IP addressing until either the
 timeout is reached, or an IP gateway replies to a ping.

 
Flags: Read / Write / Construct

-
Allowed values: <= 30

+
Allowed values: <= 600

 
Default value: 0

 

 

@@ -1557,7 +1612,6 @@ firewall.

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index ebfedd69..a662d108 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingDcb
+NMSettingDcb: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -453,7 +453,6 @@ nm_setting_dcb_get_app_fcoe_flags (
 
Returns

 
 the “app-fcoe-flags” property of the setting

-

 
 
 

@@ -479,7 +478,6 @@ nm_setting_dcb_get_app_fcoe_priority (
 
Returns

 
 the “app-fcoe-priority” property of the setting

-

 
 
 

@@ -505,7 +503,6 @@ nm_setting_dcb_get_app_fcoe_mode (
 
Returns

 
 the “app-fcoe-mode” property of the setting

-

 
 
 

@@ -531,7 +528,6 @@ nm_setting_dcb_get_app_iscsi_flags (
 
Returns

 
 the “app-iscsi-flags” property of the setting

-

 
 
 

@@ -557,7 +553,6 @@ nm_setting_dcb_get_app_iscsi_priority (
 
Returns

 
 the “app-iscsi-priority” property of the setting

-

 
 
 

@@ -583,7 +578,6 @@ nm_setting_dcb_get_app_fip_flags (
 
Returns

 
 the “app-fip-flags” property of the setting

-

 
 
 

@@ -609,7 +603,6 @@ nm_setting_dcb_get_app_fip_priority (
 
Returns

 
 the “app-fip-priority” property of the setting

-

 
 
 

@@ -636,7 +629,6 @@ nm_setting_dcb_get_priority_flow_control_flags
 

 
Returns

 
 the “priority-flow-control-flags” property of the setting

-

 

 
 

@@ -673,7 +665,6 @@ nm_setting_dcb_get_priority_flow_control
 
 TRUE if flow control is enabled for the given user_priority
 ,
 FALSE if not enabled

-

 
 
 

@@ -738,7 +729,6 @@ nm_setting_dcb_get_priority_group_flags
 

 
Returns

 
 the “priority-group-flags” property of the setting

-

 

 
 

@@ -775,7 +765,6 @@ nm_setting_dcb_get_priority_group_id (“priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 
 
 

@@ -852,7 +841,6 @@ nm_setting_dcb_get_priority_group_bandwidth
 .  These values are
 only valid when “priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 
 
 

@@ -928,7 +916,6 @@ nm_setting_dcb_get_priority_bandwidth (“priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 
 
 

@@ -1005,7 +992,6 @@ nm_setting_dcb_get_priority_strict_bandwidth
 may use all of the bandwidth allocated to its
 assigned group, or FALSE if not. These values are only valid when
 “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

-

 
 
 

@@ -1083,7 +1069,6 @@ nm_setting_dcb_get_priority_traffic_class
 . These values are only
 valid when “priority-group-flags” includes the
 NM_SETTING_DCB_FLAG_ENABLE flag.

-

 
 
 

@@ -1094,8 +1079,6 @@ nm_setting_dcb_set_priority_traffic_class
                                (NMSettingDcb *setting,
                                 guint user_priority,
                                 guint traffic_class);
-

-

 
 
 

@@ -1104,8 +1087,6 @@ nm_setting_dcb_set_priority_traffic_class
 
NM_SETTING_DCB_SETTING_NAME

 
#define NM_SETTING_DCB_SETTING_NAME "dcb"
 

-

-

 

 

 

@@ -1172,120 +1153,90 @@ peer configuration advertisements

 
NM_SETTING_DCB_APP_FCOE_FLAGS

 
#define NM_SETTING_DCB_APP_FCOE_FLAGS         "app-fcoe-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FCOE_PRIORITY

 
#define NM_SETTING_DCB_APP_FCOE_PRIORITY      "app-fcoe-priority"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FCOE_MODE

 
#define NM_SETTING_DCB_APP_FCOE_MODE          "app-fcoe-mode"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_ISCSI_FLAGS

 
#define NM_SETTING_DCB_APP_ISCSI_FLAGS        "app-iscsi-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_ISCSI_PRIORITY

 
#define NM_SETTING_DCB_APP_ISCSI_PRIORITY     "app-iscsi-priority"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FIP_FLAGS

 
#define NM_SETTING_DCB_APP_FIP_FLAGS          "app-fip-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_APP_FIP_PRIORITY

 
#define NM_SETTING_DCB_APP_FIP_PRIORITY       "app-fip-priority"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS

 
#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS  "priority-flow-control-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_FLOW_CONTROL

 
#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL        "priority-flow-control"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_GROUP_FLAGS

 
#define NM_SETTING_DCB_PRIORITY_GROUP_FLAGS      "priority-group-flags"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_GROUP_ID

 
#define NM_SETTING_DCB_PRIORITY_GROUP_ID         "priority-group-id"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH

 
#define NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH  "priority-group-bandwidth"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_BANDWIDTH

 
#define NM_SETTING_DCB_PRIORITY_BANDWIDTH        "priority-bandwidth"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH

 
#define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 

-

-

 

 

 

 
NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS

 
#define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 

-

-

 

 
 

@@ -1293,14 +1244,17 @@ peer configuration advertisements

 

 
The “app-fcoe-flags” property

 
  “app-fcoe-flags”           NMSettingDcbFlags

-

+
Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may
+be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 

 

 

 
The “app-fcoe-mode” property

 
  “app-fcoe-mode”            gchar *

-

+
The FCoE controller mode; either NM_SETTING_DCB_FCOE_MODE_FABRIC
+(default) or NM_SETTING_DCB_FCOE_MODE_VN2VN.

 
Flags: Read / Write / Construct

 
Default value: "fabric"

 

@@ -1308,7 +1262,9 @@ peer configuration advertisements

 

 
The “app-fcoe-priority” property

 
  “app-fcoe-priority”        gint

-

+
The highest User Priority (0 - 7) which FCoE frames should use, or -1 for
+default priority.  Only used when the “app-fcoe-flags”
+property includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,7]

 
Default value: -1

@@ -1317,14 +1273,18 @@ peer configuration advertisements

 

 
The “app-fip-flags” property

 
  “app-fip-flags”            NMSettingDcbFlags

-

+
Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may
+be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 

 

 

 
The “app-fip-priority” property

 
  “app-fip-priority”         gint

-

+
The highest User Priority (0 - 7) which FIP frames should use, or -1 for
+default priority.  Only used when the “app-fip-flags”
+property includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,7]

 
Default value: -1

@@ -1333,14 +1293,18 @@ peer configuration advertisements

 

 
The “app-iscsi-flags” property

 
  “app-iscsi-flags”          NMSettingDcbFlags

-

+
Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags
+may be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 

 

 

 
The “app-iscsi-priority” property

 
  “app-iscsi-priority”       gint

-

+
The highest User Priority (0 - 7) which iSCSI frames should use, or -1
+for default priority. Only used when the “app-iscsi-flags”
+property includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,7]

 
Default value: -1

@@ -1349,62 +1313,86 @@ peer configuration advertisements

 

 
The “priority-bandwidth” property

 
  “priority-bandwidth”       GArray *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates the percentage of bandwidth of
+the priority's assigned group that the priority may use.  The sum of all
+percentages for priorities which belong to the same group must total 100
+percent.

+
Element-type: guint

 
Flags: Read / Write

 

 

 

 
The “priority-flow-control” property

 
  “priority-flow-control”    GArray *

-

+
An array of 8 boolean values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates whether or not the corresponding
+priority should transmit priority pause.

+
Element-type: gboolean

 
Flags: Read / Write

 

 

 

 
The “priority-flow-control-flags” property

 
  “priority-flow-control-flags” NMSettingDcbFlags

-

+
Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC).
+Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 

 

 

 
The “priority-group-bandwidth” property

 
  “priority-group-bandwidth” GArray *

-

+
An array of 8 uint values, where the array index corresponds to the
+Priority Group ID (0 - 7) and the value indicates the percentage of link
+bandwidth allocated to that group.  Allowed values are 0 - 100, and the
+sum of all values must total 100 percent.

+
Element-type: guint

 
Flags: Read / Write

 

 

 

 
The “priority-group-flags” property

 
  “priority-group-flags”     NMSettingDcbFlags

-

+
Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be
+any combination of NM_SETTING_DCB_FLAG_ENABLE,
+NM_SETTING_DCB_FLAG_ADVERTISE, and NM_SETTING_DCB_FLAG_WILLING.

 
Flags: Read / Write

 

 

 

 
The “priority-group-id” property

 
  “priority-group-id”        GArray *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed
+Priority Group ID values are 0 - 7 or 15 for the unrestricted group.

+
Element-type: guint

 
Flags: Read / Write

 

 

 

 
The “priority-strict-bandwidth” property

 
  “priority-strict-bandwidth” GArray *

-

+
An array of 8 boolean values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates whether or not the priority may
+use all of the bandwidth allocated to its assigned group.

+
Element-type: gboolean

 
Flags: Read / Write

 

 

 

 
The “priority-traffic-class” property

 
  “priority-traffic-class”   GArray *

-

+
An array of 8 uint values, where the array index corresponds to the User
+Priority (0 - 7) and the value indicates the traffic class (0 - 7) to
+which the priority is mapped.

+
Element-type: guint

 
Flags: Read / Write

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24

 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index 13bf6b87..f1975597 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingGeneric
+NMSettingGeneric: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -97,13 +97,10 @@ nm_setting_generic_new (void
NM_SETTING_GENERIC_SETTING_NAME

 
#define NM_SETTING_GENERIC_SETTING_NAME "generic"
 

-

-

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 2da1fa2e..bee69df6 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingGsm
+NMSettingGsm: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -255,7 +255,6 @@ nm_setting_gsm_new (void
 
Returns

 
 the new empty NMSettingGsm object

-

 
 
 

@@ -281,7 +280,6 @@ nm_setting_gsm_get_number (
 
Returns

 
 the “number” property of the setting

-

 
 
 

@@ -307,7 +305,6 @@ nm_setting_gsm_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -333,7 +330,6 @@ nm_setting_gsm_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -359,7 +355,6 @@ nm_setting_gsm_get_apn (
 
Returns

 
 the “apn” property of the setting

-

 
 
 

@@ -385,7 +380,6 @@ nm_setting_gsm_get_network_id (
 
Returns

 
 the “network-id” property of the setting

-

 
 
 

@@ -411,7 +405,6 @@ nm_setting_gsm_get_pin (
 
Returns

 
 the “pin” property of the setting

-

 
 
 

@@ -437,7 +430,6 @@ nm_setting_gsm_get_home_only (
 
Returns

 
 the “home-only” property of the setting

-

 
 
 

@@ -463,7 +455,6 @@ nm_setting_gsm_get_pin_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “pin”

-

 
 
 

@@ -489,7 +480,6 @@ nm_setting_gsm_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -499,80 +489,60 @@ nm_setting_gsm_get_password_flags (
NM_SETTING_GSM_SETTING_NAME

 
#define NM_SETTING_GSM_SETTING_NAME "gsm"
 

-

-

 
 

 

 
NM_SETTING_GSM_NUMBER

 
#define NM_SETTING_GSM_NUMBER         "number"
 

-

-

 

 

 

 
NM_SETTING_GSM_USERNAME

 
#define NM_SETTING_GSM_USERNAME       "username"
 

-

-

 

 

 

 
NM_SETTING_GSM_PASSWORD

 
#define NM_SETTING_GSM_PASSWORD       "password"
 

-

-

 

 

 

 
NM_SETTING_GSM_PASSWORD_FLAGS

 
#define NM_SETTING_GSM_PASSWORD_FLAGS "password-flags"
 

-

-

 

 

 

 
NM_SETTING_GSM_APN

 
#define NM_SETTING_GSM_APN            "apn"
 

-

-

 

 

 

 
NM_SETTING_GSM_NETWORK_ID

 
#define NM_SETTING_GSM_NETWORK_ID     "network-id"
 

-

-

 

 

 

 
NM_SETTING_GSM_PIN

 
#define NM_SETTING_GSM_PIN            "pin"
 

-

-

 

 

 

 
NM_SETTING_GSM_PIN_FLAGS

 
#define NM_SETTING_GSM_PIN_FLAGS      "pin-flags"
 

-

-

 

 

 

 
NM_SETTING_GSM_HOME_ONLY

 
#define NM_SETTING_GSM_HOME_ONLY      "home-only"
 

-

-

 

 
 

@@ -580,7 +550,13 @@ nm_setting_gsm_get_password_flags (
 
The “apn” property

 
  “apn”                      gchar *

-

+
The GPRS Access Point Name specifying the APN used when establishing a
+data session with the GSM-based network.  The APN often determines how
+the user will be billed for their network usage and whether the user has
+access to the Internet or just a provider-specific walled-garden, so it
+is important to use the correct APN for the user's mobile broadband plan.
+The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
+03.60 Section 14.9.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -588,7 +564,8 @@ nm_setting_gsm_get_password_flags (
 
The “home-only” property

 
  “home-only”                gboolean

-

+
When TRUE, only connections to the home network will be allowed.
+Connections to roaming networks will not be made.

 
Flags: Read / Write

 
Default value: FALSE

 
@@ -596,7 +573,11 @@ nm_setting_gsm_get_password_flags (
 
The “network-id” property

 
  “network-id”               gchar *

-

+
The Network ID (GSM LAI format, ie MCC-MNC) to force specific network
+registration.  If the Network ID is specified, NetworkManager will
+attempt to force the device to register only on the specified network.
+This can be used to ensure that the device does not roam when direct
+roaming control of the device is not otherwise possible.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -604,7 +585,10 @@ nm_setting_gsm_get_password_flags (
 
The “number” property

 
  “number”                   gchar *

-

+
Number to dial when establishing a PPP data session with the GSM-based
+mobile broadband network.  Many modems do not require PPP for connections
+to the mobile network and thus this property should be left blank, which
+allows NetworkManager to select the appropriate settings automatically.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -612,7 +596,9 @@ nm_setting_gsm_get_password_flags (
 
The “password” property

 
  “password”                 gchar *

-

+
The password used to authenticate with the network, if required.  Many
+providers do not require a password, or accept any password.  But if a
+password is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 
@@ -620,14 +606,16 @@ nm_setting_gsm_get_password_flags (
 
The “password-flags” property

 
  “password-flags”           NMSettingSecretFlags

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
 

 

 
The “pin” property

 
  “pin”                      gchar *

-

+
If the SIM is locked with a PIN it must be unlocked before any other
+operations are requested.  Specify the PIN here to allow operation of the
+device.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -635,21 +623,22 @@ nm_setting_gsm_get_password_flags (
 
The “pin-flags” property

 
  “pin-flags”                NMSettingSecretFlags

-

+
Flags indicating how to handle the “pin” property.

 
Flags: Read / Write

 
 

 

 
The “username” property

 
  “username”                 gchar *

-

+
The username used to authenticate with the network, if required.  Many
+providers do not require a username, or accept any username.  But if a
+username is required, it is specified here.

 
Flags: Read / Write

 
Default value: NULL

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index 95b3dc6d..9a40fd47 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingIP4Config
+NMSettingIP4Config: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -181,7 +181,6 @@ property.

 
Returns

 
 the configured Client ID to send to the DHCP server when requesting
 addresses via DHCP.

-

 
 
 
@@ -191,16 +190,12 @@ addresses via DHCP.

 
NM_SETTING_IP4_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP4_CONFIG_SETTING_NAME "ipv4"
 

-

-

 
 

 

 
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID

 
#define NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID     "dhcp-client-id"
 

-

-

 

 

 

@@ -252,14 +247,14 @@ through that interface to the default network.

 

 
The “dhcp-client-id” property

 
  “dhcp-client-id”           gchar *

-

+
A string sent to the DHCP server to identify the local machine which the
+DHCP server may use to customize the DHCP lease and options.

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 75c33f7f..7d4408c7 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingIP6Config
+NMSettingIP6Config: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -187,7 +187,6 @@ property.

 

 
Returns

 
 IPv6 Privacy Extensions configuration value (NMSettingIP6ConfigPrivacy).

-

 

 
 
@@ -197,16 +196,12 @@ property.

 
NM_SETTING_IP6_CONFIG_SETTING_NAME

 
#define NM_SETTING_IP6_CONFIG_SETTING_NAME "ipv6"
 

-

-

 
 

 

 
NM_SETTING_IP6_CONFIG_IP6_PRIVACY

 
#define NM_SETTING_IP6_CONFIG_IP6_PRIVACY "ip6-privacy"
 

-

-

 

 

 

@@ -316,14 +311,23 @@ are enabled and temporary addresses are preferred over public addresses

 

 
The “ip6-privacy” property

 
  “ip6-privacy”              NMSettingIP6ConfigPrivacy

-

+
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: -1: unknown,
+0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary
+addresses).

+
Having a per-connection setting set to "-1" (unknown) means fallback to
+global configuration "ipv6.ip6-privacy".

+
If also global configuration is unspecified or set to "-1", fallback to read
+"/proc/sys/net/ipv6/conf/default/use_tempaddr".

 
Flags: Read / Write / Construct

 
Default value: NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index ae386b27..9ec05095 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingIPConfig
+NMSettingIPConfig: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -952,7 +952,6 @@ to.

 

 
Returns

 
 TRUE if the objects contain the same values, FALSE if they do not.

-

 

 
 

@@ -1009,7 +1008,6 @@ object.

 

 
Returns

 
 the IP address family

-

 

 
 

@@ -1036,7 +1034,6 @@ nm_ip_address_get_address (
 
Returns

 
 the IP address

-

 
 
 

@@ -1083,8 +1080,9 @@ nm_ip_address_get_address_binary (addr
  must point to a buffer that is the correct size for address
 's family.

+
[skip]

 

-
Parameters

+
Parameters

 
@@ -1116,8 +1114,9 @@ nm_ip_address_set_address_binary (addr
  must point to a buffer that is the correct size for address
 's family.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1164,7 +1163,6 @@ object.

 

 
Returns

 
 the IP address prefix

-

 

 
 

@@ -1506,7 +1504,6 @@ to.

 

 
Returns

 
 TRUE if the objects contain the same values, FALSE if they do not.

-

 

 
 

@@ -1563,7 +1560,6 @@ object.

 

 
Returns

 
 the IP address family

-

 

 
 

@@ -1590,7 +1586,6 @@ nm_ip_route_get_dest (
 
Returns

 
 the IP address of the route's destination

-

 
 
 

@@ -1637,8 +1632,9 @@ nm_ip_route_get_dest_binary (dest
  must point to a buffer that is the correct size for route
 's family.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1670,8 +1666,9 @@ nm_ip_route_set_dest_binary (dest
  must point to a buffer that is the correct size for route
 's family.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1717,7 +1714,6 @@ nm_ip_route_get_prefix (
 
Returns

 
 the IP prefix

-

 
 
 

@@ -1775,7 +1771,6 @@ route has no next hop.

 

 
Returns

 
 the IP address of the next hop, or NULL if this is a device route.

-

 

 
 

@@ -1823,8 +1818,9 @@ nm_ip_route_get_next_hop_binary (next_hop
  must point to a buffer that is the correct size for route
 's family.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1846,12 +1842,11 @@ nm_ip_route_get_next_hop_binary (
 
 

-
Returns

+
Returns

 
 TRUE if route
 has a next hop, FALSE if not (in which case
 next_hop
 will be zeroed out)

-

 

 
 

@@ -1865,8 +1860,9 @@ nm_ip_route_set_next_hop_binary (NULL) must point to a buffer that is the correct size for
 route
 's family.

+
[skip]

 

-
Parameters

+
Parameters

 

 
 

@@ -1914,7 +1910,6 @@ indicate "better" or more preferred routes; -1 indicates "default"
 

 
Returns

 
 the route metric

-

 

 
 

@@ -2078,7 +2073,6 @@ nm_setting_ip_config_get_method ( the “method” property of the setting; see
 NMSettingIP4Config and NMSettingIP6Config for details of the
 methods available with each type.

-

 
 
 

@@ -2104,7 +2098,6 @@ nm_setting_ip_config_get_num_dns (
 
Returns

 
 the number of configured DNS servers

-

 
 
 

@@ -2139,7 +2132,6 @@ nm_setting_ip_config_get_dns (
Returns

 
 the IP address of the DNS server at index i
 

-

 
 
 

@@ -2175,7 +2167,6 @@ nm_setting_ip_config_add_dns (
Returns

 
 TRUE if the DNS server was added; FALSE if the server was already
 known

-

 
 
 

@@ -2243,7 +2234,6 @@ nm_setting_ip_config_remove_dns_by_value
 

 
Returns

 
 TRUE if the DNS server was found and removed; FALSE if it was not.

-

 

 
 

@@ -2292,7 +2282,6 @@ nm_setting_ip_config_get_num_dns_searches
 

 
Returns

 
 the number of configured DNS search domains

-

 

 
 

@@ -2327,7 +2316,6 @@ nm_setting_ip_config_get_dns_search (
Returns

 
 the DNS search domain at index i
 

-

 
 
 

@@ -2363,7 +2351,6 @@ nm_setting_ip_config_add_dns_search (
Returns

 
 TRUE if the DNS search domain was added; FALSE if the search
 domain was already known

-

 
 
 

@@ -2433,7 +2420,6 @@ nm_setting_ip_config_remove_dns_search_by_value
 
Returns

 
 TRUE if the DNS search domain was found and removed; FALSE if it was not.

 
Since 0.9.10

-

 
 
 

@@ -2483,7 +2469,6 @@ nm_setting_ip_config_get_num_addresses
 

 
Returns

 
 the number of configured addresses

-

 

 
 

@@ -2518,7 +2503,6 @@ nm_setting_ip_config_get_address (
Returns

 
 the address at index i
 

-

 
 
 

@@ -2555,7 +2539,6 @@ given address is duplicated internally and is not changed by this function.

 
Returns

 
 TRUE if the address was added; FALSE if the address was already
 known.

-

 
 
 

@@ -2623,7 +2606,6 @@ nm_setting_ip_config_remove_address_by_value
 

 
Returns

 
 TRUE if the address was found and removed; FALSE if it was not.

-

 

 
 

@@ -2672,7 +2654,6 @@ nm_setting_ip_config_get_gateway (
Returns

 
 the IP address of the gateway associated with this configuration, or
 NULL.

-

 
 
 

@@ -2698,7 +2679,6 @@ nm_setting_ip_config_get_num_routes (
 
Returns

 
 the number of configured routes

-

 
 
 

@@ -2733,7 +2713,6 @@ nm_setting_ip_config_get_route (
Returns

 
 the route at index i
 

-

 
 
 

@@ -2769,7 +2748,6 @@ given route is duplicated internally and is not changed by this function.

 

 
Returns

 
 TRUE if the route was added; FALSE if the route was already known.

-

 

 
 

@@ -2837,7 +2815,6 @@ nm_setting_ip_config_remove_route_by_value
 

 
Returns

 
 TRUE if the route was found and removed; FALSE if it was not.

-

 

 
 

@@ -2888,7 +2865,6 @@ property.

 
Returns

 
 the route metric that is used for routes that don't explicitly
 specify a metric. See “route-metric” for more details.

-

 
 
 

@@ -2918,7 +2894,6 @@ property.

 
Returns

 
 TRUE if automatically configured (ie via DHCP) routes should be
 ignored.

-

 
 
 

@@ -2948,7 +2923,6 @@ property.

 
Returns

 
 TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.

-

 
 
 

@@ -2977,7 +2951,6 @@ property.

 

 
Returns

 
 the configured hostname to send to the DHCP server

-

 

 
 

@@ -3008,7 +2981,6 @@ property.

 
 TRUE if NetworkManager should send the machine hostname to the
 DHCP server when requesting addresses to allow the server to automatically
 update DNS information for this machine.

-

 
 
 

@@ -3038,7 +3010,6 @@ property.

 
Returns

 
 TRUE if this connection should never be the default
 connection

-

 
 
 

@@ -3067,7 +3038,6 @@ property.

 
Returns

 
 TRUE if this connection doesn't require this type of IP
 addressing to complete for the connection to succeed.

-

 
 
 
@@ -3077,104 +3047,78 @@ addressing to complete for the connection to succeed.

 
NM_SETTING_IP_CONFIG_METHOD

 
#define NM_SETTING_IP_CONFIG_METHOD             "method"
 

-

-

 
 

 

 
NM_SETTING_IP_CONFIG_DNS

 
#define NM_SETTING_IP_CONFIG_DNS                "dns"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_DNS_SEARCH

 
#define NM_SETTING_IP_CONFIG_DNS_SEARCH         "dns-search"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_ADDRESSES

 
#define NM_SETTING_IP_CONFIG_ADDRESSES          "addresses"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_GATEWAY

 
#define NM_SETTING_IP_CONFIG_GATEWAY            "gateway"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_ROUTES

 
#define NM_SETTING_IP_CONFIG_ROUTES             "routes"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_ROUTE_METRIC

 
#define NM_SETTING_IP_CONFIG_ROUTE_METRIC       "route-metric"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES

 
#define NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES "ignore-auto-routes"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS

 
#define NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS    "ignore-auto-dns"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_DHCP_HOSTNAME

 
#define NM_SETTING_IP_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME

 
#define NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME "dhcp-send-hostname"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_NEVER_DEFAULT

 
#define NM_SETTING_IP_CONFIG_NEVER_DEFAULT      "never-default"
 

-

-

 

 

 

 
NM_SETTING_IP_CONFIG_MAY_FAIL

 
#define NM_SETTING_IP_CONFIG_MAY_FAIL           "may-fail"
 

-

-

 

 
 

@@ -3182,14 +3126,16 @@ addressing to complete for the connection to succeed.

 

 
The “addresses” property

 
  “addresses”                GPtrArray *

-

+
Array of IP addresses.

+
Element-Type: NMIPAddress

 
Flags: Read / Write

 

 

 

 
The “dhcp-hostname” property

 
  “dhcp-hostname”            gchar *

-

+
If the “dhcp-send-hostname” property is TRUE, then the
+specified name will be sent to the DHCP server when acquiring a lease.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3197,7 +3143,11 @@ addressing to complete for the connection to succeed.

 

 
The “dhcp-send-hostname” property

 
  “dhcp-send-hostname”       gboolean

-

+
If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
+Some DHCP servers use this hostname to update DNS databases, essentially
+providing a static hostname for the computer.  If the
+“dhcp-hostname” property is NULL and this property is
+TRUE, the current persistent hostname of the computer is sent.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -3205,21 +3155,22 @@ addressing to complete for the connection to succeed.

 

 
The “dns” property

 
  “dns”                      GStrv

-

+
Array of IP addresses of DNS servers.

 
Flags: Read / Write

 

 

 

 
The “dns-search” property

 
  “dns-search”               GStrv

-

+
Array of DNS search domains.

 
Flags: Read / Write

 

 

 

 
The “gateway” property

 
  “gateway”                  gchar *

-

+
The gateway associated with this configuration. This is only meaningful
+if “addresses” is also set.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3227,7 +3178,11 @@ addressing to complete for the connection to succeed.

 

 
The “ignore-auto-dns” property

 
  “ignore-auto-dns”          gboolean

-

+
When “method” is set to "auto" and this property to
+TRUE, automatically configured nameservers and search domains are
+ignored and only nameservers and search domains specified in the
+“dns” and “dns-search” properties, if
+any, are used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -3235,7 +3190,9 @@ addressing to complete for the connection to succeed.

 

 
The “ignore-auto-routes” property

 
  “ignore-auto-routes”       gboolean

-

+
When “method” is set to "auto" and this property to
+TRUE, automatically configured routes are ignored and only routes
+specified in the “routes” property, if any, are used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -3243,7 +3200,13 @@ addressing to complete for the connection to succeed.

 

 
The “may-fail” property

 
  “may-fail”                 gboolean

-

+
If TRUE, allow overall network configuration to proceed even if the
+configuration specified by this property 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 on the NMSettingIP4Config allows the overall network configuration
+to succeed if IPv4 configuration fails but IPv6 configuration completes
+successfully.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -3251,7 +3214,17 @@ addressing to complete for the connection to succeed.

 

 
The “method” property

 
  “method”                   gchar *

-

+
IP configuration method.

+
NMSettingIP4Config and NMSettingIP6Config both support "auto",
+"manual", and "link-local". See the subclass-specific documentation for
+other values.

+
In general, for the "auto" method, properties such as
+“dns” and “routes” specify information
+that is added on to the information returned from automatic
+configuration.  The “ignore-auto-routes” and
+“ignore-auto-dns” properties modify this behavior.

+
For methods that imply no upstream network, such as "shared" or
+"link-local", these properties must be empty.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -3259,7 +3232,9 @@ addressing to complete for the connection to succeed.

 

 
The “never-default” property

 
  “never-default”            gboolean

-

+
If TRUE, this connection will never be the default connection for this
+IP type, meaning it will never be assigned the default route by
+NetworkManager.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

@@ -3267,7 +3242,16 @@ addressing to complete for the connection to succeed.

 

 
The “route-metric” property

 
  “route-metric”             gint64

-

+
The default metric for routes that don't explicitly specify a metric.
+The default value -1 means that the metric is choosen automatically
+based on the device type.
+The metric applies to dynamic routes, manual (static) routes that
+don't have an explicit metric setting, address prefix routes, and
+the default route.
+Note that for IPv6, the kernel accepts zero (0) but coerces it to
+1024 (user default). Hence, setting this property to zero effectively
+mean setting it to 1024.
+For IPv4, zero is a regular value for the metric.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,4294967295]

 
Default value: -1

@@ -3276,7 +3260,8 @@ addressing to complete for the connection to succeed.

 

 
The “routes” property

 
  “routes”                   GPtrArray *

-

+
Array of IP routes.

+
Element-Type: NMIPRoute

 
Flags: Read / Write

 

 

@@ -3286,7 +3271,6 @@ addressing to complete for the connection to succeed.

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index d68c9929..4ab10c02 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingInfiniband
+NMSettingInfiniband: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -219,7 +219,6 @@ nm_setting_infiniband_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -245,7 +244,6 @@ nm_setting_infiniband_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 
 
 

@@ -274,7 +272,6 @@ nm_setting_infiniband_get_transport_mode
 

 
Returns

 
 the IPoIB transport mode

-

 

 
 

@@ -303,7 +300,6 @@ a 16-bit unsigned integer.

 

 
Returns

 
 the IPoIB P_Key

-

 

 
 

@@ -330,7 +326,6 @@ nm_setting_infiniband_get_parent (
 
Returns

 
 the parent interface name

-

 
 
 

@@ -360,7 +355,6 @@ return NULL.)

 

 
Returns

 
 the interface name, or NULL

-

 

 
 
@@ -370,48 +364,36 @@ return NULL.)

 
NM_SETTING_INFINIBAND_SETTING_NAME

 
#define NM_SETTING_INFINIBAND_SETTING_NAME "infiniband"
 

-

-

 
 

 

 
NM_SETTING_INFINIBAND_MAC_ADDRESS

 
#define NM_SETTING_INFINIBAND_MAC_ADDRESS    "mac-address"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_MTU

 
#define NM_SETTING_INFINIBAND_MTU            "mtu"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_TRANSPORT_MODE

 
#define NM_SETTING_INFINIBAND_TRANSPORT_MODE "transport-mode"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_P_KEY

 
#define NM_SETTING_INFINIBAND_P_KEY          "p-key"
 

-

-

 

 

 

 
NM_SETTING_INFINIBAND_PARENT

 
#define NM_SETTING_INFINIBAND_PARENT         "parent"
 

-

-

 

 
 

@@ -419,7 +401,9 @@ return NULL.)

 

 
The “mac-address” property

 
  “mac-address”              gchar *

-

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

 
Flags: Read / Write

 
Default value: NULL

 

@@ -427,7 +411,8 @@ return NULL.)

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple frames.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -435,7 +420,10 @@ return NULL.)

 

 
The “p-key” property

 
  “p-key”                    gint

-

+
The InfiniBand P_Key to use for this device. A value of -1 means to use
+the default P_Key (aka "the P_Key at index 0").  Otherwise it is a 16-bit
+unsigned integer, whose high bit is set if it is a "full membership"
+P_Key.

 
Flags: Read / Write / Construct

 
Allowed values: [-1,65535]

 
Default value: -1

@@ -444,7 +432,10 @@ return NULL.)

 

 
The “parent” property

 
  “parent”                   gchar *

-

+
The interface name of the parent device of this device. Normally NULL,
+but if the “p_key” property is set, then you must
+specify the base device by setting either this property or
+“mac-address”.

 
Flags: Read / Write / Construct

 
Default value: NULL

 

@@ -452,14 +443,14 @@ return NULL.)

 

 
The “transport-mode” property

 
  “transport-mode”           gchar *

-

+
The IP-over-InfiniBand transport mode. Either "datagram" or
+"connected".

 
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index 8291a313..b8d90183 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingOlpcMesh
+NMSettingOlpcMesh: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -140,8 +140,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -153,7 +151,6 @@ nm_setting_olpc_mesh_new (void
 
Returns

 
 the new empty NMSettingOlpcMesh object

-

 

 
 

@@ -172,12 +169,6 @@ nm_setting_olpc_mesh_get_ssid (
nm_setting_olpc_mesh_get_channel ()

 
guint32
 nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);

-

-

-

-
Returns

-

-

 
 

 

@@ -185,12 +176,6 @@ nm_setting_olpc_mesh_get_channel (const char *
 nm_setting_olpc_mesh_get_dhcp_anycast_address
                                (NMSettingOlpcMesh *setting);
-

-

-

-
Returns

-

-

 

 
 

@@ -199,32 +184,24 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 
NM_SETTING_OLPC_MESH_SETTING_NAME

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

-

-

 

 

 

 
NM_SETTING_OLPC_MESH_SSID

 
#define NM_SETTING_OLPC_MESH_SSID                 "ssid"
 

-

-

 

 

 

 
NM_SETTING_OLPC_MESH_CHANNEL

 
#define NM_SETTING_OLPC_MESH_CHANNEL              "channel"
 

-

-

 

 

 

 
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS

 
#define NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS "dhcp-anycast-address"
 

-

-

 

 
 

@@ -232,7 +209,7 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 

 
The “channel” property

 
  “channel”                  guint

-

+
Channel on which the mesh network to join is located.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -240,7 +217,9 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 

 
The “dhcp-anycast-address” property

 
  “dhcp-anycast-address”     gchar *

-

+
Anycast DHCP MAC address used when requesting an IP address via DHCP.
+The specific anycast address used determines which DHCP server class
+answers the request.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -248,13 +227,12 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 

 
The “ssid” property

 
  “ssid”                     GBytes *

-

+
SSID of the mesh network to join.

 
Flags: Read / Write

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index 832e3fcd..2ea94443 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingPpp
+NMSettingPpp: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -435,7 +435,6 @@ nm_setting_ppp_get_noauth (
 
Returns

 
 the “noauth” property of the setting

-

 
 
 

@@ -461,7 +460,6 @@ nm_setting_ppp_get_refuse_eap (
 
Returns

 
 the “refuse-eap” property of the setting

-

 
 
 

@@ -487,7 +485,6 @@ nm_setting_ppp_get_refuse_pap (
 
Returns

 
 the “refuse-pap” property of the setting

-

 
 
 

@@ -513,7 +510,6 @@ nm_setting_ppp_get_refuse_chap (
 
Returns

 
 the “refuse-chap” property of the setting

-

 
 
 

@@ -539,7 +535,6 @@ nm_setting_ppp_get_refuse_mschap (
 
Returns

 
 the “refuse-mschap” property of the setting

-

 
 
 

@@ -565,7 +560,6 @@ nm_setting_ppp_get_refuse_mschapv2 (
 
Returns

 
 the “refuse-mschapv2” property of the setting

-

 
 
 

@@ -591,7 +585,6 @@ nm_setting_ppp_get_nobsdcomp (
 
Returns

 
 the “nobsdcomp” property of the setting

-

 
 
 

@@ -617,7 +610,6 @@ nm_setting_ppp_get_nodeflate (
 
Returns

 
 the “nodeflate” property of the setting

-

 
 
 

@@ -643,7 +635,6 @@ nm_setting_ppp_get_no_vj_comp (
 
Returns

 
 the “no-vj-comp” property of the setting

-

 
 
 

@@ -669,7 +660,6 @@ nm_setting_ppp_get_require_mppe (
 
Returns

 
 the “require-mppe” property of the setting

-

 
 
 

@@ -695,7 +685,6 @@ nm_setting_ppp_get_require_mppe_128 (
 
Returns

 
 the “require-mppe-128” property of the setting

-

 
 
 

@@ -721,7 +710,6 @@ nm_setting_ppp_get_mppe_stateful (
 
Returns

 
 the “mppe-stateful” property of the setting

-

 
 
 

@@ -747,7 +735,6 @@ nm_setting_ppp_get_crtscts (
 
Returns

 
 the “crtscts” property of the setting

-

 
 
 

@@ -773,7 +760,6 @@ nm_setting_ppp_get_baud (
 
Returns

 
 the “baud” property of the setting

-

 
 
 

@@ -799,7 +785,6 @@ nm_setting_ppp_get_mru (
 
Returns

 
 the “mru” property of the setting

-

 
 
 

@@ -825,7 +810,6 @@ nm_setting_ppp_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 
 
 

@@ -851,7 +835,6 @@ nm_setting_ppp_get_lcp_echo_failure (
 
Returns

 
 the “lcp-echo-failure” property of the setting

-

 
 
 

@@ -877,7 +860,6 @@ nm_setting_ppp_get_lcp_echo_interval (
 
Returns

 
 the “lcp-echo-interval” property of the setting

-

 
 
 
@@ -887,152 +869,114 @@ nm_setting_ppp_get_lcp_echo_interval (
NM_SETTING_PPP_SETTING_NAME

 
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 

-

-

 
 

 

 
NM_SETTING_PPP_NOAUTH

 
#define NM_SETTING_PPP_NOAUTH            "noauth"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_EAP

 
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_PAP

 
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_CHAP

 
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_MSCHAP

 
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 

-

-

 

 

 

 
NM_SETTING_PPP_REFUSE_MSCHAPV2

 
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 

-

-

 

 

 

 
NM_SETTING_PPP_NOBSDCOMP

 
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 

-

-

 

 

 

 
NM_SETTING_PPP_NODEFLATE

 
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 

-

-

 

 

 

 
NM_SETTING_PPP_NO_VJ_COMP

 
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 

-

-

 

 

 

 
NM_SETTING_PPP_REQUIRE_MPPE

 
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 

-

-

 

 

 

 
NM_SETTING_PPP_REQUIRE_MPPE_128

 
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 

-

-

 

 

 

 
NM_SETTING_PPP_MPPE_STATEFUL

 
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 

-

-

 

 

 

 
NM_SETTING_PPP_CRTSCTS

 
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 

-

-

 

 

 

 
NM_SETTING_PPP_BAUD

 
#define NM_SETTING_PPP_BAUD              "baud"
 

-

-

 

 

 

 
NM_SETTING_PPP_MRU

 
#define NM_SETTING_PPP_MRU               "mru"
 

-

-

 

 

 

 
NM_SETTING_PPP_MTU

 
#define NM_SETTING_PPP_MTU               "mtu"
 

-

-

 

 

 

 
NM_SETTING_PPP_LCP_ECHO_FAILURE

 
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 

-

-

 

 

 

 
NM_SETTING_PPP_LCP_ECHO_INTERVAL

 
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 

-

-

 

 
 

@@ -1040,7 +984,9 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “baud” property

 
  “baud”                     guint

-

+
If non-zero, instruct pppd to set the serial port to the specified
+baudrate.  This value should normally be left as 0 to automatically
+choose the speed.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1048,7 +994,9 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “crtscts” property

 
  “crtscts”                  gboolean

-

+
If TRUE, specify that pppd should set the serial port to use hardware
+flow control with RTS and CTS signals.  This value should normally be set
+to FALSE.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1056,7 +1004,10 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “lcp-echo-failure” property

 
  “lcp-echo-failure”         guint

-

+
If non-zero, instruct pppd to presume the connection to the peer has
+failed if the specified number of LCP echo-requests go unanswered by the
+peer.  The "lcp-echo-interval" property must also be set to a non-zero
+value if this property is used.

 
Flags: Read / Write / Construct

 
Default value: 0

 
@@ -1064,7 +1015,10 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “lcp-echo-interval” property

 
  “lcp-echo-interval”        guint

-

+
If non-zero, instruct pppd to send an LCP echo-request frame to the peer
+every n seconds (where n is the specified value).  Note that some PPP
+peers will respond to echo requests and some will not, and it is not
+possible to autodetect this.

 
Flags: Read / Write / Construct

 
Default value: 0

 
@@ -1072,7 +1026,8 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “mppe-stateful” property

 
  “mppe-stateful”            gboolean

-

+
If TRUE, stateful MPPE is used.  See pppd documentation for more
+information on stateful MPPE.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1080,7 +1035,9 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “mru” property

 
  “mru”                      guint

-

+
If non-zero, instruct pppd to request that the peer send packets no
+larger than the specified size.  If non-zero, the MRU should be between
+128 and 16384.

 
Flags: Read / Write / Construct

 
Allowed values: <= 16384

 
Default value: 0

@@ -1089,7 +1046,8 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, instruct pppd to send packets no larger than the specified
+size.

 
Flags: Read / Write / Construct

 
Default value: 0

 
@@ -1097,7 +1055,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “no-vj-comp” property

 
  “no-vj-comp”               gboolean

-

+
If TRUE, Van Jacobsen TCP header compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1105,7 +1063,9 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “noauth” property

 
  “noauth”                   gboolean

-

+
If TRUE, do not require the other side (usually the PPP server) to
+authenticate itself to the client.  If FALSE, require authentication
+from the remote side.  In almost all cases, this should be TRUE.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 
@@ -1113,7 +1073,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “nobsdcomp” property

 
  “nobsdcomp”                gboolean

-

+
If TRUE, BSD compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1121,7 +1081,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “nodeflate” property

 
  “nodeflate”                gboolean

-

+
If TRUE, "deflate" compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1129,7 +1089,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “refuse-chap” property

 
  “refuse-chap”              gboolean

-

+
If TRUE, the CHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1137,7 +1097,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “refuse-eap” property

 
  “refuse-eap”               gboolean

-

+
If TRUE, the EAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1145,7 +1105,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “refuse-mschap” property

 
  “refuse-mschap”            gboolean

-

+
If TRUE, the MSCHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1153,7 +1113,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “refuse-mschapv2” property

 
  “refuse-mschapv2”          gboolean

-

+
If TRUE, the MSCHAPv2 authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1161,7 +1121,7 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “refuse-pap” property

 
  “refuse-pap”               gboolean

-

+
If TRUE, the PAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1169,7 +1129,10 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “require-mppe” property

 
  “require-mppe”             gboolean

-

+
If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+the PPP session.  If either 64-bit or 128-bit MPPE is not available the
+session will fail.  Note that MPPE is not used on mobile broadband
+connections.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
@@ -1177,14 +1140,15 @@ nm_setting_ppp_get_lcp_echo_interval (
 
The “require-mppe-128” property

 
  “require-mppe-128”         gboolean

-

+
If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+required for the PPP session, and the "require-mppe" property must also
+be set to TRUE.  If 128-bit MPPE is not available the session will fail.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index daa5f943..6155a548 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingPppoe
+NMSettingPppoe: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -196,7 +196,6 @@ nm_setting_pppoe_get_service (
 
Returns

 
 the “service” property of the setting

-

 
 
 

@@ -222,7 +221,6 @@ nm_setting_pppoe_get_username (
 
Returns

 
 the “username” property of the setting

-

 
 
 

@@ -248,7 +246,6 @@ nm_setting_pppoe_get_password (
 
Returns

 
 the “password” property of the setting

-

 
 
 

@@ -274,7 +271,6 @@ nm_setting_pppoe_get_password_flags (
 
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

-

 
 
 
@@ -284,40 +280,30 @@ nm_setting_pppoe_get_password_flags (
NM_SETTING_PPPOE_SETTING_NAME

 
#define NM_SETTING_PPPOE_SETTING_NAME "pppoe"
 

-

-

 
 

 

 
NM_SETTING_PPPOE_SERVICE

 
#define NM_SETTING_PPPOE_SERVICE        "service"
 

-

-

 

 

 

 
NM_SETTING_PPPOE_USERNAME

 
#define NM_SETTING_PPPOE_USERNAME       "username"
 

-

-

 

 

 

 
NM_SETTING_PPPOE_PASSWORD

 
#define NM_SETTING_PPPOE_PASSWORD       "password"
 

-

-

 

 

 

 
NM_SETTING_PPPOE_PASSWORD_FLAGS

 
#define NM_SETTING_PPPOE_PASSWORD_FLAGS "password-flags"
 

-

-

 

 
 

@@ -325,7 +311,7 @@ nm_setting_pppoe_get_password_flags (
 
The “password” property

 
  “password”                 gchar *

-

+
Password used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -333,14 +319,17 @@ nm_setting_pppoe_get_password_flags (
 
The “password-flags” property

 
  “password-flags”           NMSettingSecretFlags

-

+
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
 

 

 
The “service” property

 
  “service”                  gchar *

-

+
If specified, instruct PPPoE to only initiate sessions with access
+concentrators that provide the specified service.  For most providers,
+this should be left blank.  It is only required if there are multiple
+access concentrators or a specific service is known to be required.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -348,14 +337,13 @@ nm_setting_pppoe_get_password_flags (
 
The “username” property

 
  “username”                 gchar *

-

+
Username used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

 
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index f27e73ee..14ae299b 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingSerial
+NMSettingSerial: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -220,7 +220,6 @@ nm_setting_serial_get_baud (
 
Returns

 
 the “baud” property of the setting

-

 
 
 

@@ -246,7 +245,6 @@ nm_setting_serial_get_bits (
 
Returns

 
 the “bits” property of the setting

-

 
 
 

@@ -272,7 +270,6 @@ nm_setting_serial_get_parity (
 
Returns

 
 the “parity” property of the setting

-

 
 
 

@@ -298,7 +295,6 @@ nm_setting_serial_get_stopbits (
 
Returns

 
 the “stopbits” property of the setting

-

 
 
 

@@ -324,7 +320,6 @@ nm_setting_serial_get_send_delay (
 
Returns

 
 the “send-delay” property of the setting

-

 
 
 
@@ -334,8 +329,6 @@ nm_setting_serial_get_send_delay (
NM_SETTING_SERIAL_SETTING_NAME

 
#define NM_SETTING_SERIAL_SETTING_NAME "serial"
 

-

-

 
 

 

@@ -380,40 +373,30 @@ nm_setting_serial_get_send_delay (
NM_SETTING_SERIAL_BAUD

 
#define NM_SETTING_SERIAL_BAUD "baud"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_BITS

 
#define NM_SETTING_SERIAL_BITS "bits"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_PARITY

 
#define NM_SETTING_SERIAL_PARITY "parity"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_STOPBITS

 
#define NM_SETTING_SERIAL_STOPBITS "stopbits"
 

-

-

 

 

 

 
NM_SETTING_SERIAL_SEND_DELAY

 
#define NM_SETTING_SERIAL_SEND_DELAY "send-delay"
 

-

-

 

 
 

@@ -421,7 +404,9 @@ nm_setting_serial_get_send_delay (
 
The “baud” property

 
  “baud”                     guint

-

+
Speed to use for communication over the serial port.  Note that this
+value usually has no effect for mobile broadband modems as they generally
+ignore speed settings and use the highest available speed.

 
Flags: Read / Write / Construct

 
Default value: 57600

 

@@ -429,7 +414,7 @@ nm_setting_serial_get_send_delay (
 
The “bits” property

 
  “bits”                     guint

-

+
Byte-width of the serial communication. The 8 in "8n1" for example.

 
Flags: Read / Write / Construct

 
Allowed values: [5,8]

 
Default value: 8

@@ -438,7 +423,7 @@ nm_setting_serial_get_send_delay (
 
The “parity” property

 
  “parity”                   NMSettingSerialParity

-

+
Parity setting of the serial port.

 
Flags: Read / Write / Construct

 
Default value: NM_SETTING_SERIAL_PARITY_NONE

 
@@ -446,7 +431,7 @@ nm_setting_serial_get_send_delay (
 
The “send-delay” property

 
  “send-delay”               guint64

-

+
Time to delay between each byte sent to the modem, in microseconds.

 
Flags: Read / Write / Construct

 
Default value: 0

 
@@ -454,7 +439,8 @@ nm_setting_serial_get_send_delay (
 
The “stopbits” property

 
  “stopbits”                 guint

-

+
Number of stop bits for communication on the serial port.  Either 1 or 2.
+The 1 in "8n1" for example.

 
Flags: Read / Write / Construct

 
Allowed values: [1,2]

 
Default value: 1

@@ -462,7 +448,6 @@ nm_setting_serial_get_send_delay (
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 85f6eeea..bd678358 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingTeam
+NMSettingTeam: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -142,7 +142,6 @@ nm_setting_team_get_config (
 
Returns

 
 the “config” property of the setting

-

 
 
 
@@ -152,16 +151,12 @@ nm_setting_team_get_config (
NM_SETTING_TEAM_SETTING_NAME

 
#define NM_SETTING_TEAM_SETTING_NAME "team"
 

-

-

 
 

 

 
NM_SETTING_TEAM_CONFIG

 
#define NM_SETTING_TEAM_CONFIG "config"
 

-

-

 

 
 

@@ -169,14 +164,16 @@ nm_setting_team_get_config (
 
The “config” property

 
  “config”                   gchar *

-

+
The JSON configuration for the team network interface.  The property
+should contain raw JSON configuration data suitable for teamd, because
+the value is passed directly to teamd. If not specified, the default
+configuration is used.  See man teamd.conf for the format details.

 
Flags: Read / Write

 
Default value: NULL

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index e25e1e4e..fbe09ce0 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingTeamPort
+NMSettingTeamPort: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -142,7 +142,6 @@ nm_setting_team_port_get_config (
 
Returns

 
 the “config” property of the setting

-

 
 
 
@@ -152,16 +151,12 @@ nm_setting_team_port_get_config (
NM_SETTING_TEAM_PORT_SETTING_NAME

 
#define NM_SETTING_TEAM_PORT_SETTING_NAME "team-port"
 

-

-

 
 

 

 
NM_SETTING_TEAM_PORT_CONFIG

 
#define NM_SETTING_TEAM_PORT_CONFIG     "config"
 

-

-

 

 
 

@@ -169,14 +164,16 @@ nm_setting_team_port_get_config (
 
The “config” property

 
  “config”                   gchar *

-

+
The JSON configuration for the team port. The property should contain raw
+JSON configuration data suitable for teamd, because the value is passed
+directly to teamd. If not specified, the default configuration is
+used. See man teamd.conf for the format details.

 
Flags: Read / Write

 
Default value: NULL

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index a82533dc..d205fd32 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingVlan
+NMSettingVlan: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -272,7 +272,6 @@ nm_setting_vlan_get_parent (
 
Returns

 
 the “parent” property of the setting

-

 
 
 

@@ -298,7 +297,6 @@ nm_setting_vlan_get_id (
 
Returns

 
 the “id” property of the setting

-

 
 
 

@@ -324,7 +322,6 @@ nm_setting_vlan_get_flags (
 
Returns

 
 the “flags” property of the setting

-

 
 
 

@@ -361,7 +358,6 @@ properties of this setting.

 

 
Returns

 
 return the number of ingress/egress priority entries, -1 if error

-

 

 
 

@@ -415,7 +411,6 @@ or 
 
Returns

 
 TRUE if a priority map was returned, FALSE if error

-

 
 
 

@@ -480,7 +475,6 @@ to

 
Returns

 
 TRUE if the new priority mapping was successfully added to the
 list, FALSE if error

-

 
 
 

@@ -574,7 +568,6 @@ to

 

 
Returns

 
 TRUE if the priority mapping was found and removed; FALSE if it was not.

-

 

 
 

@@ -620,7 +613,6 @@ properties.

 

 
Returns

 
 TRUE if the priority mapping was found and removed; FALSE if it was not.

-

 

 
 

@@ -695,7 +687,6 @@ the Linux SKB priorities to 802.1p priorities.

 
Returns

 
 TRUE if the entry was successfully added to the list, or it
 overwrote the old value, FALSE if error

-

 
 
 
@@ -705,48 +696,36 @@ overwrote the old value, FALSE if error

 
NM_SETTING_VLAN_SETTING_NAME

 
#define NM_SETTING_VLAN_SETTING_NAME "vlan"
 

-

-

 
 

 

 
NM_SETTING_VLAN_PARENT

 
#define NM_SETTING_VLAN_PARENT               "parent"
 

-

-

 

 

 

 
NM_SETTING_VLAN_ID

 
#define NM_SETTING_VLAN_ID                   "id"
 

-

-

 

 

 

 
NM_SETTING_VLAN_FLAGS

 
#define NM_SETTING_VLAN_FLAGS                "flags"
 

-

-

 

 

 

 
NM_SETTING_VLAN_INGRESS_PRIORITY_MAP

 
#define NM_SETTING_VLAN_INGRESS_PRIORITY_MAP "ingress-priority-map"
 

-

-

 

 

 

 
NM_SETTING_VLAN_EGRESS_PRIORITY_MAP

 
#define NM_SETTING_VLAN_EGRESS_PRIORITY_MAP  "egress-priority-map"
 

-

-

 

 

 

@@ -828,21 +807,28 @@ to 802.1p priorities used in VLANs.

 

 
The “egress-priority-map” property

 
  “egress-priority-map”      GStrv

-

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

 
Flags: Read / Write

 

 

 

 
The “flags” property

 
  “flags”                    NMVlanFlags

-

+
One or more flags which control the behavior and features of the VLAN
+interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (reordering of
+output packet headers), NM_VLAN_FLAG_GVRP (use of the GVRP protocol),
+and NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its
+master device's operating state).

 
Flags: Read / Write / Construct

 

 

 

 
The “id” property

 
  “id”                       guint

-

+
The VLAN identifier that the interface created by this connection should
+be assigned.

 
Flags: Read / Write / Construct

 
Allowed values: <= 4095

 
Default value: 0

@@ -851,21 +837,25 @@ to 802.1p priorities used in VLANs.

 

 
The “ingress-priority-map” property

 
  “ingress-priority-map”     GStrv

-

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

 
Flags: Read / Write

 

 

 

 
The “parent” property

 
  “parent”                   gchar *

-

+
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 an NMSettingWired setting
+with a “mac-address” property.

 
Flags: Read / Write / Construct

 
Default value: NULL

 

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index a55a552a..ba0b0304 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingVpn
+NMSettingVpn: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -327,7 +327,6 @@ plugin that should be used to connect to this VPN.

 

 
Returns

 
 the VPN plugin's service name

-

 

 
 

@@ -353,7 +352,6 @@ nm_setting_vpn_get_user_name (
 
Returns

 
 the “user-name” property of the setting

-

 
 
 

@@ -379,7 +377,6 @@ nm_setting_vpn_get_persistent (
 
Returns

 
 the “persistent” property of the setting

-

 
 
 

@@ -406,7 +403,6 @@ nm_setting_vpn_get_num_data_items (
 
Returns

 
 the number of VPN plugin specific configuration data items

-

 
 
 

@@ -484,7 +480,6 @@ by 
 
Returns

 
 the data item, if any

-

 
 
 

@@ -521,7 +516,6 @@ nm_setting_vpn_remove_data_item (
Returns

 
 TRUE if the data item was found and removed from the internal list,
 FALSE if it was not.

-

 
 
 

@@ -588,7 +582,6 @@ nm_setting_vpn_get_num_secrets (
 
Returns

 
 the number of VPN plugin specific secrets

-

 
 
 

@@ -665,7 +658,6 @@ by 
 
Returns

 
 the secret, if any

-

 
 
 

@@ -702,7 +694,6 @@ nm_setting_vpn_remove_secret (
Returns

 
 TRUE if the secret was found and removed from the internal list,
 FALSE if it was not.

-

 
 
 

@@ -752,48 +743,36 @@ iteration will not be part of the iteration.

 
NM_SETTING_VPN_SETTING_NAME

 
#define NM_SETTING_VPN_SETTING_NAME "vpn"
 

-

-

 
 

 

 
NM_SETTING_VPN_SERVICE_TYPE

 
#define NM_SETTING_VPN_SERVICE_TYPE "service-type"
 

-

-

 

 

 

 
NM_SETTING_VPN_USER_NAME

 
#define NM_SETTING_VPN_USER_NAME    "user-name"
 

-

-

 

 

 

 
NM_SETTING_VPN_PERSISTENT

 
#define NM_SETTING_VPN_PERSISTENT   "persistent"
 

-

-

 

 

 

 
NM_SETTING_VPN_DATA

 
#define NM_SETTING_VPN_DATA         "data"
 

-

-

 

 

 

 
NM_SETTING_VPN_SECRETS

 
#define NM_SETTING_VPN_SECRETS      "secrets"
 

-

-

 

 
 

@@ -801,14 +780,18 @@ iteration will not be part of the iteration.

 

 
The “data” property

 
  “data”                     GHashTable *

-

+
Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
+values must be strings.

+
Type: GHashTable(utf8,utf8)

 
Flags: Read / Write

 

 

 

 
The “persistent” property

 
  “persistent”               gboolean

-

+
If the VPN service supports persistence, and this property is TRUE,
+the VPN will attempt to stay connected across link changes and outages,
+until explicitly disconnected.

 
Flags: Read / Write

 
Default value: FALSE

 

@@ -816,14 +799,18 @@ iteration will not be part of the iteration.

 

 
The “secrets” property

 
  “secrets”                  GHashTable *

-

+
Dictionary of key/value pairs of VPN plugin specific secrets like
+passwords or private keys.  Both keys and values must be strings.

+
Type: GHashTable(utf8,utf8)

 
Flags: Read / Write

 

 

 

 
The “service-type” property

 
  “service-type”             gchar *

-

+
D-Bus service name of the VPN plugin that this setting uses to connect to
+its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc
+plugin.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -831,14 +818,18 @@ iteration will not be part of the iteration.

 

 
The “user-name” property

 
  “user-name”                gchar *

-

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

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index 99666051..b4843dd7 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingWimax
+NMSettingWimax: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -135,7 +135,6 @@ nm_setting_wimax_new (void
 

 
Returns

 
 the new empty NMSettingWimax object

-

 

 
 

@@ -163,7 +162,6 @@ specific WiMAX network this setting describes a connection to.

 

 
Returns

 
 the WiMAX NSP name

-

 

 
 

@@ -191,7 +189,6 @@ to.

 

 
Returns

 
 the MAC address

-

 

 
 
@@ -201,24 +198,18 @@ to.

 
NM_SETTING_WIMAX_SETTING_NAME

 
#define NM_SETTING_WIMAX_SETTING_NAME "wimax"
 

-

-

 
 

 

 
NM_SETTING_WIMAX_NETWORK_NAME

 
#define NM_SETTING_WIMAX_NETWORK_NAME "network-name"
 

-

-

 

 

 

 
NM_SETTING_WIMAX_MAC_ADDRESS

 
#define NM_SETTING_WIMAX_MAC_ADDRESS  "mac-address"
 

-

-

 

 
 

@@ -226,7 +217,9 @@ to.

 

 
The “mac-address” property

 
  “mac-address”              gchar *

-

+
If specified, this connection will only apply to the WiMAX device whose
+MAC address matches. This property does not change the MAC address of the
+device (known as MAC spoofing).

 
Flags: Read / Write

 
Default value: NULL

 

@@ -234,14 +227,14 @@ to.

 

 
The “network-name” property

 
  “network-name”             gchar *

-

+
Network Service Provider (NSP) name of the WiMAX network this connection
+should use.

 
Flags: Read / Write

 
Default value: NULL

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index a65d2e22..6255f6c8 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingWired
+NMSettingWired: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -398,7 +398,6 @@ nm_setting_wired_get_port (
 
Returns

 
 the “port” property of the setting

-

 
 
 

@@ -424,7 +423,6 @@ nm_setting_wired_get_speed (
 
Returns

 
 the “speed” property of the setting

-

 
 
 

@@ -450,7 +448,6 @@ nm_setting_wired_get_duplex (
 
Returns

 
 the “duplex” property of the setting

-

 
 
 

@@ -476,7 +473,6 @@ nm_setting_wired_get_auto_negotiate (
 
Returns

 
 the “auto-negotiate” property of the setting

-

 
 
 

@@ -502,7 +498,6 @@ nm_setting_wired_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -529,7 +524,6 @@ nm_setting_wired_get_cloned_mac_address
 

 
Returns

 
 the “cloned-mac-address” property of the setting

-

 

 
 

@@ -556,7 +550,6 @@ nm_setting_wired_get_mac_address_blacklist
 

 
Returns

 
 the “mac-address-blacklist” property of the setting

-

 

 
 

@@ -583,7 +576,6 @@ nm_setting_wired_get_num_mac_blacklist_items
 

 
Returns

 
 the number of blacklisted MAC addresses

-

 

 
 

@@ -620,7 +612,6 @@ nm_setting_wired_get_mac_blacklist_item
 
 the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 

-

 
 
 

@@ -657,7 +648,6 @@ nm_setting_wired_add_mac_blacklist_item
 
Returns

 
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

-

 
 
 

@@ -727,7 +717,6 @@ the blacklist

 

 
Returns

 
 TRUE if the MAC address was found and removed; FALSE if it was not.

-

 

 
 

@@ -776,7 +765,6 @@ nm_setting_wired_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 
 
 

@@ -834,7 +822,6 @@ of 'qeth', 'lcs', or 'ctc'.

 

 
Returns

 
 the s390 device type

-

 

 
 

@@ -863,7 +850,6 @@ option individually using 
 
Returns

 
 the number of s390-specific device options

-

 
 
 

@@ -920,7 +906,6 @@ modified. 

 
 TRUE on success if the index was valid and an option was found,
 FALSE if the index was invalid (ie, greater than the number of options
 currently held by the setting)

-

 
 
 

@@ -959,7 +944,6 @@ nm_setting_wired_get_s390_option_by_key
 
Returns

 
 the value, or NULL if the key/value pair was never added to the
 setting; the value is owned by the setting and must not be modified

-

 
 
 

@@ -1004,7 +988,6 @@ may already exist.

 
Returns

 
 TRUE if the option was valid and was added to the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -1042,7 +1025,6 @@ list.

 
Returns

 
 TRUE if the option was found and removed from the internal option
 list, FALSE if it was not.

-

 
 
 

@@ -1080,96 +1062,72 @@ nm_setting_wired_get_valid_s390_options
 
NM_SETTING_WIRED_SETTING_NAME

 
#define NM_SETTING_WIRED_SETTING_NAME "802-3-ethernet"
 

-

-

 
 

 

 
NM_SETTING_WIRED_PORT

 
#define NM_SETTING_WIRED_PORT "port"
 

-

-

 

 

 

 
NM_SETTING_WIRED_SPEED

 
#define NM_SETTING_WIRED_SPEED "speed"
 

-

-

 

 

 

 
NM_SETTING_WIRED_DUPLEX

 
#define NM_SETTING_WIRED_DUPLEX "duplex"
 

-

-

 

 

 

 
NM_SETTING_WIRED_AUTO_NEGOTIATE

 
#define NM_SETTING_WIRED_AUTO_NEGOTIATE "auto-negotiate"
 

-

-

 

 

 

 
NM_SETTING_WIRED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_MAC_ADDRESS "mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRED_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRED_CLONED_MAC_ADDRESS "cloned-mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST

 
#define NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

-

-

 

 

 

 
NM_SETTING_WIRED_MTU

 
#define NM_SETTING_WIRED_MTU "mtu"
 

-

-

 

 

 

 
NM_SETTING_WIRED_S390_SUBCHANNELS

 
#define NM_SETTING_WIRED_S390_SUBCHANNELS "s390-subchannels"
 

-

-

 

 

 

 
NM_SETTING_WIRED_S390_NETTYPE

 
#define NM_SETTING_WIRED_S390_NETTYPE "s390-nettype"
 

-

-

 

 

 

 
NM_SETTING_WIRED_S390_OPTIONS

 
#define NM_SETTING_WIRED_S390_OPTIONS "s390-options"
 

-

-

 

 
 

@@ -1177,7 +1135,9 @@ nm_setting_wired_get_valid_s390_options
 

 
The “auto-negotiate” property

 
  “auto-negotiate”           gboolean

-

+
If TRUE, allow auto-negotiation of port speed and duplex mode.  If
+FALSE, do not allow auto-negotiation, in which case the "speed" and
+"duplex" properties should be set.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

@@ -1185,7 +1145,8 @@ nm_setting_wired_get_valid_s390_options
 

 
The “cloned-mac-address” property

 
  “cloned-mac-address”       gchar *

-

+
If specified, request that the device use this MAC address instead of its
+permanent MAC address.  This is known as MAC cloning or spoofing.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1193,7 +1154,8 @@ nm_setting_wired_get_valid_s390_options
 

 
The “duplex” property

 
  “duplex”                   gchar *

-

+
If specified, request that the device only use the specified duplex mode.
+Either "half" or "full".

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1201,7 +1163,9 @@ nm_setting_wired_get_valid_s390_options
 

 
The “mac-address” property

 
  “mac-address”              gchar *

-

+
If specified, this connection will only apply to the Ethernet device
+whose permanent MAC address matches. This property does not change the
+MAC address of the device (i.e. MAC spoofing).

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1209,14 +1173,18 @@ nm_setting_wired_get_valid_s390_options
 

 
The “mac-address-blacklist” property

 
  “mac-address-blacklist”    GStrv

-

+
If specified, this connection will never apply to the Ethernet device
+whose permanent MAC address matches an address in the list.  Each MAC
+address is in the standard hex-digits-and-colons notation
+(00:11:22:33:44:55).

 
Flags: Read / Write

 

 

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1224,7 +1192,10 @@ nm_setting_wired_get_valid_s390_options
 

 
The “port” property

 
  “port”                     gchar *

-

+
Specific port type to use if multiple the device supports multiple
+attachment methods.  One of "tp" (Twisted Pair), "aui" (Attachment Unit
+Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface.
+If the device supports only one port type, this setting is ignored.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1232,7 +1203,8 @@ nm_setting_wired_get_valid_s390_options
 

 
The “s390-nettype” property

 
  “s390-nettype”             gchar *

-

+
s390 network device type; one of "qeth", "lcs", or "ctc", representing
+the different types of virtual network devices available on s390 systems.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1240,28 +1212,38 @@ nm_setting_wired_get_valid_s390_options
 

 
The “s390-options” property

 
  “s390-options”             GHashTable *

-

+
Dictionary of key/value pairs of s390-specific device options.  Both keys
+and values must be strings.  Allowed keys include "portno", "layer2",
+"portname", "protocol", among others.  Key names must contain only
+alphanumeric characters (ie, [a-zA-Z0-9]).

+
Type: GHashTable(utf8,utf8)

 
Flags: Read / Write

 

 

 

 
The “s390-subchannels” property

 
  “s390-subchannels”         GStrv

-

+
Identifies specific subchannels that this network device uses for
+communication with z/VM or s390 host.  Like the
+“mac-address” property for non-z/VM devices, this property
+can be used to ensure this connection only applies to the network device
+that uses these subchannels.  The list should contain exactly 3 strings,
+and each string may only be composed of hexadecimal characters and the
+period (.) character.

 
Flags: Read / Write

 

 

 

 
The “speed” property

 
  “speed”                    guint

-

+
If non-zero, request that the device use only the specified speed.  In
+Mbit/s, ie 100 == 100Mbit/s.

 
Flags: Read / Write / Construct

 
Default value: 0

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 1c59261b..f4cd0050 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingWireless
+NMSettingWireless: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -456,7 +456,6 @@ nm_setting_wireless_get_mode (
 
Returns

 
 the “mode” property of the setting

-

 
 
 

@@ -482,7 +481,6 @@ nm_setting_wireless_get_band (
 
Returns

 
 the “band” property of the setting

-

 
 
 

@@ -508,7 +506,6 @@ nm_setting_wireless_get_channel (
 
Returns

 
 the “channel” property of the setting

-

 
 
 

@@ -534,7 +531,6 @@ nm_setting_wireless_get_bssid (
 
Returns

 
 the “bssid” property of the setting

-

 
 
 

@@ -560,7 +556,6 @@ nm_setting_wireless_get_rate (
 
Returns

 
 the “rate” property of the setting

-

 
 
 

@@ -586,7 +581,6 @@ nm_setting_wireless_get_tx_power (
 
Returns

 
 the “tx-power” property of the setting

-

 
 
 

@@ -612,7 +606,6 @@ nm_setting_wireless_get_mac_address (
 
Returns

 
 the “mac-address” property of the setting

-

 
 
 

@@ -639,7 +632,6 @@ nm_setting_wireless_get_cloned_mac_address
 

 
Returns

 
 the “cloned-mac-address” property of the setting

-

 

 
 

@@ -666,7 +658,6 @@ nm_setting_wireless_get_mac_address_blacklist
 

 
Returns

 
 the “mac-address-blacklist” property of the setting

-

 

 
 

@@ -693,7 +684,6 @@ nm_setting_wireless_get_num_mac_blacklist_items
 

 
Returns

 
 the number of blacklisted MAC addresses

-

 

 
 

@@ -730,7 +720,6 @@ nm_setting_wireless_get_mac_blacklist_item
 
 the blacklisted MAC address string (hex-digits-and-colons notation)
 at index idx
 

-

 
 
 

@@ -767,7 +756,6 @@ nm_setting_wireless_add_mac_blacklist_item
 
Returns

 
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

-

 
 
 

@@ -837,7 +825,6 @@ the blacklist

 

 
Returns

 
 TRUE if the MAC address was found and removed; FALSE if it was not.

-

 

 
 

@@ -886,7 +873,6 @@ nm_setting_wireless_get_mtu (
 
Returns

 
 the “mtu” property of the setting

-

 
 
 

@@ -912,7 +898,6 @@ nm_setting_wireless_get_hidden (
 
Returns

 
 the “hidden” property of the setting

-

 
 
 

@@ -951,7 +936,6 @@ not be preserved.

 
Returns

 
 TRUE if bssid
 was already known, FALSE if not

-

 
 
 

@@ -978,7 +962,6 @@ nm_setting_wireless_get_num_seen_bssids
 

 
Returns

 
 the number of BSSIDs in the previously seen BSSID list

-

 

 
 

@@ -1013,7 +996,6 @@ nm_setting_wireless_get_seen_bssid (
Returns

 
 the BSSID at index i
 

-

 
 
 

@@ -1081,7 +1063,6 @@ capabilities

 
Returns

 
 TRUE if the given settings are compatible with the access point's
 security flags and mode, FALSE if they are not.

-

 
 
 
@@ -1091,112 +1072,84 @@ security flags and mode, FALSE if they are not.

 
NM_SETTING_WIRELESS_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 

-

-

 
 

 

 
NM_SETTING_WIRELESS_SSID

 
#define NM_SETTING_WIRELESS_SSID        "ssid"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MODE

 
#define NM_SETTING_WIRELESS_MODE        "mode"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_BAND

 
#define NM_SETTING_WIRELESS_BAND        "band"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_CHANNEL

 
#define NM_SETTING_WIRELESS_CHANNEL     "channel"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_BSSID

 
#define NM_SETTING_WIRELESS_BSSID       "bssid"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_RATE

 
#define NM_SETTING_WIRELESS_RATE        "rate"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_TX_POWER

 
#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS

 
#define NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS "cloned-mac-address"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST

 
#define NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST "mac-address-blacklist"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_MTU

 
#define NM_SETTING_WIRELESS_MTU         "mtu"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SEEN_BSSIDS

 
#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_HIDDEN

 
#define NM_SETTING_WIRELESS_HIDDEN      "hidden"
 

-

-

 

 

 

@@ -1227,7 +1180,12 @@ for this connection.

 

 
The “band” property

 
  “band”                     gchar *

-

+
802.11 frequency band of the network.  One of "a" for 5GHz 802.11a or
+"bg" for 2.4GHz 802.11.  This will lock associations to the Wi-Fi network
+to the specific band, i.e. if "a" is specified, the device will not
+associate with the same network in the 2.4GHz band even if the network's
+settings are compatible.  This setting depends on specific driver
+capability and may not work with all drivers.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1235,7 +1193,10 @@ for this connection.

 

 
The “bssid” property

 
  “bssid”                    gchar *

-

+
If specified, directs the device to only associate with the given access
+point.  This capability is highly driver dependent and not supported by
+all devices.  Note: this property does not control the BSSID used when
+creating an Ad-Hoc network and is unlikely to in the future.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1243,7 +1204,10 @@ for this connection.

 

 
The “channel” property

 
  “channel”                  guint

-

+
Wireless channel to use for the Wi-Fi connection.  The device will only
+join (or create for Ad-Hoc networks) a Wi-Fi network on the specified
+channel.  Because channel numbers overlap between bands, this property
+also requires the "band" property to be set.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1251,7 +1215,8 @@ for this connection.

 

 
The “cloned-mac-address” property

 
  “cloned-mac-address”       gchar *

-

+
If specified, request that the Wi-Fi device use this MAC address instead
+of its permanent MAC address.  This is known as MAC cloning or spoofing.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1259,7 +1224,11 @@ for this connection.

 

 
The “hidden” property

 
  “hidden”                   gboolean

-

+
If TRUE, indicates this network is a non-broadcasting network that hides
+its SSID.  In this case various workarounds may take place, such as
+probe-scanning the SSID for more reliable network discovery.  However,
+these workarounds expose inherent insecurities with hidden SSID networks,
+and thus hidden SSID networks should be used with caution.

 
Flags: Read / Write

 
Default value: FALSE

 

@@ -1267,7 +1236,9 @@ for this connection.

 

 
The “mac-address” property

 
  “mac-address”              gchar *

-

+
If specified, this connection will only apply to the Wi-Fi device whose
+permanent MAC address matches. This property does not change the MAC
+address of the device (i.e. MAC spoofing).

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1275,14 +1246,17 @@ for this connection.

 

 
The “mac-address-blacklist” property

 
  “mac-address-blacklist”    GStrv

-

+
A list of permanent MAC addresses of Wi-Fi devices to which this
+connection should never apply.  Each MAC address should be given in the
+standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").

 
Flags: Read / Write

 

 

 

 
The “mode” property

 
  “mode”                     gchar *

-

+
Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
+infrastructure is assumed.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1290,7 +1264,8 @@ for this connection.

 

 
The “mtu” property

 
  “mtu”                      guint

-

+
If non-zero, only transmit packets of the specified size or smaller,
+breaking larger packets up into multiple Ethernet frames.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1298,7 +1273,10 @@ for this connection.

 

 
The “rate” property

 
  “rate”                     guint

-

+
If non-zero, directs the device to only use the specified bitrate for
+communication with the access point.  Units are in Kb/s, ie 5500 = 5.5
+Mbit/s.  This property is highly driver dependent and not all devices
+support setting a static bitrate.

 
Flags: Read / Write / Construct

 
Default value: 0

 

@@ -1306,28 +1284,34 @@ for this connection.

 

 
The “seen-bssids” property

 
  “seen-bssids”              GStrv

-

+
A list of BSSIDs (each BSSID formatted as a MAC address like
+"00:11:22:33:44:55") that have been detected as part of the Wi-Fi
+network.  NetworkManager internally tracks previously seen BSSIDs. The
+property is only meant for reading and reflects the BSSID list of
+NetworkManager. The changes you make to this property will not be
+preserved.

 
Flags: Read / Write

 

 

 

 
The “ssid” property

 
  “ssid”                     GBytes *

-

+
SSID of the Wi-Fi network. Must be specified.

 
Flags: Read / Write

 

 

 

 
The “tx-power” property

 
  “tx-power”                 guint

-

+
If non-zero, directs the device to use the specified transmit power.
+Units are dBm.  This property is highly driver dependent and not all
+devices support setting a static transmit power.

 
Flags: Read / Write / Construct

 
Default value: 0

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 4542c113..59829fac 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSettingWirelessSecurity
+NMSettingWirelessSecurity: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -538,7 +538,6 @@ nm_setting_wireless_security_get_key_mgmt
 

 
Returns

 
 the “key-mgmt” property of the setting

-

 

 
 

@@ -566,7 +565,6 @@ nm_setting_wireless_security_get_num_protos
 
Returns

 
 the number of security protocols this connection allows when
 connecting to secure Wi-Fi networks

-

 
 
 

@@ -602,7 +600,6 @@ nm_setting_wireless_security_get_proto
 
Returns

 
 the protocol at index i
 

-

 
 
 

@@ -644,7 +641,6 @@ with the access point.

 
Returns

 
 TRUE if the protocol was new and and was added to the allowed
 protocol list, or FALSE if it was already in the list

-

 
 
 

@@ -711,7 +707,6 @@ nm_setting_wireless_security_remove_proto_by_value
 

 
Returns

 
 TRUE if the protocol was found and removed; FALSE it it was not.

-

 

 
 

@@ -762,7 +757,6 @@ nm_setting_wireless_security_get_num_pairwise
 

 
Returns

 
 the number of pairwise encryption algorithms in the allowed list

-

 

 
 

@@ -800,7 +794,6 @@ list.

 
Returns

 
 the pairwise encryption algorithm at index i
 

-

 
 
 

@@ -840,7 +833,6 @@ compatible with this connection.

 
Returns

 
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

-

 
 
 

@@ -909,7 +901,6 @@ algorithm list.

 

 
Returns

 
 TRUE if the encryption algorith was found and removed; FALSE it it was not.

-

 

 
 

@@ -960,7 +951,6 @@ nm_setting_wireless_security_get_num_groups
 

 
Returns

 
 the number of groupwise encryption algorithms in the allowed list

-

 

 
 

@@ -998,7 +988,6 @@ list.

 
Returns

 
 the groupwise encryption algorithm at index i
 

-

 
 
 

@@ -1039,7 +1028,6 @@ compatible with this connection.

 
Returns

 
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

-

 
 
 

@@ -1109,7 +1097,6 @@ algorithm list.

 

 
Returns

 
 TRUE if the algorithm was found and removed; FALSE it it was not.

-

 

 
 

@@ -1159,7 +1146,6 @@ nm_setting_wireless_security_get_psk (
 
Returns

 
 the “psk” property of the setting

-

 
 
 

@@ -1187,7 +1173,6 @@ nm_setting_wireless_security_get_psk_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “psk”

-

 
 
 

@@ -1214,7 +1199,6 @@ nm_setting_wireless_security_get_leap_username
 

 
Returns

 
 the “leap-username” property of the setting

-

 

 
 

@@ -1241,7 +1225,6 @@ nm_setting_wireless_security_get_leap_password
 

 
Returns

 
 the “leap-password” property of the setting

-

 

 
 

@@ -1269,7 +1252,6 @@ nm_setting_wireless_security_get_leap_password_flags
 
Returns

 
 the NMSettingSecretFlags pertaining to the
 “leap-password”

-

 
 
 

@@ -1304,7 +1286,6 @@ nm_setting_wireless_security_get_wep_key
 

 
Returns

 
 the WEP key at the given index

-

 

 
 

@@ -1370,7 +1351,6 @@ nm_setting_wireless_security_get_wep_tx_keyidx
 

 
Returns

 
 the “wep-tx-keyidx” property of the setting

-

 

 
 

@@ -1397,7 +1377,6 @@ nm_setting_wireless_security_get_auth_alg
 

 
Returns

 
 the “auth-alg” property of the setting

-

 

 
 

@@ -1424,7 +1403,6 @@ nm_setting_wireless_security_get_wep_key_flags
 

 
Returns

 
 the NMSettingSecretFlags pertaining to the all WEP keys

-

 

 
 

@@ -1451,7 +1429,6 @@ nm_setting_wireless_security_get_wep_key_type
 

 
Returns

 
 the “wep-key-type” property of the setting

-

 

 
 
@@ -1461,8 +1438,6 @@ nm_setting_wireless_security_get_wep_key_type
 
NM_SETTING_WIRELESS_SECURITY_SETTING_NAME

 
#define NM_SETTING_WIRELESS_SECURITY_SETTING_NAME "802-11-wireless-security"
 

-

-

 
 

 

@@ -1528,136 +1503,102 @@ the actual WEP key using the MD5 hash algorithm.

 
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT

 
#define NM_SETTING_WIRELESS_SECURITY_KEY_MGMT "key-mgmt"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX "wep-tx-keyidx"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG

 
#define NM_SETTING_WIRELESS_SECURITY_AUTH_ALG "auth-alg"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PROTO

 
#define NM_SETTING_WIRELESS_SECURITY_PROTO "proto"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PAIRWISE

 
#define NM_SETTING_WIRELESS_SECURITY_PAIRWISE "pairwise"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_GROUP

 
#define NM_SETTING_WIRELESS_SECURITY_GROUP "group"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME "leap-username"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY0 "wep-key0"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY1 "wep-key1"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY2 "wep-key2"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY3 "wep-key3"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS "wep-key-flags"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE

 
#define NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE "wep-key-type"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PSK

 
#define NM_SETTING_WIRELESS_SECURITY_PSK "psk"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS

 
#define NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS "psk-flags"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD "leap-password"
 

-

-

 

 

 

 
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS

 
#define NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS "leap-password-flags"
 

-

-

 

 
 

@@ -1665,7 +1606,11 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “auth-alg” property

 
  “auth-alg”                 gchar *

-

+
When WEP is used (ie, key-mgmt = "none" or "ieee8021x") indicate the
+802.11 authentication algorithm required by the AP here.  One of "open"
+for Open System, "shared" for Shared Key, or "leap" for Cisco LEAP.  When
+using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
+"leap-username" and "leap-password" properties must be specified.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1673,14 +1618,20 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “group” property

 
  “group”                    GStrv

-

+
A list of group/broadcast encryption algorithms which prevents
+connections to Wi-Fi networks that do not utilize one of the algorithms
+in the list.  For maximum compatibility leave this property empty.  Each
+list element may be one of "wep40", "wep104", "tkip", or "ccmp".

 
Flags: Read / Write

 

 

 

 
The “key-mgmt” property

 
  “key-mgmt”                 gchar *

-

+
Key management used for the connection.  One of "none" (WEP), "ieee8021x"
+(Dynamic WEP), "wpa-none" (Ad-Hoc WPA-PSK), "wpa-psk" (infrastructure
+WPA-PSK), or "wpa-eap" (WPA-Enterprise).  This property must be set for
+any Wi-Fi connection that uses security.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1688,7 +1639,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “leap-password” property

 
  “leap-password”            gchar *

-

+
The login password for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1696,14 +1648,16 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “leap-password-flags” property

 
  “leap-password-flags”      NMSettingSecretFlags

-

+
Flags indicating how to handle the
+“leap-password” property.

 
Flags: Read / Write

 

 

 

 
The “leap-username” property

 
  “leap-username”            gchar *

-

+
The login username for legacy LEAP connections (ie, key-mgmt =
+"ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1711,21 +1665,31 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “pairwise” property

 
  “pairwise”                 GStrv

-

+
A list of pairwise encryption algorithms which prevents connections to
+Wi-Fi networks that do not utilize one of the algorithms in the list.
+For maximum compatibility leave this property empty.  Each list element
+may be one of "tkip" or "ccmp".

 
Flags: Read / Write

 

 

 

 
The “proto” property

 
  “proto”                    GStrv

-

+
List of strings specifying the allowed WPA protocol versions to use.
+Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN).  If
+not specified, both WPA and RSN connections are allowed.

 
Flags: Read / Write

 

 

 

 
The “psk” property

 
  “psk”                      gchar *

-

+
Pre-Shared-Key for WPA networks.  If the key is 64-characters long, it
+must contain only hexadecimal characters and is interpreted as a
+hexadecimal WPA key.  Otherwise, the key must be between 8 and 63 ASCII
+characters (as specified in the 802.11i standard) and is interpreted as a
+WPA passphrase, and is hashed to derive the actual WPA-PSK used when
+connecting to the Wi-Fi network.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1733,21 +1697,29 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “psk-flags” property

 
  “psk-flags”                NMSettingSecretFlags

-

+
Flags indicating how to handle the “psk”
+property.

 
Flags: Read / Write

 

 

 

 
The “wep-key-flags” property

 
  “wep-key-flags”            NMSettingSecretFlags

-

+
Flags indicating how to handle the “wep-key0”,
+“wep-key1”, “wep-key2”,
+and “wep-key3” properties.

 
Flags: Read / Write

 

 

 

 
The “wep-key-type” property

 
  “wep-key-type”             NMWepKeyType

-

+
Controls the interpretation of WEP keys.  Allowed values are
+NM_WEP_KEY_TYPE_KEY, in which case the key is either a 10- or
+26-character hexadecimal string, or a 5- or 13-character ASCII password;
+or NM_WEP_KEY_TYPE_PASSPHRASE, in which case the passphrase is provided
+as a string and will be hashed using the de-facto MD5 method to derive
+the actual WEP key.

 
Flags: Read / Write / Construct

 
Default value: NM_WEP_KEY_TYPE_UNKNOWN

 

@@ -1755,7 +1727,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key0” property

 
  “wep-key0”                 gchar *

-

+
Index 0 WEP key.  This is the WEP key used in most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1763,7 +1736,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key1” property

 
  “wep-key1”                 gchar *

-

+
Index 1 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1771,7 +1745,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key2” property

 
  “wep-key2”                 gchar *

-

+
Index 2 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1779,7 +1754,8 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-key3” property

 
  “wep-key3”                 gchar *

-

+
Index 3 WEP key.  This WEP index is not used by most networks.  See the
+"wep-key-type" property for a description of how this key is interpreted.

 
Flags: Read / Write

 
Default value: NULL

 

@@ -1787,7 +1763,10 @@ the actual WEP key using the MD5 hash algorithm.

 

 
The “wep-tx-keyidx” property

 
  “wep-tx-keyidx”            guint

-

+
When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key
+index is used by the AP, put that WEP key index here.  Valid values are 0
+(default key) through 3.  Note that some consumer access points (like the
+Linksys WRT54G) number the keys 1 - 4.

 
Flags: Read / Write / Construct

 
Allowed values: <= 3

 
Default value: 0

@@ -1795,7 +1774,6 @@ the actual WEP key using the MD5 hash algorithm.

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index b1e77edb..5fa62ec0 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMSimpleConnection
+NMSimpleConnection: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -75,8 +75,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -166,7 +164,6 @@ and properties as the source 
-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index e1e8ab62..de3a08b4 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMVpnConnection
+NMVpnConnection: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -127,8 +127,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -155,7 +153,6 @@ nm_vpn_connection_get_vpn_state (
 
Returns

 
 the VPN state of the active VPN connection.

-

 

 
 

@@ -183,7 +180,6 @@ nm_vpn_connection_get_banner (
Returns

 
 the VPN login banner of the VPN connection. This is the internal
 string used by the connection, and must not be modified.

-

 
 
 
@@ -193,16 +189,12 @@ string used by the connection, and must not be modified.

 
NM_VPN_CONNECTION_VPN_STATE

 
#define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 

-

-

 
 

 

 
NM_VPN_CONNECTION_BANNER

 
#define NM_VPN_CONNECTION_BANNER "banner"
 

-

-

 

 
 

@@ -210,7 +202,7 @@ string used by the connection, and must not be modified.

 

 
The “banner” property

 
  “banner”                   gchar *

-

+
The VPN login banner of the active VPN connection.

 
Flags: Read

 
Default value: NULL

 

@@ -218,7 +210,7 @@ string used by the connection, and must not be modified.

 

 
The “vpn-state” property

 
  “vpn-state”                NMVpnConnectionState

-

+
The VPN state of the active VPN connection.

 
Flags: Read

 
Default value: NM_VPN_CONNECTION_STATE_UNKNOWN

 

@@ -237,7 +229,6 @@ user_function (
-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMVpnEditor.html b/docs/libnm/html/NMVpnEditor.html
index ee18c74d..d6f1b3ca 100644
--- a/docs/libnm/html/NMVpnEditor.html
+++ b/docs/libnm/html/NMVpnEditor.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMVpnEditor
+NMVpnEditor: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -208,8 +208,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -217,24 +215,12 @@
 
NMVpnEditorPluginFactory ()

 
NMVpnEditorPlugin *
 (*NMVpnEditorPluginFactory) (GError **error);

-

-

-

-
Returns

-

-

 

 

 

 
nm_vpn_editor_plugin_factory ()

 
NMVpnEditorPlugin *
 nm_vpn_editor_plugin_factory (GError **error);

-

-

-

-
Returns

-

-

 

 

 

@@ -254,12 +240,6 @@ nm_vpn_editor_plugin_get_editor (
nm_vpn_editor_plugin_get_capabilities ()

 
NMVpnEditorPluginCapability
 nm_vpn_editor_plugin_get_capabilities (NMVpnEditorPlugin *plugin);

-

-

-

-
Returns

-

-

 

 

 

@@ -282,12 +262,6 @@ nm_vpn_editor_plugin_export (const char *path,
                              NMConnection *connection,
                              GError **error);
-

-

-

-
Returns

-

-

 

 

 

@@ -296,12 +270,6 @@ nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                                 NMConnection *connection);
-

-

-

-
Returns

-

-

 

 

 

@@ -321,12 +289,6 @@ nm_vpn_editor_get_widget (NMVpnEditor *editor,
                                  NMConnection *connection,
                                  GError **error);
-

-

-

-
Returns

-

-

 

 
 

@@ -380,24 +342,18 @@ nm_vpn_editor_update_connection (
NM_VPN_EDITOR_PLUGIN_NAME

 
#define NM_VPN_EDITOR_PLUGIN_NAME "name"
 

-

-

 

 

 

 
NM_VPN_EDITOR_PLUGIN_DESCRIPTION

 
#define NM_VPN_EDITOR_PLUGIN_DESCRIPTION "description"
 

-

-

 

 

 

 
NM_VPN_EDITOR_PLUGIN_SERVICE

 
#define NM_VPN_EDITOR_PLUGIN_SERVICE "service"
 

-

-

 

 

 

@@ -552,7 +508,7 @@ to write values to the connection.

 

 
The “description” property

 
  “description”              gchar *

-

+
Longer description of the VPN plugin.

 
Flags: Read

 
Default value: NULL

 

@@ -560,7 +516,7 @@ to write values to the connection.

 

 
The “name” property

 
  “name”                     gchar *

-

+
Short display name of the VPN plugin.

 
Flags: Read

 
Default value: NULL

 

@@ -568,7 +524,7 @@ to write values to the connection.

 

 
The “service” property

 
  “service”                  gchar *

-

+
D-Bus service name of the plugin's VPN service.

 
Flags: Read

 
Default value: NULL

 

@@ -585,7 +541,6 @@ user_function (
 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 6b4d8307..c91b65e2 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMWimaxNsp
+NMWimaxNsp: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -149,8 +149,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -177,7 +175,6 @@ nm_wimax_nsp_get_name (
 
Returns

 
 the name

-

 

 
 

@@ -204,7 +201,6 @@ nm_wimax_nsp_get_signal_quality (
 
Returns

 
 the signal quality

-

 
 
 

@@ -231,7 +227,6 @@ nm_wimax_nsp_get_network_type (
 
Returns

 
 the network type

-

 
 
 

@@ -314,7 +309,6 @@ against

 
Returns

 
 TRUE if the connection may be activated with this WiMAX NSP,
 FALSE if it cannot be.

-

 
 
 
@@ -324,24 +318,18 @@ against

 
NM_WIMAX_NSP_NAME

 
#define NM_WIMAX_NSP_NAME           "name"
 

-

-

 
 

 

 
NM_WIMAX_NSP_SIGNAL_QUALITY

 
#define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 

-

-

 

 

 

 
NM_WIMAX_NSP_NETWORK_TYPE

 
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 

-

-

 

 

 

@@ -394,7 +382,7 @@ against

 

 
The “name” property

 
  “name”                     gchar *

-

+
The name of the WiMAX NSP.

 
Flags: Read

 
Default value: NULL

 

@@ -402,7 +390,7 @@ against

 

 
The “network-type” property

 
  “network-type”             NMWimaxNspNetworkType

-

+
The network type of the WiMAX NSP.

 
Flags: Read

 
Default value: NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

 

@@ -410,7 +398,7 @@ against

 

 
The “signal-quality” property

 
  “signal-quality”           guint

-

+
The signal quality of the WiMAX NSP.

 
Flags: Read

 
Allowed values: <= 100

 
Default value: 0

@@ -418,7 +406,6 @@ against

 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html
index ffa567c1..ff056841 100644
--- a/docs/libnm/html/annotation-glossary.html
+++ b/docs/libnm/html/annotation-glossary.html
@@ -2,12 +2,12 @@
 
 
 
-libnm Reference Manual: Annotation Glossary
+Annotation Glossary: libnm Reference Manual
 
 
 
 
-
+
 
 
 
@@ -55,6 +55,8 @@
 
The callback is valid until first called.

 
scope call

 
The callback is valid only during the call to the method.

+
skip

+
Exposed in C code, not necessarily available in other languages.

 
T

 
transfer container

 
Free data container after the code is done.

@@ -66,7 +68,6 @@
 
Override the parsed C type with given type.

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index e64d6477..aac846df 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: API Index
+API Index: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -27,6 +27,8 @@
                      | 
                   I
                      | 
+                  K
+                     | 
                   M
                      | 
                   O
@@ -390,6 +392,10 @@
 NM_AVAILABLE_IN_1_0, macro in nm-version
 
 

+

+NM_AVAILABLE_IN_1_0_4, macro in nm-version
+

+

 
B

 

 NMBluetoothCapabilities, enum in nm-dbus-interface
@@ -1342,6 +1348,14 @@
 

 

 

+DEFINE_KF_LIST_WRAPPER_PROTO, macro in nm-keyfile-utils
+

+

+

+DEFINE_KF_WRAPPER_PROTO, macro in nm-keyfile-utils
+

+

+

 NM_DEPRECATED_IN_0_9_10, macro in nm-version
 

 

@@ -2591,6 +2605,79 @@
 nm_ip_route_unref, function in NMSettingIPConfig
 
 

+
K

+

+NMKeyfileReadHandler, user_function in nm-keyfile-internal
+

+

+

+NMKeyfileReadType, enum in nm-keyfile-internal
+

+

+

+NMKeyfileReadTypeDataWarn, struct in nm-keyfile-internal
+

+

+

+NMKeyfileWarnSeverity, enum in nm-keyfile-internal
+

+

+

+NMKeyfileWriteHandler, user_function in nm-keyfile-internal
+

+

+

+NMKeyfileWriteType, enum in nm-keyfile-internal
+

+

+

+NMKeyfileWriteTypeDataCert, struct in nm-keyfile-internal
+

+

+

+NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB, macro in nm-keyfile-internal
+

+

+

+NM_KEYFILE_CERT_SCHEME_PREFIX_PATH, macro in nm-keyfile-internal
+

+

+

+nm_keyfile_detect_unqualified_path_scheme, function in nm-keyfile-internal
+

+

+

+nm_keyfile_plugin_get_alias_for_setting_name, function in nm-keyfile-utils
+

+

+

+nm_keyfile_plugin_get_setting_name_for_alias, function in nm-keyfile-utils
+

+

+

+nm_keyfile_plugin_kf_get_keys, function in nm-keyfile-utils
+

+

+

+nm_keyfile_plugin_kf_get_string, function in nm-keyfile-internal
+

+

+

+nm_keyfile_plugin_kf_has_key, function in nm-keyfile-utils
+

+

+

+nm_keyfile_plugin_kf_set_string, function in nm-keyfile-internal
+

+

+

+nm_keyfile_read, function in nm-keyfile-internal
+

+

+

+nm_keyfile_write, function in nm-keyfile-internal
+

+

 
M

 

 NM_MAJOR_VERSION, macro in nm-version
@@ -3088,6 +3175,10 @@
 

 

 

+NMSettingConnection:autoconnect-slaves, object property in NMSettingConnection
+

+

+

 NMSettingConnection:gateway-ping-timeout, object property in NMSettingConnection
 

 

@@ -3136,6 +3227,10 @@
 
 

 

+NMSettingConnectionAutoconnectSlaves, enum in NMSettingConnection
+

+

+

 NMSettingDcb:app-fcoe-flags, object property in NMSettingDcb
 

 

@@ -3716,6 +3811,10 @@
 
 

 

+NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, macro in NMSetting8021x
+

+

+

 nm_setting_802_1x_clear_altsubject_matches, function in NMSetting8021x
 

 

@@ -4480,6 +4579,10 @@
 
 

 

+NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, macro in NMSettingConnection
+

+

+

 NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, macro in NMSettingConnection
 

 

@@ -4492,6 +4595,10 @@
 
 

 

+nm_setting_connection_get_autoconnect_slaves, function in NMSettingConnection
+

+

+

 nm_setting_connection_get_connection_type, function in NMSettingConnection
 

 

@@ -6474,6 +6581,14 @@
 
 

 

+NM_VERSION_1_0_2, macro in nm-version
+

+

+

+NM_VERSION_1_0_4, macro in nm-version
+

+

+

 NM_VERSION_CUR_STABLE, macro in nm-version
 

 

@@ -6773,6 +6888,10 @@
 NM_VPN_PLUGIN_IP6_CONFIG_ROUTES, macro in nm-vpn-dbus-interface
 
 

+

+VPN_SECRETS_GROUP, macro in nm-keyfile-utils
+

+

 
W

 

 NMWepKeyType, enum in NMSettingWirelessSecurity
@@ -6828,7 +6947,6 @@
 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html
index 8275cbd8..64f06223 100644
--- a/docs/libnm/html/ch02.html
+++ b/docs/libnm/html/ch02.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: Client Object API Reference
+Client Object API Reference: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -41,7 +41,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html
index 5a52fb4c..e30c11dc 100644
--- a/docs/libnm/html/ch03.html
+++ b/docs/libnm/html/ch03.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: Connection and Setting API Reference
+Connection and Setting API Reference: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -120,7 +120,6 @@ use WEP, LEAP, WPA or WPA2/RSN security
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html
index 851d3f2b..6513b1a8 100644
--- a/docs/libnm/html/ch04.html
+++ b/docs/libnm/html/ch04.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: Device and Runtime Configuration API Reference
+Device and Runtime Configuration API Reference: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -89,7 +89,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html
index 08ddd5cc..8dd164e2 100644
--- a/docs/libnm/html/ch05.html
+++ b/docs/libnm/html/ch05.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: Utility API Reference
+Utility API Reference: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -32,7 +32,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html
index 4e2d3dc4..7cbb0f5e 100644
--- a/docs/libnm/html/ch06.html
+++ b/docs/libnm/html/ch06.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: VPN Plugin API Reference
+VPN Plugin API Reference: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -32,7 +32,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 8affed8e..f197c752 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -15,7 +15,7 @@
 

 

 
 


 

-      for libnm 1.0.2
+      for libnm 1.0.4
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/1.0/.
@@ -253,7 +253,6 @@ use WEP, LEAP, WPA or WPA2/RSN security
 

 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index ebd23df0..0f085cb3 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -87,8 +87,28 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
+
+
+
 
 
 
@@ -182,16 +202,79 @@
 
 
 
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
 
 
+
+
+
+
+
+
 
 
+
+
+
+
+
+
+
+
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
+
 
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -239,20 +322,180 @@
 
 
 
+
+
+
+
+
+
+
+
 
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
 
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
 
+
+
+
 
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
+
+
 
+
+
+
+
+
+
 
+
+
+
 
 
 
@@ -320,6 +563,9 @@
 
 
 
+
+
+
 
 
 
@@ -355,9 +601,27 @@
 
 
 
+
+
+
+
 
+
+
+
+
+
+
+
+
+
 
 
+
+
+
+
+
 
 
 
@@ -386,6 +650,7 @@
 
 
 
+
 
 
 
@@ -409,12 +674,18 @@
 
 
 
+
 
 
+
+
+
+
 
 
 
 
+
 
 
 
@@ -503,8 +774,16 @@
 
 
 
+
 
+
+
+
+
 
+
+
+
 
 
 
@@ -770,6 +1049,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1025,6 +1308,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1151,6 +1438,9 @@
 
 
 
+
+
+
 
 
 
@@ -1217,7 +1507,12 @@
 
 
 
+
+
 
+
+
+
 
 
 
@@ -1434,6 +1729,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -1988,6 +2287,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -2102,6 +2405,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -2117,6 +2429,8 @@
 
 
 
+
+
 
 
 
@@ -2128,6 +2442,7 @@
 
 
 
+
 
 
 
@@ -2160,9 +2475,39 @@
 
 
 
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
 
+
+
+
+
+
+
+
+
+
+
+
+
 
+
+
+
 
 
 
@@ -2216,6 +2561,10 @@
 
 
 
+
+
+
+
 
 
 
@@ -2235,6 +2584,7 @@
 
 
 
+
 
 
 
diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html
index 3ff7a3b6..7c3f7952 100644
--- a/docs/libnm/html/libnm-NMConnection.html
+++ b/docs/libnm/html/libnm-NMConnection.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: NMConnection
+NMConnection: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -742,7 +742,6 @@ need to result in a connection that passes connection
 will be unchanged).

-

 
 
 

@@ -843,7 +842,6 @@ each flag's behavior.

 

 
Returns

 
 TRUE if the comparison succeeds, FALSE if it does not

-

 

 
 

@@ -899,7 +897,6 @@ differ mapped to one or more of 
Returns

 
 TRUE if the connections contain the same values, FALSE if they do
 not

-

 
 
 

@@ -942,7 +939,6 @@ setting and which property failed validation, and how it failed validation.

 

 
Returns

 
 TRUE if the connection is valid, FALSE if it is not

-

 

 
 

@@ -1001,7 +997,6 @@ why the connection is invalid, if the function returns an error.

 

 
Returns

 
 TRUE if the connection is valid, FALSE if it is not

-

 

 
 

@@ -1045,7 +1040,6 @@ elements. 

 
Returns

 
 the setting name of the NMSetting object which has invalid or
 missing secrets

-

 
 
 

@@ -1164,7 +1158,6 @@ or 
Returns

 
 TRUE if the secrets were successfully updated, FALSE if the update
 failed (tried to update secrets for a setting that doesn't exist, etc)

-

 
 
 

@@ -1225,7 +1218,6 @@ nm_connection_get_path (
Returns

 
 the D-Bus path of the connection, previously set by a call to
 nm_connection_set_path().

-

 
 
 

@@ -1256,7 +1248,6 @@ NetworkManager, this is the name of the created interface.

 

 
Returns

 
 Name of the kernel interface or NULL

-

 

 
 

@@ -1297,7 +1288,6 @@ property of the connection and matches that against 
 
Returns

 
 TRUE if the connection is of the given type
 , FALSE if not

-

 
 
 

@@ -1386,7 +1376,6 @@ nm_connection_get_uuid (
 
Returns

 
 the UUID from the connection's 'connection' setting

-

 
 
 

@@ -1413,7 +1402,6 @@ nm_connection_get_id (
 
Returns

 
 the ID from the connection's 'connection' setting

-

 
 
 

@@ -1440,7 +1428,6 @@ nm_connection_get_connection_type (
 
Returns

 
 the type from the connection's 'connection' setting

-

 
 
 

@@ -1470,7 +1457,6 @@ activated even if the device it refers to doesn't exist).

 
Returns

 
 whether connection
 refers to a virtual device

-

 
 
 

@@ -2225,32 +2211,24 @@ nm_connection_get_setting_vlan (
NM_CONNECTION_SECRETS_UPDATED

 
#define NM_CONNECTION_SECRETS_UPDATED "secrets-updated"
 

-

-

 
 

 

 
NM_CONNECTION_SECRETS_CLEARED

 
#define NM_CONNECTION_SECRETS_CLEARED "secrets-cleared"
 

-

-

 

 

 

 
NM_CONNECTION_CHANGED

 
#define NM_CONNECTION_CHANGED         "changed"
 

-

-

 

 

 

 
NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD

 
#define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
 

-

-

 

 

 

@@ -2349,7 +2327,6 @@ calling 
 

 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 3d03fe4c..1272e0d3 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: nm-dbus-interface
+nm-dbus-interface: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -286,11 +286,10 @@
 
 

 
Description

-

-

 

 

 
Functions

+

 

 

 
Types and Values

@@ -298,320 +297,240 @@
 
NM_DBUS_SERVICE

 
#define NM_DBUS_SERVICE                     "org.freedesktop.NetworkManager"
 

-

-

 

 

 

 
NM_DBUS_PATH

 
#define NM_DBUS_PATH                        "/org/freedesktop/NetworkManager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE

 
#define NM_DBUS_INTERFACE                   "org.freedesktop.NetworkManager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE

 
#define NM_DBUS_INTERFACE_DEVICE            NM_DBUS_INTERFACE ".Device"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_WIRED

 
#define NM_DBUS_INTERFACE_DEVICE_WIRED      NM_DBUS_INTERFACE_DEVICE ".Wired"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_ADSL

 
#define NM_DBUS_INTERFACE_DEVICE_ADSL       NM_DBUS_INTERFACE_DEVICE ".Adsl"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_WIRELESS

 
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS   NM_DBUS_INTERFACE_DEVICE ".Wireless"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_BLUETOOTH

 
#define NM_DBUS_INTERFACE_DEVICE_BLUETOOTH  NM_DBUS_INTERFACE_DEVICE ".Bluetooth"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_OLPC_MESH

 
#define NM_DBUS_INTERFACE_DEVICE_OLPC_MESH  NM_DBUS_INTERFACE_DEVICE ".OlpcMesh"
 

-

-

 

 

 

 
NM_DBUS_PATH_ACCESS_POINT

 
#define NM_DBUS_PATH_ACCESS_POINT           NM_DBUS_PATH "/AccessPoint"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_ACCESS_POINT

 
#define NM_DBUS_INTERFACE_ACCESS_POINT      NM_DBUS_INTERFACE ".AccessPoint"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_MODEM

 
#define NM_DBUS_INTERFACE_DEVICE_MODEM      NM_DBUS_INTERFACE_DEVICE ".Modem"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_WIMAX

 
#define NM_DBUS_INTERFACE_DEVICE_WIMAX      NM_DBUS_INTERFACE_DEVICE ".WiMax"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_WIMAX_NSP

 
#define NM_DBUS_INTERFACE_WIMAX_NSP         NM_DBUS_INTERFACE ".WiMax.Nsp"
 

-

-

 

 

 

 
NM_DBUS_PATH_WIMAX_NSP

 
#define NM_DBUS_PATH_WIMAX_NSP              NM_DBUS_PATH "/Nsp"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_ACTIVE_CONNECTION

 
#define NM_DBUS_INTERFACE_ACTIVE_CONNECTION NM_DBUS_INTERFACE ".Connection.Active"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_IP4_CONFIG

 
#define NM_DBUS_INTERFACE_IP4_CONFIG        NM_DBUS_INTERFACE ".IP4Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DHCP4_CONFIG

 
#define NM_DBUS_INTERFACE_DHCP4_CONFIG      NM_DBUS_INTERFACE ".DHCP4Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_IP6_CONFIG

 
#define NM_DBUS_INTERFACE_IP6_CONFIG        NM_DBUS_INTERFACE ".IP6Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DHCP6_CONFIG

 
#define NM_DBUS_INTERFACE_DHCP6_CONFIG      NM_DBUS_INTERFACE ".DHCP6Config"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_INFINIBAND

 
#define NM_DBUS_INTERFACE_DEVICE_INFINIBAND NM_DBUS_INTERFACE_DEVICE ".Infiniband"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_BOND

 
#define NM_DBUS_INTERFACE_DEVICE_BOND       NM_DBUS_INTERFACE_DEVICE ".Bond"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_TEAM

 
#define NM_DBUS_INTERFACE_DEVICE_TEAM       NM_DBUS_INTERFACE_DEVICE ".Team"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_VLAN

 
#define NM_DBUS_INTERFACE_DEVICE_VLAN       NM_DBUS_INTERFACE_DEVICE ".Vlan"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_BRIDGE

 
#define NM_DBUS_INTERFACE_DEVICE_BRIDGE     NM_DBUS_INTERFACE_DEVICE ".Bridge"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_GENERIC

 
#define NM_DBUS_INTERFACE_DEVICE_GENERIC    NM_DBUS_INTERFACE_DEVICE ".Generic"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_VETH

 
#define NM_DBUS_INTERFACE_DEVICE_VETH       NM_DBUS_INTERFACE_DEVICE ".Veth"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_TUN

 
#define NM_DBUS_INTERFACE_DEVICE_TUN        NM_DBUS_INTERFACE_DEVICE ".Tun"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_MACVLAN

 
#define NM_DBUS_INTERFACE_DEVICE_MACVLAN    NM_DBUS_INTERFACE_DEVICE ".Macvlan"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_VXLAN

 
#define NM_DBUS_INTERFACE_DEVICE_VXLAN      NM_DBUS_INTERFACE_DEVICE ".Vxlan"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_DEVICE_GRE

 
#define NM_DBUS_INTERFACE_DEVICE_GRE        NM_DBUS_INTERFACE_DEVICE ".Gre"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_SETTINGS

 
#define NM_DBUS_INTERFACE_SETTINGS        "org.freedesktop.NetworkManager.Settings"
 

-

-

 

 

 

 
NM_DBUS_PATH_SETTINGS

 
#define NM_DBUS_PATH_SETTINGS             "/org/freedesktop/NetworkManager/Settings"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_SETTINGS_CONNECTION

 
#define NM_DBUS_INTERFACE_SETTINGS_CONNECTION "org.freedesktop.NetworkManager.Settings.Connection"
 

-

-

 

 

 

 
NM_DBUS_PATH_SETTINGS_CONNECTION

 
#define NM_DBUS_PATH_SETTINGS_CONNECTION  "/org/freedesktop/NetworkManager/Settings/Connection"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS

 
#define NM_DBUS_INTERFACE_SETTINGS_CONNECTION_SECRETS "org.freedesktop.NetworkManager.Settings.Connection.Secrets"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_AGENT_MANAGER

 
#define NM_DBUS_INTERFACE_AGENT_MANAGER   NM_DBUS_INTERFACE ".AgentManager"
 

-

-

 

 

 

 
NM_DBUS_PATH_AGENT_MANAGER

 
#define NM_DBUS_PATH_AGENT_MANAGER        "/org/freedesktop/NetworkManager/AgentManager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_SECRET_AGENT

 
#define NM_DBUS_INTERFACE_SECRET_AGENT    NM_DBUS_INTERFACE ".SecretAgent"
 

-

-

 

 

 

 
NM_DBUS_PATH_SECRET_AGENT

 
#define NM_DBUS_PATH_SECRET_AGENT         "/org/freedesktop/NetworkManager/SecretAgent"
 

-

-

 

 

 

@@ -1881,6 +1800,20 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
  
 
+
+
NM_DEVICE_STATE_REASON_PARENT_CHANGED

+
+
the device's parent changed

+
+ 
+
+
+
NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED

+
+
the device parent's management changed

+
+ 
+
 
 

 
@@ -2057,7 +1990,6 @@ VPN plugin authentication dialogs.

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index b62be03e..92ea7737 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: nm-errors
+nm-errors: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -197,8 +197,6 @@
 
 

 
Description

-

-

 

 

 
Functions

@@ -206,136 +204,78 @@
 
nm_agent_manager_error_quark ()

 
GQuark
 nm_agent_manager_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
NM_AGENT_MANAGER_ERROR

 
#define NM_AGENT_MANAGER_ERROR (nm_agent_manager_error_quark ())
 

-

-

 

 

 

 
nm_connection_error_quark ()

 
GQuark
 nm_connection_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
nm_crypto_error_quark ()

 
GQuark
 nm_crypto_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
nm_device_error_quark ()

 
GQuark
 nm_device_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
nm_manager_error_quark ()

 
GQuark
 nm_manager_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
NM_MANAGER_ERROR

 
#define NM_MANAGER_ERROR (nm_manager_error_quark ())
 

-

-

 

 

 

 
nm_secret_agent_error_quark ()

 
GQuark
 nm_secret_agent_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
NM_SECRET_AGENT_ERROR

 
#define NM_SECRET_AGENT_ERROR         (nm_secret_agent_error_quark ())
 

-

-

 

 

 

 
nm_settings_error_quark ()

 
GQuark
 nm_settings_error_quark (void);

-

-

-

-
Returns

-

-

 

 

 

 
NM_SETTINGS_ERROR

 
#define NM_SETTINGS_ERROR (nm_settings_error_quark ())
 

-

-

 

 

 

 
NM_VPN_PLUGIN_ERROR

 
#define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
 

-

-

 

 

 

 
nm_vpn_plugin_error_quark ()

 
GQuark
 nm_vpn_plugin_error_quark (void);

-

-

-

-
Returns

-

-

 

 
 

@@ -506,8 +446,6 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR

 
#define NM_CONNECTION_ERROR nm_connection_error_quark ()
 

-

-

 

 

 

@@ -575,8 +513,6 @@ and some 
NM_CRYPTO_ERROR

 
#define NM_CRYPTO_ERROR nm_crypto_error_quark ()
 

-

-

 

 

 

@@ -664,8 +600,6 @@ returned from D-Bus operations (where they correspond to errors in the
 
NM_DEVICE_ERROR

 
#define NM_DEVICE_ERROR nm_device_error_quark ()
 

-

-

 

 

 

@@ -1020,7 +954,6 @@ to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 60eb603e..d3789e5b 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: nm-utils
+nm-utils: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -532,7 +532,6 @@ number of known SSID-cloaking methods.

 

 
Returns

 
 TRUE if the SSID is "empty", FALSE if it is not

-

 

 
 

@@ -572,7 +571,6 @@ be used for display of SSIDs.

 
Returns

 
 pointer to the escaped SSID, which uses an internal static buffer
 and will be overwritten by subsequent calls to this function

-

 
 
 

@@ -632,7 +630,6 @@ NULLs, even though that is functionally pointless.

 

 
Returns

 
 TRUE if the SSIDs are the same, FALSE if they are not

-

 

 
 

@@ -766,7 +763,6 @@ e.g. (TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
 , FALSE if they are not

-

 
 
 

@@ -807,7 +803,6 @@ e.g.  TRUE if the device capabilities are compatible with the desired
 type
 , FALSE if they are not.

-

 
 
 

@@ -844,7 +839,6 @@ nm_utils_wep_key_valid (const cha
 
Returns

 
 TRUE if key
 is a WEP key, FALSE if not

-

 
 
 

@@ -873,7 +867,6 @@ nm_utils_wpa_psk_valid (const cha
 
Returns

 
 TRUE if psk
 is a WPA PSK, FALSE if not

-

 
 
 

@@ -1099,7 +1092,6 @@ nm_utils_ip4_netmask_to_prefix (g
 

 
Returns

 
 the CIDR prefix represented by the netmask

-

 

 
 

@@ -1125,7 +1117,6 @@ nm_utils_ip4_prefix_to_netmask (g
 

 
Returns

 
 the netmask represented by the prefix, in network byte order

-

 

 
 

@@ -1155,7 +1146,6 @@ falls in the predefined classes.

 

 
Returns

 
 the default class prefix for the given IP

-

 

 
 

@@ -1509,7 +1499,6 @@ nm_utils_uuid_generate (void
Returns

 
 a newly allocated UUID suitable for use as the NMSettingConnection
 object's “id”: property.  Should be freed with g_free()

-

 
 
 

@@ -1539,7 +1528,6 @@ recognized by NetworkManager.

 

 
Returns

 
 TRUE if the file is a certificate, FALSE if it is not

-

 

 
 

@@ -1577,7 +1565,6 @@ recognized by NetworkManager.

 

 
Returns

 
 TRUE if the file is a private key, FALSE if it is not

-

 

 
 

@@ -1605,7 +1592,6 @@ nm_utils_file_is_pkcs12 (const ch
 

 
Returns

 
 TRUE if the file is PKCS#12, FALSE if it is not

-

 

 
 

@@ -1614,12 +1600,6 @@ nm_utils_file_is_pkcs12 (const ch
 
gboolean
 (*NMUtilsFileSearchInPathsPredicate) (const char *filename,
                                       gpointer user_data);

-

-

-

-
Returns

-

-

 
 

 

@@ -1726,7 +1706,6 @@ nm_utils_wifi_freq_to_channel (gu
 

 
Returns

 
 the channel represented by the frequency or 0

-

 

 

 

@@ -1763,7 +1742,6 @@ nm_utils_wifi_channel_to_freq (gu
 
 the frequency represented by the channel of the band,
 or -1 when the freq is invalid, or 0 when the band
 is invalid

-

 
 
 

@@ -1804,7 +1782,6 @@ nm_utils_wifi_find_next_channel (
 

 
Returns

 
 the next channel in the specified direction or 0

-

 

 
 

@@ -1839,7 +1816,6 @@ nm_utils_wifi_is_channel_valid (g
 

 
Returns

 
 TRUE or FALSE

-

 

 
 

@@ -1870,7 +1846,6 @@ support it, this will use unicode graphics characters to represent
 

 
Returns

 
 the graphical representation of the access point strength

-

 

 
 

@@ -1901,7 +1876,6 @@ nm_utils_hwaddr_len (int t
 

 
Returns

 
 the length.

-

 

 
 

@@ -2028,7 +2002,6 @@ the size of the buffer in bytes.

 couldn't be parsed
 or would be shorter or longer than length
 .

-

 
 
 

@@ -2069,7 +2042,6 @@ is expected to convert to
 
 TRUE if asc
 appears to be a valid hardware address
 of the indicated length, FALSE if not.

-

 
 
 

@@ -2195,7 +2167,6 @@ is ASCII

 and hwaddr2
 are equivalent, FALSE if they are
 different (or either of them is invalid).

-

 
 
 

@@ -2303,7 +2274,6 @@ function in net/core/dev.c.

 

 
Returns

 
 TRUE if interface name is valid, otherwise FALSE is returned.

-

 

 
 

@@ -2332,7 +2302,6 @@ nm_utils_is_uuid (const char
Returns

 
 TRUE if str
 is a UUID, FALSE if not

-

 
 
 

@@ -2342,8 +2311,9 @@ is a UUID, FALSE if not

 nm_utils_inet4_ntop (in_addr_t inaddr,
                      char *dst);
 
Wrapper for inet_ntop.

+
[skip]

 

-
Parameters

+
Parameters

 
@@ -2374,11 +2344,10 @@ buffer to avoid these issues.

 
 

 

 

 

-
Returns

+
Returns

 
 the input buffer dst
 , or a pointer to an
 internal, static buffer. This function cannot fail.

-

 

 
 

@@ -2388,8 +2357,9 @@ internal, static buffer. This function cannot fail.

 nm_utils_inet6_ntop (const struct in6_addr *in6addr,
                      char *dst);
 
Wrapper for inet_ntop.

+
[skip]

 

-
Parameters

+
Parameters

 
@@ -2420,13 +2390,12 @@ buffer to avoid these issues.

 
 

 

 

 

-
Returns

+
Returns

 
 the input buffer dst
 , or a pointer to an
 internal, static buffer. NULL is not allowed as in6addr
 ,
 otherwise, this function cannot fail.

-

 

 
 

@@ -2463,7 +2432,6 @@ nm_utils_ipaddr_valid (int
 

 
Returns

 
 TRUE or FALSE

-

 

 
 

@@ -2519,7 +2487,6 @@ underlying device driver.

 

 
Returns

 
 TRUE or FALSE

-

 

 
 
@@ -2628,7 +2595,6 @@ for both 
-

-          Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 7cbebd93..99310a5c 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: nm-version
+nm-version: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -77,6 +77,14 @@
 
 
 #define
+NM_VERSION_1_0_2
+
+
+#define
+NM_VERSION_1_0_4
+
+
+#define
 NM_VERSION_MIN_REQUIRED
 
 
@@ -130,13 +138,15 @@
 #define
 NM_AVAILABLE_IN_1_0
 
+
+#define
+NM_AVAILABLE_IN_1_0_4
+
 
 
 
 

 
Description

-

-

 

 

 
Functions

@@ -158,7 +168,7 @@ is compiled against.

 

 

 
NM_MICRO_VERSION

-
#define NM_MICRO_VERSION (2)
+
#define NM_MICRO_VERSION (4)
 

 
Evaluates to the micro version number of NetworkManager which this source
 compiled against.

@@ -198,7 +208,6 @@ compiled against.

 
Returns

 
 TRUE if the version of the NetworkManager header files
 is the same as or newer than the passed-in version.

-

 

 

 

@@ -206,119 +215,108 @@ is the same as or newer than the passed-in version.

 
NM_ENCODE_VERSION()

 
#define NM_ENCODE_VERSION(major,minor,micro) ((major) << 16 | (minor) << 8 | (micro))
 

-

-

 
 

 

 
NM_VERSION_0_9_8

 
#define NM_VERSION_0_9_8  (NM_ENCODE_VERSION (0, 9, 8))
 

-

-

 

 

 

 
NM_VERSION_0_9_10

 
#define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
 

-

-

 

 

 

 
NM_VERSION_1_0

 
#define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
 

-

-

+

+

+

+
NM_VERSION_1_0_2

+
#define NM_VERSION_1_0_2  (NM_ENCODE_VERSION (1, 0, 2))
+

+

+

+

+
NM_VERSION_1_0_4

+
#define NM_VERSION_1_0_4  (NM_ENCODE_VERSION (1, 0, 4))
+

 

 

 

 
NM_VERSION_MIN_REQUIRED

 
# define NM_VERSION_MIN_REQUIRED (NM_VERSION_CUR_STABLE)
 

-

-

 

 

 

 
NM_VERSION_MAX_ALLOWED

 
# define NM_VERSION_MAX_ALLOWED (NM_VERSION_CUR_STABLE)
 

-

-

 

 

 

 
NM_DEPRECATED_IN_0_9_10_FOR()

 
# define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
 

-

-

 

 

 

 
NM_DEPRECATED_IN_1_0_FOR()

 
# define NM_DEPRECATED_IN_1_0_FOR(f)    G_DEPRECATED_FOR(f)
 

-

-

 

 
 

 
Types and Values

 

 
NM_VERSION_CUR_STABLE

-
#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
+
#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0_2
 

-

-

 

 

 

 
NM_VERSION_NEXT_STABLE

-
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0
+
#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_4
 

-

-

 

 

 

 
NM_DEPRECATED_IN_0_9_10

 
# define NM_DEPRECATED_IN_0_9_10        G_DEPRECATED
 

-

-

 

 

 

 
NM_DEPRECATED_IN_1_0

 
# define NM_DEPRECATED_IN_1_0           G_DEPRECATED
 

-

-

 

 

 

 
NM_AVAILABLE_IN_0_9_10

 
# define NM_AVAILABLE_IN_0_9_10         G_UNAVAILABLE(0.9,10)
 

-

-

 

 

 

 
NM_AVAILABLE_IN_1_0

 
# define NM_AVAILABLE_IN_1_0            G_UNAVAILABLE(1,0)
 

-

-

+

+

+

+
NM_AVAILABLE_IN_1_0_4

+
# define NM_AVAILABLE_IN_1_0_4          G_UNAVAILABLE(1,0.4)
+

 

 

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index d48bb1cd..cb1bb7f5 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: nm-vpn-dbus-interface
+nm-vpn-dbus-interface: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -302,11 +302,10 @@
 
 

 
Description

-

-

 

 

 
Functions

+

 

 

 
Types and Values

@@ -314,200 +313,150 @@
 
NM_DBUS_PATH_VPN

 
#define NM_DBUS_PATH_VPN                  "/org/freedesktop/NetworkManager/VPN/Manager"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_VPN

 
#define NM_DBUS_INTERFACE_VPN             "org.freedesktop.NetworkManager.VPN.Manager"
 

-

-

 

 

 

 
NM_DBUS_PATH_VPN_CONNECTION

 
#define NM_DBUS_PATH_VPN_CONNECTION       "/org/freedesktop/NetworkManager/VPN/Connection"
 

-

-

 

 

 

 
NM_DBUS_INTERFACE_VPN_CONNECTION

 
#define NM_DBUS_INTERFACE_VPN_CONNECTION  "org.freedesktop.NetworkManager.VPN.Connection"
 

-

-

 

 

 

 
NM_VPN_DBUS_PLUGIN_PATH

 
#define NM_VPN_DBUS_PLUGIN_PATH           "/org/freedesktop/NetworkManager/VPN/Plugin"
 

-

-

 

 

 

 
NM_VPN_DBUS_PLUGIN_INTERFACE

 
#define NM_VPN_DBUS_PLUGIN_INTERFACE      "org.freedesktop.NetworkManager.VPN.Plugin"
 

-

-

 

 

 

 
NM_DBUS_NO_ACTIVE_VPN_CONNECTION

 
#define NM_DBUS_NO_ACTIVE_VPN_CONNECTION "org.freedesktop.NetworkManager.VPNConnections.NoActiveVPNConnection"
 

-

-

 

 

 

 
NM_DBUS_NO_VPN_CONNECTIONS

 
#define NM_DBUS_NO_VPN_CONNECTIONS       "org.freedesktop.NetworkManager.VPNConnections.NoVPNConnections"
 

-

-

 

 

 

 
NM_DBUS_INVALID_VPN_CONNECTION

 
#define NM_DBUS_INVALID_VPN_CONNECTION   "org.freedesktop.NetworkManager.VPNConnections.InvalidVPNConnection"
 

-

-

 

 

 

 
NM_DBUS_VPN_ERROR_PREFIX

 
#define NM_DBUS_VPN_ERROR_PREFIX              "org.freedesktop.NetworkManager.VPN.Error"
 

-

-

 

 

 

 
NM_DBUS_VPN_STARTING_IN_PROGRESS

 
#define NM_DBUS_VPN_STARTING_IN_PROGRESS      "StartingInProgress"
 

-

-

 

 

 

 
NM_DBUS_VPN_ALREADY_STARTED

 
#define NM_DBUS_VPN_ALREADY_STARTED           "AlreadyStarted"
 

-

-

 

 

 

 
NM_DBUS_VPN_STOPPING_IN_PROGRESS

 
#define NM_DBUS_VPN_STOPPING_IN_PROGRESS      "StoppingInProgress"
 

-

-

 

 

 

 
NM_DBUS_VPN_ALREADY_STOPPED

 
#define NM_DBUS_VPN_ALREADY_STOPPED           "AlreadyStopped"
 

-

-

 

 

 

 
NM_DBUS_VPN_WRONG_STATE

 
#define NM_DBUS_VPN_WRONG_STATE               "WrongState"
 

-

-

 

 

 

 
NM_DBUS_VPN_BAD_ARGUMENTS

 
#define NM_DBUS_VPN_BAD_ARGUMENTS             "BadArguments"
 

-

-

 

 

 

 
NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED

 
#define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_LOGIN_BANNER

 
#define NM_DBUS_VPN_SIGNAL_LOGIN_BANNER   "LoginBanner"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_LOGIN_FAILED

 
#define NM_DBUS_VPN_SIGNAL_LOGIN_FAILED   "LoginFailed"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED

 
#define NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED  "LaunchFailed"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_CONNECT_FAILED

 
#define NM_DBUS_VPN_SIGNAL_CONNECT_FAILED "ConnectFailed"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD

 
#define NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD "VPNConfigBad"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD

 
#define NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD  "IPConfigBad"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_STATE_CHANGE

 
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE   "StateChange"
 

-

-

 

 

 

 
NM_DBUS_VPN_SIGNAL_IP4_CONFIG

 
#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG     "IP4Config"
 

-

-

 

 

 

@@ -813,269 +762,202 @@
 
NM_VPN_PLUGIN_CONFIG_TUNDEV

 
#define NM_VPN_PLUGIN_CONFIG_TUNDEV      "tundev"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_BANNER

 
#define NM_VPN_PLUGIN_CONFIG_BANNER      "banner"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY

 
#define NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY "gateway"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_MTU

 
#define NM_VPN_PLUGIN_CONFIG_MTU         "mtu"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_HAS_IP4

 
#define NM_VPN_PLUGIN_CONFIG_HAS_IP4     "has-ip4"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CONFIG_HAS_IP6

 
#define NM_VPN_PLUGIN_CONFIG_HAS_IP6     "has-ip6"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_CAN_PERSIST

 
#define NM_VPN_PLUGIN_CAN_PERSIST        "can-persist"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY

 
#define NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY "internal-gateway"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS     "address"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_PTP

 
#define NM_VPN_PLUGIN_IP4_CONFIG_PTP         "ptp"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_PREFIX

 
#define NM_VPN_PLUGIN_IP4_CONFIG_PREFIX      "prefix"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_DNS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_DNS         "dns"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_NBNS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_NBNS        "nbns"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_MSS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_MSS         "mss"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN

 
#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN      "domain"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS

 
#define NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS     "domains"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_ROUTES

 
#define NM_VPN_PLUGIN_IP4_CONFIG_ROUTES      "routes"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT

 
#define NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT "never-default"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY

 
#define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY   NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_BANNER

 
#define NM_VPN_PLUGIN_IP4_CONFIG_BANNER      NM_VPN_PLUGIN_CONFIG_BANNER
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY

 
#define NM_VPN_PLUGIN_IP4_CONFIG_EXT_GATEWAY NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_MTU

 
#define NM_VPN_PLUGIN_IP4_CONFIG_MTU         NM_VPN_PLUGIN_CONFIG_MTU
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV

 
#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV      NM_VPN_PLUGIN_CONFIG_TUNDEV
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY

 
#define NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY "internal-gateway"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS     "address"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_PTP

 
#define NM_VPN_PLUGIN_IP6_CONFIG_PTP         "ptp"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_PREFIX

 
#define NM_VPN_PLUGIN_IP6_CONFIG_PREFIX      "prefix"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_DNS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_DNS         "dns"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_MSS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_MSS         "mss"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN

 
#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN      "domain"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS

 
#define NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS     "domains"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_ROUTES

 
#define NM_VPN_PLUGIN_IP6_CONFIG_ROUTES      "routes"
 

-

-

 

 

 

 
NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT

 
#define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 

-

-

 

 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 58b5d8e4..ff749308 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -1,5 +1,4 @@
 
-
 
   
     
@@ -394,6 +393,7 @@
     
     
     
+    
     
     
     
@@ -416,11 +416,14 @@
     
     
     
+    
     
     
+    
     
     
     
+    
     
     
     
@@ -501,6 +504,7 @@
     
     
     
+    
     
     
     
@@ -1678,6 +1682,8 @@
     
     
     
+    
+    
     
     
     
@@ -1688,6 +1694,7 @@
     
     
     
+    
     
     
     
@@ -1769,5 +1776,346 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   
 
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 514bd2b0..424f0762 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: Object Hierarchy
+Object Hierarchy: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -115,6 +115,7 @@
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
     ├── NMSettingCompareFlags
+    ├── NMSettingConnectionAutoconnectSlaves
     ├── NMSettingDiffResult
     ├── NMSettingIP6ConfigPrivacy
     ├── NMSettingSerialParity
@@ -133,7 +134,6 @@
 
 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html
index 17883712..8d5ab916 100644
--- a/docs/libnm/html/ref-overview.html
+++ b/docs/libnm/html/ref-overview.html
@@ -2,13 +2,13 @@
 
 
 
-libnm Reference Manual: Overview
+Overview: libnm Reference Manual
 
 
 
 
 
-
+
 
 
 
@@ -42,7 +42,6 @@
     

 
 

-

-          Generated by GTK-Doc V1.21

+
Generated by GTK-Doc V1.24
 
 
\ No newline at end of file
diff --git a/docs/libnm/html/style.css b/docs/libnm/html/style.css
index c141ddd2..36754209 100644
--- a/docs/libnm/html/style.css
+++ b/docs/libnm/html/style.css
@@ -60,7 +60,7 @@ a:hover
 div.informaltable table
 {
   border-collapse: separate;
-  border-spacing: 1em 0.5em;
+  border-spacing: 1em 0.3em;
   border: none;
 }
 
@@ -148,6 +148,8 @@ div.table table th
 h4
 {
   color: #555753;
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
 hr
@@ -166,17 +168,16 @@ dl.toc dt
   padding-bottom: 0.25em;
 }
 
-dl.toc > dd > dl > dt
+dl.toc > dt
 {
   padding-top: 0.25em;
   padding-bottom: 0.25em;
+  font-weight: bold;
 }
 
-dl.toc > dt
+dl.toc > dl
 {
-  padding-top: 1em;
   padding-bottom: 0.5em;
-  font-weight: bold;
 }
 
 .parameter
@@ -346,7 +347,9 @@ acronym,abbr
 }
 
 @media screen {
-  sup a.footnote
+  /* these have a  as a first child, but since there are no parent selectors
+   * we can't use that. */
+  a.footnote
   {
     position: relative;
     top: 0em ! important;
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 947fea62..ed0cefa8 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -276,6 +276,7 @@ NM_TYPE_SETTINGS_ERROR
 NM_TYPE_SETTING_802_1X_CK_FORMAT
 NM_TYPE_SETTING_802_1X_CK_SCHEME
 NM_TYPE_SETTING_COMPARE_FLAGS
+NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES
 NM_TYPE_SETTING_DCB_FLAGS
 NM_TYPE_SETTING_DIFF_RESULT
 NM_TYPE_SETTING_IP6_CONFIG_PRIVACY
@@ -315,6 +316,7 @@ nm_secret_agent_get_secrets_flags_get_type
 nm_setting_802_1x_ck_format_get_type
 nm_setting_802_1x_ck_scheme_get_type
 nm_setting_compare_flags_get_type
+nm_setting_connection_autoconnect_slaves_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_diff_result_get_type
 nm_setting_ip6_config_privacy_get_type
@@ -851,6 +853,35 @@ NM_TYPE_IP_CONFIG
 nm_ip_config_get_type
 
 
+

+nm-keyfile-internal
+NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB
+NM_KEYFILE_CERT_SCHEME_PREFIX_PATH
+nm_keyfile_detect_unqualified_path_scheme
+NMKeyfileReadType
+NMKeyfileReadHandler
+NMKeyfileWarnSeverity
+NMKeyfileReadTypeDataWarn
+nm_keyfile_read
+NMKeyfileWriteType
+NMKeyfileWriteHandler
+NMKeyfileWriteTypeDataCert
+nm_keyfile_write
+nm_keyfile_plugin_kf_get_string
+nm_keyfile_plugin_kf_set_string
+

+
+

+nm-keyfile-utils
+VPN_SECRETS_GROUP
+nm_keyfile_plugin_get_alias_for_setting_name
+nm_keyfile_plugin_get_setting_name_for_alias
+DEFINE_KF_LIST_WRAPPER_PROTO
+DEFINE_KF_WRAPPER_PROTO
+nm_keyfile_plugin_kf_get_keys
+nm_keyfile_plugin_kf_has_key
+

+
 

 nm-object
 NMObject
@@ -972,6 +1003,7 @@ nm_setting_get_type
 

 nm-setting-8021x
 NMSetting8021x
+NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH
 NMSetting8021xCKFormat
 NMSetting8021xCKScheme
 NM_SETTING_802_1X_SETTING_NAME
@@ -1285,8 +1317,10 @@ NM_SETTING_CONNECTION_PERMISSIONS
 NM_SETTING_CONNECTION_ZONE
 NM_SETTING_CONNECTION_MASTER
 NM_SETTING_CONNECTION_SLAVE_TYPE
+NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES
 NM_SETTING_CONNECTION_SECONDARIES
 NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT
+NMSettingConnectionAutoconnectSlaves
 NMSettingConnection
 nm_setting_connection_new
 nm_setting_connection_get_id
@@ -1307,6 +1341,7 @@ nm_setting_connection_remove_permission_by_value
 nm_setting_connection_get_master
 nm_setting_connection_is_slave_type
 nm_setting_connection_get_slave_type
+nm_setting_connection_get_autoconnect_slaves
 nm_setting_connection_get_num_secondaries
 nm_setting_connection_get_secondary
 nm_setting_connection_add_secondary
@@ -2130,6 +2165,8 @@ NM_ENCODE_VERSION
 NM_VERSION_0_9_8
 NM_VERSION_0_9_10
 NM_VERSION_1_0
+NM_VERSION_1_0_2
+NM_VERSION_1_0_4
 NM_VERSION_CUR_STABLE
 NM_VERSION_NEXT_STABLE
 NM_VERSION_MIN_REQUIRED
@@ -2140,6 +2177,7 @@ NM_DEPRECATED_IN_1_0
 NM_DEPRECATED_IN_1_0_FOR
 NM_AVAILABLE_IN_0_9_10
 NM_AVAILABLE_IN_1_0
+NM_AVAILABLE_IN_1_0_4
 

 
 

diff --git a/docs/libnm/libnm.types b/docs/libnm/libnm.types
index c7169090..2742a215 100644
--- a/docs/libnm/libnm.types
+++ b/docs/libnm/libnm.types
@@ -57,6 +57,7 @@ nm_setting_bridge_get_type
 nm_setting_bridge_port_get_type
 nm_setting_cdma_get_type
 nm_setting_compare_flags_get_type
+nm_setting_connection_autoconnect_slaves_get_type
 nm_setting_connection_get_type
 nm_setting_dcb_flags_get_type
 nm_setting_dcb_get_type
diff --git a/docs/libnm/tmpl/libnm-unused.sgml b/docs/libnm/tmpl/libnm-unused.sgml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/libnm/tmpl/nm-access-point.sgml b/docs/libnm/tmpl/nm-access-point.sgml
deleted file mode 100644
index 8a5cd28c..00000000
--- a/docs/libnm/tmpl/nm-access-point.sgml
+++ /dev/null
@@ -1,195 +0,0 @@
-
-NMAccessPoint
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@connections: 
-@Returns: 
-
-
-
-
-
-
-
-@ap: 
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-active-connection.sgml b/docs/libnm/tmpl/nm-active-connection.sgml
deleted file mode 100644
index 77f7be1a..00000000
--- a/docs/libnm/tmpl/nm-active-connection.sgml
+++ /dev/null
@@ -1,264 +0,0 @@
-
-NMActiveConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-client.sgml b/docs/libnm/tmpl/nm-client.sgml
deleted file mode 100644
index 123aba73..00000000
--- a/docs/libnm/tmpl/nm-client.sgml
+++ /dev/null
@@ -1,798 +0,0 @@
-
-NMClient
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CLIENT_PERMISSION_NONE: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WWAN: 
-@NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX: 
-@NM_CLIENT_PERMISSION_SLEEP_WAKE: 
-@NM_CLIENT_PERMISSION_NETWORK_CONTROL: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_PROTECTED: 
-@NM_CLIENT_PERMISSION_WIFI_SHARE_OPEN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN: 
-@NM_CLIENT_PERMISSION_SETTINGS_MODIFY_HOSTNAME: 
-@NM_CLIENT_PERMISSION_LAST: 
-
-
-
-
-
-
-@NM_CLIENT_PERMISSION_RESULT_UNKNOWN: 
-@NM_CLIENT_PERMISSION_RESULT_YES: 
-@NM_CLIENT_PERMISSION_RESULT_AUTH: 
-@NM_CLIENT_PERMISSION_RESULT_NO: 
-
-
-
-
-
-
-@NM_CLIENT_ERROR_FAILED: 
-@NM_CLIENT_ERROR_MANAGER_NOT_RUNNING: 
-@NM_CLIENT_ERROR_OBJECT_CREATION_FAILED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@enabled: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@level: 
-@domains: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@permission: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@hostname: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@hostname: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@object_path: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@iface: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@connection: 
-@device: 
-@specific_object: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@partial: 
-@device: 
-@specific_object: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@active: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@active: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@id: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@uuid: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@connection: 
-@save_to_disk: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@filenames: 
-@failures: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@filenames: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@failures: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@client: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@client: 
-@result: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-connection.sgml b/docs/libnm/tmpl/nm-connection.sgml
deleted file mode 100644
index 804f0cb2..00000000
--- a/docs/libnm/tmpl/nm-connection.sgml
+++ /dev/null
@@ -1,573 +0,0 @@
-
-NMConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@parent: 
-@secrets_updated: 
-@secrets_cleared: 
-@changed: 
-
-
-
-
-
-
-@connection: 
-@setting: 
-
-
-
-
-
-
-
-@connection: 
-@setting_type: 
-
-
-
-
-
-
-
-@connection: 
-@setting_type: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CONNECTION_SERIALIZE_ALL: 
-@NM_CONNECTION_SERIALIZE_NO_SECRETS: 
-@NM_CONNECTION_SERIALIZE_ONLY_SECRETS: 
-
-
-
-
-
-
-@connection: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@new_settings: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@new_connection: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@out_settings: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@parameters: 
-@modified: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@hints: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@connection: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@secrets: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@path: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-core-enum-types.sgml b/docs/libnm/tmpl/nm-core-enum-types.sgml
deleted file mode 100644
index 68f14ec3..00000000
--- a/docs/libnm/tmpl/nm-core-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-core-enum-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm/tmpl/nm-dbus-interface.sgml b/docs/libnm/tmpl/nm-dbus-interface.sgml
deleted file mode 100644
index 127f117d..00000000
--- a/docs/libnm/tmpl/nm-dbus-interface.sgml
+++ /dev/null
@@ -1,552 +0,0 @@
-
-nm-dbus-interface
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_STATE_UNKNOWN: 
-@NM_STATE_ASLEEP: 
-@NM_STATE_DISCONNECTED: 
-@NM_STATE_DISCONNECTING: 
-@NM_STATE_CONNECTING: 
-@NM_STATE_CONNECTED_LOCAL: 
-@NM_STATE_CONNECTED_SITE: 
-@NM_STATE_CONNECTED_GLOBAL: 
-
-
-
-
-
-
-@NM_CONNECTIVITY_UNKNOWN: 
-@NM_CONNECTIVITY_NONE: 
-@NM_CONNECTIVITY_PORTAL: 
-@NM_CONNECTIVITY_LIMITED: 
-@NM_CONNECTIVITY_FULL: 
-
-
-
-
-
-
-@NM_DEVICE_TYPE_UNKNOWN: 
-@NM_DEVICE_TYPE_ETHERNET: 
-@NM_DEVICE_TYPE_WIFI: 
-@NM_DEVICE_TYPE_UNUSED1: 
-@NM_DEVICE_TYPE_UNUSED2: 
-@NM_DEVICE_TYPE_BT: 
-@NM_DEVICE_TYPE_OLPC_MESH: 
-@NM_DEVICE_TYPE_WIMAX: 
-@NM_DEVICE_TYPE_MODEM: 
-@NM_DEVICE_TYPE_INFINIBAND: 
-@NM_DEVICE_TYPE_BOND: 
-@NM_DEVICE_TYPE_VLAN: 
-@NM_DEVICE_TYPE_ADSL: 
-@NM_DEVICE_TYPE_BRIDGE: 
-@NM_DEVICE_TYPE_GENERIC: 
-@NM_DEVICE_TYPE_TEAM: 
-
-
-
-
-
-
-@NM_DEVICE_CAP_NONE: 
-@NM_DEVICE_CAP_NM_SUPPORTED: 
-@NM_DEVICE_CAP_CARRIER_DETECT: 
-@NM_DEVICE_CAP_IS_SOFTWARE: 
-
-
-
-
-
-
-@NM_WIFI_DEVICE_CAP_NONE: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP40: 
-@NM_WIFI_DEVICE_CAP_CIPHER_WEP104: 
-@NM_WIFI_DEVICE_CAP_CIPHER_TKIP: 
-@NM_WIFI_DEVICE_CAP_CIPHER_CCMP: 
-@NM_WIFI_DEVICE_CAP_WPA: 
-@NM_WIFI_DEVICE_CAP_RSN: 
-@NM_WIFI_DEVICE_CAP_AP: 
-@NM_WIFI_DEVICE_CAP_ADHOC: 
-@NM_WIFI_DEVICE_CAP_FREQ_VALID: 
-@NM_WIFI_DEVICE_CAP_FREQ_2GHZ: 
-@NM_WIFI_DEVICE_CAP_FREQ_5GHZ: 
-
-
-
-
-
-
-@NM_802_11_AP_FLAGS_NONE: 
-@NM_802_11_AP_FLAGS_PRIVACY: 
-
-
-
-
-
-
-@NM_802_11_AP_SEC_NONE: 
-@NM_802_11_AP_SEC_PAIR_WEP40: 
-@NM_802_11_AP_SEC_PAIR_WEP104: 
-@NM_802_11_AP_SEC_PAIR_TKIP: 
-@NM_802_11_AP_SEC_PAIR_CCMP: 
-@NM_802_11_AP_SEC_GROUP_WEP40: 
-@NM_802_11_AP_SEC_GROUP_WEP104: 
-@NM_802_11_AP_SEC_GROUP_TKIP: 
-@NM_802_11_AP_SEC_GROUP_CCMP: 
-@NM_802_11_AP_SEC_KEY_MGMT_PSK: 
-@NM_802_11_AP_SEC_KEY_MGMT_802_1X: 
-
-
-
-
-
-
-@NM_802_11_MODE_UNKNOWN: 
-@NM_802_11_MODE_ADHOC: 
-@NM_802_11_MODE_INFRA: 
-@NM_802_11_MODE_AP: 
-
-
-
-
-
-
-@NM_BT_CAPABILITY_NONE: 
-@NM_BT_CAPABILITY_DUN: 
-@NM_BT_CAPABILITY_NAP: 
-
-
-
-
-
-
-@NM_DEVICE_MODEM_CAPABILITY_NONE: 
-@NM_DEVICE_MODEM_CAPABILITY_POTS: 
-@NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO: 
-@NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS: 
-@NM_DEVICE_MODEM_CAPABILITY_LTE: 
-
-
-
-
-
-
-@NM_DEVICE_STATE_UNKNOWN: 
-@NM_DEVICE_STATE_UNMANAGED: 
-@NM_DEVICE_STATE_UNAVAILABLE: 
-@NM_DEVICE_STATE_DISCONNECTED: 
-@NM_DEVICE_STATE_PREPARE: 
-@NM_DEVICE_STATE_CONFIG: 
-@NM_DEVICE_STATE_NEED_AUTH: 
-@NM_DEVICE_STATE_IP_CONFIG: 
-@NM_DEVICE_STATE_IP_CHECK: 
-@NM_DEVICE_STATE_SECONDARIES: 
-@NM_DEVICE_STATE_ACTIVATED: 
-@NM_DEVICE_STATE_DEACTIVATING: 
-@NM_DEVICE_STATE_FAILED: 
-
-
-
-
-
-
-@NM_DEVICE_STATE_REASON_NONE: 
-@NM_DEVICE_STATE_REASON_UNKNOWN: 
-@NM_DEVICE_STATE_REASON_NOW_MANAGED: 
-@NM_DEVICE_STATE_REASON_NOW_UNMANAGED: 
-@NM_DEVICE_STATE_REASON_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED: 
-@NM_DEVICE_STATE_REASON_NO_SECRETS: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_PPP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_PPP_DISCONNECT: 
-@NM_DEVICE_STATE_REASON_PPP_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_DHCP_ERROR: 
-@NM_DEVICE_STATE_REASON_DHCP_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_START_FAILED: 
-@NM_DEVICE_STATE_REASON_SHARED_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED: 
-@NM_DEVICE_STATE_REASON_AUTOIP_ERROR: 
-@NM_DEVICE_STATE_REASON_AUTOIP_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_BUSY: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE: 
-@NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_APN_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT: 
-@NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED: 
-@NM_DEVICE_STATE_REASON_FIRMWARE_MISSING: 
-@NM_DEVICE_STATE_REASON_REMOVED: 
-@NM_DEVICE_STATE_REASON_SLEEPING: 
-@NM_DEVICE_STATE_REASON_CONNECTION_REMOVED: 
-@NM_DEVICE_STATE_REASON_USER_REQUESTED: 
-@NM_DEVICE_STATE_REASON_CARRIER: 
-@NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED: 
-@NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_BT_FAILED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED: 
-@NM_DEVICE_STATE_REASON_GSM_SIM_WRONG: 
-@NM_DEVICE_STATE_REASON_INFINIBAND_MODE: 
-@NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED: 
-@NM_DEVICE_STATE_REASON_BR2684_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE: 
-@NM_DEVICE_STATE_REASON_SSID_NOT_FOUND: 
-@NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED: 
-@NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED: 
-@NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_FAILED: 
-@NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: 
-@NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: 
-@NM_DEVICE_STATE_REASON_NEW_ACTIVATION: 
-
-
-
-
-
-
-@NM_ACTIVE_CONNECTION_STATE_UNKNOWN: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_ACTIVATED: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: 
-@NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: 
-
-
-
-
-
-
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM: 
-@NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS: 
-
-
-
-
-
-
-@NM_SECRET_AGENT_CAPABILITY_NONE: 
-@NM_SECRET_AGENT_CAPABILITY_VPN_HINTS: 
-@NM_SECRET_AGENT_CAPABILITY_LAST: 
-
diff --git a/docs/libnm/tmpl/nm-device-adsl.sgml b/docs/libnm/tmpl/nm-device-adsl.sgml
deleted file mode 100644
index a6ef7224..00000000
--- a/docs/libnm/tmpl/nm-device-adsl.sgml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-NMDeviceAdsl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-bond.sgml b/docs/libnm/tmpl/nm-device-bond.sgml
deleted file mode 100644
index 8feb3de6..00000000
--- a/docs/libnm/tmpl/nm-device-bond.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-NMDeviceBond
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-bridge.sgml b/docs/libnm/tmpl/nm-device-bridge.sgml
deleted file mode 100644
index 675fdb64..00000000
--- a/docs/libnm/tmpl/nm-device-bridge.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-NMDeviceBridge
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-bt.sgml b/docs/libnm/tmpl/nm-device-bt.sgml
deleted file mode 100644
index ff536c37..00000000
--- a/docs/libnm/tmpl/nm-device-bt.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-NMDeviceBt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-ethernet.sgml b/docs/libnm/tmpl/nm-device-ethernet.sgml
deleted file mode 100644
index 9bb88cb3..00000000
--- a/docs/libnm/tmpl/nm-device-ethernet.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-NMDeviceEthernet
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-generic.sgml b/docs/libnm/tmpl/nm-device-generic.sgml
deleted file mode 100644
index 94f52f55..00000000
--- a/docs/libnm/tmpl/nm-device-generic.sgml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-NMDeviceGeneric
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-infiniband.sgml b/docs/libnm/tmpl/nm-device-infiniband.sgml
deleted file mode 100644
index bc6e35af..00000000
--- a/docs/libnm/tmpl/nm-device-infiniband.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-NMDeviceInfiniband
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-modem.sgml b/docs/libnm/tmpl/nm-device-modem.sgml
deleted file mode 100644
index 042959ce..00000000
--- a/docs/libnm/tmpl/nm-device-modem.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-NMDeviceModem
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-olpc-mesh.sgml b/docs/libnm/tmpl/nm-device-olpc-mesh.sgml
deleted file mode 100644
index 8047c8f8..00000000
--- a/docs/libnm/tmpl/nm-device-olpc-mesh.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-NMDeviceOlpcMesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-team.sgml b/docs/libnm/tmpl/nm-device-team.sgml
deleted file mode 100644
index dd23f451..00000000
--- a/docs/libnm/tmpl/nm-device-team.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-NMDeviceTeam
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-vlan.sgml b/docs/libnm/tmpl/nm-device-vlan.sgml
deleted file mode 100644
index 44f7d730..00000000
--- a/docs/libnm/tmpl/nm-device-vlan.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-NMDeviceVlan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-wifi.sgml b/docs/libnm/tmpl/nm-device-wifi.sgml
deleted file mode 100644
index 57891ab3..00000000
--- a/docs/libnm/tmpl/nm-device-wifi.sgml
+++ /dev/null
@@ -1,179 +0,0 @@
-
-NMDeviceWifi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@result: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device-wimax.sgml b/docs/libnm/tmpl/nm-device-wimax.sgml
deleted file mode 100644
index 71a3a039..00000000
--- a/docs/libnm/tmpl/nm-device-wimax.sgml
+++ /dev/null
@@ -1,162 +0,0 @@
-
-NMDeviceWimax
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@wimax: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@path: 
-@Returns: 
-
-
-
-
-
-
-
-@wimax: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-device.sgml b/docs/libnm/tmpl/nm-device.sgml
deleted file mode 100644
index 9abbd944..00000000
--- a/docs/libnm/tmpl/nm-device.sgml
+++ /dev/null
@@ -1,553 +0,0 @@
-
-NMDevice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@autoconnect: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
-
-
-
-
-
-@devices: 
-@num_devices: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@device: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@connections: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@device: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-dhcp-config.sgml b/docs/libnm/tmpl/nm-dhcp-config.sgml
deleted file mode 100644
index 9e5bb72a..00000000
--- a/docs/libnm/tmpl/nm-dhcp-config.sgml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-NMDhcpConfig
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@option: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-enum-types.sgml b/docs/libnm/tmpl/nm-enum-types.sgml
deleted file mode 100644
index 8577600d..00000000
--- a/docs/libnm/tmpl/nm-enum-types.sgml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-nm-enum-types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm/tmpl/nm-errors.sgml b/docs/libnm/tmpl/nm-errors.sgml
deleted file mode 100644
index 8c79b479..00000000
--- a/docs/libnm/tmpl/nm-errors.sgml
+++ /dev/null
@@ -1,263 +0,0 @@
-
-nm-errors
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_AGENT_MANAGER_ERROR_FAILED: 
-@NM_AGENT_MANAGER_ERROR_PERMISSION_DENIED: 
-@NM_AGENT_MANAGER_ERROR_INVALID_IDENTIFIER: 
-@NM_AGENT_MANAGER_ERROR_NOT_REGISTERED: 
-@NM_AGENT_MANAGER_ERROR_NO_SECRETS: 
-@NM_AGENT_MANAGER_ERROR_USER_CANCELED: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_CONNECTION_ERROR_FAILED: 
-@NM_CONNECTION_ERROR_SETTING_NOT_FOUND: 
-@NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND: 
-@NM_CONNECTION_ERROR_PROPERTY_NOT_SECRET: 
-@NM_CONNECTION_ERROR_MISSING_SETTING: 
-@NM_CONNECTION_ERROR_INVALID_SETTING: 
-@NM_CONNECTION_ERROR_MISSING_PROPERTY: 
-@NM_CONNECTION_ERROR_INVALID_PROPERTY: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_CRYPTO_ERROR_FAILED: 
-@NM_CRYPTO_ERROR_INVALID_DATA: 
-@NM_CRYPTO_ERROR_INVALID_PASSWORD: 
-@NM_CRYPTO_ERROR_UNKNOWN_CIPHER: 
-@NM_CRYPTO_ERROR_DECRYPTION_FAILED: 
-@NM_CRYPTO_ERROR_ENCRYPTION_FAILED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_DEVICE_ERROR_FAILED: 
-@NM_DEVICE_ERROR_CREATION_FAILED: 
-@NM_DEVICE_ERROR_INVALID_CONNECTION: 
-@NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION: 
-@NM_DEVICE_ERROR_NOT_ACTIVE: 
-@NM_DEVICE_ERROR_NOT_SOFTWARE: 
-@NM_DEVICE_ERROR_NOT_ALLOWED: 
-@NM_DEVICE_ERROR_SPECIFIC_OBJECT_NOT_FOUND: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_MANAGER_ERROR_FAILED: 
-@NM_MANAGER_ERROR_PERMISSION_DENIED: 
-@NM_MANAGER_ERROR_UNKNOWN_CONNECTION: 
-@NM_MANAGER_ERROR_UNKNOWN_DEVICE: 
-@NM_MANAGER_ERROR_CONNECTION_NOT_AVAILABLE: 
-@NM_MANAGER_ERROR_CONNECTION_NOT_ACTIVE: 
-@NM_MANAGER_ERROR_CONNECTION_ALREADY_ACTIVE: 
-@NM_MANAGER_ERROR_DEPENDENCY_FAILED: 
-@NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE: 
-@NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED: 
-@NM_MANAGER_ERROR_UNKNOWN_LOG_LEVEL: 
-@NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SECRET_AGENT_ERROR_FAILED: 
-@NM_SECRET_AGENT_ERROR_PERMISSION_DENIED: 
-@NM_SECRET_AGENT_ERROR_INVALID_CONNECTION: 
-@NM_SECRET_AGENT_ERROR_USER_CANCELED: 
-@NM_SECRET_AGENT_ERROR_AGENT_CANCELED: 
-@NM_SECRET_AGENT_ERROR_NO_SECRETS: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTINGS_ERROR_FAILED: 
-@NM_SETTINGS_ERROR_PERMISSION_DENIED: 
-@NM_SETTINGS_ERROR_NOT_SUPPORTED: 
-@NM_SETTINGS_ERROR_INVALID_CONNECTION: 
-@NM_SETTINGS_ERROR_READ_ONLY_CONNECTION: 
-@NM_SETTINGS_ERROR_UUID_EXISTS: 
-@NM_SETTINGS_ERROR_INVALID_HOSTNAME: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VPN_PLUGIN_ERROR_FAILED: 
-@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_INVALID_CONNECTION: 
-@NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-ip-config.sgml b/docs/libnm/tmpl/nm-ip-config.sgml
deleted file mode 100644
index 2784a9b6..00000000
--- a/docs/libnm/tmpl/nm-ip-config.sgml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-NMIPConfig
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
-
-
-
-
-
-@config: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-object.sgml b/docs/libnm/tmpl/nm-object.sgml
deleted file mode 100644
index 98025f3d..00000000
--- a/docs/libnm/tmpl/nm-object.sgml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-NMObject
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@object: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-remote-connection.sgml b/docs/libnm/tmpl/nm-remote-connection.sgml
deleted file mode 100644
index fb74dcc5..00000000
--- a/docs/libnm/tmpl/nm-remote-connection.sgml
+++ /dev/null
@@ -1,206 +0,0 @@
-
-NMRemoteConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@connection: 
-@save_to_disk: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@save_to_disk: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@setting_name: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@connection: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-secret-agent-old.sgml b/docs/libnm/tmpl/nm-secret-agent-old.sgml
deleted file mode 100644
index 1e147551..00000000
--- a/docs/libnm/tmpl/nm-secret-agent-old.sgml
+++ /dev/null
@@ -1,197 +0,0 @@
-
-NMSecretAgentOld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@agent: 
-@connection: 
-@secrets: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@agent: 
-@connection: 
-@error: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@cancellable: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@result: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@Returns: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@setting_name: 
-@hints: 
-@flags: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@self: 
-@connection: 
-@callback: 
-@user_data: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-8021x.sgml b/docs/libnm/tmpl/nm-setting-8021x.sgml
deleted file mode 100644
index f61f0874..00000000
--- a/docs/libnm/tmpl/nm-setting-8021x.sgml
+++ /dev/null
@@ -1,918 +0,0 @@
-
-NMSetting8021x
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: 
-@NM_SETTING_802_1X_CK_FORMAT_X509: 
-@NM_SETTING_802_1X_CK_FORMAT_RAW_KEY: 
-@NM_SETTING_802_1X_CK_FORMAT_PKCS12: 
-
-
-
-
-
-
-@NM_SETTING_802_1X_CK_SCHEME_UNKNOWN: 
-@NM_SETTING_802_1X_CK_SCHEME_BLOB: 
-@NM_SETTING_802_1X_CK_SCHEME_PATH: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@eap: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@phase2_altsubject_match: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@cert_path: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key_path: 
-@password: 
-@scheme: 
-@out_format: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-adsl.sgml b/docs/libnm/tmpl/nm-setting-adsl.sgml
deleted file mode 100644
index 8895e119..00000000
--- a/docs/libnm/tmpl/nm-setting-adsl.sgml
+++ /dev/null
@@ -1,187 +0,0 @@
-
-NMSettingAdsl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bluetooth.sgml b/docs/libnm/tmpl/nm-setting-bluetooth.sgml
deleted file mode 100644
index 6d1f1468..00000000
--- a/docs/libnm/tmpl/nm-setting-bluetooth.sgml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-NMSettingBluetooth
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bond.sgml b/docs/libnm/tmpl/nm-setting-bond.sgml
deleted file mode 100644
index 25b94199..00000000
--- a/docs/libnm/tmpl/nm-setting-bond.sgml
+++ /dev/null
@@ -1,233 +0,0 @@
-
-NMSettingBond
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_name: 
-@out_value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@name: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bridge-port.sgml b/docs/libnm/tmpl/nm-setting-bridge-port.sgml
deleted file mode 100644
index 7fec001b..00000000
--- a/docs/libnm/tmpl/nm-setting-bridge-port.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-NMSettingBridgePort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-bridge.sgml b/docs/libnm/tmpl/nm-setting-bridge.sgml
deleted file mode 100644
index 216c370a..00000000
--- a/docs/libnm/tmpl/nm-setting-bridge.sgml
+++ /dev/null
@@ -1,152 +0,0 @@
-
-NMSettingBridge
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-cdma.sgml b/docs/libnm/tmpl/nm-setting-cdma.sgml
deleted file mode 100644
index 2f02d707..00000000
--- a/docs/libnm/tmpl/nm-setting-cdma.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-NMSettingCdma
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-connection.sgml b/docs/libnm/tmpl/nm-setting-connection.sgml
deleted file mode 100644
index b8bb9b51..00000000
--- a/docs/libnm/tmpl/nm-setting-connection.sgml
+++ /dev/null
@@ -1,466 +0,0 @@
-
-NMSettingConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_ptype: 
-@out_pitem: 
-@out_detail: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@uname: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@ptype: 
-@pitem: 
-@detail: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@sec_uuid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-dcb.sgml b/docs/libnm/tmpl/nm-setting-dcb.sgml
deleted file mode 100644
index be50bafa..00000000
--- a/docs/libnm/tmpl/nm-setting-dcb.sgml
+++ /dev/null
@@ -1,370 +0,0 @@
-
-NMSettingDcb
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_DCB_FLAG_NONE: 
-@NM_SETTING_DCB_FLAG_ENABLE: 
-@NM_SETTING_DCB_FLAG_ADVERTISE: 
-@NM_SETTING_DCB_FLAG_WILLING: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@enabled: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@group_id: 
-
-
-
-
-
-
-
-@setting: 
-@group_id: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@group_id: 
-@bandwidth_percent: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@bandwidth_percent: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@strict: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@user_priority: 
-@traffic_class: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-generic.sgml b/docs/libnm/tmpl/nm-setting-generic.sgml
deleted file mode 100644
index 339f99b5..00000000
--- a/docs/libnm/tmpl/nm-setting-generic.sgml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-NMSettingGeneric
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-gsm.sgml b/docs/libnm/tmpl/nm-setting-gsm.sgml
deleted file mode 100644
index dd801247..00000000
--- a/docs/libnm/tmpl/nm-setting-gsm.sgml
+++ /dev/null
@@ -1,184 +0,0 @@
-
-NMSettingGsm
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-infiniband.sgml b/docs/libnm/tmpl/nm-setting-infiniband.sgml
deleted file mode 100644
index b6f86e3a..00000000
--- a/docs/libnm/tmpl/nm-setting-infiniband.sgml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-NMSettingInfiniband
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ip-config.sgml b/docs/libnm/tmpl/nm-setting-ip-config.sgml
deleted file mode 100644
index f7ae0e4a..00000000
--- a/docs/libnm/tmpl/nm-setting-ip-config.sgml
+++ /dev/null
@@ -1,781 +0,0 @@
-
-NMSettingIPConfig
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@family: 
-@addr: 
-@prefix: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@family: 
-@addr: 
-@prefix: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-
-
-
-
-
-
-
-@address: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@addr: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@prefix: 
-
-
-
-
-
-
-
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@address: 
-@name: 
-@value: 
-
-
-
-
-
-
-
-@family: 
-@dest: 
-@prefix: 
-@next_hop: 
-@metric: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@family: 
-@dest: 
-@prefix: 
-@next_hop: 
-@metric: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-
-
-
-
-
-
-
-@route: 
-@other: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@dest: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@prefix: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@next_hop: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@metric: 
-
-
-
-
-
-
-
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@route: 
-@name: 
-@value: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@dns_search: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@address: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@route: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ip4-config.sgml b/docs/libnm/tmpl/nm-setting-ip4-config.sgml
deleted file mode 100644
index 4eabe034..00000000
--- a/docs/libnm/tmpl/nm-setting-ip4-config.sgml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-NMSettingIP4Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ip6-config.sgml b/docs/libnm/tmpl/nm-setting-ip6-config.sgml
deleted file mode 100644
index 3ba20ae0..00000000
--- a/docs/libnm/tmpl/nm-setting-ip6-config.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-NMSettingIP6Config
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@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: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-olpc-mesh.sgml b/docs/libnm/tmpl/nm-setting-olpc-mesh.sgml
deleted file mode 100644
index ec682d73..00000000
--- a/docs/libnm/tmpl/nm-setting-olpc-mesh.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-NMSettingOlpcMesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-ppp.sgml b/docs/libnm/tmpl/nm-setting-ppp.sgml
deleted file mode 100644
index d974da0f..00000000
--- a/docs/libnm/tmpl/nm-setting-ppp.sgml
+++ /dev/null
@@ -1,328 +0,0 @@
-
-NMSettingPpp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-pppoe.sgml b/docs/libnm/tmpl/nm-setting-pppoe.sgml
deleted file mode 100644
index 32d9e725..00000000
--- a/docs/libnm/tmpl/nm-setting-pppoe.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-NMSettingPppoe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-serial.sgml b/docs/libnm/tmpl/nm-setting-serial.sgml
deleted file mode 100644
index d713db5c..00000000
--- a/docs/libnm/tmpl/nm-setting-serial.sgml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-NMSettingSerial
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_SERIAL_PARITY_NONE: 
-@NM_SETTING_SERIAL_PARITY_EVEN: 
-@NM_SETTING_SERIAL_PARITY_ODD: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-team-port.sgml b/docs/libnm/tmpl/nm-setting-team-port.sgml
deleted file mode 100644
index 809e1878..00000000
--- a/docs/libnm/tmpl/nm-setting-team-port.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-NMSettingTeamPort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-team.sgml b/docs/libnm/tmpl/nm-setting-team.sgml
deleted file mode 100644
index 6c2cb1fa..00000000
--- a/docs/libnm/tmpl/nm-setting-team.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-NMSettingTeam
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-vlan.sgml b/docs/libnm/tmpl/nm-setting-vlan.sgml
deleted file mode 100644
index 756c0399..00000000
--- a/docs/libnm/tmpl/nm-setting-vlan.sgml
+++ /dev/null
@@ -1,207 +0,0 @@
-
-NMSettingVlan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VLAN_INGRESS_MAP: 
-@NM_VLAN_EGRESS_MAP: 
-
-
-
-
-
-
-@NM_VLAN_FLAG_REORDER_HEADERS: 
-@NM_VLAN_FLAG_GVRP: 
-@NM_VLAN_FLAG_LOOSE_BINDING: 
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@idx: 
-@out_from: 
-@out_to: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@from: 
-@to: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-
-
-
-
-
-
-
-@setting: 
-@map: 
-@str: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-vpn.sgml b/docs/libnm/tmpl/nm-setting-vpn.sgml
deleted file mode 100644
index 2d5e70c9..00000000
--- a/docs/libnm/tmpl/nm-setting-vpn.sgml
+++ /dev/null
@@ -1,210 +0,0 @@
-
-NMSettingVpn
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@key: 
-@value: 
-@user_data: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@item: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@secret: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wimax.sgml b/docs/libnm/tmpl/nm-setting-wimax.sgml
deleted file mode 100644
index a7f51a8e..00000000
--- a/docs/libnm/tmpl/nm-setting-wimax.sgml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-NMSettingWimax
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wired.sgml b/docs/libnm/tmpl/nm-setting-wired.sgml
deleted file mode 100644
index 156ff4f1..00000000
--- a/docs/libnm/tmpl/nm-setting-wired.sgml
+++ /dev/null
@@ -1,324 +0,0 @@
-
-NMSettingWired
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@out_key: 
-@out_value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wireless-security.sgml b/docs/libnm/tmpl/nm-setting-wireless-security.sgml
deleted file mode 100644
index 4cb19ed3..00000000
--- a/docs/libnm/tmpl/nm-setting-wireless-security.sgml
+++ /dev/null
@@ -1,447 +0,0 @@
-
-NMSettingWirelessSecurity
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_WEP_KEY_TYPE_UNKNOWN: 
-@NM_WEP_KEY_TYPE_KEY: 
-@NM_WEP_KEY_TYPE_PASSPHRASE: 
-@NM_WEP_KEY_TYPE_LAST: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@proto: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@pairwise: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@group: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-
-
-
-
-
-
-
-@setting: 
-@group: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@key: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting-wireless.sgml b/docs/libnm/tmpl/nm-setting-wireless.sgml
deleted file mode 100644
index f20aa114..00000000
--- a/docs/libnm/tmpl/nm-setting-wireless.sgml
+++ /dev/null
@@ -1,359 +0,0 @@
-
-NMSettingWireless
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@idx: 
-
-
-
-
-
-
-
-@setting: 
-@mac: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@bssid: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@i: 
-@Returns: 
-
-
-
-
-
-
-
-@s_wireless: 
-@s_wireless_sec: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@ap_mode: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-setting.sgml b/docs/libnm/tmpl/nm-setting.sgml
deleted file mode 100644
index 88a4e99e..00000000
--- a/docs/libnm/tmpl/nm-setting.sgml
+++ /dev/null
@@ -1,238 +0,0 @@
-
-NMSetting
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_SETTING_SECRET_FLAG_NONE: 
-@NM_SETTING_SECRET_FLAG_AGENT_OWNED: 
-@NM_SETTING_SECRET_FLAG_NOT_SAVED: 
-@NM_SETTING_SECRET_FLAG_NOT_REQUIRED: 
-
-
-
-
-
-
-@NM_SETTING_COMPARE_FLAG_EXACT: 
-@NM_SETTING_COMPARE_FLAG_FUZZY: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_ID: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_WITH_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_DIFF_RESULT_NO_DEFAULT: 
-@NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@setting: 
-@secret: 
-@flags: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@key: 
-@value: 
-@flags: 
-@user_data: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_SETTING_DIFF_RESULT_UNKNOWN: 
-@NM_SETTING_DIFF_RESULT_IN_A: 
-@NM_SETTING_DIFF_RESULT_IN_B: 
-@NM_SETTING_DIFF_RESULT_IN_A_DEFAULT: 
-@NM_SETTING_DIFF_RESULT_IN_B_DEFAULT: 
-
-
-
-
-
-
-@a: 
-@b: 
-@flags: 
-@invert_results: 
-@results: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@func: 
-@user_data: 
-
-
-
-
-
-
-
-@setting: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@secret_name: 
-@out_flags: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@secret_name: 
-@flags: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@setting: 
-@property_name: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-simple-connection.sgml b/docs/libnm/tmpl/nm-simple-connection.sgml
deleted file mode 100644
index 8ef5406d..00000000
--- a/docs/libnm/tmpl/nm-simple-connection.sgml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-NMSimpleConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@dict: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-utils.sgml b/docs/libnm/tmpl/nm-utils.sgml
deleted file mode 100644
index 9981cc58..00000000
--- a/docs/libnm/tmpl/nm-utils.sgml
+++ /dev/null
@@ -1,578 +0,0 @@
-
-nm-utils
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid1: 
-@len1: 
-@ssid2: 
-@len2: 
-@ignore_trailing_null: 
-@Returns: 
-
-
-
-
-
-
-
-@ssid: 
-@len: 
-@Returns: 
-
-
-
-
-
-
-
-@NMU_SEC_INVALID: 
-@NMU_SEC_NONE: 
-@NMU_SEC_STATIC_WEP: 
-@NMU_SEC_LEAP: 
-@NMU_SEC_DYNAMIC_WEP: 
-@NMU_SEC_WPA_PSK: 
-@NMU_SEC_WPA_ENTERPRISE: 
-@NMU_SEC_WPA2_PSK: 
-@NMU_SEC_WPA2_ENTERPRISE: 
-
-
-
-
-
-
-@type: 
-@wifi_caps: 
-@have_ap: 
-@adhoc: 
-@ap_flags: 
-@ap_wpa: 
-@ap_rsn: 
-@Returns: 
-
-
-
-
-
-
-
-@type: 
-@wifi_caps: 
-@Returns: 
-
-
-
-
-
-
-
-@key: 
-@wep_type: 
-@Returns: 
-
-
-
-
-
-
-
-@psk: 
-@Returns: 
-
-
-
-
-
-
-
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@addresses: 
-@gateway: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@out_gateway: 
-@Returns: 
-
-
-
-
-
-
-
-@routes: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@netmask: 
-@Returns: 
-
-
-
-
-
-
-
-@prefix: 
-@Returns: 
-
-
-
-
-
-
-
-@ip: 
-@Returns: 
-
-
-
-
-
-
-
-@dns: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@addresses: 
-@gateway: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@out_gateway: 
-@Returns: 
-
-
-
-
-
-
-
-@routes: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@Returns: 
-
-
-
-
-
-
-
-@addresses: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@family: 
-@Returns: 
-
-
-
-
-
-
-
-@routes: 
-@Returns: 
-
-
-
-
-
-
-
-@value: 
-@family: 
-@Returns: 
-
-
-
-
-
-
-
-@void: 
-@Returns: 
-
-
-
-
-
-
-
-@filename: 
-@Returns: 
-
-
-
-
-
-
-
-@filename: 
-@out_encrypted: 
-@Returns: 
-
-
-
-
-
-
-
-@filename: 
-@Returns: 
-
-
-
-
-
-
-
-@filename: 
-@user_data: 
-@Returns: 
-
-
-
-
-
-
-
-@progname: 
-@try_first: 
-@paths: 
-@file_test_flags: 
-@predicate: 
-@user_data: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@freq: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@direction: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@channel: 
-@band: 
-@Returns: 
-
-
-
-
-
-
-
-@strength: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@type: 
-@Returns: 
-
-
-
-
-
-
-
-@addr: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@buffer: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@asc: 
-@length: 
-@Returns: 
-
-
-
-
-
-
-
-@hwaddr1: 
-@hwaddr1_len: 
-@hwaddr2: 
-@hwaddr2_len: 
-@Returns: 
-
-
-
-
-
-
-
-@src: 
-@len: 
-@final_len: 
-@Returns: 
-
-
-
-
-
-
-
-@hex: 
-@Returns: 
-
-
-
-
-
-
-
-@name: 
-@Returns: 
-
-
-
-
-
-
-
-@str: 
-@Returns: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@inaddr: 
-@dst: 
-@Returns: 
-
-
-
-
-
-
-
-@in6addr: 
-@dst: 
-@Returns: 
-
-
-
-
-
-
-
-@family: 
-@ip: 
-@Returns: 
-
-
-
-
-
-
-
-@virtual_type: 
-@other_type: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-version.sgml b/docs/libnm/tmpl/nm-version.sgml
deleted file mode 100644
index c27d75bd..00000000
--- a/docs/libnm/tmpl/nm-version.sgml
+++ /dev/null
@@ -1,158 +0,0 @@
-
-nm-version
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@major: 
-@minor: 
-@micro: 
-
-
-
-
-
-
-
-@major: 
-@minor: 
-@micro: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@f: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@f: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm/tmpl/nm-vpn-connection.sgml b/docs/libnm/tmpl/nm-vpn-connection.sgml
deleted file mode 100644
index 33b7ef29..00000000
--- a/docs/libnm/tmpl/nm-vpn-connection.sgml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-NMVpnConnection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@vpn: 
-@Returns: 
-
-
-
-
-
-
-
-@vpn: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-vpn-dbus-interface.sgml b/docs/libnm/tmpl/nm-vpn-dbus-interface.sgml
deleted file mode 100644
index c4a88fe3..00000000
--- a/docs/libnm/tmpl/nm-vpn-dbus-interface.sgml
+++ /dev/null
@@ -1,484 +0,0 @@
-
-nm-vpn-dbus-interface
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_VPN_SERVICE_STATE_UNKNOWN: 
-@NM_VPN_SERVICE_STATE_INIT: 
-@NM_VPN_SERVICE_STATE_SHUTDOWN: 
-@NM_VPN_SERVICE_STATE_STARTING: 
-@NM_VPN_SERVICE_STATE_STARTED: 
-@NM_VPN_SERVICE_STATE_STOPPING: 
-@NM_VPN_SERVICE_STATE_STOPPED: 
-
-
-
-
-
-
-@NM_VPN_CONNECTION_STATE_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_PREPARE: 
-@NM_VPN_CONNECTION_STATE_NEED_AUTH: 
-@NM_VPN_CONNECTION_STATE_CONNECT: 
-@NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: 
-@NM_VPN_CONNECTION_STATE_ACTIVATED: 
-@NM_VPN_CONNECTION_STATE_FAILED: 
-@NM_VPN_CONNECTION_STATE_DISCONNECTED: 
-
-
-
-
-
-
-@NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: 
-@NM_VPN_CONNECTION_STATE_REASON_NONE: 
-@NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: 
-@NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: 
-@NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: 
-@NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: 
-@NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED: 
-
-
-
-
-
-
-@NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: 
-@NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/libnm/tmpl/nm-vpn-editor-plugin.sgml b/docs/libnm/tmpl/nm-vpn-editor-plugin.sgml
deleted file mode 100644
index a945515b..00000000
--- a/docs/libnm/tmpl/nm-vpn-editor-plugin.sgml
+++ /dev/null
@@ -1,169 +0,0 @@
-
-NMVpnEditor
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_NONE: 
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT: 
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT: 
-@NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6: 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@g_iface: 
-@get_editor: 
-@get_capabilities: 
-@import_from_file: 
-@export_to_file: 
-@get_suggested_filename: 
-
-
-
-
-
-
-@plugin: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@path: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@path: 
-@connection: 
-@error: 
-@Returns: 
-
-
-
-
-
-
-
-@plugin: 
-@connection: 
-@Returns: 
-
-
-
-
-
-
-
-@g_iface: 
-@get_widget: 
-@placeholder: 
-@update_connection: 
-@changed: 
-
-
-
-
-
-
-@editor: 
-@Returns: 
-
-
-
-
-
-
-
-@editor: 
-@connection: 
-@error: 
-@Returns: 
-
-
diff --git a/docs/libnm/tmpl/nm-wimax-nsp.sgml b/docs/libnm/tmpl/nm-wimax-nsp.sgml
deleted file mode 100644
index ceb02601..00000000
--- a/docs/libnm/tmpl/nm-wimax-nsp.sgml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-NMWimaxNsp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN: 
-@NM_WIMAX_NSP_NETWORK_TYPE_HOME: 
-@NM_WIMAX_NSP_NETWORK_TYPE_PARTNER: 
-@NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER: 
-
-
-
-
-
-
-@nsp: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@connections: 
-@Returns: 
-
-
-
-
-
-
-
-@nsp: 
-@connection: 
-@Returns: 
-
-
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 6d7de6e6..ee90284c 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.0.2
+1.0.4
diff --git a/examples/C/Makefile.in b/examples/C/Makefile.in
index f9eec797..0d606287 100644
--- a/examples/C/Makefile.in
+++ b/examples/C/Makefile.in
@@ -196,6 +196,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -309,6 +310,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/C/glib/Makefile.in b/examples/C/glib/Makefile.in
index b404d0da..9c18e61f 100644
--- a/examples/C/glib/Makefile.in
+++ b/examples/C/glib/Makefile.in
@@ -234,6 +234,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -347,6 +348,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/C/qt/Makefile.in b/examples/C/qt/Makefile.in
index 3f89c11c..7758476d 100644
--- a/examples/C/qt/Makefile.in
+++ b/examples/C/qt/Makefile.in
@@ -206,6 +206,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -319,6 +320,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 0228abd0..9e3a806b 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -195,6 +195,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -308,6 +309,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/dispatcher/Makefile.in b/examples/dispatcher/Makefile.in
index 96174d84..fba9c820 100644
--- a/examples/dispatcher/Makefile.in
+++ b/examples/dispatcher/Makefile.in
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -248,6 +249,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in
index 071e0791..d94a2675 100644
--- a/examples/python/Makefile.in
+++ b/examples/python/Makefile.in
@@ -195,6 +195,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -308,6 +309,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/python/dbus/Makefile.in b/examples/python/dbus/Makefile.in
index 3b886251..784997e1 100644
--- a/examples/python/dbus/Makefile.in
+++ b/examples/python/dbus/Makefile.in
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -248,6 +249,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/python/gi/Makefile.in b/examples/python/gi/Makefile.in
index 980390a1..18e395e9 100644
--- a/examples/python/gi/Makefile.in
+++ b/examples/python/gi/Makefile.in
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -248,6 +249,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/ruby/Makefile.in b/examples/ruby/Makefile.in
index 626b5ed3..b3960334 100644
--- a/examples/ruby/Makefile.in
+++ b/examples/ruby/Makefile.in
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -248,6 +249,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/examples/shell/Makefile.in b/examples/shell/Makefile.in
index f6f09052..d22c113e 100644
--- a/examples/shell/Makefile.in
+++ b/examples/shell/Makefile.in
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -248,6 +249,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/gtk-doc.make b/gtk-doc.make
index dd319930..9ccd0b04 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -25,6 +25,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
 SETUP_FILES = \
 	$(content_files)		\
+	$(expand_content_files)		\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
@@ -33,9 +34,9 @@ EXTRA_DIST = 				\
 	$(HTML_IMAGES)			\
 	$(SETUP_FILES)
 
-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
-	tmpl.stamp sgml.stamp html.stamp pdf.stamp
+	sgml.stamp html.stamp pdf.stamp
 
 SCANOBJ_FILES = 		 \
 	$(DOC_MODULE).args 	 \
@@ -86,21 +87,19 @@ GTK_DOC_V_SETUP_0=@echo "  DOC   Preparing build";
 
 setup-build.stamp:
 	-$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
+	    files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \
 	    if test "x$$files" != "x" ; then \
 	        for file in $$files ; do \
-	            destdir=`dirname $(abs_builddir)/$$file` ;\
+	            destdir=`dirname $(abs_builddir)/$$file`; \
 	            test -d "$$destdir" || mkdir -p "$$destdir"; \
 	            test -f $(abs_srcdir)/$$file && \
 	                cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \
 	        done; \
 	    fi; \
-	    test -d $(abs_srcdir)/tmpl && \
-	        { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \
-	        chmod -R u+w $(abs_builddir)/tmpl; } \
 	fi
 	$(AM_V_at)touch setup-build.stamp
 
+
 #### scan ####
 
 GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V))
@@ -120,7 +119,7 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 	$(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    scanobj_options=""; \
 	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	    if test "$(?)" = "0"; then \
+	    if test "$$?" = "0"; then \
 	        if test "x$(V)" = "x1"; then \
 	            scanobj_options="--verbose"; \
 	        fi; \
@@ -137,35 +136,14 @@ scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB)
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-#### templates ####
-
-GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V))
-GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY))
-GTK_DOC_V_TMPL_0=@echo "  DOC   Rebuilding template files";
-
-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	$(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	$(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	  if test -w $(abs_srcdir) ; then \
-	    cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \
-	  fi \
-	fi
-	$(AM_V_at)touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-$(srcdir)/tmpl/*.sgml:
-	@true
-
 #### xml ####
 
 GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V))
 GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 
-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	-$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
 	done ; \
@@ -185,17 +163,17 @@ GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V))
 GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XREF_0=@echo "  DOC   Fixing cross-references";
 
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkhtml_options="$$mkhtml_options --verbose"; \
 	  fi; \
 	fi; \
 	gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
 	fi; \
 	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
@@ -217,11 +195,11 @@ GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V))
 GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_PDF_0=@echo "  DOC   Building PDF";
 
-pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \
 	mkpdf_options=""; \
 	gtkdoc-mkpdf 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
-	if test "$(?)" = "0"; then \
+	if test "$$?" = "0"; then \
 	  if test "x$(V)" = "x1"; then \
 	    mkpdf_options="$$mkpdf_options --verbose"; \
 	  fi; \
@@ -246,13 +224,15 @@ clean-local:
 	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \
 	  rm -f $(DOC_MODULE).types; \
 	fi
+	@if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \
+	  rm -f $(DOC_MODULE)-sections.txt; \
+	fi
 
 distclean-local:
 	@rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
-	    rm -rf tmpl; \
+	    rm -f $(SETUP_FILES) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local:
@@ -302,9 +282,7 @@ dist-check-gtkdoc:
 endif
 
 dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local
-	@mkdir $(distdir)/tmpl
 	@mkdir $(distdir)/html
-	@-cp ./tmpl/*.sgml $(distdir)/tmpl
 	@cp ./html/* $(distdir)/html
 	@-cp ./$(DOC_MODULE).pdf $(distdir)/
 	@-cp ./$(DOC_MODULE).types $(distdir)/
diff --git a/include/Makefile.am b/include/Makefile.am
index 6e84a5b6..ff7eac8c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,6 +4,6 @@ EXTRA_DIST = \
      nm-glib-compat.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \
-     nm-utils-internal.h
+     nm-macros-internal.h
 
 CLEANFILES=nm-version.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 016710b6..3dbcc338 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -248,6 +249,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -397,7 +399,7 @@ EXTRA_DIST = \
      nm-glib-compat.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \
-     nm-utils-internal.h
+     nm-macros-internal.h
 
 CLEANFILES = nm-version.h
 all: all-am
diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h
index 1dc939fe..dc39d2b9 100644
--- a/include/nm-glib-compat.h
+++ b/include/nm-glib-compat.h
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 
 
 #ifdef __clang__
@@ -163,4 +164,90 @@ q_n##_quark (void)                            \
 }
 #endif
 
+
+static inline gboolean
+nm_g_hash_table_replace (GHashTable *hash, gpointer key, gpointer value)
+{
+	/* glib 2.40 added a return value indicating whether the key already existed
+	 * (910191597a6c2e5d5d460e9ce9efb4f47d9cc63c). */
+#if GLIB_CHECK_VERSION(2, 40, 0)
+	return g_hash_table_replace (hash, key, value);
+#else
+	gboolean contained = g_hash_table_contains (hash, key);
+
+	g_hash_table_replace (hash, key, value);
+	return !contained;
+#endif
+}
+
+
+#if !GLIB_CHECK_VERSION(2, 40, 0) || defined (NM_GLIB_COMPAT_H_TEST)
+static inline void
+_nm_g_ptr_array_insert (GPtrArray *array,
+                        gint       index_,
+                        gpointer   data)
+{
+	g_return_if_fail (array);
+	g_return_if_fail (index_ >= -1);
+	g_return_if_fail (index_ <= (gint) array->len);
+
+	g_ptr_array_add (array, data);
+
+	if (index_ != -1 && index_ != (gint) (array->len - 1)) {
+		memmove (&(array->pdata[index_ + 1]),
+		         &(array->pdata[index_]),
+		         (array->len - index_ - 1) * sizeof (gpointer));
+		array->pdata[index_] = data;
+	}
+}
+#endif
+#if !GLIB_CHECK_VERSION(2, 40, 0)
+#define g_ptr_array_insert(array, index, data) G_STMT_START { _nm_g_ptr_array_insert (array, index, data); } G_STMT_END
+#else
+#define g_ptr_array_insert(array, index, data) \
+	G_STMT_START { \
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
+		g_ptr_array_insert (array, index, data); \
+		G_GNUC_END_IGNORE_DEPRECATIONS \
+	} G_STMT_END
+#endif
+
+
+#if !GLIB_CHECK_VERSION (2, 40, 0)
+inline static gboolean
+_g_key_file_save_to_file (GKeyFile     *key_file,
+                          const gchar  *filename,
+                          GError      **error)
+{
+	gchar *contents;
+	gboolean success;
+	gsize length;
+
+	g_return_val_if_fail (key_file != NULL, FALSE);
+	g_return_val_if_fail (filename != NULL, FALSE);
+	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+	contents = g_key_file_to_data (key_file, &length, NULL);
+	g_assert (contents != NULL);
+
+	success = g_file_set_contents (filename, contents, length, error);
+	g_free (contents);
+
+	return success;
+}
+#define g_key_file_save_to_file(key_file, filename, error) \
+	_g_key_file_save_to_file (key_file, filename, error)
+#else
+#define g_key_file_save_to_file(key_file, filename, error) \
+	({ \
+		gboolean _success; \
+		\
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
+		_success = g_key_file_save_to_file (key_file, filename, error); \
+		G_GNUC_END_IGNORE_DEPRECATIONS \
+		_success; \
+	})
+#endif
+
+
 #endif  /* __NM_GLIB_COMPAT_H__ */
diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h
new file mode 100644
index 00000000..405051f3
--- /dev/null
+++ b/include/nm-macros-internal.h
@@ -0,0 +1,248 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager -- Network link manager
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser 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.
+ *
+ * (C) Copyright 2014 Red Hat, Inc.
+ */
+
+#ifndef __NM_MACROS_INTERNAL_H__
+#define __NM_MACROS_INTERNAL_H__
+
+
+#include 
+
+/********************************************************/
+
+/* http://stackoverflow.com/a/11172679 */
+#define  _NM_UTILS_MACRO_FIRST(...)                           __NM_UTILS_MACRO_FIRST_HELPER(__VA_ARGS__, throwaway)
+#define __NM_UTILS_MACRO_FIRST_HELPER(first, ...)             first
+
+#define  _NM_UTILS_MACRO_REST(...)                            __NM_UTILS_MACRO_REST_HELPER(__NM_UTILS_MACRO_REST_NUM(__VA_ARGS__), __VA_ARGS__)
+#define __NM_UTILS_MACRO_REST_HELPER(qty, ...)                __NM_UTILS_MACRO_REST_HELPER2(qty, __VA_ARGS__)
+#define __NM_UTILS_MACRO_REST_HELPER2(qty, ...)               __NM_UTILS_MACRO_REST_HELPER_##qty(__VA_ARGS__)
+#define __NM_UTILS_MACRO_REST_HELPER_ONE(first)
+#define __NM_UTILS_MACRO_REST_HELPER_TWOORMORE(first, ...)    , __VA_ARGS__
+#define __NM_UTILS_MACRO_REST_NUM(...) \
+    __NM_UTILS_MACRO_REST_SELECT_20TH(__VA_ARGS__, \
+                TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\
+                TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\
+                TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\
+                TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
+#define __NM_UTILS_MACRO_REST_SELECT_20TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, ...) a20
+
+/********************************************************/
+
+#if defined (__GNUC__)
+#define _NM_PRAGMA_WARNING_DO(warning)       G_STRINGIFY(GCC diagnostic ignored warning)
+#elif defined (__clang__)
+#define _NM_PRAGMA_WARNING_DO(warning)       G_STRINGIFY(clang diagnostic ignored warning)
+#endif
+
+/* you can only suppress a specific warning that the compiler
+ * understands. Otherwise you will get another compiler warning
+ * about invalid pragma option.
+ * It's not that bad however, because gcc and clang often have the
+ * same name for the same warning. */
+
+#if defined (__GNUC__)
+#define NM_PRAGMA_WARNING_DISABLE(warning) \
+        _Pragma("GCC diagnostic push"); \
+        _Pragma(_NM_PRAGMA_WARNING_DO(warning))
+#elif defined (__clang__)
+#define NM_PRAGMA_WARNING_DISABLE(warning) \
+        _Pragma("clang diagnostic push"); \
+        _Pragma(_NM_PRAGMA_WARNING_DO(warning))
+#else
+#define NM_PRAGMA_WARNING_DISABLE(warning)
+#endif
+
+#if defined (__GNUC__)
+#define NM_PRAGMA_WARNING_REENABLE \
+    _Pragma("GCC diagnostic pop")
+#elif defined (__clang__)
+#define NM_PRAGMA_WARNING_REENABLE \
+    _Pragma("clang diagnostic pop")
+#else
+#define NM_PRAGMA_WARNING_REENABLE
+#endif
+
+/********************************************************/
+
+/* macro to return strlen() of a compile time string. */
+#define STRLEN(str)     ( sizeof ("" str) - 1 )
+
+#define NM_IN_SET(x, y, ...)                                    \
+    ({                                                          \
+        const typeof(y) _y = (y);                               \
+        typeof(_y) _x = (x);                                    \
+        unsigned _i;                                            \
+        gboolean _found = FALSE;                                \
+        for (_i = 0; _i < 1 + sizeof((typeof(_x)[]) { __VA_ARGS__ })/sizeof(typeof(_x)); _i++) { \
+            if (((typeof(_x)[]) { _y, __VA_ARGS__ })[_i] == _x) { \
+                _found = TRUE;                                  \
+                break;                                          \
+            }                                                   \
+        }                                                       \
+        _found;                                                 \
+    })
+
+#define NM_PRINT_FMT_QUOTED(cond, prefix, str, suffix, str_else) \
+	(cond) ? (prefix) : "", \
+	(cond) ? (str) : (str_else), \
+	(cond) ? (suffix) : ""
+
+/*****************************************************************************/
+
+#ifdef NM_MORE_ASSERTS
+#define nm_assert(cond) G_STMT_START { g_assert (cond); } G_STMT_END
+#else
+#define nm_assert(cond) G_STMT_START { if (FALSE) { if (cond) { } } } G_STMT_END
+#endif
+
+/*****************************************************************************/
+
+#define NM_DEFINE_SINGLETON_INSTANCE(TYPE) \
+static TYPE *singleton_instance
+
+#define NM_DEFINE_SINGLETON_WEAK_REF(TYPE) \
+NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
+static void \
+_singleton_instance_weak_ref_cb (gpointer data, \
+                                 GObject *where_the_object_was) \
+{ \
+	nm_log_dbg (LOGD_CORE, "disposing %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
+	singleton_instance = NULL; \
+} \
+static inline void \
+nm_singleton_instance_weak_ref_register (void) \
+{ \
+	g_object_weak_ref (G_OBJECT (singleton_instance), _singleton_instance_weak_ref_cb, NULL); \
+}
+
+#define NM_DEFINE_SINGLETON_DESTRUCTOR(TYPE) \
+NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
+static void __attribute__((destructor)) \
+_singleton_destructor (void) \
+{ \
+	if (singleton_instance) { \
+		if (G_OBJECT (singleton_instance)->ref_count > 1) \
+			nm_log_dbg (LOGD_CORE, "disown %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
+		g_object_unref (singleton_instance); \
+	} \
+}
+
+/* By default, the getter will assert that the singleton will be created only once. You can
+ * change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */
+#ifndef NM_DEFINE_SINGLETON_ALLOW_MULTIPLE
+#define NM_DEFINE_SINGLETON_ALLOW_MULTIPLE     FALSE
+#endif
+
+#define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \
+NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
+NM_DEFINE_SINGLETON_WEAK_REF (TYPE); \
+TYPE * \
+GETTER (void) \
+{ \
+	if (G_UNLIKELY (!singleton_instance)) { \
+		static char _already_created = FALSE; \
+\
+		g_assert (!_already_created || (NM_DEFINE_SINGLETON_ALLOW_MULTIPLE)); \
+		_already_created = TRUE;\
+		singleton_instance = (g_object_new (GTYPE, ##__VA_ARGS__, NULL)); \
+		g_assert (singleton_instance); \
+		nm_singleton_instance_weak_ref_register (); \
+		nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
+	} \
+	return singleton_instance; \
+} \
+NM_DEFINE_SINGLETON_DESTRUCTOR(TYPE)
+
+/*****************************************************************************/
+
+static inline gboolean
+nm_clear_g_source (guint *id)
+{
+	if (id && *id) {
+		g_source_remove (*id);
+		*id = 0;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/*****************************************************************************/
+
+/* Determine whether @x is a power of two (@x being an integer type).
+ * For the special cases @x equals zero or one, it also returns true.
+ * For negative @x, always returns FALSE. That only applies, if the data
+ * type of @x is signed. */
+#define nm_utils_is_power_of_two(x) ({ \
+		const typeof(x) __x = (x); \
+		\
+		((__x & (__x - 1)) == 0) && \
+			/* Check if the value is negative. In that case, return FALSE.
+			 * The first expression is a compile time constant, depending on whether
+			 * the type is signed. The second expression is a clumsy way for (__x >= 0),
+			 * which causes a compiler warning for unsigned types. */ \
+			( ( ((typeof(__x)) -1) > ((typeof(__x)) 0) ) || (__x > 0) || (__x == 0) ); \
+	})
+
+/*****************************************************************************/
+
+/* check if @flags has exactly one flag (@check) set. You should call this
+ * only with @check being a compile time constant and a power of two. */
+#define NM_FLAGS_HAS(flags, check)  \
+    ( (G_STATIC_ASSERT_EXPR ( ((check) != 0) && ((check) & ((check)-1)) == 0 )), (NM_FLAGS_ANY ((flags), (check))) )
+
+#define NM_FLAGS_ANY(flags, check)  ( ( ((flags) & (check)) != 0       ) ? TRUE : FALSE )
+#define NM_FLAGS_ALL(flags, check)  ( ( ((flags) & (check)) == (check) ) ? TRUE : FALSE )
+
+#define NM_FLAGS_SET(flags, val)  ({ \
+		const typeof(flags) _flags = (flags); \
+		const typeof(flags) _val = (val); \
+		\
+		_flags | _val; \
+	})
+
+#define NM_FLAGS_UNSET(flags, val)  ({ \
+		const typeof(flags) _flags = (flags); \
+		const typeof(flags) _val = (val); \
+		\
+		_flags & (~_val); \
+	})
+
+#define NM_FLAGS_ASSIGN(flags, val, assign)  ({ \
+		const typeof(flags) _flags = (flags); \
+		const typeof(flags) _val = (val); \
+		\
+		(assign) \
+			? _flags | (_val) \
+			: _flags & (~_val); \
+	})
+
+/*****************************************************************************/
+
+static inline char *
+nm_strstrip (char *str)
+{
+	/* g_strstrip doesn't like NULL. */
+	return str ? g_strstrip (str) : NULL;
+}
+
+/*****************************************************************************/
+
+#endif /* __NM_MACROS_INTERNAL_H__ */
diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 5f83d09d..258d3937 100644
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -92,13 +92,14 @@
 #include 
 
 #include "nm-utils.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 #include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 
-
-/* Analog to EXIT_SUCCESS and EXIT_FAILURE. */
-#define EXIT_SKIP (77)
+#ifdef __NETWORKMANAGER_LOGGING_H__
+/* We are running tests under src/ */
+#include "NetworkManagerUtils.h"
+#endif
 
 /*******************************************************************************/
 
@@ -122,6 +123,14 @@ nmtst_assert_error (GError *error,
 	}
 }
 
+inline static void
+_nmtst_assert_success (gboolean success, GError *error, const char *file, int line)
+{
+	if (!success || error)
+		g_error ("(%s:%d) FAILURE success=%d, error=%s", file, line, success, error && error->message ? error->message : "(no error)");
+}
+#define nmtst_assert_success(success, error) _nmtst_assert_success ((success), (error), __FILE__, __LINE__)
+
 /*******************************************************************************/
 
 struct __nmtst_internal
@@ -258,6 +267,11 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
 	g_assert (!argc || (g_strv_length (*argv) == *argc));
 	g_assert (!assert_logging || (!log_level && !log_domains));
 
+#ifdef __NETWORKMANAGER_UTILS_H__
+	if (!nm_utils_get_testing_initialized ())
+		_nm_utils_set_testing (_NM_UTILS_TEST_GENERAL);
+#endif
+
 	if (argc)
 		__nmtst_internal.orig_argv = g_strdupv (*argv);
 
@@ -710,6 +724,39 @@ __nmtst_spawn_sync (const char *working_directory, char **standard_out, char **s
 
 /*******************************************************************************/
 
+inline static char *
+nmtst_file_resolve_relative_path (const char *rel, const char *cwd)
+{
+	gs_free char *cwd_free = NULL;
+
+	g_assert (rel && *rel);
+
+	if (g_path_is_absolute (rel))
+		return g_strdup (rel);
+
+	if (!cwd)
+		cwd = cwd_free = g_get_current_dir ();
+	return g_build_filename (cwd, rel, NULL);
+}
+
+inline static void
+_nmtst_assert_resolve_relative_path_equals (const char *f1, const char *f2, const char *file, int line)
+{
+	gs_free char *p1 = NULL, *p2 = NULL;
+
+	p1 = nmtst_file_resolve_relative_path (f1, NULL);
+	p2 = nmtst_file_resolve_relative_path (f2, NULL);
+	g_assert (p1 && *p1);
+
+	/* Fixme: later we might need to coalesce repeated '/', "./", and "../".
+	 * For now, it's good enough. */
+	if (g_strcmp0 (p1, p2) != 0)
+		g_error ("%s:%d : filenames don't match \"%s\" vs. \"%s\" // \"%s\" - \"%s\"", file, line, f1, f2, p1, p2);
+}
+#define nmtst_assert_resolve_relative_path_equals(f1, f2) _nmtst_assert_resolve_relative_path_equals (f1, f2, __FILE__, __LINE__);
+
+/*******************************************************************************/
+
 #ifdef __NETWORKMANAGER_PLATFORM_H__
 
 inline static NMPlatformIP6Address *
@@ -742,6 +789,38 @@ nmtst_platform_ip6_address_full (const char *address, const char *peer_address,
 	return addr;
 }
 
+inline static NMPlatformIP4Route *
+nmtst_platform_ip4_route (const char *network, guint plen, const char *gateway)
+{
+	static NMPlatformIP4Route route;
+
+	memset (&route, 0, sizeof (route));
+	route.network = nmtst_inet4_from_string (network);
+	route.plen = plen;
+	route.gateway = nmtst_inet4_from_string (gateway);
+
+	return &route;
+}
+
+inline static NMPlatformIP4Route *
+nmtst_platform_ip4_route_full (const char *network, guint plen, const char *gateway,
+                               int ifindex, NMIPConfigSource source,
+                               guint metric, guint mss,
+                               guint8 scope,
+                               const char *pref_src)
+{
+	NMPlatformIP4Route *route = nmtst_platform_ip4_route (network, plen, gateway);
+
+	route->ifindex = ifindex;
+	route->source = source;
+	route->metric = metric;
+	route->mss = mss;
+	route->scope_inv = nm_platform_route_scope_inv (scope);
+	route->pref_src = nmtst_inet4_from_string (pref_src);
+
+	return route;
+}
+
 inline static NMPlatformIP6Route *
 nmtst_platform_ip6_route (const char *network, guint plen, const char *gateway)
 {
@@ -799,9 +878,6 @@ nmtst_platform_ip4_routes_equal (const NMPlatformIP4Route *a, const NMPlatformIP
 			         nmtst_static_1024_02 (nm_platform_ip4_route_to_string (&b[i])));
 			g_assert_not_reached ();
 		}
-
-		/* also check with memcmp, though this might fail for valid programs (due to field alignment) */
-		g_assert_cmpint (memcmp (&a[i], &b[i], sizeof (a[i])), ==, 0);
 	}
 }
 
@@ -834,9 +910,6 @@ nmtst_platform_ip6_routes_equal (const NMPlatformIP6Route *a, const NMPlatformIP
 			         nmtst_static_1024_02 (nm_platform_ip6_route_to_string (&b[i])));
 			g_assert_not_reached ();
 		}
-
-		/* also check with memcmp, though this might fail for valid programs (due to field alignment) */
-		g_assert_cmpint (memcmp (&a[i], &b[i], sizeof (a[i])), ==, 0);
 	}
 }
 
@@ -1193,6 +1266,36 @@ nmtst_assert_hwaddr_equals (gconstpointer hwaddr1, gssize hwaddr1_len, const cha
     nmtst_assert_hwaddr_equals (hwaddr1, hwaddr1_len, expected, G_STRLOC)
 #endif
 
+#if defined(__NM_SIMPLE_CONNECTION_H__) && defined(__NM_SETTING_CONNECTION_H__) && defined(__NM_KEYFILE_INTERNAL_H__)
+
+inline static NMConnection *
+nmtst_create_connection_from_keyfile (const char *keyfile_str, const char *keyfile_name, const char *base_dir)
+{
+	GKeyFile *keyfile;
+	GError *error = NULL;
+	gboolean success;
+	NMConnection *con;
+
+	g_assert (keyfile_str);
+
+	keyfile =  g_key_file_new ();
+	success = g_key_file_load_from_data (keyfile, keyfile_str, strlen (keyfile_str), G_KEY_FILE_NONE, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+
+	con = nm_keyfile_read (keyfile, keyfile_name, base_dir, NULL, NULL, &error);
+	g_assert_no_error (error);
+	g_assert (NM_IS_CONNECTION (con));
+
+	g_key_file_unref (keyfile);
+
+	nmtst_connection_normalize (con);
+
+	return con;
+}
+
+#endif
+
 #ifdef __NM_CONNECTION_H__
 
 typedef enum {
diff --git a/include/nm-utils-internal.h b/include/nm-utils-internal.h
deleted file mode 100644
index 227a210b..00000000
--- a/include/nm-utils-internal.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser 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.
- *
- * (C) Copyright 2014 Red Hat, Inc.
- */
-
-#ifndef __NM_UTILS_INTERNAL_H__
-#define __NM_UTILS_INTERNAL_H__
-
-
-#include 
-
-/********************************************************/
-
-/* http://stackoverflow.com/a/11172679 */
-#define  _NM_UTILS_MACRO_FIRST(...)                           __NM_UTILS_MACRO_FIRST_HELPER(__VA_ARGS__, throwaway)
-#define __NM_UTILS_MACRO_FIRST_HELPER(first, ...)             first
-
-#define  _NM_UTILS_MACRO_REST(...)                            __NM_UTILS_MACRO_REST_HELPER(__NM_UTILS_MACRO_REST_NUM(__VA_ARGS__), __VA_ARGS__)
-#define __NM_UTILS_MACRO_REST_HELPER(qty, ...)                __NM_UTILS_MACRO_REST_HELPER2(qty, __VA_ARGS__)
-#define __NM_UTILS_MACRO_REST_HELPER2(qty, ...)               __NM_UTILS_MACRO_REST_HELPER_##qty(__VA_ARGS__)
-#define __NM_UTILS_MACRO_REST_HELPER_ONE(first)
-#define __NM_UTILS_MACRO_REST_HELPER_TWOORMORE(first, ...)    , __VA_ARGS__
-#define __NM_UTILS_MACRO_REST_NUM(...) \
-    __NM_UTILS_MACRO_REST_SELECT_20TH(__VA_ARGS__, \
-                TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\
-                TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\
-                TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE, TWOORMORE,\
-                TWOORMORE, TWOORMORE, TWOORMORE, ONE, throwaway)
-#define __NM_UTILS_MACRO_REST_SELECT_20TH(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, ...) a20
-
-/********************************************************/
-
-#if defined (__GNUC__)
-#define _NM_PRAGMA_WARNING_DO(warning)       G_STRINGIFY(GCC diagnostic ignored warning)
-#elif defined (__clang__)
-#define _NM_PRAGMA_WARNING_DO(warning)       G_STRINGIFY(clang diagnostic ignored warning)
-#endif
-
-/* you can only suppress a specific warning that the compiler
- * understands. Otherwise you will get another compiler warning
- * about invalid pragma option.
- * It's not that bad however, because gcc and clang often have the
- * same name for the same warning. */
-
-#if defined (__GNUC__)
-#define NM_PRAGMA_WARNING_DISABLE(warning) \
-        _Pragma("GCC diagnostic push"); \
-        _Pragma(_NM_PRAGMA_WARNING_DO(warning))
-#elif defined (__clang__)
-#define NM_PRAGMA_WARNING_DISABLE(warning) \
-        _Pragma("clang diagnostic push"); \
-        _Pragma(_NM_PRAGMA_WARNING_DO(warning))
-#else
-#define NM_PRAGMA_WARNING_DISABLE(warning)
-#endif
-
-#if defined (__GNUC__)
-#define NM_PRAGMA_WARNING_REENABLE \
-    _Pragma("GCC diagnostic pop")
-#elif defined (__clang__)
-#define NM_PRAGMA_WARNING_REENABLE \
-    _Pragma("clang diagnostic pop")
-#else
-#define NM_PRAGMA_WARNING_REENABLE
-#endif
-
-/********************************************************/
-
-/* macro to return strlen() of a compile time string. */
-#define STRLEN(str)     ( sizeof ("" str) - 1 )
-
-#define NM_IN_SET(x, y, ...)                                    \
-    ({                                                          \
-        const typeof(y) _y = (y);                               \
-        typeof(_y) _x = (x);                                    \
-        unsigned _i;                                            \
-        gboolean _found = FALSE;                                \
-        for (_i = 0; _i < 1 + sizeof((typeof(_x)[]) { __VA_ARGS__ })/sizeof(typeof(_x)); _i++) { \
-            if (((typeof(_x)[]) { _y, __VA_ARGS__ })[_i] == _x) { \
-                _found = TRUE;                                  \
-                break;                                          \
-            }                                                   \
-        }                                                       \
-        _found;                                                 \
-    })
-
-/*****************************************************************************/
-
-#define NM_DEFINE_SINGLETON_INSTANCE(TYPE) \
-static TYPE *singleton_instance
-
-#define NM_DEFINE_SINGLETON_WEAK_REF(TYPE) \
-NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
-static void \
-_singleton_instance_weak_ref_cb (gpointer data, \
-                                 GObject *where_the_object_was) \
-{ \
-	nm_log_dbg (LOGD_CORE, "disposing %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
-	singleton_instance = NULL; \
-} \
-static inline void \
-nm_singleton_instance_weak_ref_register (void) \
-{ \
-	g_object_weak_ref (G_OBJECT (singleton_instance), _singleton_instance_weak_ref_cb, NULL); \
-}
-
-#define NM_DEFINE_SINGLETON_DESTRUCTOR(TYPE) \
-NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
-static void __attribute__((destructor)) \
-_singleton_destructor (void) \
-{ \
-	if (singleton_instance) { \
-		if (G_OBJECT (singleton_instance)->ref_count > 1) \
-			nm_log_dbg (LOGD_CORE, "disown %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
-		g_object_unref (singleton_instance); \
-	} \
-}
-
-/* By default, the getter will assert that the singleton will be created only once. You can
- * change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */
-#ifndef NM_DEFINE_SINGLETON_ALLOW_MULTIPLE
-#define NM_DEFINE_SINGLETON_ALLOW_MULTIPLE     FALSE
-#endif
-
-#define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \
-NM_DEFINE_SINGLETON_INSTANCE (TYPE); \
-NM_DEFINE_SINGLETON_WEAK_REF (TYPE); \
-TYPE * \
-GETTER (void) \
-{ \
-	if (G_UNLIKELY (!singleton_instance)) { \
-		static char _already_created = FALSE; \
-\
-		g_assert (!_already_created || (NM_DEFINE_SINGLETON_ALLOW_MULTIPLE)); \
-		_already_created = TRUE;\
-		singleton_instance = (g_object_new (GTYPE, ##__VA_ARGS__, NULL)); \
-		g_assert (singleton_instance); \
-		nm_singleton_instance_weak_ref_register (); \
-		nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \
-	} \
-	return singleton_instance; \
-} \
-NM_DEFINE_SINGLETON_DESTRUCTOR(TYPE)
-
-/*****************************************************************************/
-
-static inline gboolean
-nm_clear_g_source (guint *id)
-{
-	if (id && *id) {
-		g_source_remove (*id);
-		*id = 0;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-/*****************************************************************************/
-
-#endif
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 1f358d47..d9f37a99 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -198,6 +198,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -311,6 +312,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index 0c2a330c..e405a384 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -637,6 +637,21 @@
           The SIM PIN was incorrect.
         
       
+      
+        
+          A new connection activation was enqueued.
+        
+      
+      
+        
+          The device's parent changed.
+        
+      
+      
+        
+          The device parent's management changed.
+        
+      
     
 
     
diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in
index 7ceb3cfa..6f502e38 100644
--- a/libnm-core/Makefile.in
+++ b/libnm-core/Makefile.in
@@ -132,14 +132,15 @@ libnm_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_3)
 am__libnm_core_la_SOURCES_DIST = $(core_build)/nm-core-enum-types.c \
 	$(core)/crypto.c $(core)/nm-connection.c $(core)/nm-errors.c \
-	$(core)/nm-property-compare.c $(core)/nm-setting-8021x.c \
-	$(core)/nm-setting-adsl.c $(core)/nm-setting-bluetooth.c \
-	$(core)/nm-setting-bond.c $(core)/nm-setting-bridge-port.c \
-	$(core)/nm-setting-bridge.c $(core)/nm-setting-cdma.c \
-	$(core)/nm-setting-connection.c $(core)/nm-setting-dcb.c \
-	$(core)/nm-setting-generic.c $(core)/nm-setting-gsm.c \
-	$(core)/nm-setting-infiniband.c $(core)/nm-setting-ip-config.c \
-	$(core)/nm-setting-ip4-config.c \
+	$(core)/nm-keyfile-reader.c $(core)/nm-keyfile-utils.c \
+	$(core)/nm-keyfile-writer.c $(core)/nm-property-compare.c \
+	$(core)/nm-setting-8021x.c $(core)/nm-setting-adsl.c \
+	$(core)/nm-setting-bluetooth.c $(core)/nm-setting-bond.c \
+	$(core)/nm-setting-bridge-port.c $(core)/nm-setting-bridge.c \
+	$(core)/nm-setting-cdma.c $(core)/nm-setting-connection.c \
+	$(core)/nm-setting-dcb.c $(core)/nm-setting-generic.c \
+	$(core)/nm-setting-gsm.c $(core)/nm-setting-infiniband.c \
+	$(core)/nm-setting-ip-config.c $(core)/nm-setting-ip4-config.c \
 	$(core)/nm-setting-ip6-config.c $(core)/nm-setting-olpc-mesh.c \
 	$(core)/nm-setting-ppp.c $(core)/nm-setting-pppoe.c \
 	$(core)/nm-setting-serial.c $(core)/nm-setting-team-port.c \
@@ -150,14 +151,17 @@ am__libnm_core_la_SOURCES_DIST = $(core_build)/nm-core-enum-types.c \
 	$(core)/nm-setting-wireless.c $(core)/nm-setting.c \
 	$(core)/nm-simple-connection.c $(core)/nm-utils.c \
 	$(core)/crypto.h $(core)/nm-connection-private.h \
-	$(core)/nm-core-internal.h $(core)/nm-property-compare.h \
+	$(core)/nm-core-internal.h $(core)/nm-keyfile-internal.h \
+	$(core)/nm-keyfile-utils.h $(core)/nm-property-compare.h \
 	$(core)/nm-setting-private.h $(core)/nm-utils-private.h \
 	crypto_gnutls.c crypto_nss.c
 am__objects_1 = nm-core-enum-types.lo crypto.lo nm-connection.lo \
-	nm-errors.lo nm-property-compare.lo nm-setting-8021x.lo \
-	nm-setting-adsl.lo nm-setting-bluetooth.lo nm-setting-bond.lo \
-	nm-setting-bridge-port.lo nm-setting-bridge.lo \
-	nm-setting-cdma.lo nm-setting-connection.lo nm-setting-dcb.lo \
+	nm-errors.lo nm-keyfile-reader.lo nm-keyfile-utils.lo \
+	nm-keyfile-writer.lo nm-property-compare.lo \
+	nm-setting-8021x.lo nm-setting-adsl.lo nm-setting-bluetooth.lo \
+	nm-setting-bond.lo nm-setting-bridge-port.lo \
+	nm-setting-bridge.lo nm-setting-cdma.lo \
+	nm-setting-connection.lo nm-setting-dcb.lo \
 	nm-setting-generic.lo nm-setting-gsm.lo \
 	nm-setting-infiniband.lo nm-setting-ip-config.lo \
 	nm-setting-ip4-config.lo nm-setting-ip6-config.lo \
@@ -315,6 +319,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -428,6 +433,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -622,6 +628,8 @@ libnm_core_private_headers = \
 	$(core)/crypto.h			\
 	$(core)/nm-connection-private.h		\
 	$(core)/nm-core-internal.h		\
+	$(core)/nm-keyfile-internal.h       \
+	$(core)/nm-keyfile-utils.h          \
 	$(core)/nm-property-compare.h		\
 	$(core)/nm-setting-private.h		\
 	$(core)/nm-utils-private.h
@@ -631,6 +639,9 @@ libnm_core_sources = \
 	$(core)/crypto.c			\
 	$(core)/nm-connection.c			\
 	$(core)/nm-errors.c			\
+	$(core)/nm-keyfile-reader.c         \
+	$(core)/nm-keyfile-utils.c          \
+	$(core)/nm-keyfile-writer.c         \
 	$(core)/nm-property-compare.c		\
 	$(core)/nm-setting-8021x.c		\
 	$(core)/nm-setting-adsl.c		\
@@ -742,6 +753,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-core-enum-types.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-errors.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-keyfile-reader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-keyfile-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-keyfile-writer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-property-compare.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting-8021x.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting-adsl.Plo@am__quote@
@@ -823,6 +837,27 @@ nm-errors.lo: $(core)/nm-errors.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-errors.lo `test -f '$(core)/nm-errors.c' || echo '$(srcdir)/'`$(core)/nm-errors.c
 
+nm-keyfile-reader.lo: $(core)/nm-keyfile-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-keyfile-reader.lo -MD -MP -MF $(DEPDIR)/nm-keyfile-reader.Tpo -c -o nm-keyfile-reader.lo `test -f '$(core)/nm-keyfile-reader.c' || echo '$(srcdir)/'`$(core)/nm-keyfile-reader.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-keyfile-reader.Tpo $(DEPDIR)/nm-keyfile-reader.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(core)/nm-keyfile-reader.c' object='nm-keyfile-reader.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-keyfile-reader.lo `test -f '$(core)/nm-keyfile-reader.c' || echo '$(srcdir)/'`$(core)/nm-keyfile-reader.c
+
+nm-keyfile-utils.lo: $(core)/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-keyfile-utils.lo -MD -MP -MF $(DEPDIR)/nm-keyfile-utils.Tpo -c -o nm-keyfile-utils.lo `test -f '$(core)/nm-keyfile-utils.c' || echo '$(srcdir)/'`$(core)/nm-keyfile-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-keyfile-utils.Tpo $(DEPDIR)/nm-keyfile-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(core)/nm-keyfile-utils.c' object='nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-keyfile-utils.lo `test -f '$(core)/nm-keyfile-utils.c' || echo '$(srcdir)/'`$(core)/nm-keyfile-utils.c
+
+nm-keyfile-writer.lo: $(core)/nm-keyfile-writer.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-keyfile-writer.lo -MD -MP -MF $(DEPDIR)/nm-keyfile-writer.Tpo -c -o nm-keyfile-writer.lo `test -f '$(core)/nm-keyfile-writer.c' || echo '$(srcdir)/'`$(core)/nm-keyfile-writer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-keyfile-writer.Tpo $(DEPDIR)/nm-keyfile-writer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(core)/nm-keyfile-writer.c' object='nm-keyfile-writer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-keyfile-writer.lo `test -f '$(core)/nm-keyfile-writer.c' || echo '$(srcdir)/'`$(core)/nm-keyfile-writer.c
+
 nm-property-compare.lo: $(core)/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-property-compare.lo -MD -MP -MF $(DEPDIR)/nm-property-compare.Tpo -c -o nm-property-compare.lo `test -f '$(core)/nm-property-compare.c' || echo '$(srcdir)/'`$(core)/nm-property-compare.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-property-compare.Tpo $(DEPDIR)/nm-property-compare.Plo
diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
index fc6d779b..09a80c71 100644
--- a/libnm-core/Makefile.libnm-core
+++ b/libnm-core/Makefile.libnm-core
@@ -48,6 +48,8 @@ libnm_core_private_headers =			\
 	$(core)/crypto.h			\
 	$(core)/nm-connection-private.h		\
 	$(core)/nm-core-internal.h		\
+	$(core)/nm-keyfile-internal.h       \
+	$(core)/nm-keyfile-utils.h          \
 	$(core)/nm-property-compare.h		\
 	$(core)/nm-setting-private.h		\
 	$(core)/nm-utils-private.h
@@ -57,6 +59,9 @@ libnm_core_sources =				\
 	$(core)/crypto.c			\
 	$(core)/nm-connection.c			\
 	$(core)/nm-errors.c			\
+	$(core)/nm-keyfile-reader.c         \
+	$(core)/nm-keyfile-utils.c          \
+	$(core)/nm-keyfile-writer.c         \
 	$(core)/nm-property-compare.c		\
 	$(core)/nm-setting-8021x.c		\
 	$(core)/nm-setting-adsl.c		\
diff --git a/libnm-core/nm-core-enum-types.c b/libnm-core/nm-core-enum-types.c
index e4cf177c..cfb264cf 100644
--- a/libnm-core/nm-core-enum-types.c
+++ b/libnm-core/nm-core-enum-types.c
@@ -401,6 +401,8 @@ nm_device_state_reason_get_type (void)
         { NM_DEVICE_STATE_REASON_MODEM_AVAILABLE, "NM_DEVICE_STATE_REASON_MODEM_AVAILABLE", "modem-available" },
         { NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT, "NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT", "sim-pin-incorrect" },
         { NM_DEVICE_STATE_REASON_NEW_ACTIVATION, "NM_DEVICE_STATE_REASON_NEW_ACTIVATION", "new-activation" },
+        { NM_DEVICE_STATE_REASON_PARENT_CHANGED, "NM_DEVICE_STATE_REASON_PARENT_CHANGED", "parent-changed" },
+        { NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED, "NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED", "parent-managed-changed" },
         { 0, NULL, NULL }
       };
       GType g_define_type_id =
@@ -716,6 +718,26 @@ nm_setting_802_1x_ck_scheme_get_type (void)
   return g_define_type_id__volatile;
 }
 GType
+nm_setting_connection_autoconnect_slaves_get_type (void)
+{
+  static volatile gsize g_define_type_id__volatile = 0;
+
+  if (g_once_init_enter (&g_define_type_id__volatile))
+    {
+      static const GEnumValue values[] = {
+        { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT, "NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT", "default" },
+        { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO, "NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO", "no" },
+        { NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES, "NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES", "yes" },
+        { 0, NULL, NULL }
+      };
+      GType g_define_type_id =
+        g_enum_register_static (g_intern_static_string ("NMSettingConnectionAutoconnectSlaves"), values);
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+    }
+
+  return g_define_type_id__volatile;
+}
+GType
 nm_setting_dcb_flags_get_type (void)
 {
   static volatile gsize g_define_type_id__volatile = 0;
diff --git a/libnm-core/nm-core-enum-types.h b/libnm-core/nm-core-enum-types.h
index 162b704e..abc646b2 100644
--- a/libnm-core/nm-core-enum-types.h
+++ b/libnm-core/nm-core-enum-types.h
@@ -61,6 +61,8 @@ GType nm_setting_802_1x_ck_format_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_SETTING_802_1X_CK_FORMAT (nm_setting_802_1x_ck_format_get_type ())
 GType nm_setting_802_1x_ck_scheme_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_SETTING_802_1X_CK_SCHEME (nm_setting_802_1x_ck_scheme_get_type ())
+GType nm_setting_connection_autoconnect_slaves_get_type (void) G_GNUC_CONST;
+#define NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES (nm_setting_connection_autoconnect_slaves_get_type ())
 GType nm_setting_dcb_flags_get_type (void) G_GNUC_CONST;
 #define NM_TYPE_SETTING_DCB_FLAGS (nm_setting_dcb_flags_get_type ())
 GType nm_setting_ip6_config_privacy_get_type (void) G_GNUC_CONST;
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 9f4b33e3..dd5151e0 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -110,18 +110,39 @@ GPtrArray *_nm_utils_copy_array (const GPtrArray *array,
                                  GDestroyNotify free_func);
 GPtrArray *_nm_utils_copy_object_array (const GPtrArray *array);
 
+gssize _nm_utils_ptrarray_find_first (gpointer *list, gssize len, gconstpointer needle);
+
+gssize _nm_utils_ptrarray_find_binary_search (gpointer *list, gsize len, gpointer needle, GCompareDataFunc cmpfcn, gpointer user_data);
+
 gboolean    _nm_utils_string_in_list   (const char *str,
                                         const char **valid_strings);
 
+gssize      _nm_utils_strv_find_first (char **list, gssize len, const char *needle);
+
+char **_nm_utils_strv_cleanup (char **strv,
+                               gboolean strip_whitespace,
+                               gboolean skip_empty,
+                               gboolean skip_repeated);
+
 char **     _nm_utils_strsplit_set (const char *str,
                                     const char *delimiters,
                                     int max_tokens);
 
+GSList *    _nm_utils_strv_to_slist (char **strv, gboolean deep_copy);
+char **     _nm_utils_slist_to_strv (GSList *slist, gboolean deep_copy);
+
+GPtrArray * _nm_utils_strv_to_ptrarray (char **strv);
+char **     _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray);
+
 #define NM_UTILS_UUID_TYPE_LEGACY            0
 #define NM_UTILS_UUID_TYPE_VARIANT3          1
 
 char *nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args);
 
+#define NM_UTILS_UUID_NS "b425e9fb-7598-44b4-9e3b-5a2e3aaa4905"
+
+char *_nm_utils_uuid_generate_from_strings (const char *string1, ...) G_GNUC_NULL_TERMINATED;
+
 void _nm_dbus_errors_init (void);
 
 extern gboolean _nm_utils_is_manager_process;
@@ -136,4 +157,6 @@ GByteArray *nm_utils_rsa_key_encrypt (const guint8 *data,
 int nm_utils_bond_mode_string_to_int (const char *mode);
 const char *nm_utils_bond_mode_int_to_string (int mode);
 
+gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback);
+
 #endif
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 9bab80f3..ccc3b3a9 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -467,6 +467,8 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: Modem now ready and available
  * @NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: SIM PIN was incorrect
  * @NM_DEVICE_STATE_REASON_NEW_ACTIVATION: New connection activation was enqueued
+ * @NM_DEVICE_STATE_REASON_PARENT_CHANGED: the device's parent changed
+ * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed
  *
  * Device state change reason codes
  *
@@ -534,6 +536,8 @@ typedef enum {
 	NM_DEVICE_STATE_REASON_MODEM_AVAILABLE = 58,
 	NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59,
 	NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60,
+	NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61,
+	NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62,
 } NMDeviceStateReason;
 
 
diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
new file mode 100644
index 00000000..f4bb0796
--- /dev/null
+++ b/libnm-core/nm-keyfile-internal.h
@@ -0,0 +1,171 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service - keyfile plugin
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2008 Novell, Inc.
+ * Copyright (C) 2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_KEYFILE_INTERNAL_H__
+#define __NM_KEYFILE_INTERNAL_H__
+
+#include 
+#include 
+
+#include "nm-connection.h"
+#include "nm-setting-8021x.h"
+
+
+/*********************************************************/
+
+#define NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB "data:;base64,"
+#define NM_KEYFILE_CERT_SCHEME_PREFIX_PATH "file://"
+
+char *nm_keyfile_detect_unqualified_path_scheme (const char *base_dir,
+                                                 gconstpointer pdata,
+                                                 gsize data_len,
+                                                 gboolean consider_exists,
+                                                 gboolean *out_exists);
+
+typedef enum {
+	NM_KEYFILE_READ_TYPE_WARN               = 1,
+} NMKeyfileReadType;
+
+/**
+ * NMKeyfileReadHandler:
+ *
+ * Hook to nm_keyfile_read(). The user might fail the reading by setting
+ * @error.
+ *
+ * Returns: should return TRUE, if the reading was handled. Otherwise,
+ * a default action will be performed that depends on the @type.
+ * For %NM_KEYFILE_READ_TYPE_WARN type, the default action is doing nothing.
+ */
+typedef gboolean (*NMKeyfileReadHandler) (GKeyFile *keyfile,
+                                          NMConnection *connection,
+                                          NMKeyfileReadType type,
+                                          void *type_data,
+                                          void *user_data,
+                                          GError **error);
+
+typedef enum {
+	NM_KEYFILE_WARN_SEVERITY_DEBUG                  = 1000,
+	NM_KEYFILE_WARN_SEVERITY_INFO                   = 2000,
+	NM_KEYFILE_WARN_SEVERITY_INFO_MISSING_FILE      = 2901,
+	NM_KEYFILE_WARN_SEVERITY_WARN                   = 3000,
+} NMKeyfileWarnSeverity;
+
+/**
+ * NMKeyfileReadTypeDataWarn:
+ *
+ * this struct is passed as @type_data for the @NMKeyfileReadHandler of
+ * type %NM_KEYFILE_READ_TYPE_WARN.
+ */
+typedef struct {
+	/* might be %NULL, if the warning is not about a group. */
+	const char *group;
+
+	/* might be %NULL, if the warning is not about a setting. */
+	NMSetting *setting;
+
+	/* might be %NULL, if the warning is not about a property. */
+	const char *property_name;
+
+	NMKeyfileWarnSeverity severity;
+	const char *message;
+} NMKeyfileReadTypeDataWarn;
+
+
+NMConnection *nm_keyfile_read (GKeyFile *keyfile,
+                               const char *keyfile_name,
+                               const char *base_dir,
+                               NMKeyfileReadHandler handler,
+                               void *user_data,
+                               GError **error);
+
+/*********************************************************/
+
+typedef enum {
+	NM_KEYFILE_WRITE_TYPE_CERT              = 1,
+} NMKeyfileWriteType;
+
+/**
+ * NMKeyfileWriteHandler:
+ *
+ * This is a hook to tweak the serialization.
+ *
+ * Handler for certain properties or events that are not entirely contained
+ * within the keyfile or that might be serialized differently. The @type and
+ * @type_data arguments tell which kind of argument we have at hand.
+ *
+ * Currently only the type %NM_KEYFILE_WRITE_TYPE_CERT is supported, which provides
+ * @type_data as %NMKeyfileWriteTypeDataCert. However, this handler should be generic enough
+ * to support other types as well.
+ *
+ * This don't have to be only "properties". For example, nm_keyfile_read() uses
+ * a similar handler to push warnings to the caller.
+ *
+ * If the handler raises an error, it should set the @error value. This causes
+ * the an overall failure.
+ *
+ * Returns: whether the issue was handled. If the type was unhandled,
+ * a default action will be performed. This might be raise an error,
+ * do some fallback parsing, or do nothing.
+ */
+typedef gboolean (*NMKeyfileWriteHandler) (NMConnection *connection,
+                                           GKeyFile *keyfile,
+                                           NMKeyfileWriteType type,
+                                           void *type_data,
+                                           void *user_data,
+                                           GError **error);
+
+/**
+ * NMKeyfileWriteTypeDataCert:
+ *
+ * this struct is passed as @type_data for the @NMKeyfileWriteHandler of
+ * type %NM_KEYFILE_WRITE_TYPE_CERT.
+ */
+typedef struct {
+	NMSetting8021x *setting;
+	const char *property_name;
+
+	/* The following functions are helpers that simplify the implementation
+	 * of the handler. */
+	const char *suffix;
+	NMSetting8021xCKScheme (*scheme_func) (NMSetting8021x *setting);
+	NMSetting8021xCKFormat (*format_func) (NMSetting8021x *setting);
+	const char *           (*path_func)   (NMSetting8021x *setting);
+	GBytes *               (*blob_func)   (NMSetting8021x *setting);
+} NMKeyfileWriteTypeDataCert;
+
+
+GKeyFile *nm_keyfile_write (NMConnection *connection,
+                            NMKeyfileWriteHandler handler,
+                            void *user_data,
+                            GError **error);
+
+/*********************************************************/
+
+char *nm_keyfile_plugin_kf_get_string (GKeyFile *kf, const char *group, const char *key, GError **error);
+void nm_keyfile_plugin_kf_set_string (GKeyFile *kf, const char *group, const char *key, const char *value);
+
+void _nm_keyfile_copy (GKeyFile *dst, GKeyFile *src);
+gboolean _nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b);
+gboolean _nm_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order);
+gboolean _nm_keyfile_has_values (GKeyFile *keyfile);
+
+
+#endif /* __NM_KEYFILE_INTERNAL_H__ */
diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
new file mode 100644
index 00000000..353804f9
--- /dev/null
+++ b/libnm-core/nm-keyfile-reader.c
@@ -0,0 +1,1659 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service - keyfile plugin
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2008 - 2015 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "nm-core-internal.h"
+#include "nm-macros-internal.h"
+#include "gsystem-local-alloc.h"
+#include "nm-glib-compat.h"
+#include "nm-keyfile-internal.h"
+#include "nm-keyfile-utils.h"
+#include "nm-setting-private.h"
+
+
+typedef struct {
+	NMConnection *connection;
+	GKeyFile *keyfile;
+	const char *base_dir;
+	NMKeyfileReadHandler handler;
+	void *user_data;
+	GError *error;
+	const char *group;
+	NMSetting *setting;
+} KeyfileReaderInfo;
+
+
+static void
+_handle_warn (KeyfileReaderInfo *info,
+              const char *property_name,
+              NMKeyfileWarnSeverity severity,
+              char *message)
+{
+	NMKeyfileReadTypeDataWarn type_data = {
+		.group = info->group,
+		.setting = info->setting,
+		.property_name = property_name,
+		.severity = severity,
+		.message = message,
+	};
+
+	info->handler (info->keyfile,
+	               info->connection,
+	               NM_KEYFILE_READ_TYPE_WARN,
+	               &type_data,
+	               info->user_data,
+	               &info->error);
+	g_free (message);
+}
+#define handle_warn(arg_info, arg_property_name, arg_severity, ...) \
+	({ \
+		KeyfileReaderInfo *_info = (arg_info); \
+		\
+		if (_info->handler) { \
+			_handle_warn (_info, (arg_property_name), (arg_severity), \
+			              g_strdup_printf (__VA_ARGS__)); \
+		} \
+		_info->error == NULL; \
+	})
+
+/* Some setting properties also contain setting names, such as
+ * NMSettingConnection's 'type' property (which specifies the base type of the
+ * connection, e.g. ethernet or wifi) or 'slave-type' (specifies type of slave
+ * connection, e.g. bond or bridge). This function handles translating those
+ * properties' values to the real setting name if they are an alias.
+ */
+static void
+setting_alias_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	char *s;
+	const char *key_setting_name;
+
+	s = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
+	if (s) {
+		key_setting_name = nm_keyfile_plugin_get_setting_name_for_alias (s);
+		g_object_set (G_OBJECT (setting),
+		              key, key_setting_name ? key_setting_name : s,
+		              NULL);
+		g_free (s);
+	}
+}
+
+static void
+read_array_of_uint (GKeyFile *file,
+                    NMSetting *setting,
+                    const char *key)
+{
+	GArray *array = NULL;
+	gsize length;
+	int i;
+	gint *tmp;
+
+	tmp = nm_keyfile_plugin_kf_get_integer_list (file, nm_setting_get_name (setting), key, &length, NULL);
+	array = g_array_sized_new (FALSE, FALSE, sizeof (guint32), length);
+
+	for (i = 0; i < length; i++)
+		g_array_append_val (array, tmp[i]);
+
+	g_object_set (setting, key, array, NULL);
+	g_array_unref (array);
+}
+
+static gboolean
+get_one_int (KeyfileReaderInfo *info, const char *property_name, const char *str, guint32 max_val, guint32 *out)
+{
+	long tmp;
+	char *endptr;
+
+	g_return_val_if_fail (!info == !property_name, FALSE);
+
+	if (!str || !str[0]) {
+		if (property_name)
+			handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("ignoring missing number"));
+		return FALSE;
+	}
+
+	errno = 0;
+	tmp = strtol (str, &endptr, 10);
+	if (errno || (tmp < 0) || (tmp > max_val) || *endptr != 0) {
+		if (property_name)
+			handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("ignoring invalid number '%s'"),
+			            str);
+		return FALSE;
+	}
+
+	*out = (guint32) tmp;
+	return TRUE;
+}
+
+static gpointer
+build_address (KeyfileReaderInfo *info, int family, const char *address_str, guint32 plen, const char *property_name)
+{
+	NMIPAddress *addr;
+	GError *error = NULL;
+
+	g_return_val_if_fail (address_str, NULL);
+
+	addr = nm_ip_address_new (family, address_str, plen, &error);
+	if (!addr) {
+		handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("ignoring invalid %s address: %s"),
+		            family == AF_INET ? "IPv4" : "IPv6", error->message);
+		g_error_free (error);
+	}
+
+	return addr;
+}
+
+static gpointer
+build_route (KeyfileReaderInfo *info,
+             const char *property_name,
+             int family,
+             const char *dest_str, guint32 plen,
+             const char *gateway_str, const char *metric_str)
+{
+	NMIPRoute *route;
+	guint32 metric = 0;
+	GError *error = NULL;
+
+	g_return_val_if_fail (plen, NULL);
+	g_return_val_if_fail (dest_str, NULL);
+
+	/* Next hop */
+	if (gateway_str && gateway_str[0]) {
+		if (!nm_utils_ipaddr_valid (family, gateway_str)) {
+			/* Try workaround for routes written by broken keyfile writer.
+			 * Due to bug bgo#719851, an older version of writer would have
+			 * written "a:b:c:d::/plen,metric" if the gateway was ::, instead
+			 * of "a:b:c:d::/plen,,metric" or "a:b:c:d::/plen,::,metric"
+			 * Try workaround by interpreting gateway_str as metric to accept such
+			 * invalid routes. This broken syntax should not be not officially
+			 * supported.
+			 **/
+			if (   family == AF_INET6
+			    && !metric_str
+			    && get_one_int (NULL, NULL, gateway_str, G_MAXUINT32, &metric))
+				gateway_str = NULL;
+			else {
+				if (!info->error) {
+					handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+					             _("ignoring invalid gateway '%s' for %s route"),
+					             gateway_str, family == AF_INET ? "IPv4" : "IPv6");
+				}
+				return NULL;
+			}
+		}
+	} else
+		gateway_str = NULL;
+
+	/* parse metric, default to 0 */
+	if (metric_str) {
+		if (!get_one_int (info, property_name, metric_str, G_MAXUINT32, &metric))
+			return NULL;
+	}
+
+	route = nm_ip_route_new (family, dest_str, plen, gateway_str,
+	                         metric ? (gint64) metric : -1,
+	                         &error);
+	if (!route) {
+		handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("ignoring invalid %s route: %s"),
+		             family == AF_INET ? "IPv4" : "IPv6",
+		             error->message);
+		g_error_free (error);
+	}
+
+	return route;
+}
+
+/* On success, returns pointer to the zero-terminated field (original @current).
+ * The @current * pointer target is set to point to the rest of the input
+ * or %NULL if there is no more input. Sets error to %NULL for convenience.
+ *
+ * On failure, returns %NULL (unspecified). The @current pointer target is
+ * resets to its original value to allow skipping fields. The @error target
+ * is set to the character that breaks the parsing or %NULL if @current was %NULL.
+ *
+ * When @current target is %NULL, gracefully fail returning %NULL while
+ * leaving the @current target %NULL end setting @error to %NULL;
+ */
+static char *
+read_field (char **current, char **error, const char *characters, const char *delimiters)
+{
+	char *start;
+
+	g_return_val_if_fail (current, NULL);
+	g_return_val_if_fail (error, NULL);
+	g_return_val_if_fail (characters, NULL);
+	g_return_val_if_fail (delimiters, NULL);
+
+	*error = NULL;
+
+	if (!*current) {
+		/* graceful failure, leave '*current' NULL */
+		return NULL;
+	}
+
+	/* fail on empty input */
+	if (!**current)
+		return NULL;
+
+	/* remember beginning of input */
+	start = *current;
+
+	while (**current && strchr (characters, **current))
+		(*current)++;
+	if (**current)
+		if (strchr (delimiters, **current)) {
+			/* success, more data available */
+			*(*current)++ = '\0';
+			return start;
+		} else {
+			/* error, bad character */
+			*error = *current;
+			*current = start;
+			return NULL;
+		}
+	else {
+		/* success, end of input */
+		*current = NULL;
+		return start;
+	}
+}
+
+#define IP_ADDRESS_CHARS "0123456789abcdefABCDEF:.%"
+#define DIGITS "0123456789"
+#define DELIMITERS "/;,"
+
+
+/* The following IPv4 and IPv6 address formats are supported:
+ *
+ * address (DEPRECATED)
+ * address/plen
+ * address/gateway (DEPRECATED)
+ * address/plen,gateway
+ *
+ * The following IPv4 and IPv6 route formats are supported:
+ *
+ * address/plen (NETWORK dev DEVICE)
+ * address/plen,gateway (NETWORK via GATEWAY dev DEVICE)
+ * address/plen,,metric (NETWORK dev DEVICE metric METRIC)
+ * address/plen,gateway,metric (NETWORK via GATEWAY dev DEVICE metric METRIC)
+ *
+ * For backward, forward and sideward compatibility, slash (/),
+ * semicolon (;) and comma (,) are interchangable. The choice of
+ * separator in the above examples is therefore not significant.
+ *
+ * Leaving out the prefix length is discouraged and DEPRECATED. The
+ * default value of IPv6 prefix length was 64 and has not been
+ * changed. The default for IPv4 is now 24, which is the closest
+ * IPv4 equivalent. These defaults may just as well be changed to
+ * match the iproute2 defaults (32 for IPv4 and 128 for IPv6).
+ */
+static gpointer
+read_one_ip_address_or_route (KeyfileReaderInfo *info,
+                              const char *property_name,
+                              const char *setting_name,
+                              const char *key_name,
+                              gboolean ipv6,
+                              gboolean route,
+                              char **out_gateway,
+                              NMSetting *setting)
+{
+	guint32 plen = G_MAXUINT32;
+	gpointer result;
+	char *address_str, *plen_str, *gateway_str, *metric_str, *current, *error;
+	gs_free char *value = NULL, *value_orig = NULL;
+
+#define VALUE_ORIG()   (value_orig ? value_orig : (value_orig = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key_name, NULL)))
+
+	current = value = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key_name, NULL);
+	if (!value)
+		return NULL;
+
+	/* get address field */
+	address_str = read_field (¤t, &error, IP_ADDRESS_CHARS, DELIMITERS);
+	if (error) {
+		handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("unexpected character '%c' for address %s: '%s' (position %td)"),
+		             *error, key_name, VALUE_ORIG (), error - current);
+		return NULL;
+	}
+	/* get prefix length field (skippable) */
+	plen_str = read_field (¤t, &error, DIGITS, DELIMITERS);
+	/* get gateway field */
+	gateway_str = read_field (¤t, &error, IP_ADDRESS_CHARS, DELIMITERS);
+	if (error) {
+		handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("unexpected character '%c' for %s: '%s' (position %td)"),
+		             *error, key_name, VALUE_ORIG (), error - current);
+		return NULL;
+	}
+	/* for routes, get metric */
+	if (route) {
+		metric_str = read_field (¤t, &error, DIGITS, DELIMITERS);
+		if (error) {
+			handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("unexpected character '%c' in prefix length for %s: '%s' (position %td)"),
+			             *error, key_name, VALUE_ORIG (), error - current);
+			return NULL;
+		}
+	} else
+		metric_str = NULL;
+	if (current) {
+		/* there is still some data */
+		if (*current) {
+			/* another field follows */
+			handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("garbage at the end of value %s: '%s'"),
+			             key_name, VALUE_ORIG ());
+			return NULL;
+		} else {
+			/* semicolon at the end of input */
+			if (!handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_INFO,
+			                  _("deprecated semicolon at the end of value %s: '%s'"),
+			                  key_name, VALUE_ORIG ()))
+				return NULL;
+		}
+	}
+
+#define DEFAULT_PREFIX(for_route, for_ipv6) ( (for_route) ? ( (for_ipv6) ? 128 : 24 ) : ( (for_ipv6) ? 64 : 24 ) )
+
+	/* parse plen, fallback to defaults */
+	if (plen_str) {
+		if (!get_one_int (info, property_name, plen_str, ipv6 ? 128 : 32, &plen)
+		    || (route && plen == 0)) {
+			plen = DEFAULT_PREFIX (route, ipv6);
+			if (   info->error
+			    || !handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                     _("invalid prefix length for %s '%s', defaulting to %d"),
+			                     key_name, VALUE_ORIG (), plen))
+				return NULL;
+		}
+	} else {
+		plen = DEFAULT_PREFIX (route, ipv6);
+		if (!handle_warn (info, property_name, NM_KEYFILE_WARN_SEVERITY_WARN,
+		                  _("missing prefix length for %s '%s', defaulting to %d"),
+		                  key_name, VALUE_ORIG (), plen))
+			return NULL;
+	}
+
+	/* build the appropriate data structure for NetworkManager settings */
+	if (route) {
+		result = build_route (info, property_name,
+		                      ipv6 ? AF_INET6 : AF_INET,
+		                      address_str, plen, gateway_str, metric_str);
+	} else {
+		result = build_address (info, ipv6 ? AF_INET6 : AF_INET,
+		                        address_str, plen, property_name);
+		if (!result)
+			return NULL;
+		if (out_gateway && gateway_str)
+			*out_gateway = g_strdup (gateway_str);
+	}
+
+#undef VALUE_ORIG
+
+	return result;
+}
+
+static void
+ip_address_or_route_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	gboolean ipv6 = !strcmp (setting_name, "ipv6");
+	gboolean routes = !strcmp (key, "routes");
+	static const char *key_names_routes[] = { "route", "routes", NULL };
+	static const char *key_names_addresses[] = { "address", "addresses", NULL };
+	const char **key_names = routes ? key_names_routes : key_names_addresses;
+	char *gateway = NULL;
+	GPtrArray *list;
+	GDestroyNotify free_func;
+	int i;
+
+	if (routes)
+		free_func = (GDestroyNotify) nm_ip_route_unref;
+	else
+		free_func = (GDestroyNotify) nm_ip_address_unref;
+	list = g_ptr_array_new_with_free_func (free_func);
+
+	for (i = -1; i < 1000; i++) {
+		const char **key_basename;
+
+		for (key_basename = key_names; *key_basename; key_basename++) {
+			char *key_name;
+			gpointer item;
+
+			/* -1 means no suffix */
+			if (i >= 0)
+				key_name = g_strdup_printf ("%s%d", *key_basename, i);
+			else
+				key_name = g_strdup (*key_basename);
+
+			item = read_one_ip_address_or_route (info, key, setting_name, key_name, ipv6, routes,
+			                                     gateway ? NULL : &gateway, setting);
+			g_free (key_name);
+
+			if (info->error) {
+				g_ptr_array_unref (list);
+				g_free (gateway);
+				return;
+			}
+			if (item)
+				g_ptr_array_add (list, item);
+
+		}
+	}
+
+	if (list->len >= 1)
+		g_object_set (setting, key, list, NULL);
+
+	if (gateway) {
+		g_object_set (setting, "gateway", gateway, NULL);
+		g_free (gateway);
+	}
+
+	g_ptr_array_unref (list);
+}
+
+static void
+ip4_dns_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	GPtrArray *array;
+	gsize length;
+	char **list, **iter;
+	int ret;
+
+	list = nm_keyfile_plugin_kf_get_string_list (info->keyfile, setting_name, key, &length, NULL);
+	if (!list || !g_strv_length (list))
+		return;
+
+	array = g_ptr_array_sized_new (length + 1);
+	for (iter = list; *iter; iter++) {
+		guint32 addr;
+
+		ret = inet_pton (AF_INET, *iter, &addr);
+		if (ret <= 0) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("ignoring invalid DNS server IPv4 address '%s'"),
+			                  *iter)) {
+				g_ptr_array_unref (array);
+				g_strfreev (list);
+				return;
+			}
+			continue;
+		}
+
+		g_ptr_array_add (array, *iter);
+	}
+	g_ptr_array_add (array, NULL);
+
+	g_object_set (setting, key, array->pdata, NULL);
+	g_ptr_array_unref (array);
+	g_strfreev (list);
+}
+
+static void
+ip6_dns_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	GPtrArray *array = NULL;
+	gsize length;
+	char **list, **iter;
+	int ret;
+
+	list = nm_keyfile_plugin_kf_get_string_list (info->keyfile, setting_name, key, &length, NULL);
+	if (!list || !g_strv_length (list))
+		return;
+
+	array = g_ptr_array_sized_new (length + 1);
+
+	for (iter = list; *iter; iter++) {
+		struct in6_addr addr;
+
+		ret = inet_pton (AF_INET6, *iter, &addr);
+		if (ret <= 0) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("ignoring invalid DNS server IPv6 address '%s'"),
+			                  *iter)) {
+				g_ptr_array_unref (array);
+				g_strfreev (list);
+				return;
+			}
+			continue;
+		}
+
+		g_ptr_array_add (array, *iter);
+	}
+	g_ptr_array_add (array, NULL);
+
+	g_object_set (setting, key, array->pdata, NULL);
+	g_ptr_array_unref (array);
+	g_strfreev (list);
+}
+
+static void
+mac_address_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key, gsize enforce_length)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	char *tmp_string = NULL, *p, *mac_str;
+	gint *tmp_list;
+	GByteArray *array = NULL;
+	gsize length;
+
+	p = tmp_string = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
+	if (tmp_string && tmp_string[0]) {
+		/* Look for enough ':' characters to signify a MAC address */
+		guint i = 0;
+
+		while (*p) {
+			if (*p == ':')
+				i++;
+			p++;
+		}
+
+		if (enforce_length == 0 || enforce_length == i+1) {
+			/* If we found enough it's probably a string-format MAC address */
+			array = g_byte_array_sized_new (i+1);
+			g_byte_array_set_size (array, i+1);
+			if (!nm_utils_hwaddr_aton (tmp_string, array->data, array->len)) {
+				g_byte_array_unref (array);
+				array = NULL;
+			}
+		}
+	}
+	g_free (tmp_string);
+
+	if (array == NULL) {
+		/* Old format; list of ints */
+		tmp_list = nm_keyfile_plugin_kf_get_integer_list (info->keyfile, setting_name, key, &length, NULL);
+		if (length > 0 && (enforce_length == 0 || enforce_length == length)) {
+			gsize i;
+
+			array = g_byte_array_sized_new (length);
+			for (i = 0; i < length; i++) {
+				int val = tmp_list[i];
+				const guint8 v = (guint8) (val & 0xFF);
+
+				if (val < 0 || val > 255) {
+					handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+					             _("ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"),
+					             val);
+					g_byte_array_free (array, TRUE);
+					g_free (tmp_list);
+					return;
+				}
+				g_byte_array_append (array, &v, 1);
+			}
+		}
+		g_free (tmp_list);
+	}
+
+	if (!array) {
+		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("ignoring invalid MAC address"));
+		return;
+	}
+
+	mac_str = nm_utils_hwaddr_ntoa (array->data, array->len);
+	g_object_set (setting, key, mac_str, NULL);
+	g_free (mac_str);
+	g_byte_array_free (array, TRUE);
+}
+
+static void
+mac_address_parser_ETHER (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	mac_address_parser (info, setting, key, ETH_ALEN);
+}
+
+static void
+mac_address_parser_INFINIBAND (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	mac_address_parser (info, setting, key, INFINIBAND_ALEN);
+}
+
+static void
+read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
+{
+	char **keys, **iter;
+	char *value;
+	const char *setting_name = nm_setting_get_name (setting);
+
+	keys = nm_keyfile_plugin_kf_get_keys (file, setting_name, NULL, NULL);
+	if (!keys || !*keys)
+		return;
+
+	for (iter = keys; *iter; iter++) {
+		value = nm_keyfile_plugin_kf_get_string (file, setting_name, *iter, NULL);
+		if (!value)
+			continue;
+
+		if (NM_IS_SETTING_VPN (setting)) {
+			/* Add any item that's not a class property to the data hash */
+			if (!g_object_class_find_property (G_OBJECT_GET_CLASS (setting), *iter))
+				nm_setting_vpn_add_data_item (NM_SETTING_VPN (setting), *iter, value);
+		}
+		if (NM_IS_SETTING_BOND (setting)) {
+			if (strcmp (*iter, "interface-name"))
+				nm_setting_bond_add_option (NM_SETTING_BOND (setting), *iter, value);
+		}
+		g_free (value);
+	}
+	g_strfreev (keys);
+}
+
+static void
+unescape_semicolons (char *str)
+{
+	int i;
+	gsize len = strlen (str);
+
+	for (i = 0; i < len; i++) {
+		if (str[i] == '\\' && str[i+1] == ';') {
+			memmove(str + i, str + i + 1, len - (i + 1));
+			len--;
+		}
+		str[len] = '\0';
+	}
+}
+
+static GBytes *
+get_bytes (KeyfileReaderInfo *info,
+           const char *setting_name,
+           const char *key,
+           gboolean zero_terminate,
+           gboolean unescape_semicolon)
+{
+	GByteArray *array = NULL;
+	char *tmp_string;
+	gint *tmp_list;
+	gsize length;
+	int i;
+
+	if (!nm_keyfile_plugin_kf_has_key (info->keyfile, setting_name, key, NULL))
+		return NULL;
+
+	/* New format: just a string
+	 * Old format: integer list; e.g. 11;25;38;
+	 */
+	tmp_string = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
+	if (tmp_string) {
+		GRegex *regex;
+		GMatchInfo *match_info;
+		const char *pattern = "^[[:space:]]*[[:digit:]]{1,3}[[:space:]]*;([[:space:]]*[[:digit:]]{1,3}[[:space:]]*;)*([[:space:]]*)?$";
+
+		regex = g_regex_new (pattern, 0, 0, NULL);
+		g_regex_match (regex, tmp_string, 0, &match_info);
+		if (!g_match_info_matches (match_info)) {
+			/* Handle as a simple string (ie, new format) */
+			if (unescape_semicolon)
+				unescape_semicolons (tmp_string);
+			length = strlen (tmp_string);
+			if (zero_terminate)
+				length++;
+			array = g_byte_array_sized_new (length);
+			g_byte_array_append (array, (guint8 *) tmp_string, length);
+		}
+		g_match_info_free (match_info);
+		g_regex_unref (regex);
+		g_free (tmp_string);
+	}
+
+	if (!array) {
+		gboolean already_warned = FALSE;
+
+		/* Old format; list of ints */
+		tmp_list = nm_keyfile_plugin_kf_get_integer_list (info->keyfile, setting_name, key, &length, NULL);
+		if (!tmp_list) {
+			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("ignoring invalid binary property"));
+			return NULL;
+		}
+		array = g_byte_array_sized_new (length);
+		for (i = 0; i < length; i++) {
+			int val = tmp_list[i];
+			unsigned char v = (unsigned char) (val & 0xFF);
+
+			if (val < 0 || val > 255) {
+				if (   !already_warned
+				    && !handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+				                     _("ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"),
+				                     val)) {
+					g_free (tmp_list);
+					g_byte_array_free (array, TRUE);
+					return NULL;
+				}
+				already_warned = TRUE;
+			} else
+				g_byte_array_append (array, (const unsigned char *) &v, sizeof (v));
+		}
+		g_free (tmp_list);
+	}
+
+	if (array->len == 0) {
+		g_byte_array_free (array, TRUE);
+		return NULL;
+	} else
+		return g_byte_array_free_to_bytes (array);
+}
+
+static void
+ssid_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	GBytes *bytes;
+
+	bytes = get_bytes (info, setting_name, key, FALSE, TRUE);
+	if (bytes) {
+		g_object_set (setting, key, bytes, NULL);
+		g_bytes_unref (bytes);
+	} else if (!info->error) {
+		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("ignoring invalid SSID"));
+	}
+}
+
+static void
+password_raw_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	GBytes *bytes;
+
+	bytes = get_bytes (info, setting_name, key, FALSE, TRUE);
+	if (bytes) {
+		g_object_set (setting, key, bytes, NULL);
+		g_bytes_unref (bytes);
+	} else if (!info->error) {
+		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("ignoring invalid raw password"));
+	}
+}
+
+static char *
+get_cert_path (const char *base_dir, const guint8 *cert_path, gsize cert_path_len)
+{
+	const char *base;
+	char *p = NULL, *path, *tmp;
+
+	g_return_val_if_fail (base_dir != NULL, NULL);
+	g_return_val_if_fail (cert_path != NULL, NULL);
+
+	base = path = g_malloc0 (cert_path_len + 1);
+	memcpy (path, cert_path, cert_path_len);
+
+	if (path[0] == '/')
+		return path;
+
+	p = strrchr (path, '/');
+	if (p)
+		base = p + 1;
+
+	tmp = g_build_path ("/", base_dir, base, NULL);
+	g_free (path);
+	return tmp;
+}
+
+static const char *certext[] = { ".pem", ".cert", ".crt", ".cer", ".p12", ".der", ".key" };
+
+static gboolean
+has_cert_ext (const char *path)
+{
+	int i;
+
+	for (i = 0; i < G_N_ELEMENTS (certext); i++) {
+		if (g_str_has_suffix (path, certext[i]))
+			return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
+handle_as_scheme (KeyfileReaderInfo *info, GBytes *bytes, NMSetting *setting, const char *key)
+{
+	const char *data;
+	gsize data_len, bin_len;
+
+	data = g_bytes_get_data (bytes, &data_len);
+
+	g_return_val_if_fail (data && data_len > 0, FALSE);
+
+	/* to be a scheme, @data must be a zero terminated string, which is counted by @data_len */
+	if (data[data_len - 1] != '\0')
+		return FALSE;
+	data_len--;
+
+	/* It's the PATH scheme, can just set plain data.
+	 * In this case, @data_len includes */
+	if (   data_len >= STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)
+	    && g_str_has_prefix (data, NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)) {
+		if (nm_setting_802_1x_check_cert_scheme (data, data_len + 1, NULL) == NM_SETTING_802_1X_CK_SCHEME_PATH) {
+			const char *path = &data[STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH)];
+			gs_free char *path_free = NULL;
+
+			if (path[0] != '/') {
+				/* we want to read absolute paths because we use keyfile as exchange
+				 * between different processes which might not have the same cwd. */
+				path = path_free = get_cert_path (info->base_dir, (const guint8 *) path,
+				                                  data_len - STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH));
+			}
+
+			g_object_set (setting, key, bytes, NULL);
+			if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
+				handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_INFO_MISSING_FILE,
+				             _("certificate or key file '%s' does not exist"),
+				             path);
+			}
+		} else {
+			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("invalid key/cert value path \"%s\""), data);
+		}
+		return TRUE;
+	}
+	if (   data_len > STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB)
+	    && g_str_has_prefix (data, NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB)) {
+		const char *cdata = data + STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB);
+		guchar *bin;
+		GBytes *bytes2;
+		gsize i;
+		gboolean valid_base64;
+
+		data_len -= STRLEN (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB);
+
+		/* Let's be strict here. We expect valid base64, no funny stuff!!
+		 * We didn't write such invalid data ourselfes and refuse to read it as blob. */
+		if ((valid_base64 = (data_len % 4 == 0))) {
+			for (i = 0; i < data_len; i++) {
+				char c = cdata[i];
+
+				if (!(   (c >= 'a' && c <= 'z')
+				      || (c >= 'A' && c <= 'Z')
+				      || (c >= '0' && c <= '9')
+				      || (c == '+' || c == '/'))) {
+					if (c != '=' || i < data_len - 2)
+						valid_base64 = FALSE;
+					else {
+						for (; i < data_len; i++) {
+							if (cdata[i] != '=')
+								valid_base64 = FALSE;
+						}
+					}
+					break;
+				}
+			}
+		}
+		if (!valid_base64) {
+			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("invalid key/cert value data:;base64, is not base64"));
+			return TRUE;
+		}
+
+		bin = g_base64_decode (cdata, &bin_len);
+
+		g_return_val_if_fail (bin_len > 0, FALSE);
+		if (nm_setting_802_1x_check_cert_scheme (bin, bin_len, NULL) != NM_SETTING_802_1X_CK_SCHEME_BLOB) {
+			/* The blob probably starts with "file://". Setting the cert data will confuse NMSetting8021x.
+			 * In fact this is a limitation of NMSetting8021x which does not support setting blobs that start
+			 * with file://. Just warn and return TRUE to signal that we ~handled~ the setting. */
+			g_free (bin);
+			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("invalid key/cert value data:;base64,file://"));
+		} else {
+			bytes2 = g_bytes_new_take (bin, bin_len);
+			g_object_set (setting, key, bytes2, NULL);
+			g_bytes_unref (bytes2);
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
+char *
+nm_keyfile_detect_unqualified_path_scheme (const char *base_dir,
+                                           gconstpointer pdata,
+                                           gsize data_len,
+                                           gboolean consider_exists,
+                                           gboolean *out_exists)
+{
+	const char *data = pdata;
+	gboolean exists = FALSE;
+	gboolean success = FALSE;
+	gsize validate_len;
+	char *path;
+	GByteArray *tmp;
+
+	g_return_val_if_fail (base_dir && base_dir[0] == '/', NULL);
+
+	if (!pdata)
+		return NULL;
+	if (data_len == -1)
+		data_len = strlen (data);
+	if (data_len > 500 || data_len < 1)
+		return NULL;
+
+	/* If there's a trailing zero tell g_utf8_validate() to validate until the zero */
+	if (data[data_len - 1] == '\0') {
+		/* setting it to -1, would mean we accept data to contain NUL characters before the
+		 * end. Don't accept any NUL in [0 .. data_len-1[ . */
+		validate_len = data_len - 1;
+	} else
+		validate_len = data_len;
+	if (   validate_len == 0
+	    || g_utf8_validate ((const char *) data, validate_len, NULL) == FALSE)
+		 return NULL;
+
+	/* Might be a bare path without the file:// prefix; in that case
+	 * if it's an absolute path, use that, otherwise treat it as a
+	 * relative path to the current directory.
+	 */
+
+	path = get_cert_path (base_dir, (const guint8 *) data, data_len);
+	if (   !memchr (data, '/', data_len)
+	    && !has_cert_ext (path)) {
+		if (!consider_exists)
+			goto out;
+		exists = g_file_test (path, G_FILE_TEST_EXISTS);
+		if (!exists)
+			goto out;
+	} else if (out_exists)
+		exists = g_file_test (path, G_FILE_TEST_EXISTS);
+
+	/* Construct the proper value as required for the PATH scheme */
+	tmp = g_byte_array_sized_new (strlen (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH) + strlen (path) + 1);
+	g_byte_array_append (tmp, (const guint8 *) NM_KEYFILE_CERT_SCHEME_PREFIX_PATH, strlen (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH));
+	g_byte_array_append (tmp, (const guint8 *) path, strlen (path) + 1);
+	if (nm_setting_802_1x_check_cert_scheme (tmp->data, tmp->len, NULL) == NM_SETTING_802_1X_CK_SCHEME_PATH) {
+		g_free (path);
+		path = (char *) g_byte_array_free (tmp, FALSE);
+		/* when returning TRUE, we must also be sure that @data_len does not look like
+		 * the deprecated format of list of integers. With this implementation that is the
+		 * case, as long as @consider_exists is FALSE. */
+		success = TRUE;
+	} else
+		g_byte_array_unref (tmp);
+
+out:
+	if (!success) {
+		g_free (path);
+		return NULL;
+	}
+	if (out_exists)
+		*out_exists = exists;
+	return path;
+}
+
+static gboolean
+handle_as_path (KeyfileReaderInfo *info,
+                GBytes *bytes,
+                NMSetting *setting,
+                const char *key)
+{
+	const guint8 *data;
+	gsize data_len;
+	char *path;
+	gboolean exists = FALSE;
+	GBytes *val;
+
+	data = g_bytes_get_data (bytes, &data_len);
+
+	path = nm_keyfile_detect_unqualified_path_scheme (info->base_dir, data, data_len, TRUE, &exists);
+	if (!path)
+		return FALSE;
+
+	/* Construct the proper value as required for the PATH scheme */
+	val = g_bytes_new_take (path, strlen (path) + 1);
+	g_object_set (setting, key, val, NULL);
+
+	/* Warn if the certificate didn't exist */
+	if (!exists) {
+		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_INFO_MISSING_FILE,
+		             _("certificate or key file '%s' does not exist"),
+		             path);
+	}
+	g_bytes_unref (val);
+
+	return TRUE;
+}
+
+static void
+cert_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	gs_unref_bytes GBytes *bytes = NULL;
+	gsize bin_len;
+	const char *bin;
+
+	bytes = get_bytes (info, setting_name, key, TRUE, FALSE);
+	if (bytes) {
+		/* Try as a path + scheme (ie, starts with "file://") */
+		if (handle_as_scheme (info, bytes, setting, key))
+			return;
+		if (info->error)
+			return;
+
+		/* If not, it might be a plain path */
+		if (handle_as_path (info, bytes, setting, key))
+			return;
+		if (info->error)
+			return;
+
+		bin = g_bytes_get_data (bytes, &bin_len);
+		if (nm_setting_802_1x_check_cert_scheme (bin, bin_len, NULL) != NM_SETTING_802_1X_CK_SCHEME_BLOB) {
+			/* The blob probably starts with "file://" but contains invalid characters for a path.
+			 * Setting the cert data will confuse NMSetting8021x.
+			 * In fact, NMSetting8021x does not support setting such binary data, so just warn and
+			 * continue. */
+			handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			             _("invalid key/cert value is not a valid blob"));
+		} else
+			g_object_set (setting, key, bytes, NULL);
+	} else if (!info->error) {
+		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("invalid key/cert value"));
+	}
+}
+
+static void
+parity_parser (KeyfileReaderInfo *info, NMSetting *setting, const char *key)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	NMSettingSerialParity parity;
+	int int_val;
+	gs_free char *str_val = NULL;
+
+	/* Keyfile traditionally stored this as the ASCII value for 'E', 'o', or 'n'.
+	 * We now accept either that or the (case-insensitive) character itself (but
+	 * still always write it the old way, for backward compatibility).
+	 */
+	int_val = nm_keyfile_plugin_kf_get_integer (info->keyfile, setting_name, key, NULL);
+	if (!int_val) {
+		str_val = nm_keyfile_plugin_kf_get_string (info->keyfile, setting_name, key, NULL);
+		if (str_val) {
+			if (str_val[0] && !str_val[1])
+				int_val = str_val[0];
+			else {
+				/* This will hit the warning below */
+				int_val = 'X';
+			}
+		}
+	}
+
+	if (!int_val)
+		return;
+
+	switch (int_val) {
+	case 'E':
+	case 'e':
+		parity = NM_SETTING_SERIAL_PARITY_EVEN;
+		break;
+	case 'O':
+	case 'o':
+		parity = NM_SETTING_SERIAL_PARITY_ODD;
+		break;
+	case 'N':
+	case 'n':
+		parity = NM_SETTING_SERIAL_PARITY_NONE;
+		break;
+	default:
+		handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("invalid parity value '%s'"),
+		             str_val ? str_val : "");
+		return;
+	}
+
+	g_object_set (setting, key, parity, NULL);
+}
+
+typedef struct {
+	const char *setting_name;
+	const char *key;
+	gboolean check_for_key;
+	void (*parser) (KeyfileReaderInfo *info, NMSetting *setting, const char *key);
+} KeyParser;
+
+/* A table of keys that require further parsing/conversion because they are
+ * stored in a format that can't be automatically read using the key's type.
+ * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are
+ * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored
+ * in struct in6_addr internally, but as string in keyfiles.
+ */
+static KeyParser key_parsers[] = {
+	{ NM_SETTING_CONNECTION_SETTING_NAME,
+	  NM_SETTING_CONNECTION_TYPE,
+	  TRUE,
+	  setting_alias_parser },
+	{ NM_SETTING_BRIDGE_SETTING_NAME,
+	  NM_SETTING_BRIDGE_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ADDRESSES,
+	  FALSE,
+	  ip_address_or_route_parser },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ADDRESSES,
+	  FALSE,
+	  ip_address_or_route_parser },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ROUTES,
+	  FALSE,
+	  ip_address_or_route_parser },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ROUTES,
+	  FALSE,
+	  ip_address_or_route_parser },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_DNS,
+	  FALSE,
+	  ip4_dns_parser },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_DNS,
+	  FALSE,
+	  ip6_dns_parser },
+	{ NM_SETTING_WIRED_SETTING_NAME,
+	  NM_SETTING_WIRED_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_WIRED_SETTING_NAME,
+	  NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_WIRELESS_SETTING_NAME,
+	  NM_SETTING_WIRELESS_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_WIRELESS_SETTING_NAME,
+	  NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_WIRELESS_SETTING_NAME,
+	  NM_SETTING_WIRELESS_BSSID,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_BLUETOOTH_SETTING_NAME,
+	  NM_SETTING_BLUETOOTH_BDADDR,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_INFINIBAND_SETTING_NAME,
+	  NM_SETTING_INFINIBAND_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_INFINIBAND },
+	{ NM_SETTING_WIMAX_SETTING_NAME,
+	  NM_SETTING_WIMAX_MAC_ADDRESS,
+	  TRUE,
+	  mac_address_parser_ETHER },
+	{ NM_SETTING_WIRELESS_SETTING_NAME,
+	  NM_SETTING_WIRELESS_SSID,
+	  TRUE,
+	  ssid_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PASSWORD_RAW,
+	  TRUE,
+	  password_raw_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_CA_CERT,
+	  TRUE,
+	  cert_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_CLIENT_CERT,
+	  TRUE,
+	  cert_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PRIVATE_KEY,
+	  TRUE,
+	  cert_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PHASE2_CA_CERT,
+	  TRUE,
+	  cert_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
+	  TRUE,
+	  cert_parser },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
+	  TRUE,
+	  cert_parser },
+	{ NM_SETTING_SERIAL_SETTING_NAME,
+	  NM_SETTING_SERIAL_PARITY,
+	  TRUE,
+	  parity_parser },
+	{ NULL, NULL, FALSE }
+};
+
+static void
+read_one_setting_value (NMSetting *setting,
+                        const char *key,
+                        const GValue *value,
+                        GParamFlags flags,
+                        gpointer user_data)
+{
+	KeyfileReaderInfo *info = user_data;
+	GKeyFile *keyfile = info->keyfile;
+	const char *setting_name;
+	int errsv;
+	GType type;
+	gs_free_error GError *err = NULL;
+	gboolean check_for_key = TRUE;
+	KeyParser *parser = &key_parsers[0];
+
+	if (info->error)
+		return;
+
+	/* Property is not writable */
+	if (!(flags & G_PARAM_WRITABLE))
+		return;
+
+	/* Setting name gets picked up from the keyfile's section name instead */
+	if (!strcmp (key, NM_SETTING_NAME))
+		return;
+
+	/* Don't read the NMSettingConnection object's 'read-only' property */
+	if (   NM_IS_SETTING_CONNECTION (setting)
+	    && !strcmp (key, NM_SETTING_CONNECTION_READ_ONLY))
+		return;
+
+	setting_name = nm_setting_get_name (setting);
+
+	/* Look through the list of handlers for non-standard format key values */
+	while (parser->setting_name) {
+		if (!strcmp (parser->setting_name, setting_name) && !strcmp (parser->key, key)) {
+			check_for_key = parser->check_for_key;
+			break;
+		}
+		parser++;
+	}
+
+	/* VPN properties don't have the exact key name */
+	if (NM_IS_SETTING_VPN (setting))
+		check_for_key = FALSE;
+
+	/* Bonding 'options' don't have the exact key name. The options are right under [bond] group. */
+	if (NM_IS_SETTING_BOND (setting))
+		check_for_key = FALSE;
+
+	/* Check for the exact key in the GKeyFile if required.  Most setting
+	 * properties map 1:1 to a key in the GKeyFile, but for those properties
+	 * like IP addresses and routes where more than one value is actually
+	 * encoded by the setting property, this won't be true.
+	 */
+	if (check_for_key && !nm_keyfile_plugin_kf_has_key (keyfile, setting_name, key, &err)) {
+		/* Key doesn't exist or an error ocurred, thus nothing to do. */
+		if (err) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("error loading setting value: %s"),
+			                  err->message))
+				goto out_error;
+		}
+		return;
+	}
+
+	/* If there's a custom parser for this key, handle that before the generic
+	 * parsers below.
+	 */
+	if (parser->setting_name) {
+		(*parser->parser) (info, setting, key);
+		return;
+	}
+
+	type = G_VALUE_TYPE (value);
+
+	if (type == G_TYPE_STRING) {
+		char *str_val;
+
+		str_val = nm_keyfile_plugin_kf_get_string (keyfile, setting_name, key, NULL);
+		g_object_set (setting, key, str_val, NULL);
+		g_free (str_val);
+	} else if (type == G_TYPE_UINT) {
+		int int_val;
+
+		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, NULL);
+		if (int_val < 0) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("invalid negative value (%i)"),
+			                  int_val))
+				goto out_error;
+		}
+		g_object_set (setting, key, int_val, NULL);
+	} else if (type == G_TYPE_INT) {
+		int int_val;
+
+		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, NULL);
+		g_object_set (setting, key, int_val, NULL);
+	} else if (type == G_TYPE_BOOLEAN) {
+		gboolean bool_val;
+
+		bool_val = nm_keyfile_plugin_kf_get_boolean (keyfile, setting_name, key, NULL);
+		g_object_set (setting, key, bool_val, NULL);
+	} else if (type == G_TYPE_CHAR) {
+		int int_val;
+
+		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, NULL);
+		if (int_val < G_MININT8 || int_val > G_MAXINT8) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("invalid char value (%i)"),
+			                  int_val))
+				goto out_error;
+		}
+
+		g_object_set (setting, key, int_val, NULL);
+	} else if (type == G_TYPE_UINT64) {
+		char *tmp_str;
+		guint64 uint_val;
+
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, NULL);
+		uint_val = g_ascii_strtoull (tmp_str, NULL, 10);
+		g_free (tmp_str);
+		g_object_set (setting, key, uint_val, NULL);
+	} else if (type == G_TYPE_INT64) {
+		gs_free char *tmp_str = NULL;
+		gint64 int_val;
+
+		tmp_str = nm_keyfile_plugin_kf_get_value (keyfile, setting_name, key, NULL);
+		int_val = _nm_utils_ascii_str_to_int64 (tmp_str, 10, G_MININT64, G_MAXINT64, 0);
+		errsv = errno;
+		if (errsv) {
+			if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+			                  _("invalid int64 value (%s)"),
+			                  tmp_str))
+				goto out_error;
+		} else
+			g_object_set (setting, key, int_val, NULL);
+	} else if (type == G_TYPE_BYTES) {
+		gint *tmp;
+		GByteArray *array;
+		GBytes *bytes;
+		gsize length;
+		int i;
+		gboolean already_warned = FALSE;
+
+		tmp = nm_keyfile_plugin_kf_get_integer_list (keyfile, setting_name, key, &length, NULL);
+
+		array = g_byte_array_sized_new (length);
+		for (i = 0; i < length; i++) {
+			int val = tmp[i];
+			unsigned char v = (unsigned char) (val & 0xFF);
+
+			if (val < 0 || val > 255) {
+				if (   !already_warned
+				    && !handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+				                     _("ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"),
+				                     val)) {
+					g_byte_array_unref (array);
+					g_free (tmp);
+					goto out_error;
+				}
+				already_warned = TRUE;
+			} else
+				g_byte_array_append (array, (const unsigned char *) &v, sizeof (v));
+		}
+
+		bytes = g_byte_array_free_to_bytes (array);
+		g_object_set (setting, key, bytes, NULL);
+		g_bytes_unref (bytes);
+		g_free (tmp);
+	} else if (type == G_TYPE_STRV) {
+		gchar **sa;
+		gsize length;
+
+		sa = nm_keyfile_plugin_kf_get_string_list (keyfile, setting_name, key, &length, NULL);
+		g_object_set (setting, key, sa, NULL);
+		g_strfreev (sa);
+	} else if (type == G_TYPE_HASH_TABLE) {
+		read_hash_of_string (keyfile, setting, key);
+	} else if (type == G_TYPE_ARRAY) {
+		read_array_of_uint (keyfile, setting, key);
+	} else if (G_VALUE_HOLDS_FLAGS (value)) {
+		guint64 uint_val;
+
+		/* Flags are guint but GKeyFile has no uint reader, just uint64 */
+		uint_val = nm_keyfile_plugin_kf_get_uint64 (keyfile, setting_name, key, &err);
+		if (!err) {
+			if (uint_val <= G_MAXUINT)
+				g_object_set (setting, key, (guint) uint_val, NULL);
+			else {
+				if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+				                  _("too large FLAGS property '%s' (%llu)"),
+				                  G_VALUE_TYPE_NAME (value), (long long unsigned) uint_val))
+					goto out_error;
+			}
+		}
+	} else if (G_VALUE_HOLDS_ENUM (value)) {
+		gint int_val;
+
+		int_val = nm_keyfile_plugin_kf_get_integer (keyfile, setting_name, key, &err);
+		if (!err)
+			g_object_set (setting, key, (gint) int_val, NULL);
+	} else {
+		if (!handle_warn (info, key, NM_KEYFILE_WARN_SEVERITY_WARN,
+		                 _("unhandled setting property type '%s'"),
+		                 G_VALUE_TYPE_NAME (value)))
+			goto out_error;
+	}
+out_error:
+	return;
+}
+
+static NMSetting *
+read_setting (KeyfileReaderInfo *info)
+{
+	const char *alias;
+	GType type;
+
+	alias = nm_keyfile_plugin_get_setting_name_for_alias (info->group);
+	if (!alias)
+		alias = info->group;
+
+	type = nm_setting_lookup_type (alias);
+	if (type) {
+		NMSetting *setting = g_object_new (type, NULL);
+
+		info->setting = setting;
+		nm_setting_enumerate_values (setting, read_one_setting_value, info);
+		info->setting = NULL;
+		if (!info->error)
+			return setting;
+
+		g_object_unref (setting);
+	} else {
+		handle_warn (info, NULL, NM_KEYFILE_WARN_SEVERITY_WARN,
+		             _("invalid setting name '%s'"), info->group);
+	}
+
+	return NULL;
+}
+
+static void
+read_vpn_secrets (KeyfileReaderInfo *info, NMSettingVpn *s_vpn)
+{
+	char **keys, **iter;
+
+	keys = nm_keyfile_plugin_kf_get_keys (info->keyfile, VPN_SECRETS_GROUP, NULL, NULL);
+	for (iter = keys; *iter; iter++) {
+		char *secret;
+
+		secret = nm_keyfile_plugin_kf_get_string (info->keyfile, VPN_SECRETS_GROUP, *iter, NULL);
+		if (secret) {
+			nm_setting_vpn_add_secret (s_vpn, *iter, secret);
+			g_free (secret);
+		}
+	}
+	g_strfreev (keys);
+}
+
+/**
+ * nm_keyfile_read:
+ * @keyfile: the keyfile from which to create the connection
+ * @keyfile_name: keyfile allows missing connection id and uuid
+ *   and NetworkManager will create those when reading a connection
+ *   from file. By providing a filename you can reproduce that behavior,
+ *   but of course, it can only recreate the same UUID if you provide the
+ *   same filename as NetworkManager core daemon would.
+ *   @keyfile_name has only a relevance for setting the id or uuid if it
+ *   is missing and as fallback for @base_dir.
+ * @base_dir: when reading certificates from files with relative name,
+ *   the relative path is made absolute using @base_dir.
+ *   If @base_dir is missing, first try to get the pathname from @keyfile_name
+ *   (if it is given as absolute path). As last, fallback to the current path.
+ * @handler: read handler
+ * @user_data: user data for read handler
+ * @error: error
+ *
+ * Tries to create a NMConnection from a keyfile. The resulting keyfile is
+ * not normalized and might not even verify.
+ *
+ * Returns: (transfer full): on success, returns the created connection.
+ */
+NMConnection *
+nm_keyfile_read (GKeyFile *keyfile,
+                 const char *keyfile_name,
+                 const char *base_dir,
+                 NMKeyfileReadHandler handler,
+                 void *user_data,
+                 GError **error)
+{
+	NMConnection *connection = NULL;
+	NMSettingConnection *s_con;
+	NMSetting *setting;
+	gchar **groups;
+	gsize length;
+	int i;
+	gboolean vpn_secrets = FALSE;
+	KeyfileReaderInfo info = { 0 };
+	gs_free char *base_dir_free = NULL;
+
+	g_return_val_if_fail (keyfile, NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	if (!base_dir) {
+		/* basedir is not given. Prefer it from the keyfile_name */
+		if (keyfile_name && keyfile_name[0] == '/') {
+			base_dir = base_dir_free = g_path_get_dirname (keyfile_name);
+		} else {
+			/* if keyfile is not given or not an absolute path, fallback
+			 * to current working directory. */
+			base_dir = base_dir_free = g_get_current_dir ();
+		}
+	} else
+		g_return_val_if_fail ("/", NULL);
+
+	connection = nm_simple_connection_new ();
+
+	info.connection = connection;
+	info.keyfile = (GKeyFile *) keyfile;
+	info.base_dir = base_dir;
+	info.handler = handler;
+	info.user_data = user_data;
+
+	groups = g_key_file_get_groups (keyfile, &length);
+	if (!groups)
+		length = 0;
+	for (i = 0; i < length; i++) {
+		/* Only read out secrets when needed */
+		if (!strcmp (groups[i], VPN_SECRETS_GROUP)) {
+			vpn_secrets = TRUE;
+			continue;
+		}
+
+		info.group = groups[i];
+		setting = read_setting (&info);
+		info.group = NULL;
+		if (info.error)
+			goto out_error;
+		if (setting)
+			nm_connection_add_setting (connection, setting);
+	}
+	g_strfreev (groups);
+
+	s_con = nm_connection_get_setting_connection (connection);
+	if (!s_con) {
+		s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
+		nm_connection_add_setting (connection, NM_SETTING (s_con));
+	}
+
+	/* Make sure that we have 'id' even if not explictly specified in the keyfile */
+	if (   keyfile_name
+	    && !nm_setting_connection_get_id (s_con)) {
+		char *base_name;
+
+		base_name = g_path_get_basename (keyfile_name);
+		g_object_set (s_con, NM_SETTING_CONNECTION_ID, base_name, NULL);
+		g_free (base_name);
+	}
+
+	/* Make sure that we have 'uuid' even if not explictly specified in the keyfile */
+	if (   keyfile_name
+	    && !nm_setting_connection_get_uuid (s_con)) {
+		char *hashed_uuid;
+
+		hashed_uuid = _nm_utils_uuid_generate_from_strings ("keyfile", keyfile_name, NULL);
+		g_object_set (s_con, NM_SETTING_CONNECTION_UUID, hashed_uuid, NULL);
+		g_free (hashed_uuid);
+	}
+
+	/* Make sure that we have 'interface-name' even if it was specified in the
+	 * "wrong" (ie, deprecated) group.
+	 */
+	if (   !nm_setting_connection_get_interface_name (s_con)
+	    && nm_setting_connection_get_connection_type (s_con)) {
+		char *interface_name;
+
+		interface_name = g_key_file_get_string (keyfile,
+		                                        nm_setting_connection_get_connection_type (s_con),
+		                                        "interface-name",
+		                                        NULL);
+		if (interface_name) {
+			g_object_set (s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, interface_name, NULL);
+			g_free (interface_name);
+		}
+	}
+
+	/* Handle vpn secrets after the 'vpn' setting was read */
+	if (vpn_secrets) {
+		NMSettingVpn *s_vpn;
+
+		s_vpn = nm_connection_get_setting_vpn (connection);
+		if (s_vpn) {
+			read_vpn_secrets (&info, s_vpn);
+			if (info.error)
+				goto out_error;
+		}
+	}
+
+	return connection;
+out_error:
+	g_propagate_error (error, info.error);
+	g_free (connection);
+	return NULL;
+}
diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
new file mode 100644
index 00000000..d04a3d1b
--- /dev/null
+++ b/libnm-core/nm-keyfile-utils.c
@@ -0,0 +1,342 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2010 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include 
+#include 
+#include 
+
+#include "gsystem-local-alloc.h"
+#include "nm-keyfile-utils.h"
+#include "nm-keyfile-internal.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+
+
+typedef struct {
+	const char *setting;
+	const char *alias;
+} SettingAlias;
+
+static const SettingAlias alias_list[] = {
+	{ NM_SETTING_WIRED_SETTING_NAME, "ethernet" },
+	{ NM_SETTING_WIRELESS_SETTING_NAME, "wifi" },
+	{ NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, "wifi-security" },
+};
+
+const char *
+nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_name)
+{
+	guint i;
+
+	g_return_val_if_fail (setting_name != NULL, NULL);
+
+	for (i = 0; i < G_N_ELEMENTS (alias_list); i++) {
+		if (strcmp (setting_name, alias_list[i].setting) == 0)
+			return alias_list[i].alias;
+	}
+	return NULL;
+}
+
+const char *
+nm_keyfile_plugin_get_setting_name_for_alias (const char *alias)
+{
+	guint i;
+
+	g_return_val_if_fail (alias != NULL, NULL);
+
+	for (i = 0; i < G_N_ELEMENTS (alias_list); i++) {
+		if (strcmp (alias, alias_list[i].alias) == 0)
+			return alias_list[i].setting;
+	}
+	return NULL;
+}
+
+/**********************************************************************/
+
+/* List helpers */
+#define DEFINE_KF_LIST_WRAPPER(stype, get_ctype, set_ctype) \
+get_ctype \
+nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
+                                         const char *group, \
+                                         const char *key, \
+                                         gsize *out_length, \
+                                         GError **error) \
+{ \
+	get_ctype list; \
+	const char *alias; \
+	GError *local = NULL; \
+ \
+	list = g_key_file_get_##stype##_list (kf, group, key, out_length, &local); \
+	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
+		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
+		if (alias) { \
+			g_clear_error (&local); \
+			list = g_key_file_get_##stype##_list (kf, alias, key, out_length, &local); \
+		} \
+	} \
+	if (local) \
+		g_propagate_error (error, local); \
+	return list; \
+} \
+ \
+void \
+nm_keyfile_plugin_kf_set_##stype##_list (GKeyFile *kf, \
+                                         const char *group, \
+                                         const char *key, \
+                                         set_ctype list[], \
+                                         gsize length) \
+{ \
+	const char *alias; \
+ \
+	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
+	g_key_file_set_##stype##_list (kf, alias ? alias : group, key, list, length); \
+}
+
+DEFINE_KF_LIST_WRAPPER(integer, gint*, gint);
+DEFINE_KF_LIST_WRAPPER(string, gchar **, const gchar* const);
+
+/* Single value helpers */
+#define DEFINE_KF_WRAPPER(stype, get_ctype, set_ctype) \
+get_ctype \
+nm_keyfile_plugin_kf_get_##stype (GKeyFile *kf, \
+                                  const char *group, \
+                                  const char *key, \
+                                  GError **error) \
+{ \
+	get_ctype val; \
+	const char *alias; \
+	GError *local = NULL; \
+ \
+	val = g_key_file_get_##stype (kf, group, key, &local); \
+	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) { \
+		alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
+		if (alias) { \
+			g_clear_error (&local); \
+			val = g_key_file_get_##stype (kf, alias, key, &local); \
+		} \
+	} \
+	if (local) \
+		g_propagate_error (error, local); \
+	return val; \
+} \
+ \
+void \
+nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \
+                                  const char *group, \
+                                  const char *key, \
+                                  set_ctype value) \
+{ \
+	const char *alias; \
+ \
+	alias = nm_keyfile_plugin_get_alias_for_setting_name (group); \
+	g_key_file_set_##stype (kf, alias ? alias : group, key, value); \
+}
+
+DEFINE_KF_WRAPPER(string, gchar*, const gchar*);
+DEFINE_KF_WRAPPER(integer, gint, gint);
+DEFINE_KF_WRAPPER(uint64, guint64, guint64);
+DEFINE_KF_WRAPPER(boolean, gboolean, gboolean);
+DEFINE_KF_WRAPPER(value, gchar*, const gchar*);
+
+
+gchar **
+nm_keyfile_plugin_kf_get_keys (GKeyFile *kf,
+                               const char *group,
+                               gsize *out_length,
+                               GError **error)
+{
+	gchar **keys;
+	const char *alias;
+	GError *local = NULL;
+
+	keys = g_key_file_get_keys (kf, group, out_length, &local);
+	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
+		if (alias) {
+			g_clear_error (&local);
+			keys = g_key_file_get_keys (kf, alias, out_length, &local);
+		}
+	}
+	if (local)
+		g_propagate_error (error, local);
+	return keys;
+}
+
+gboolean
+nm_keyfile_plugin_kf_has_key (GKeyFile *kf,
+                              const char *group,
+                              const char *key,
+                              GError **error)
+{
+	gboolean has;
+	const char *alias;
+	GError *local = NULL;
+
+	has = g_key_file_has_key (kf, group, key, &local);
+	if (g_error_matches (local, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)) {
+		alias = nm_keyfile_plugin_get_alias_for_setting_name (group);
+		if (alias) {
+			g_clear_error (&local);
+			has = g_key_file_has_key (kf, alias, key, &local);
+		}
+	}
+	if (local)
+		g_propagate_error (error, local);
+	return has;
+}
+
+/************************************************************************/
+
+void
+_nm_keyfile_copy (GKeyFile *dst, GKeyFile *src)
+{
+	gs_strfreev char **groups = NULL;
+	guint g, k;
+
+	groups = g_key_file_get_groups (src, NULL);
+	for (g = 0; groups && groups[g]; g++) {
+		const char *group = groups[g];
+		gs_strfreev char **keys = NULL;
+
+		keys = g_key_file_get_keys (src, group, NULL, NULL);
+		if (!keys)
+			continue;
+
+		for (k = 0; keys[k]; k++) {
+			const char *key = keys[k];
+			gs_free char *value = NULL;
+
+			value = g_key_file_get_value (src, group, key, NULL);
+			if (value)
+				g_key_file_set_value (dst, group, key, value);
+			else
+				g_key_file_remove_key (dst, group, key, NULL);
+		}
+	}
+}
+
+/************************************************************************/
+
+gboolean
+_nm_keyfile_a_contains_all_in_b (GKeyFile *kf_a, GKeyFile *kf_b)
+{
+	gs_strfreev char **groups = NULL;
+	guint i, j;
+
+	if (kf_a == kf_b)
+		return TRUE;
+	if (!kf_a || !kf_b)
+		return FALSE;
+
+	groups = g_key_file_get_groups (kf_a, NULL);
+	for (i = 0; groups && groups[i]; i++) {
+		gs_strfreev char **keys = NULL;
+
+		keys = g_key_file_get_keys (kf_a, groups[i], NULL, NULL);
+		if (!keys)
+			continue;
+
+		for (j = 0; keys[j]; j++) {
+			gs_free char *key_a = g_key_file_get_value (kf_a, groups[i], keys[j], NULL);
+			gs_free char *key_b = g_key_file_get_value (kf_b, groups[i], keys[j], NULL);
+
+			if (g_strcmp0 (key_a, key_b) != 0)
+				return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+
+static gboolean
+_nm_keyfile_equals_ordered (GKeyFile *kf_a, GKeyFile *kf_b)
+{
+	gs_strfreev char **groups = NULL;
+	gs_strfreev char **groups_b = NULL;
+	guint i, j;
+
+	if (kf_a == kf_b)
+		return TRUE;
+	if (!kf_a || !kf_b)
+		return FALSE;
+
+	groups = g_key_file_get_groups (kf_a, NULL);
+	groups_b = g_key_file_get_groups (kf_b, NULL);
+	if (!groups && !groups_b)
+		return TRUE;
+	if (!groups || !groups_b)
+		return FALSE;
+	for (i = 0; groups[i] && groups_b[i] && !strcmp (groups[i], groups_b[i]); i++)
+		;
+	if (groups[i] || groups_b[i])
+		return FALSE;
+
+	for (i = 0; groups[i]; i++) {
+		gs_strfreev char **keys = NULL;
+		gs_strfreev char **keys_b = NULL;
+
+		keys = g_key_file_get_keys (kf_a, groups[i], NULL, NULL);
+		keys_b = g_key_file_get_keys (kf_b, groups[i], NULL, NULL);
+
+		if ((!keys) != (!keys_b))
+			return FALSE;
+		if (!keys)
+			continue;
+
+		for (j = 0; keys[j] && keys_b[j] && !strcmp (keys[j], keys_b[j]); j++)
+			;
+		if (keys[j] || keys_b[j])
+			return FALSE;
+
+		for (j = 0; keys[j]; j++) {
+			gs_free char *key_a = g_key_file_get_value (kf_a, groups[i], keys[j], NULL);
+			gs_free char *key_b = g_key_file_get_value (kf_b, groups[i], keys[j], NULL);
+
+			if (g_strcmp0 (key_a, key_b) != 0)
+				return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+gboolean
+_nm_keyfile_equals (GKeyFile *kf_a, GKeyFile *kf_b, gboolean consider_order)
+{
+	if (!consider_order) {
+		return    _nm_keyfile_a_contains_all_in_b (kf_a, kf_b)
+		       && _nm_keyfile_a_contains_all_in_b (kf_b, kf_a);
+	} else {
+		return _nm_keyfile_equals_ordered (kf_a, kf_b);
+	}
+}
+
+gboolean
+_nm_keyfile_has_values (GKeyFile *keyfile)
+{
+	gs_strfreev char **groups = NULL;
+
+	g_return_val_if_fail (keyfile, FALSE);
+
+	groups = g_key_file_get_groups (keyfile, NULL);
+	return groups && groups[0];
+}
diff --git a/libnm-core/nm-keyfile-utils.h b/libnm-core/nm-keyfile-utils.h
new file mode 100644
index 00000000..fd4334d1
--- /dev/null
+++ b/libnm-core/nm-keyfile-utils.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2010-2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_KEYFILE_UTILS_H__
+#define __NM_KEYFILE_UTILS_H__
+
+#include 
+
+#define VPN_SECRETS_GROUP "vpn-secrets"
+
+const char *nm_keyfile_plugin_get_alias_for_setting_name (const char *setting_name);
+
+const char *nm_keyfile_plugin_get_setting_name_for_alias (const char *alias);
+
+/*********************************************************/
+
+/* List helpers */
+#define DEFINE_KF_LIST_WRAPPER_PROTO(stype, get_ctype, set_ctype) \
+get_ctype nm_keyfile_plugin_kf_get_##stype##_list (GKeyFile *kf, \
+                                                   const char *group, \
+                                                   const char *key, \
+                                                   gsize *out_length, \
+                                                   GError **error); \
+\
+void nm_keyfile_plugin_kf_set_##stype##_list  (GKeyFile *kf, \
+                                               const char *group, \
+                                               const char *key, \
+                                               set_ctype list[], \
+                                               gsize length);
+DEFINE_KF_LIST_WRAPPER_PROTO(integer, gint*, gint)
+DEFINE_KF_LIST_WRAPPER_PROTO(string, gchar**, const gchar* const)
+
+/* Single-value helpers */
+#define DEFINE_KF_WRAPPER_PROTO(stype, get_ctype, set_ctype) \
+get_ctype nm_keyfile_plugin_kf_get_##stype (GKeyFile *kf, \
+                                            const char *group, \
+                                            const char *key, \
+                                            GError **error); \
+\
+void nm_keyfile_plugin_kf_set_##stype (GKeyFile *kf, \
+                                       const char *group, \
+                                       const char *key, \
+                                       set_ctype value);
+DEFINE_KF_WRAPPER_PROTO(string, gchar*, const gchar*)
+DEFINE_KF_WRAPPER_PROTO(integer, gint, gint)
+DEFINE_KF_WRAPPER_PROTO(uint64, guint64, guint64)
+DEFINE_KF_WRAPPER_PROTO(boolean, gboolean, gboolean)
+DEFINE_KF_WRAPPER_PROTO(value, gchar*, const gchar*)
+
+/* Misc */
+gchar ** nm_keyfile_plugin_kf_get_keys    (GKeyFile *kf,
+                                           const char *group,
+                                           gsize *out_length,
+                                           GError **error);
+
+gboolean nm_keyfile_plugin_kf_has_key     (GKeyFile *kf,
+                                           const char *group,
+                                           const char *key,
+                                           GError **error);
+
+#endif  /* __NM_KEYFILE_UTILS_H__ */
+
diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c
new file mode 100644
index 00000000..ff433b26
--- /dev/null
+++ b/libnm-core/nm-keyfile-writer.c
@@ -0,0 +1,751 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service - keyfile plugin
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2008 Novell, Inc.
+ * Copyright (C) 2008 - 2015 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "nm-setting.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-vpn.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-bluetooth.h"
+#include "nm-setting-8021x.h"
+#include "nm-utils.h"
+
+#include "gsystem-local-alloc.h"
+#include "nm-glib-compat.h"
+#include "nm-keyfile-internal.h"
+#include "nm-keyfile-utils.h"
+
+typedef struct {
+	NMConnection *connection;
+	GKeyFile *keyfile;
+	GError *error;
+	NMKeyfileWriteHandler handler;
+	void *user_data;
+} KeyfileWriterInfo;
+
+
+/* Some setting properties also contain setting names, such as
+ * NMSettingConnection's 'type' property (which specifies the base type of the
+ * connection, eg ethernet or wifi) or the 802-11-wireless setting's
+ * 'security' property which specifies whether or not the AP requires
+ * encrpytion.  This function handles translating those properties' values
+ * from the real setting name to the more-readable alias.
+ */
+static void
+setting_alias_writer (KeyfileWriterInfo *info,
+                      NMSetting *setting,
+                      const char *key,
+                      const GValue *value)
+{
+	const char *str, *alias;
+
+	str = g_value_get_string (value);
+	alias = nm_keyfile_plugin_get_alias_for_setting_name (str);
+	nm_keyfile_plugin_kf_set_string (info->keyfile,
+	                                 nm_setting_get_name (setting),
+	                                 key,
+	                                 alias ? alias : str);
+}
+
+static void
+write_array_of_uint (GKeyFile *file,
+                     NMSetting *setting,
+                     const char *key,
+                     const GValue *value)
+{
+	GArray *array;
+	int i;
+	int *tmp_array;
+
+	array = (GArray *) g_value_get_boxed (value);
+	if (!array || !array->len)
+		return;
+
+	tmp_array = g_new (gint, array->len);
+	for (i = 0; i < array->len; i++)
+		tmp_array[i] = g_array_index (array, int, i);
+
+	nm_keyfile_plugin_kf_set_integer_list (file, nm_setting_get_name (setting), key, tmp_array, array->len);
+	g_free (tmp_array);
+}
+
+static void
+dns_writer (KeyfileWriterInfo *info,
+            NMSetting *setting,
+            const char *key,
+            const GValue *value)
+{
+	char **list;
+
+	list = g_value_get_boxed (value);
+	if (list && list[0]) {
+		nm_keyfile_plugin_kf_set_string_list (info->keyfile, nm_setting_get_name (setting), key,
+		                                      (const char **) list, g_strv_length (list));
+	}
+}
+
+static void
+write_ip_values (GKeyFile *file,
+                 const char *setting_name,
+                 GPtrArray *array,
+                 const char *gateway,
+                 gboolean is_route)
+{
+	GString *output;
+	int family, i;
+	const char *addr, *gw;
+	guint32 plen, metric;
+	char key_name[30], *key_name_idx;
+
+	if (!array->len)
+		return;
+
+	family = !strcmp (setting_name, NM_SETTING_IP4_CONFIG_SETTING_NAME) ? AF_INET : AF_INET6;
+
+	strcpy (key_name, is_route ? "route" : "address");
+	key_name_idx = key_name + strlen (key_name);
+
+	output = g_string_sized_new (2*INET_ADDRSTRLEN + 10);
+	for (i = 0; i < array->len; i++) {
+		if (is_route) {
+			NMIPRoute *route = array->pdata[i];
+
+			addr = nm_ip_route_get_dest (route);
+			plen = nm_ip_route_get_prefix (route);
+			gw = nm_ip_route_get_next_hop (route);
+			metric = MAX (0, nm_ip_route_get_metric (route));
+		} else {
+			NMIPAddress *address = array->pdata[i];
+
+			addr = nm_ip_address_get_address (address);
+			plen = nm_ip_address_get_prefix (address);
+			gw = i == 0 ? gateway : NULL;
+			metric = 0;
+		}
+
+		g_string_set_size (output, 0);
+		g_string_append_printf (output, "%s/%u", addr, plen);
+		if (metric || gw) {
+			/* Older versions of the plugin do not support the form
+			 * "a.b.c.d/plen,,metric", so, we always have to write the
+			 * gateway, even if there isn't one.
+			 * The current version supports reading of the above form.
+			 */
+			if (!gw) {
+				if (family == AF_INET)
+					gw = "0.0.0.0";
+				else
+					gw = "::";
+			}
+
+			g_string_append_printf (output, ",%s", gw);
+			if (metric)
+				g_string_append_printf (output, ",%lu", (unsigned long) metric);
+		}
+
+		sprintf (key_name_idx, "%d", i + 1);
+		nm_keyfile_plugin_kf_set_string (file, setting_name, key_name, output->str);
+	}
+	g_string_free (output, TRUE);
+}
+
+static void
+addr_writer (KeyfileWriterInfo *info,
+             NMSetting *setting,
+             const char *key,
+             const GValue *value)
+{
+	GPtrArray *array;
+	const char *setting_name = nm_setting_get_name (setting);
+	const char *gateway = nm_setting_ip_config_get_gateway (NM_SETTING_IP_CONFIG (setting));
+
+	array = (GPtrArray *) g_value_get_boxed (value);
+	if (array && array->len)
+		write_ip_values (info->keyfile, setting_name, array, gateway, FALSE);
+}
+
+static void
+ip4_addr_label_writer (KeyfileWriterInfo *info,
+                       NMSetting *setting,
+                       const char *key,
+                       const GValue *value)
+{
+	/* skip */
+}
+
+static void
+gateway_writer (KeyfileWriterInfo *info,
+                NMSetting *setting,
+                const char *key,
+                const GValue *value)
+{
+	/* skip */
+}
+
+static void
+route_writer (KeyfileWriterInfo *info,
+              NMSetting *setting,
+              const char *key,
+              const GValue *value)
+{
+	GPtrArray *array;
+	const char *setting_name = nm_setting_get_name (setting);
+
+	array = (GPtrArray *) g_value_get_boxed (value);
+	if (array && array->len)
+		write_ip_values (info->keyfile, setting_name, array, NULL, TRUE);
+}
+
+static void
+write_hash_of_string (GKeyFile *file,
+                      NMSetting *setting,
+                      const char *key,
+                      const GValue *value)
+{
+	GHashTableIter iter;
+	const char *property = NULL, *data = NULL;
+	const char *group_name = nm_setting_get_name (setting);
+	gboolean vpn_secrets = FALSE;
+
+	/* Write VPN secrets out to a different group to keep them separate */
+	if (NM_IS_SETTING_VPN (setting) && !strcmp (key, NM_SETTING_VPN_SECRETS)) {
+		group_name = VPN_SECRETS_GROUP;
+		vpn_secrets = TRUE;
+	}
+
+	g_hash_table_iter_init (&iter, (GHashTable *) g_value_get_boxed (value));
+	while (g_hash_table_iter_next (&iter, (gpointer *) &property, (gpointer *) &data)) {
+		gboolean write_item = TRUE;
+
+		/* Handle VPN secrets specially; they are nested in the property's hash;
+		 * we don't want to write them if the secret is not saved, not required,
+		 * or owned by a user's secret agent.
+		 */
+		if (vpn_secrets) {
+			NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+
+			nm_setting_get_secret_flags (setting, property, &secret_flags, NULL);
+			if (secret_flags != NM_SETTING_SECRET_FLAG_NONE)
+				write_item = FALSE;
+		}
+
+		if (write_item)
+			nm_keyfile_plugin_kf_set_string (file, group_name, property, data);
+	}
+}
+
+static void
+ssid_writer (KeyfileWriterInfo *info,
+             NMSetting *setting,
+             const char *key,
+             const GValue *value)
+{
+	GBytes *bytes;
+	const guint8 *ssid_data;
+	gsize ssid_len;
+	const char *setting_name = nm_setting_get_name (setting);
+	gboolean new_format = TRUE;
+	unsigned int semicolons = 0;
+	int i, *tmp_array;
+	char *ssid;
+
+	g_return_if_fail (G_VALUE_HOLDS (value, G_TYPE_BYTES));
+
+	bytes = g_value_get_boxed (value);
+	if (!bytes)
+		return;
+	ssid_data = g_bytes_get_data (bytes, &ssid_len);
+	if (ssid_len == 0)
+		return;
+
+	/* Check whether each byte is printable.  If not, we have to use an
+	 * integer list, otherwise we can just use a string.
+	 */
+	for (i = 0; i < ssid_len; i++) {
+		char c = ssid_data[i] & 0xFF;
+		if (!g_ascii_isprint (c)) {
+			new_format = FALSE;
+			break;
+		}
+		if (c == ';')
+			semicolons++;
+	}
+
+	if (new_format) {
+		ssid = g_malloc0 (ssid_len + semicolons + 1);
+		if (semicolons == 0)
+			memcpy (ssid, ssid_data, ssid_len);
+		else {
+			/* Escape semicolons with backslashes to make strings
+			 * containing ';', such as '16;17;' unambiguous */
+			int j = 0;
+			for (i = 0; i < ssid_len; i++) {
+				if (ssid_data[i] == ';')
+					ssid[j++] = '\\';
+				ssid[j++] = ssid_data[i];
+			}
+		}
+		nm_keyfile_plugin_kf_set_string (info->keyfile, setting_name, key, ssid);
+		g_free (ssid);
+	} else {
+		tmp_array = g_new (gint, ssid_len);
+		for (i = 0; i < ssid_len; i++)
+			tmp_array[i] = (int) ssid_data[i];
+		nm_keyfile_plugin_kf_set_integer_list (info->keyfile, setting_name, key, tmp_array, ssid_len);
+		g_free (tmp_array);
+	}
+}
+
+static void
+password_raw_writer (KeyfileWriterInfo *info,
+                     NMSetting *setting,
+                     const char *key,
+                     const GValue *value)
+{
+	const char *setting_name = nm_setting_get_name (setting);
+	GBytes *array;
+	int *tmp_array;
+	gsize i, len;
+	const char *data;
+
+	g_return_if_fail (G_VALUE_HOLDS (value, G_TYPE_BYTES));
+
+	array = (GBytes *) g_value_get_boxed (value);
+	if (!array)
+		return;
+	data = g_bytes_get_data (array, &len);
+	if (!data || !len)
+		return;
+
+	tmp_array = g_new (gint, len);
+	for (i = 0; i < len; i++)
+		tmp_array[i] = (int) data[i];
+	nm_keyfile_plugin_kf_set_integer_list (info->keyfile, setting_name, key, tmp_array, len);
+	g_free (tmp_array);
+}
+
+typedef struct ObjectType {
+	const char *key;
+	const char *suffix;
+	NMSetting8021xCKScheme (*scheme_func) (NMSetting8021x *setting);
+	NMSetting8021xCKFormat (*format_func) (NMSetting8021x *setting);
+	const char *           (*path_func)   (NMSetting8021x *setting);
+	GBytes *               (*blob_func)   (NMSetting8021x *setting);
+} ObjectType;
+
+static const ObjectType objtypes[10] = {
+	{ NM_SETTING_802_1X_CA_CERT,
+	  "ca-cert",
+	  nm_setting_802_1x_get_ca_cert_scheme,
+	  NULL,
+	  nm_setting_802_1x_get_ca_cert_path,
+	  nm_setting_802_1x_get_ca_cert_blob },
+
+	{ NM_SETTING_802_1X_PHASE2_CA_CERT,
+	  "inner-ca-cert",
+	  nm_setting_802_1x_get_phase2_ca_cert_scheme,
+	  NULL,
+	  nm_setting_802_1x_get_phase2_ca_cert_path,
+	  nm_setting_802_1x_get_phase2_ca_cert_blob },
+
+	{ NM_SETTING_802_1X_CLIENT_CERT,
+	  "client-cert",
+	  nm_setting_802_1x_get_client_cert_scheme,
+	  NULL,
+	  nm_setting_802_1x_get_client_cert_path,
+	  nm_setting_802_1x_get_client_cert_blob },
+
+	{ NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
+	  "inner-client-cert",
+	  nm_setting_802_1x_get_phase2_client_cert_scheme,
+	  NULL,
+	  nm_setting_802_1x_get_phase2_client_cert_path,
+	  nm_setting_802_1x_get_phase2_client_cert_blob },
+
+	{ NM_SETTING_802_1X_PRIVATE_KEY,
+	  "private-key",
+	  nm_setting_802_1x_get_private_key_scheme,
+	  nm_setting_802_1x_get_private_key_format,
+	  nm_setting_802_1x_get_private_key_path,
+	  nm_setting_802_1x_get_private_key_blob },
+
+	{ NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
+	  "inner-private-key",
+	  nm_setting_802_1x_get_phase2_private_key_scheme,
+	  nm_setting_802_1x_get_phase2_private_key_format,
+	  nm_setting_802_1x_get_phase2_private_key_path,
+	  nm_setting_802_1x_get_phase2_private_key_blob },
+
+	{ NULL },
+};
+
+/**************************************************************************/
+
+static void
+cert_writer_default (NMConnection *connection,
+                     GKeyFile *file,
+                     NMKeyfileWriteTypeDataCert *cert_data)
+{
+	const char *setting_name = nm_setting_get_name (NM_SETTING (cert_data->setting));
+	NMSetting8021xCKScheme scheme;
+
+	scheme = cert_data->scheme_func (cert_data->setting);
+	if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) {
+		const char *path;
+		char *path_free = NULL, *tmp;
+		gs_free char *base_dir = NULL;
+
+		path = cert_data->path_func (cert_data->setting);
+		g_assert (path);
+
+		/* If the path is relative, make it an absolute path.
+		 * Relative paths make a keyfile not easily usable in another
+		 * context. */
+		if (path[0] && path[0] != '/') {
+			base_dir = g_get_current_dir ();
+			path = path_free = g_strconcat (base_dir, "/", path, NULL);
+		} else
+			base_dir = g_path_get_dirname (path);
+
+		/* path cannot start with "file://" or "data:;base64,", because it is an absolute path.
+		 * Still, make sure that a prefix-less path will be recognized. This can happen
+		 * for example if the path is longer then 500 chars. */
+		tmp = nm_keyfile_detect_unqualified_path_scheme (base_dir, path, -1, FALSE, NULL);
+		if (tmp)
+			g_clear_pointer (&tmp, g_free);
+		else
+			path = tmp = g_strconcat (NM_KEYFILE_CERT_SCHEME_PREFIX_PATH, path, NULL);
+
+		/* Path contains at least a '/', hence it cannot be recognized as the old
+		 * binary format consisting of a list of integers. */
+
+		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->property_name, path);
+		g_free (tmp);
+		g_free (path_free);
+	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
+		GBytes *blob;
+		const guint8 *blob_data;
+		gsize blob_len;
+		char *blob_base64, *val;
+
+		blob = cert_data->blob_func (cert_data->setting);
+		g_assert (blob);
+		blob_data = g_bytes_get_data (blob, &blob_len);
+
+		blob_base64 = g_base64_encode (blob_data, blob_len);
+		val = g_strconcat (NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB, blob_base64, NULL);
+
+		nm_keyfile_plugin_kf_set_string (file, setting_name, cert_data->property_name, val);
+		g_free (val);
+		g_free (blob_base64);
+	} else {
+		/* scheme_func() returns UNKNOWN in all other cases. The only valid case
+		 * where a scheme is allowed to be UNKNOWN, is unsetting the value. In this
+		 * case, we don't expect the writer to be called, because the default value
+		 * will not be serialized.
+		 * The only other reason for the scheme to be UNKNOWN is an invalid cert.
+		 * But our connection verifies, so that cannot happen either. */
+		g_return_if_reached ();
+	}
+}
+
+static void
+cert_writer (KeyfileWriterInfo *info,
+             NMSetting *setting,
+             const char *key,
+             const GValue *value)
+{
+	const ObjectType *objtype = NULL;
+	guint i;
+	NMKeyfileWriteTypeDataCert type_data = { 0 };
+
+	for (i = 0; i < G_N_ELEMENTS (objtypes) && objtypes[i].key; i++) {
+		if (g_strcmp0 (objtypes[i].key, key) == 0) {
+			objtype = &objtypes[i];
+			break;
+		}
+	}
+	if (!objtype)
+		g_return_if_reached ();
+
+	type_data.setting = NM_SETTING_802_1X (setting);
+	type_data.property_name = key;
+	type_data.suffix = objtype->suffix;
+	type_data.scheme_func = objtype->scheme_func;
+	type_data.format_func = objtype->format_func;
+	type_data.path_func = objtype->path_func;
+	type_data.blob_func = objtype->blob_func;
+
+	if (info->handler) {
+		if (info->handler (info->connection,
+		                   info->keyfile,
+		                   NM_KEYFILE_WRITE_TYPE_CERT,
+		                   &type_data,
+		                   info->user_data,
+		                   &info->error))
+			return;
+		if (info->error)
+			return;
+	}
+
+	cert_writer_default (info->connection, info->keyfile, &type_data);
+}
+
+/**************************************************************************/
+
+typedef struct {
+	const char *setting_name;
+	const char *key;
+	void (*writer) (KeyfileWriterInfo *info,
+	                NMSetting *setting,
+	                const char *key,
+	                const GValue *value);
+} KeyWriter;
+
+/* A table of keys that require further parsing/conversion because they are
+ * stored in a format that can't be automatically read using the key's type.
+ * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are
+ * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored 
+ * in struct in6_addr internally, but as string in keyfiles.
+ */
+static KeyWriter key_writers[] = {
+	{ NM_SETTING_CONNECTION_SETTING_NAME,
+	  NM_SETTING_CONNECTION_TYPE,
+	  setting_alias_writer },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ADDRESSES,
+	  addr_writer },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  "address-labels",
+	  ip4_addr_label_writer },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ADDRESSES,
+	  addr_writer },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_GATEWAY,
+	  gateway_writer },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_GATEWAY,
+	  gateway_writer },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ROUTES,
+	  route_writer },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_ROUTES,
+	  route_writer },
+	{ NM_SETTING_IP4_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_DNS,
+	  dns_writer },
+	{ NM_SETTING_IP6_CONFIG_SETTING_NAME,
+	  NM_SETTING_IP_CONFIG_DNS,
+	  dns_writer },
+	{ NM_SETTING_WIRELESS_SETTING_NAME,
+	  NM_SETTING_WIRELESS_SSID,
+	  ssid_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PASSWORD_RAW,
+	  password_raw_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_CA_CERT,
+	  cert_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_CLIENT_CERT,
+	  cert_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PRIVATE_KEY,
+	  cert_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PHASE2_CA_CERT,
+	  cert_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
+	  cert_writer },
+	{ NM_SETTING_802_1X_SETTING_NAME,
+	  NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
+	  cert_writer },
+	{ NULL, NULL, NULL }
+};
+
+static void
+write_setting_value (NMSetting *setting,
+                     const char *key,
+                     const GValue *value,
+                     GParamFlags flag,
+                     gpointer user_data)
+{
+	KeyfileWriterInfo *info = user_data;
+	const char *setting_name;
+	GType type = G_VALUE_TYPE (value);
+	KeyWriter *writer = &key_writers[0];
+	GParamSpec *pspec;
+
+	if (info->error)
+		return;
+
+	/* Setting name gets picked up from the keyfile's section name instead */
+	if (!strcmp (key, NM_SETTING_NAME))
+		return;
+
+	/* Don't write the NMSettingConnection object's 'read-only' property */
+	if (   NM_IS_SETTING_CONNECTION (setting)
+	    && !strcmp (key, NM_SETTING_CONNECTION_READ_ONLY))
+		return;
+
+	setting_name = nm_setting_get_name (setting);
+
+	/* If the value is the default value, remove the item from the keyfile */
+	pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), key);
+	if (pspec) {
+		if (g_param_value_defaults (pspec, (GValue *) value)) {
+			g_key_file_remove_key (info->keyfile, setting_name, key, NULL);
+			return;
+		}
+	}
+
+	/* Don't write secrets that are owned by user secret agents or aren't
+	 * supposed to be saved.  VPN secrets are handled specially though since
+	 * the secret flags there are in a third-level hash in the 'secrets'
+	 * property.
+	 */
+	if (pspec && (pspec->flags & NM_SETTING_PARAM_SECRET) && !NM_IS_SETTING_VPN (setting)) {
+		NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
+
+		if (!nm_setting_get_secret_flags (setting, key, &secret_flags, NULL))
+			g_assert_not_reached ();
+		if (secret_flags != NM_SETTING_SECRET_FLAG_NONE)
+			return;
+	}
+
+	/* Look through the list of handlers for non-standard format key values */
+	while (writer->setting_name) {
+		if (!strcmp (writer->setting_name, setting_name) && !strcmp (writer->key, key)) {
+			(*writer->writer) (info, setting, key, value);
+			return;
+		}
+		writer++;
+	}
+
+	if (type == G_TYPE_STRING) {
+		const char *str;
+
+		str = g_value_get_string (value);
+		if (str)
+			nm_keyfile_plugin_kf_set_string (info->keyfile, setting_name, key, str);
+	} else if (type == G_TYPE_UINT)
+		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (int) g_value_get_uint (value));
+	else if (type == G_TYPE_INT)
+		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, g_value_get_int (value));
+	else if (type == G_TYPE_UINT64) {
+		char *numstr;
+
+		numstr = g_strdup_printf ("%" G_GUINT64_FORMAT, g_value_get_uint64 (value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		g_free (numstr);
+	} else if (type == G_TYPE_INT64) {
+		char *numstr;
+
+		numstr = g_strdup_printf ("%" G_GINT64_FORMAT, g_value_get_int64 (value));
+		nm_keyfile_plugin_kf_set_value (info->keyfile, setting_name, key, numstr);
+		g_free (numstr);
+	} else if (type == G_TYPE_BOOLEAN) {
+		nm_keyfile_plugin_kf_set_boolean (info->keyfile, setting_name, key, g_value_get_boolean (value));
+	} else if (type == G_TYPE_CHAR) {
+		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (int) g_value_get_schar (value));
+	} else if (type == G_TYPE_BYTES) {
+		GBytes *bytes;
+		const guint8 *data;
+		gsize len = 0;
+
+		bytes = g_value_get_boxed (value);
+		data = bytes ? g_bytes_get_data (bytes, &len) : NULL;
+
+		if (data != NULL && len > 0) {
+			int *tmp_array;
+			int i;
+
+			tmp_array = g_new (gint, len);
+			for (i = 0; i < len; i++)
+				tmp_array[i] = (int) data[i];
+
+			nm_keyfile_plugin_kf_set_integer_list (info->keyfile, setting_name, key, tmp_array, len);
+			g_free (tmp_array);
+		}
+	} else if (type == G_TYPE_STRV) {
+		char **array;
+
+		array = (char **) g_value_get_boxed (value);
+		nm_keyfile_plugin_kf_set_string_list (info->keyfile, setting_name, key, (const gchar **const) array, g_strv_length (array));
+	} else if (type == G_TYPE_HASH_TABLE) {
+		write_hash_of_string (info->keyfile, setting, key, value);
+	} else if (type == G_TYPE_ARRAY) {
+		write_array_of_uint (info->keyfile, setting, key, value);
+	} else if (G_VALUE_HOLDS_FLAGS (value)) {
+		/* Flags are guint but GKeyFile has no uint reader, just uint64 */
+		nm_keyfile_plugin_kf_set_uint64 (info->keyfile, setting_name, key, (guint64) g_value_get_flags (value));
+	} else if (G_VALUE_HOLDS_ENUM (value))
+		nm_keyfile_plugin_kf_set_integer (info->keyfile, setting_name, key, (gint) g_value_get_enum (value));
+	else
+		g_warn_if_reached ();
+}
+
+GKeyFile *
+nm_keyfile_write (NMConnection *connection,
+                  NMKeyfileWriteHandler handler,
+                  void *user_data,
+                  GError **error)
+{
+	KeyfileWriterInfo info = { 0 };
+
+	g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
+	g_return_val_if_fail (!error || !*error, NULL);
+
+	if (!nm_connection_verify (connection, error))
+		return NULL;
+
+	info.connection = connection;
+	info.keyfile = g_key_file_new ();
+	info.error = NULL;
+	info.handler = handler;
+	info.user_data = user_data;
+	nm_connection_for_each_setting_value (connection, write_setting_value, &info);
+
+	if (info.error) {
+		g_propagate_error (error, info.error);
+		g_key_file_unref (info.keyfile);
+		return NULL;
+	}
+	return info.keyfile;
+}
+
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 41559e0c..d53ae43b 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -31,6 +31,8 @@
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
+#include "nm-macros-internal.h"
+#include "gsystem-local-alloc.h"
 
 /**
  * SECTION:nm-setting-8021x
@@ -60,8 +62,6 @@
  *       ISBN: 978-1587051548
  **/
 
-#define SCHEME_PATH "file://"
-
 G_DEFINE_TYPE_WITH_CODE (NMSetting8021x, nm_setting_802_1x, NM_TYPE_SETTING,
                          _nm_register_setting (802_1X, 2))
 NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_802_1X)
@@ -400,25 +400,120 @@ nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting)
 }
 
 static NMSetting8021xCKScheme
-get_cert_scheme (GBytes *bytes)
+get_cert_scheme (GBytes *bytes, GError **error)
 {
-	gconstpointer data;
+	const char *data;
 	gsize length;
 
-	if (!bytes)
+	if (!bytes) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("data missing"));
 		return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
+	}
 
 	data = g_bytes_get_data (bytes, &length);
-	if (!length)
+	return nm_setting_802_1x_check_cert_scheme (data, length, error);
+}
+
+/**
+ * nm_setting_802_1x_check_cert_scheme:
+ * @pdata: (allow-none): the data pointer
+ * @length: the length of the data
+ * @error: (allow-none): (out): validation reason
+ *
+ * Determines and verifies the blob type.
+ * When setting certificate properties of NMSetting8021x
+ * the blob must be not UNKNOWN (or NULL).
+ *
+ * Returns: the scheme of the blob or %NM_SETTING_802_1X_CK_SCHEME_UNKNOWN.
+ * For NULL it also returns NM_SETTING_802_1X_CK_SCHEME_UNKNOWN.
+ **/
+NMSetting8021xCKScheme
+nm_setting_802_1x_check_cert_scheme (gconstpointer pdata, gsize length, GError **error)
+{
+	const char *data = pdata;
+
+	g_return_val_if_fail (!length || data, NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
+
+	if (!length || !data) {
+		g_set_error_literal (error,
+		                     NM_CONNECTION_ERROR,
+		                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+		                     _("binary data missing"));
 		return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
+	}
+
+	/* interpret the blob as PATH if it starts with "file://". */
+	if (   length >= STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)
+	    && !memcmp (data, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH))) {
+		/* But it must also be NUL terminated, contain at least
+		 * one non-NUL character, and contain only one trailing NUL
+		 * chracter.
+		 * And ensure it's UTF-8 valid too so we can pass it through
+		 * D-Bus and stuff like that. */
+
+		if (data[length - 1] != '\0') {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("file:// URI not NUL terminated"));
+			return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
+		}
+		length--;
+
+		if (length <= STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("file:// URI is empty"));
+			return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
+		}
+
+		if (!g_utf8_validate (data + STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH), length - STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH), NULL)) {
+			g_set_error_literal (error,
+			                     NM_CONNECTION_ERROR,
+			                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			                     _("file:// URI is not valid UTF-8"));
+			return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
+		}
 
-	if (   (length > strlen (SCHEME_PATH))
-	    && !memcmp (data, SCHEME_PATH, strlen (SCHEME_PATH)))
 		return NM_SETTING_802_1X_CK_SCHEME_PATH;
+	}
 
 	return NM_SETTING_802_1X_CK_SCHEME_BLOB;
 }
 
+static GByteArray *
+load_and_verify_certificate (const char *cert_path,
+                             NMSetting8021xCKScheme scheme,
+                             NMCryptoFileFormat *out_file_format,
+                             GError **error)
+{
+	NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
+	GByteArray *array;
+
+	array = crypto_load_and_verify_certificate (cert_path, &format, error);
+
+	if (!array || !array->len || format == NM_CRYPTO_FILE_FORMAT_UNKNOWN) {
+		/* the array is empty or the format is already unknown. */
+		format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
+	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
+		/* If we load the file as blob, we must ensure that the binary data does not
+		 * start with file://. NMSetting8021x cannot represent blobs that start with
+		 * file://.
+		 * If that's the case, coerce the format to UNKNOWN. The callers will take care
+		 * of that and not set the blob. */
+		if (nm_setting_802_1x_check_cert_scheme (array->data, array->len, NULL) != NM_SETTING_802_1X_CK_SCHEME_BLOB)
+			format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
+	}
+
+	if (out_file_format)
+		*out_file_format = format;
+	return array;
+}
+
 /**
  * nm_setting_802_1x_get_ca_cert_scheme:
  * @setting: the #NMSetting8021x
@@ -434,7 +529,7 @@ nm_setting_802_1x_get_ca_cert_scheme (NMSetting8021x *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
 
-	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->ca_cert);
+	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->ca_cert, NULL);
 }
 
 /**
@@ -488,20 +583,23 @@ nm_setting_802_1x_get_ca_cert_path (NMSetting8021x *setting)
 	g_return_val_if_fail (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH, NULL);
 
 	data = g_bytes_get_data (NM_SETTING_802_1X_GET_PRIVATE (setting)->ca_cert, NULL);
-	return (const char *)data + strlen (SCHEME_PATH);
+	return (const char *)data + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 }
 
 static GBytes *
 path_to_scheme_value (const char *path)
 {
 	GByteArray *array;
+	gsize len;
 
-	g_return_val_if_fail (path != NULL, NULL);
+	g_return_val_if_fail (path != NULL && path[0], NULL);
 
-	/* Add the path scheme tag to the front, then the fielname */
-	array = g_byte_array_sized_new (strlen (path) + strlen (SCHEME_PATH) + 1);
-	g_byte_array_append (array, (const guint8 *) SCHEME_PATH, strlen (SCHEME_PATH));
-	g_byte_array_append (array, (const guint8 *) path, strlen (path));
+	len = strlen (path);
+
+	/* Add the path scheme tag to the front, then the filename */
+	array = g_byte_array_sized_new (len + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH) + 1);
+	g_byte_array_append (array, (const guint8 *) NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH));
+	g_byte_array_append (array, (const guint8 *) path, len);
 	g_byte_array_append (array, (const guint8 *) "\0", 1);
 
 	return g_byte_array_free_to_bytes (array);
@@ -558,7 +656,7 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		/* wpa_supplicant can only use raw x509 CA certs */
 		if (format == NM_CRYPTO_FILE_FORMAT_X509) {
@@ -766,7 +864,7 @@ nm_setting_802_1x_get_client_cert_scheme (NMSetting8021x *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
 
-	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->client_cert);
+	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->client_cert, NULL);
 }
 
 /**
@@ -814,7 +912,7 @@ nm_setting_802_1x_get_client_cert_path (NMSetting8021x *setting)
 	g_return_val_if_fail (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH, NULL);
 
 	data = g_bytes_get_data (NM_SETTING_802_1X_GET_PRIVATE (setting)->client_cert, NULL);
-	return (const char *)data + strlen (SCHEME_PATH);
+	return (const char *)data + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 }
 
 /**
@@ -872,7 +970,7 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		gboolean valid = FALSE;
 
@@ -1029,7 +1127,7 @@ nm_setting_802_1x_get_phase2_ca_cert_scheme (NMSetting8021x *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
 
-	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_ca_cert);
+	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_ca_cert, NULL);
 }
 
 /**
@@ -1083,7 +1181,7 @@ nm_setting_802_1x_get_phase2_ca_cert_path (NMSetting8021x *setting)
 	g_return_val_if_fail (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH, NULL);
 
 	data = g_bytes_get_data (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_ca_cert, NULL);
-	return (const char *)data + strlen (SCHEME_PATH);
+	return (const char *)data + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 }
 
 /**
@@ -1137,7 +1235,7 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		/* wpa_supplicant can only use raw x509 CA certs */
 		if (format == NM_CRYPTO_FILE_FORMAT_X509) {
@@ -1349,7 +1447,7 @@ nm_setting_802_1x_get_phase2_client_cert_scheme (NMSetting8021x *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
 
-	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_client_cert);
+	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_client_cert, NULL);
 }
 
 /**
@@ -1397,7 +1495,7 @@ nm_setting_802_1x_get_phase2_client_cert_path (NMSetting8021x *setting)
 	g_return_val_if_fail (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH, NULL);
 
 	data = g_bytes_get_data (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_client_cert, NULL);
-	return (const char *)data + strlen (SCHEME_PATH);
+	return (const char *)data + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 }
 
 /**
@@ -1455,7 +1553,7 @@ nm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		gboolean valid = FALSE;
 
@@ -1604,7 +1702,7 @@ nm_setting_802_1x_get_private_key_scheme (NMSetting8021x *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
 
-	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->private_key);
+	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->private_key, NULL);
 }
 
 /**
@@ -1656,7 +1754,7 @@ nm_setting_802_1x_get_private_key_path (NMSetting8021x *setting)
 	g_return_val_if_fail (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH, NULL);
 
 	data = g_bytes_get_data (NM_SETTING_802_1X_GET_PRIVATE (setting)->private_key, NULL);
-	return (const char *)data + strlen (SCHEME_PATH);
+	return (const char *)data + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 }
 
 static void
@@ -1678,7 +1776,7 @@ file_to_secure_bytes (const char *filename)
 	if (g_file_get_contents (filename, &contents, &length, NULL)) {
 		array = g_byte_array_sized_new (length);
 		g_byte_array_append (array, (guint8 *) contents, length);
-		g_assert (array->len == length);
+		memset (contents, 0, length);
 		g_free (contents);
 		return g_bytes_new_with_free_func (array->data, array->len, free_secure_bytes, array);
 	}
@@ -1790,7 +1888,8 @@ nm_setting_802_1x_set_private_key (NMSetting8021x *setting,
 
 	priv->private_key_password = g_strdup (password);
 	if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
-		/* Shouldn't fail this since we just verified the private key above */
+		/* FIXME: potential race after verifying the private key above */
+		/* FIXME: ensure blob doesn't start with file:// */
 		priv->private_key = file_to_secure_bytes (key_path);
 		g_assert (priv->private_key);
 	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
@@ -1941,7 +2040,7 @@ nm_setting_802_1x_get_phase2_private_key_scheme (NMSetting8021x *setting)
 {
 	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NM_SETTING_802_1X_CK_SCHEME_UNKNOWN);
 
-	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_private_key);
+	return get_cert_scheme (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_private_key, NULL);
 }
 
 /**
@@ -1993,7 +2092,7 @@ nm_setting_802_1x_get_phase2_private_key_path (NMSetting8021x *setting)
 	g_return_val_if_fail (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH, NULL);
 
 	data = g_bytes_get_data (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_private_key, NULL);
-	return (const char *)data + strlen (SCHEME_PATH);
+	return (const char *)data + strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 }
 
 /**
@@ -2101,7 +2200,8 @@ nm_setting_802_1x_set_phase2_private_key (NMSetting8021x *setting,
 
 	priv->phase2_private_key_password = g_strdup (password);
 	if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
-		/* Shouldn't fail this since we just verified the private key above */
+		/* FIXME: potential race after verifying the private key above */
+		/* FIXME: ensure blob doesn't start with file:// */
 		priv->phase2_private_key = file_to_secure_bytes (key_path);
 		g_assert (priv->phase2_private_key);
 	} else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH)
@@ -2575,35 +2675,18 @@ need_secrets (NMSetting *setting)
 static gboolean
 verify_cert (GBytes *bytes, const char *prop_name, GError **error)
 {
-	gconstpointer data;
-	gsize length;
-
-	if (!bytes)
-		return TRUE;
+	GError *local = NULL;
 
-	switch (get_cert_scheme (bytes)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+	if (   !bytes
+	    || get_cert_scheme (bytes, &local) != NM_SETTING_802_1X_CK_SCHEME_UNKNOWN)
 		return TRUE;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		/* For path-based schemes, verify that the path is zero-terminated */
-		data = g_bytes_get_data (bytes, &length);
-		if (((const guchar *)data)[length - 1] == '\0') {
-			/* And ensure it's UTF-8 valid too so we can pass it through
-			 * D-Bus and stuff like that.
-			 */
-			if (g_utf8_validate ((const char *)data + strlen (SCHEME_PATH), -1, NULL))
-				return TRUE;
-		}
-		break;
-	default:
-		break;
-	}
 
-	g_set_error_literal (error,
-	                     NM_CONNECTION_ERROR,
-	                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
-	                     _("property is invalid"));
+	g_set_error (error,
+	             NM_CONNECTION_ERROR,
+	             NM_CONNECTION_ERROR_INVALID_PROPERTY,
+	             _("certificate is invalid: %s"), local->message);
 	g_prefix_error (error, "%s.%s: ", NM_SETTING_802_1X_SETTING_NAME, prop_name);
+	g_error_free (local);
 	return FALSE;
 }
 
@@ -2805,7 +2888,7 @@ set_property (GObject *object, guint prop_id,
 	switch (prop_id) {
 	case PROP_EAP:
 		g_slist_free_full (priv->eap, g_free);
-		priv->eap = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->eap = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_IDENTITY:
 		g_free (priv->identity);
@@ -2839,7 +2922,7 @@ set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_ALTSUBJECT_MATCHES:
 		g_slist_free_full (priv->altsubject_matches, g_free);
-		priv->altsubject_matches = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->altsubject_matches = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_CLIENT_CERT:
 		if (priv->client_cert)
@@ -2891,7 +2974,7 @@ set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_PHASE2_ALTSUBJECT_MATCHES:
 		g_slist_free_full (priv->phase2_altsubject_matches, g_free);
-		priv->phase2_altsubject_matches = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->phase2_altsubject_matches = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_PHASE2_CLIENT_CERT:
 		if (priv->phase2_client_cert)
@@ -2977,7 +3060,7 @@ get_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_EAP:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->eap));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->eap, TRUE));
 		break;
 	case PROP_IDENTITY:
 		g_value_set_string (value, priv->identity);
@@ -2998,7 +3081,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, priv->subject_match);
 		break;
 	case PROP_ALTSUBJECT_MATCHES:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->altsubject_matches));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->altsubject_matches, TRUE));
 		break;
 	case PROP_CLIENT_CERT:
 		g_value_set_boxed (value, priv->client_cert);
@@ -3028,7 +3111,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, priv->phase2_subject_match);
 		break;
 	case PROP_PHASE2_ALTSUBJECT_MATCHES:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->phase2_altsubject_matches));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->phase2_altsubject_matches, TRUE));
 		break;
 	case PROP_PHASE2_CLIENT_CERT:
 		g_value_set_boxed (value, priv->phase2_client_cert);
@@ -3848,7 +3931,10 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 * specified at configure time with the --system-ca-path switch.  The
 	 * certificates in this directory are added to the verification chain in
 	 * addition to any certificates specified by the #NMSetting8021x:ca-cert and
-	 * #NMSetting8021x:phase2-ca-cert properties.
+	 * #NMSetting8021x:phase2-ca-cert properties. If the path provided with
+	 * --system-ca-path is rather a file name (bundle of trusted CA certificates),
+	 * it overrides #NMSetting8021x:ca-cert and #NMSetting8021x:phase2-ca-cert
+	 * properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
 	 **/
 	/* ---ifcfg-rh---
 	 * property: system-ca-certs
diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index 43885daa..3099fbd1 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/libnm-core/nm-setting-8021x.h
@@ -31,6 +31,8 @@
 
 G_BEGIN_DECLS
 
+#define NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH "file://"
+
 /**
  * NMSetting8021xCKFormat:
  * @NM_SETTING_802_1X_CK_FORMAT_UNKNOWN: unknown file format
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 7bc927bc..07b3401d 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -27,6 +27,7 @@
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"
+#include "nm-core-enum-types.h"
 #include "nm-setting-connection.h"
 #include "nm-connection-private.h"
 #include "nm-setting-bond.h"
@@ -66,6 +67,7 @@ typedef struct {
 	char *type;
 	char *master;
 	char *slave_type;
+	NMSettingConnectionAutoconnectSlaves autoconnect_slaves;
 	GSList *permissions; /* list of Permission structs */
 	gboolean autoconnect;
 	gint autoconnect_priority;
@@ -90,6 +92,7 @@ enum {
 	PROP_ZONE,
 	PROP_MASTER,
 	PROP_SLAVE_TYPE,
+	PROP_AUTOCONNECT_SLAVES,
 	PROP_SECONDARIES,
 	PROP_GATEWAY_PING_TIMEOUT,
 
@@ -602,6 +605,25 @@ nm_setting_connection_is_slave_type (NMSettingConnection *setting,
 	return !g_strcmp0 (NM_SETTING_CONNECTION_GET_PRIVATE (setting)->slave_type, type);
 }
 
+/**
+ * nm_setting_connection_get_autoconnect_slaves:
+ * @setting: the #NMSettingConnection
+ *
+ * Returns the #NMSettingConnection:autoconnect-slaves property of the connection.
+ *
+ * Returns: whether slaves of the connection should be activated together
+ *          with the connection.
+ *
+ * Since: 1.0.4
+ **/
+NMSettingConnectionAutoconnectSlaves
+nm_setting_connection_get_autoconnect_slaves (NMSettingConnection *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_CONNECTION (setting), NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT);
+
+	return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->autoconnect_slaves;
+}
+
 /**
  * nm_setting_connection_get_num_secondaries:
  * @setting: the #NMSettingConnection
@@ -1122,9 +1144,12 @@ set_property (GObject *object, guint prop_id,
 		g_free (priv->slave_type);
 		priv->slave_type = g_value_dup_string (value);
 		break;
+	case PROP_AUTOCONNECT_SLAVES:
+		priv->autoconnect_slaves = g_value_get_enum (value);
+		break;
 	case PROP_SECONDARIES:
 		g_slist_free_full (priv->secondaries, g_free);
-		priv->secondaries = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->secondaries = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_GATEWAY_PING_TIMEOUT:
 		priv->gateway_ping_timeout = g_value_get_uint (value);
@@ -1193,8 +1218,11 @@ get_property (GObject *object, guint prop_id,
 	case PROP_SLAVE_TYPE:
 		g_value_set_string (value, nm_setting_connection_get_slave_type (setting));
 		break;
+	case PROP_AUTOCONNECT_SLAVES:
+		g_value_set_enum (value, nm_setting_connection_get_autoconnect_slaves (setting));
+		break;
 	case PROP_SECONDARIES:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->secondaries));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->secondaries, TRUE));
 		break;
 	case PROP_GATEWAY_PING_TIMEOUT:
 		g_value_set_uint (value, priv->gateway_ping_timeout);
@@ -1523,6 +1551,37 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
 		                      NM_SETTING_PARAM_INFERRABLE |
 		                      G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSettingConnection:autoconnect-slaves:
+	 *
+	 * Whether or not slaves of this connection should be automatically brought up
+	 * when NetworkManager activates this connection. This only has a real effect
+	 * for master connections.
+	 * The permitted values are: 0: leave slave connections untouched,
+	 * 1: activate all the slave connections with this connection, -1: default.
+	 * If -1 (default) is set, global connection.autoconnect-slaves is read to
+	 * determine the real value. If it is default as well, this fallbacks to 0.
+	 *
+	 * Since: 1.0.4
+	 **/
+	/* ---ifcfg-rh---
+	 * property: autoconnect-slaves
+	 * variable: AUTOCONNECT-SLAVES(+)
+	 * default: missing variable means global default
+	 * description: Whether slaves of this connection should be auto-connected
+	 *   when this connection is activated.
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_AUTOCONNECT_SLAVES,
+		 g_param_spec_enum (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES, "", "",
+		                    NM_TYPE_SETTING_CONNECTION_AUTOCONNECT_SLAVES,
+		                    NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT,
+		                    G_PARAM_READWRITE |
+		                    G_PARAM_CONSTRUCT |
+		                    NM_SETTING_PARAM_FUZZY_IGNORE |
+		                    G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSettingConnection:secondaries:
 	 *
@@ -1563,7 +1622,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
 	g_object_class_install_property
 		(object_class, PROP_GATEWAY_PING_TIMEOUT,
 		 g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "",
-		                    0, 30, 0,
+		                    0, 600, 0,
 		                    G_PARAM_READWRITE |
 		                    G_PARAM_CONSTRUCT |
 		                    G_PARAM_STATIC_STRINGS));
diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h
index d1ad0fe1..ff89d200 100644
--- a/libnm-core/nm-setting-connection.h
+++ b/libnm-core/nm-setting-connection.h
@@ -56,9 +56,30 @@ G_BEGIN_DECLS
 #define NM_SETTING_CONNECTION_ZONE           "zone"
 #define NM_SETTING_CONNECTION_MASTER         "master"
 #define NM_SETTING_CONNECTION_SLAVE_TYPE     "slave-type"
+#define NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES "autoconnect-slaves"
 #define NM_SETTING_CONNECTION_SECONDARIES    "secondaries"
 #define NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT "gateway-ping-timeout"
 
+/* Types for property values */
+/**
+ * NMSettingConnectionAutoconnectSlaves:
+ * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT: default value
+ * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO: slaves are not brought up when
+ *   master is activated
+ * @NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES: slaves are brought up when
+ *   master is activated
+ *
+ * #NMSettingConnectionAutoconnectSlaves values indicate whether slave connections
+ * should be activated when master is activated.
+ */
+NM_AVAILABLE_IN_1_0_4
+typedef enum {
+	NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT = -1,
+	NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO = 0,
+	NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES = 1,
+} NMSettingConnectionAutoconnectSlaves;
+
+
 /**
  * NMSettingConnection:
  *
@@ -111,6 +132,8 @@ const char *nm_setting_connection_get_master           (NMSettingConnection *set
 gboolean    nm_setting_connection_is_slave_type        (NMSettingConnection *setting,
                                                         const char *type);
 const char *nm_setting_connection_get_slave_type       (NMSettingConnection *setting);
+NM_AVAILABLE_IN_1_0_4
+NMSettingConnectionAutoconnectSlaves nm_setting_connection_get_autoconnect_slaves (NMSettingConnection *setting);
 
 guint32     nm_setting_connection_get_num_secondaries  (NMSettingConnection *setting);
 const char *nm_setting_connection_get_secondary        (NMSettingConnection *setting, guint32 idx);
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index 29ca5515..7e3ae4d4 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -504,9 +504,15 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class)
 	 * 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
+	 * applications, on the other hand.  The permitted values are: -1: unknown,
+	 * 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary
 	 * addresses).
+	 *
+	 * Having a per-connection setting set to "-1" (unknown) means fallback to
+	 * global configuration "ipv6.ip6-privacy".
+	 *
+	 * If also global configuration is unspecified or set to "-1", fallback to read
+	 * "/proc/sys/net/ipv6/conf/default/use_tempaddr".
 	 **/
 	/* ---ifcfg-rh---
 	 * property: ip6-privacy
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index 2d34d509..955608fa 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -155,4 +155,6 @@ gboolean _nm_setting_use_legacy_property (NMSetting *setting,
 
 GPtrArray  *_nm_setting_need_secrets (NMSetting *setting);
 
+NMSetting8021xCKScheme nm_setting_802_1x_check_cert_scheme (gconstpointer pdata, gsize length, GError **error);
+
 #endif  /* NM_SETTING_PRIVATE_H */
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index a56a8e97..6df5b461 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -1132,15 +1132,15 @@ set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_PROTO:
 		g_slist_free_full (priv->proto, g_free);
-		priv->proto = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->proto = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_PAIRWISE:
 		g_slist_free_full (priv->pairwise, g_free);
-		priv->pairwise = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->pairwise = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_GROUP:
 		g_slist_free_full (priv->group, g_free);
-		priv->group = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->group = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_LEAP_USERNAME:
 		g_free (priv->leap_username);
@@ -1206,13 +1206,13 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_string (value, priv->auth_alg);
 		break;
 	case PROP_PROTO:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->proto));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->proto, TRUE));
 		break;
 	case PROP_PAIRWISE:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->pairwise));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->pairwise, TRUE));
 		break;
 	case PROP_GROUP:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->group));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->group, TRUE));
 		break;
 	case PROP_LEAP_USERNAME:
 		g_value_set_string (value, priv->leap_username);
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index f8d22c2d..ce3cf9a7 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -911,7 +911,7 @@ set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_SEEN_BSSIDS:
 		g_slist_free_full (priv->seen_bssids, g_free);
-		priv->seen_bssids = _nm_utils_strv_to_slist (g_value_get_boxed (value));
+		priv->seen_bssids = _nm_utils_strv_to_slist (g_value_get_boxed (value), TRUE);
 		break;
 	case PROP_HIDDEN:
 		priv->hidden = g_value_get_boolean (value);
@@ -964,7 +964,7 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_uint (value, nm_setting_wireless_get_mtu (setting));
 		break;
 	case PROP_SEEN_BSSIDS:
-		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->seen_bssids));
+		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->seen_bssids, TRUE));
 		break;
 	case PROP_HIDDEN:
 		g_value_set_boolean (value, nm_setting_wireless_get_hidden (setting));
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index b78d9376..e1e81b5d 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -91,7 +91,7 @@ _nm_gtype_hash (gconstpointer v)
 	return *((const GType *) v);
 }
 
-static void __attribute__((constructor))
+static void
 _ensure_registered (void)
 {
 	if (G_UNLIKELY (registered_settings == NULL)) {
@@ -103,6 +103,12 @@ _ensure_registered (void)
 	}
 }
 
+static void __attribute__((constructor))
+_ensure_registered_constructor (void)
+{
+	_ensure_registered ();
+}
+
 #define _ensure_setting_info(self, priv) \
 	G_STMT_START { \
 		NMSettingPrivate *_priv_esi = (priv); \
@@ -1047,13 +1053,15 @@ compare_property (NMSetting *setting,
 	property = nm_setting_class_find_property (NM_SETTING_GET_CLASS (setting), prop_spec->name);
 	g_return_val_if_fail (property != NULL, FALSE);
 
-	value1 = get_property_for_dbus (setting, property, FALSE);
-	value2 = get_property_for_dbus (other, property, FALSE);
+	value1 = get_property_for_dbus (setting, property, TRUE);
+	value2 = get_property_for_dbus (other, property, TRUE);
 
 	cmp = nm_property_compare (value1, value2);
 
-	g_variant_unref (value1);
-	g_variant_unref (value2);
+	if (value1)
+		g_variant_unref (value1);
+	if (value2)
+		g_variant_unref (value2);
 
 	return cmp == 0;
 }
diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h
index 3854d679..ffdc6315 100644
--- a/libnm-core/nm-utils-private.h
+++ b/libnm-core/nm-utils-private.h
@@ -40,12 +40,6 @@ GVariant *  _nm_utils_bytes_to_dbus     (const GValue *prop_value);
 void        _nm_utils_bytes_from_dbus   (GVariant *dbus_value,
                                          GValue *prop_value);
 
-GSList *    _nm_utils_strv_to_slist (char **strv);
-char **     _nm_utils_slist_to_strv (GSList *slist);
-
-GPtrArray * _nm_utils_strv_to_ptrarray (char **strv);
-char **     _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray);
-
 char *      _nm_utils_hwaddr_canonical_or_invalid (const char *mac, gssize length);
 
 #endif
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 5d4f1163..14686ed1 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,7 +37,7 @@
 #include "nm-setting-private.h"
 #include "crypto.h"
 #include "gsystem-local-alloc.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 #include "nm-setting-bond.h"
 #include "nm-setting-bridge.h"
@@ -433,15 +434,85 @@ nm_utils_same_ssid (const guint8 *ssid1, gsize len1,
 gboolean
 _nm_utils_string_in_list (const char *str, const char **valid_strings)
 {
-	int i;
+	return _nm_utils_strv_find_first ((char **) valid_strings, -1, str) >= 0;
+}
 
-	for (i = 0; valid_strings[i]; i++)
-		if (strcmp (str, valid_strings[i]) == 0)
-			break;
+/**
+ * _nm_utils_strv_find_first:
+ * @list: the strv list to search
+ * @len: the length of the list, or a negative value if @list is %NULL terminated.
+ * @needle: the value to search for. The search is done using strcmp().
+ *
+ * Searches @list for @needle and returns the index of the first match (based
+ * on strcmp()).
+ *
+ * For convenience, @list has type 'char**' instead of 'const char **'.
+ *
+ * Returns: index of first occurrence or -1 if @needle is not found in @list.
+ */
+gssize
+_nm_utils_strv_find_first (char **list, gssize len, const char *needle)
+{
+	gssize i;
+
+	if (len > 0) {
+		g_return_val_if_fail (list, -1);
+
+		if (!needle) {
+			/* if we search a list with known length, %NULL is a valid @needle. */
+			for (i = 0; i < len; i++) {
+				if (!list[i])
+					return i;
+			}
+		} else {
+			for (i = 0; i < len; i++) {
+				if (list[i] && !strcmp (needle, list[i]))
+					return i;
+			}
+		}
+	} else if (len < 0) {
+		g_return_val_if_fail (needle, -1);
 
-	return valid_strings[i] != NULL;
+		if (list) {
+			for (i = 0; list[i]; i++) {
+				if (strcmp (needle, list[i]) == 0)
+					return i;
+			}
+		}
+	}
+	return -1;
 }
 
+char **
+_nm_utils_strv_cleanup (char **strv,
+                        gboolean strip_whitespace,
+                        gboolean skip_empty,
+                        gboolean skip_repeated)
+{
+	guint i, j;
+
+	if (!strv || !*strv)
+		return strv;
+
+	if (strip_whitespace) {
+		for (i = 0; strv[i]; i++)
+			g_strstrip (strv[i]);
+	}
+	if (!skip_empty && !skip_repeated)
+		return strv;
+	j = 0;
+	for (i = 0; strv[i]; i++) {
+		if (   (skip_empty && !*strv[i])
+		    || (skip_repeated && _nm_utils_strv_find_first (strv, j, strv[i]) >= 0))
+			g_free (strv[i]);
+		else
+			strv[j++] = strv[i];
+	}
+	strv[j] = NULL;
+	return strv;
+}
+
+
 gboolean
 _nm_utils_string_slist_validate (GSList *list, const char **valid_values)
 {
@@ -590,6 +661,65 @@ _nm_utils_copy_object_array (const GPtrArray *array)
 	return _nm_utils_copy_array (array, g_object_ref, g_object_unref);
 }
 
+/* have @list of type 'gpointer *' instead of 'gconstpointer *' to
+ * reduce the necessity for annoying const-casts. */
+gssize
+_nm_utils_ptrarray_find_first (gpointer *list, gssize len, gconstpointer needle)
+{
+	gssize i;
+
+	if (len == 0)
+		return -1;
+
+	if (len > 0) {
+		g_return_val_if_fail (list, -1);
+		for (i = 0; i < len; i++) {
+			if (list[i] == needle)
+				return i;
+		}
+	} else {
+		g_return_val_if_fail (needle, -1);
+		for (i = 0; list && list[i]; i++) {
+			if (list[i] == needle)
+				return i;
+		}
+	}
+	return -1;
+}
+
+gssize
+_nm_utils_ptrarray_find_binary_search (gpointer *list, gsize len, gpointer needle, GCompareDataFunc cmpfcn, gpointer user_data)
+{
+	gssize imin, imax, imid;
+	int cmp;
+
+	g_return_val_if_fail (list || !len, ~((gssize) 0));
+	g_return_val_if_fail (cmpfcn, ~((gssize) 0));
+
+	imin = 0;
+	if (len == 0)
+		return ~imin;
+
+	imax = len - 1;
+
+	while (imin <= imax) {
+		imid = imin + (imax - imin) / 2;
+
+		cmp = cmpfcn (list[imid], needle, user_data);
+		if (cmp == 0)
+			return imid;
+
+		if (cmp < 0)
+			imin = imid + 1;
+		else
+			imax = imid - 1;
+	}
+
+	/* return the inverse of @imin. This is a negative number, but
+	 * also is ~imin the position where the value should be inserted. */
+	return ~imin;
+}
+
 GVariant *
 _nm_utils_bytes_to_dbus (const GValue *prop_value)
 {
@@ -625,21 +755,26 @@ _nm_utils_bytes_from_dbus (GVariant *dbus_value,
 }
 
 GSList *
-_nm_utils_strv_to_slist (char **strv)
+_nm_utils_strv_to_slist (char **strv, gboolean deep_copy)
 {
 	int i;
 	GSList *list = NULL;
 
 	if (strv) {
-		for (i = 0; strv[i]; i++)
-			list = g_slist_prepend (list, g_strdup (strv[i]));
+		if (deep_copy) {
+			for (i = 0; strv[i]; i++)
+				list = g_slist_prepend (list, g_strdup (strv[i]));
+		} else {
+			for (i = 0; strv[i]; i++)
+				list = g_slist_prepend (list, strv[i]);
+		}
 	}
 
 	return g_slist_reverse (list);
 }
 
 char **
-_nm_utils_slist_to_strv (GSList *slist)
+_nm_utils_slist_to_strv (GSList *slist, gboolean deep_copy)
 {
 	GSList *iter;
 	char **strv;
@@ -648,8 +783,13 @@ _nm_utils_slist_to_strv (GSList *slist)
 	len = g_slist_length (slist);
 	strv = g_new (char *, len + 1);
 
-	for (i = 0, iter = slist; iter; iter = iter->next, i++)
-		strv[i] = g_strdup (iter->data);
+	if (deep_copy) {
+		for (i = 0, iter = slist; iter; iter = iter->next, i++)
+			strv[i] = g_strdup (iter->data);
+	} else {
+		for (i = 0, iter = slist; iter; iter = iter->next, i++)
+			strv[i] = iter->data;
+	}
 	strv[i] = NULL;
 
 	return strv;
@@ -1942,6 +2082,8 @@ nm_utils_ip_routes_from_variant (GVariant *value,
 	return routes;
 }
 
+/**********************************************************************************************/
+
 /**
  * nm_utils_uuid_generate:
  *
@@ -2014,6 +2156,50 @@ nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, g
 	return buf;
 }
 
+/**
+ * _nm_utils_uuid_generate_from_strings:
+ * @string1: a variadic list of strings. Must be NULL terminated.
+ *
+ * Returns a variant3 UUID based on the concatenated C strings.
+ * It does not simply concatenate them, but also includes the
+ * terminating '\0' character. For example "a", "b", gives
+ * "a\0b\0".
+ *
+ * This has the advantage, that the following invocations
+ * all give different UUIDs: (NULL), (""), ("",""), ("","a"), ("a",""),
+ * ("aa"), ("aa", ""), ("", "aa"), ...
+ */
+char *
+_nm_utils_uuid_generate_from_strings (const char *string1, ...)
+{
+	GString *str;
+	va_list args;
+	const char *s;
+	char *uuid;
+
+	if (!string1)
+		return nm_utils_uuid_generate_from_string (NULL, 0, NM_UTILS_UUID_TYPE_VARIANT3, NM_UTILS_UUID_NS);
+
+	str = g_string_sized_new (120); /* effectively allocates power of 2 (128)*/
+
+	g_string_append_len (str, string1, strlen (string1) + 1);
+
+	va_start (args, string1);
+	s = va_arg (args, const char *);
+	while (s) {
+		g_string_append_len (str, s, strlen (s) + 1);
+		s = va_arg (args, const char *);
+	}
+	va_end (args);
+
+	uuid = nm_utils_uuid_generate_from_string (str->str, str->len, NM_UTILS_UUID_TYPE_VARIANT3, NM_UTILS_UUID_NS);
+
+	g_string_free (str, TRUE);
+	return uuid;
+}
+
+/**********************************************************************************************/
+
 /**
  * nm_utils_rsa_key_encrypt:
  * @data: (array length=len): RSA private key data to be encrypted
@@ -3278,3 +3464,79 @@ nm_utils_bond_mode_string_to_int (const char *mode)
 	}
 	return -1;
 }
+
+/**********************************************************************************************/
+
+/* _nm_utils_ascii_str_to_int64:
+ *
+ * A wrapper for g_ascii_strtoll, that checks whether the whole string
+ * can be successfully converted to a number and is within a given
+ * range. On any error, @fallback will be returned and %errno will be set
+ * to a non-zero value. On success, %errno will be set to zero, check %errno
+ * for errors. Any trailing or leading (ascii) white space is ignored and the
+ * functions is locale independent.
+ *
+ * The function is guaranteed to return a value between @min and @max
+ * (inclusive) or @fallback. Also, the parsing is rather strict, it does
+ * not allow for any unrecognized characters, except leading and trailing
+ * white space.
+ **/
+gint64
+_nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback)
+{
+	gint64 v;
+	size_t len;
+	char buf[64], *s, *str_free = NULL;
+
+	if (str) {
+		while (g_ascii_isspace (str[0]))
+			str++;
+	}
+	if (!str || !str[0]) {
+		errno = EINVAL;
+		return fallback;
+	}
+
+	len = strlen (str);
+	if (g_ascii_isspace (str[--len])) {
+		/* backward search the first non-ws character.
+		 * We already know that str[0] is non-ws. */
+		while (g_ascii_isspace (str[--len]))
+			;
+
+		/* str[len] is now the last non-ws character... */
+		len++;
+
+		if (len >= sizeof (buf))
+			s = str_free = g_malloc (len + 1);
+		else
+			s = buf;
+
+		memcpy (s, str, len);
+		s[len] = 0;
+
+		nm_assert (len > 0 && len < strlen (str) && len == strlen (s));
+		nm_assert (!g_ascii_isspace (str[len-1]) && g_ascii_isspace (str[len]));
+		nm_assert (strncmp (str, s, len) == 0);
+
+		str = s;
+	}
+
+	errno = 0;
+	v = g_ascii_strtoll (str, &s, base);
+
+	if (errno != 0)
+		v = fallback;
+	else if (s[0] != 0) {
+		errno = EINVAL;
+		v = fallback;
+	} else if (v > max || v < min) {
+		errno = ERANGE;
+		v = fallback;
+	}
+
+	if (G_UNLIKELY (str_free))
+		g_free (str_free);
+	return v;
+}
+
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 46103544..e36d921e 100644
--- a/libnm-core/nm-version.h
+++ b/libnm-core/nm-version.h
@@ -43,7 +43,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (2)
+#define NM_MICRO_VERSION (4)
 
 /**
  * NM_CHECK_VERSION:
@@ -67,9 +67,11 @@
 #define NM_VERSION_0_9_8  (NM_ENCODE_VERSION (0, 9, 8))
 #define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
 #define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
+#define NM_VERSION_1_0_2  (NM_ENCODE_VERSION (1, 0, 2))
+#define NM_VERSION_1_0_4  (NM_ENCODE_VERSION (1, 0, 4))
 
-#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
-#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0
+#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0_2
+#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_4
 
 #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0)
 # undef NM_VERSION_MIN_REQUIRED
@@ -120,4 +122,10 @@
 # define NM_AVAILABLE_IN_1_0
 #endif
 
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_4
+# define NM_AVAILABLE_IN_1_0_4          G_UNAVAILABLE(1,0.4)
+#else
+# define NM_AVAILABLE_IN_1_0_4
+#endif
+
 #endif  /* NM_VERSION_H */
diff --git a/libnm-core/nm-version.h.in b/libnm-core/nm-version.h.in
index bbbf993a..9c9219e1 100644
--- a/libnm-core/nm-version.h.in
+++ b/libnm-core/nm-version.h.in
@@ -67,9 +67,11 @@
 #define NM_VERSION_0_9_8  (NM_ENCODE_VERSION (0, 9, 8))
 #define NM_VERSION_0_9_10 (NM_ENCODE_VERSION (0, 9, 10))
 #define NM_VERSION_1_0    (NM_ENCODE_VERSION (1, 0, 0))
+#define NM_VERSION_1_0_2  (NM_ENCODE_VERSION (1, 0, 2))
+#define NM_VERSION_1_0_4  (NM_ENCODE_VERSION (1, 0, 4))
 
-#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0
-#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0
+#define NM_VERSION_CUR_STABLE  NM_VERSION_1_0_2
+#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_4
 
 #if !defined (NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0)
 # undef NM_VERSION_MIN_REQUIRED
@@ -120,4 +122,10 @@
 # define NM_AVAILABLE_IN_1_0
 #endif
 
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_4
+# define NM_AVAILABLE_IN_1_0_4          G_UNAVAILABLE(1,0.4)
+#else
+# define NM_AVAILABLE_IN_1_0_4
+#endif
+
 #endif  /* NM_VERSION_H */
diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am
index 79aa73db..daa5825b 100644
--- a/libnm-core/tests/Makefile.am
+++ b/libnm-core/tests/Makefile.am
@@ -15,6 +15,7 @@ noinst_PROGRAMS =		\
 	test-compare		\
 	test-crypto		\
 	test-general		\
+	test-keyfile		\
 	test-secrets		\
 	test-setting-8021x	\
 	test-setting-dcb	\
@@ -38,20 +39,22 @@ endif
 #	-name "test-pkcs12" \
 #	-out test-cert.p12
 
-EXTRA_DIST =                              \
-	certs/test_ca_cert.pem            \
-	certs/test_ca_cert.der            \
-	certs/test_key_and_cert.pem       \
-	certs/test-cert.p12               \
-	certs/test2_ca_cert.pem           \
-	certs/test2_key_and_cert.pem      \
-	certs/test2-cert.p12              \
-	certs/ca-no-ending-newline.pem    \
-	certs/test-key-only.pem           \
-	certs/test-key-only-decrypted.der \
-	certs/test-key-only-decrypted.pem \
-	certs/pkcs8-enc-key.pem           \
-	certs/pkcs8-noenc-key.pem         \
-	certs/pkcs8-decrypted.der         \
-	certs/test-aes-key.pem
+EXTRA_DIST =                            \
+	certs/ca-no-ending-newline.pem      \
+	certs/pkcs8-decrypted.der           \
+	certs/pkcs8-enc-key.pem             \
+	certs/pkcs8-noenc-key.pem           \
+	certs/test2_ca_cert.pem             \
+	certs/test2-cert.p12                \
+	certs/test2_key_and_cert.pem        \
+	certs/test-aes-key.pem              \
+	certs/test_ca_cert.der              \
+	certs/test_ca_cert.pem              \
+	certs/test-ca-cert.pem              \
+	certs/test-cert.p12                 \
+	certs/test_key_and_cert.pem         \
+	certs/test-key-and-cert.pem         \
+	certs/test-key-only-decrypted.der   \
+	certs/test-key-only-decrypted.pem   \
+	certs/test-key-only.pem
 
diff --git a/libnm-core/tests/Makefile.in b/libnm-core/tests/Makefile.in
index c2b15c6a..edb6a50e 100644
--- a/libnm-core/tests/Makefile.in
+++ b/libnm-core/tests/Makefile.in
@@ -90,7 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 @ENABLE_TESTS_TRUE@noinst_PROGRAMS = test-compare$(EXEEXT) \
 @ENABLE_TESTS_TRUE@	test-crypto$(EXEEXT) test-general$(EXEEXT) \
-@ENABLE_TESTS_TRUE@	test-secrets$(EXEEXT) \
+@ENABLE_TESTS_TRUE@	test-keyfile$(EXEEXT) test-secrets$(EXEEXT) \
 @ENABLE_TESTS_TRUE@	test-setting-8021x$(EXEEXT) \
 @ENABLE_TESTS_TRUE@	test-setting-dcb$(EXEEXT) \
 @ENABLE_TESTS_TRUE@	test-settings-defaults$(EXEEXT)
@@ -140,6 +140,12 @@ test_general_LDADD = $(LDADD)
 @ENABLE_TESTS_TRUE@test_general_DEPENDENCIES =  \
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-core/libnm-core.la \
 @ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
+test_keyfile_SOURCES = test-keyfile.c
+test_keyfile_OBJECTS = test-keyfile.$(OBJEXT)
+test_keyfile_LDADD = $(LDADD)
+@ENABLE_TESTS_TRUE@test_keyfile_DEPENDENCIES =  \
+@ENABLE_TESTS_TRUE@	$(top_builddir)/libnm-core/libnm-core.la \
+@ENABLE_TESTS_TRUE@	$(am__DEPENDENCIES_1)
 test_secrets_SOURCES = test-secrets.c
 test_secrets_OBJECTS = test-secrets.$(OBJEXT)
 test_secrets_LDADD = $(LDADD)
@@ -198,12 +204,12 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = test-compare.c test-crypto.c test-general.c test-secrets.c \
-	test-setting-8021x.c test-setting-dcb.c \
-	test-settings-defaults.c
-DIST_SOURCES = test-compare.c test-crypto.c test-general.c \
+SOURCES = test-compare.c test-crypto.c test-general.c test-keyfile.c \
 	test-secrets.c test-setting-8021x.c test-setting-dcb.c \
 	test-settings-defaults.c
+DIST_SOURCES = test-compare.c test-crypto.c test-general.c \
+	test-keyfile.c test-secrets.c test-setting-8021x.c \
+	test-setting-dcb.c test-settings-defaults.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -250,13 +256,196 @@ am__tty_colors = { \
     std=''; \
   fi; \
 }
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/build-aux/depcomp
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -370,6 +559,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -538,26 +728,28 @@ with_valgrind = @with_valgrind@
 #	-name "test-pkcs12" \
 #	-out test-cert.p12
 EXTRA_DIST = \
-	certs/test_ca_cert.pem            \
-	certs/test_ca_cert.der            \
-	certs/test_key_and_cert.pem       \
-	certs/test-cert.p12               \
-	certs/test2_ca_cert.pem           \
-	certs/test2_key_and_cert.pem      \
-	certs/test2-cert.p12              \
-	certs/ca-no-ending-newline.pem    \
-	certs/test-key-only.pem           \
-	certs/test-key-only-decrypted.der \
-	certs/test-key-only-decrypted.pem \
-	certs/pkcs8-enc-key.pem           \
-	certs/pkcs8-noenc-key.pem         \
-	certs/pkcs8-decrypted.der         \
-	certs/test-aes-key.pem
+	certs/ca-no-ending-newline.pem      \
+	certs/pkcs8-decrypted.der           \
+	certs/pkcs8-enc-key.pem             \
+	certs/pkcs8-noenc-key.pem           \
+	certs/test2_ca_cert.pem             \
+	certs/test2-cert.p12                \
+	certs/test2_key_and_cert.pem        \
+	certs/test-aes-key.pem              \
+	certs/test_ca_cert.der              \
+	certs/test_ca_cert.pem              \
+	certs/test-ca-cert.pem              \
+	certs/test-cert.p12                 \
+	certs/test_key_and_cert.pem         \
+	certs/test-key-and-cert.pem         \
+	certs/test-key-only-decrypted.der   \
+	certs/test-key-only-decrypted.pem   \
+	certs/test-key-only.pem
 
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -609,6 +801,10 @@ test-general$(EXEEXT): $(test_general_OBJECTS) $(test_general_DEPENDENCIES) $(EX
 	@rm -f test-general$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_general_OBJECTS) $(test_general_LDADD) $(LIBS)
 
+test-keyfile$(EXEEXT): $(test_keyfile_OBJECTS) $(test_keyfile_DEPENDENCIES) $(EXTRA_test_keyfile_DEPENDENCIES) 
+	@rm -f test-keyfile$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_keyfile_OBJECTS) $(test_keyfile_LDADD) $(LIBS)
+
 test-secrets$(EXEEXT): $(test_secrets_OBJECTS) $(test_secrets_DEPENDENCIES) $(EXTRA_test_secrets_DEPENDENCIES) 
 	@rm -f test-secrets$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_secrets_OBJECTS) $(test_secrets_LDADD) $(LIBS)
@@ -634,6 +830,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-compare.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-crypto.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-general.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-keyfile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-secrets.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setting-8021x.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-setting-dcb.Po@am__quote@
@@ -718,98 +915,217 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-compare.log: test-compare$(EXEEXT)
+	@p='test-compare$(EXEEXT)'; \
+	b='test-compare'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-crypto.log: test-crypto$(EXEEXT)
+	@p='test-crypto$(EXEEXT)'; \
+	b='test-crypto'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-general.log: test-general$(EXEEXT)
+	@p='test-general$(EXEEXT)'; \
+	b='test-general'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-keyfile.log: test-keyfile$(EXEEXT)
+	@p='test-keyfile$(EXEEXT)'; \
+	b='test-keyfile'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-secrets.log: test-secrets$(EXEEXT)
+	@p='test-secrets$(EXEEXT)'; \
+	b='test-secrets'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setting-8021x.log: test-setting-8021x$(EXEEXT)
+	@p='test-setting-8021x$(EXEEXT)'; \
+	b='test-setting-8021x'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setting-dcb.log: test-setting-dcb$(EXEEXT)
+	@p='test-setting-dcb$(EXEEXT)'; \
+	b='test-setting-dcb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-settings-defaults.log: test-settings-defaults$(EXEEXT)
+	@p='test-settings-defaults$(EXEEXT)'; \
+	b='test-settings-defaults'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -866,6 +1182,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -961,7 +1280,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/libnm-core/tests/certs/test-ca-cert.pem b/libnm-core/tests/certs/test-ca-cert.pem
new file mode 100644
index 00000000..ef1be20d
--- /dev/null
+++ b/libnm-core/tests/certs/test-ca-cert.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEjzCCA3egAwIBAgIJAOvnZPt59yIZMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
+VQQGEwJVUzESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdOZXdidXJ5MRcw
+FQYDVQQKEw5NeSBDb21wYW55IEx0ZDEQMA4GA1UECxMHVGVzdGluZzENMAsGA1UE
+AxMEdGVzdDEcMBoGCSqGSIb3DQEJARYNdGVzdEB0ZXN0LmNvbTAeFw0wOTAzMTAx
+NTEyMTRaFw0xOTAzMDgxNTEyMTRaMIGLMQswCQYDVQQGEwJVUzESMBAGA1UECBMJ
+QmVya3NoaXJlMRAwDgYDVQQHEwdOZXdidXJ5MRcwFQYDVQQKEw5NeSBDb21wYW55
+IEx0ZDEQMA4GA1UECxMHVGVzdGluZzENMAsGA1UEAxMEdGVzdDEcMBoGCSqGSIb3
+DQEJARYNdGVzdEB0ZXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKot9j+/+CX1/gZLgJHIXCRgCItKLGnf7qGbgqB9T2ACBqR0jllKWwDKrcWU
+xjXNIc+GF9Wnv+lX6G0Okn4Zt3/uRNobL+2b/yOF7M3Td3/9W873zdkQQX930YZc
+Rr8uxdRPP5bxiCgtcw632y21sSEbG9mjccAUnV/0jdvfmMNj0i8gN6E0fMBiJ9S3
+FkxX/KFvt9JWE9CtoyL7ki7UIDq+6vj7Gd5N0B3dOa1y+rRHZzKlJPcSXQSEYUS4
+HmKDwiKSVahft8c4tDn7KPi0vex91hlgZVd3usL2E/Vq7o5D9FAZ5kZY0AdFXwdm
+J4lO4Mj7ac7GE4vNERNcXVIX59sCAwEAAaOB8zCB8DAdBgNVHQ4EFgQUuDU3Mr7P
+T3n1e3Sy8hBauoDFahAwgcAGA1UdIwSBuDCBtYAUuDU3Mr7PT3n1e3Sy8hBauoDF
+ahChgZGkgY4wgYsxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAO
+BgNVBAcTB05ld2J1cnkxFzAVBgNVBAoTDk15IENvbXBhbnkgTHRkMRAwDgYDVQQL
+EwdUZXN0aW5nMQ0wCwYDVQQDEwR0ZXN0MRwwGgYJKoZIhvcNAQkBFg10ZXN0QHRl
+c3QuY29tggkA6+dk+3n3IhkwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
+AQEAVRG4aALIvCXCiKfe7K+iJxjBVRDFPEf7JWA9LGgbFOn6pNvbxonrR+0BETdc
+JV1ET4ct2xsE7QNFIkp9GKRC+6J32zCo8qtLCD5+v436r8TUG2/t2JRMkb9I2XVT
+p7RJoot6M0Ltf8KNQUPYh756xmKZ4USfQUwc58MOSDGY8VWEXJOYij9Pf0e0c52t
+qiCEjXH7uXiS8Pgq9TYm7AkWSOrglYhSa83x0f8mtT8Q15nBESIHZ6o8FAS2bBgn
+B0BkrKRjtBUkuJG3vTox+bYINh2Gxi1JZHWSV1tN5z3hd4VFcKqanW5OgQwToBqp
+3nniskIjbH0xjgZf/nVMyLnjxg==
+-----END CERTIFICATE-----
diff --git a/libnm-core/tests/certs/test-key-and-cert.pem b/libnm-core/tests/certs/test-key-and-cert.pem
new file mode 100644
index 00000000..dec9aa1b
--- /dev/null
+++ b/libnm-core/tests/certs/test-key-and-cert.pem
@@ -0,0 +1,118 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,4DE0615F23D82107
+
+QPNCO5Dobvz9dDhN32KkZRoEifW+HDm2PCbRQhKDiscGwB6LgypvVjHNsZiFKwzz
+L4R51UqgQeJx7GSGJqE626e9z9J+UNBhop02aOO2X0eSPdvBzr/uJ6Umiyr1xqD7
+zWf7u9l5kXElDJRhK+87GMBewp4Ie9NeXDjhF8hzC5Kiulen4AH3AYnfH3S7DimU
+h8GFMg8inrudrTbcjBhCdPeHG2jCygOxw3InRFz7uaN6LIhOaPQvmvpP4Cc1WRnW
+ZPq9o+eU3fPWPD5t+Op/VzYLvKwgBy/yK1rQXUm6ZMO7MhhRJ94ZCsJv+nVWpJlv
+QyBlxDKxwfkfYbDELdnnDQdHdMbKatLqa0KhSkgpp8LywBtanPz731tyT0r7b3na
+eLdra59lRU7ZQLPEdS3lPZd2O/KQvWf8wbg7MjXS9LxQ7R5HOPu6DNJlwXVZBmmo
+cAfu2q8ubU2IePvWLD1GOrBi6hE9TiGvFJkw+wBK+t72sz3njv9Xm/zlxruaEk5m
+RW/kybU3FP4PtjriBbskz3/VZaaxuRN7OoOYTkmyHmG1ADgcRUV6fea19qqsBlN8
+xb+SRtoH28oT/JVWU5neE2dbNzk5LeVO+w70NNdR5s5xqkBhbGGaJxvXwNP4ltFr
+T06SMh8znOLKwWB00aRtwfU7jOwR3mOleQO4ugIHmau3zp1TqzAHW8XtpuV7qVeI
+ESZOZuf0vW43BtNzgLXt1+r+bmsMsRwhnyomL9M0TUyyBdVYY9GkzTG9pOESheRo
+RSvAZ8qKGUliTpgBcbt2v1+NqkszcHa6FxuvS8YU4uo5/GqsgTxHTNIB232hIrrZ
+EIm6QL9TC5oFXMjy6UNqoCm5Nb8DBJ6aErt7pt7aoktqUW3O3QIzQT3IbZ4nAcTt
+lVF4d7j29I9t7bcC8GOVU1neilguZUss4ghJg9x4zI5UZdR7hZ8fbFT47TyxB+j5
+r0YdmjbjVTaSyaN2JGh1wvb4TzawGNVx/U2EJE16HigOtPfsfQRJ3x+FROKBdVa4
+aIFYXkRBeIPxX6n9pcw0lBCsnXo6/5iTjQSk2VqO3rHO/wyWiEjNczhL33dY2A8W
+GG5ECMO5SqXZHQQzpABqK94dxe3UC8aEESO5NhEqDuV7qQGol0qPKrUA3wb0jb2e
+DrejJ9HS2m1SUDmjpvvmEGy6GN7CRibbKt5rNZdJNNvWArOF5d0F6wkixQLl73oE
+lq5gLQQk9n7ClleKLhlQpBCorxilBbzmSUekkJLi0eaZiBBFWBX9udqnUZloXTgO
+8qwuO8K/GPR9Jy1/UH2Vh1H+wivaqKTVgEb0NotzgzECgTEFKJafl7rUNs1OZRZ3
+VBjevi6+iDpxVFgF71kXfdUC4ph0E1XDl0ja2rrKQGivMkUhWJ57+4EV5+hBkAnt
+G0RV45NwHXLrK2bd8F9PlRk2XHW6mIcFRXsW1DjeBhk/sQjvlO9R01GRSgcXtekJ
+tmX17FWrMrzXHpvy1IC3fk4RVnSjpzQ8O+17YE8/la9wVaeZZzHyYFmMT7VXjIhW
+QozJQ0vJ2jxJRh5GYn3tpJzdaeRfvTBik0pChNdUTnWP+BJ35xoCTs8iwJbmgVZ1
+-----END RSA PRIVATE KEY-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: md5WithRSAEncryption
+        Issuer: C=US, ST=Berkshire, L=Newbury, O=My Company Ltd, OU=Testing, CN=test/emailAddress=test@test.com
+        Validity
+            Not Before: Mar 10 15:13:16 2009 GMT
+            Not After : Mar  8 15:13:16 2019 GMT
+        Subject: C=US, ST=Berkshire, O=My Company Ltd, OU=Testing, CN=test1/emailAddress=test@test.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:cd:34:b1:2e:b0:04:c6:f4:2b:a2:c0:a0:39:7a:
+                    82:ed:96:c4:f7:19:83:91:5c:b4:e7:9c:de:ec:48:
+                    ec:2d:e4:51:08:26:42:ac:d3:98:26:7a:72:f7:49:
+                    c2:9e:66:05:c6:47:29:fe:3b:ac:6b:af:6f:5e:a8:
+                    03:5a:73:33:ba:19:03:00:35:f5:00:bc:a8:be:14:
+                    ce:46:69:e3:6d:ed:34:37:85:55:87:62:b3:b7:c9:
+                    c0:cc:9a:aa:61:05:5b:cd:a2:17:42:d3:e5:6f:1c:
+                    60:8d:c2:15:41:46:f8:12:54:d0:38:57:e1:fd:8d:
+                    44:c8:fb:56:b3:b9:6c:e9:f8:9e:21:11:57:1b:8b:
+                    f9:cf:e3:17:e7:d8:fd:ac:d1:01:c6:92:30:f3:2d:
+                    c9:d6:c1:f0:3d:fd:ca:30:dd:75:74:e7:d1:6b:75:
+                    d8:c5:4d:43:61:fe:f6:ad:7e:4c:63:7c:03:17:a2:
+                    06:8f:d0:8b:69:d3:7a:07:0f:0b:a2:cf:0c:70:38:
+                    ba:cc:55:35:60:84:58:d8:d2:be:1f:ef:76:a9:ba:
+                    ae:6a:dc:08:97:80:de:42:00:b7:d4:ce:9a:b0:36:
+                    2a:c7:6f:45:04:7c:ea:41:19:d8:b9:19:04:1f:11:
+                    a9:22:80:bd:69:08:15:0d:3c:de:cd:7e:88:6c:0f:
+                    a3:43
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                CE:03:7E:EF:E7:DE:C9:87:BF:DE:56:F4:C8:A3:40:F6:C8:6F:05:8C
+            X509v3 Authority Key Identifier: 
+                keyid:B8:35:37:32:BE:CF:4F:79:F5:7B:74:B2:F2:10:5A:BA:80:C5:6A:10
+                DirName:/C=US/ST=Berkshire/L=Newbury/O=My Company Ltd/OU=Testing/CN=test/emailAddress=test@test.com
+                serial:EB:E7:64:FB:79:F7:22:19
+
+    Signature Algorithm: md5WithRSAEncryption
+        7a:20:93:63:40:73:7d:33:01:2e:c0:13:52:a4:a7:e1:4d:82:
+        f4:fb:b2:7b:d0:2b:5a:3f:0e:3c:28:61:71:ab:01:4d:fe:89:
+        b5:cd:2f:97:59:93:53:9d:51:86:48:dd:b9:e4:73:5e:22:0b:
+        12:0d:25:39:76:16:44:06:0c:40:45:21:6b:a6:b1:e0:bf:76:
+        1b:36:f3:1e:41:82:57:d9:59:b7:60:40:43:1c:1d:79:f6:48:
+        32:5c:4e:e2:06:89:96:41:d2:54:1f:4a:6f:f6:78:a5:3c:02:
+        85:21:e2:65:e1:8a:6d:24:19:95:f8:c0:35:ab:bd:ff:3d:f1:
+        fb:50:2d:30:1e:67:a6:7c:50:f9:d5:77:66:77:5a:14:0f:5c:
+        cd:21:09:9b:a3:92:57:19:dd:01:a4:18:c5:f9:70:e4:17:43:
+        8d:b1:e6:61:e9:50:89:83:4f:ce:a4:57:68:58:40:70:ae:71:
+        1c:47:66:d2:30:54:50:ea:3a:87:32:64:3b:18:42:fe:5a:19:
+        07:64:f7:f1:b1:10:07:fd:a7:d2:a7:a8:05:79:5b:25:ba:69:
+        7b:1a:3e:b1:3e:e4:17:17:01:ba:eb:54:ae:83:00:ed:66:62:
+        8d:c0:3e:8a:b4:27:5f:e9:01:ce:20:c3:34:a9:28:c0:6f:c7:
+        3b:65:fe:f9
+-----BEGIN CERTIFICATE-----
+MIIEojCCA4qgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBizELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCUJlcmtzaGlyZTEQMA4GA1UEBxMHTmV3YnVyeTEXMBUGA1UEChMO
+TXkgQ29tcGFueSBMdGQxEDAOBgNVBAsTB1Rlc3RpbmcxDTALBgNVBAMTBHRlc3Qx
+HDAaBgkqhkiG9w0BCQEWDXRlc3RAdGVzdC5jb20wHhcNMDkwMzEwMTUxMzE2WhcN
+MTkwMzA4MTUxMzE2WjB6MQswCQYDVQQGEwJVUzESMBAGA1UECBMJQmVya3NoaXJl
+MRcwFQYDVQQKEw5NeSBDb21wYW55IEx0ZDEQMA4GA1UECxMHVGVzdGluZzEOMAwG
+A1UEAxMFdGVzdDExHDAaBgkqhkiG9w0BCQEWDXRlc3RAdGVzdC5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNNLEusATG9CuiwKA5eoLtlsT3GYOR
+XLTnnN7sSOwt5FEIJkKs05gmenL3ScKeZgXGRyn+O6xrr29eqANaczO6GQMANfUA
+vKi+FM5GaeNt7TQ3hVWHYrO3ycDMmqphBVvNohdC0+VvHGCNwhVBRvgSVNA4V+H9
+jUTI+1azuWzp+J4hEVcbi/nP4xfn2P2s0QHGkjDzLcnWwfA9/cow3XV059FrddjF
+TUNh/vatfkxjfAMXogaP0Itp03oHDwuizwxwOLrMVTVghFjY0r4f73apuq5q3AiX
+gN5CALfUzpqwNirHb0UEfOpBGdi5GQQfEakigL1pCBUNPN7NfohsD6NDAgMBAAGj
+ggEfMIIBGzAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
+YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUzgN+7+feyYe/3lb0yKNA9shvBYww
+gcAGA1UdIwSBuDCBtYAUuDU3Mr7PT3n1e3Sy8hBauoDFahChgZGkgY4wgYsxCzAJ
+BgNVBAYTAlVTMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAOBgNVBAcTB05ld2J1cnkx
+FzAVBgNVBAoTDk15IENvbXBhbnkgTHRkMRAwDgYDVQQLEwdUZXN0aW5nMQ0wCwYD
+VQQDEwR0ZXN0MRwwGgYJKoZIhvcNAQkBFg10ZXN0QHRlc3QuY29tggkA6+dk+3n3
+IhkwDQYJKoZIhvcNAQEEBQADggEBAHogk2NAc30zAS7AE1Kkp+FNgvT7snvQK1o/
+DjwoYXGrAU3+ibXNL5dZk1OdUYZI3bnkc14iCxINJTl2FkQGDEBFIWumseC/dhs2
+8x5BglfZWbdgQEMcHXn2SDJcTuIGiZZB0lQfSm/2eKU8AoUh4mXhim0kGZX4wDWr
+vf898ftQLTAeZ6Z8UPnVd2Z3WhQPXM0hCZujklcZ3QGkGMX5cOQXQ42x5mHpUImD
+T86kV2hYQHCucRxHZtIwVFDqOocyZDsYQv5aGQdk9/GxEAf9p9KnqAV5WyW6aXsa
+PrE+5BcXAbrrVK6DAO1mYo3APoq0J1/pAc4gwzSpKMBvxztl/vk=
+-----END CERTIFICATE-----
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 7df4e57a..bd144f38 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -19,6 +19,8 @@
  *
  */
 
+#define NM_GLIB_COMPAT_H_TEST
+
 #include "config.h"
 
 #include 
@@ -57,6 +59,7 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-simple-connection.h"
+#include "nm-glib-compat.h"
 
 #include "nm-test-utils.h"
 
@@ -1963,6 +1966,7 @@ test_connection_diff_a_only (void)
 			{ NM_SETTING_CONNECTION_ZONE,                 NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_MASTER,               NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_SLAVE_TYPE,           NM_SETTING_DIFF_RESULT_IN_A },
+			{ NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES,   NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_SECONDARIES,          NM_SETTING_DIFF_RESULT_IN_A },
 			{ NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A },
 			{ NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }
@@ -4038,6 +4042,410 @@ test_nm_utils_uuid_generate_from_string (void)
 	_test_uuid (NM_UTILS_UUID_TYPE_VARIANT3, "002a0ada-f547-375a-bab5-896a11d1927e", "a\0b", 3, UUID_NS_DNS);
 }
 
+/*******************************************/
+
+static void
+__test_uuid (const char *expected_uuid, const char *str, gssize slen, char *uuid_test)
+{
+	g_assert (uuid_test);
+	g_assert (nm_utils_is_uuid (uuid_test));
+
+	if (strcmp (uuid_test, expected_uuid)) {
+		g_error ("UUID test failed (1): text=%s, len=%lld, expected=%s, uuid_test=%s",
+		         str, (long long) slen, expected_uuid, uuid_test);
+	}
+	g_free (uuid_test);
+
+	uuid_test = nm_utils_uuid_generate_from_string (str, slen, NM_UTILS_UUID_TYPE_VARIANT3, NM_UTILS_UUID_NS);
+
+	g_assert (uuid_test);
+	g_assert (nm_utils_is_uuid (uuid_test));
+
+	if (strcmp (uuid_test, expected_uuid)) {
+		g_error ("UUID test failed (2): text=%s; len=%lld, expected=%s, uuid2=%s",
+		         str, (long long) slen, expected_uuid, uuid_test);
+	}
+	g_free (uuid_test);
+}
+
+#define _test_uuid(expected_uuid, str, strlen, ...) __test_uuid (expected_uuid, str, strlen, _nm_utils_uuid_generate_from_strings(__VA_ARGS__, NULL))
+
+static void
+test_nm_utils_uuid_generate_from_strings (void)
+{
+	_test_uuid ("b07c334a-399b-32de-8d50-58e4e08f98e3", "",         0, NULL);
+	_test_uuid ("b8a426cb-bcb5-30a3-bd8f-6786fea72df9", "\0",       1, "");
+	_test_uuid ("12a4a982-7aae-39e1-951e-41aeb1250959", "a\0",      2, "a");
+	_test_uuid ("69e22c7e-f89f-3a43-b239-1cb52ed8db69", "aa\0",     3, "aa");
+	_test_uuid ("59829fd3-5ad5-3d90-a7b0-4911747e4088", "\0\0",     2, "",   "");
+	_test_uuid ("01ad0e06-6c50-3384-8d86-ddab81421425", "a\0\0",    3, "a",  "");
+	_test_uuid ("e1ed8647-9ed3-3ec8-8c6d-e8204524d71d", "aa\0\0",   4, "aa", "");
+	_test_uuid ("fb1c7cd6-275c-3489-9382-83b900da8af0", "\0a\0",    3, "",   "a");
+	_test_uuid ("5d79494e-c4ba-31a6-80a2-d6016ccd7e17", "a\0a\0",   4, "a",  "a");
+	_test_uuid ("fd698d86-1b60-3ebe-855f-7aada9950a8d", "aa\0a\0",  5, "aa", "a");
+	_test_uuid ("8c573b48-0f01-30ba-bb94-c5f59f4fe517", "\0aa\0",   4, "",   "aa");
+	_test_uuid ("2bdd3d46-eb83-3c53-a41b-a724d04b5544", "a\0aa\0",  5, "a",  "aa");
+	_test_uuid ("13d4b780-07c1-3ba7-b449-81c4844ef039", "aa\0aa\0", 6, "aa", "aa");
+	_test_uuid ("dd265bf7-c05a-3037-9939-b9629858a477", "a\0b\0",   4, "a",  "b");
+}
+
+/******************************************************************************/
+
+static void
+test_nm_utils_ascii_str_to_int64_check (const char *str, guint base, gint64 min,
+                                        gint64 max, gint64 fallback, int exp_errno,
+                                        gint64 exp_val)
+{
+	gint64 v;
+
+	errno = 1;
+	v = _nm_utils_ascii_str_to_int64 (str, base, min, max, fallback);
+	g_assert_cmpint (errno, ==, exp_errno);
+	g_assert_cmpint (v, ==, exp_val);
+}
+
+static void
+test_nm_utils_ascii_str_to_int64_do (const char *str, guint base, gint64 min,
+                                     gint64 max, gint64 fallback, int exp_errno,
+                                     gint64 exp_val)
+{
+	const char *sign = "";
+	const char *val;
+	static const char *whitespaces[] = {
+		"",
+		" ",
+		"\r\n\t",
+		" \r\n\t ",
+		" \r\n\t \t\r\n\t",
+		NULL,
+	};
+	static const char *nulls[] = {
+		"",
+		"0",
+		"00",
+		"0000",
+		"0000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+		NULL,
+	};
+	const char **ws_pre, **ws_post, **null;
+	guint i;
+
+	if (str == NULL || exp_errno != 0) {
+		test_nm_utils_ascii_str_to_int64_check (str, base, min, max, fallback, exp_errno, exp_val);
+		return;
+	}
+
+	if (strncmp (str, "-", 1) == 0)
+		sign = "-";
+
+	val = str + strlen (sign);
+
+	for (ws_pre = whitespaces; *ws_pre; ws_pre++) {
+		for (ws_post = whitespaces; *ws_post; ws_post++) {
+			for (null = nulls; *null; null++) {
+				for (i = 0; ; i++) {
+					char *s;
+					const char *str_base = "";
+
+					if (base == 16) {
+						if (i == 1)
+							str_base = "0x";
+						else if (i > 1)
+							break;
+					} else if (base == 8) {
+						if (i == 1)
+							str_base = "0";
+						else if (i > 1)
+							break;
+					} else if (base == 0) {
+						if (i > 0)
+							break;
+						/* with base==0, a leading zero would be interpreted as octal. Only test without *null */
+						if ((*null)[0])
+							break;
+					} else {
+						if (i > 0)
+							break;
+					}
+
+					s = g_strdup_printf ("%s%s%s%s%s%s", *ws_pre, sign, str_base, *null, val, *ws_post);
+
+					test_nm_utils_ascii_str_to_int64_check (s, base, min, max, fallback, exp_errno, exp_val);
+					g_free (s);
+				}
+			}
+		}
+	}
+}
+
+static void
+test_nm_utils_ascii_str_to_int64 (void)
+{
+	test_nm_utils_ascii_str_to_int64_do (NULL, 10, 0, 10000, -1, EINVAL, -1);
+	test_nm_utils_ascii_str_to_int64_do ("", 10, 0, 10000, -1, EINVAL, -1);
+	test_nm_utils_ascii_str_to_int64_do ("1x", 10, 0, 10000, -1, EINVAL, -1);
+	test_nm_utils_ascii_str_to_int64_do ("4711", 10, 0, 10000, -1, 0, 4711);
+	test_nm_utils_ascii_str_to_int64_do ("10000", 10, 0, 10000, -1, 0, 10000);
+	test_nm_utils_ascii_str_to_int64_do ("10001", 10, 0, 10000, -1, ERANGE, -1);
+	test_nm_utils_ascii_str_to_int64_do ("FF", 16, 0, 10000, -1, 0, 255);
+	test_nm_utils_ascii_str_to_int64_do ("FF", 10, 0, 10000, -2, EINVAL, -2);
+	test_nm_utils_ascii_str_to_int64_do ("9223372036854775807", 10, 0, G_MAXINT64, -2, 0, G_MAXINT64);
+	test_nm_utils_ascii_str_to_int64_do ("7FFFFFFFFFFFFFFF", 16, 0, G_MAXINT64, -2, 0, G_MAXINT64);
+	test_nm_utils_ascii_str_to_int64_do ("9223372036854775808", 10, 0, G_MAXINT64, -2, ERANGE, -2);
+	test_nm_utils_ascii_str_to_int64_do ("-9223372036854775808", 10, G_MININT64, 0, -2, 0, G_MININT64);
+	test_nm_utils_ascii_str_to_int64_do ("-9223372036854775808", 10, G_MININT64+1, 0, -2, ERANGE, -2);
+	test_nm_utils_ascii_str_to_int64_do ("-9223372036854775809", 10, G_MININT64, 0, -2, ERANGE, -2);
+	test_nm_utils_ascii_str_to_int64_do ("1.0", 10, 1, 1, -1, EINVAL, -1);
+	test_nm_utils_ascii_str_to_int64_do ("1x0", 16, -10, 10, -100, EINVAL, -100);
+	test_nm_utils_ascii_str_to_int64_do ("0", 16, -10, 10, -100, 0, 0);
+	test_nm_utils_ascii_str_to_int64_do ("10001111", 2, -1000, 1000, -100000, 0, 0x8F);
+	test_nm_utils_ascii_str_to_int64_do ("-10001111", 2, -1000, 1000, -100000, 0, -0x8F);
+	test_nm_utils_ascii_str_to_int64_do ("1111111", 2, G_MININT64, G_MAXINT64, -1, 0, 0x7F);
+	test_nm_utils_ascii_str_to_int64_do ("111111111111111", 2, G_MININT64, G_MAXINT64, -1, 0, 0x7FFF);
+	test_nm_utils_ascii_str_to_int64_do ("11111111111111111111111111111111111111111111111", 2, G_MININT64, G_MAXINT64, -1, 0, 0x7FFFFFFFFFFF);
+	test_nm_utils_ascii_str_to_int64_do ("111111111111111111111111111111111111111111111111111111111111111", 2, G_MININT64, G_MAXINT64, -1, 0, 0x7FFFFFFFFFFFFFFF);
+	test_nm_utils_ascii_str_to_int64_do ("100000000000000000000000000000000000000000000000000000000000000", 2, G_MININT64, G_MAXINT64, -1, 0,  0x4000000000000000);
+	test_nm_utils_ascii_str_to_int64_do ("1000000000000000000000000000000000000000000000000000000000000000", 2, G_MININT64, G_MAXINT64, -1, ERANGE, -1);
+	test_nm_utils_ascii_str_to_int64_do ("-100000000000000000000000000000000000000000000000000000000000000", 2, G_MININT64, G_MAXINT64, -1, 0,  -0x4000000000000000);
+	test_nm_utils_ascii_str_to_int64_do ("111111111111111111111111111111111111111111111111111111111111111",  2, G_MININT64, G_MAXINT64, -1, 0, 0x7FFFFFFFFFFFFFFF);
+	test_nm_utils_ascii_str_to_int64_do ("-100000000000000000000000000000000000000000000000000000000000000",  2, G_MININT64, G_MAXINT64, -1, 0,  -0x4000000000000000);
+	test_nm_utils_ascii_str_to_int64_do ("0x70",  10, G_MININT64, G_MAXINT64, -1, EINVAL, -1);
+	test_nm_utils_ascii_str_to_int64_do ("4711",  0, G_MININT64, G_MAXINT64, -1, 0, 4711);
+	test_nm_utils_ascii_str_to_int64_do ("04711",  0, G_MININT64, G_MAXINT64, -1, 0, 04711);
+	test_nm_utils_ascii_str_to_int64_do ("0x4711",  0, G_MININT64, G_MAXINT64, -1, 0, 0x4711);
+	test_nm_utils_ascii_str_to_int64_do ("080",  0, G_MININT64, G_MAXINT64, -1, EINVAL, -1);
+	test_nm_utils_ascii_str_to_int64_do ("070",  0, G_MININT64, G_MAXINT64, -1, 0, 7*8);
+	test_nm_utils_ascii_str_to_int64_do ("0x70",  0, G_MININT64, G_MAXINT64, -1, 0, 0x70);
+}
+
+/******************************************************************************/
+
+enum TEST_IS_POWER_OF_TWP_ENUM_SIGNED {
+	_DUMMY_1 = -1,
+};
+
+enum TEST_IS_POWER_OF_TWP_ENUM_UNSIGNED {
+	_DUMMY_2,
+};
+
+enum TEST_IS_POWER_OF_TWP_ENUM_SIGNED_64 {
+	_DUMMY_3 = (1LL << 40),
+};
+
+enum TEST_IS_POWER_OF_TWP_ENUM_UNSIGNED_64 {
+	_DUMMY_4a = -1,
+	_DUMMY_4b = (1LL << 40),
+};
+
+#define test_nm_utils_is_power_of_two_do(type, x, expect) \
+	G_STMT_START { \
+		typeof (x) x1 = (x); \
+		type x2 = (type) x1; \
+		\
+		if (((typeof (x1)) x2) == x1 && (x2 > 0 || x2 == 0)) { \
+			/* x2 equals @x, and is positive. Compare to @expect */ \
+			g_assert_cmpint (expect, ==, nm_utils_is_power_of_two (x2)); \
+		} else if (!(x2 > 0) && !(x2 == 0)) { \
+			/* a (signed) negative value is always FALSE. */ \
+			g_assert_cmpint (FALSE, ==, nm_utils_is_power_of_two (x2));\
+		} \
+		g_assert_cmpint (expect, ==, nm_utils_is_power_of_two (x1)); \
+	} G_STMT_END
+
+static void
+test_nm_utils_is_power_of_two (void)
+{
+	guint64 xyes, xno;
+	gint i, j;
+	GRand *rand = nmtst_get_rand ();
+	int numbits;
+
+	for (i = -1; i < 64; i++) {
+
+		/* find a (positive) x which is a power of two. */
+		if (i == -1)
+			xyes = 0;
+		else {
+			xyes = (1LL << i);
+			g_assert (xyes != 0);
+		}
+
+		xno = xyes;
+		if (xyes != 0) {
+again:
+			/* Find another @xno, that is not a power of two. Do that,
+			 * by randomly setting bits. */
+			numbits = g_rand_int_range (rand, 1, 65);
+			while (xno != ~((guint64) 0) && numbits > 0) {
+				guint64 v = (1LL << g_rand_int_range (rand, 0, 65));
+
+				if ((xno | v) != xno) {
+					xno |= v;
+					--numbits;
+				}
+			}
+			if (xno == xyes)
+				goto again;
+		}
+
+		for (j = 0; j < 2; j++) {
+			gboolean expect = j == 0;
+			guint64 x = expect ? xyes : xno;
+
+			if (!expect && xno == 0)
+				continue;
+
+			/* check if @x is as @expect, when casted to a certain data type. */
+			test_nm_utils_is_power_of_two_do (gint8, x, expect);
+			test_nm_utils_is_power_of_two_do (guint8, x, expect);
+			test_nm_utils_is_power_of_two_do (gint16, x, expect);
+			test_nm_utils_is_power_of_two_do (guint16, x, expect);
+			test_nm_utils_is_power_of_two_do (gint32, x, expect);
+			test_nm_utils_is_power_of_two_do (guint32, x, expect);
+			test_nm_utils_is_power_of_two_do (gint64, x, expect);
+			test_nm_utils_is_power_of_two_do (guint64, x, expect);
+			test_nm_utils_is_power_of_two_do (char, x, expect);
+			test_nm_utils_is_power_of_two_do (unsigned char, x, expect);
+			test_nm_utils_is_power_of_two_do (signed char, x, expect);
+			test_nm_utils_is_power_of_two_do (enum TEST_IS_POWER_OF_TWP_ENUM_SIGNED, x, expect);
+			test_nm_utils_is_power_of_two_do (enum TEST_IS_POWER_OF_TWP_ENUM_UNSIGNED, x, expect);
+			test_nm_utils_is_power_of_two_do (enum TEST_IS_POWER_OF_TWP_ENUM_SIGNED_64, x, expect);
+			test_nm_utils_is_power_of_two_do (enum TEST_IS_POWER_OF_TWP_ENUM_UNSIGNED_64, x, expect);
+		}
+	}
+}
+
+/******************************************************************************/
+
+static void
+test_g_ptr_array_insert (void)
+{
+	/* this test only makes sense on a recent glib, where we compare our compat
+	 * with the original implementation. */
+#if GLIB_CHECK_VERSION(2, 40, 0)
+	gs_unref_ptrarray GPtrArray *arr1 = g_ptr_array_new ();
+	gs_unref_ptrarray GPtrArray *arr2 = g_ptr_array_new ();
+	GRand *rand = nmtst_get_rand ();
+	guint i;
+
+	for (i = 0; i < 560; i++) {
+		gint32 idx = g_rand_int_range (rand, -1, arr1->len + 1);
+
+		g_ptr_array_insert (arr1, idx, GINT_TO_POINTER (i));
+		_nm_g_ptr_array_insert (arr2, idx, GINT_TO_POINTER (i));
+
+		g_assert_cmpint (arr1->len, ==, arr2->len);
+		g_assert (memcmp (arr1->pdata, arr2->pdata, arr1->len * sizeof (gpointer)) == 0);
+	}
+#endif
+}
+
+/******************************************************************************/
+
+static int
+_test_find_binary_search_cmp (gconstpointer a, gconstpointer b, gpointer dummy)
+{
+	int ia, ib;
+
+	ia = GPOINTER_TO_INT (a);
+	ib = GPOINTER_TO_INT (b);
+
+	if (ia == ib)
+		return 0;
+	if (ia < ib)
+		return -1;
+	return 1;
+}
+
+static void
+_test_find_binary_search_do (const int *array, gsize len)
+{
+	gsize i;
+	gssize idx;
+	gs_free gpointer *parray = g_new (gpointer, len);
+	const int needle = 0;
+	gpointer pneedle = GINT_TO_POINTER (needle);
+	gssize expected_result;
+
+	for (i = 0; i < len; i++)
+		parray[i] = GINT_TO_POINTER (array[i]);
+
+	expected_result = _nm_utils_ptrarray_find_first (parray, len, pneedle);
+
+	idx = _nm_utils_ptrarray_find_binary_search (parray, len, pneedle, _test_find_binary_search_cmp, NULL);
+	if (expected_result >= 0)
+		g_assert_cmpint (expected_result, ==, idx);
+	else {
+		gssize idx2 = ~idx;
+		g_assert_cmpint (idx, <, 0);
+
+		g_assert (idx2 >= 0);
+		g_assert (idx2 <= len);
+		g_assert (idx2 - 1 < 0 || _test_find_binary_search_cmp (parray[idx2 - 1], pneedle, NULL) < 0);
+		g_assert (idx2 >= len || _test_find_binary_search_cmp (parray[idx2], pneedle, NULL) > 0);
+	}
+	for (i = 0; i < len; i++) {
+		int cmp;
+
+		cmp = _test_find_binary_search_cmp (parray[i], pneedle, NULL);
+		if (cmp == 0) {
+			g_assert (pneedle == parray[i]);
+			g_assert (idx >= 0);
+			g_assert (i == idx);
+		} else {
+			g_assert (pneedle != parray[i]);
+			if (cmp < 0) {
+				if (idx < 0)
+					g_assert (i < ~idx);
+				else
+					g_assert (i < idx);
+			} else {
+				if (idx < 0)
+					g_assert (i >= ~idx);
+				else
+					g_assert (i >= idx);
+			}
+		}
+	}
+}
+#define test_find_binary_search_do(...) \
+	G_STMT_START { \
+		const int _array[] = { __VA_ARGS__ } ; \
+		_test_find_binary_search_do (_array, G_N_ELEMENTS (_array)); \
+	} G_STMT_END
+
+static void
+test_nm_utils_ptrarray_find_binary_search (void)
+{
+#define _NOT(idx) (~ ((gssize) (idx)))
+	test_find_binary_search_do (            0);
+	test_find_binary_search_do (        -1, 0);
+	test_find_binary_search_do (    -2, -1, 0);
+	test_find_binary_search_do (-3, -2, -1, 0);
+	test_find_binary_search_do (            0, 1);
+	test_find_binary_search_do (            0, 1, 2);
+	test_find_binary_search_do (        -1, 0, 1, 2);
+	test_find_binary_search_do (    -2, -1, 0, 1, 2);
+	test_find_binary_search_do (-3, -2, -1, 0, 1, 2);
+	test_find_binary_search_do (-3, -2, -1, 0, 1, 2);
+	test_find_binary_search_do (-3, -2, -1, 0, 1, 2, 3);
+	test_find_binary_search_do (-3, -2, -1, 0, 1, 2, 3, 4);
+
+	test_find_binary_search_do (        -1);
+	test_find_binary_search_do (    -2, -1);
+	test_find_binary_search_do (-3, -2, -1);
+	test_find_binary_search_do (            1);
+	test_find_binary_search_do (            1, 2);
+	test_find_binary_search_do (        -1, 1, 2);
+	test_find_binary_search_do (    -2, -1, 1, 2);
+	test_find_binary_search_do (-3, -2, -1, 1, 2);
+	test_find_binary_search_do (-3, -2, -1, 1, 2);
+	test_find_binary_search_do (-3, -2, -1, 1, 2, 3);
+	test_find_binary_search_do (-3, -2, -1, 1, 2, 3, 4);
+}
+
 /******************************************************************************/
 
 NMTST_DEFINE ();
@@ -4137,6 +4545,12 @@ int main (int argc, char **argv)
 
 	g_test_add_func ("/core/general/hexstr2bin", test_hexstr2bin);
 	g_test_add_func ("/core/general/test_nm_utils_uuid_generate_from_string", test_nm_utils_uuid_generate_from_string);
+	g_test_add_func ("/core/general/_nm_utils_uuid_generate_from_strings", test_nm_utils_uuid_generate_from_strings);
+
+	g_test_add_func ("/core/general/_nm_utils_ascii_str_to_int64", test_nm_utils_ascii_str_to_int64);
+	g_test_add_func ("/core/general/nm_utils_is_power_of_two", test_nm_utils_is_power_of_two);
+	g_test_add_func ("/core/general/_glib_compat_g_ptr_array_insert", test_g_ptr_array_insert);
+	g_test_add_func ("/core/general/_nm_utils_ptrarray_find_binary_search", test_nm_utils_ptrarray_find_binary_search);
 
 	return g_test_run ();
 }
diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c
new file mode 100644
index 00000000..99f88ac5
--- /dev/null
+++ b/libnm-core/tests/test-keyfile.c
@@ -0,0 +1,534 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/*
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright 2015 Red Hat, Inc.
+ *
+ */
+
+#include "config.h"
+
+#include "nm-macros-internal.h"
+#include "nm-keyfile-utils.h"
+#include "nm-keyfile-internal.h"
+
+#include "nm-simple-connection.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-8021x.h"
+
+#include "nm-test-utils.h"
+
+
+#define TEST_WIRED_TLS_CA_CERT     TEST_CERT_DIR"/test-ca-cert.pem"
+#define TEST_WIRED_TLS_PRIVKEY     TEST_CERT_DIR"/test-key-and-cert.pem"
+
+
+/******************************************************************************/
+
+#define CLEAR(con, keyfile) \
+	G_STMT_START { \
+		NMConnection **_con = (con); \
+		GKeyFile **_keyfile = (keyfile); \
+		\
+		g_clear_object (_con); \
+		g_clear_pointer (_keyfile, g_key_file_unref); \
+	} G_STMT_END
+
+static void
+_assert_gbytes (GBytes *bytes, gconstpointer data, gssize len)
+{
+	g_assert ((data && len > 0) || !len || (data && len == -1));
+
+	if (len == -1)
+		len = strlen (data);
+
+	if (!len)
+		g_assert (!bytes);
+	else {
+		g_assert_cmpint (g_bytes_get_size (bytes), ==, len);
+		g_assert (memcmp (g_bytes_get_data (bytes, NULL), data, len) == 0);
+	}
+}
+
+static GKeyFile *
+_keyfile_load_from_data (const char *str)
+{
+	GError *error = NULL;
+	gboolean success;
+	GKeyFile *keyfile;
+
+	g_assert (str);
+
+	keyfile =  g_key_file_new ();
+	success = g_key_file_load_from_data (keyfile, str, strlen (str), G_KEY_FILE_NONE, &error);
+	g_assert_no_error (error);
+	g_assert (success);
+
+	return keyfile;
+}
+
+static GKeyFile *
+_nm_keyfile_write (NMConnection *connection,
+                   NMKeyfileWriteHandler handler,
+                   void *user_data)
+{
+	GError *error = NULL;
+	GKeyFile *kf;
+
+	g_assert (NM_IS_CONNECTION (connection));
+
+	kf = nm_keyfile_write (connection, handler, user_data, &error);
+	g_assert_no_error (error);
+	g_assert (kf);
+	return kf;
+}
+
+static NMConnection *
+_nm_keyfile_read (GKeyFile *keyfile,
+                  const char *keyfile_name,
+                  const char *base_dir,
+                  NMKeyfileReadHandler read_handler,
+                  void *read_data,
+                  gboolean needs_normalization)
+{
+	GError *error = NULL;
+	NMConnection *con;
+
+	g_assert (keyfile);
+
+	con = nm_keyfile_read (keyfile, keyfile_name, base_dir, read_handler, read_data, &error);
+	g_assert_no_error (error);
+	g_assert (NM_IS_CONNECTION (con));
+	if (needs_normalization)
+		nmtst_assert_connection_verifies_after_normalization (con, 0, 0);
+	else
+		nmtst_assert_connection_verifies_without_normalization (con);
+	return con;
+}
+
+
+static void
+_keyfile_convert (NMConnection **con,
+                  GKeyFile **keyfile,
+                  const char *keyfile_name,
+                  const char *base_dir,
+                  NMKeyfileReadHandler read_handler,
+                  void *read_data,
+                  NMKeyfileWriteHandler write_handler,
+                  void *write_data,
+                  gboolean needs_normalization)
+{
+	NMConnection *c0;
+	GKeyFile *k0;
+	gs_unref_object NMConnection *c0_k1_c2 = NULL, *k0_c1 = NULL, *k0_c1_k2_c3 = NULL;
+	gs_unref_keyfile GKeyFile *k0_c1_k2 = NULL, *c0_k1 = NULL, *c0_k1_c2_k3 = NULL;
+
+	/* convert from @con to @keyfile and check that we can make
+	 * full round trips and obtaining the same result. */
+
+	g_assert (con);
+	g_assert (keyfile);
+	g_assert (*con || *keyfile);
+
+	c0 = *con;
+	k0 = *keyfile;
+
+	if (c0) {
+		c0_k1 = _nm_keyfile_write (c0, write_handler, write_data);
+		c0_k1_c2 = _nm_keyfile_read (c0_k1, keyfile_name, base_dir, read_handler, read_data, FALSE);
+		c0_k1_c2_k3 = _nm_keyfile_write (c0_k1_c2, write_handler, write_data);
+
+		g_assert (_nm_keyfile_equals (c0_k1, c0_k1_c2_k3, TRUE));
+	}
+	if (k0) {
+		NMSetting8021x *s1, *s2;
+
+		k0_c1 = _nm_keyfile_read (k0, keyfile_name, base_dir, read_handler, read_data, needs_normalization);
+		k0_c1_k2 = _nm_keyfile_write (k0_c1, write_handler, write_data);
+		k0_c1_k2_c3 = _nm_keyfile_read (k0_c1_k2, keyfile_name, base_dir, read_handler, read_data, FALSE);
+
+		/* It is a expeced behavior, that if @k0 contains a relative path ca-cert, @k0_c1 will
+		 * contain that path as relative. But @k0_c1_k2 and @k0_c1_k2_c3 will have absolute paths.
+		 * In this case, hack up @k0_c1_k2_c3 to contain the same relative path. */
+		s1 = nm_connection_get_setting_802_1x (k0_c1);
+		s2 = nm_connection_get_setting_802_1x (k0_c1_k2_c3);
+		if (s1 || s2) {
+			g_assert_cmpint (nm_setting_802_1x_get_ca_cert_scheme (s1), ==, nm_setting_802_1x_get_ca_cert_scheme (s2));
+			switch (nm_setting_802_1x_get_ca_cert_scheme (s1)) {
+			case NM_SETTING_802_1X_CK_SCHEME_PATH:
+				{
+					const char *p1 = nm_setting_802_1x_get_ca_cert_path (s1);
+					const char *p2 = nm_setting_802_1x_get_ca_cert_path (s2);
+
+					nmtst_assert_resolve_relative_path_equals (p1, p2);
+					if (strcmp (p1, p2) != 0) {
+						gs_free char *puri = NULL;
+						gs_unref_bytes GBytes *pfile = NULL;
+
+						g_assert (p1[0] != '/' && p2[0] == '/');
+
+						/* one of the paths is a relative path and the other is absolute. This is an
+						 * expected difference.
+						 * Make the paths of s2 identical to s1... */
+						puri = g_strconcat (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, p1, NULL);
+						pfile = g_bytes_new (puri, strlen (puri) + 1);
+						g_object_set (s2, NM_SETTING_802_1X_CA_CERT, pfile, NULL);
+					}
+				}
+				break;
+			case NM_SETTING_802_1X_CK_SCHEME_BLOB: {
+				GBytes *b1, *b2;
+
+				b1 = nm_setting_802_1x_get_ca_cert_blob (s1);
+				b2 = nm_setting_802_1x_get_ca_cert_blob (s2);
+				g_assert_cmpint (g_bytes_get_size (b1), ==, g_bytes_get_size (b2));
+				g_assert (memcmp (g_bytes_get_data (b1, NULL), g_bytes_get_data (b2, NULL), g_bytes_get_size (b1)) == 0);
+				break;
+			}
+			default:
+				break;
+			}
+		}
+
+		nmtst_assert_connection_equals (k0_c1, FALSE, k0_c1_k2_c3, FALSE);
+	}
+
+	if (!k0)
+		*keyfile = g_key_file_ref (c0_k1);
+	else if (!c0)
+		*con = g_object_ref (k0_c1);
+	else {
+		/* finally, if both a keyfile and a connection are given, assert that they are equal
+		 * after a round of conversion. */
+		g_assert (_nm_keyfile_equals (c0_k1, k0_c1_k2, TRUE));
+		nmtst_assert_connection_equals (k0_c1, FALSE, c0_k1_c2, FALSE);
+	}
+}
+
+/******************************************************************************/
+
+static void
+_test_8021x_cert_check (NMConnection *con,
+                        NMSetting8021xCKScheme expected_scheme,
+                        const void *value,
+                        gssize val_len)
+{
+	GKeyFile *keyfile = NULL;
+	NMSetting8021x *s_8021x;
+	gs_free char *kval = NULL;
+
+	_keyfile_convert (&con, &keyfile, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
+
+	s_8021x = nm_connection_get_setting_802_1x (con);
+
+	g_assert (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == expected_scheme);
+
+	if (expected_scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) {
+		const char *path = nm_setting_802_1x_get_ca_cert_path (s_8021x);
+
+		g_assert_cmpstr (path, ==, value);
+		g_assert (val_len == -1 || strlen (path) == val_len);
+
+		kval = g_key_file_get_string (keyfile, "802-1x", "ca-cert", NULL);
+		g_assert (kval);
+		g_assert_cmpstr (kval, ==, value);
+	} else if (expected_scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
+		GBytes *blob = nm_setting_802_1x_get_ca_cert_blob (s_8021x);
+		gs_free char *file_blob = NULL;
+
+		if (val_len == -1) {
+			gsize l;
+			gboolean success;
+
+			success = g_file_get_contents (value, &file_blob, &l, NULL);
+			g_assert (success);
+
+			value = file_blob;
+			val_len = l;
+		}
+
+		g_assert (blob);
+		g_assert_cmpint (g_bytes_get_size (blob), ==, val_len);
+		g_assert (!memcmp (g_bytes_get_data (blob, NULL), value, val_len));
+
+		kval = g_key_file_get_string (keyfile, "802-1x", "ca-cert", NULL);
+		g_assert (kval);
+		g_assert (g_str_has_prefix (kval, NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB));
+	}
+
+	g_key_file_unref (keyfile);
+}
+
+static void
+_test_8021x_cert_check_blob_full (NMConnection *con, const void *data, gsize len)
+{
+	GBytes *bytes;
+	NMSetting8021x *s_8021x = nm_connection_get_setting_802_1x (con);
+
+	bytes = g_bytes_new (data, len);
+	g_object_set (s_8021x,
+	              NM_SETTING_802_1X_CA_CERT,
+                  bytes,
+                  NULL);
+	_test_8021x_cert_check (con, NM_SETTING_802_1X_CK_SCHEME_BLOB, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
+	g_bytes_unref (bytes);
+}
+#define _test_8021x_cert_check_blob(con, data) _test_8021x_cert_check_blob_full(con, data, STRLEN (data))
+
+static void
+test_8021x_cert (void)
+{
+	NMSetting8021x *s_8021x;
+	gs_unref_object NMConnection *con = nmtst_create_minimal_connection ("test-cert", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL);
+	GError *error = NULL;
+	gboolean success;
+	NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH;
+	gs_free char *full_TEST_WIRED_TLS_CA_CERT = nmtst_file_resolve_relative_path (TEST_WIRED_TLS_CA_CERT, NULL);
+	gs_free char *full_TEST_WIRED_TLS_PRIVKEY = nmtst_file_resolve_relative_path (TEST_WIRED_TLS_PRIVKEY, NULL);
+
+	/* test writing/reading of certificates of NMSetting8021x */
+
+	/* create a valid connection with NMSetting8021x */
+	s_8021x = (NMSetting8021x *) nm_setting_802_1x_new ();
+	nm_setting_802_1x_add_eap_method (s_8021x, "tls");
+	g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, "Bill Smith", NULL);
+	success = nm_setting_802_1x_set_ca_cert (s_8021x,
+	                                         full_TEST_WIRED_TLS_CA_CERT,
+	                                         scheme,
+	                                         NULL,
+	                                         &error);
+	g_assert_no_error (error);
+	g_assert (success);
+	success = nm_setting_802_1x_set_client_cert (s_8021x,
+	                                             full_TEST_WIRED_TLS_CA_CERT,
+	                                             scheme,
+	                                             NULL,
+	                                             &error);
+	g_assert_no_error (error);
+	g_assert (success);
+	success = nm_setting_802_1x_set_private_key (s_8021x,
+	                                             full_TEST_WIRED_TLS_PRIVKEY,
+	                                             "test1",
+	                                             scheme,
+	                                             NULL,
+	                                             &error);
+	g_assert_no_error (error);
+	g_assert (success);
+
+
+	/* test reseting ca-cert to different values and see whether we can write/read. */
+
+	nm_connection_add_setting (con, NM_SETTING (s_8021x));
+	nmtst_assert_connection_verifies_and_normalizable (con);
+
+
+	_test_8021x_cert_check (con, scheme, full_TEST_WIRED_TLS_CA_CERT, -1);
+
+	scheme = NM_SETTING_802_1X_CK_SCHEME_BLOB;
+	success = nm_setting_802_1x_set_ca_cert (s_8021x,
+	                                         full_TEST_WIRED_TLS_CA_CERT,
+	                                         scheme,
+	                                         NULL,
+	                                         &error);
+	g_assert_no_error (error);
+	g_assert (success);
+	_test_8021x_cert_check (con, scheme, full_TEST_WIRED_TLS_CA_CERT, -1);
+
+	_test_8021x_cert_check_blob (con, "a");
+	_test_8021x_cert_check_blob (con, "\0");
+	_test_8021x_cert_check_blob (con, "10");
+	_test_8021x_cert_check_blob (con, "data:;base64,a");
+	_test_8021x_cert_check_blob_full (con, "data:;base64,a", STRLEN ("data:;base64,a") + 1);
+	_test_8021x_cert_check_blob (con, "data:;base64,file://a");
+	_test_8021x_cert_check_blob (con, "123");
+
+}
+
+/******************************************************************************/
+
+static void
+test_8021x_cert_read (void)
+{
+	GKeyFile *keyfile = NULL;
+	gs_unref_object NMConnection *con = NULL;
+	NMSetting8021x *s_8021x;
+
+	con = nmtst_create_connection_from_keyfile (
+	      "[connection]\n"
+	      "type=ethernet",
+	      "/test_8021x_cert_read/test0", NULL);
+	CLEAR (&con, &keyfile);
+
+
+	keyfile = _keyfile_load_from_data (
+	          "[connection]\n"
+	          "type=ethernet"
+	          );
+	_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test1", NULL, NULL, NULL, NULL, NULL, TRUE);
+	CLEAR (&con, &keyfile);
+
+	keyfile = _keyfile_load_from_data (
+	          "[connection]\n"
+	          "type=802-3-ethernet\n"
+
+	          "[802-1x]\n"
+	          "eap=tls;\n"
+	          "identity=Bill Smith\n"
+	          "ca-cert=48;130;2;52;48;130;1;161;2;16;2;173;102;126;78;69;254;94;87;111;60;152;25;94;221;192;48;13;6;9;42;134;72;134;247;13;1;1;2;5;0;48;95;49;11;48;9;6;3;85;4;6;19;2;85;83;49;32;48;30;6;3;85;4;10;19;23;82;83;65;32;68;97;116;97;32;83;101;99;117;114;105;116;121;44;32;73;110;99;46;49;46;48;44;6;3;85;4;11;19;37;83;101;99;117;114;101;32;83;101;114;118;101;114;32;67;101;114;116;105;102;105;99;97;116;105;111;110;32;65;117;116;104;111;114;105;116;121;48;30;23;13;57;52;49;49;48;57;48;48;48;48;48;48;90;23;13;49;48;48;49;48;55;50;51;53;57;53;57;90;48;95;49;11;48;9;6;3;85;4;6;19;2;85;83;49;32;48;30;6;3;85;4;10;19;23;82;83;65;32;68;97;116;97;32;83;101;99;117;114;105;116;121;44;32;73;110;99;46;49;46;48;44;6;3;85;4;11;19;37;83;101;99;117;114;101;32;83;101;114;118;101;114;32;67;101;114;116;105;102;105;99;97;116;105;111;110;32;65;117;116;104;111;114;105;116;121;48;129;155;48;13;6;9;42;134;72;134;247;13;1;1;1;5;0;3;129;137;0;48;129;133;2;126;0;146;206;122;193;174;131;62;90;170;137;131;87;172;37;1;118;12;173;174;142;44;55;206;235;53;120;100;84;3;229;132;64;81;201;191;143;8;226;138;130;8;210;22;134;55;85;233;177;33;2;173;118;104;129;154;5;162;75;201;75;37;102;34;86;108;136;7;143;247;129;89;109;132;7;101;112;19;113;118;62;155;119;76;227;80;137;86;152;72;185;29;167;41;26;19;46;74;17;89;156;30;21;213;73;84;44;115;58;105;130;177;151;57;156;109;112;103;72;229;221;45;214;200;30;123;2;3;1;0;1;48;13;6;9;42;134;72;134;247;13;1;1;2;5;0;3;126;0;101;221;126;225;178;236;176;226;58;224;236;113;70;154;25;17;184;211;199;160;180;3;64;38;2;62;9;156;225;18;179;209;90;246;55;165;183;97;3;182;91;22;105;59;198;68;8;12;136;83;12;107;151;73;199;62;53;220;108;185;187;170;223;92;187;58;47;147;96;182;169;75;77;242;32;247;205;95;127;100;123;142;220;0;92;215;250;119;202;57;22;89;111;14;234;211;181;131;127;77;77;66;86;118;180;201;95;4;248;56;248;235;210;95;117;95;205;123;252;229;142;128;124;252;80;\n"
+	          "client-cert=102;105;108;101;58;47;47;47;104;111;109;101;47;100;99;98;119;47;68;101;115;107;116;111;112;47;99;101;114;116;105;110;102;114;97;47;99;108;105;101;110;116;46;112;101;109;0;\n"
+	          "private-key=102;105;108;101;58;47;47;47;104;111;109;101;47;100;99;98;119;47;68;101;115;107;116;111;112;47;99;101;114;116;105;110;102;114;97;47;99;108;105;101;110;116;46;112;101;109;0;\n"
+	          "private-key-password=12345testing\n"
+	          );
+	_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE);
+	CLEAR (&con, &keyfile);
+
+
+	keyfile = _keyfile_load_from_data (
+	          "[connection]\n"
+	          "type=802-3-ethernet\n"
+
+	          "[802-1x]\n"
+	          "eap=tls;\n"
+	          "identity=Bill Smith\n"
+	          /* unqualified strings are only recognized as path up to 500 chars*/
+	          "ca-cert="  "/111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
+	                      "/111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
+	                      "/111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
+	                      "/111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111"
+	                      "/11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111\n"
+	          "client-cert=/222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221"
+	                      "/222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221"
+	                      "/222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221"
+	                      "/222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222221"
+	                      "/222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222\n"
+	          "private-key=file://"
+	                      "/333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333331"
+	                      "/333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333331"
+	                      "/333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333331"
+	                      "/333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333331"
+	                      "/33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333111111\n"
+	          "private-key-password=12345testing\n"
+	          );
+	_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE);
+	s_8021x = nm_connection_get_setting_802_1x (con);
+
+	g_assert (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH);
+	g_assert (g_str_has_prefix (nm_setting_802_1x_get_ca_cert_path (s_8021x), "/111111111111"));
+	g_assert_cmpint (strlen (nm_setting_802_1x_get_ca_cert_path (s_8021x)), ==, 499);
+
+	g_assert (nm_setting_802_1x_get_client_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_BLOB);
+	g_assert (g_str_has_prefix (g_bytes_get_data (nm_setting_802_1x_get_client_cert_blob (s_8021x), NULL), "/2222222222"));
+	g_assert_cmpint (g_bytes_get_size (nm_setting_802_1x_get_client_cert_blob (s_8021x)), ==, 500 + 1 /* keyfile reader adds a trailing NUL */);
+
+	g_assert (nm_setting_802_1x_get_private_key_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH);
+	g_assert (g_str_has_prefix (nm_setting_802_1x_get_private_key_path (s_8021x), "/333333333"));
+	g_assert_cmpint (strlen (nm_setting_802_1x_get_private_key_path (s_8021x)), ==, 505);
+	CLEAR (&con, &keyfile);
+
+
+	keyfile = _keyfile_load_from_data (
+	          "[connection]\n"
+	          "type=802-3-ethernet\n"
+
+	          "[802-1x]\n"
+	          "eap=tls;\n"
+	          "identity=Bill Smith\n"
+	          "ca-cert=/\n"
+	          "client-cert=a.pem\n"
+	          "private-key=data:;base64,aGFsbG8=\n" // hallo
+	          "private-key-password=12345testing\n"
+	          );
+	_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE);
+	s_8021x = nm_connection_get_setting_802_1x (con);
+
+	g_assert (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH);
+	g_assert_cmpstr (nm_setting_802_1x_get_ca_cert_path (s_8021x), ==, "/");
+
+	g_assert (nm_setting_802_1x_get_client_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH);
+	g_assert_cmpstr (nm_setting_802_1x_get_client_cert_path (s_8021x), ==, "/test_8021x_cert_read/a.pem");
+
+	g_assert (nm_setting_802_1x_get_private_key_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_BLOB);
+	_assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "hallo", -1);
+	CLEAR (&con, &keyfile);
+
+
+	keyfile = _keyfile_load_from_data (
+	          "[connection]\n"
+	          "type=802-3-ethernet\n"
+
+	          "[802-1x]\n"
+	          "eap=tls;\n"
+	          "identity=Bill Smith\n"
+	          "ca-cert=file://data:;base64,x\n"
+	          "client-cert=abc.der\n"
+	          "private-key=abc.deR\n"
+	          "private-key-password=12345testing\n"
+	          );
+	_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE);
+	s_8021x = nm_connection_get_setting_802_1x (con);
+
+	g_assert (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH);
+	g_assert_cmpstr (nm_setting_802_1x_get_ca_cert_path (s_8021x), ==, "data:;base64,x");
+
+	g_assert (nm_setting_802_1x_get_client_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH);
+	g_assert_cmpstr (nm_setting_802_1x_get_client_cert_path (s_8021x), ==, "/test_8021x_cert_read/abc.der");
+
+	g_assert (nm_setting_802_1x_get_private_key_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_BLOB);
+	_assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "abc.deR\0", 8);
+	CLEAR (&con, &keyfile);
+
+
+	keyfile = _keyfile_load_from_data (
+	          "[connection]\n"
+	          "type=802-3-ethernet\n"
+
+	          "[802-1x]\n"
+	          "eap=tls;\n"
+	          "identity=Bill Smith\n"
+	          "ca-cert=104;97;108;108;111;\n" /* "hallo" without trailing NUL */
+	          "client-cert=104;097;108;108;111;0;\n"
+	          "private-key=hallo\n"
+	          "private-key-password=12345testing\n"
+	          );
+	_keyfile_convert (&con, &keyfile, "/test_8021x_cert_read/test2", NULL, NULL, NULL, NULL, NULL, TRUE);
+	s_8021x = nm_connection_get_setting_802_1x (con);
+
+	g_assert (nm_setting_802_1x_get_ca_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_BLOB);
+	_assert_gbytes (nm_setting_802_1x_get_ca_cert_blob (s_8021x), "hallo", 5);
+
+	g_assert (nm_setting_802_1x_get_client_cert_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_BLOB);
+	_assert_gbytes (nm_setting_802_1x_get_client_cert_blob (s_8021x), "hallo\0", 6);
+
+	g_assert (nm_setting_802_1x_get_private_key_scheme (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_BLOB);
+	_assert_gbytes (nm_setting_802_1x_get_private_key_blob (s_8021x), "hallo\0", 6);
+	CLEAR (&con, &keyfile);
+}
+
+/******************************************************************************/
+
+NMTST_DEFINE ();
+
+int main (int argc, char **argv)
+{
+	nmtst_init (&argc, &argv, TRUE);
+
+	g_test_add_func ("/core/keyfile/test_8021x_cert", test_8021x_cert);
+	g_test_add_func ("/core/keyfile/test_8021x_cert_read", test_8021x_cert_read);
+
+	return g_test_run ();
+}
+
diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index a915ae7d..178fddd5 100644
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@@ -739,33 +739,23 @@ NMTST_DEFINE ();
 int
 main (int argc, char **argv)
 {
-	char *base;
-
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-	g_type_init ();
-#endif
-
 	nmtst_init (&argc, &argv, TRUE);
 
 	/* The tests */
-	test_need_tls_secrets_path ();
-	test_need_tls_secrets_blob ();
-	test_need_tls_phase2_secrets_path ();
-	test_need_tls_phase2_secrets_blob ();
-
-	test_update_secrets_wifi_single_setting ();
-	test_update_secrets_wifi_full_hash ();
-	test_update_secrets_wifi_bad_setting_name ();
-
-	test_update_secrets_whole_connection ();
-	test_update_secrets_whole_connection_empty_hash ();
-	test_update_secrets_whole_connection_bad_setting ();
-	test_update_secrets_whole_connection_empty_base_setting ();
-	test_update_secrets_null_setting_name_with_setting_hash ();
-
-	base = g_path_get_basename (argv[0]);
-	fprintf (stdout, "%s: SUCCESS\n", base);
-	g_free (base);
-	return 0;
+	g_test_add_func ("/libnm/need_tls_secrets_path", test_need_tls_secrets_path);
+	g_test_add_func ("/libnm/need_tls_secrets_blob", test_need_tls_secrets_blob);
+	g_test_add_func ("/libnm/need_tls_phase2_secrets_path", test_need_tls_phase2_secrets_path);
+	g_test_add_func ("/libnm/need_tls_phase2_secrets_blob", test_need_tls_phase2_secrets_blob);
+
+	g_test_add_func ("/libnm/update_secrets_wifi_single_setting", test_update_secrets_wifi_single_setting);
+	g_test_add_func ("/libnm/update_secrets_wifi_full_hash", test_update_secrets_wifi_full_hash);
+	g_test_add_func ("/libnm/update_secrets_wifi_bad_setting_name", test_update_secrets_wifi_bad_setting_name);
+
+	g_test_add_func ("/libnm/update_secrets_whole_connection", test_update_secrets_whole_connection);
+	g_test_add_func ("/libnm/update_secrets_whole_connection_empty_hash", test_update_secrets_whole_connection_empty_hash);
+	g_test_add_func ("/libnm/update_secrets_whole_connection_bad_setting", test_update_secrets_whole_connection_bad_setting);
+	g_test_add_func ("/libnm/update_secrets_whole_connection_empty_base_setting", test_update_secrets_whole_connection_empty_base_setting);
+	g_test_add_func ("/libnm/update_secrets_null_setting_name_with_setting_hash", test_update_secrets_null_setting_name_with_setting_hash);
+
+	return g_test_run ();
 }
-
diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c
index 992379c7..16f6016e 100644
--- a/libnm-core/tests/test-setting-8021x.c
+++ b/libnm-core/tests/test-setting-8021x.c
@@ -57,15 +57,13 @@ compare_blob_data (const char *test,
 	g_free (contents);
 }
 
-#define SCHEME_PATH "file://"
-
 static void
 check_scheme_path (GBytes *value, const char *path)
 {
 	const guint8 *p = g_bytes_get_data (value, NULL);
 
-	g_assert (memcmp (p, SCHEME_PATH, strlen (SCHEME_PATH)) == 0);
-	p += strlen (SCHEME_PATH);
+	g_assert (memcmp (p, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0);
+	p += strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH);
 	g_assert (memcmp (p, path, strlen (path)) == 0);
 	p += strlen (path);
 	g_assert (*p == '\0');
diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index 0e786187..7d7715cb 100644
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@@ -101,15 +101,9 @@ test_defaults (GType type, const char *name)
 	g_object_unref (setting);
 }
 
-int
-main (int argc, char **argv)
+static void
+defaults (void)
 {
-	char *base;
-
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-	g_type_init ();
-#endif
-
 	/* The tests */
 	test_defaults (NM_TYPE_SETTING_CONNECTION, NM_SETTING_CONNECTION_SETTING_NAME);
 	test_defaults (NM_TYPE_SETTING_802_1X, NM_SETTING_802_1X_SETTING_NAME);
@@ -124,10 +118,17 @@ main (int argc, char **argv)
 	test_defaults (NM_TYPE_SETTING_WIRED, NM_SETTING_WIRED_SETTING_NAME);
 	test_defaults (NM_TYPE_SETTING_WIRELESS, NM_SETTING_WIRELESS_SETTING_NAME);
 	test_defaults (NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
+}
+
+NMTST_DEFINE ();
+
+int
+main (int argc, char **argv)
+{
+	nmtst_init (&argc, &argv, TRUE);
+
+	g_test_add_func ("/libnm/defaults", defaults);
 
-	base = g_path_get_basename (argv[0]);
-	fprintf (stdout, "%s: SUCCESS\n", base);
-	g_free (base);
-	return 0;
+	return g_test_run ();
 }
 
diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in
index 5c3254af..5f7a3800 100644
--- a/libnm-glib/Makefile.in
+++ b/libnm-glib/Makefile.in
@@ -334,6 +334,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -447,6 +448,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index d62a8b63..40add09c 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -782,8 +782,9 @@ nm_client_deactivate_connection (NMClient *client, NMActiveConnection *active)
 	                        DBUS_TYPE_G_OBJECT_PATH, path,
 	                        G_TYPE_INVALID,
 	                        G_TYPE_INVALID)) {
-		g_warning ("Could not deactivate connection '%s': %s", path, error->message);
-		g_error_free (error);
+		g_warning ("Could not deactivate connection '%s': %s", 
+		           path, error ? error->message : "(unknown)");
+		g_clear_error (&error);
 	}
 }
 
@@ -1094,8 +1095,9 @@ nm_client_networking_set_enabled (NMClient *client, gboolean enable)
 	                        G_TYPE_BOOLEAN, enable,
 	                        G_TYPE_INVALID,
 	                        G_TYPE_INVALID)) {
-		g_warning ("Error enabling/disabling networking: %s", err->message);
-		g_error_free (err);
+		g_warning ("Error enabling/disabling networking: %s",
+		           err ? err->message : "(unknown)");
+		g_clear_error (&err);
 	}
 }
 
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index d5f4ca67..80a274f5 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -469,6 +469,7 @@ connection_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 	AddConnectionInfo *addinfo;
 	const char *path;
 	GError *error = NULL, *local;
+	static gboolean print_once = TRUE;
 
 	path = nm_connection_get_path (NM_CONNECTION (remote));
 	addinfo = add_connection_info_find (self, remote);
@@ -492,7 +493,7 @@ connection_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 			local = g_error_new (NM_REMOTE_SETTINGS_ERROR,
 			                     NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE,
 			                     "Connection not visible or not available: %s",
-			                     error ? error->message : "(unknown)");
+			                     error->message);
 			add_connection_info_complete (self, addinfo, local);
 			g_error_free (local);
 		}
@@ -504,6 +505,14 @@ connection_inited (GObject *source, GAsyncResult *result, gpointer user_data)
 		if (!dbus_g_error_has_name (error, "org.freedesktop.NetworkManager.Settings.PermissionDenied"))
 			g_hash_table_remove (priv->pending, path);
 
+		if (print_once && error->code == DBUS_GERROR_LIMITS_EXCEEDED) {
+			g_printerr ("Warning: libnm-glib:%s(): a D-Bus limit exceeded: %s. The application might not work properly.\n"
+			            "Consider increasing max_replies_per_connection limit in /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf "
+			            "like 2048",
+			            __func__, error->message);
+			print_once = FALSE;
+		}
+
 		g_error_free (error);
 	}
 
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index cea3b79a..7168d3dd 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -15,7 +15,7 @@ noinst_PROGRAMS = $(TESTS)
 if WITH_VALGRIND
 @VALGRIND_RULES@ --launch-dbus
 else
-TESTS_ENVIRONMENT = $(srcdir)/libnm-glib-test-launch.sh
+LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh
 endif
 TESTS = test-nm-client test-remote-settings-client
 
diff --git a/libnm-glib/tests/Makefile.in b/libnm-glib/tests/Makefile.in
index 82530978..029927af 100644
--- a/libnm-glib/tests/Makefile.in
+++ b/libnm-glib/tests/Makefile.in
@@ -224,13 +224,196 @@ am__tty_colors = { \
     std=''; \
   fi; \
 }
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/build-aux/depcomp
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -344,6 +527,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -497,7 +681,7 @@ with_valgrind = @with_valgrind@
 @ENABLE_TESTS_TRUE@	$(GLIB_CFLAGS) \
 @ENABLE_TESTS_TRUE@	$(DBUS_CFLAGS)
 
-@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@TESTS_ENVIRONMENT = $(srcdir)/libnm-glib-test-launch.sh
+@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@LOG_COMPILER = $(srcdir)/libnm-glib-test-launch.sh
 
 ####### NMClient and non-settings tests #######
 @ENABLE_TESTS_TRUE@test_nm_client_SOURCES = \
@@ -530,7 +714,7 @@ EXTRA_DIST = libnm-glib-test-launch.sh
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -667,98 +851,175 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-nm-client.log: test-nm-client$(EXEEXT)
+	@p='test-nm-client$(EXEEXT)'; \
+	b='test-nm-client'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-remote-settings-client.log: test-remote-settings-client$(EXEEXT)
+	@p='test-remote-settings-client$(EXEEXT)'; \
+	b='test-remote-settings-client'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -815,6 +1076,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -910,7 +1174,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/libnm-glib/tests/libnm-glib-test-launch.sh b/libnm-glib/tests/libnm-glib-test-launch.sh
index 42d9fbe2..980f8345 100755
--- a/libnm-glib/tests/libnm-glib-test-launch.sh
+++ b/libnm-glib/tests/libnm-glib-test-launch.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-# Spawn DBus if there's none
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-    eval `dbus-launch --sh-syntax`
-    trap "kill $DBUS_SESSION_BUS_PID" EXIT
-fi
+# Spawn DBus
+eval `dbus-launch --sh-syntax`
+trap "kill $DBUS_SESSION_BUS_PID" EXIT
 
 "$@"
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index 87271131..327b3234 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -325,6 +325,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -438,6 +439,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 5a98b8e4..4fa861e8 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -472,6 +472,8 @@ typedef enum {
  * @NM_DEVICE_STATE_REASON_MODEM_AVAILABLE: Modem now ready and available
  * @NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT: SIM PIN was incorrect
  * @NM_DEVICE_STATE_REASON_NEW_ACTIVATION: New connection activation was enqueued
+ * @NM_DEVICE_STATE_REASON_PARENT_CHANGED: the device's parent changed
+ * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed
  *
  * Device state change reason codes
  *
@@ -539,6 +541,8 @@ typedef enum {
 	NM_DEVICE_STATE_REASON_MODEM_AVAILABLE = 58,
 	NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT = 59,
 	NM_DEVICE_STATE_REASON_NEW_ACTIVATION = 60,
+	NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61,
+	NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62,
 
 	NM_DEVICE_STATE_REASON_LAST = 0xFFFF
 } NMDeviceStateReason;
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 6d5268a1..678d70ab 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -33,6 +33,7 @@
 #include "crypto.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
+#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-8021x
@@ -430,13 +431,52 @@ get_cert_scheme (GByteArray *array)
 	if (!array || !array->len)
 		return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
 
-	if (   (array->len > strlen (SCHEME_PATH))
-	    && !memcmp (array->data, SCHEME_PATH, strlen (SCHEME_PATH)))
-		return NM_SETTING_802_1X_CK_SCHEME_PATH;
+	/* interpret the blob as PATH if it starts with "file://". */
+	if (   array->len >= STRLEN (SCHEME_PATH)
+	    && !memcmp (array->data, SCHEME_PATH, STRLEN (SCHEME_PATH))) {
+		/* But it must also be NUL terminated, contain at least
+		 * one non-NUL character, and contain only one trailing NUL
+		 * chracter.
+		 * And ensure it's UTF-8 valid too so we can pass it through
+		 * D-Bus and stuff like that. */
+		if (   array->len > STRLEN (SCHEME_PATH) + 1
+		    && array->data[array->len - 1] == '\0'
+		    && g_utf8_validate ((const char *) &array->data[STRLEN (SCHEME_PATH)], array->len - (STRLEN (SCHEME_PATH) + 1), NULL))
+			return NM_SETTING_802_1X_CK_SCHEME_PATH;
+		return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN;
+	}
 
 	return NM_SETTING_802_1X_CK_SCHEME_BLOB;
 }
 
+static GByteArray *
+load_and_verify_certificate (const char *cert_path,
+                             NMSetting8021xCKScheme scheme,
+                             NMCryptoFileFormat *out_file_format,
+                             GError **error)
+{
+	NMCryptoFileFormat format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
+	GByteArray *array;
+
+	array = crypto_load_and_verify_certificate (cert_path, &format, error);
+
+	if (!array || !array->len || format == NM_CRYPTO_FILE_FORMAT_UNKNOWN)
+		format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
+	else if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) {
+		/* If we load the file as blob, we must ensure that the binary data does not
+		 * start with file://. NMSetting8021x cannot represent blobs that start with
+		 * file://.
+		 * If that's the case, coerce the format to UNKNOWN. The callers will take care
+		 * of that and not set the blob. */
+		if (get_cert_scheme (array) != NM_SETTING_802_1X_CK_SCHEME_BLOB)
+			format = NM_CRYPTO_FILE_FORMAT_UNKNOWN;
+	}
+
+	if (out_file_format)
+		*out_file_format = format;
+	return array;
+}
+
 /**
  * nm_setting_802_1x_get_ca_cert_scheme:
  * @setting: the #NMSetting8021x
@@ -511,14 +551,16 @@ static GByteArray *
 path_to_scheme_value (const char *path)
 {
 	GByteArray *array;
+	gsize len;
+
+	g_return_val_if_fail (path != NULL && path[0], NULL);
 
-	g_return_val_if_fail (path != NULL, NULL);
+	len = strlen (path);
 
-	/* Add the path scheme tag to the front, then the fielname */
-	array = g_byte_array_sized_new (strlen (path) + strlen (SCHEME_PATH) + 1);
-	g_assert (array);
+	/* Add the path scheme tag to the front, then the filename */
+	array = g_byte_array_sized_new (len + strlen (SCHEME_PATH) + 1);
 	g_byte_array_append (array, (const guint8 *) SCHEME_PATH, strlen (SCHEME_PATH));
-	g_byte_array_append (array, (const guint8 *) path, strlen (path));
+	g_byte_array_append (array, (const guint8 *) path, len);
 	g_byte_array_append (array, (const guint8 *) "\0", 1);
 	return array;
 }
@@ -578,7 +620,7 @@ nm_setting_802_1x_set_ca_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		/* wpa_supplicant can only use raw x509 CA certs */
 		if (format == NM_CRYPTO_FILE_FORMAT_X509) {
@@ -894,7 +936,7 @@ nm_setting_802_1x_set_client_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		gboolean valid = FALSE;
 
@@ -1159,7 +1201,7 @@ nm_setting_802_1x_set_phase2_ca_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		/* wpa_supplicant can only use raw x509 CA certs */
 		if (format == NM_CRYPTO_FILE_FORMAT_X509) {
@@ -1479,7 +1521,7 @@ nm_setting_802_1x_set_phase2_client_cert (NMSetting8021x *setting,
 		return TRUE;
 	}
 
-	data = crypto_load_and_verify_certificate (cert_path, &format, error);
+	data = load_and_verify_certificate (cert_path, scheme, &format, error);
 	if (data) {
 		gboolean valid = FALSE;
 
@@ -2604,25 +2646,9 @@ need_secrets (NMSetting *setting)
 static gboolean
 verify_cert (GByteArray *array, const char *prop_name, GError **error)
 {
-	if (!array)
-		return TRUE;
-
-	switch (get_cert_scheme (array)) {
-	case NM_SETTING_802_1X_CK_SCHEME_BLOB:
+	if (   !array
+	    || get_cert_scheme (array) != NM_SETTING_802_1X_CK_SCHEME_UNKNOWN)
 		return TRUE;
-	case NM_SETTING_802_1X_CK_SCHEME_PATH:
-		/* For path-based schemes, verify that the path is zero-terminated */
-		if (array->data[array->len - 1] == '\0') {
-			/* And ensure it's UTF-8 valid too so we can pass it through
-			 * D-Bus and stuff like that.
-			 */
-			if (g_utf8_validate ((const char *) (array->data + strlen (SCHEME_PATH)), -1, NULL))
-				return TRUE;
-		}
-		break;
-	default:
-		break;
-	}
 
 	g_set_error_literal (error,
 	                     NM_SETTING_802_1X_ERROR,
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 105981bc..35ae01da 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -99,7 +99,7 @@ _nm_gtype_hash (gconstpointer v)
 	return *((const GType *) v);
 }
 
-static void __attribute__((constructor))
+static void
 _ensure_registered (void)
 {
 	if (G_UNLIKELY (registered_settings == NULL)) {
@@ -112,6 +112,12 @@ _ensure_registered (void)
 	}
 }
 
+static void __attribute__((constructor))
+_ensure_registered_constructor (void)
+{
+	_ensure_registered ();
+}
+
 #define _ensure_setting_info(self, priv) \
 	G_STMT_START { \
 		NMSettingPrivate *_priv_esi = (priv); \
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 022fa70f..d0c2ca31 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -37,7 +37,7 @@
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
-#include "nm-utils-internal.h"
+#include "nm-macros-internal.h"
 
 /* Embed the commit id in the build binary */
 static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : "";
diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in
index 5ef0d87b..0767e19a 100644
--- a/libnm-util/tests/Makefile.in
+++ b/libnm-util/tests/Makefile.in
@@ -263,13 +263,196 @@ am__tty_colors = { \
     std=''; \
   fi; \
 }
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/build-aux/depcomp
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -383,6 +566,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -597,7 +781,7 @@ with_valgrind = @with_valgrind@
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -758,98 +942,203 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-settings-defaults.log: test-settings-defaults$(EXEEXT)
+	@p='test-settings-defaults$(EXEEXT)'; \
+	b='test-settings-defaults'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-crypto.log: test-crypto$(EXEEXT)
+	@p='test-crypto$(EXEEXT)'; \
+	b='test-crypto'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-secrets.log: test-secrets$(EXEEXT)
+	@p='test-secrets$(EXEEXT)'; \
+	b='test-secrets'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-general.log: test-general$(EXEEXT)
+	@p='test-general$(EXEEXT)'; \
+	b='test-general'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setting-8021x.log: test-setting-8021x$(EXEEXT)
+	@p='test-setting-8021x$(EXEEXT)'; \
+	b='test-setting-8021x'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-setting-dcb.log: test-setting-dcb$(EXEEXT)
+	@p='test-setting-dcb$(EXEEXT)'; \
+	b='test-setting-dcb'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -906,6 +1195,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -1001,7 +1293,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index d8f9dcc4..f365dc04 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -1703,9 +1703,9 @@ test_setting_compare_id (void)
 }
 
 static void
-test_setting_compare_secrets (NMSettingSecretFlags secret_flags,
-                              NMSettingCompareFlags comp_flags,
-                              gboolean remove_secret)
+_compare_secrets (NMSettingSecretFlags secret_flags,
+                  NMSettingCompareFlags comp_flags,
+                  gboolean remove_secret)
 {
 	gs_unref_object NMSetting *old = NULL, *new = NULL;
 	gboolean success;
@@ -1735,9 +1735,18 @@ test_setting_compare_secrets (NMSettingSecretFlags secret_flags,
 }
 
 static void
-test_setting_compare_vpn_secrets (NMSettingSecretFlags secret_flags,
-                                  NMSettingCompareFlags comp_flags,
-                                  gboolean remove_secret)
+test_setting_compare_secrets (void)
+{
+	_compare_secrets (NM_SETTING_SECRET_FLAG_AGENT_OWNED, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS, TRUE);
+	_compare_secrets (NM_SETTING_SECRET_FLAG_NOT_SAVED, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS, TRUE);
+	_compare_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS, TRUE);
+	_compare_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_EXACT, FALSE);
+}
+
+static void
+_compare_vpn_secrets (NMSettingSecretFlags secret_flags,
+                      NMSettingCompareFlags comp_flags,
+                      gboolean remove_secret)
 {
 	gs_unref_object NMSetting *old = NULL, *new = NULL;
 	gboolean success;
@@ -1767,6 +1776,15 @@ test_setting_compare_vpn_secrets (NMSettingSecretFlags secret_flags,
 	g_assert (success);
 }
 
+static void
+test_setting_compare_vpn_secrets (void)
+{
+	_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_AGENT_OWNED, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS, TRUE);
+	_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NOT_SAVED, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS, TRUE);
+	_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS, TRUE);
+	_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_EXACT, FALSE);
+}
+
 static void
 test_hwaddr_aton_ether_normal (void)
 {
@@ -2546,84 +2564,73 @@ NMTST_DEFINE ();
 
 int main (int argc, char **argv)
 {
-	char *base;
-
 	nmtst_init (&argc, &argv, TRUE);
 
 	/* The tests */
-	test_setting_vpn_items ();
-	test_setting_vpn_update_secrets ();
-	test_setting_vpn_modify_during_foreach ();
-	test_setting_ip6_config_old_address_array ();
-	test_setting_gsm_apn_spaces ();
-	test_setting_gsm_apn_bad_chars ();
-	test_setting_gsm_apn_underscore ();
-	test_setting_gsm_without_number ();
-	test_setting_to_hash_all ();
-	test_setting_to_hash_no_secrets ();
-	test_setting_to_hash_only_secrets ();
-	test_setting_compare_id ();
-	test_setting_compare_secrets (NM_SETTING_SECRET_FLAG_AGENT_OWNED, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS, TRUE);
-	test_setting_compare_secrets (NM_SETTING_SECRET_FLAG_NOT_SAVED, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS, TRUE);
-	test_setting_compare_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS, TRUE);
-	test_setting_compare_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_EXACT, FALSE);
-	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_AGENT_OWNED, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS, TRUE);
-	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NOT_SAVED, NM_SETTING_COMPARE_FLAG_IGNORE_NOT_SAVED_SECRETS, TRUE);
-	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_IGNORE_SECRETS, TRUE);
-	test_setting_compare_vpn_secrets (NM_SETTING_SECRET_FLAG_NONE, NM_SETTING_COMPARE_FLAG_EXACT, FALSE);
-	test_setting_old_uuid ();
-
-	test_connection_to_hash_setting_name ();
-	test_setting_new_from_hash ();
-	test_connection_replace_settings ();
-	test_connection_replace_settings_from_connection ();
-	test_connection_new_from_hash ();
-	test_connection_verify_sets_interface_name ();
-	test_connection_normalize_virtual_iface_name ();
-
-	test_setting_connection_permissions_helpers ();
-	test_setting_connection_permissions_property ();
-
-	test_connection_compare_same ();
-	test_connection_compare_key_only_in_a ();
-	test_connection_compare_setting_only_in_a ();
-	test_connection_compare_key_only_in_b ();
-	test_connection_compare_setting_only_in_b ();
-
-	test_connection_diff_a_only ();
-	test_connection_diff_same ();
-	test_connection_diff_different ();
-	test_connection_diff_no_secrets ();
-	test_connection_diff_inferrable ();
-	test_connection_good_base_types ();
-	test_connection_bad_base_types ();
-
-	test_hwaddr_aton_ether_normal ();
-	test_hwaddr_aton_ib_normal ();
-	test_hwaddr_aton_no_leading_zeros ();
-	test_hwaddr_aton_malformed ();
-	test_ip4_prefix_to_netmask ();
-	test_ip4_netmask_to_prefix ();
-
-	test_connection_changed_signal ();
-	test_setting_connection_changed_signal ();
-	test_setting_bond_changed_signal ();
-	test_setting_ip4_changed_signal ();
-	test_setting_ip6_changed_signal ();
-	test_setting_vlan_changed_signal ();
-	test_setting_vpn_changed_signal ();
-	test_setting_wired_changed_signal ();
-	test_setting_wireless_changed_signal ();
-	test_setting_wireless_security_changed_signal ();
-	test_setting_802_1x_changed_signal ();
-
-	test_libnm_linking ();
-
-	test_nm_utils_uuid_generate_from_string ();
-
-	base = g_path_get_basename (argv[0]);
-	fprintf (stdout, "%s: SUCCESS\n", base);
-	g_free (base);
-	return 0;
+	g_test_add_func ("/libnm/setting_vpn_items", test_setting_vpn_items);
+	g_test_add_func ("/libnm/setting_vpn_update_secrets", test_setting_vpn_update_secrets);
+	g_test_add_func ("/libnm/setting_vpn_modify_during_foreach", test_setting_vpn_modify_during_foreach);
+	g_test_add_func ("/libnm/setting_ip6_config_old_address_array", test_setting_ip6_config_old_address_array);
+	g_test_add_func ("/libnm/setting_gsm_apn_spaces", test_setting_gsm_apn_spaces);
+	g_test_add_func ("/libnm/setting_gsm_apn_bad_chars", test_setting_gsm_apn_bad_chars);
+	g_test_add_func ("/libnm/setting_gsm_apn_underscore", test_setting_gsm_apn_underscore);
+	g_test_add_func ("/libnm/setting_gsm_without_number", test_setting_gsm_without_number);
+	g_test_add_func ("/libnm/setting_to_hash_all", test_setting_to_hash_all);
+	g_test_add_func ("/libnm/setting_to_hash_no_secrets", test_setting_to_hash_no_secrets);
+	g_test_add_func ("/libnm/setting_to_hash_only_secrets", test_setting_to_hash_only_secrets);
+	g_test_add_func ("/libnm/setting_compare_id", test_setting_compare_id);
+	g_test_add_func ("/libnm/setting_compare_secrets", test_setting_compare_secrets);
+	g_test_add_func ("/libnm/setting_compare_vpn_secrets", test_setting_compare_vpn_secrets);
+	g_test_add_func ("/libnm/setting_old_uuid", test_setting_old_uuid);
+
+	g_test_add_func ("/libnm/connection_to_hash_setting_name", test_connection_to_hash_setting_name);
+	g_test_add_func ("/libnm/setting_new_from_hash", test_setting_new_from_hash);
+	g_test_add_func ("/libnm/connection_replace_settings", test_connection_replace_settings);
+	g_test_add_func ("/libnm/connection_replace_settings_from_connection", test_connection_replace_settings_from_connection);
+	g_test_add_func ("/libnm/connection_new_from_hash", test_connection_new_from_hash);
+	g_test_add_func ("/libnm/connection_verify_sets_interface_name", test_connection_verify_sets_interface_name);
+	g_test_add_func ("/libnm/connection_normalize_virtual_iface_name", test_connection_normalize_virtual_iface_name);
+
+	g_test_add_func ("/libnm/setting_connection_permissions_helpers", test_setting_connection_permissions_helpers);
+	g_test_add_func ("/libnm/setting_connection_permissions_property", test_setting_connection_permissions_property);
+
+	g_test_add_func ("/libnm/connection_compare_same", test_connection_compare_same);
+	g_test_add_func ("/libnm/connection_compare_key_only_in_a", test_connection_compare_key_only_in_a);
+	g_test_add_func ("/libnm/connection_compare_setting_only_in_a", test_connection_compare_setting_only_in_a);
+	g_test_add_func ("/libnm/connection_compare_key_only_in_b", test_connection_compare_key_only_in_b);
+	g_test_add_func ("/libnm/connection_compare_setting_only_in_b", test_connection_compare_setting_only_in_b);
+
+	g_test_add_func ("/libnm/connection_diff_a_only", test_connection_diff_a_only);
+	g_test_add_func ("/libnm/connection_diff_same", test_connection_diff_same);
+	g_test_add_func ("/libnm/connection_diff_different", test_connection_diff_different);
+	g_test_add_func ("/libnm/connection_diff_no_secrets", test_connection_diff_no_secrets);
+	g_test_add_func ("/libnm/connection_diff_inferrable", test_connection_diff_inferrable);
+	g_test_add_func ("/libnm/connection_good_base_types", test_connection_good_base_types);
+	g_test_add_func ("/libnm/connection_bad_base_types", test_connection_bad_base_types);
+
+	g_test_add_func ("/libnm/hwaddr_aton_ether_normal", test_hwaddr_aton_ether_normal);
+	g_test_add_func ("/libnm/hwaddr_aton_ib_normal", test_hwaddr_aton_ib_normal);
+	g_test_add_func ("/libnm/hwaddr_aton_no_leading_zeros", test_hwaddr_aton_no_leading_zeros);
+	g_test_add_func ("/libnm/hwaddr_aton_malformed", test_hwaddr_aton_malformed);
+	g_test_add_func ("/libnm/ip4_prefix_to_netmask", test_ip4_prefix_to_netmask);
+	g_test_add_func ("/libnm/ip4_netmask_to_prefix", test_ip4_netmask_to_prefix);
+
+	g_test_add_func ("/libnm/connection_changed_signal", test_connection_changed_signal);
+	g_test_add_func ("/libnm/setting_connection_changed_signal", test_setting_connection_changed_signal);
+	g_test_add_func ("/libnm/setting_bond_changed_signal", test_setting_bond_changed_signal);
+	g_test_add_func ("/libnm/setting_ip4_changed_signal", test_setting_ip4_changed_signal);
+	g_test_add_func ("/libnm/setting_ip6_changed_signal", test_setting_ip6_changed_signal);
+	g_test_add_func ("/libnm/setting_vlan_changed_signal", test_setting_vlan_changed_signal);
+	g_test_add_func ("/libnm/setting_vpn_changed_signal", test_setting_vpn_changed_signal);
+	g_test_add_func ("/libnm/setting_wired_changed_signal", test_setting_wired_changed_signal);
+	g_test_add_func ("/libnm/setting_wireless_changed_signal", test_setting_wireless_changed_signal);
+	g_test_add_func ("/libnm/setting_wireless_security_changed_signal", test_setting_wireless_security_changed_signal);
+	g_test_add_func ("/libnm/setting_802_1x_changed_signal", test_setting_802_1x_changed_signal);
+
+	g_test_add_func ("/libnm/libnm_linking", test_libnm_linking);
+
+	g_test_add_func ("/libnm/nm_utils_uuid_generate_from_string", test_nm_utils_uuid_generate_from_string);
+
+	return g_test_run ();
 }
 
diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c
index a22edb0f..adf3a94a 100644
--- a/libnm-util/tests/test-secrets.c
+++ b/libnm-util/tests/test-secrets.c
@@ -734,37 +734,33 @@ test_update_secrets_null_setting_name_with_setting_hash (void)
 	g_object_unref (connection);
 }
 
+NMTST_DEFINE ();
+
 int main (int argc, char **argv)
 {
 	GError *error = NULL;
-	char *base;
 
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-	g_type_init ();
-#endif
+	nmtst_init (&argc, &argv, TRUE);
 
 	if (!nm_utils_init (&error))
 		FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message);
 
 	/* The tests */
-	test_need_tls_secrets_path ();
-	test_need_tls_secrets_blob ();
-	test_need_tls_phase2_secrets_path ();
-	test_need_tls_phase2_secrets_blob ();
-
-	test_update_secrets_wifi_single_setting ();
-	test_update_secrets_wifi_full_hash ();
-	test_update_secrets_wifi_bad_setting_name ();
-
-	test_update_secrets_whole_connection ();
-	test_update_secrets_whole_connection_empty_hash ();
-	test_update_secrets_whole_connection_bad_setting ();
-	test_update_secrets_whole_connection_empty_base_setting ();
-	test_update_secrets_null_setting_name_with_setting_hash ();
-
-	base = g_path_get_basename (argv[0]);
-	fprintf (stdout, "%s: SUCCESS\n", base);
-	g_free (base);
-	return 0;
+	g_test_add_func ("/libnm/need_tls_secrets_path", test_need_tls_secrets_path);
+	g_test_add_func ("/libnm/need_tls_secrets_blob", test_need_tls_secrets_blob);
+	g_test_add_func ("/libnm/need_tls_phase2_secrets_path", test_need_tls_phase2_secrets_path);
+	g_test_add_func ("/libnm/need_tls_phase2_secrets_blob", test_need_tls_phase2_secrets_blob);
+
+	g_test_add_func ("/libnm/update_secrets_wifi_single_setting", test_update_secrets_wifi_single_setting);
+	g_test_add_func ("/libnm/update_secrets_wifi_full_hash", test_update_secrets_wifi_full_hash);
+	g_test_add_func ("/libnm/update_secrets_wifi_bad_setting_name", test_update_secrets_wifi_bad_setting_name);
+
+	g_test_add_func ("/libnm/update_secrets_whole_connection", test_update_secrets_whole_connection);
+	g_test_add_func ("/libnm/update_secrets_whole_connection_empty_hash", test_update_secrets_whole_connection_empty_hash);
+	g_test_add_func ("/libnm/update_secrets_whole_connection_bad_setting", test_update_secrets_whole_connection_bad_setting);
+	g_test_add_func ("/libnm/update_secrets_whole_connection_empty_base_setting", test_update_secrets_whole_connection_empty_base_setting);
+	g_test_add_func ("/libnm/update_secrets_null_setting_name_with_setting_hash", test_update_secrets_null_setting_name_with_setting_hash);
+
+	return g_test_run ();
 }
 
diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c
index 7441e1ff..70a743cb 100644
--- a/libnm-util/tests/test-settings-defaults.c
+++ b/libnm-util/tests/test-settings-defaults.c
@@ -101,18 +101,9 @@ test_defaults (GType type, const char *name)
 	g_object_unref (setting);
 }
 
-int main (int argc, char **argv)
+static void
+defaults (void)
 {
-	GError *error = NULL;
-	char *base;
-
-#if !GLIB_CHECK_VERSION (2, 35, 0)
-	g_type_init ();
-#endif
-
-	if (!nm_utils_init (&error))
-		FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message);
-
 	/* The tests */
 	test_defaults (NM_TYPE_SETTING_CONNECTION, NM_SETTING_CONNECTION_SETTING_NAME);
 	test_defaults (NM_TYPE_SETTING_802_1X, NM_SETTING_802_1X_SETTING_NAME);
@@ -127,10 +118,16 @@ int main (int argc, char **argv)
 	test_defaults (NM_TYPE_SETTING_WIRED, NM_SETTING_WIRED_SETTING_NAME);
 	test_defaults (NM_TYPE_SETTING_WIRELESS, NM_SETTING_WIRELESS_SETTING_NAME);
 	test_defaults (NM_TYPE_SETTING_WIRELESS_SECURITY, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME);
-
-	base = g_path_get_basename (argv[0]);
-	fprintf (stdout, "%s: SUCCESS\n", base);
-	g_free (base);
-	return 0;
 }
 
+NMTST_DEFINE ();
+
+int
+main (int argc, char **argv)
+{
+	nmtst_init (&argc, &argv, TRUE);
+
+	g_test_add_func ("/libnm/defaults", defaults);
+
+	return g_test_run ();
+}
diff --git a/libnm/Makefile.in b/libnm/Makefile.in
index dd9a5952..73b56966 100644
--- a/libnm/Makefile.in
+++ b/libnm/Makefile.in
@@ -292,6 +292,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -405,6 +406,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -608,6 +610,8 @@ libnm_core_private_headers = \
 	$(core)/crypto.h			\
 	$(core)/nm-connection-private.h		\
 	$(core)/nm-core-internal.h		\
+	$(core)/nm-keyfile-internal.h       \
+	$(core)/nm-keyfile-utils.h          \
 	$(core)/nm-property-compare.h		\
 	$(core)/nm-setting-private.h		\
 	$(core)/nm-utils-private.h
@@ -617,6 +621,9 @@ libnm_core_sources = \
 	$(core)/crypto.c			\
 	$(core)/nm-connection.c			\
 	$(core)/nm-errors.c			\
+	$(core)/nm-keyfile-reader.c         \
+	$(core)/nm-keyfile-utils.c          \
+	$(core)/nm-keyfile-writer.c         \
 	$(core)/nm-property-compare.c		\
 	$(core)/nm-setting-8021x.c		\
 	$(core)/nm-setting-adsl.c		\
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 82bcdb9f..294bab41 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -844,3 +844,10 @@ global:
 local:
 	*;
 };
+
+libnm_1_0_4 {
+global:
+	nm_setting_connection_autoconnect_slaves_get_type;
+	nm_setting_connection_get_autoconnect_slaves;
+} libnm_1_0_0;
+
diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 6bfd4bbd..45e09442 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -22,6 +22,8 @@
 
 #include 
 #include 
+
+#include "nm-glib-compat.h"
 #include "nm-dbus-helpers.h"
 #include "nm-dbus-interface.h"
 
@@ -93,7 +95,8 @@ _nm_dbus_new_connection (GCancellable *cancellable, GError **error)
 	GDBusConnection *connection = NULL;
 
 	/* If running as root try the private bus first */
-	if (0 == geteuid ()) {
+	if (0 == geteuid () && !g_test_initialized ()) {
+
 		GError *local = NULL;
 		GDBusConnection *p;
 
@@ -203,7 +206,7 @@ _nm_dbus_new_connection_async (GCancellable *cancellable,
 	simple = g_simple_async_result_new (NULL, callback, user_data, _nm_dbus_new_connection_async);
 
 	/* If running as root try the private bus first */
-	if (0 == geteuid ()) {
+	if (0 == geteuid () && !g_test_initialized ()) {
 		GDBusConnection *p;
 
 		if (cancellable) {
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index e80ac707..cd14c0e9 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -979,6 +979,9 @@ nm_device_get_type_description (NMDevice *device)
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
 	const char *desc, *typename;
 
+	/* BEWARE: this function should return the same value
+	 * as nm_device_get_type_description() in nm-core. */
+
 	g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
 
 	if (priv->type_description)
diff --git a/libnm/nm-ifcfg-rh-docs.xml b/libnm/nm-ifcfg-rh-docs.xml
index 438f4b71..0c287f26 100644
--- a/libnm/nm-ifcfg-rh-docs.xml
+++ b/libnm/nm-ifcfg-rh-docs.xml
@@ -86,6 +86,8 @@ the connection type."/>
 
+
 
 
     
     
-    
+    
   
   
     
@@ -83,6 +83,7 @@
   
     
     
+    
     
     
     
@@ -164,7 +165,7 @@
     
     
     
-    
+    
     
     
     
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 3afe7f8e..98924973 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -602,6 +602,8 @@ updated_get_settings_cb (GObject *proxy,
 		priv->visible = visible;
 		g_object_notify (G_OBJECT (self), NM_REMOTE_CONNECTION_VISIBLE);
 	}
+
+	g_object_unref (self);
 }
 
 static void
@@ -613,7 +615,8 @@ updated_cb (NMDBusSettingsConnection *proxy, gpointer user_data)
 	/* The connection got updated; request the replacement settings */
 	nmdbus_settings_connection_call_get_settings (priv->proxy,
 	                                              NULL,
-	                                              updated_get_settings_cb, self);
+	                                              updated_get_settings_cb,
+	                                              g_object_ref (self));
 }
 
 /****************************************************************/
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 5da8ef65..6df54d43 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -301,6 +301,7 @@ get_secrets_cb (NMSecretAgentOld *self,
 	if (error)
 		g_dbus_method_invocation_return_gerror (info->context, error);
 	else {
+		g_variant_take_ref (secrets);
 		g_dbus_method_invocation_return_value (info->context,
 		                                       g_variant_new ("(@a{sa{sv}})", secrets));
 	}
diff --git a/libnm/nm-setting-docs.xml b/libnm/nm-setting-docs.xml
index 2e9814f8..c2cb80ed 100644
--- a/libnm/nm-setting-docs.xml
+++ b/libnm/nm-setting-docs.xml
@@ -36,7 +36,7 @@
     
     
     
-    
+    
   
   
     
@@ -85,6 +85,7 @@
   
     
     
+    
     
     
     
@@ -169,7 +170,7 @@
     
     
     
-    
+    
     
     
     
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index e6843f7e..b43c481c 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -279,8 +279,8 @@ nm_vpn_plugin_old_set_config (NMVpnPluginOld *plugin,
 
 	priv->got_config = TRUE;
 
-	g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_HAS_IP4, "b", &priv->has_ip4);
-	g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_HAS_IP6, "b", &priv->has_ip6);
+	(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_HAS_IP4, "b", &priv->has_ip4);
+	(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_HAS_IP6, "b", &priv->has_ip6);
 
 	g_warn_if_fail (priv->has_ip4 || priv->has_ip6);
 
@@ -288,13 +288,13 @@ nm_vpn_plugin_old_set_config (NMVpnPluginOld *plugin,
 	 * ip4config, for compatibility with older daemons.
 	 */
 	g_clear_pointer (&priv->banner, g_free);
-	g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_BANNER, "&s", &priv->banner);
+	(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_BANNER, "&s", &priv->banner);
 	g_clear_pointer (&priv->tundev, g_free);
-	g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_TUNDEV, "&s", &priv->tundev);
+	(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_TUNDEV, "&s", &priv->tundev);
 	g_clear_pointer (&priv->gateway, g_free);
-	g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, "&s", &priv->gateway);
+	(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, "&s", &priv->gateway);
 	g_clear_pointer (&priv->mtu, g_free);
-	g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_MTU, "&s", &priv->mtu);
+	(void) g_variant_lookup (config, NM_VPN_PLUGIN_CONFIG_MTU, "&s", &priv->mtu);
 
 	g_signal_emit (plugin, signals[CONFIG], 0, config);
 }
diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am
index 56dd17d5..a2dafec7 100644
--- a/libnm/tests/Makefile.am
+++ b/libnm/tests/Makefile.am
@@ -20,7 +20,7 @@ noinst_PROGRAMS = $(TESTS)
 if WITH_VALGRIND
 @VALGRIND_RULES@ --launch-dbus
 else
-TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh
+LOG_COMPILER = $(srcdir)/libnm-test-launch.sh
 endif
 TESTS = test-nm-client test-remote-settings-client test-secret-agent
 
diff --git a/libnm/tests/Makefile.in b/libnm/tests/Makefile.in
index 631e3c53..2ffb9641 100644
--- a/libnm/tests/Makefile.in
+++ b/libnm/tests/Makefile.in
@@ -237,13 +237,196 @@ am__tty_colors = { \
     std=''; \
   fi; \
 }
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/build-aux/depcomp
+	$(top_srcdir)/build-aux/depcomp \
+	$(top_srcdir)/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -357,6 +540,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -515,7 +699,7 @@ with_valgrind = @with_valgrind@
 @ENABLE_TESTS_TRUE@	$(top_builddir)/libnm/libnm.la \
 @ENABLE_TESTS_TRUE@	$(GLIB_LIBS)
 
-@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@TESTS_ENVIRONMENT = $(srcdir)/libnm-test-launch.sh
+@ENABLE_TESTS_TRUE@@WITH_VALGRIND_FALSE@LOG_COMPILER = $(srcdir)/libnm-test-launch.sh
 @ENABLE_TESTS_TRUE@test_nm_client_SOURCES = \
 @ENABLE_TESTS_TRUE@	common.c \
 @ENABLE_TESTS_TRUE@	common.h \
@@ -535,7 +719,7 @@ EXTRA_DIST = libnm-test-launch.sh
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -677,98 +861,182 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
-	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      skipped="($$skip tests were not run)"; \
+	      color_start= color_end=; \
 	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    col="$$grn"; \
-	  else \
-	    col="$$red"; \
-	  fi; \
-	  echo "$${col}$$dashes$${std}"; \
-	  echo "$${col}$$banner$${std}"; \
-	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
-	  test -z "$$report" || echo "$${col}$$report$${std}"; \
-	  echo "$${col}$$dashes$${std}"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+test-nm-client.log: test-nm-client$(EXEEXT)
+	@p='test-nm-client$(EXEEXT)'; \
+	b='test-nm-client'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-remote-settings-client.log: test-remote-settings-client$(EXEEXT)
+	@p='test-remote-settings-client$(EXEEXT)'; \
+	b='test-remote-settings-client'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-secret-agent.log: test-secret-agent$(EXEEXT)
+	@p='test-secret-agent$(EXEEXT)'; \
+	b='test-secret-agent'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -825,6 +1093,9 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
@@ -920,7 +1191,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/libnm/tests/libnm-test-launch.sh b/libnm/tests/libnm-test-launch.sh
index 42d9fbe2..980f8345 100755
--- a/libnm/tests/libnm-test-launch.sh
+++ b/libnm/tests/libnm-test-launch.sh
@@ -1,9 +1,7 @@
 #!/bin/sh
 
-# Spawn DBus if there's none
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-    eval `dbus-launch --sh-syntax`
-    trap "kill $DBUS_SESSION_BUS_PID" EXIT
-fi
+# Spawn DBus
+eval `dbus-launch --sh-syntax`
+trap "kill $DBUS_SESSION_BUS_PID" EXIT
 
 "$@"
diff --git a/m4/ax_lib_readline.m4 b/m4/ax_lib_readline.m4
index fe56c5bf..af32fdaf 100644
--- a/m4/ax_lib_readline.m4
+++ b/m4/ax_lib_readline.m4
@@ -87,7 +87,7 @@ AC_DEFUN([AX_LIB_READLINE], [
   ])
 
   if test -z "$ax_cv_lib_readline"; then
-    AC_MSG_ERROR([readline library with terminfo support is required (one of ncurses, curses, or termcap)])
+    AC_MSG_ERROR([readline library with terminfo support is required (one of readline, edit, or editline, AND one of ncurses, curses, or termcap)])
   fi
 
   ORIG_LIBS="$LIBS"
diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4
index 5c8d2077..a1c4e128 100644
--- a/m4/compiler_warnings.m4
+++ b/m4/compiler_warnings.m4
@@ -22,7 +22,7 @@ AC_DEFUN([NM_COMPILER_WARNING], [
 AC_DEFUN([NM_COMPILER_WARNINGS],
 [AC_ARG_ENABLE(more-warnings,
 	AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
-	set_more_warnings="$enableval",set_more_warnings=error)
+	set_more_warnings="$enableval",set_more_warnings=yes)
 AC_MSG_CHECKING(for more warnings)
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	AC_MSG_RESULT(yes)
diff --git a/man/Makefile.in b/man/Makefile.in
index 01a94a34..d62aa0f8 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -186,6 +186,7 @@ ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -299,6 +300,7 @@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LOG_DRIVER = @LOG_DRIVER@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 9f8840d0..6896f941 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,7 +2,7 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 05/05/2015
+.\"      Date: 07/14/2015
 .\"    Manual: Network management daemons
 .\"    Source: NetworkManager 1.0
 .\"  Language: English
@@ -239,6 +239,17 @@ in
 \fBNetworkManager.conf\fR(5)
 for more information\&.
 .RE
+.SH "UDEV PROPERTIES"
+.PP
+\fBudev\fR(7)
+device manager is used for the network device discovery\&. The following property influences how NetworkManager manages the devices:
+.PP
+\fINM_UNMANAGED\fR
+.RS 4
+No default connection will be created and automatic activation will not be attempted when this property of a device is set to a true value ("1" or "true")\&. You will still be able to attach a connection to the device manually or observe externally added configuration such as addresses or routes\&.
+.sp
+Create an udev rule that sets this property to prevent NetworkManager from interfering with virtual Ethernet device interfaces that are managed by virtualization tools\&.
+.RE
 .SH "DEBUGGING"
 .PP
 The following environment variables are supported to help debugging\&. When used in conjunction with the
@@ -258,4 +269,4 @@ to enable debug logging inside NetworkManager itself\&.
 \fBnm-online\fR(1),
 \fBnm-settings\fR(5),
 \fBnm-applet\fR(1),
-\fBnm-connection-editor\fR(1)
+\fBnm-connection-editor\fR(1)\fBudev\fR(7)
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 9cfcc93f..ae18f4f6 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,7 +2,7 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 05/05/2015
+.\"      Date: 07/14/2015
 .\"    Manual: Configuration
 .\"    Source: NetworkManager 1.0
 .\"  Language: English
@@ -50,7 +50,9 @@ directory\&. These will be read in order, with later files overriding earlier on
 .PP
 The configuration file format is so\-called key file (sort of ini\-style format)\&. It consists of sections (groups) of key\-value pairs\&. Lines beginning with a \*(Aq#\*(Aq and blank lines are considered comments\&. Sections are started by a header line containing the section enclosed in \*(Aq[\*(Aq and \*(Aq]\*(Aq, and ended implicitly by the start of the next section or the end of the file\&. Each key\-value pair must be contained in a section\&.
 .PP
-For keys that take a list of devices as their value, you can specify devices by their MAC addresses or interface names, or "*" to specify all devices\&.
+For keys that take a list of devices as their value, you can specify devices by their MAC addresses or interface names, or "*" to specify all devices\&. See
+the section called \(lqDevice List Format\(rq
+below\&.
 .PP
 Minimal system settings configuration file looks like this:
 .sp
@@ -73,6 +75,7 @@ As an extension to the normal keyfile format, you can also append a value to a p
 .\}
 .nf
 	plugins+=another\-plugin
+	plugins\-=remove\-me
       
 .fi
 .if n \{\
@@ -125,7 +128,7 @@ internal\&.
 .PP
 \fIno\-auto\-default\fR
 .RS 4
-Comma\-separated list of devices for which NetworkManager shouldn\*(Aqt create default wired connection (Auto eth0)\&. By default, NetworkManager creates a temporary wired connection for any Ethernet device that is managed and doesn\*(Aqt have a connection configured\&. List a device in this option to inhibit creating the default connection for the device\&. May have the special value
+Specify devices for which NetworkManager shouldn\*(Aqt create default wired connection (Auto eth0)\&. By default, NetworkManager creates a temporary wired connection for any Ethernet device that is managed and doesn\*(Aqt have a connection configured\&. List a device in this option to inhibit creating the default connection for the device\&. May have the special value
 *
 to apply to all devices\&.
 .sp
@@ -133,13 +136,19 @@ When the default wired connection is deleted or saved to a new persistent connec
 /var/run/NetworkManager/no\-auto\-default\&.state
 to prevent creating the default connection for that device again\&.
 .sp
+See
+the section called \(lqDevice List Format\(rq
+for the syntax how to specify a device\&.
+.sp
+Example:
+.sp
 .if n \{\
 .RS 4
 .\}
 .nf
-	    no\-auto\-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
-	    no\-auto\-default=eth0,eth1
-	    no\-auto\-default=*
+no\-auto\-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
+no\-auto\-default=eth0,eth1
+no\-auto\-default=*
 	  
 .fi
 .if n \{\
@@ -150,15 +159,24 @@ to prevent creating the default connection for that device again\&.
 .PP
 \fIignore\-carrier\fR
 .RS 4
-Comma\-separated list of devices for which NetworkManager will (partially) ignore the carrier state\&. Normally, for device types that support carrier\-detect, such as Ethernet and InfiniBand, NetworkManager will only allow a connection to be activated on the device if carrier is present (ie, a cable is plugged in), and it will deactivate the device if carrier drops for more than a few seconds\&.
+Specify devices for which NetworkManager will (partially) ignore the carrier state\&. Normally, for device types that support carrier\-detect, such as Ethernet and InfiniBand, NetworkManager will only allow a connection to be activated on the device if carrier is present (ie, a cable is plugged in), and it will deactivate the device if carrier drops for more than a few seconds\&.
 .sp
 Listing a device here will allow activating connections on that device even when it does not have carrier, provided that the connection uses only statically\-configured IP addresses\&. Additionally, it will allow any active connection (whether static or dynamic) to remain active on the device when carrier is lost\&.
 .sp
-May have the special value
-*
-to apply to all devices\&.
-.sp
 Note that the "carrier" property of NMDevices and device D\-Bus interfaces will still reflect the actual device state; it\*(Aqs just that NetworkManager will not make use of that information\&.
+.sp
+See
+the section called \(lqDevice List Format\(rq
+for the syntax how to specify a device\&.
+.RE
+.PP
+\fIassume\-ipv6ll\-only\fR
+.RS 4
+Specify devices for which NetworkManager will try to generate a connection based on initial configuration when the device only has an IPv6 link\-local address\&.
+.sp
+See
+the section called \(lqDevice List Format\(rq
+for the syntax how to specify a device\&.
 .RE
 .PP
 \fIconfigure\-and\-quit\fR
@@ -205,19 +223,11 @@ Set a persistent hostname\&.
 .PP
 \fIunmanaged\-devices\fR
 .RS 4
-Set devices that should be ignored by NetworkManager when using the
-keyfile
-plugin\&. Devices are specified in the following format:
+Set devices that should be ignored by NetworkManager\&.
 .sp
-mac:
-or
-interface\-name:\&. Here
-hwaddr
-is the MAC address of the device to be ignored, in hex\-digits\-and\-colons notation\&.
-ifname
-is the interface name of the ignored device\&.
-.sp
-Multiple entries are separated with semicolons\&. No spaces are allowed in the value\&.
+See
+the section called \(lqDevice List Format\(rq
+for the syntax how to specify a device\&.
 .sp
 Example:
 .sp
@@ -415,6 +425,86 @@ IP          : shortcut for "IP4,IP6"
 HW          : deprecated alias for "PLATFORM"
 .RE
 .RE
+.SH "CONNECTION SECTION"
+.PP
+This section allows to specify default values for connections\&. Not all properties can be overwritten, only a selected list below\&. You can have multiple
+connection
+sections, by having different sections with a name that all start with "connection"\&.
+.PP
+Example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+[connection]
+ipv6\&.ip6\-privacy=0
+connection\&.autoconnect\-slaves=1
+
+[connection\-wifi\-wlan0]
+match\-device=interface\-name:wlan0
+ipv4\&.route\-metric=50
+
+[connection\-wifi\-other]
+match\-device=type:wifi
+ipv4\&.route\-metric=55
+ipv6\&.ip6\-privacy=1
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+The sections within one file are considered in order of appearance, with the exception that the
+[connection]
+section is always considered last\&. In the example above, this order is
+[connection\-wifi\-wlan0],
+[connection\-wlan\-other], and
+[connection]\&. When checking for a default configuration value, the section are searched until the requested value is found\&. In the example above, "ipv4\&.route\-metric" for wlan0 interface is set to 50, and for all other Wi\-Fi typed interfaces to 55\&. Also, Wi\-Fi devices would have IPv6 private addresses enabled by default, but other devices would have it disabled\&. Note that also "wlan0" gets "ipv6\&.ip6\-privacy=1", because although the section "[connection\-wifi\-wlan0]" matches the device, it does not contain that property and the search continues\&.
+.PP
+When having different sections in multiple files, sections from files that are read later have higher priority\&. So within one file the priority of the sections is top\-to\-bottom\&. Across multiple files later definitions take precedence\&.
+.PP
+.PP
+\fImatch\-device\fR
+.RS 4
+An optional device spec that restricts when the section applies\&. See
+the section called \(lqDevice List Format\(rq
+for the possible values\&.
+.RE
+.PP
+\fIstop\-match\fR
+.RS 4
+An optional boolean value which defaults to
+no\&. If the section matches (based on
+match\-device), further sections will not be considered even if the property in question is not present\&. In the example above, if
+[connection\-wifi\-wlan0]
+would have
+stop\-match
+set to
+yes, its
+ipv6\&.ip6\-privacy
+value would be unspecified\&.
+.RE
+.PP
+The following properties are supported to have their default values configured:
+.PP
+\fIipv4\&.route\-metric\fR
+.RS 4
+.RE
+.PP
+\fIipv6\&.ip6\-privacy\fR
+.RS 4
+If
+ipv6\&.ip6\-privacy
+is unset, use the content of "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback\&.
+.RE
+.PP
+\fIipv6\&.route\-metric\fR
+.RS 4
+.RE
+.PP
+\fIconnection\&.autoconnect\-slaves\fR
+.RS 4
+.RE
 .SH "CONNECTIVITY SECTION"
 .PP
 This section controls NetworkManager\*(Aqs optional connectivity checking functionality\&. This allows NetworkManager to detect whether or not the system can actually access the internet or whether it is behind a captive portal\&.
@@ -479,6 +569,92 @@ plugin instead\&.
 .RS 4
 This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table)\&. The configuration is read using /sbin/iscsiadm\&. Users are expected to configure iBFT connections via the firmware interfaces\&.
 .RE
+.SH "APPENDIX"
+.SS "Device List Format"
+.PP
+The configuration options
+main\&.no\-auto\-default,
+main\&.ignore\-carrier, and
+keyfile\&.unmanaged\-devices
+select devices based on a list of matchings\&. Devices can be specified using the following format:
+.PP
+.PP
+*
+.RS 4
+Matches every device\&.
+.RE
+.PP
+IFNAME
+.RS 4
+Case sensitive match of interface name of the device\&. Globbing is not supported\&.
+.RE
+.PP
+HWADDR
+.RS 4
+Match the MAC address of the device\&. Globbing is not supported
+.RE
+.PP
+interface\-name:IFNAME, interface\-name:~IFNAME
+.RS 4
+Case sensitive match of interface name of the device\&. Simple globbing is supported with
+*
+and
+?\&. Ranges and escaping is not supported\&.
+.RE
+.PP
+interface\-name:=IFNAME
+.RS 4
+Case sensitive match of interface name of the device\&. Globbing is disabled and
+IFNAME
+is taken literally\&.
+.RE
+.PP
+mac:HWADDR
+.RS 4
+Match the MAC address of the device\&. Globbing is not supported
+.RE
+.PP
+s390\-subchannels:HWADDR
+.RS 4
+Match the device based on the subchannel address\&. Globbing is not supported
+.RE
+.PP
+type:TYPE
+.RS 4
+Match the device type\&. Valid type names are as reported by "nmcli \-f GENERAL\&.TYPE device show"\&. Globbing is not supported\&.
+.RE
+.PP
+except:SPEC
+.RS 4
+Negative match of a device\&.
+SPEC
+must be explicitly qualified with a prefix such as
+interface\-name:\&. A negative match has higher priority then the positive matches above\&.
+.RE
+.PP
+SPEC[,;]SPEC
+.RS 4
+Multiple specs can be concatenated with comman or semicolon\&. The order does not matter as matches are either positive (inclusive) or negative, with negative matches having higher priority\&.
+.sp
+Backslash is supported to escape the separators \*(Aq;\*(Aq and \*(Aq,\*(Aq, and to express special characters such as newline (\*(Aq\en\*(Aq), tabulator (\*(Aq\et\*(Aq), whitespace (\*(Aq\es\*(Aq) and backslash (\*(Aq\e\e\*(Aq)\&. The globbing of interface names cannot be escaped\&. Whitespace is taken literally so usually the specs will be concatenated without spaces\&.
+.RE
+.PP
+Example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+interface\-name:em4
+mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface\-name:eth2
+interface\-name:vboxnet*,except:interface\-name:vboxnet2
+*,except:mac:00:22:68:1c:59:b1
+        
+.fi
+.if n \{\
+.RE
+.\}
+.sp
 .SH "SEE ALSO"
 .PP
 \fBNetworkManager\fR(8),
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index 7c6b9551..40fa49dd 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -62,7 +62,8 @@ Copyright 2010 - 2014 Red Hat, Inc.
     
       For keys that take a list of devices as their value, you can
       specify devices by their MAC addresses or interface names, or
-      "*" to specify all devices.
+      "*" to specify all devices. See 
+      below.
     
     
       Minimal system settings configuration file looks like this:
@@ -76,6 +77,7 @@ Copyright 2010 - 2014 Red Hat, Inc.
       append a value to a previously-set list-valued key by doing:
       
 	plugins+=another-plugin
+	plugins-=remove-me
       
     
   
@@ -148,7 +150,7 @@ Copyright 2010 - 2014 Red Hat, Inc.
       
       
 	no-auto-default
-	Comma-separated list of devices for which
+	Specify devices for which
 	NetworkManager shouldn't create default wired connection
 	(Auto eth0).  By default, NetworkManager creates a temporary
 	wired connection for any Ethernet device that is managed and
@@ -162,11 +164,15 @@ Copyright 2010 - 2014 Red Hat, Inc.
 	/var/run/NetworkManager/no-auto-default.state
 	to prevent creating the default connection for that device
 	again.
+	See  for the syntax how to
+	specify a device.
+	
 	
+	  Example:
 	  
-	    no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
-	    no-auto-default=eth0,eth1
-	    no-auto-default=*
+no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
+no-auto-default=eth0,eth1
+no-auto-default=*
 	  
 	
 	
@@ -176,8 +182,8 @@ Copyright 2010 - 2014 Red Hat, Inc.
 	ignore-carrier
 	
 	  
-	    Comma-separated list of devices for which NetworkManager
-	    will (partially) ignore the carrier state. Normally, for
+	    Specify devices for which NetworkManager will (partially)
+	    ignore the carrier state. Normally, for
 	    device types that support carrier-detect, such as Ethernet
 	    and InfiniBand, NetworkManager will only allow a
 	    connection to be activated on the device if carrier is
@@ -193,15 +199,28 @@ Copyright 2010 - 2014 Red Hat, Inc.
 	    connection (whether static or dynamic) to remain active on
 	    the device when carrier is lost.
 	  
-	  
-	    May have the special value * to apply
-	    to all devices.
-	  
 	  
 	    Note that the "carrier" property of NMDevices and device D-Bus
 	    interfaces will still reflect the actual device state; it's just
 	    that NetworkManager will not make use of that information.
 	  
+	  See  for the syntax how to
+	   specify a device.
+	  
+	
+      
+
+      
+	assume-ipv6ll-only
+	
+	  
+	    Specify devices for which NetworkManager will try to
+	    generate a connection based on initial configuration when
+	    the device only has an IPv6 link-local address.
+	  
+	  See  for the syntax how to
+	   specify a device.
+	  
 	
       
 
@@ -287,17 +306,11 @@ Copyright 2010 - 2014 Red Hat, Inc.
 	
 	  unmanaged-devices
 	  Set devices that should be ignored by
-	  NetworkManager when using the keyfile
-	  plugin. Devices are specified in the following
-	  format:
-	  mac:<hwaddr> or
-	  interface-name:<ifname>.  Here
-	  hwaddr is the MAC address of the device
-	  to be ignored, in hex-digits-and-colons notation.
-	  ifname is the interface name of the
-	  ignored device.
-	  Multiple entries are separated with semicolons. No
-	  spaces are allowed in the value.
+	   NetworkManager.
+	  
+	  See  for the syntax how to
+	   specify a device.
+	  
 	  
 	    Example:
 	    
@@ -428,6 +441,97 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
     
   
 
+  
+    <literal>connection</literal> section
+    This section allows to specify default values for
+    connections. Not all properties can be overwritten, only a selected
+    list below. You can have multiple connection
+    sections, by having different sections with a name that all start
+    with "connection".
+    
+        Example:
+
+[connection]
+ipv6.ip6-privacy=0
+connection.autoconnect-slaves=1
+
+[connection-wifi-wlan0]
+match-device=interface-name:wlan0
+ipv4.route-metric=50
+
+[connection-wifi-other]
+match-device=type:wifi
+ipv4.route-metric=55
+ipv6.ip6-privacy=1
+
+    
+
+    
+        The sections within one file are considered in order of appearance, with the
+        exception that the [connection] section is always
+        considered last. In the example above, this order is [connection-wifi-wlan0],
+        [connection-wlan-other], and [connection].
+        When checking for a default configuration value, the section are searched until
+        the requested value is found.
+        In the example above, "ipv4.route-metric" for wlan0 interface is set to 50,
+        and for all other Wi-Fi typed interfaces to 55. Also, Wi-Fi devices would have
+        IPv6 private addresses enabled by default, but other devices would have it disabled.
+        Note that also "wlan0" gets "ipv6.ip6-privacy=1", because although the section
+        "[connection-wifi-wlan0]" matches the device, it does not contain that property
+        and the search continues.
+    
+    
+        When having different sections in multiple files, sections from files that are read
+        later have higher priority. So within one file the priority of the sections is
+        top-to-bottom. Across multiple files later definitions take precedence.
+    
+
+    
+      
+        
+          match-device
+          An optional device spec that restricts
+          when the section applies. See 
+          for the possible values.
+          
+        
+        
+          stop-match
+          An optional boolean value which defaults to
+          no. If the section matches (based on
+          match-device), further sections will not be
+          considered even if the property in question is not present. In
+          the example above, if [connection-wifi-wlan0] would
+          have stop-match set to yes,
+          its ipv6.ip6-privacy value would be
+          unspecified.
+          
+        
+      
+    
+
+    
+      The following properties are supported to have their default values configured:
+      
+        
+          ipv4.route-metric
+        
+        
+          ipv6.ip6-privacy
+          If ipv6.ip6-privacy is unset, use the content of
+            "/proc/sys/net/ipv6/conf/default/use_tempaddr" as last fallback.
+          
+        
+        
+          ipv6.route-metric
+        
+        
+          connection.autoconnect-slaves
+        
+      
+    
+  
+
   
     <literal>connectivity</literal> section
     This section controls NetworkManager's optional connectivity
@@ -553,6 +657,82 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
     
   
 
+  
+    Appendix
+    
+      Device List Format
+      
+          The configuration options main.no-auto-default, main.ignore-carrier,
+          and keyfile.unmanaged-devices select devices based on a list of matchings.
+          Devices can be specified using the following format:
+      
+      
+      
+        
+          *
+          Matches every device.
+        
+        
+          IFNAME
+          Case sensitive match of interface name of the device. Globbing is not supported.
+        
+        
+          HWADDR
+          Match the MAC address of the device. Globbing is not supported
+        
+        
+          interface-name:IFNAME
+          interface-name:~IFNAME
+          Case sensitive match of interface name of the device. Simple globbing is supported with
+             * and ?. Ranges and escaping is not supported.
+        
+        
+          interface-name:=IFNAME
+          Case sensitive match of interface name of the device. Globbing is disabled and IFNAME
+             is taken literally.
+        
+        
+          mac:HWADDR
+          Match the MAC address of the device. Globbing is not supported
+        
+        
+          s390-subchannels:HWADDR
+          Match the device based on the subchannel address. Globbing is not supported
+        
+        
+          type:TYPE
+          Match the device type. Valid type names are as reported by "nmcli -f GENERAL.TYPE device show".
+          Globbing is not supported.
+        
+        
+          except:SPEC
+          Negative match of a device. SPEC must be explicitly qualified with
+             a prefix such as interface-name:. A negative match has higher priority then the positive
+             matches above.
+        
+        
+          SPEC[,;]SPEC
+          Multiple specs can be concatenated with comman or semicolon. The order does not matter as
+             matches are either positive (inclusive) or negative, with negative matches having higher priority.
+            Backslash is supported to escape the separators ';' and ',', and to express special
+            characters such as newline ('\n'), tabulator ('\t'), whitespace ('\s') and backslash ('\\'). The globbing of
+            interface names cannot be escaped. Whitespace is taken literally so usually the specs will be concatenated
+            without spaces.
+        
+      
+      
+      
+        Example:
+        
+interface-name:em4
+mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2
+interface-name:vboxnet*,except:interface-name:vboxnet2
+*,except:mac:00:22:68:1c:59:b1
+        
+      
+    
+  
+
   
     See Also
     
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 6d394e91..e31d9a9d 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 05 May 2015
+.\"      Date: 14 July 2015
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.0.2
+.\"    Source: NetworkManager 1.0.4
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.2" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -897,6 +897,7 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 id
@@ -1001,6 +1002,15 @@ T}:T{
 Slave type doesn\*(Aqt map directly to a variable, but it is recognized using different variables\&.  MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging\&.
 T}
 T{
+autoconnect\-slaves
+T}:T{
+AUTOCONNECT\-SLAVES\fI(+)\fR
+T}:T{
+missing variable means global default
+T}:T{
+Whether slaves of this connection should be auto\-connected when this connection is activated\&.
+T}
+T{
 secondaries
 T}:T{
 SECONDARY_UUIDS\fI(+)\fR
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index 362bd68b..7146cb43 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 
 
-05 May 2015nm-settings-ifcfg-rh5NetworkManagerConfiguration1.0.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION
+14 July 2015nm-settings-ifcfg-rh5NetworkManagerConfiguration1.0.4nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
@@ -233,7 +233,7 @@ Example: AUTOCONNECT_PRIORITY=20
 
 Allowed values: -999 to 999zoneZONE(+)Trust level of this connection. The string is usually used for a firewall.
 
-Example: ZONE=WorkmasterMASTER, TEAM_MASTER, BRIDGEReference to master connection. The variable used depends on the connection type.slave-typeMASTER, TEAM_MASTER, DEVICETYPE, BRIDGESlave type doesn't map directly to a variable, but it is recognized using different variables.  MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging.secondariesSECONDARY_UUIDS(+)UUID of VPN connections that should be activated together with this connection.gateway-ping-timeoutGATEWAY_PING_TIMEOUT(+)0If greater than zero, the IP connectivity will be checked by pinging the gateway and waiting for the specified timeout (in seconds).
+Example: ZONE=WorkmasterMASTER, TEAM_MASTER, BRIDGEReference to master connection. The variable used depends on the connection type.slave-typeMASTER, TEAM_MASTER, DEVICETYPE, BRIDGESlave type doesn't map directly to a variable, but it is recognized using different variables.  MASTER for bonding, TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging.autoconnect-slavesAUTOCONNECT-SLAVES(+)missing variable means global defaultWhether slaves of this connection should be auto-connected when this connection is activated.secondariesSECONDARY_UUIDS(+)UUID of VPN connections that should be activated together with this connection.gateway-ping-timeoutGATEWAY_PING_TIMEOUT(+)0If greater than zero, the IP connectivity will be checked by pinging the gateway and waiting for the specified timeout (in seconds).
 
 Example: GATEWAY_PING_TIMEOUT=5dcb settingPropertyIfcfg-rh VariableDefaultDescriptionapp-fcoe-flagsDCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLINGnoFCOE flags.
 
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index ba6f6311..1343bc15 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 05 May 2015
+.\"      Date: 14 July 2015
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.0.2
+.\"    Source: NetworkManager 1.0.4
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.2" "Configuration"
+.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 8f49a8fc..2ab07314 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 
 
-05 May 2015nm-settings-keyfile5NetworkManagerConfiguration1.0.2nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION
+14 July 2015nm-settings-keyfile5NetworkManagerConfiguration1.0.4nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION
           NetworkManager is based on the concept of connection profiles that contain
           network configuration (see nm-settings5 for details). The profiles can be
           stored in various formats. NetworkManager uses plugins for reading and writing
diff --git a/man/nm-settings.5 b/man/nm-settings.5
index 2e1d1be9..35b24d15 100644
--- a/man/nm-settings.5
+++ b/man/nm-settings.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 
-.\"      Date: 05 May 2015
+.\"      Date: 14 July 2015
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.0.2
+.\"    Source: NetworkManager 1.0.4
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.2" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.4" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -405,7 +405,7 @@ boolean
 T}:T{
 FALSE
 T}:T{
-When TRUE, overrides the "ca\-path" and "phase2\-ca\-path" properties using the system CA directory specified at configure time with the \-\-system\-ca\-path switch\&.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca\-cert" and "phase2\-ca\-cert" properties\&.
+When TRUE, overrides the "ca\-path" and "phase2\-ca\-path" properties using the system CA directory specified at configure time with the \-\-system\-ca\-path switch\&.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca\-cert" and "phase2\-ca\-cert" properties\&. If the path provided with \-\-system\-ca\-path is rather a file name (bundle of trusted CA certificates), it overrides "ca\-cert" and "phase2\-ca\-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant)\&.
 T}
 .TE
 .sp 1
@@ -888,6 +888,7 @@ l l l l
 l l l l
 l l l l
 l l l l
+l l l l
 l l l l.
 T{
 autoconnect
@@ -908,6 +909,15 @@ T}:T{
 The autoconnect priority\&. If the connection is set to autoconnect, connections with higher priority will be preferred\&. Defaults to 0\&. The higher number means higher priority\&.
 T}
 T{
+autoconnect\-slaves
+T}:T{
+NMSettingConnectionAutoconnectSlaves (int32)
+T}:T{
+\ \&
+T}:T{
+Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection\&. This only has a real effect for master connections\&. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, \-1: default\&. If \-1 (default) is set, global connection\&.autoconnect\-slaves is read to determine the real value\&. If it is default as well, this fallbacks to 0\&.
+T}
+T{
 gateway\-ping\-timeout
 T}:T{
 uint32
@@ -1755,7 +1765,7 @@ NMSettingIP6ConfigPrivacy (int32)
 T}:T{
 \ \&
 T}:T{
-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)\&.
+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: \-1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses)\&. Having a per\-connection setting set to "\-1" (unknown) means fallback to global configuration "ipv6\&.ip6\-privacy"\&. If also global configuration is unspecified or set to "\-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr"\&.
 T}
 T{
 may\-fail
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index d70b1771..d289d2d3 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 
 
-05 May 2015nm-settings5NetworkManagerConfiguration1.0.2nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION
+14 July 2015nm-settings5NetworkManagerConfiguration1.0.4nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION
           NetworkManager is based on a concept of connection profiles, sometimes referred to as
           connections only. These connection profiles contain a network configuration. When
           NetworkManager activates a connection profile on a network device the configuration will
@@ -66,7 +66,7 @@
     private-key-passwordstringThe password used to decrypt the private key specified in the "private-key" property when the private key either uses the path scheme, or if the private key is a PKCS#12 format key.
     private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "private-key-password" property. (see  for flag values)
     subject-matchstringSubstring to be matched against the subject of the certificate presented by the authentication server. When unset, no verification of the authentication server certificate's subject is performed.
-    system-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties.
+    system-ca-certsbooleanFALSEWhen TRUE, overrides the "ca-path" and "phase2-ca-path" properties using the system CA directory specified at configure time with the --system-ca-path switch.  The certificates in this directory are added to the verification chain in addition to any certificates specified by the "ca-cert" and "phase2-ca-cert" properties. If the path provided with --system-ca-path is rather a file name (bundle of trusted CA certificates), it overrides "ca-cert" and "phase2-ca-cert" properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).
   

   adsl settingKey NameValue TypeDefault ValueValue DescriptionencapsulationstringEncapsulation of ADSL connection.  Can be "vcmux" or "llc".
@@ -115,6 +115,7 @@
   

     
connection settingKey NameValue TypeDefault ValueValue DescriptionautoconnectbooleanTRUEWhether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection.autoconnect-priorityint320The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.
+    autoconnect-slavesNMSettingConnectionAutoconnectSlaves (int32)Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.gateway-ping-timeoutuint320If greater than zero, delay success of IP addressing until either the timeout is reached, or an IP gateway replies to a ping.idstringA human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".interface-namestringThe name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.
@@ -199,7 +200,7 @@
     gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set.ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used.ignore-auto-routesbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured routes are ignored and only routes specified in the "routes" property, if any, are used.
-    ip6-privacyNMSettingIP6ConfigPrivacy (int32)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).
+    ip6-privacyNMSettingIP6ConfigPrivacy (int32)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: -1: unknown, 0: disabled, 1: enabled (prefer public address), 2: enabled (prefer temporary addresses). Having a per-connection setting set to "-1" (unknown) means fallback to global configuration "ipv6.ip6-privacy". If also global configuration is unspecified or set to "-1", fallback to read "/proc/sys/net/ipv6/conf/default/use_tempaddr".may-failbooleanTRUEIf TRUE, allow overall network configuration to proceed even if the configuration specified by this property 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 on the NMSettingIP4Config allows the overall network configuration to succeed if IPv4 configuration fails but IPv6 configuration completes successfully.methodstringIP configuration method. NMSettingIP4Config and NMSettingIP6Config both support "auto", "manual", and "link-local". See the subclass-specific documentation for other values. In general, for the "auto" method, properties such as "dns" and "routes" specify information that is added on to the information returned from automatic configuration.  The "ignore-auto-routes" and "ignore-auto-dns" properties modify this behavior. For methods that imply no upstream network, such as "shared" or "link-local", these properties must be empty.namestringipv6The setting's name, which uniquely identifies the setting within the connection.  Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired".
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index f6df1b0a..335b6511 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -398,6 +398,8 @@ If  is ambiguous, a keyword \fIid\fP, \fIuuid\fP, \fIpath\fP or
 \fIapath\fP can be used.
 .br
 See \fBconnection show\fP above for the description of the -specifying keywords.
+.br
+If '--wait' option is not specified, the default timeout will be 10 seconds.
 .TP
 .B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS
 .br
@@ -686,6 +688,8 @@ its name, UUID or D-Bus path. If  is ambiguous, a keyword \fIid\fP,
 \fIuuid\fP or \fIpath\fP can be used.
 .br
 See \fBconnection show\fP above for the description of the -specifying keywords.
+.br
+If '--wait' option is not specified, the default timeout will be 10 seconds.
 .TP
 .B reload
 .br
@@ -730,14 +734,15 @@ will be activated. It will also consider connections that are not set to auto co
 .br
 If '--wait' option is not specified, the default timeout will be 90 seconds.
 .TP
-.B disconnect 
+.B disconnect  ...
 .br
 Disconnect a device and prevent the device from automatically activating further
-connections without user/manual intervention.
+connections without user/manual intervention. Note that disconnecting software
+devices may mean that the devices will disappear.
 .br
 If '--wait' option is not specified, the default timeout will be 10 seconds.
 .TP
-.B delete 
+.B delete  ...
 .br
 Delete a device. The command removes the interface from the system. Note that
 this only works for software devices like bonds, bridges, teams, etc.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 926dd6c3..6c09b21f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -48,6 +48,8 @@ libnm-core/crypto.c
 libnm-core/crypto_gnutls.c
 libnm-core/crypto_nss.c
 libnm-core/nm-connection.c
+libnm-core/nm-keyfile-reader.c
+libnm-core/nm-keyfile-writer.c
 libnm-core/nm-setting-8021x.c
 libnm-core/nm-setting-adsl.c
 libnm-core/nm-setting-bluetooth.c
diff --git a/po/pl.po b/po/pl.po
index c0be7c57..e76babf7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,13 +9,12 @@
 # Tomasz Dominikowski , 2008-2010.
 # Piotr Drąg , 2009-2015.
 # Aviary.pl , 2007-2015.
-#: ../src/nm-iface-helper.c:307
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-25 20:28+0100\n"
-"PO-Revision-Date: 2015-01-25 20:29+0100\n"
+"POT-Creation-Date: 2015-07-06 00:19+0200\n"
+"PO-Revision-Date: 2015-07-06 00:20+0200\n"
 "Last-Translator: Piotr Drąg \n"
 "Language-Team: Polish \n"
 "Language: pl\n"
@@ -112,9 +111,9 @@ msgstr "Błąd: zainicjowanie agenta polkit się nie powiodło: %s"
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "Pomyślnie zarejestrowano program nmcli jako agenta polkit.\n"
 
-#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:8779
-#: ../clients/cli/connections.c:8805 ../clients/cli/connections.c:8943
-#: ../clients/cli/devices.c:2832 ../clients/cli/general.c:325
+#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:8928
+#: ../clients/cli/connections.c:8954 ../clients/cli/connections.c:9095
+#: ../clients/cli/devices.c:2961 ../clients/cli/general.c:325
 #: ../clients/cli/general.c:463
 #, c-format
 msgid "Error: NetworkManager is not running."
@@ -127,7 +126,7 @@ msgstr "Błąd: polecenie \"agent\" \"%s\" jest nieprawidłowe."
 
 #: ../clients/cli/common.c:40 ../clients/cli/common.c:53
 #: ../clients/cli/common.c:61 ../clients/cli/common.c:73
-#: ../clients/cli/connections.c:172 ../clients/cli/connections.c:194
+#: ../clients/cli/connections.c:173 ../clients/cli/connections.c:195
 msgid "GROUP"
 msgstr "GRUPA"
 
@@ -139,7 +138,7 @@ msgstr "ADRES"
 #. 1
 #. 2
 #: ../clients/cli/common.c:42 ../clients/cli/common.c:63
-#: ../clients/cli/connections.c:197
+#: ../clients/cli/connections.c:198
 msgid "GATEWAY"
 msgstr "BRAMA"
 
@@ -241,7 +240,7 @@ msgstr "łączenie (uruchamianie drugorzędnych połączeń)"
 msgid "connected"
 msgstr "połączono"
 
-#: ../clients/cli/common.c:516 ../clients/cli/connections.c:538
+#: ../clients/cli/common.c:516 ../clients/cli/connections.c:540
 msgid "deactivating"
 msgstr "deaktywowanie"
 
@@ -249,13 +248,14 @@ msgstr "deaktywowanie"
 msgid "connection failed"
 msgstr "połączenie się nie powiodło"
 
-#: ../clients/cli/common.c:520 ../clients/cli/connections.c:543
-#: ../clients/cli/connections.c:566 ../clients/cli/connections.c:1705
-#: ../clients/cli/devices.c:878 ../clients/cli/general.c:263
+#: ../clients/cli/common.c:520 ../clients/cli/connections.c:545
+#: ../clients/cli/connections.c:568 ../clients/cli/connections.c:1708
+#: ../clients/cli/devices.c:886 ../clients/cli/devices.c:927
+#: ../clients/cli/devices.c:929 ../clients/cli/general.c:263
 #: ../clients/cli/general.c:281 ../clients/cli/general.c:411
-#: ../clients/cli/general.c:427 ../clients/cli/settings.c:717
-#: ../clients/cli/settings.c:779 ../clients/cli/settings.c:1072
-#: ../clients/cli/utils.c:1145 ../src/main.c:309 ../src/main.c:337
+#: ../clients/cli/general.c:427 ../clients/cli/settings.c:725
+#: ../clients/cli/settings.c:810 ../clients/cli/settings.c:1111
+#: ../clients/cli/utils.c:1164 ../src/main.c:363 ../src/main.c:413
 msgid "unknown"
 msgstr "nieznane"
 
@@ -263,7 +263,7 @@ msgstr "nieznane"
 msgid "No reason given"
 msgstr "Nie podano przyczyny"
 
-#: ../clients/cli/common.c:532 ../clients/cli/connections.c:2705
+#: ../clients/cli/common.c:532 ../clients/cli/connections.c:2721
 #, c-format
 msgid "Unknown error"
 msgstr "Nieznany błąd"
@@ -504,28 +504,40 @@ msgstr "Modem jest teraz gotowy i dostępny"
 msgid "SIM PIN was incorrect"
 msgstr "Kod PIN karty SIM był niepoprawny"
 
+#: ../clients/cli/common.c:709
+msgid "New connection activation was enqueued"
+msgstr "Dodano aktywację nowego połączenia do kolejki"
+
+#: ../clients/cli/common.c:712
+msgid "The device's parent changed"
+msgstr "Zmieniono urządzenie nadrzędne urządzenia"
+
+#: ../clients/cli/common.c:715
+msgid "The device parent's management changed"
+msgstr "Zmieniono zarządzanie urządzenia nadrzędnego urządzenia"
+
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:710 ../clients/cli/devices.c:619
-#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1635
+#: ../clients/cli/common.c:719 ../clients/cli/devices.c:625
+#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1638
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: ../clients/cli/common.c:752
+#: ../clients/cli/common.c:761
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "nieprawidłowa mapa priorytetów \"%s\""
 
-#: ../clients/cli/common.c:759 ../clients/cli/common.c:765
+#: ../clients/cli/common.c:768 ../clients/cli/common.c:774
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "priorytet \"%s\" jest nieprawidłowy (<0-%ld>)"
 
-#: ../clients/cli/common.c:832
+#: ../clients/cli/common.c:841
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
 msgstr "\"%s\" nie jest prawidłową konfiguracją zespołu lub nazwą pliku."
 
-#: ../clients/cli/common.c:933
+#: ../clients/cli/common.c:942
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -572,20 +584,24 @@ msgstr "\"Master\" mostku: "
 msgid "Connection (name, UUID, or path): "
 msgstr "Połączenie (nazwa, UUID lub ścieżka): "
 
+#: ../clients/cli/connections.c:53
+msgid "Connection(s) (name, UUID, or path): "
+msgstr "Połączenia (nazwa, UUID lub ścieżka): "
+
 #. 0
-#: ../clients/cli/connections.c:60 ../clients/cli/connections.c:173
-#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:86
-#: ../clients/cli/devices.c:96 ../clients/cli/devices.c:107
-#: ../clients/cli/devices.c:116 ../clients/cli/devices.c:131
-#: ../clients/cli/devices.c:144 ../clients/cli/devices.c:170
-#: ../clients/cli/devices.c:185 ../clients/cli/devices.c:194
-#: ../clients/cli/devices.c:204
+#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174
+#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:90
+#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111
+#: ../clients/cli/devices.c:120 ../clients/cli/devices.c:137
+#: ../clients/cli/devices.c:150 ../clients/cli/devices.c:176
+#: ../clients/cli/devices.c:191 ../clients/cli/devices.c:200
+#: ../clients/cli/devices.c:210
 msgid "NAME"
 msgstr "NAZWA"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174
+#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:175
 msgid "UUID"
 msgstr "UUID"
 
@@ -593,35 +609,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:195
-#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:59
-#: ../clients/cli/devices.c:173
+#: ../clients/cli/connections.c:63 ../clients/cli/connections.c:196
+#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:60
+#: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TYP"
 
 #. 2
-#: ../clients/cli/connections.c:63
+#: ../clients/cli/connections.c:64
 msgid "TIMESTAMP"
 msgstr "OKRES-CZASU"
 
 #. 3
-#: ../clients/cli/connections.c:64
+#: ../clients/cli/connections.c:65
 msgid "TIMESTAMP-REAL"
 msgstr "RZECZYWISTY-OKRES-CZASU"
 
 #. 4
-#. 15
-#: ../clients/cli/connections.c:65 ../clients/cli/devices.c:73
+#. 16
+#: ../clients/cli/connections.c:66 ../clients/cli/devices.c:75
 msgid "AUTOCONNECT"
 msgstr "ŁĄCZENIE-AUTOMATYCZNE"
 
 #. 5
-#: ../clients/cli/connections.c:66
+#: ../clients/cli/connections.c:67
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "PRIORYTET-AUTOMATYCZNEGO-ŁĄCZENIA"
 
 #. 6
-#: ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:68
 msgid "READONLY"
 msgstr "TYLKO-DO-ODCZYTU"
 
@@ -630,17 +646,17 @@ msgstr "TYLKO-DO-ODCZYTU"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:68 ../clients/cli/connections.c:181
-#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:160
-#: ../clients/cli/devices.c:176
+#: ../clients/cli/connections.c:69 ../clients/cli/connections.c:182
+#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:166
+#: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
 msgstr "ŚCIEŻKA-DBUS"
 
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:69 ../clients/cli/devices.c:158
-#: ../clients/cli/devices.c:175
+#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:164
+#: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "AKTYWNOŚĆ"
 
@@ -648,124 +664,124 @@ msgstr "AKTYWNOŚĆ"
 #. 0
 #. 12
 #. 3
-#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:42
-#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:157
-#: ../clients/cli/devices.c:174
+#: ../clients/cli/connections.c:71 ../clients/cli/devices.c:43
+#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:163
+#: ../clients/cli/devices.c:180
 msgid "DEVICE"
 msgstr "URZĄDZENIE"
 
 #. 10
 #. 3
 #. 1
-#. 9
+#. 10
 #. 1
-#: ../clients/cli/connections.c:71 ../clients/cli/connections.c:176
-#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:67
+#: ../clients/cli/connections.c:72 ../clients/cli/connections.c:177
+#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:69
 #: ../clients/cli/general.c:37
 msgid "STATE"
 msgstr "STAN"
 
 #. 11
-#: ../clients/cli/connections.c:72
+#: ../clients/cli/connections.c:73
 msgid "ACTIVE-PATH"
 msgstr "AKTYWNA-ŚCIEŻKA"
 
 #. 2
-#: ../clients/cli/connections.c:175
+#: ../clients/cli/connections.c:176
 msgid "DEVICES"
 msgstr "URZĄDZENIA"
 
 #. 4
-#: ../clients/cli/connections.c:177
+#: ../clients/cli/connections.c:178
 msgid "DEFAULT"
 msgstr "DOMYŚLNE"
 
 #. 5
-#: ../clients/cli/connections.c:178
+#: ../clients/cli/connections.c:179
 msgid "DEFAULT6"
 msgstr "DOMYŚLNE6"
 
 #. 6
-#: ../clients/cli/connections.c:179
+#: ../clients/cli/connections.c:180
 msgid "SPEC-OBJECT"
 msgstr "KONKRETNY-OBIEKT"
 
 #. 7
 #. 4
 #. Ask for optional 'vpn' arguments.
-#: ../clients/cli/connections.c:180 ../clients/cli/connections.c:218
-#: ../clients/cli/connections.c:3816 ../clients/tui/nm-editor-utils.c:234
+#: ../clients/cli/connections.c:181 ../clients/cli/connections.c:219
+#: ../clients/cli/connections.c:3832 ../clients/tui/nm-editor-utils.c:234
 #: ../clients/tui/nmt-connect-connection-list.c:406
 msgid "VPN"
 msgstr "VPN"
 
 #. 9
 #. 5
-#. 19
-#: ../clients/cli/connections.c:182 ../clients/cli/devices.c:48
-#: ../clients/cli/devices.c:77
+#. 21
+#: ../clients/cli/connections.c:183 ../clients/cli/devices.c:49
+#: ../clients/cli/devices.c:80
 msgid "CON-PATH"
 msgstr "ŚCIEŻKA-POŁĄCZENIA"
 
 #. 10
-#: ../clients/cli/connections.c:183
+#: ../clients/cli/connections.c:184
 msgid "ZONE"
 msgstr "STREFA"
 
 #. 11
-#: ../clients/cli/connections.c:184
+#: ../clients/cli/connections.c:185
 msgid "MASTER-PATH"
 msgstr "GŁÓWNA-ŚCIEŻKA"
 
 #. 1
-#: ../clients/cli/connections.c:196
+#: ../clients/cli/connections.c:197
 msgid "USERNAME"
 msgstr "NAZWA-UŻYTKOWNIKA"
 
 #. 3
-#: ../clients/cli/connections.c:198
+#: ../clients/cli/connections.c:199
 msgid "BANNER"
 msgstr "BANER"
 
 #. 4
-#: ../clients/cli/connections.c:199
+#: ../clients/cli/connections.c:200
 msgid "VPN-STATE"
 msgstr "STAN-VPN"
 
 #. 5
-#: ../clients/cli/connections.c:200
+#: ../clients/cli/connections.c:201
 msgid "CFG"
 msgstr "KONFIGURACJA"
 
-#: ../clients/cli/connections.c:213 ../clients/cli/devices.c:219
+#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "OGÓLNE"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:226
+#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:227
+#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:228
+#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:229
+#: ../clients/cli/connections.c:218 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:251
+#: ../clients/cli/connections.c:253
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -828,7 +844,7 @@ msgstr ""
 "  load  [ ... ]\n"
 "\n"
 
-#: ../clients/cli/connections.c:272
+#: ../clients/cli/connections.c:274
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -871,7 +887,7 @@ msgstr ""
 "więcej informacji. Podanie opcji --active spowoduje uwzględnienie tylko\n"
 "aktywnych profili. Opcja --show-secrets ujawni także powiązane hasła.\n"
 
-#: ../clients/cli/connections.c:293
+#: ../clients/cli/connections.c:295
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -915,7 +931,7 @@ msgstr ""
 "passwd-file - plik z hasłami wymaganymi do aktywowania połączenia\n"
 "\n"
 
-#: ../clients/cli/connections.c:314
+#: ../clients/cli/connections.c:316
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -937,7 +953,7 @@ msgstr ""
 "swojej nazwie, UUID lub ścieżce D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:326
+#: ../clients/cli/connections.c:328
 #, c-format
 msgid ""
 "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1141,7 +1157,7 @@ msgstr ""
 "                  [ip4 ] [gw4 ]\n"
 "                  [ip6 ] [gw6 ]\n"
 
-#: ../clients/cli/connections.c:406
+#: ../clients/cli/connections.c:408
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1188,7 +1204,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:429
+#: ../clients/cli/connections.c:431
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1216,7 +1232,7 @@ msgstr ""
 "Dodaje nowy profil połączenia w interaktywnym edytorze.\n"
 "\n"
 
-#: ../clients/cli/connections.c:444
+#: ../clients/cli/connections.c:446
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1235,7 +1251,7 @@ msgstr ""
 "Profil jest identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n"
 "\n"
 
-#: ../clients/cli/connections.c:455
+#: ../clients/cli/connections.c:457
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1248,7 +1264,7 @@ msgstr ""
 "Wczytuje ponownie wszystkie pliki połączeń z dysku.\n"
 "\n"
 
-#: ../clients/cli/connections.c:463
+#: ../clients/cli/connections.c:465
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1270,142 +1286,144 @@ msgstr ""
 "usługa NetworkManager zna jego najnowszy stan.\n"
 "\n"
 
-#: ../clients/cli/connections.c:534
+#: ../clients/cli/connections.c:536
 msgid "activating"
 msgstr "aktywowanie"
 
-#: ../clients/cli/connections.c:536
+#: ../clients/cli/connections.c:538
 msgid "activated"
 msgstr "aktywowano"
 
-#: ../clients/cli/connections.c:540
+#: ../clients/cli/connections.c:542
 msgid "deactivated"
 msgstr "deaktywowano"
 
-#: ../clients/cli/connections.c:552
+#: ../clients/cli/connections.c:554
 msgid "VPN connecting (prepare)"
 msgstr "Łączenie z VPN (przygotowanie)"
 
-#: ../clients/cli/connections.c:554
+#: ../clients/cli/connections.c:556
 msgid "VPN connecting (need authentication)"
 msgstr "Łączenie z VPN (wymaga uwierzytelnienia)"
 
-#: ../clients/cli/connections.c:556
+#: ../clients/cli/connections.c:558
 msgid "VPN connecting"
 msgstr "Łączenie z VPN"
 
-#: ../clients/cli/connections.c:558
+#: ../clients/cli/connections.c:560
 msgid "VPN connecting (getting IP configuration)"
 msgstr "Łączenie z VPN (pobieranie konfiguracji adresu IP)"
 
-#: ../clients/cli/connections.c:560
+#: ../clients/cli/connections.c:562
 msgid "VPN connected"
 msgstr "Połączono z VPN"
 
-#: ../clients/cli/connections.c:562
+#: ../clients/cli/connections.c:564
 msgid "VPN connection failed"
 msgstr "Połączenie z VPN się nie powiodło"
 
-#: ../clients/cli/connections.c:564
+#: ../clients/cli/connections.c:566
 msgid "VPN disconnected"
 msgstr "Rozłączono z VPN"
 
-#: ../clients/cli/connections.c:634
+#: ../clients/cli/connections.c:636
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Błąd podczas aktualizowania haseł dla %s: %s\n"
 
-#: ../clients/cli/connections.c:654
+#: ../clients/cli/connections.c:656
 msgid "Connection profile details"
 msgstr "Szczegóły profilu połączenia"
 
-#: ../clients/cli/connections.c:666 ../clients/cli/connections.c:1075
+#: ../clients/cli/connections.c:668 ../clients/cli/connections.c:1077
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Błąd: \"connection show\": %s"
 
-#: ../clients/cli/connections.c:812
+#: ../clients/cli/connections.c:814
 msgid "never"
 msgstr "nigdy"
 
 #. "CAPABILITIES"
-#: ../clients/cli/connections.c:813 ../clients/cli/connections.c:815
-#: ../clients/cli/connections.c:817 ../clients/cli/connections.c:849
-#: ../clients/cli/connections.c:916 ../clients/cli/connections.c:917
-#: ../clients/cli/connections.c:919 ../clients/cli/connections.c:3111
-#: ../clients/cli/connections.c:6949 ../clients/cli/connections.c:6950
-#: ../clients/cli/devices.c:589 ../clients/cli/devices.c:639
-#: ../clients/cli/devices.c:846 ../clients/cli/devices.c:847
-#: ../clients/cli/devices.c:848 ../clients/cli/devices.c:849
-#: ../clients/cli/devices.c:882 ../clients/cli/devices.c:884
-#: ../clients/cli/devices.c:912 ../clients/cli/devices.c:913
-#: ../clients/cli/devices.c:914 ../clients/cli/devices.c:915
-#: ../clients/cli/devices.c:916 ../clients/cli/devices.c:917
-#: ../clients/cli/devices.c:918 ../clients/cli/general.c:421
+#: ../clients/cli/connections.c:815 ../clients/cli/connections.c:817
+#: ../clients/cli/connections.c:819 ../clients/cli/connections.c:851
+#: ../clients/cli/connections.c:918 ../clients/cli/connections.c:919
+#: ../clients/cli/connections.c:921 ../clients/cli/connections.c:3127
+#: ../clients/cli/connections.c:7084 ../clients/cli/connections.c:7085
+#: ../clients/cli/devices.c:595 ../clients/cli/devices.c:645
+#: ../clients/cli/devices.c:853 ../clients/cli/devices.c:854
+#: ../clients/cli/devices.c:855 ../clients/cli/devices.c:856
+#: ../clients/cli/devices.c:890 ../clients/cli/devices.c:892
+#: ../clients/cli/devices.c:920 ../clients/cli/devices.c:921
+#: ../clients/cli/devices.c:922 ../clients/cli/devices.c:923
+#: ../clients/cli/devices.c:924 ../clients/cli/devices.c:925
+#: ../clients/cli/devices.c:926 ../clients/cli/devices.c:928
+#: ../clients/cli/devices.c:930 ../clients/cli/general.c:421
 msgid "yes"
 msgstr "tak"
 
-#: ../clients/cli/connections.c:813 ../clients/cli/connections.c:815
-#: ../clients/cli/connections.c:817 ../clients/cli/connections.c:916
-#: ../clients/cli/connections.c:917 ../clients/cli/connections.c:919
-#: ../clients/cli/connections.c:3112 ../clients/cli/connections.c:6949
-#: ../clients/cli/connections.c:6950 ../clients/cli/devices.c:589
-#: ../clients/cli/devices.c:639 ../clients/cli/devices.c:846
-#: ../clients/cli/devices.c:847 ../clients/cli/devices.c:848
-#: ../clients/cli/devices.c:849 ../clients/cli/devices.c:882
-#: ../clients/cli/devices.c:884 ../clients/cli/devices.c:912
-#: ../clients/cli/devices.c:913 ../clients/cli/devices.c:914
-#: ../clients/cli/devices.c:915 ../clients/cli/devices.c:916
-#: ../clients/cli/devices.c:917 ../clients/cli/devices.c:918
+#: ../clients/cli/connections.c:815 ../clients/cli/connections.c:817
+#: ../clients/cli/connections.c:819 ../clients/cli/connections.c:918
+#: ../clients/cli/connections.c:919 ../clients/cli/connections.c:921
+#: ../clients/cli/connections.c:3128 ../clients/cli/connections.c:7084
+#: ../clients/cli/connections.c:7085 ../clients/cli/devices.c:595
+#: ../clients/cli/devices.c:645 ../clients/cli/devices.c:853
+#: ../clients/cli/devices.c:854 ../clients/cli/devices.c:855
+#: ../clients/cli/devices.c:856 ../clients/cli/devices.c:890
+#: ../clients/cli/devices.c:892 ../clients/cli/devices.c:920
+#: ../clients/cli/devices.c:921 ../clients/cli/devices.c:922
+#: ../clients/cli/devices.c:923 ../clients/cli/devices.c:924
+#: ../clients/cli/devices.c:925 ../clients/cli/devices.c:926
+#: ../clients/cli/devices.c:928 ../clients/cli/devices.c:930
 #: ../clients/cli/general.c:423
 msgid "no"
 msgstr "nie"
 
-#: ../clients/cli/connections.c:1063
+#: ../clients/cli/connections.c:1065
 msgid "Activate connection details"
 msgstr "Szczegóły aktywowania połączenia"
 
-#: ../clients/cli/connections.c:1299
+#: ../clients/cli/connections.c:1301
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "nieprawidłowe pole \"%s\"; dozwolone pola: %s i %s, albo %s,%s"
 
-#: ../clients/cli/connections.c:1314 ../clients/cli/connections.c:1322
+#: ../clients/cli/connections.c:1316 ../clients/cli/connections.c:1324
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "\"%s\" musi być same"
 
 #. Add headers
-#: ../clients/cli/connections.c:1377
+#: ../clients/cli/connections.c:1379
 msgid "NetworkManager active profiles"
 msgstr "Aktywne profile usługi NetworkManager"
 
-#: ../clients/cli/connections.c:1378
+#: ../clients/cli/connections.c:1380
 msgid "NetworkManager connection profiles"
 msgstr "Profile połączeń usługi NetworkManager"
 
-#: ../clients/cli/connections.c:1418 ../clients/cli/connections.c:2145
-#: ../clients/cli/connections.c:2167 ../clients/cli/connections.c:2176
-#: ../clients/cli/connections.c:2186 ../clients/cli/connections.c:2196
-#: ../clients/cli/connections.c:2346 ../clients/cli/connections.c:8499
-#: ../clients/cli/connections.c:8716 ../clients/cli/devices.c:1909
-#: ../clients/cli/devices.c:1917 ../clients/cli/devices.c:2233
-#: ../clients/cli/devices.c:2240 ../clients/cli/devices.c:2254
-#: ../clients/cli/devices.c:2261 ../clients/cli/devices.c:2278
-#: ../clients/cli/devices.c:2286 ../clients/cli/devices.c:2474
-#: ../clients/cli/devices.c:2570 ../clients/cli/devices.c:2577
+#: ../clients/cli/connections.c:1420 ../clients/cli/connections.c:2148
+#: ../clients/cli/connections.c:2170 ../clients/cli/connections.c:2179
+#: ../clients/cli/connections.c:2189 ../clients/cli/connections.c:2199
+#: ../clients/cli/connections.c:2361 ../clients/cli/connections.c:8652
+#: ../clients/cli/connections.c:8857 ../clients/cli/devices.c:2023
+#: ../clients/cli/devices.c:2031 ../clients/cli/devices.c:2353
+#: ../clients/cli/devices.c:2360 ../clients/cli/devices.c:2374
+#: ../clients/cli/devices.c:2381 ../clients/cli/devices.c:2398
+#: ../clients/cli/devices.c:2406 ../clients/cli/devices.c:2594
+#: ../clients/cli/devices.c:2696 ../clients/cli/devices.c:2703
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Błąd: brak parametru %s."
 
-#: ../clients/cli/connections.c:1433
+#: ../clients/cli/connections.c:1435
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Błąd: %s - nie ma takiego profilu połączenia."
 
-#: ../clients/cli/connections.c:1492 ../clients/cli/connections.c:2219
-#: ../clients/cli/connections.c:9016 ../clients/cli/devices.c:2453
-#: ../clients/cli/devices.c:2921 ../clients/cli/general.c:518
+#: ../clients/cli/connections.c:1494 ../clients/cli/connections.c:2222
+#: ../clients/cli/connections.c:9168 ../clients/cli/devices.c:2573
+#: ../clients/cli/devices.c:3050 ../clients/cli/general.c:518
 #: ../clients/cli/general.c:567 ../clients/cli/general.c:584
 #: ../clients/cli/general.c:623 ../clients/cli/general.c:637
 #: ../clients/cli/general.c:755 ../clients/cli/general.c:802
@@ -1414,81 +1432,81 @@ msgstr "Błąd: %s - nie ma takiego profilu połączenia."
 msgid "Error: %s."
 msgstr "Błąd: %s."
 
-#: ../clients/cli/connections.c:1587
+#: ../clients/cli/connections.c:1590
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "brak aktywnych połączeń na urządzeniu \"%s\""
 
-#: ../clients/cli/connections.c:1595
+#: ../clients/cli/connections.c:1598
 msgid "no active connection or device"
 msgstr "brak aktywnych połączeń na urządzeń"
 
-#: ../clients/cli/connections.c:1666
+#: ../clients/cli/connections.c:1669
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "urządzenie \"%s\" nie jest zgodne z połączeniem \"%s\""
 
-#: ../clients/cli/connections.c:1669
+#: ../clients/cli/connections.c:1672
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "nie odnaleziono urządzenia dla połączenia \"%s\""
 
-#: ../clients/cli/connections.c:1681
+#: ../clients/cli/connections.c:1684
 msgid "unknown reason"
 msgstr "nieznany powód"
 
-#: ../clients/cli/connections.c:1683 ../clients/cli/general.c:272
+#: ../clients/cli/connections.c:1686 ../clients/cli/general.c:272
 msgid "none"
 msgstr "brak"
 
-#: ../clients/cli/connections.c:1685
+#: ../clients/cli/connections.c:1688
 msgid "the user was disconnected"
 msgstr "użytkownik został rozłączony"
 
-#: ../clients/cli/connections.c:1687
+#: ../clients/cli/connections.c:1690
 msgid "the base network connection was interrupted"
 msgstr "podstawowe połączenie sieciowe zostało przerwane"
 
-#: ../clients/cli/connections.c:1689
+#: ../clients/cli/connections.c:1692
 msgid "the VPN service stopped unexpectedly"
 msgstr "usługa VPN została nieoczekiwanie zatrzymana"
 
-#: ../clients/cli/connections.c:1691
+#: ../clients/cli/connections.c:1694
 msgid "the VPN service returned invalid configuration"
 msgstr "usługa VPN zwróciła nieprawidłową konfigurację"
 
-#: ../clients/cli/connections.c:1693
+#: ../clients/cli/connections.c:1696
 msgid "the connection attempt timed out"
 msgstr "próba połączenia przekroczyła czas oczekiwania"
 
-#: ../clients/cli/connections.c:1695
+#: ../clients/cli/connections.c:1698
 msgid "the VPN service did not start in time"
 msgstr "usługa VPN nie została uruchomiona w czasie"
 
-#: ../clients/cli/connections.c:1697
+#: ../clients/cli/connections.c:1700
 msgid "the VPN service failed to start"
 msgstr "uruchomienie usługi VPN się nie powiodło"
 
-#: ../clients/cli/connections.c:1699
+#: ../clients/cli/connections.c:1702
 msgid "no valid VPN secrets"
 msgstr "brak prawidłowych haseł VPN"
 
-#: ../clients/cli/connections.c:1701
+#: ../clients/cli/connections.c:1704
 msgid "invalid VPN secrets"
 msgstr "nieprawidłowe hasła VPN"
 
-#: ../clients/cli/connections.c:1703
+#: ../clients/cli/connections.c:1706
 msgid "the connection was removed"
 msgstr "połączenie zostało usunięte"
 
-#: ../clients/cli/connections.c:1725 ../clients/cli/connections.c:1753
-#: ../clients/cli/connections.c:1914 ../clients/cli/connections.c:6840
+#: ../clients/cli/connections.c:1728 ../clients/cli/connections.c:1756
+#: ../clients/cli/connections.c:1917 ../clients/cli/connections.c:6975
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 "Połączenie zostało pomyślnie aktywowane (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:1732
+#: ../clients/cli/connections.c:1735
 #, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
@@ -1497,176 +1515,181 @@ msgstr ""
 "Połączenie zostało pomyślnie aktywowane (główne oczekujące na podrzędne) "
 "(ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:1736 ../clients/cli/connections.c:1758
+#: ../clients/cli/connections.c:1739 ../clients/cli/connections.c:1761
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Błąd: aktywacja połączenia się nie powiodła."
 
-#: ../clients/cli/connections.c:1809
+#: ../clients/cli/connections.c:1812
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr ""
 "Połączenie VPN zostało pomyślnie aktywowane (ścieżka aktywacji D-Bus: %s)\n"
 
-#: ../clients/cli/connections.c:1817
+#: ../clients/cli/connections.c:1820
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s."
 
-#: ../clients/cli/connections.c:1836 ../clients/cli/devices.c:1322
+#: ../clients/cli/connections.c:1839 ../clients/cli/devices.c:1334
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Błąd: przekroczono czas oczekiwania o %d sekund."
 
-#: ../clients/cli/connections.c:1896
+#: ../clients/cli/connections.c:1899
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Błąd: aktywacja połączenia się nie powiodła: %s"
 
-#: ../clients/cli/connections.c:1981
+#: ../clients/cli/connections.c:1984
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "odczytanie passwd-file \"%s\" się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:1993
+#: ../clients/cli/connections.c:1996
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "brak dwukropka we wpisie \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2001
+#: ../clients/cli/connections.c:2004
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "brak kropki we wpisie \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2014
+#: ../clients/cli/connections.c:2017
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "nieprawidłowa nazwa ustawienia we wpisie \"password\" \"%s\""
 
-#: ../clients/cli/connections.c:2061 ../clients/cli/connections.c:2220
+#: ../clients/cli/connections.c:2064 ../clients/cli/connections.c:2223
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: ../clients/cli/connections.c:2070
+#: ../clients/cli/connections.c:2073
 #, c-format
 msgid "unknown device '%s'."
 msgstr "nieznane urządzenie \"%s\"."
 
-#: ../clients/cli/connections.c:2075
+#: ../clients/cli/connections.c:2078
 msgid "neither a valid connection nor device given"
 msgstr "nie podano prawidłowego połączenia ani urządzenia"
 
-#: ../clients/cli/connections.c:2158
+#: ../clients/cli/connections.c:2161
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Błąd: połączenie \"%s\" nie istnieje."
 
-#: ../clients/cli/connections.c:2204 ../clients/cli/devices.c:1221
-#: ../clients/cli/devices.c:1923 ../clients/cli/devices.c:2297
-#: ../clients/cli/devices.c:2583
+#: ../clients/cli/connections.c:2207 ../clients/cli/devices.c:1233
+#: ../clients/cli/devices.c:2037 ../clients/cli/devices.c:2417
+#: ../clients/cli/devices.c:2709
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Nieznany parametr: %s\n"
 
-#: ../clients/cli/connections.c:2228
+#: ../clients/cli/connections.c:2231
 msgid "preparing"
 msgstr "przygotowywanie"
 
-#: ../clients/cli/connections.c:2267
+#: ../clients/cli/connections.c:2255
+#, c-format
+msgid "Connection '%s' (%s) successfully deleted.\n"
+msgstr "Pomyślnie usunięto połączenie \"%s\" (%s).\n"
+
+#: ../clients/cli/connections.c:2271
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "Połączenie \"%s\" zostało pomyślnie deaktywowane (ścieżka aktywacji D-Bus: "
 "%s)\n"
 
-#: ../clients/cli/connections.c:2325 ../clients/cli/connections.c:8697
-#: ../clients/cli/connections.c:8811
+#: ../clients/cli/connections.c:2343 ../clients/cli/connections.c:8843
+#: ../clients/cli/connections.c:8960
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Błąd: nie podano połączenia."
 
-#: ../clients/cli/connections.c:2356
+#: ../clients/cli/connections.c:2375
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Błąd: \"%s\" nie jest aktywnym połączeniem.\n"
 
-#: ../clients/cli/connections.c:2357
+#: ../clients/cli/connections.c:2376 ../clients/cli/connections.c:8872
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Błąd: nie odnaleziono wszystkich aktywnych połączeń."
 
-#: ../clients/cli/connections.c:2366
+#: ../clients/cli/connections.c:2385
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Błąd: nie podano aktywnego połączenia."
 
-#: ../clients/cli/connections.c:2684 ../clients/cli/utils.c:516
+#: ../clients/cli/connections.c:2700 ../clients/cli/utils.c:533
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "\"%s\" nie jest w [%s]"
 
-#: ../clients/cli/connections.c:2763
+#: ../clients/cli/connections.c:2779
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Błąd: \"%s\": \"%s\" nie jest prawidłowym adresem MAC %s."
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:2764 ../clients/cli/connections.c:3226
-#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1573
-#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1623
+#: ../clients/cli/connections.c:2780 ../clients/cli/connections.c:3242
+#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1613
+#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1626
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:2764 ../clients/tui/nm-editor-utils.c:147
-#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1611
+#: ../clients/cli/connections.c:2780 ../clients/tui/nm-editor-utils.c:147
+#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1614
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:2784
+#: ../clients/cli/connections.c:2800
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Błąd: \"mtu\": \"%s\" nie jest prawidłowym MTU."
 
-#: ../clients/cli/connections.c:2800
+#: ../clients/cli/connections.c:2816
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Błąd: \"parent\": \"%s\" nie jest prawidłową nazwą interfejsu."
 
-#: ../clients/cli/connections.c:2821
+#: ../clients/cli/connections.c:2837
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Błąd: \"p-key\": \"%s\" nie jest prawidłowym P_KEY InfiniBand."
 
-#: ../clients/cli/connections.c:2866
+#: ../clients/cli/connections.c:2882
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
 msgstr "Błąd: \"%s\": \"%s\" nie jest prawidłowym %s %s."
 
-#: ../clients/cli/connections.c:2879
+#: ../clients/cli/connections.c:2895
 msgid "Wi-Fi mode"
 msgstr "Tryb Wi-Fi"
 
-#: ../clients/cli/connections.c:2888
+#: ../clients/cli/connections.c:2904
 msgid "InfiniBand transport mode"
 msgstr "Tryb przesyłania InfiniBand"
 
-#: ../clients/cli/connections.c:2901
+#: ../clients/cli/connections.c:2917
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Błąd: \"flags\": \"%s\" jest nieprawidłowe; należy użyć <0-7>."
 
-#: ../clients/cli/connections.c:2923
+#: ../clients/cli/connections.c:2939
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Błąd: \"%s\": \"%s\" jest nieprawidłowe; %s "
 
-#: ../clients/cli/connections.c:3102
+#: ../clients/cli/connections.c:3118
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Błąd: \"%s\": \"%s\" jest nieprawidłowe; należy użyć <%u-%u>."
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3158
+#: ../clients/cli/connections.c:3174
 #, c-format
 msgid "There is %d optional argument for '%s' connection type.\n"
 msgid_plural "There are %d optional arguments for '%s' connection type.\n"
@@ -1674,7 +1697,7 @@ msgstr[0] "Istnieje %d opcjonalny parametr dla typu połączenia \"%s\".\n"
 msgstr[1] "Istnieją %d opcjonalne parametry dla typu połączenia \"%s\".\n"
 msgstr[2] "Istnieje %d opcjonalnych parametrów dla typu połączenia \"%s\".\n"
 
-#: ../clients/cli/connections.c:3161
+#: ../clients/cli/connections.c:3177
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -1683,468 +1706,468 @@ msgstr[1] "Podać je? %s"
 msgstr[2] "Podać je? %s"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3178
+#: ../clients/cli/connections.c:3194
 msgid "ethernet"
 msgstr "ethernet"
 
-#: ../clients/cli/connections.c:3183 ../clients/cli/connections.c:3231
-#: ../clients/cli/connections.c:3365 ../clients/cli/connections.c:3444
+#: ../clients/cli/connections.c:3199 ../clients/cli/connections.c:3247
+#: ../clients/cli/connections.c:3381 ../clients/cli/connections.c:3460
 msgid "MTU [auto]: "
 msgstr "MTU [auto]: "
 
-#: ../clients/cli/connections.c:3194 ../clients/cli/connections.c:3242
-#: ../clients/cli/connections.c:3337 ../clients/cli/connections.c:3376
-#: ../clients/cli/connections.c:3748
+#: ../clients/cli/connections.c:3210 ../clients/cli/connections.c:3258
+#: ../clients/cli/connections.c:3353 ../clients/cli/connections.c:3392
+#: ../clients/cli/connections.c:3764
 msgid "MAC [none]: "
 msgstr "MAC [none]: "
 
-#: ../clients/cli/connections.c:3205
+#: ../clients/cli/connections.c:3221
 msgid "Cloned MAC [none]: "
 msgstr "Sklonowany MAC [none]: "
 
-#: ../clients/cli/connections.c:3253
+#: ../clients/cli/connections.c:3269
 #, c-format
 msgid "Transport mode %s"
 msgstr "Tryb przesyłania %s"
 
-#: ../clients/cli/connections.c:3266
+#: ../clients/cli/connections.c:3282
 msgid "Parent interface [none]: "
 msgstr "Interfejs nadrzędny [none]: "
 
-#: ../clients/cli/connections.c:3277
+#: ../clients/cli/connections.c:3293
 msgid "P_KEY [none]: "
 msgstr "P_KEY [none]: "
 
-#: ../clients/cli/connections.c:3287
+#: ../clients/cli/connections.c:3303
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Błąd: \"p-key\" jest wymagane, kiedy podano \"parent\".\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3304 ../clients/tui/nm-editor-utils.c:155
-#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1613
+#: ../clients/cli/connections.c:3320 ../clients/tui/nm-editor-utils.c:155
+#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1616
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3312
+#: ../clients/cli/connections.c:3328
 #, c-format
 msgid "Mode %s"
 msgstr "Tryb %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3332 ../libnm-glib/nm-device.c:1797
-#: ../libnm/nm-device.c:1619
+#: ../clients/cli/connections.c:3348 ../libnm-glib/nm-device.c:1797
+#: ../libnm/nm-device.c:1622
 msgid "WiMAX"
 msgstr "WiMAX"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3355
+#: ../clients/cli/connections.c:3371
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:3359 ../clients/cli/connections.c:3397
+#: ../clients/cli/connections.c:3375 ../clients/cli/connections.c:3413
 msgid "Password [none]: "
 msgstr "Hasło [none]: "
 
-#: ../clients/cli/connections.c:3361
+#: ../clients/cli/connections.c:3377
 msgid "Service [none]: "
 msgstr "Usługa [none]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3391
+#: ../clients/cli/connections.c:3407
 msgid "mobile broadband"
 msgstr "komórkowe"
 
-#: ../clients/cli/connections.c:3395 ../clients/cli/connections.c:3820
+#: ../clients/cli/connections.c:3411 ../clients/cli/connections.c:3836
 msgid "Username [none]: "
 msgstr "Nazwa użytkownika [none]: "
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3410
+#: ../clients/cli/connections.c:3426
 msgid "bluetooth"
 msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:3417
+#: ../clients/cli/connections.c:3433
 #, c-format
 msgid "Bluetooth type %s"
 msgstr "Typ Bluetooth %s"
 
-#: ../clients/cli/connections.c:3423
+#: ../clients/cli/connections.c:3439
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Błąd: \"bt-type\": \"%s\" nie jest prawidłowym typem Bluetooth.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3439 ../clients/cli/devices.c:233
+#: ../clients/cli/connections.c:3455 ../clients/cli/devices.c:239
 #: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:97
-#: ../libnm-core/nm-connection.c:1571 ../libnm-glib/nm-device.c:1809
-#: ../libnm-util/nm-connection.c:1614 ../libnm/nm-device.c:1631
+#: ../libnm-core/nm-connection.c:1611 ../libnm-glib/nm-device.c:1809
+#: ../libnm-util/nm-connection.c:1614 ../libnm/nm-device.c:1634
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/cli/connections.c:3455
+#: ../clients/cli/connections.c:3471
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "Flagi VLAN= (<0-7>) [none]: "
 
-#: ../clients/cli/connections.c:3466
+#: ../clients/cli/connections.c:3482
 msgid "Ingress priority maps [none]: "
 msgstr "Wejściowe mapy priorytetów [none]: "
 
-#: ../clients/cli/connections.c:3477
+#: ../clients/cli/connections.c:3493
 msgid "Egress priority maps [none]: "
 msgstr "Wyjściowe mapy priorytetów [none]: "
 
-#: ../clients/cli/connections.c:3488
+#: ../clients/cli/connections.c:3504
 msgid "Bonding mode [balance-rr]: "
 msgstr "Tryb wiązania [balance-rr]: "
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3504
+#: ../clients/cli/connections.c:3520
 msgid "bond"
 msgstr "wiązanie"
 
-#: ../clients/cli/connections.c:3526
+#: ../clients/cli/connections.c:3542
 msgid "Bonding primary interface [none]: "
 msgstr "Interfejs nadrzędny wiązania [none]: "
 
-#: ../clients/cli/connections.c:3529
+#: ../clients/cli/connections.c:3545
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Błąd: \"primary\": \"%s\" nie jest prawidłową nazwą interfejsu.\n"
 
-#: ../clients/cli/connections.c:3537
+#: ../clients/cli/connections.c:3553
 #, c-format
 msgid "Bonding monitoring mode %s"
 msgstr "Tryb monitorowania wiązania %s"
 
-#: ../clients/cli/connections.c:3543
+#: ../clients/cli/connections.c:3559
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Błąd: \"%s\" nie jest prawidłowym trybem monitorowania; należy użyć \"%s\" "
 "lub \"%s\".\n"
 
-#: ../clients/cli/connections.c:3552
+#: ../clients/cli/connections.c:3568
 msgid "Bonding miimon [100]: "
 msgstr "miimon wiązania [100]: "
 
-#: ../clients/cli/connections.c:3555
+#: ../clients/cli/connections.c:3571
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: \"miimon\": \"%s\" nie jest prawidłową liczbą <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3563
+#: ../clients/cli/connections.c:3579
 msgid "Bonding downdelay [0]: "
 msgstr "downdelay wiązania [0]: "
 
-#: ../clients/cli/connections.c:3566
+#: ../clients/cli/connections.c:3582
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: \"downdelay\": \"%s\" nie jest prawidłową liczbą <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3574
+#: ../clients/cli/connections.c:3590
 msgid "Bonding updelay [0]: "
 msgstr "updelay wiązania [0]: "
 
-#: ../clients/cli/connections.c:3577
+#: ../clients/cli/connections.c:3593
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: \"updelay\": \"%s\" nie jest prawidłową liczbą <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3586
+#: ../clients/cli/connections.c:3602
 msgid "Bonding arp-interval [0]: "
 msgstr "arp-interval wiązania [0]: "
 
-#: ../clients/cli/connections.c:3589
+#: ../clients/cli/connections.c:3605
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Błąd: \"arp-interval\": \"%s\" nie jest prawidłową liczbą <0-%u>.\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3597
+#: ../clients/cli/connections.c:3613
 msgid "Bonding arp-ip-target [none]: "
 msgstr "arp-ip-target wiązania [none]: "
 
-#: ../clients/cli/connections.c:3604
+#: ../clients/cli/connections.c:3620
 msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "Prędkość LACP (\"slow\" lub \"fast\") [slow]: "
 
-#: ../clients/cli/connections.c:3610
+#: ../clients/cli/connections.c:3626
 #, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
 msgstr ""
 "Błąd: \"lacp_rate\": \"%s\" jest nieprawidłowe (\"slow\" lub \"fast\").\n"
 
-#: ../clients/cli/connections.c:3633
+#: ../clients/cli/connections.c:3649
 msgid "Team JSON configuration [none]: "
 msgstr "Konfiguracja JSON zespołu [none]: "
 
-#: ../clients/cli/connections.c:3650
+#: ../clients/cli/connections.c:3666
 msgid "team"
 msgstr "zespół"
 
-#: ../clients/cli/connections.c:3656
+#: ../clients/cli/connections.c:3672
 msgid "team-slave"
 msgstr "podrzędny-zespołu"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:3668
+#: ../clients/cli/connections.c:3684
 msgid "bridge"
 msgstr "mostek"
 
-#: ../clients/cli/connections.c:3674
+#: ../clients/cli/connections.c:3690
 #, c-format
 msgid "Enable STP %s"
 msgstr "Włączenie STP %s"
 
-#: ../clients/cli/connections.c:3679
+#: ../clients/cli/connections.c:3695
 #, c-format
 msgid "Error: 'stp': %s.\n"
 msgstr "Błąd: \"stp\": %s.\n"
 
-#: ../clients/cli/connections.c:3687
+#: ../clients/cli/connections.c:3703
 msgid "STP priority [32768]: "
 msgstr "Priorytet STP [32768]: "
 
-#: ../clients/cli/connections.c:3691
+#: ../clients/cli/connections.c:3707
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Błąd: \"priority\": \"%s\" nie jest prawidłową liczbą <0-%d>.\n"
 
-#: ../clients/cli/connections.c:3699
+#: ../clients/cli/connections.c:3715
 msgid "Forward delay [15]: "
 msgstr "Forward-delay [15]: "
 
-#: ../clients/cli/connections.c:3703
+#: ../clients/cli/connections.c:3719
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Błąd: \"forward-delay\": \"%s\" nie jest prawidłową liczbą <2-30>.\n"
 
-#: ../clients/cli/connections.c:3712
+#: ../clients/cli/connections.c:3728
 msgid "Hello time [2]: "
 msgstr "Hello-time [2]: "
 
-#: ../clients/cli/connections.c:3716
+#: ../clients/cli/connections.c:3732
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Błąd: \"hello-time\": \"%s\" nie jest prawidłową liczbą <1-10>.\n"
 
-#: ../clients/cli/connections.c:3724
+#: ../clients/cli/connections.c:3740
 msgid "Max age [20]: "
 msgstr "Max-age [20]: "
 
-#: ../clients/cli/connections.c:3728
+#: ../clients/cli/connections.c:3744
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Błąd: \"max-age\": \"%s\" nie jest prawidłową liczbą <6-40>.\n"
 
-#: ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:3752
 msgid "MAC address ageing time [300]: "
 msgstr "Czas starzenia adresu MAC [300]: "
 
-#: ../clients/cli/connections.c:3740
+#: ../clients/cli/connections.c:3756
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr ""
 "Błąd: \"ageing-time\": \"%s\" nie jest prawidłową liczbą <0-1000000>.\n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:3767
+#: ../clients/cli/connections.c:3783
 msgid "bridge-slave"
 msgstr "podrzędny-mostku"
 
-#: ../clients/cli/connections.c:3772
+#: ../clients/cli/connections.c:3788
 msgid "Bridge port priority [32]: "
 msgstr "Priorytet portu mostku [32]: "
 
-#: ../clients/cli/connections.c:3785
+#: ../clients/cli/connections.c:3801
 msgid "Bridge port STP path cost [100]: "
 msgstr "Koszt ścieżki STP portu mostku [100]: "
 
-#: ../clients/cli/connections.c:3799
+#: ../clients/cli/connections.c:3815
 #, c-format
 msgid "Hairpin %s"
 msgstr "Hairpin %s"
 
-#: ../clients/cli/connections.c:3804
+#: ../clients/cli/connections.c:3820
 #, c-format
 msgid "Error: 'hairpin': %s.\n"
 msgstr "Błąd: \"hairpin\": %s.\n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:3831 ../libnm-glib/nm-device.c:1795
-#: ../libnm/nm-device.c:1617
+#: ../clients/cli/connections.c:3847 ../libnm-glib/nm-device.c:1795
+#: ../libnm/nm-device.c:1620
 msgid "OLPC Mesh"
 msgstr "Kratowe OLPC"
 
-#: ../clients/cli/connections.c:3836
+#: ../clients/cli/connections.c:3852
 msgid "OLPC Mesh channel [1]: "
 msgstr "Kanał sieci kratowej OLPC [1]: "
 
-#: ../clients/cli/connections.c:3839
+#: ../clients/cli/connections.c:3855
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Błąd: \"channel\": \"%s\" nie jest prawidłową liczbą <1-13>.\n"
 
-#: ../clients/cli/connections.c:3847
+#: ../clients/cli/connections.c:3863
 msgid "DHCP anycast MAC address [none]: "
 msgstr "Adres MAC \"anycast\" DHCP [none]: "
 
-#: ../clients/cli/connections.c:3889
+#: ../clients/cli/connections.c:3905
 msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "Adres IPv4 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:3891
+#: ../clients/cli/connections.c:3907
 msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "Adres IPv6 (IP[/plen]) [none]: "
 
-#: ../clients/cli/connections.c:3905
+#: ../clients/cli/connections.c:3921
 #, c-format
 msgid "  Address successfully added: %s\n"
 msgstr "  Pomyślnie dodano adres: %s\n"
 
-#: ../clients/cli/connections.c:3907
+#: ../clients/cli/connections.c:3923
 #, c-format
 msgid "  Warning: address already present: %s\n"
 msgstr "  Ostrzeżenie: adres jest już obecny: %s\n"
 
-#: ../clients/cli/connections.c:3909
+#: ../clients/cli/connections.c:3925
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Ostrzeżenie: ignorowanie śmieci na końcu: \"%s\"\n"
 
-#: ../clients/cli/connections.c:3911 ../clients/cli/connections.c:4791
-#: ../clients/cli/connections.c:4852 ../clients/cli/connections.c:5253
-#: ../clients/cli/connections.c:5286
+#: ../clients/cli/connections.c:3927 ../clients/cli/connections.c:4807
+#: ../clients/cli/connections.c:4868 ../clients/cli/connections.c:5269
+#: ../clients/cli/connections.c:5302
 msgid "Error: "
 msgstr "Błąd: "
 
-#: ../clients/cli/connections.c:3931
+#: ../clients/cli/connections.c:3947
 msgid "IPv4 gateway [none]: "
 msgstr "Brama IPv4 [none]: "
 
-#: ../clients/cli/connections.c:3934
+#: ../clients/cli/connections.c:3950
 msgid "IPv6 gateway [none]: "
 msgstr "Brama IPv6 [none]: "
 
-#: ../clients/cli/connections.c:3954
+#: ../clients/cli/connections.c:3970
 #, c-format
 msgid "Error: invalid gateway address '%s'\n"
 msgstr "Błąd: nieprawidłowy adres bramy \"%s\"\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:3967
+#: ../clients/cli/connections.c:3983
 #, c-format
 msgid "Do you want to add IP addresses? %s"
 msgstr "Dodać adresy IP? %s"
 
-#: ../clients/cli/connections.c:3975
+#: ../clients/cli/connections.c:3991
 #, c-format
 msgid "Press  to finish adding addresses.\n"
 msgstr "Naciśnięcie klawisza  zakończy dodawanie adresów.\n"
 
-#: ../clients/cli/connections.c:4113
+#: ../clients/cli/connections.c:4129
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Błąd: \"parent\": nieprawidłowe bez \"p-key\"."
 
-#: ../clients/cli/connections.c:4168 ../clients/cli/connections.c:5173
+#: ../clients/cli/connections.c:4184 ../clients/cli/connections.c:5189
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../clients/cli/connections.c:4171 ../clients/cli/connections.c:5176
+#: ../clients/cli/connections.c:4187 ../clients/cli/connections.c:5192
 msgid "Error: 'ssid' is required."
 msgstr "Błąd: \"ssid\" jest wymagane."
 
-#: ../clients/cli/connections.c:4235
+#: ../clients/cli/connections.c:4251
 msgid "WiMAX NSP name: "
 msgstr "Nazwa NSP sieci WiMAX: "
 
-#: ../clients/cli/connections.c:4238
+#: ../clients/cli/connections.c:4254
 msgid "Error: 'nsp' is required."
 msgstr "Błąd: \"nsp\" jest wymagane."
 
-#: ../clients/cli/connections.c:4290
+#: ../clients/cli/connections.c:4306
 msgid "PPPoE username: "
 msgstr "Nazwa użytkownika PPPoE: "
 
-#: ../clients/cli/connections.c:4293
+#: ../clients/cli/connections.c:4309
 msgid "Error: 'username' is required."
 msgstr "Błąd: \"username\" jest wymagane."
 
-#: ../clients/cli/connections.c:4362
+#: ../clients/cli/connections.c:4378
 msgid "APN: "
 msgstr "APN: "
 
-#: ../clients/cli/connections.c:4365
+#: ../clients/cli/connections.c:4381
 msgid "Error: 'apn' is required."
 msgstr "Błąd: \"apn\" jest wymagane."
 
-#: ../clients/cli/connections.c:4423
+#: ../clients/cli/connections.c:4439
 msgid "Bluetooth device address: "
 msgstr "Adres urządzenia Bluetooth: "
 
-#: ../clients/cli/connections.c:4426
+#: ../clients/cli/connections.c:4442
 msgid "Error: 'addr' is required."
 msgstr "Błąd: \"addr\" jest wymagane."
 
-#: ../clients/cli/connections.c:4467
+#: ../clients/cli/connections.c:4483
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 "Błąd: \"bt-type\": \"%s\" jest nieprawidłowe; należy użyć [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:4511
+#: ../clients/cli/connections.c:4527
 msgid "VLAN parent device or connection UUID: "
 msgstr "Urządzenie nadrzędne VLAN lub UUID połączenia: "
 
-#: ../clients/cli/connections.c:4514
+#: ../clients/cli/connections.c:4530
 msgid "Error: 'dev' is required."
 msgstr "Błąd: \"dev\" jest wymagane."
 
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4534
 msgid "VLAN ID <0-4095>: "
 msgstr "Identyfikator VLAN <0-4095>: "
 
-#: ../clients/cli/connections.c:4521
+#: ../clients/cli/connections.c:4537
 msgid "Error: 'id' is required."
 msgstr "Błąd: \"id\" jest wymagane."
 
-#: ../clients/cli/connections.c:4527
+#: ../clients/cli/connections.c:4543
 #, c-format
 msgid "Error: 'id': '%s' is not valid; use <0-4095>."
 msgstr "Błąd: \"id\": \"%s\" jest nieprawidłowe; należy użyć <0-4095>."
 
-#: ../clients/cli/connections.c:4537
+#: ../clients/cli/connections.c:4553
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr "Błąd: \"dev\": \"%s\" nie jest UUID, nazwą interfejsu ani MAC."
 
-#: ../clients/cli/connections.c:4671
+#: ../clients/cli/connections.c:4687
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Błąd: \"mode\": %s."
 
-#: ../clients/cli/connections.c:4680
+#: ../clients/cli/connections.c:4696
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Błąd: \"primary\": \"%s\" nie jest prawidłową nazwą interfejsu."
 
-#: ../clients/cli/connections.c:4732 ../clients/cli/connections.c:4830
-#: ../clients/cli/connections.c:5032
+#: ../clients/cli/connections.c:4748 ../clients/cli/connections.c:4846
+#: ../clients/cli/connections.c:5048
 msgid "Error: 'master' is required."
 msgstr "Błąd: \"master\" jest wymagane."
 
-#: ../clients/cli/connections.c:4738 ../clients/cli/connections.c:4836
-#: ../clients/cli/connections.c:5038
+#: ../clients/cli/connections.c:4754 ../clients/cli/connections.c:4852
+#: ../clients/cli/connections.c:5054
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr ""
 "Ostrzeżenie: master=\"%s\" nie odnosi się do żadnego istniejącego profilu.\n"
 
-#: ../clients/cli/connections.c:4741 ../clients/cli/connections.c:4844
-#: ../clients/cli/connections.c:5041
+#: ../clients/cli/connections.c:4757 ../clients/cli/connections.c:4860
+#: ../clients/cli/connections.c:5057
 #, c-format
 msgid ""
 "Warning: 'type' is currently ignored. We only support ethernet slaves for "
@@ -2153,110 +2176,110 @@ msgstr ""
 "Ostrzeżenie: \"type\" jest obecnie ignorowane. W tej chwili obsługiwane są "
 "tylko podrzędne Ethernet.\n"
 
-#: ../clients/cli/connections.c:4938
+#: ../clients/cli/connections.c:4954
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Błąd: \"stp\": %s."
 
-#: ../clients/cli/connections.c:5068
+#: ../clients/cli/connections.c:5084
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Błąd: \"hairpin\": %s."
 
-#: ../clients/cli/connections.c:5121
+#: ../clients/cli/connections.c:5137
 msgid "Error: 'vpn-type' is required."
 msgstr "Błąd: \"vpn-type\" jest wymagane."
 
-#: ../clients/cli/connections.c:5128
+#: ../clients/cli/connections.c:5144
 #, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Błąd: \"vpn-type\": nieznane %s.\n"
 
-#: ../clients/cli/connections.c:5189
+#: ../clients/cli/connections.c:5205
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Błąd: \"channel\": \"%s\" jest nieprawidłowe; należy użyć <1-13>."
 
-#: ../clients/cli/connections.c:5221
+#: ../clients/cli/connections.c:5237
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Błąd: \"%s\" nie jest prawidłowym typem połączenia."
 
-#: ../clients/cli/connections.c:5265
+#: ../clients/cli/connections.c:5281
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr "Błąd: podano bramę IPv4 bez adresów IPv4"
 
-#: ../clients/cli/connections.c:5269
+#: ../clients/cli/connections.c:5285
 #, c-format
 msgid "Error: multiple IPv4 gateways specified"
 msgstr "Błąd: podano wiele bram IPv4"
 
-#: ../clients/cli/connections.c:5273
+#: ../clients/cli/connections.c:5289
 #, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
 msgstr "Błąd: nieprawidłowa brama IPv4 \"%s\""
 
-#: ../clients/cli/connections.c:5298
+#: ../clients/cli/connections.c:5314
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr "Błąd: podano bramę IPv6 bez adresów IPv6"
 
-#: ../clients/cli/connections.c:5302
+#: ../clients/cli/connections.c:5318
 #, c-format
 msgid "Error: multiple IPv6 gateways specified"
 msgstr "Błąd: podano wiele bram IPv6"
 
-#: ../clients/cli/connections.c:5306
+#: ../clients/cli/connections.c:5322
 #, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
 msgstr "Błąd: nieprawidłowa brama IPv6 \"%s\""
 
-#: ../clients/cli/connections.c:5366
+#: ../clients/cli/connections.c:5382
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Błąd: dodanie połączenia \"%s\" się nie powiodło: %s"
 
-#: ../clients/cli/connections.c:5371
+#: ../clients/cli/connections.c:5387
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Pomyślnie dodano połączenie \"%s\" (%s).\n"
 
-#: ../clients/cli/connections.c:5591
+#: ../clients/cli/connections.c:5607
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Błąd: parametr \"type\" jest wymagany."
 
-#: ../clients/cli/connections.c:5599
+#: ../clients/cli/connections.c:5615
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Błąd: nieznany typ połączenia; %s."
 
-#: ../clients/cli/connections.c:5608
+#: ../clients/cli/connections.c:5624
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Błąd: \"autoconnect\": %s."
 
-#: ../clients/cli/connections.c:5618
+#: ../clients/cli/connections.c:5634
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Błąd: \"save\": %s."
 
-#: ../clients/cli/connections.c:5634
+#: ../clients/cli/connections.c:5650
 msgid "Interface name [*]: "
 msgstr "Nazwa interfejsu [*]: "
 
-#: ../clients/cli/connections.c:5639
+#: ../clients/cli/connections.c:5655
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Błąd: parametr \"ifname\" jest wymagany."
 
-#: ../clients/cli/connections.c:5646
+#: ../clients/cli/connections.c:5662
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr "Błąd: \"ifname\": \"%s\" nie jest prawidłowym interfejsem ani \"*\"."
 
-#: ../clients/cli/connections.c:6422
+#: ../clients/cli/connections.c:6557
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[wartości ustawienia \"%s\"]\n"
@@ -2264,7 +2287,7 @@ msgstr "[wartości ustawienia \"%s\"]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6504
+#: ../clients/cli/connections.c:6639
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -2301,7 +2324,7 @@ msgstr ""
 "nmcli             :: konfiguracja nmcli\n"
 "quit                                           :: kończy działanie nmcli\n"
 
-#: ../clients/cli/connections.c:6531
+#: ../clients/cli/connections.c:6666
 #, c-format
 msgid ""
 "goto [.] |   :: enter setting/property for editing\n"
@@ -2322,7 +2345,7 @@ msgstr ""
 "           nmcli connection> goto secondaries\n"
 "           nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6538
+#: ../clients/cli/connections.c:6673
 #, c-format
 msgid ""
 "remove [.]  :: remove setting or reset property value\n"
@@ -2343,7 +2366,7 @@ msgstr ""
 "Przykłady: nmcli> remove wifi-sec\n"
 "           nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6545
+#: ../clients/cli/connections.c:6680
 #, c-format
 msgid ""
 "set [. ]  :: set property value\n"
@@ -2358,7 +2381,7 @@ msgstr ""
 "\n"
 "Przykład: nmcli> set con.id Moje połączenie\n"
 
-#: ../clients/cli/connections.c:6550
+#: ../clients/cli/connections.c:6685
 #, c-format
 msgid ""
 "describe [.]  :: describe property\n"
@@ -2371,7 +2394,7 @@ msgstr ""
 "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM\n"
 "można znaleźć na stronie podręcznika nm-settings(5).\n"
 
-#: ../clients/cli/connections.c:6555
+#: ../clients/cli/connections.c:6690
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -2386,7 +2409,7 @@ msgstr ""
 "\n"
 "Przykład: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6560
+#: ../clients/cli/connections.c:6695
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -2411,7 +2434,7 @@ msgstr ""
 "           nmcli> verify fix\n"
 "           nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6569
+#: ../clients/cli/connections.c:6704
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -2437,7 +2460,7 @@ msgstr ""
 "między ponownymi uruchomieniami. Aby w pełni usunąć trwałe połączenie,\n"
 "należy usunąć profil połączenia.\n"
 
-#: ../clients/cli/connections.c:6580
+#: ../clients/cli/connections.c:6715
 #, c-format
 msgid ""
 "activate [] [/|]  :: activate the connection\n"
@@ -2458,7 +2481,7 @@ msgstr ""
 "/|        - AP (Wi-Fi) lub NSP (WiMAX) (należy poprzedzić\n"
 "                     znakiem /, kiedy nie podano )\n"
 
-#: ../clients/cli/connections.c:6587 ../clients/cli/connections.c:6745
+#: ../clients/cli/connections.c:6722 ../clients/cli/connections.c:6880
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -2467,7 +2490,7 @@ msgstr ""
 "back  :: przechodzi do menu wyższego poziomu\n"
 "\n"
 
-#: ../clients/cli/connections.c:6590
+#: ../clients/cli/connections.c:6725
 #, c-format
 msgid ""
 "help/? []  :: help for the nmcli commands\n"
@@ -2476,7 +2499,7 @@ msgstr ""
 "help/? []  :: pomoc dla poleceń nmcli\n"
 "\n"
 
-#: ../clients/cli/connections.c:6593
+#: ../clients/cli/connections.c:6728
 #, c-format
 msgid ""
 "nmcli [ ]  :: nmcli configuration\n"
@@ -2521,7 +2544,7 @@ msgstr ""
 "           nmcli> nmcli save-confirmation no\n"
 "           nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6614 ../clients/cli/connections.c:6751
+#: ../clients/cli/connections.c:6749 ../clients/cli/connections.c:6886
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -2534,8 +2557,8 @@ msgstr ""
 "To polecenie kończy działanie nmcli. Jeśli modyfikowane połączenie nie jest "
 "zapisane, użytkownik zostanie poproszony o potwierdzenie działania.\n"
 
-#: ../clients/cli/connections.c:6619 ../clients/cli/connections.c:6756
-#: ../clients/cli/connections.c:7167 ../clients/cli/connections.c:8083
+#: ../clients/cli/connections.c:6754 ../clients/cli/connections.c:6891
+#: ../clients/cli/connections.c:7314 ../clients/cli/connections.c:8236
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Nieznane polecenie: \"%s\"\n"
@@ -2543,7 +2566,7 @@ msgstr "Nieznane polecenie: \"%s\"\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:6685
+#: ../clients/cli/connections.c:6820
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -2570,7 +2593,7 @@ msgstr ""
 "help/?   []           :: wyświetla tę pomoc lub opis polecenia\n"
 "quit                             :: kończy działanie nmcli\n"
 
-#: ../clients/cli/connections.c:6710
+#: ../clients/cli/connections.c:6845
 #, c-format
 msgid ""
 "set []  :: set new value\n"
@@ -2581,7 +2604,7 @@ msgstr ""
 "\n"
 "To polecenie ustawia podaną  tej właściwości\n"
 
-#: ../clients/cli/connections.c:6714
+#: ../clients/cli/connections.c:6849
 #, c-format
 msgid ""
 "add []  :: append new value to the property\n"
@@ -2596,7 +2619,7 @@ msgstr ""
 "jest typu kontener. W przypadku właściwości zawierających jedną wartość "
 "zastępuje tę wartość (podobnie jak \"set\").\n"
 
-#: ../clients/cli/connections.c:6720
+#: ../clients/cli/connections.c:6855
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -2607,7 +2630,7 @@ msgstr ""
 "\n"
 "Wyświetla bieżącą wartość i umożliwia jej modyfikację.\n"
 
-#: ../clients/cli/connections.c:6724
+#: ../clients/cli/connections.c:6859
 #, c-format
 msgid ""
 "remove [||