From d9c99a29a0d3384c9c3d2adce430f5cb1134ab6a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 30 Mar 2016 00:56:30 +0200 Subject: Imported Upstream version 1.1.92 --- NEWS | 15 +- callouts/nm-dispatcher-utils.c | 1 + callouts/nm-dispatcher.c | 7 +- callouts/nm-dispatcher.xml | 54 +- clients/cli/connections.c | 688 ++-- clients/cli/nmcli-completion | 2 +- clients/cli/settings-docs.c | 12 +- clients/cli/settings.c | 118 +- config.h.in | 6 + configure | 46 +- configure.ac | 9 +- docs/api/Makefile.am | 58 +- docs/api/Makefile.in | 55 +- docs/api/html/NetworkManager.conf.html | 1060 +++++ docs/api/html/NetworkManager.devhelp2 | 353 +- docs/api/html/NetworkManager.html | 494 +++ ...org.freedesktop.NetworkManager.AccessPoint.html | 167 + ...rg.freedesktop.NetworkManager.AgentManager.html | 104 + ...eedesktop.NetworkManager.Connection.Active.html | 212 + ...org.freedesktop.NetworkManager.DHCP4Config.html | 86 + ...org.freedesktop.NetworkManager.DHCP6Config.html | 86 + ...org.freedesktop.NetworkManager.Device.Adsl.html | 86 + ...reedesktop.NetworkManager.Device.Bluetooth.html | 104 + ...org.freedesktop.NetworkManager.Device.Bond.html | 104 + ...g.freedesktop.NetworkManager.Device.Bridge.html | 104 + ....freedesktop.NetworkManager.Device.Generic.html | 95 + ...freedesktop.NetworkManager.Device.IPTunnel.html | 176 + ...eedesktop.NetworkManager.Device.Infiniband.html | 95 + ....freedesktop.NetworkManager.Device.Macvlan.html | 113 + ...rg.freedesktop.NetworkManager.Device.Modem.html | 95 + ...freedesktop.NetworkManager.Device.OlpcMesh.html | 104 + ...org.freedesktop.NetworkManager.Device.Team.html | 104 + ...-org.freedesktop.NetworkManager.Device.Tun.html | 140 + ...org.freedesktop.NetworkManager.Device.Veth.html | 86 + ...org.freedesktop.NetworkManager.Device.Vlan.html | 113 + ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 230 ++ ...rg.freedesktop.NetworkManager.Device.WiMax.html | 213 + ...rg.freedesktop.NetworkManager.Device.Wired.html | 122 + ...freedesktop.NetworkManager.Device.Wireless.html | 242 ++ ...dbus-org.freedesktop.NetworkManager.Device.html | 416 ++ ...s-org.freedesktop.NetworkManager.IP4Config.html | 167 + ...s-org.freedesktop.NetworkManager.IP6Config.html | 158 + .../gdbus-org.freedesktop.NetworkManager.PPP.html | 133 + ...org.freedesktop.NetworkManager.SecretAgent.html | 181 + ...desktop.NetworkManager.Settings.Connection.html | 222 + ...us-org.freedesktop.NetworkManager.Settings.html | 320 ++ ....freedesktop.NetworkManager.VPN.Connection.html | 122 + ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 392 ++ .../html/gdbus-org.freedesktop.NetworkManager.html | 638 +++ docs/api/html/index.html | 153 +- docs/api/html/index.sgml | 434 ++ docs/api/html/ix01.html | 685 +++- docs/api/html/license.html | 6 +- docs/api/html/manpages.html | 49 + docs/api/html/nm-settings-ifcfg-rh.html | 1876 +++++++++ docs/api/html/nm-settings-keyfile.html | 525 +++ docs/api/html/nm-settings.html | 2567 ++++++++++++ docs/api/html/nmcli-examples.html | 610 +++ docs/api/html/ref-dbus.html | 34 - docs/api/html/ref-migrating.html | 540 --- docs/api/html/ref-settings.html | 30 +- docs/api/html/secrets-flags.html | 8 +- docs/api/html/spec.html | 2931 +------------ docs/api/migrating-to-09.xml | 478 --- docs/api/network-manager-docs.xml | 57 +- docs/api/settings-spec.xml | 10 +- docs/api/spec.html | 2792 ------------- docs/api/version.xml | 2 +- docs/libnm-glib/html/NMAccessPoint.html | 108 +- docs/libnm-glib/html/NMActiveConnection.html | 106 +- docs/libnm-glib/html/NMClient.html | 302 +- docs/libnm-glib/html/NMDHCP4Config.html | 18 +- docs/libnm-glib/html/NMDHCP6Config.html | 18 +- docs/libnm-glib/html/NMDevice.html | 234 +- docs/libnm-glib/html/NMDeviceAdsl.html | 20 +- docs/libnm-glib/html/NMDeviceBond.html | 30 +- docs/libnm-glib/html/NMDeviceBridge.html | 30 +- docs/libnm-glib/html/NMDeviceBt.html | 30 +- docs/libnm-glib/html/NMDeviceEthernet.html | 36 +- docs/libnm-glib/html/NMDeviceGeneric.html | 20 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 24 +- docs/libnm-glib/html/NMDeviceModem.html | 22 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 24 +- docs/libnm-glib/html/NMDeviceTeam.html | 30 +- docs/libnm-glib/html/NMDeviceVlan.html | 32 +- docs/libnm-glib/html/NMDeviceWifi.html | 74 +- docs/libnm-glib/html/NMDeviceWimax.html | 78 +- docs/libnm-glib/html/NMIP4Config.html | 68 +- docs/libnm-glib/html/NMIP6Config.html | 64 +- docs/libnm-glib/html/NMObject.html | 20 +- docs/libnm-glib/html/NMRemoteConnection.html | 80 +- docs/libnm-glib/html/NMRemoteSettings.html | 184 +- docs/libnm-glib/html/NMSecretAgent.html | 120 +- docs/libnm-glib/html/NMVPNConnection.html | 28 +- docs/libnm-glib/html/NMWimaxNsp.html | 46 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 24 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 58 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 24 +- docs/libnm-glib/html/object-tree.html | 4 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/NMConnection.html | 264 +- docs/libnm-util/html/NMSetting.html | 132 +- docs/libnm-util/html/NMSetting8021x.html | 278 +- docs/libnm-util/html/NMSettingAdsl.html | 44 +- docs/libnm-util/html/NMSettingBluetooth.html | 16 +- docs/libnm-util/html/NMSettingBond.html | 56 +- docs/libnm-util/html/NMSettingBridge.html | 64 +- docs/libnm-util/html/NMSettingBridgePort.html | 32 +- docs/libnm-util/html/NMSettingCdma.html | 24 +- docs/libnm-util/html/NMSettingConnection.html | 150 +- docs/libnm-util/html/NMSettingDcb.html | 130 +- docs/libnm-util/html/NMSettingGeneric.html | 8 +- docs/libnm-util/html/NMSettingGsm.html | 62 +- docs/libnm-util/html/NMSettingIP4Config.html | 242 +- docs/libnm-util/html/NMSettingIP6Config.html | 190 +- docs/libnm-util/html/NMSettingInfiniband.html | 34 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 24 +- docs/libnm-util/html/NMSettingPPP.html | 186 +- docs/libnm-util/html/NMSettingPPPOE.html | 24 +- docs/libnm-util/html/NMSettingSerial.html | 44 +- docs/libnm-util/html/NMSettingTeam.html | 16 +- docs/libnm-util/html/NMSettingTeamPort.html | 12 +- docs/libnm-util/html/NMSettingVPN.html | 56 +- docs/libnm-util/html/NMSettingVlan.html | 86 +- docs/libnm-util/html/NMSettingWimax.html | 16 +- docs/libnm-util/html/NMSettingWired.html | 120 +- docs/libnm-util/html/NMSettingWireless.html | 138 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 134 +- docs/libnm-util/html/api-index-full.html | 20 +- docs/libnm-util/html/index.html | 2 +- .../libnm-util/html/libnm-util-NetworkManager.html | 2 +- docs/libnm-util/html/libnm-util-nm-utils.html | 416 +- docs/libnm-util/html/object-tree.html | 6 +- docs/libnm-util/version.xml | 2 +- docs/libnm/html/NMAccessPoint.html | 78 +- docs/libnm/html/NMActiveConnection.html | 78 +- docs/libnm/html/NMClient.html | 578 +-- docs/libnm/html/NMDevice.html | 418 +- docs/libnm/html/NMDeviceAdsl.html | 12 +- docs/libnm/html/NMDeviceBond.html | 26 +- docs/libnm/html/NMDeviceBridge.html | 26 +- docs/libnm/html/NMDeviceBt.html | 10 +- docs/libnm/html/NMDeviceEthernet.html | 32 +- docs/libnm/html/NMDeviceGeneric.html | 12 +- docs/libnm/html/NMDeviceIPTunnel.html | 62 +- docs/libnm/html/NMDeviceInfiniband.html | 16 +- docs/libnm/html/NMDeviceMacvlan.html | 28 +- docs/libnm/html/NMDeviceModem.html | 2 +- docs/libnm/html/NMDeviceOlpcMesh.html | 16 +- docs/libnm/html/NMDeviceTeam.html | 26 +- docs/libnm/html/NMDeviceTun.html | 54 +- docs/libnm/html/NMDeviceVlan.html | 24 +- docs/libnm/html/NMDeviceVxlan.html | 128 +- docs/libnm/html/NMDeviceWifi.html | 114 +- docs/libnm/html/NMDeviceWimax.html | 74 +- docs/libnm/html/NMDhcpConfig.html | 18 +- docs/libnm/html/NMIPConfig.html | 56 +- docs/libnm/html/NMObject.html | 16 +- docs/libnm/html/NMRemoteConnection.html | 196 +- docs/libnm/html/NMSecretAgentOld.html | 164 +- docs/libnm/html/NMSetting.html | 122 +- docs/libnm/html/NMSetting8021x.html | 607 +-- docs/libnm/html/NMSettingAdsl.html | 34 +- docs/libnm/html/NMSettingBluetooth.html | 10 +- docs/libnm/html/NMSettingBond.html | 50 +- docs/libnm/html/NMSettingBridge.html | 62 +- docs/libnm/html/NMSettingBridgePort.html | 26 +- docs/libnm/html/NMSettingCdma.html | 14 +- docs/libnm/html/NMSettingConnection.html | 172 +- docs/libnm/html/NMSettingDcb.html | 130 +- docs/libnm/html/NMSettingGeneric.html | 4 +- docs/libnm/html/NMSettingGsm.html | 48 +- docs/libnm/html/NMSettingIP4Config.html | 12 +- docs/libnm/html/NMSettingIP6Config.html | 8 +- docs/libnm/html/NMSettingIPConfig.html | 354 +- docs/libnm/html/NMSettingIPTunnel.html | 74 +- docs/libnm/html/NMSettingInfiniband.html | 32 +- docs/libnm/html/NMSettingMacvlan.html | 28 +- docs/libnm/html/NMSettingOlpcMesh.html | 22 +- docs/libnm/html/NMSettingPpp.html | 180 +- docs/libnm/html/NMSettingPppoe.html | 14 +- docs/libnm/html/NMSettingSerial.html | 36 +- docs/libnm/html/NMSettingTeam.html | 6 +- docs/libnm/html/NMSettingTeamPort.html | 6 +- docs/libnm/html/NMSettingTun.html | 50 +- docs/libnm/html/NMSettingVlan.html | 84 +- docs/libnm/html/NMSettingVpn.html | 66 +- docs/libnm/html/NMSettingVxlan.html | 118 +- docs/libnm/html/NMSettingWimax.html | 10 +- docs/libnm/html/NMSettingWired.html | 130 +- docs/libnm/html/NMSettingWireless.html | 138 +- docs/libnm/html/NMSettingWirelessSecurity.html | 126 +- docs/libnm/html/NMSimpleConnection.html | 40 +- docs/libnm/html/NMVpnConnection.html | 16 +- docs/libnm/html/NMVpnEditorPlugin.html | 82 +- docs/libnm/html/NMWimaxNsp.html | 40 +- docs/libnm/html/api-index-full.html | 30 +- docs/libnm/html/index.html | 2 +- docs/libnm/html/index.sgml | 6 + docs/libnm/html/libnm-NMConnection.html | 476 +-- docs/libnm/html/libnm-nm-dbus-interface.html | 6 +- docs/libnm/html/libnm-nm-errors.html | 54 +- docs/libnm/html/libnm-nm-utils.html | 530 +-- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 2 +- docs/libnm/html/libnm.devhelp2 | 6 + docs/libnm/html/object-tree.html | 10 +- docs/libnm/libnm-sections.txt | 4 + docs/libnm/version.xml | 2 +- examples/python/dbus/create-bond.py | 2 +- examples/python/dbus/list-devices.py | 10 +- introspection/Makefile.am | 43 +- introspection/Makefile.in | 54 +- introspection/errors.xml | 12 +- introspection/generic-types.xml | 26 +- introspection/nm-access-point.xml | 60 +- introspection/nm-active-connection.xml | 90 +- introspection/nm-agent-manager.xml | 26 +- introspection/nm-device-adsl.xml | 8 +- introspection/nm-device-bond.xml | 16 +- introspection/nm-device-bridge.xml | 16 +- introspection/nm-device-bt.xml | 26 +- introspection/nm-device-ethernet.xml | 24 +- introspection/nm-device-generic.xml | 12 +- introspection/nm-device-infiniband.xml | 12 +- introspection/nm-device-ip-tunnel.xml | 48 +- introspection/nm-device-macvlan.xml | 22 +- introspection/nm-device-modem.xml | 34 +- introspection/nm-device-olpc-mesh.xml | 20 +- introspection/nm-device-team.xml | 16 +- introspection/nm-device-tun.xml | 40 +- introspection/nm-device-veth.xml | 8 +- introspection/nm-device-vlan.xml | 20 +- introspection/nm-device-vxlan.xml | 72 +- introspection/nm-device-wifi.xml | 112 +- introspection/nm-device-wimax.xml | 64 +- introspection/nm-device.xml | 556 +-- introspection/nm-dhcp4-config.xml | 10 +- introspection/nm-dhcp6-config.xml | 10 +- introspection/nm-ip4-config.xml | 42 +- introspection/nm-ip6-config.xml | 42 +- introspection/nm-manager.xml | 354 +- introspection/nm-secret-agent.xml | 122 +- introspection/nm-settings-connection.xml | 70 +- introspection/nm-settings.xml | 118 +- introspection/nm-vpn-connection.xml | 104 +- introspection/nm-vpn-plugin.xml | 184 +- introspection/nm-wimax-nsp.xml | 22 +- ...-org.freedesktop.NetworkManager.AccessPoint.xml | 134 + ...reedesktop.NetworkManager.Connection.Active.xml | 179 + ...org.freedesktop.NetworkManager.AgentManager.xml | 66 + ...-org.freedesktop.NetworkManager.Device.Adsl.xml | 53 + ...-org.freedesktop.NetworkManager.Device.Bond.xml | 71 + ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 71 + ...freedesktop.NetworkManager.Device.Bluetooth.xml | 71 + ...org.freedesktop.NetworkManager.Device.Wired.xml | 89 + ...g.freedesktop.NetworkManager.Device.Generic.xml | 62 + ...reedesktop.NetworkManager.Device.Infiniband.xml | 62 + ....freedesktop.NetworkManager.Device.IPTunnel.xml | 143 + ...g.freedesktop.NetworkManager.Device.Macvlan.xml | 80 + ...org.freedesktop.NetworkManager.Device.Modem.xml | 62 + ....freedesktop.NetworkManager.Device.OlpcMesh.xml | 71 + ...evice-org.freedesktop.NetworkManager.Device.xml | 370 ++ ...-org.freedesktop.NetworkManager.Device.Team.xml | 71 + ...n-org.freedesktop.NetworkManager.Device.Tun.xml | 107 + ...-org.freedesktop.NetworkManager.Device.Veth.xml | 53 + ...-org.freedesktop.NetworkManager.Device.Vlan.xml | 80 + ...org.freedesktop.NetworkManager.Device.Vxlan.xml | 197 + ....freedesktop.NetworkManager.Device.Wireless.xml | 190 + ...org.freedesktop.NetworkManager.Device.WiMax.xml | 169 + ...-org.freedesktop.NetworkManager.DHCP4Config.xml | 53 + ...-org.freedesktop.NetworkManager.DHCP6Config.xml | 53 + ...ig-org.freedesktop.NetworkManager.IP4Config.xml | 134 + ...ig-org.freedesktop.NetworkManager.IP6Config.xml | 125 + ...dbus-manager-org.freedesktop.NetworkManager.xml | 532 +++ ...-manager-org.freedesktop.NetworkManager.PPP.xml | 87 + ...-org.freedesktop.NetworkManager.SecretAgent.xml | 129 + ...edesktop.NetworkManager.Settings.Connection.xml | 172 + ...ngs-org.freedesktop.NetworkManager.Settings.xml | 244 ++ ...g.freedesktop.NetworkManager.VPN.Connection.xml | 83 + ...n-org.freedesktop.NetworkManager.VPN.Plugin.xml | 298 ++ introspection/vpn-errors.xml | 38 +- libnm-core/Makefile.in | 54 +- libnm-core/Makefile.libnm-core | 2 + libnm-core/nm-connection.c | 90 +- libnm-core/nm-core-internal.h | 21 +- libnm-core/nm-dbus-interface.h | 2 +- libnm-core/nm-setting-8021x.c | 140 +- libnm-core/nm-setting-8021x.h | 6 + libnm-core/nm-setting-connection.c | 15 +- libnm-core/nm-setting-ip-config.c | 14 +- libnm-core/nm-setting-ip-tunnel.c | 1 + libnm-core/nm-setting-ip4-config.c | 44 +- libnm-core/nm-setting-ip6-config.c | 44 +- libnm-core/nm-setting-private.h | 13 +- libnm-core/nm-setting-vlan.c | 9 +- libnm-core/nm-setting.c | 128 +- libnm-core/nm-simple-connection.c | 34 +- libnm-core/nm-utils.c | 83 +- libnm-core/tests/test-general.c | 58 +- libnm-glib/nm-active-connection.c | 4 +- libnm-glib/nm-client.c | 12 +- libnm-glib/nm-device.c | 5 +- libnm-glib/nm-object.c | 3 +- libnm-glib/nm-remote-connection.c | 31 +- libnm-glib/nm-remote-settings.c | 5 +- libnm-glib/nm-secret-agent.c | 23 +- libnm-glib/nm-vpn-plugin.c | 57 +- libnm-glib/tests/test-nm-client.c | 33 +- libnm-util/Makefile.am | 2 + libnm-util/Makefile.in | 38 +- libnm-util/libnm-util.ver | 2 + libnm-util/nm-connection.c | 82 +- libnm-util/nm-setting-8021x.c | 28 +- libnm-util/nm-setting-private.h | 6 + libnm-util/nm-setting.c | 18 +- libnm-util/nm-utils.c | 14 +- libnm/Makefile.in | 2 + libnm/libnm.ver | 2 + libnm/nm-client.c | 12 + libnm/nm-device.c | 14 +- libnm/nm-ifcfg-rh-docs.xml | 2 + libnm/nm-manager.c | 2 +- libnm/nm-object.c | 130 +- libnm/nm-property-docs.xml | 10 +- libnm/nm-remote-connection.c | 12 +- libnm/nm-secret-agent-old.c | 11 +- libnm/nm-setting-docs.xml | 10 +- libnm/nm-vpn-plugin-old.c | 34 +- libnm/nm-vpn-service-plugin.c | 34 +- libnm/tests/test-nm-client.c | 184 +- m4/compiler_warnings.m4 | 1 + m4/introspection.m4 | 2 + man/Makefile.am | 1 + man/Makefile.in | 1 + man/NetworkManager.8 | 308 ++ man/NetworkManager.conf.5 | 905 ++++ man/NetworkManager.conf.xml | 22 +- man/NetworkManager.conf.xml.in | 20 +- man/NetworkManager.xml | 2 +- man/nm-online.1.in | 2 +- man/nm-settings-ifcfg-rh.5 | 26 +- man/nm-settings-ifcfg-rh.xml | 6 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 34 +- man/nm-settings.xml | 12 +- man/nmcli-examples.5 | 693 ++++ man/nmcli-examples.xml | 36 +- man/nmcli.1.in | 41 +- man/nmtui.1.in | 2 +- po/POTFILES.in | 1 + po/de.po | 4320 ++++++++++---------- po/pl.po | 3506 ++++++++-------- shared/Makefile.am | 2 + shared/Makefile.in | 2 + shared/nm-default.h | 1 + shared/nm-macros-internal.h | 63 + shared/nm-shared-utils.c | 228 ++ shared/nm-shared-utils.h | 63 + shared/nm-test-utils.h | 109 +- shared/nm-version-macros.h | 2 +- src/Makefile.am | 30 +- src/Makefile.in | 200 +- src/NetworkManager.ver | 9 + src/NetworkManagerUtils.c | 10 +- src/NetworkManagerUtils.h | 3 +- src/devices/adsl/nm-atm-manager.c | 2 +- src/devices/adsl/nm-device-adsl.c | 5 +- src/devices/bluetooth/nm-bluez-device.c | 5 +- src/devices/bluetooth/nm-bluez-manager.c | 26 +- src/devices/bluetooth/nm-bluez4-adapter.c | 2 +- src/devices/bluetooth/nm-bluez5-manager.c | 4 +- src/devices/bluetooth/nm-bluez5-manager.h | 2 +- src/devices/bluetooth/nm-device-bt.c | 14 +- src/devices/nm-device-bond.c | 3 +- src/devices/nm-device-bridge.c | 3 +- src/devices/nm-device-ethernet.c | 26 +- src/devices/nm-device-factory.c | 4 +- src/devices/nm-device-infiniband.c | 5 +- src/devices/nm-device-ip-tunnel.c | 10 +- src/devices/nm-device-logging.h | 4 +- src/devices/nm-device-macvlan.c | 3 +- src/devices/nm-device-tun.c | 3 +- src/devices/nm-device-vlan.c | 3 +- src/devices/nm-device-vxlan.c | 3 +- src/devices/nm-device.c | 141 +- src/devices/nm-device.h | 5 +- src/devices/nm-lldp-listener.c | 910 +++-- src/devices/nm-lldp-listener.h | 3 +- src/devices/team/nm-device-team.c | 3 +- src/devices/tests/test-arping.c | 6 +- src/devices/tests/test-lldp.c | 466 ++- src/devices/wifi/nm-device-olpc-mesh.c | 3 +- src/devices/wifi/nm-device-wifi.c | 7 +- src/devices/wifi/nm-wifi-ap.c | 2 +- src/devices/wifi/tests/test-wifi-ap-utils.c | 2 +- src/devices/wwan/nm-device-modem.c | 7 +- src/devices/wwan/nm-modem-broadband.c | 16 +- src/devices/wwan/nm-modem-manager.c | 2 +- src/devices/wwan/nm-modem.c | 5 +- src/dhcp-manager/nm-dhcp-client-logging.h | 55 + src/dhcp-manager/nm-dhcp-client.c | 86 +- src/dhcp-manager/nm-dhcp-dhclient.c | 118 +- src/dhcp-manager/nm-dhcp-dhcpcd.c | 21 +- src/dhcp-manager/nm-dhcp-manager.c | 63 +- src/dhcp-manager/nm-dhcp-systemd.c | 206 +- src/dhcp-manager/tests/test-dhcp-utils.c | 14 +- src/dns-manager/nm-dns-dnsmasq.c | 47 +- src/dns-manager/nm-dns-manager.c | 238 +- src/dns-manager/nm-dns-manager.h | 10 +- src/dns-manager/nm-dns-plugin.c | 120 +- src/dnsmasq-manager/nm-dnsmasq-manager.c | 28 +- src/main-utils.c | 28 +- src/main-utils.h | 1 + src/main.c | 32 +- src/nm-activation-request.c | 5 +- src/nm-active-connection.c | 78 + src/nm-active-connection.h | 6 + src/nm-audit-manager.c | 22 +- src/nm-auth-utils.c | 4 +- src/nm-bus-manager.c | 63 +- src/nm-core-utils.c | 156 +- src/nm-core-utils.h | 63 +- src/nm-default-route-manager.c | 61 +- src/nm-default-route-manager.h | 3 +- src/nm-dispatcher.c | 83 +- src/nm-enum-types.c | 29 +- src/nm-enum-types.h | 2 - src/nm-iface-helper.c | 42 +- src/nm-ip4-config.c | 4 +- src/nm-logging.c | 28 +- src/nm-logging.h | 21 +- src/nm-manager.c | 566 +-- src/nm-policy.c | 820 ++-- src/nm-policy.h | 6 +- src/nm-route-manager.c | 48 +- src/nm-route-manager.h | 3 + src/nm-session-monitor.c | 16 +- src/nm-types.h | 3 +- src/org.freedesktop.NetworkManager.conf | 19 +- src/platform/nm-fake-platform.c | 2 + src/platform/nm-linux-platform.c | 282 +- src/platform/nm-platform-utils.c | 106 +- src/platform/nm-platform-utils.h | 15 - src/platform/nm-platform.c | 199 +- src/platform/nm-platform.h | 25 +- src/platform/nmp-netns.c | 732 ++++ src/platform/nmp-netns.h | 74 + src/platform/nmp-object.c | 27 +- src/platform/nmp-object.h | 4 +- src/platform/tests/test-address.c | 14 +- src/platform/tests/test-cleanup.c | 2 +- src/platform/tests/test-common.c | 122 +- src/platform/tests/test-common.h | 19 +- src/platform/tests/test-general.c | 4 +- src/platform/tests/test-link.c | 501 ++- src/platform/tests/test-nmp-object.c | 4 +- src/platform/tests/test-route.c | 4 +- src/platform/wifi/wifi-utils-wext.c | 25 +- src/ppp-manager/nm-ppp-manager.c | 50 +- src/ppp-manager/nm-pppd-plugin.c | 5 +- src/rdisc/nm-lndp-rdisc.c | 30 +- src/rdisc/nm-lndp-rdisc.h | 3 +- src/rdisc/nm-rdisc.c | 107 +- src/rdisc/nm-rdisc.h | 10 +- src/rdisc/tests/test-rdisc-fake.c | 2 +- src/rdisc/tests/test-rdisc-linux.c | 3 +- src/settings/nm-agent-manager.c | 9 +- src/settings/nm-settings-connection.c | 28 +- src/settings/nm-settings-plugin.c | 2 + src/settings/nm-settings.c | 156 +- src/settings/nm-settings.h | 7 + src/settings/plugins/ibft/tests/test-ibft.c | 2 +- src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml | 20 +- src/settings/plugins/ifcfg-rh/plugin.c | 6 +- src/settings/plugins/ifcfg-rh/reader.c | 64 +- .../ifcfg-rh/tests/network-scripts/Makefile.am | 1 + .../ifcfg-rh/tests/network-scripts/Makefile.in | 1 + .../tests/network-scripts/ifcfg-test-sit-ignore | 12 + .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 56 +- src/settings/plugins/ifcfg-rh/utils.h | 2 +- src/settings/plugins/ifcfg-rh/writer.c | 7 + src/settings/plugins/ifnet/connection_parser.c | 166 +- src/settings/plugins/ifnet/net_parser.c | 64 +- src/settings/plugins/ifnet/net_utils.c | 17 +- src/settings/plugins/ifnet/nm-ifnet-connection.c | 15 +- src/settings/plugins/ifnet/tests/test-ifnet.c | 18 +- src/settings/plugins/ifnet/wpa_parser.c | 45 +- src/settings/plugins/ifupdown/interface_parser.c | 49 +- src/settings/plugins/ifupdown/interface_parser.h | 2 +- .../plugins/ifupdown/nm-ifupdown-connection.c | 117 +- .../plugins/ifupdown/nm-ifupdown-connection.h | 4 +- src/settings/plugins/ifupdown/parser.c | 41 +- src/settings/plugins/ifupdown/parser.h | 2 +- src/settings/plugins/ifupdown/plugin.c | 36 +- src/settings/plugins/ifupdown/plugin.h | 2 +- src/settings/plugins/keyfile/plugin.c | 5 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 146 +- src/settings/plugins/keyfile/utils.h | 2 +- src/supplicant-manager/nm-supplicant-config.c | 10 +- src/supplicant-manager/nm-supplicant-manager.c | 34 +- .../nm-supplicant-settings-verify.c | 2 + .../tests/test-supplicant-config.c | 70 +- src/systemd/nm-sd-adapt.c | 216 +- src/systemd/nm-sd-adapt.h | 23 +- src/systemd/nm-sd.c | 136 + src/systemd/nm-sd.h | 25 + src/systemd/src/basic/alloc-util.h | 22 +- src/systemd/src/basic/escape.c | 28 + src/systemd/src/basic/escape.h | 1 + src/systemd/src/basic/ether-addr-util.c | 58 + src/systemd/src/basic/ether-addr-util.h | 37 + src/systemd/src/basic/fileio.c | 12 +- src/systemd/src/basic/fs-util.c | 18 - src/systemd/src/basic/fs-util.h | 1 - src/systemd/src/basic/hashmap.c | 14 +- src/systemd/src/basic/hexdecoct.c | 13 +- src/systemd/src/basic/hostname-util.c | 36 +- src/systemd/src/basic/hostname-util.h | 1 + src/systemd/src/basic/io-util.c | 2 +- src/systemd/src/basic/io-util.h | 2 +- src/systemd/src/basic/list.h | 14 +- src/systemd/src/basic/log.h | 3 +- src/systemd/src/basic/macro.h | 15 +- src/systemd/src/basic/mempool.h | 2 +- src/systemd/src/basic/parse-util.c | 2 +- src/systemd/src/basic/set.h | 3 + src/systemd/src/basic/socket-util.c | 982 +++++ src/systemd/src/basic/socket-util.h | 2 + src/systemd/src/basic/stdio-util.h | 2 +- src/systemd/src/basic/string-util.c | 2 +- src/systemd/src/basic/strv.c | 4 +- src/systemd/src/basic/time-util.c | 95 +- src/systemd/src/basic/time-util.h | 1 + src/systemd/src/basic/utf8.c | 2 +- src/systemd/src/basic/util.h | 11 + src/systemd/src/libsystemd-network/dhcp-internal.h | 4 +- src/systemd/src/libsystemd-network/dhcp-option.c | 13 +- src/systemd/src/libsystemd-network/dhcp-packet.c | 2 +- src/systemd/src/libsystemd-network/dhcp6-option.c | 3 +- src/systemd/src/libsystemd-network/lldp-internal.c | 362 -- src/systemd/src/libsystemd-network/lldp-internal.h | 78 +- src/systemd/src/libsystemd-network/lldp-neighbor.c | 797 ++++ src/systemd/src/libsystemd-network/lldp-neighbor.h | 106 + src/systemd/src/libsystemd-network/lldp-network.c | 35 +- src/systemd/src/libsystemd-network/lldp-network.h | 4 +- src/systemd/src/libsystemd-network/lldp-port.c | 118 - src/systemd/src/libsystemd-network/lldp-port.h | 69 - src/systemd/src/libsystemd-network/lldp-tlv.c | 640 --- src/systemd/src/libsystemd-network/lldp-tlv.h | 94 - src/systemd/src/libsystemd-network/lldp.h | 84 +- .../src/libsystemd-network/network-internal.c | 4 +- .../src/libsystemd-network/sd-dhcp-client.c | 32 +- .../src/libsystemd-network/sd-dhcp6-client.c | 19 +- src/systemd/src/libsystemd-network/sd-ipv4acd.c | 8 +- src/systemd/src/libsystemd-network/sd-ipv4ll.c | 8 +- src/systemd/src/libsystemd-network/sd-lldp.c | 898 ++-- src/systemd/src/libsystemd/sd-event/sd-event.c | 2905 +++++++++++++ src/systemd/src/libsystemd/sd-id128/sd-id128.c | 2 +- src/systemd/src/shared/dns-domain.c | 8 +- src/systemd/src/shared/dns-domain.h | 5 +- src/systemd/src/systemd/_sd-common.h | 2 +- src/systemd/src/systemd/sd-dhcp-client.h | 6 +- src/systemd/src/systemd/sd-dhcp6-client.h | 7 +- src/systemd/src/systemd/sd-event.h | 6 +- src/systemd/src/systemd/sd-id128.h | 4 +- src/systemd/src/systemd/sd-ipv4acd.h | 6 +- src/systemd/src/systemd/sd-ipv4ll.h | 6 +- src/systemd/src/systemd/sd-lldp.h | 90 +- src/systemd/src/systemd/sd-ndisc.h | 2 +- src/tests/Makefile.am | 1 + src/tests/Makefile.in | 1 + src/tests/config/test-config.c | 16 +- src/tests/test-general-with-expect.c | 8 +- src/tests/test-general.c | 27 +- src/tests/test-route-manager.c | 36 +- src/tests/test-systemd.c | 87 + src/vpn-manager/nm-vpn-connection.c | 29 +- tools/Makefile.am | 1 - tools/Makefile.in | 1 - tools/doc-generator.xsl | 691 ---- tools/run-test-dbus-session.sh | 2 +- tools/run-test-valgrind.sh | 8 + tools/test-networkmanager-service.py | 2 +- 585 files changed, 45865 insertions(+), 24776 deletions(-) create mode 100644 docs/api/html/NetworkManager.conf.html create mode 100644 docs/api/html/NetworkManager.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.html create mode 100644 docs/api/html/index.sgml create mode 100644 docs/api/html/manpages.html create mode 100644 docs/api/html/nm-settings-ifcfg-rh.html create mode 100644 docs/api/html/nm-settings-keyfile.html create mode 100644 docs/api/html/nm-settings.html create mode 100644 docs/api/html/nmcli-examples.html delete mode 100644 docs/api/html/ref-dbus.html delete mode 100644 docs/api/html/ref-migrating.html delete mode 100644 docs/api/migrating-to-09.xml delete mode 100644 docs/api/spec.html create mode 100644 introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml create mode 100644 introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml create mode 100644 introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml create mode 100644 introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml create mode 100644 introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml create mode 100644 introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml create mode 100644 introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml create mode 100644 introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml create mode 100644 introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml create mode 100644 introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml create mode 100644 introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml create mode 100644 introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml create mode 100644 introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml create mode 100644 introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml create mode 100644 introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml create mode 100644 introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml create mode 100644 introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml create mode 100644 introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml create mode 100644 introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml create mode 100644 introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml create mode 100644 introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml create mode 100644 introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml create mode 100644 introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml create mode 100644 introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml create mode 100644 introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml create mode 100644 introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml create mode 100644 introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml create mode 100644 introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml create mode 100644 introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml create mode 100644 introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml create mode 100644 introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml create mode 100644 introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml create mode 100644 introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml create mode 100644 man/NetworkManager.8 create mode 100644 man/NetworkManager.conf.5 create mode 100644 man/nmcli-examples.5 create mode 100644 shared/nm-shared-utils.c create mode 100644 shared/nm-shared-utils.h create mode 100644 src/NetworkManager.ver create mode 100644 src/dhcp-manager/nm-dhcp-client-logging.h create mode 100644 src/platform/nmp-netns.c create mode 100644 src/platform/nmp-netns.h create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore create mode 100644 src/systemd/nm-sd.c create mode 100644 src/systemd/nm-sd.h create mode 100644 src/systemd/src/basic/ether-addr-util.c create mode 100644 src/systemd/src/basic/ether-addr-util.h create mode 100644 src/systemd/src/basic/socket-util.c delete mode 100644 src/systemd/src/libsystemd-network/lldp-internal.c create mode 100644 src/systemd/src/libsystemd-network/lldp-neighbor.c create mode 100644 src/systemd/src/libsystemd-network/lldp-neighbor.h delete mode 100644 src/systemd/src/libsystemd-network/lldp-port.c delete mode 100644 src/systemd/src/libsystemd-network/lldp-port.h delete mode 100644 src/systemd/src/libsystemd-network/lldp-tlv.c delete mode 100644 src/systemd/src/libsystemd-network/lldp-tlv.h create mode 100644 src/systemd/src/libsystemd/sd-event/sd-event.c delete mode 100644 tools/doc-generator.xsl diff --git a/NEWS b/NEWS index b86656c9..19afd6d0 100644 --- a/NEWS +++ b/NEWS @@ -50,9 +50,11 @@ This is a new stable release of NetworkManager. Notable changes include: addressing configuration based on systemd network library is now used instead. * Hostname is now managed via systemd-hostnamed on systemd-based systems. -* Management of resolv.conf management can be changed at runtime, private - resolv.conf is always written in /run. +* Management of resolv.conf can be changed at runtime, private resolv.conf + is always written in /run. * NetworkManager can now write DNS options to resolv.conf. +* Added an option to enable the old-fashioned /etc/resolv.conf handling + (using a symlink) * Updated version of systemd network library used for internal DHCP and IPv4 link-local support. * Support for event logging via audit subsystem has been added. @@ -80,9 +82,16 @@ This is a new stable release of NetworkManager. Notable changes include: * The reorder-header VLAN flag setting is now honored; to keep backwards compatibility in behavior, an existing REORDER_HDR=0 ifcfg-rh key is ignored; the flag must be disabled with VLAN_FLAGS=NO_REORDER_HDR. +* NetworkManager now checks the connection data from client for validity + and gracefully handles unknown properties in client. This improves + interoperability between the server and clients of different versions. +* The activation of a VLAN device with a virtual parent that is inactive + now results in a parent being activated first. +* The server name used with 802.1x authentication can now be constrained + to a particular domain suffix (CVE-2006-7246). * Fair amount of bugs was fixed and robustness was generally improved. -The following features were backported to 1.0.x releases from 1.0.0 to 1.0.8 +The following features were backported to 1.0.x releases from 1.0.0 to 1.0.10 are also present in NetworkManager-1.2: * Added support for handling VPN secrets to nmtui and nmcli agent. diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index f7f9e965..015bb070 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -313,6 +313,7 @@ construct_device_dhcp6_items (GSList *items, GVariant *dhcp6_config) tmp = g_variant_get_string (val, NULL); items = g_slist_prepend (items, g_strdup_printf ("DHCP6_%s=%s", ucased, tmp)); g_free (ucased); + g_variant_unref (val); } return items; } diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index de13bd0d..7ddffb04 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -549,8 +549,7 @@ script_dispatch (ScriptInfo *script) request->num_scripts_nowait++; return TRUE; } else { - _LOG_S_W (script, "complete: failed to execute script: %s (%d)", - error->message, error->code); + _LOG_S_W (script, "complete: failed to execute script: %s", error->message); script->result = DISPATCH_RESULT_EXEC_FAILED; script->error = g_strdup (error->message); request->num_scripts_done++; @@ -594,8 +593,8 @@ find_scripts (const char *str_action) dirname = NMD_SCRIPT_DIR_DEFAULT; if (!(dir = g_dir_open (dirname, 0, &error))) { - g_message ("find-scripts: Failed to open dispatcher directory '%s': (%d) %s", - dirname, error->code, error->message); + g_message ("find-scripts: Failed to open dispatcher directory '%s': %s", + dirname, error->message); g_error_free (error); return NULL; } diff --git a/callouts/nm-dispatcher.xml b/callouts/nm-dispatcher.xml index b2c4a21a..e2e89a89 100644 --- a/callouts/nm-dispatcher.xml +++ b/callouts/nm-dispatcher.xml @@ -5,87 +5,87 @@ - + - + - + - + - + - + - + - + - + - VPN interface name. + - + - + - + - + diff --git a/clients/cli/connections.c b/clients/cli/connections.c index d263154d..129a5298 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1641,13 +1641,13 @@ do_connections_show (NmCli *nmc, gboolean active_only, gboolean show_secrets, invisibles = get_invisible_active_connections (nmc); for (i = 0; i < invisibles->len; i++) fill_output_connection_for_invisible (invisibles->pdata[i], nmc); - g_ptr_array_free (invisibles, FALSE); + g_ptr_array_free (invisibles, TRUE); /* Sort the connections and fill the output data */ sorted_cons = sort_connections (nmc->connections, nmc, order); for (i = 0; i < sorted_cons->len; i++) fill_output_connection (sorted_cons->pdata[i], nmc, active_only); - g_ptr_array_free (sorted_cons, FALSE); + g_ptr_array_free (sorted_cons, TRUE); print_data (nmc); /* Print all data */ } else { @@ -2302,7 +2302,7 @@ nmc_activate_connection (NmCli *nmc, /* Virtual connection may not have their interfaces created yet */ if (!device_found && !nm_connection_is_virtual (connection)) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_CON_ACTIVATION, - "%s", local && local->message ? local->message : _("unknown error")); + "%s", local->message); g_clear_error (&local); return FALSE; } @@ -2450,8 +2450,8 @@ do_connection_up (NmCli *nmc, int argc, char **argv) if (!nmc_activate_connection (nmc, connection, ifname, ap, nsp, pwds, activate_connection_cb, &error)) { g_string_printf (nmc->return_text, _("Error: %s."), - error ? error->message : _("unknown error")); - nmc->return_value = error ? error->code : NMC_RESULT_ERROR_CON_ACTIVATION; + error->message); + nmc->return_value = error->code; g_clear_error (&error); nmc->should_wait--; goto error; @@ -2653,8 +2653,6 @@ typedef struct NameItem { static const NameItem nmc_generic_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2662,8 +2660,6 @@ static const NameItem nmc_ethernet_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, TRUE }, { NM_SETTING_802_1X_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NM_SETTING_DCB_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2671,8 +2667,6 @@ static const NameItem nmc_ethernet_settings [] = { static const NameItem nmc_infiniband_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_INFINIBAND_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2681,16 +2675,12 @@ static const NameItem nmc_wifi_settings [] = { { NM_SETTING_WIRELESS_SETTING_NAME, "wifi", NULL, TRUE }, { NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, "wifi-sec", NULL, FALSE }, { NM_SETTING_802_1X_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_wimax_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIMAX_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2699,8 +2689,6 @@ static const NameItem nmc_gsm_settings [] = { { NM_SETTING_GSM_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_SERIAL_SETTING_NAME, NULL, NULL, FALSE }, { NM_SETTING_PPP_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2709,24 +2697,18 @@ static const NameItem nmc_cdma_settings [] = { { NM_SETTING_CDMA_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_SERIAL_SETTING_NAME, NULL, NULL, FALSE }, { NM_SETTING_PPP_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_bluetooth_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_BLUETOOTH_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_adsl_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_ADSL_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2739,24 +2721,18 @@ static const NameItem nmc_pppoe_settings [] = { { NM_SETTING_PPPOE_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_PPP_SETTING_NAME, NULL, NULL, FALSE }, { NM_SETTING_802_1X_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_olpc_mesh_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_OLPC_MESH_SETTING_NAME, "olpc-mesh", NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_vpn_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_VPN_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2764,8 +2740,6 @@ static const NameItem nmc_vlan_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, { NM_SETTING_VLAN_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2773,8 +2747,6 @@ static const NameItem nmc_bond_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_BOND_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2782,8 +2754,6 @@ static const NameItem nmc_team_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_TEAM_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2791,31 +2761,26 @@ static const NameItem nmc_bridge_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_BRIDGE_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_bond_slave_settings [] = { - { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, TRUE }, - { NM_SETTING_802_1X_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_team_slave_settings [] = { - { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, TRUE }, { NM_SETTING_TEAM_PORT_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_802_1X_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_bridge_slave_settings [] = { - { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_BRIDGE_PORT_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, TRUE }, - { NM_SETTING_802_1X_SETTING_NAME, NULL, NULL, FALSE }, + { NULL, NULL, NULL, FALSE } +}; + +static const NameItem nmc_no_slave_settings [] = { + { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2823,16 +2788,12 @@ static const NameItem nmc_tun_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_TUN_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; static const NameItem nmc_ip_tunnel_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_IP_TUNNEL_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2840,8 +2801,6 @@ static const NameItem nmc_macvlan_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, { NM_SETTING_MACVLAN_SETTING_NAME, NULL, NULL, TRUE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2849,8 +2808,6 @@ static const NameItem nmc_vxlan_settings [] = { { NM_SETTING_CONNECTION_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_VXLAN_SETTING_NAME, NULL, NULL, TRUE }, { NM_SETTING_WIRED_SETTING_NAME, "ethernet", NULL, FALSE }, - { NM_SETTING_IP4_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, - { NM_SETTING_IP6_CONFIG_SETTING_NAME, NULL, NULL, FALSE }, { NULL, NULL, NULL, FALSE } }; @@ -2875,6 +2832,7 @@ static const NameItem nmc_valid_connection_types[] = { { "bond-slave", NULL, nmc_bond_slave_settings }, { "team-slave", NULL, nmc_team_slave_settings }, { "bridge-slave", NULL, nmc_bridge_slave_settings }, + { "no-slave", NULL, nmc_no_slave_settings }, { NM_SETTING_TUN_SETTING_NAME, NULL, nmc_tun_settings }, { NM_SETTING_IP_TUNNEL_SETTING_NAME, NULL, nmc_ip_tunnel_settings }, { NM_SETTING_MACVLAN_SETTING_NAME, NULL, nmc_macvlan_settings }, @@ -2907,32 +2865,53 @@ get_name_alias (const char *name, const NameItem array[]) } /* - * Construct a string with names and aliases from the array formatted as: + * Construct a string with names and aliases from the arrays formatted as: * "name (alias), name, name (alias), name, name" * * Returns: string; the caller is responsible for freeing it. */ static char * -get_valid_options_string (const NameItem array[]) +get_valid_options_string (const NameItem *array, const NameItem *array_slv) { - const NameItem *iter = &array[0]; + const NameItem *iter = array; GString *str; + int i; str = g_string_sized_new (150); - while (iter && iter->name) { - if (str->len) - g_string_append (str, ", "); - if (iter->alias) - g_string_append_printf (str, "%s (%s)", iter->name, iter->alias); - else - g_string_append (str, iter->name); - iter++; + + for (i = 0; i < 2; i++, iter = array_slv) { + while (iter && iter->name) { + if (str->len) + g_string_append (str, ", "); + if (iter->alias) + g_string_append_printf (str, "%s (%s)", iter->name, iter->alias); + else + g_string_append (str, iter->name); + iter++; + } } return g_string_free (str, FALSE); } +static const NameItem * +get_valid_settings_array (const char *con_type) +{ + guint i, num; + + if (!con_type) + return NULL; + + num = G_N_ELEMENTS (nmc_valid_connection_types); + for (i = 0; i < num; i++) { + if (nm_streq0 (con_type, nmc_valid_connection_types[i].name)) + return nmc_valid_connection_types[i].settings; + } + return NULL; +} + /* - * Check if 'val' is valid string in either array->name or array->alias. + * Check if 'val' is valid string in either array->name or array->alias for + * both array parameters (array & array_slv). * It accepts shorter string provided they are not ambiguous. * 'val' == NULL doesn't hurt. * @@ -2940,21 +2919,27 @@ get_valid_options_string (const NameItem array[]) * The returned string must not be freed. */ static const char * -check_valid_name (const char *val, const NameItem array[], GError **error) +check_valid_name (const char *val, const NameItem *array, const NameItem *array_slv, GError **error) { const NameItem *iter; - GPtrArray *tmp_arr; + gs_unref_ptrarray GPtrArray *tmp_arr = NULL; const char *str; GError *tmp_err = NULL; + int i; + + g_return_val_if_fail (val, NULL); + g_return_val_if_fail (array, NULL); /* Create a temporary array that can be used in nmc_string_is_valid() */ - tmp_arr = g_ptr_array_sized_new (30); - iter = &array[0]; - while (iter && iter->name) { - g_ptr_array_add (tmp_arr, (gpointer) iter->name); - if (iter->alias) - g_ptr_array_add (tmp_arr, (gpointer) iter->alias); - iter++; + tmp_arr = g_ptr_array_sized_new (32); + iter = array; + for (i = 0; i < 2; i++, iter = array_slv) { + while (iter && iter->name) { + g_ptr_array_add (tmp_arr, (gpointer) iter->name); + if (iter->alias) + g_ptr_array_add (tmp_arr, (gpointer) iter->alias); + iter++; + } } g_ptr_array_add (tmp_arr, (gpointer) NULL); @@ -2965,48 +2950,33 @@ check_valid_name (const char *val, const NameItem array[], GError **error) g_propagate_error (error, tmp_err); else { /* We want to handle aliases, so construct own error message */ - char *err_str = get_valid_options_string (array); + char *err_str = get_valid_options_string (array, array_slv); + g_set_error (error, 1, 0, _("'%s' not among [%s]"), - val ? val : "", err_str); + val, err_str); g_free (err_str); g_clear_error (&tmp_err); } - g_ptr_array_free (tmp_arr, TRUE); return NULL; } /* Return a pointer to the found string in passed 'array' */ - iter = &array[0]; - while (iter && iter->name) { - if ( (iter->name && g_strcmp0 (iter->name, str) == 0) - || (iter->alias && g_strcmp0 (iter->alias, str) == 0)) { - g_ptr_array_free (tmp_arr, TRUE); - return iter->name; + iter = array; + for (i = 0; i < 2; i++, iter = array_slv) { + while (iter && iter->name) { + if ( nm_streq (iter->name, str) + || nm_streq0 (iter->alias, str)) { + return iter->name; + } + iter++; } - iter++; } + /* We should not really come here */ - g_ptr_array_free (tmp_arr, TRUE); g_set_error (error, 1, 0, _("Unknown error")); return NULL; } -static const NameItem * -get_valid_settings_array (const char *con_type) -{ - guint i, num; - - if (!con_type) - return NULL; - - num = G_N_ELEMENTS (nmc_valid_connection_types); - for (i = 0; i < num; i++) { - if (!g_strcmp0 (con_type, nmc_valid_connection_types[i].name)) - return nmc_valid_connection_types[i].settings; - } - return NULL; -} - static gboolean is_setting_mandatory (NMConnection *connection, NMSetting *setting) { @@ -3014,6 +2984,8 @@ is_setting_mandatory (NMConnection *connection, NMSetting *setting) const char *c_type; const NameItem *item; const char *name; + const char *s_type; + char *slv_type; s_con = nm_connection_get_setting_connection (connection); g_assert (s_con); @@ -3027,6 +2999,18 @@ is_setting_mandatory (NMConnection *connection, NMSetting *setting) return item->mandatory; item++; } + + /* Let's give a try to parameters related to slave type */ + s_type = nm_setting_connection_get_slave_type (s_con); + slv_type = g_strdup_printf ("%s-slave", s_type ? s_type : "no"); + item = get_valid_settings_array (slv_type); + g_free (slv_type); + while (item && item->name) { + if (!strcmp (name, item->name)) + return item->mandatory; + item++; + } + return FALSE; } @@ -4482,11 +4466,11 @@ do_questionnaire_ip (NMConnection *connection) } static NMSetting * -is_setting_valid (NMConnection *connection, const NameItem *valid_settings, char *setting) +is_setting_valid (NMConnection *connection, const NameItem *valid_settings_main, const NameItem *valid_settings_slave, char *setting) { const char *setting_name; - if (!(setting_name = check_valid_name (setting, valid_settings, NULL))) + if (!(setting_name = check_valid_name (setting, valid_settings_main, valid_settings_slave, NULL))) return NULL; return nm_connection_get_setting_by_name (connection, setting_name); } @@ -4639,6 +4623,7 @@ read_connection_properties (NMConnection *connection, const char *s_dot_p; const char *value; char **strv = NULL; + char *slv_type = NULL; const char *setting_name; gboolean append = FALSE; gboolean remove = FALSE; @@ -4647,6 +4632,16 @@ read_connection_properties (NMConnection *connection, s_con = nm_connection_get_setting_connection (connection); g_assert (s_con); + + /* First check if we have a slave-type, as this would mean we will not + * have ip properties but possibly others, slave-type specific. + */ + con_type = nm_setting_connection_get_slave_type (s_con); + if (!con_type) + con_type = "no"; + + slv_type = g_strdup_printf ("%s-slave", con_type); + con_type = nm_setting_connection_get_connection_type (s_con); /* Go through arguments and set properties */ @@ -4687,7 +4682,8 @@ read_connection_properties (NMConnection *connection, goto finish; } - setting_name = check_valid_name (strv[0], get_valid_settings_array (con_type), &local); + setting_name = check_valid_name (strv[0], get_valid_settings_array (con_type), + get_valid_settings_array (slv_type), &local); if (!setting_name) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("Error: invalid or not allowed setting '%s': %s."), @@ -4759,6 +4755,7 @@ read_connection_properties (NMConnection *connection, finish: if (strv) g_strfreev (strv); + g_free (slv_type); return success; } @@ -4802,6 +4799,7 @@ complete_slave (NMSettingConnection *s_con, /* Change properties in 'connection' setting */ g_object_set (s_con, NM_SETTING_CONNECTION_MASTER, checked_master, + NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, NULL); g_free (master_ask); @@ -4842,7 +4840,6 @@ complete_connection_by_type (NMConnection *connection, NMSettingIPTunnel *s_ip_tunnel; NMSettingMacvlan *s_macvlan; NMSettingVxlan *s_vxlan; - const char *slave_type; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -5545,12 +5542,24 @@ cleanup_bond: return FALSE; } else if (!strcmp (con_type, "bond-slave")) { + /* Slave types without any specific settings ('bond-slave') */ + const char *master = NULL; + const char *type = NULL; + nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, + {"type", TRUE, &type, FALSE}, + {NULL} }; + + /* Set global variables for use in TAB completion */ + nmc_tab_completion.con_type = NM_SETTING_BOND_SETTING_NAME; + + if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) + return FALSE; + + if (!complete_slave (s_con, all_connections, NM_SETTING_BOND_SETTING_NAME, master, type, ask, error)) + return FALSE; /* Change properties in 'connection' setting */ - g_object_set (s_con, - NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BOND_SETTING_NAME, - NULL); + g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, NULL); /* Add ethernet setting */ s_wired = (NMSettingWired *) nm_setting_wired_new (); @@ -5605,12 +5614,55 @@ cleanup_team: return FALSE; } else if (!strcmp (con_type, "team-slave")) { + /* Build up the settings required for 'team-slave' */ + gboolean success = FALSE; + const char *master = NULL; + char *master_ask = NULL; + const char *type = NULL; + const char *config_c = NULL; + char *config = NULL; + char *json = NULL; + nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, + {"type", TRUE, &type, FALSE}, + {"config", TRUE, &config_c, FALSE}, + {NULL} }; + + /* Set global variables for use in TAB completion */ + nmc_tab_completion.con_type = NM_SETTING_TEAM_SETTING_NAME; + + if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) + return FALSE; + + if (!complete_slave (s_con, all_connections, NM_SETTING_TEAM_SETTING_NAME, master, type, ask, error)) + return FALSE; + + /* Also ask for all optional arguments if '--ask' is specified. */ + config = g_strdup (config_c); + if (ask) + do_questionnaire_team_slave (&config); + + /* Add 'team-port' setting */ + s_team_port = (NMSettingTeamPort *) nm_setting_team_port_new (); + nm_connection_add_setting (connection, NM_SETTING (s_team_port)); + + if (!nmc_team_check_config (config, &json, error)) { + g_prefix_error (error, _("Error: ")); + goto cleanup_team_slave; + } + + /* Set team-port options */ + g_object_set (s_team_port, NM_SETTING_TEAM_PORT_CONFIG, json, NULL); + + success = TRUE; +cleanup_team_slave: + g_free (master_ask); + g_free (config); + g_free (json); + if (!success) + return FALSE; /* Change properties in 'connection' setting */ - g_object_set (s_con, - NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_TEAM_SETTING_NAME, - NULL); + g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, NULL); /* Add ethernet setting */ s_wired = (NMSettingWired *) nm_setting_wired_new (); @@ -5755,12 +5807,83 @@ cleanup_bridge: return FALSE; } else if (!strcmp (con_type, "bridge-slave")) { + /* Build up the settings required for 'bridge-slave' */ + gboolean success = FALSE; + const char *master = NULL; + char *master_ask = NULL; + const char *type = NULL; + const char *priority_c = NULL; + char *priority = NULL; + const char *path_cost_c = NULL; + char *path_cost = NULL; + const char *hairpin_c = NULL; + char *hairpin = NULL; + unsigned long prio_int, path_cost_int; + gboolean hairpin_bool; + nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, + {"type", TRUE, &type, FALSE}, + {"priority", TRUE, &priority_c, FALSE}, + {"path-cost", TRUE, &path_cost_c, FALSE}, + {"hairpin", TRUE, &hairpin_c, FALSE}, + {NULL} }; + + /* Set global variables for use in TAB completion */ + nmc_tab_completion.con_type = NM_SETTING_BRIDGE_SETTING_NAME; + + if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) + return FALSE; + + if (!complete_slave (s_con, all_connections, NM_SETTING_BRIDGE_SETTING_NAME, master, type, ask, error)) + return FALSE; + + /* Add 'bridge-port' setting */ + /* Must be done *before* bridge_prop_string_to_uint() so that the type is known */ + s_bridge_port = (NMSettingBridgePort *) nm_setting_bridge_port_new (); + nm_connection_add_setting (connection, NM_SETTING (s_bridge_port)); + + /* Also ask for all optional arguments if '--ask' is specified. */ + priority = g_strdup (priority_c); + path_cost = g_strdup (path_cost_c); + hairpin = g_strdup (hairpin_c); + if (ask) + do_questionnaire_bridge_slave (&priority, &path_cost, &hairpin); + + if (priority) + if (!bridge_prop_string_to_uint (priority, "priority", NM_TYPE_SETTING_BRIDGE_PORT, + NM_SETTING_BRIDGE_PORT_PRIORITY, &prio_int, error)) + goto cleanup_bridge_slave; + if (path_cost) + if (!bridge_prop_string_to_uint (path_cost, "path-cost", NM_TYPE_SETTING_BRIDGE_PORT, + NM_SETTING_BRIDGE_PORT_PATH_COST, &path_cost_int, error)) + goto cleanup_bridge_slave; + if (hairpin) { + GError *tmp_err = NULL; + if (!nmc_string_to_bool (hairpin, &hairpin_bool, &tmp_err)) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: 'hairpin': %s."), tmp_err->message); + g_clear_error (&tmp_err); + goto cleanup_bridge_slave; + } + } + + if (priority) + g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_PRIORITY, prio_int, NULL); + if (path_cost) + g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_PATH_COST, path_cost_int, NULL); + if (hairpin) + g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, hairpin_bool, NULL); + + success = TRUE; +cleanup_bridge_slave: + g_free (master_ask); + g_free (priority); + g_free (path_cost); + g_free (hairpin); + if (!success) + return FALSE; /* Change properties in 'connection' setting */ - g_object_set (s_con, - NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_CONNECTION_SLAVE_TYPE, NM_SETTING_BRIDGE_SETTING_NAME, - NULL); + g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, NULL); /* Add ethernet setting */ s_wired = (NMSettingWired *) nm_setting_wired_new (); @@ -6064,7 +6187,7 @@ cleanup_macvlan: {"pi", TRUE, &pi_c, FALSE}, {"vnet-hdr", TRUE, &vnet_hdr_c, FALSE}, {"multi-queue", TRUE, &multi_queue_c, FALSE}, - {NULL} }; + {NULL} }; if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) return FALSE; @@ -6416,145 +6539,7 @@ cleanup_vxlan: return FALSE; } - slave_type = nm_setting_connection_get_slave_type (s_con); - if (slave_type) { - - /* Set global variables for use in TAB completion */ - nmc_tab_completion.con_type = (char *)slave_type; - - if (!strcmp (slave_type, NM_SETTING_TEAM_SETTING_NAME)) { - /* Build up the settings required for 'team-slave' */ - gboolean success = FALSE; - const char *master = NULL; - char *master_ask = NULL; - const char *type = NULL; - const char *config_c = NULL; - char *config = NULL; - char *json = NULL; - nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, - {"type", TRUE, &type, FALSE}, - {"config", TRUE, &config_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!complete_slave (s_con, all_connections, slave_type, master, type, ask, error)) - return FALSE; - - /* Also ask for all optional arguments if '--ask' is specified. */ - config = g_strdup (config_c); - if (ask) - do_questionnaire_team_slave (&config); - - /* Add 'team-port' setting */ - s_team_port = (NMSettingTeamPort *) nm_setting_team_port_new (); - nm_connection_add_setting (connection, NM_SETTING (s_team_port)); - - if (!nmc_team_check_config (config, &json, error)) { - g_prefix_error (error, _("Error: ")); - goto cleanup_team_slave; - } - - /* Set team-port options */ - g_object_set (s_team_port, NM_SETTING_TEAM_PORT_CONFIG, json, NULL); - - success = TRUE; -cleanup_team_slave: - g_free (master_ask); - g_free (config); - g_free (json); - if (!success) - return FALSE; - - } else if (!strcmp (slave_type, NM_SETTING_BRIDGE_SETTING_NAME)) { - /* Build up the settings required for 'bridge-slave' */ - gboolean success = FALSE; - const char *master = NULL; - char *master_ask = NULL; - const char *type = NULL; - const char *priority_c = NULL; - char *priority = NULL; - const char *path_cost_c = NULL; - char *path_cost = NULL; - const char *hairpin_c = NULL; - char *hairpin = NULL; - unsigned long prio_int, path_cost_int; - gboolean hairpin_bool; - nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, - {"type", TRUE, &type, FALSE}, - {"priority", TRUE, &priority_c, FALSE}, - {"path-cost", TRUE, &path_cost_c, FALSE}, - {"hairpin", TRUE, &hairpin_c, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!complete_slave (s_con, all_connections, slave_type, master, type, ask, error)) - return FALSE; - - /* Add 'bridge-port' setting */ - /* Must be done *before* bridge_prop_string_to_uint() so that the type is known */ - s_bridge_port = (NMSettingBridgePort *) nm_setting_bridge_port_new (); - nm_connection_add_setting (connection, NM_SETTING (s_bridge_port)); - - /* Also ask for all optional arguments if '--ask' is specified. */ - priority = g_strdup (priority_c); - path_cost = g_strdup (path_cost_c); - hairpin = g_strdup (hairpin_c); - if (ask) - do_questionnaire_bridge_slave (&priority, &path_cost, &hairpin); - - if (priority) - if (!bridge_prop_string_to_uint (priority, "priority", NM_TYPE_SETTING_BRIDGE_PORT, - NM_SETTING_BRIDGE_PORT_PRIORITY, &prio_int, error)) - goto cleanup_bridge_slave; - if (path_cost) - if (!bridge_prop_string_to_uint (path_cost, "path-cost", NM_TYPE_SETTING_BRIDGE_PORT, - NM_SETTING_BRIDGE_PORT_PATH_COST, &path_cost_int, error)) - goto cleanup_bridge_slave; - if (hairpin) { - GError *tmp_err = NULL; - if (!nmc_string_to_bool (hairpin, &hairpin_bool, &tmp_err)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: 'hairpin': %s."), tmp_err->message); - g_clear_error (&tmp_err); - goto cleanup_bridge_slave; - } - } - - if (priority) - g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_PRIORITY, prio_int, NULL); - if (path_cost) - g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_PATH_COST, path_cost_int, NULL); - if (hairpin) - g_object_set (s_bridge_port, NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, hairpin_bool, NULL); - - success = TRUE; -cleanup_bridge_slave: - g_free (master_ask); - g_free (priority); - g_free (path_cost); - g_free (hairpin); - if (!success) - return FALSE; - } else { - /* Slave types without any specific settings ('bond-slave') */ - const char *master = NULL; - const char *type = NULL; - nmc_arg_t exp_args[] = { {"master", TRUE, &master, FALSE}, - {"type", TRUE, &type, FALSE}, - {NULL} }; - - if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) - return FALSE; - - if (!complete_slave (s_con, all_connections, slave_type, master, type, ask, error)) - return FALSE; - } - - } else { + if (!nm_setting_connection_get_slave_type (s_con)) { /* Read and add IP configuration */ NMIPAddress *ip4addr = NULL, *ip6addr = NULL; const char *ip4 = NULL, *gw4 = NULL, *ip6 = NULL, *gw6 = NULL; @@ -6649,7 +6634,7 @@ cleanup_bridge_slave: if (argc) { /* Set extra connection properties. */ nmc_arg_t exp_args[] = { {"--", FALSE, NULL, TRUE}, - {NULL} }; + {NULL} }; if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) return FALSE; @@ -6954,7 +6939,7 @@ do_connection_add (NmCli *nmc, int argc, char **argv) } if (!type && nmc->ask) { - char *types_tmp = get_valid_options_string (nmc_valid_connection_types); + char *types_tmp = get_valid_options_string (nmc_valid_connection_types, NULL); g_print ("Valid types: [%s]\n", types_tmp); type = type_ask = nmc_readline (PROMPT_CON_TYPE); g_free (types_tmp); @@ -6967,7 +6952,7 @@ do_connection_add (NmCli *nmc, int argc, char **argv) if (type_ask) type = g_strstrip (type_ask); - if (!(setting_name = check_valid_name (type, nmc_valid_connection_types, &error))) { + if (!(setting_name = check_valid_name (type, nmc_valid_connection_types, NULL, &error))) { g_string_printf (nmc->return_text, _("Error: invalid connection type; %s."), error->message); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -7250,18 +7235,48 @@ gen_connection_types (const char *text, int state) static char * gen_setting_names (const char *text, int state) { - static int list_idx, len; + static int list_idx, len, is_slv; const char *s_name, *a_name; const NameItem *valid_settings_arr; + NMSettingConnection *s_con; + const char *s_type = NULL; + char *slv_type; if (!state) { list_idx = 0; len = strlen (text); + is_slv = 0; } - valid_settings_arr = get_valid_settings_array (nmc_tab_completion.con_type); - if (!valid_settings_arr) - return NULL; + if (!is_slv) { + valid_settings_arr = get_valid_settings_array (nmc_tab_completion.con_type); + if (!valid_settings_arr) + return NULL; + while (valid_settings_arr[list_idx].name) { + a_name = valid_settings_arr[list_idx].alias; + s_name = valid_settings_arr[list_idx].name; + list_idx++; + if (len == 0 && a_name) + return g_strdup_printf ("%s (%s)", s_name, a_name); + if (a_name && !strncmp (text, a_name, len)) + return g_strdup (a_name); + if (s_name && !strncmp (text, s_name, len)) + return g_strdup (s_name); + } + + /* Let's give a try to parameters related to slave type */ + list_idx = 0; + is_slv = 1; + } + + /* is_slv */ + s_con = nm_connection_get_setting_connection (nmc_tab_completion.connection); + if (s_con) + s_type = nm_setting_connection_get_slave_type (s_con); + slv_type = g_strdup_printf ("%s-slave", s_type ? s_type : "no"); + valid_settings_arr = get_valid_settings_array (slv_type); + g_free (slv_type); + while (valid_settings_arr[list_idx].name) { a_name = valid_settings_arr[list_idx].alias; s_name = valid_settings_arr[list_idx].name; @@ -7273,6 +7288,7 @@ gen_setting_names (const char *text, int state) if (s_name && !strncmp (text, s_name, len)) return g_strdup (s_name); } + return NULL; } @@ -7285,8 +7301,10 @@ gen_property_names (const char *text, int state) const char *line = rl_line_buffer; const char *setting_name; char **strv = NULL; - const NameItem *valid_settings_arr; + const NameItem *valid_settings_main; + const NameItem *valid_settings_slave; const char *p1; + const char *slv_type; /* Try to get the setting from 'line' - setting_name.property */ p1 = strchr (line, '.'); @@ -7296,8 +7314,23 @@ gen_property_names (const char *text, int state) strv = g_strsplit (p1+1, ".", 2); - valid_settings_arr = get_valid_settings_array (nmc_tab_completion.con_type); - setting_name = check_valid_name (strv[0], valid_settings_arr, NULL); + valid_settings_main = get_valid_settings_array (nmc_tab_completion.con_type); + + /* Support autocompletion of slave-connection parameters + * guessing the slave type from the setting name already + * typed (or autocompleted) */ + if (nm_streq0 (strv[0], NM_SETTING_TEAM_PORT_SETTING_NAME)) + slv_type = "team-slave"; + else if (nm_streq0 (strv[0], NM_SETTING_BRIDGE_PORT_SETTING_NAME)) + slv_type = "bridge-slave"; + else + slv_type = "no-slave"; + valid_settings_slave = get_valid_settings_array (slv_type); + + setting_name = check_valid_name (strv[0], + valid_settings_main, + valid_settings_slave, + NULL); setting = nmc_setting_new_for_name (setting_name); } else { /* Else take the current setting, if any */ @@ -7575,16 +7608,30 @@ static void get_setting_and_property (const char *prompt, const char *line, NMSetting **setting_out, char**property_out) { - const NameItem *valid_settings_arr; + const NameItem *valid_settings_main; + const NameItem *valid_settings_slave; const char *setting_name; NMSetting *setting = NULL; char *property = NULL; char *sett = NULL, *prop = NULL; + NMSettingConnection *s_con; + const char *s_type = NULL; + char *slv_type; extract_setting_and_property (prompt, line, &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); + /* Is this too much (and useless?) effort for an unlikely case? */ + s_con = nm_connection_get_setting_connection (nmc_tab_completion.connection); + if (s_con) + s_type = nm_setting_connection_get_slave_type (s_con); + slv_type = g_strdup_printf ("%s-slave", s_type ? s_type : "no"); + + valid_settings_main = get_valid_settings_array (nmc_tab_completion.con_type); + valid_settings_slave = get_valid_settings_array (slv_type); + g_free (slv_type); + + setting_name = check_valid_name (sett, valid_settings_main, + valid_settings_slave, NULL); setting = nmc_setting_new_for_name (setting_name); } else setting = nmc_tab_completion.setting ? g_object_ref (nmc_tab_completion.setting) : NULL; @@ -7898,7 +7945,7 @@ load_history_cmds (const char *uuid) filename = g_build_filename (g_get_home_dir (), NMCLI_EDITOR_HISTORY, NULL); kf = g_key_file_new (); if (!g_key_file_load_from_file (kf, filename, G_KEY_FILE_KEEP_COMMENTS, &err)) { - if (err->code == G_KEY_FILE_ERROR_PARSE) + if (g_error_matches (err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_PARSE)) g_print ("Warning: %s parse error: %s\n", filename, err->message); g_key_file_free (kf); g_free (filename); @@ -7933,8 +7980,8 @@ save_history_cmds (const char *uuid) filename = g_build_filename (g_get_home_dir (), NMCLI_EDITOR_HISTORY, NULL); kf = g_key_file_new (); if (!g_key_file_load_from_file (kf, filename, G_KEY_FILE_KEEP_COMMENTS, &err)) { - if ( err->code != G_FILE_ERROR_NOENT - && err->code != G_KEY_FILE_ERROR_NOT_FOUND) { + if ( !g_error_matches (err, G_FILE_ERROR, G_FILE_ERROR_NOENT) + && !g_error_matches (err, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_NOT_FOUND)) { g_print ("Warning: %s parse error: %s\n", filename, err->message); g_key_file_free (kf); g_free (filename); @@ -8786,13 +8833,13 @@ split_editor_main_cmd_args (const char *str, char **setting, char **property, ch } static NMSetting * -create_setting_by_name (const char *name, const NameItem *valid_settings) +create_setting_by_name (const char *name, const NameItem *valid_settings_main, const NameItem *valid_settings_slave) { const char *setting_name; NMSetting *setting = NULL; /* Get a valid setting name */ - setting_name = check_valid_name (name, valid_settings, NULL); + setting_name = check_valid_name (name, valid_settings_main, valid_settings_slave, NULL); if (setting_name) { setting = nmc_setting_new_for_name (setting_name); @@ -8805,7 +8852,8 @@ create_setting_by_name (const char *name, const NameItem *valid_settings) static const char * ask_check_setting (const char *arg, - const NameItem *valid_settings_arr, + const NameItem *valid_settings_main, + const NameItem *valid_settings_slave, const char *valid_settings_str) { char *setting_name_user; @@ -8821,7 +8869,10 @@ ask_check_setting (const char *arg, if (setting_name_user) g_strstrip (setting_name_user); - if (!(setting_name = check_valid_name (setting_name_user, valid_settings_arr, &err))) { + if (!(setting_name = check_valid_name (setting_name_user, + valid_settings_main, + valid_settings_slave, + &err))) { g_print (_("Error: invalid setting name; %s\n"), err->message); g_clear_error (&err); } @@ -8946,6 +8997,7 @@ menu_switch_to_level1 (NmCli *nmc, static gboolean editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_type) { + NMSettingConnection *s_con; NMRemoteConnection *rem_con; NMRemoteConnection *con_tmp; GWeakRef weak = { { NULL } }; @@ -8956,16 +9008,27 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t char *cmd_arg = NULL; char *cmd_arg_s, *cmd_arg_p, *cmd_arg_v; const char *BASE_PROMPT = "nmcli> "; - const NameItem *valid_settings_arr = NULL; + const NameItem *valid_settings_main = NULL; + const NameItem *valid_settings_slave = NULL; char *valid_settings_str = NULL; + const char *s_type = NULL; + char *slv_type; AddConnectionInfo *info = NULL; gboolean dirty; gboolean temp_changes; GError *err1 = NULL; NmcEditorMenuContext menu_ctx; - valid_settings_arr = get_valid_settings_array (connection_type); - valid_settings_str = get_valid_options_string (valid_settings_arr); + s_con = nm_connection_get_setting_connection (connection); + if (s_con) + s_type = nm_setting_connection_get_slave_type (s_con); + slv_type = g_strdup_printf ("%s-slave", s_type ? s_type : "no"); + + valid_settings_main = get_valid_settings_array (connection_type); + valid_settings_slave = get_valid_settings_array (slv_type); + g_free (slv_type); + + valid_settings_str = get_valid_options_string (valid_settings_main, valid_settings_slave); g_print (_("You may edit the following settings: %s\n"), valid_settings_str); menu_ctx.level = 0; @@ -9047,9 +9110,9 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t if (cmd_arg_s) { /* setting provided as "setting.property" */ - ss = is_setting_valid (connection, valid_settings_arr, cmd_arg_s); + ss = is_setting_valid (connection, valid_settings_main, valid_settings_slave, cmd_arg_s); if (!ss) { - ss = create_setting_by_name (cmd_arg_s, valid_settings_arr); + ss = create_setting_by_name (cmd_arg_s, valid_settings_main, valid_settings_slave); if (!ss) { g_print (_("Error: invalid setting argument '%s'; valid are [%s]\n"), cmd_arg_s, valid_settings_str); @@ -9110,7 +9173,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t NMSetting *setting; const char *user_arg = cmd_arg_s ? cmd_arg_s : cmd_arg_p; - setting_name = ask_check_setting (user_arg, valid_settings_arr, valid_settings_str); + setting_name = ask_check_setting (user_arg, + valid_settings_main, + valid_settings_slave, + valid_settings_str); if (!setting_name) break; @@ -9185,10 +9251,17 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t descr_all = !cmd_arg_s && !menu_ctx.curr_setting; user_s = descr_all ? cmd_arg_p : cmd_arg_s ? cmd_arg_s : NULL; if (user_s) { - ss = is_setting_valid (connection, valid_settings_arr, user_s); + ss = is_setting_valid (connection, + valid_settings_main, + valid_settings_slave, + user_s); if (!ss) { - if (check_valid_name (user_s, valid_settings_arr, NULL)) - g_print (_("Setting '%s' is not present in the connection.\n"), user_s); + if (check_valid_name (user_s, + valid_settings_main, + valid_settings_slave, + NULL)) + g_print (_("Setting '%s' is not present in the connection.\n"), + user_s); else g_print (_("Error: invalid setting argument '%s'; valid are [%s]\n"), user_s, valid_settings_str); @@ -9218,7 +9291,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t } else { /* If the string is not a property, try it as a setting */ NMSetting *s_tmp; - s_tmp = is_setting_valid (connection, valid_settings_arr, cmd_arg_p); + s_tmp = is_setting_valid (connection, + valid_settings_main, + valid_settings_slave, + cmd_arg_p); if (s_tmp) { /* Remove setting from the connection */ connection_remove_setting (connection, s_tmp); @@ -9266,9 +9342,14 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t descr_all = !cmd_arg_s && !menu_ctx.curr_setting; user_s = descr_all ? cmd_arg_p : cmd_arg_s ? cmd_arg_s : NULL; if (user_s) { - ss = is_setting_valid (connection, valid_settings_arr, user_s); + ss = is_setting_valid (connection, + valid_settings_main, + valid_settings_slave, + user_s); if (!ss) { - ss = create_setting_by_name (user_s, valid_settings_arr); + ss = create_setting_by_name (user_s, + valid_settings_main, + valid_settings_slave); if (!ss) { g_print (_("Error: invalid setting argument '%s'; valid are [%s]\n"), user_s, valid_settings_str); @@ -9291,7 +9372,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t } else { /* If the string is not a property, try it as a setting */ NMSetting *s_tmp; - s_tmp = is_setting_valid (connection, valid_settings_arr, cmd_arg_p); + s_tmp = is_setting_valid (connection, + valid_settings_main, + valid_settings_slave, + cmd_arg_p); if (s_tmp) print_setting_description (s_tmp); else @@ -9322,7 +9406,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t user_s = whole_setting ? cmd_arg_p : cmd_arg_s ? cmd_arg_s : NULL; if (user_s) { const char *s_name; - s_name = check_valid_name (user_s, valid_settings_arr, NULL); + s_name = check_valid_name (user_s, + valid_settings_main, + valid_settings_slave, + NULL); if (!s_name) { g_print (_("Error: unknown setting: '%s'\n"), user_s); break; @@ -9349,7 +9436,10 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t } else { /* If the string is not a property, try it as a setting */ NMSetting *s_tmp; - s_tmp = is_setting_valid (connection, valid_settings_arr, cmd_arg_p); + s_tmp = is_setting_valid (connection, + valid_settings_main, + valid_settings_slave, + cmd_arg_p); if (s_tmp) { /* Print the whole setting */ editor_show_setting (s_tmp, nmc); @@ -9928,8 +10018,8 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) editor_init_existing_connection (connection); } else { /* New connection */ - connection_type = check_valid_name (type, nmc_valid_connection_types, &err1); - tmp_str = get_valid_options_string (nmc_valid_connection_types); + connection_type = check_valid_name (type, nmc_valid_connection_types, NULL, &err1); + tmp_str = get_valid_options_string (nmc_valid_connection_types, NULL); while (!connection_type) { if (!type) @@ -9940,7 +10030,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) type_ask = nmc_readline (EDITOR_PROMPT_CON_TYPE); type = type_ask = type_ask ? g_strstrip (type_ask) : NULL; - connection_type = check_valid_name (type_ask, nmc_valid_connection_types, &err1); + connection_type = check_valid_name (type_ask, nmc_valid_connection_types, NULL, &err1); g_free (type_ask); } g_free (tmp_str); @@ -10724,7 +10814,7 @@ do_connection_export (NmCli *nmc, int argc, char **argv) if (!nm_vpn_editor_plugin_export (plugin, path, connection, &error)) { g_string_printf (nmc->return_text, _("Error: failed to export '%s': %s."), - nm_connection_get_id (connection), error ? error->message : "(unknown)"); + nm_connection_get_id (connection), error->message); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; goto finish; } @@ -11021,8 +11111,6 @@ do_connections (NmCli *nmc, int argc, char **argv) g_thread_unref (editor_thread); } else if (matches(*argv, "delete") == 0) { nmc->return_value = do_connection_delete (nmc, argc-1, argv+1); - } else if (matches(*argv, "monitor") == 0) { - nmc->return_value = do_connection_monitor (nmc, argc-1, argv+1); } else if (matches(*argv, "reload") == 0) { nmc->return_value = do_connection_reload (nmc, argc-1, argv+1); } else if (matches(*argv, "load") == 0) { @@ -11056,6 +11144,8 @@ do_connections (NmCli *nmc, int argc, char **argv) nmc->return_value = do_connection_import (nmc, temporary, argc, argv); } else if (matches(*argv, "export") == 0) { nmc->return_value = do_connection_export (nmc, argc-1, argv+1); + } else if (matches(*argv, "monitor") == 0) { + nmc->return_value = do_connection_monitor (nmc, argc-1, argv+1); } else { usage (); g_string_printf (nmc->return_text, _("Error: '%s' is not valid 'connection' command."), *argv); diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index f8c0298e..7f79180f 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -1325,7 +1325,7 @@ _nmcli() ;; de|del|dele|delet|delete| \ - m|mo|mon|moni|monit|monito|monitor) + mon|moni|monit|monito|monitor) if [[ ${#words[@]} -eq 3 ]]; then _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" elif [[ ${#words[@]} -gt 3 ]]; then diff --git a/clients/cli/settings-docs.c b/clients/cli/settings-docs.c index 10db2328..0f882c9b 100644 --- a/clients/cli/settings-docs.c +++ b/clients/cli/settings-docs.c @@ -58,6 +58,7 @@ NmcPropertyDesc setting_802_1x[] = { { "ca-cert", "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." }, { "ca-path", "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." }, { "client-cert", "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." }, + { "domain-suffix-match", "Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server. If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison." }, { "eap", "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." }, { "identity", "Identity string for EAP authentication methods. Often the user's user or login name." }, { "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\"." }, @@ -75,16 +76,17 @@ NmcPropertyDesc setting_802_1x[] = { { "phase2-ca-cert", "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." }, { "phase2-ca-path", "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." }, { "phase2-client-cert", "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." }, + { "phase2-domain-suffix-match", "Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner \"phase 2\" authentication. If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison." }, { "phase2-private-key", "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." }, { "phase2-private-key-password", "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." }, { "phase2-private-key-password-flags", "Flags indicating how to handle the \"phase2-private-key-password\" property." }, - { "phase2-subject-match", "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." }, + { "phase2-subject-match", "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. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match." }, { "pin", "PIN used for EAP authentication methods." }, { "pin-flags", "Flags indicating how to handle the \"pin\" property." }, { "private-key", "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. 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." }, { "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." }, + { "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. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match." }, { "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)." }, }; @@ -254,7 +256,7 @@ NmcPropertyDesc setting_ipv4[] = { { "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." }, { "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." }, + { "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. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen." }, { "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\"." }, { "never-default", "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." }, { "route-metric", "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." }, @@ -276,7 +278,7 @@ NmcPropertyDesc setting_ipv6[] = { { "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: -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\". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the \"addr-gen-mode\" property's \"stable-privacy\" setting as another way of avoiding host tracking with IPv6 addresses." }, { "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." }, + { "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. For IPv4 method \"shared\", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen." }, { "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\"." }, { "never-default", "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." }, { "route-metric", "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." }, @@ -407,7 +409,7 @@ NmcSettingDesc all_settings[] = { { "802-11-olpc-mesh", setting_802_11_olpc_mesh, 4 }, { "802-11-wireless", setting_802_11_wireless, 16 }, { "802-11-wireless-security", setting_802_11_wireless_security, 18 }, - { "802-1x", setting_802_1x, 33 }, + { "802-1x", setting_802_1x, 35 }, { "802-3-ethernet", setting_802_3_ethernet, 14 }, { "adsl", setting_adsl, 8 }, { "bluetooth", setting_bluetooth, 3 }, diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 9e0cf08e..3fb841a1 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -123,30 +123,32 @@ NmcOutputField nmc_fields_setting_8021X[] = { SETTING_FIELD (NM_SETTING_802_1X_CA_PATH), /* 6 */ SETTING_FIELD (NM_SETTING_802_1X_SUBJECT_MATCH), /* 7 */ SETTING_FIELD (NM_SETTING_802_1X_ALTSUBJECT_MATCHES), /* 8 */ - SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT), /* 9 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER), /* 10 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL), /* 11 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING), /* 12 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH), /* 13 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP), /* 14 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT), /* 15 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH), /* 16 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH), /* 17 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES), /* 18 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT), /* 19 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD), /* 20 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_FLAGS), /* 21 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW), /* 22 */ - SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS), /* 23 */ - SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY), /* 24 */ - SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), /* 25 */ - SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS), /* 26 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY), /* 27 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), /* 28 */ - SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), /* 29 */ - SETTING_FIELD (NM_SETTING_802_1X_PIN), /* 30 */ - SETTING_FIELD (NM_SETTING_802_1X_PIN_FLAGS), /* 31 */ - SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS), /* 32 */ + SETTING_FIELD (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH), /* 9 */ + SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT), /* 10 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER), /* 11 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL), /* 12 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING), /* 13 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH), /* 14 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP), /* 15 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT), /* 16 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH), /* 17 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH), /* 18 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES), /* 19 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH), /* 20 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT), /* 21 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD), /* 22 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_FLAGS), /* 23 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW), /* 24 */ + SETTING_FIELD (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS), /* 25 */ + SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY), /* 26 */ + SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), /* 27 */ + SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS), /* 28 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY), /* 29 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), /* 30 */ + SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), /* 31 */ + SETTING_FIELD (NM_SETTING_802_1X_PIN), /* 32 */ + SETTING_FIELD (NM_SETTING_802_1X_PIN_FLAGS), /* 33 */ + SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS), /* 34 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_802_1X_ALL "name"","\ @@ -158,6 +160,7 @@ NmcOutputField nmc_fields_setting_8021X[] = { NM_SETTING_802_1X_CA_PATH","\ NM_SETTING_802_1X_SUBJECT_MATCH","\ NM_SETTING_802_1X_ALTSUBJECT_MATCHES","\ + NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH","\ NM_SETTING_802_1X_CLIENT_CERT","\ NM_SETTING_802_1X_PHASE1_PEAPVER","\ NM_SETTING_802_1X_PHASE1_PEAPLABEL","\ @@ -168,6 +171,7 @@ NmcOutputField nmc_fields_setting_8021X[] = { NM_SETTING_802_1X_PHASE2_CA_PATH","\ NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH","\ NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES","\ + NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH","\ NM_SETTING_802_1X_PHASE2_CLIENT_CERT","\ NM_SETTING_802_1X_PASSWORD","\ NM_SETTING_802_1X_PASSWORD_FLAGS","\ @@ -999,6 +1003,7 @@ DEFINE_GETTER (nmc_property_802_1X_get_pac_file, NM_SETTING_802_1X_PAC_FILE) DEFINE_GETTER (nmc_property_802_1X_get_ca_path, NM_SETTING_802_1X_CA_PATH) DEFINE_GETTER (nmc_property_802_1X_get_subject_match, NM_SETTING_802_1X_SUBJECT_MATCH) DEFINE_GETTER (nmc_property_802_1X_get_altsubject_matches, NM_SETTING_802_1X_ALTSUBJECT_MATCHES) +DEFINE_GETTER (nmc_property_802_1X_get_domain_suffix_match, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH) DEFINE_GETTER (nmc_property_802_1X_get_phase1_peapver, NM_SETTING_802_1X_PHASE1_PEAPVER) DEFINE_GETTER (nmc_property_802_1X_get_phase1_peaplabel, NM_SETTING_802_1X_PHASE1_PEAPLABEL) DEFINE_GETTER (nmc_property_802_1X_get_phase1_fast_provisioning, NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING) @@ -1007,6 +1012,7 @@ DEFINE_GETTER (nmc_property_802_1X_get_phase2_autheap, NM_SETTING_802_1X_PHASE2_ DEFINE_GETTER (nmc_property_802_1X_get_phase2_ca_path, NM_SETTING_802_1X_PHASE2_CA_PATH) DEFINE_GETTER (nmc_property_802_1X_get_phase2_subject_match, NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH) DEFINE_GETTER (nmc_property_802_1X_get_phase2_altsubject_matches, NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES) +DEFINE_GETTER (nmc_property_802_1X_get_phase2_domain_suffix_match, NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH) DEFINE_GETTER (nmc_property_802_1X_get_password, NM_SETTING_802_1X_PASSWORD) DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_password_flags, NM_SETTING_802_1X_PASSWORD_FLAGS) DEFINE_SECRET_FLAGS_GETTER (nmc_property_802_1X_get_password_raw_flags, NM_SETTING_802_1X_PASSWORD_RAW_FLAGS) @@ -5673,6 +5679,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, DOMAIN_SUFFIX_MATCH), + nmc_property_802_1X_get_domain_suffix_match, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT), nmc_property_802_1X_get_client_cert, nmc_property_802_1X_set_client_cert, @@ -5743,6 +5756,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (802_1X, PHASE2_DOMAIN_SUFFIX_MATCH), + nmc_property_802_1X_get_phase2_domain_suffix_match, + nmc_property_set_string, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT), nmc_property_802_1X_get_phase2_client_cert, nmc_property_802_1X_set_phase2_client_cert, @@ -7956,30 +7976,32 @@ setting_802_1X_details (NMSetting *setting, NmCli *nmc, const char *one_prop, g 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, 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, 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, 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, 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, NMC_PROPERTY_GET_PRETTY)); - set_val_str (arr, 32, nmc_property_802_1X_get_system_ca_certs (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 9, nmc_property_802_1X_get_domain_suffix_match (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 10, nmc_property_802_1X_get_client_cert (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 11, nmc_property_802_1X_get_phase1_peapver (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 12, nmc_property_802_1X_get_phase1_peaplabel (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 13, nmc_property_802_1X_get_phase1_fast_provisioning (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 14, nmc_property_802_1X_get_phase2_auth (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 15, nmc_property_802_1X_get_phase2_autheap (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 16, nmc_property_802_1X_get_phase2_ca_cert (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 17, nmc_property_802_1X_get_phase2_ca_path (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 18, nmc_property_802_1X_get_phase2_subject_match (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 19, nmc_property_802_1X_get_phase2_altsubject_matches (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 20, nmc_property_802_1X_get_phase2_domain_suffix_match (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 21, nmc_property_802_1X_get_phase2_client_cert (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 22, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password)); + set_val_str (arr, 23, nmc_property_802_1X_get_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 24, GET_SECRET (secrets, setting, nmc_property_802_1X_get_password_raw)); + set_val_str (arr, 25, nmc_property_802_1X_get_password_raw_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 26, nmc_property_802_1X_get_private_key (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 27, GET_SECRET (secrets, setting, nmc_property_802_1X_get_private_key_password)); + set_val_str (arr, 28, nmc_property_802_1X_get_private_key_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 29, nmc_property_802_1X_get_phase2_private_key (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 30, GET_SECRET (secrets, setting, nmc_property_802_1X_get_phase2_private_key_password)); + set_val_str (arr, 31, nmc_property_802_1X_get_phase2_private_key_password_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 32, GET_SECRET (secrets, setting, nmc_property_802_1X_get_pin)); + set_val_str (arr, 33, nmc_property_802_1X_get_pin_flags (setting, NMC_PROPERTY_GET_PRETTY)); + set_val_str (arr, 34, 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 */ diff --git a/config.h.in b/config.h.in index 0b7e8d68..c90fd77f 100644 --- a/config.h.in +++ b/config.h.in @@ -83,6 +83,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_READLINE_READLINE_H +/* Define to 1 if you have the `secure_getenv' function. */ +#undef HAVE_SECURE_GETENV + /* Define if you have SELinux support */ #undef HAVE_SELINUX @@ -119,6 +122,9 @@ /* Define if you have Linux Wireless Extensions support */ #undef HAVE_WEXT +/* Define to 1 if you have the `__secure_getenv' function. */ +#undef HAVE___SECURE_GETENV + /* Enable Gentoo hostname persist method */ #undef HOSTNAME_PERSIST_GENTOO diff --git a/configure b/configure index 0d19357d..dfb9da76 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.1.91. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.92. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.1.91' -PACKAGE_STRING='NetworkManager 1.1.91' +PACKAGE_VERSION='1.1.92' +PACKAGE_STRING='NetworkManager 1.1.92' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1685,7 +1685,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.1.91 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.1.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1755,7 +1755,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.1.91:";; + short | recursive ) echo "Configuration of NetworkManager 1.1.92:";; esac cat <<\_ACEOF @@ -2062,7 +2062,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.1.91 +NetworkManager configure 1.1.92 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2789,7 +2789,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.1.91, which was +It was created by NetworkManager $as_me 1.1.92, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3659,7 +3659,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.1.91' + VERSION='1.1.92' cat >>confdefs.h <<_ACEOF @@ -17540,9 +17540,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=1 -NM_MICRO_VERSION=91 -NM_VERSION=1.1.91 -NM_GIT_SHA=e0abe36ae76f01ca4f80fbe69158f26ba3b560bf +NM_MICRO_VERSION=92 +NM_VERSION=1.1.92 +NM_GIT_SHA=24caeb33b7f2a2a80ee4484844810bc08d32f28c @@ -20292,6 +20292,20 @@ nmstatedir='${localstatedir}'/lib/$PACKAGE nmrundir='${runstatedir}'/$PACKAGE + +for ac_func in __secure_getenv secure_getenv +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + # Alternative configuration plugins # Check whether --enable-config-plugin-ibft was given. if test "${enable_config_plugin_ibft+set}" = set; then : @@ -21792,6 +21806,7 @@ fi else found_introspection=no fi + enable_introspection=$found_introspection ;; #( *) : as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 @@ -21987,7 +22002,7 @@ if (test "$with_udev_dir" != 'no'); then as_fn_error $? "--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir'" "$LINENO" 5 fi if (test "$with_udev_dir" = 'yes'); then - with_udev_dir="/lib/udev" + with_udev_dir="\$(prefix)/lib/udev" fi UDEV_DIR="$with_udev_dir" @@ -22407,7 +22422,7 @@ if test "$nm_config_logging_backend_default" != 'debug' \ fi if test "$nm_config_logging_backend_default" = ""; then if test "$have_systemd_journal" = "yes"; then - nm_config_logging_backend_default='journal-syslog-style' + nm_config_logging_backend_default='journal' else nm_config_logging_backend_default='syslog' fi @@ -25388,6 +25403,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wformat-security \ -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \ + -Wno-duplicate-decl-specifier \ -Wstrict-prototypes \ -fno-strict-aliasing -Wno-unused-but-set-variable \ -Wundef -Wimplicit-function-declaration \ @@ -27269,7 +27285,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.1.91, which was +This file was extended by NetworkManager $as_me 1.1.92, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27335,7 +27351,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.1.91 +NetworkManager config.status 1.1.92 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0f270ceb..578b077f 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], [1]) -m4_define([nm_micro_version], [91]) +m4_define([nm_micro_version], [92]) 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 ])]) @@ -86,6 +86,9 @@ AC_SUBST(nmdatadir, '${datadir}'/$PACKAGE, [NetworkManager shared data directory AC_SUBST(nmstatedir, '${localstatedir}'/lib/$PACKAGE, [NetworkManager persistent state directory]) AC_SUBST(nmrundir, '${runstatedir}'/$PACKAGE, [NetworkManager runtime state directory]) +AC_GNU_SOURCE +AC_CHECK_FUNCS([__secure_getenv secure_getenv]) + # Alternative configuration plugins AC_ARG_ENABLE(config-plugin-ibft, AS_HELP_STRING([--enable-config-plugin-ibft], [enable ibft configuration plugin])) AC_ARG_ENABLE(ifcfg-rh, AS_HELP_STRING([--enable-ifcfg-rh], [enable ifcfg-rh configuration plugin (Fedora/RHEL)])) @@ -320,7 +323,7 @@ if (test "$with_udev_dir" != 'no'); then AC_MSG_ERROR([--with-udev-dir must be an absolute path or 'yes' or 'no'. Instead it is '$with_udev_dir']) fi if (test "$with_udev_dir" = 'yes'); then - with_udev_dir="/lib/udev" + with_udev_dir="\$(prefix)/lib/udev" fi UDEV_DIR="$with_udev_dir" AC_SUBST(UDEV_DIR) @@ -397,7 +400,7 @@ if test "$nm_config_logging_backend_default" != 'debug' \ fi if test "$nm_config_logging_backend_default" = ""; then if test "$have_systemd_journal" = "yes"; then - nm_config_logging_backend_default='journal-syslog-style' + nm_config_logging_backend_default='journal' else nm_config_logging_backend_default='syslog' fi diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 1b50d02b..666bad00 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -8,10 +8,9 @@ OTHER_FILES= \ $(top_srcdir)/introspection/generic-types.xml \ $(top_srcdir)/introspection/errors.xml \ $(top_srcdir)/introspection/vpn-errors.xml \ - $(top_srcdir)/tools/doc-generator.xsl \ $(top_srcdir)/introspection/generic-types.xml -GENERATED_FILES = spec.html +GENERATED_FILES = if SETTING_DOCS_AVAILABLE @@ -23,15 +22,6 @@ $(DOC_MAIN_SGML_FILE): settings-spec.xml GENERATED_FILES += settings-spec.xml -endif - -if ENABLE_GTK_DOC - -spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp - $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html - mkdir -p $(builddir)/html/ - cp spec.html $(builddir)/html/ - all: $(GENERATED_FILES) endif @@ -58,10 +48,50 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)" # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ version.xml \ - migrating-to-09.xml \ ../../COPYING \ $(NULL) +expand_content_files = \ + $(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ + $(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ + $(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ + $(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \ + $(top_builddir)/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \ + $(top_builddir)/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \ + $(top_builddir)/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \ + $(top_builddir)/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \ + $(top_builddir)/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \ + $(top_builddir)/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \ + $(top_builddir)/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + $(top_builddir)/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \ + $(top_builddir)/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \ + $(top_builddir)/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \ + $(top_builddir)/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \ + $(top_builddir)/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \ + $(top_builddir)/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \ + $(top_builddir)/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \ + $(top_builddir)/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \ + $(top_builddir)/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \ + $(top_builddir)/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ + $(top_builddir)/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \ + $(top_builddir)/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \ + $(top_builddir)/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \ + $(top_builddir)/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \ + $(top_builddir)/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \ + $(top_builddir)/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \ + $(top_builddir)/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \ + $(top_builddir)/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \ + $(top_builddir)/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \ + $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ + $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ + $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/man/NetworkManager.xml \ + $(top_builddir)/man/NetworkManager.conf.xml \ + $(top_builddir)/man/nmcli-examples.xml \ + $(top_builddir)/man/nm-settings.xml \ + $(top_builddir)/man/nm-settings-keyfile.xml \ + $(top_builddir)/man/nm-settings-ifcfg-rh.xml + include $(top_srcdir)/gtk-doc.make #################################### @@ -74,7 +104,3 @@ CLEANFILES += html/* tmpl/* xml/* \ if BUILD_SETTING_DOCS CLEANFILES += settings-spec.xml endif - -if ENABLE_GTK_DOC -CLEANFILES += spec.html -endif diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index d08d2f88..6a510fef 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -95,7 +95,6 @@ build_triplet = @build@ host_triplet = @host@ @SETTING_DOCS_AVAILABLE_TRUE@am__append_1 = settings-spec.xml @BUILD_SETTING_DOCS_TRUE@am__append_2 = settings-spec.xml -@ENABLE_GTK_DOC_TRUE@am__append_3 = spec.html subdir = docs/api ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_readline.m4 \ @@ -412,10 +411,9 @@ OTHER_FILES = \ $(top_srcdir)/introspection/generic-types.xml \ $(top_srcdir)/introspection/errors.xml \ $(top_srcdir)/introspection/vpn-errors.xml \ - $(top_srcdir)/tools/doc-generator.xsl \ $(top_srcdir)/introspection/generic-types.xml -GENERATED_FILES = spec.html $(am__append_1) +GENERATED_FILES = $(am__append_1) #################################### @@ -438,10 +436,50 @@ MKHTML_OPTIONS = --path="$(abs_srcdir)" # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ version.xml \ - migrating-to-09.xml \ ../../COPYING \ $(NULL) +expand_content_files = \ + $(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \ + $(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \ + $(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \ + $(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \ + $(top_builddir)/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \ + $(top_builddir)/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \ + $(top_builddir)/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \ + $(top_builddir)/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \ + $(top_builddir)/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \ + $(top_builddir)/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \ + $(top_builddir)/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \ + $(top_builddir)/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \ + $(top_builddir)/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \ + $(top_builddir)/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \ + $(top_builddir)/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \ + $(top_builddir)/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \ + $(top_builddir)/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \ + $(top_builddir)/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \ + $(top_builddir)/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \ + $(top_builddir)/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \ + $(top_builddir)/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \ + $(top_builddir)/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \ + $(top_builddir)/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \ + $(top_builddir)/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \ + $(top_builddir)/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \ + $(top_builddir)/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \ + $(top_builddir)/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \ + $(top_builddir)/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \ + $(top_builddir)/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \ + $(top_builddir)/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \ + $(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \ + $(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \ + $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \ + $(top_builddir)/man/NetworkManager.xml \ + $(top_builddir)/man/NetworkManager.conf.xml \ + $(top_builddir)/man/nmcli-examples.xml \ + $(top_builddir)/man/nm-settings.xml \ + $(top_builddir)/man/nm-settings-keyfile.xml \ + $(top_builddir)/man/nm-settings-ifcfg-rh.xml + @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(GTKDOC_DEPS_LIBS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) @@ -486,7 +524,7 @@ REPORT_FILES = \ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ gtkdoc-check.test html/* tmpl/* xml/* \ NetworkManager-sections.txt NetworkManager-overrides.txt \ - $(am__append_2) $(am__append_3) + $(am__append_2) @GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = @GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @@ -731,12 +769,7 @@ uninstall-am: uninstall-local # Top-level SGML file includes (depends on) settings-spec.xml @SETTING_DOCS_AVAILABLE_TRUE@$(DOC_MAIN_SGML_FILE): settings-spec.xml -@ENABLE_GTK_DOC_TRUE@spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp -@ENABLE_GTK_DOC_TRUE@ $(XSLTPROC) --path "$(top_builddir)/introspection:$(top_srcdir)/introspection" $(top_srcdir)/tools/doc-generator.xsl $(top_builddir)/introspection/all.xml > spec.html -@ENABLE_GTK_DOC_TRUE@ mkdir -p $(builddir)/html/ -@ENABLE_GTK_DOC_TRUE@ cp spec.html $(builddir)/html/ - -@ENABLE_GTK_DOC_TRUE@all: $(GENERATED_FILES) +@SETTING_DOCS_AVAILABLE_TRUE@all: $(GENERATED_FILES) gtkdoc-check.test: Makefile $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html new file mode 100644 index 00000000..5049ecfe --- /dev/null +++ b/docs/api/html/NetworkManager.conf.html @@ -0,0 +1,1060 @@ + + + + +NetworkManager.conf: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NetworkManager.conf

+

NetworkManager.conf — NetworkManager configuration file

+
+
+

Synopsis

+

/etc/NetworkManager/NetworkManager.conf, + /etc/NetworkManager/conf.d/name.conf, + /usr/lib/NetworkManager/conf.d/name.conf, + /var/lib/NetworkManager/NetworkManager-intern.conf +

+
+
+

Description

+

NetworkManager.conf is the configuration file for NetworkManager. It is used + to set up various aspects of NetworkManager's behavior. The + location of the main file and configuration directories may be changed + through use of the --config, --config-dir, + --system-config-dir, and --intern-config + argument for NetworkManager, respectively. +

+

If a default NetworkManager.conf is + provided by your distribution's packages, you should not modify + it, since your changes may get overwritten by package + updates. Instead, you can add additional .conf + files to the /etc/NetworkManager/conf.d directory. + These will be read in order, with later files overriding earlier ones. + Packages might install further configuration snippets to /usr/lib/NetworkManager/conf.d. + This directory is parsed first, even before NetworkManager.conf. + The loading of a file /usr/lib/NetworkManager/conf.d/name.conf + can be prevented by adding a file /etc/NetworkManager/conf.d/name.conf. + In this case, the file from the etc configuration shadows the file from the + system configuration directory. +

+

+ NetworkManager can overwrite certain user configuration options via D-Bus or other internal + operations. In this case it writes those changes to /var/lib/NetworkManager/NetworkManager-intern.conf. + This file is not intended to be modified by the user, but it is read last and can shadow + user configuration from NetworkManager.conf. +

+
+
+

File Format

+

+ 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 '#' and blank lines are + considered comments. Sections are started by a header line + containing the section enclosed in '[' and ']', 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. +

+

+ 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 “Device List Format” + below. +

+

+ Minimal system settings configuration file looks like this: +

+
+[main]
+plugins=keyfile
+
+

+

+

+ As an extension to the normal keyfile format, you can also + append a value to a previously-set list-valued key by doing: +

+
+plugins+=another-plugin
+plugins-=remove-me
+
+

+

+
+
+

+main section

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

plugins

 +

+ Lists system settings plugin names separated by ','. These + plugins are used to read and write system-wide + connections. When multiple plugins are specified, the + connections are read from all listed plugins. When writing + connections, the plugins will be asked to save the + connection in the order listed here; if the first plugin + cannot write out that connection type (or can't write out + any connections) the next plugin is tried, etc. If none of + the plugins can save the connection, an error is returned + to the user. +

+

+ If NetworkManager defines a distro-specific + network-configuration plugin for your system, then that + will normally be listed here. (See below for the available + plugins.) Note that the keyfile plugin + is always appended to the end of this list (if it doesn't + already appear earlier in the list), so if there is no + distro-specific plugin for your system then you can leave + this key unset and NetworkManager will fall back to using + keyfile. +

+

monitor-connection-files

Whether the configured settings plugin(s) + should set up file monitors and immediately pick up changes + made to connection files while NetworkManager is running. This + is disabled by default; NetworkManager will only read + the connection files at startup, and when explicitly requested + via the ReloadConnections D-Bus call. If this key is set to + 'true', then NetworkManager will reload + connection files any time they changed.

auth-polkit

Whether the system uses PolicyKit for authorization. + If false, all requests will be allowed. If + true, non-root requests are authorized using PolicyKit. + The default value is true. +

dhcp

 +

This key sets up what DHCP client + NetworkManager will use. Allowed values are + dhclient, dhcpcd, and + internal. The dhclient + and dhcpcd options require the indicated + clients to be installed. The internal + option uses a built-in DHCP client which is not currently as + featureful as the external clients.

+

If this key is missing, available DHCP clients are + looked for in this order: dhclient, + dhcpcd, + internal.

+

no-auto-default

 +

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 + doesn't 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.

+

When the default wired connection is deleted or saved + to a new persistent connection by a plugin, the device is + added to a list in the file + /var/run/NetworkManager/no-auto-default.state + to prevent creating the default connection for that device + again.

+

See the section called “Device List Format” 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=*
+
+

+

+

ignore-carrier

 +

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

+

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

+

+ 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 the section called “Device List Format” 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 the section called “Device List Format” for the syntax how to + specify a device. +

+

configure-and-quit

+ When set to 'true', NetworkManager quits after + performing initial network configuration but spawns small helpers + to preserve DHCP leases and IPv6 addresses. This is useful in + environments where network setup is more or less static or it is + desirable to save process time but still handle some dynamic + configurations. When this option is true, + network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE + interfaces cannot be preserved due to their use of external + services, and these devices will be deconfigured when NetworkManager + quits even though other interface's configuration may be preserved. + Also, to preserve DHCP addresses the 'dhcp' option + must be set to 'internal'. The default value of + the 'configure-and-quit' option is + 'false', meaning that NetworkManager will continue + running after initial network configuration and continue responding + to system and hardware events, D-Bus requests, and user commands. +

dns

 +

Set the DNS (resolv.conf) processing mode.

+

default: The default if the key is + not specified. NetworkManager will update + resolv.conf to reflect the nameservers + provided by currently active connections.

+

dnsmasq: NetworkManager will run + dnsmasq as a local caching nameserver, using a "split DNS" + configuration if you are connected to a VPN, and then update + resolv.conf to point to the local + nameserver.

+

unbound: NetworkManager will talk + to unbound and dnssec-triggerd, providing a "split DNS" + configuration with DNSSEC support. The /etc/resolv.conf + will be managed by dnssec-trigger daemon.

+

none: NetworkManager will not + modify resolv.conf.

+

rc-manager

 +

Set the resolv.conf + management mode. The default value depends on how NetworkManager + was built. Regardless of this setting, NetworkManager will + always write resolv.conf to its runtime state directory.

+

none: NetworkManager will symlink + /etc/resolv.conf to its private + resolv.conf file in the runtime state directory.

+

file: NetworkManager will write + /etc/resolv.conf as file.

+

resolvconf: NetworkManager will run + resolvconf to update the DNS configuration.

+

netconfig: NetworkManager will run + netconfig to update the DNS configuration.

+

debug

 +

Comma separated list of options to aid + debugging. This value will be combined with the environment + variable NM_DEBUG. Currently the following + values are supported:

+

+ RLIMIT_CORE: set ulimit -c unlimited + to write out core dumps. Beware, that a core dump can contain + sensitive information such as passwords or configuration settings. +

+

+ fatal-warnings: set g_log_set_always_fatal() + to core dump on warning messages from glib. This is equivalent + to the --g-fatal-warnings command line option. +

+
+
+
+

+keyfile section

+

This section contains keyfile-plugin-specific options, and + is normally only used when you are not using any other + distro-specific plugin.

+

+

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

hostname

This key is deprecated and has no effect + since the hostname is now stored in /etc/hostname or other + system configuration files according to build options. +

path

The location where keyfiles are read and stored. + This defaults to "/usr/local/etc/NetworkManager/conf.d". +

unmanaged-devices

 +

Set devices that should be ignored by + NetworkManager. +

+

See the section called “Device List Format” for the syntax how to + specify a device. +

+

+ Example: +

+
+unmanaged-devices=interface-name:em4
+unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2
+
+

+

+
+

+

+
+
+

+ifupdown section

+

This section contains ifupdown-specific options and thus only + has effect when using the ifupdown plugin.

+

+

+
++++ + + + + +

managed

 +

If set to true, then + interfaces listed in + /etc/network/interfaces are managed by + NetworkManager. If set to false, then + any interface listed in + /etc/network/interfaces will be ignored + by NetworkManager. Remember that NetworkManager controls the + default route, so because the interface is ignored, + NetworkManager may assign the default route to some other + interface.

+

+ The default value is false. +

+
+

+

+
+
+

+logging section

+

This section controls NetworkManager's logging. Any + settings here are overridden by the --log-level + and --log-domains command-line options.

+

+

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

level

The default logging verbosity level. + One of OFF, ERR, + WARN, INFO, + DEBUG, TRACE. The ERR + level logs only critical errors. WARN logs warnings that may + reflect operation. INFO logs various informational messages that + are useful for tracking state and operations. DEBUG enables + verbose logging for debugging purposes. TRACE enables even more + verbose logging then DEBUG level. Subsequent levels also log + all messages from earlier levels; thus setting the log level + to INFO also logs error and warning messages.

domains

 +

The following log domains are available: + PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, + WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, + AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, + INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, + TEAM, CONCHECK, DCB, DISPATCH, AUDIT.

+

In addition, these special domains can be used: NONE, + ALL, DEFAULT, DHCP, IP.

+

You can specify per-domain log level overrides by + adding a colon and a log level to any domain. E.g., + "WIFI:DEBUG,WIFI_SCAN:OFF".

+

backend

The logging backend. Supported values + are "debug", "syslog", + "journal". + "debug" uses syslog and logs to standard error. + If NetworkManager is started in debug mode (--debug) + this option is ignored and "debug" is always used. + Otherwise, the default is "journal". +

audit

Whether the audit records are delivered to + auditd, the audit daemon. If false, audit + records will be sent only to the NetworkManager logging + system. If set to true, they will be also + sent to auditd. The default value is true. +

+

+

+
+
+

+connection section

+

Specify default values for connections. +

+

+ Example: +

+
+[connection]
+ipv6.ip6-privacy=0
+
+

+

+
+

Supported Properties

+

+ Not all properties can be overwritten, only the following + properties are supported to have their default values configured + (see nm-settings(5) for details). + A default value is only consulted if the corresponding per-connection value + explicitly allows for that. +

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

connection.autoconnect-slaves

connection.lldp

ethernet.wake-on-lan

ipv4.dad-timeout

ipv4.dhcp-timeout

If left unspecified, the default value for + the interface type is used.

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

vpn.timeout

If left unspecified, default value of 60 seconds is used.

wifi.mac-address-randomization

If left unspecified, MAC address randomization is disabled.

wifi.powersave

If left unspecified, the default value + "ignore" will be used.

+

+

+
+
+
+

Sections

+

+ You can configure 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
+vpn.timeout=120
+
+[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 sections 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. +

+

+ The following properties further control how a connection section applies. +

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

match-device

An optional device spec that restricts + when the section applies. See the section called “Device List Format” + 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. +

+

+

+
+
+
+

+connectivity section

+

This section controls NetworkManager's 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.

+

+

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

uri

The URI of a web page to periodically + request when connectivity is being checked. This page + should return the header "X-NetworkManager-Status" with a + value of "online". Alternatively, it's body content should + be set to "NetworkManager is online". The body content + check can be controlled by the response + option. If this option is blank or missing, connectivity + checking is disabled. +

interval

Specified in seconds; controls how often + connectivity is checked when a network connection exists. If + set to 0 connectivity checking is disabled. If missing, the + default is 300 seconds.

response

If set controls what body content + NetworkManager checks for when requesting the URI for + connectivity checking. If missing, defaults to + "NetworkManager is online"

+

+

+
+
+

+global-dns section

+

This section specifies global DNS settings that override + connection-specific configuration.

+

+

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

searches

+ A list of search domains to be used during hostname lookup. +

options

+ A list of of options to be passed to the hostname resolver. +

+

+

+
+
+

+global-dns-domain sections

+

Sections with a name starting with the "global-dns-domain-" + prefix allow to define global DNS configuration for specific + domains. The part of section name after "global-dns-domain-" + specifies the domain name a section applies to. More specific + domains have the precedence over less specific ones and the + default domain is represented by the wildcard "*". A default + domain section is mandatory. +

+

+

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

servers

+ A list of addresses of DNS servers to be used for the given domain. +

options

+ A list of domain-specific DNS options. Not used at the moment. +

+

+

+
+
+

+.config sections

+

This is a special section that contains options which apply + to the configuration file that contains the option. +

+

+

+
++++ + + + + +

enable

 +

+ Defaults to "true". If "false", + the configuration file will be skipped during loading. + Note that the main configuration file NetworkManager.conf + cannot be disabled. +

+
+# always skip loading the config file
+[.config]
+enable=false
+
+

+

+

+ You can also match against the version of NetworkManager. For example + the following are valid configurations: +

+
+# only load on version 1.0.6
+[.config]
+enable=nm-version:1.0.6
+
+# load on all versions 1.0.x, but not 1.2.x
+[.config]
+enable=nm-version:1.0
+
+# only load on versions >= 1.1.6. This does not match
+# with version 1.2.0 or 1.4.4. Only the last digit is considered.
+[.config]
+enable=nm-version-min:1.1.6
+
+# only load on versions >= 1.2. Contrary to the previous
+# example, this also matches with 1.2.0, 1.2.10, 1.4.4, etc.
+[.config]
+enable=nm-version-min:1.2
+
+# Match against the maximum allowed version. The example matches
+# versions 1.2.0, 1.2.2, 1.2.4. Again, only the last version digit
+# is allowed to be smaller. So this would not match match on 1.1.10.
+[.config]
+enable=nm-version-max:1.2.6
+
+

+

+

+ You can also match against the value of the environment variable + NM_CONFIG_ENABLE_TAG, like: +

+
+# always skip loading the file when running NetworkManager with
+# environment variable "NM_CONFIG_ENABLE_TAG=TAG1"
+[.config]
+enable=env:TAG1
+
+

+

+

+ More then one match can be specified. The configuration will be + enabled if one of the predicates matches ("or"). The special prefix "except:" can + be used to negate the match. Note that if one except-predicate + matches, the entire configuration will be disabled. + In other words, a except predicate always wins over other predicates. +

+
+# enable the configuration either when the environment variable
+# is present or the version is at least 1.2.0.
+[.config]
+enable=env:TAG2,nm-version-min:1.2
+
+# enable the configuration for version >= 1.2.0, but disable
+# it when the environment variable is set to "TAG3"
+[.config]
+enable=except:env:TAG3,nm-version-min:1.2
+
+# enable the configuration on >= 1.3, >= 1.2.6, and >= 1.0.16.
+# Useful if a certain feature is only present since those releases.
+[.config]
+enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
+
+

+

+
+

+

+
+
+

Plugins

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

keyfile

 +

+ The keyfile plugin is the generic + plugin that supports all the connection types and + capabilities that NetworkManager has. It writes files out + in an .ini-style format in + /etc/NetworkManager/system-connections. +

+

+ The stored connection file may contain passwords and + private keys, so it will be made readable only to root, + and the plugin will ignore files that are readable or + writable by any user or group other than root. +

+

+ This plugin is always active, and will automatically be + used to store any connections that aren't supported by any + other active plugin. +

+

ifcfg-rh

+ This plugin is used on the Fedora and Red Hat Enterprise + Linux distributions to read and write configuration from + the standard + /etc/sysconfig/network-scripts/ifcfg-* + files. It currently supports reading Ethernet, Wi-Fi, + InfiniBand, VLAN, Bond, Bridge, and Team connections. + Enabling ifcfg-rh implicitly enables + ibft plugin, if it is available. + This can be disabled by adding no-ibft. +

ifcfg-suse

+ This plugin is deprecated and its selection has no effect. + The keyfile plugin should be used + instead. +

ifupdown

 +

+ This plugin is used on the Debian and Ubuntu + distributions, and reads Ethernet and Wi-Fi connections + from /etc/network/interfaces. +

+

+ This plugin is read-only; any connections (of any type) + added from within NetworkManager when you are using this + plugin will be saved using the keyfile + plugin instead. +

+

ibft, no-ibft

+ 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. + If ibft support is available, it is automatically enabled after + ifcfg-rh. This can be disabled by no-ibft. + You can also explicitly specify ibft to load the + plugin without ifcfg-rh or to change the plugin order. +

+
+
+

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 commas or semicolons. The order does not matter as + matches are either inclusive or negative (except:), 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 not a separator but will be trimmed between + two specs (unless escaped as '\s'). +

+
+

+

+

+ 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

+

+ NetworkManager(8), + nmcli(1), + nmcli-examples(5), + nm-online(1), + nm-settings(5), + nm-applet(1), + nm-connection-editor(1) +

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 112d9686..d076d1ec 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -1,29 +1,346 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html new file mode 100644 index 00000000..f12e5b55 --- /dev/null +++ b/docs/api/html/NetworkManager.html @@ -0,0 +1,494 @@ + + + + +NetworkManager: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

NetworkManager

+

NetworkManager — network management daemon

+
+
+

Synopsis

+

NetworkManager [OPTIONS...]

+
+
+

Description

+

+ The NetworkManager daemon attempts to make networking + configuration and operation as painless and automatic as + possible by managing the primary network connection and other + network interfaces, like Ethernet, WiFi, and Mobile Broadband + devices. NetworkManager will connect any network device when a + connection for that device becomes available, unless that + behavior is disabled. Information about networking is exported + via a D-Bus interface to any interested application, providing a + rich API with which to inspect and control network settings and + operation. +

+
+
+

Dispatcher scripts

+

+ NetworkManager will execute scripts in the + /etc/NetworkManager/dispatcher.d directory or subdirectories in + alphabetical order in response to network events. Each script should + be a regular executable file owned by root. Furthermore, it must not be + writable by group or other, and not setuid. +

+

+ Each script receives two arguments, the first being the interface name of the + device an operation just happened on, and second the action. For device actions, + the interface is the name of the kernel interface suitable for IP configuration. + Thus it is either VPN_IP_IFACE, DEVICE_IP_IFACE, or DEVICE_IFACE, as applicable. + For the hostname action it is always "none". +

+

The actions are:

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

pre-up

The interface is connected to the network but is not + yet fully activated. Scripts acting on this event must be placed or + symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d directory, + and NetworkManager will wait for script execution to complete before + indicating to applications that the interface is fully activated. +

up

The interface has been activated.

pre-down

The interface will be deactivated but has not yet been + disconnected from the network. Scripts acting on this event must be + placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d + directory, and NetworkManager will wait for script execution to complete + before disconnecting the interface from its network. Note that this + event is not emitted for forced disconnections, like when carrier is + lost or a wireless signal fades. It is only emitted when there is + an opportunity to cleanly handle a network disconnection event. +

down

+ The interface has been deactivated. +

vpn-pre-up

The VPN is connected to the network but is not yet + fully activated. Scripts acting on this event must be placed or + symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d directory, + and NetworkManager will wait for script execution to complete before + indicating to applications that the VPN is fully activated. +

vpn-up

+ A VPN connection has been activated. +

vpn-pre-down

The VPN will be deactivated but has not yet been + disconnected from the network. Scripts acting on this event must be + placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d + directory, and NetworkManager will wait for script execution to complete + before disconnecting the VPN from its network. Note that this + event is not emitted for forced disconnections, like when the VPN + terminates unexpectedly or general connectivity is lost. It is only + emitted when there is an opportunity to cleanly handle a VPN + disconnection event. +

vpn-down

+ A VPN connection has been deactivated. +

hostname

+ The system hostname has been updated. Use gethostname(2) to retrieve it. + The interface name (first argument) is empty and no environment variable is + set for this action. +

dhcp4-change

+ The DHCPv4 lease has changed (renewed, rebound, etc). +

dhcp6-change

+ The DHCPv6 lease has changed (renewed, rebound, etc). +

+

+ The environment contains more information about the interface and the connection. + The following variables are available for the use in the dispatcher scripts: +

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

CONNECTION_UUID

+ The UUID of the connection profile. +

CONNECTION_ID

+ The name (ID) of the connection profile. +

CONNECTION_DBUS_PATH

+ The NetworkManager D-Bus path of the connection. +

CONNECTION_FILENAME

+ The backing file name of the connection profile (if any). +

CONNECTION_EXTERNAL

+ If "1", this indicates that the connection describes a + network configuration created outside of NetworkManager. +

DEVICE_IFACE

+ The interface name of the control interface of the device. + Depending on the device type, this differs from + DEVICE_IP_IFACE. For example for + ADSL devices, this could be 'atm0' or for WWAN devices + it might be 'ttyUSB0'. +

DEVICE_IP_IFACE

+ The IP interface name of the device. This is the network + interface on which IP addresses and routes will be configured. +

IP4_ADDRESS_N

+ The IPv4 address in the format "address/prefix gateway", where N is a number + from 0 to (# IPv4 addresses - 1). gateway item in this variable is deprecated, + use IP4_GATEWAY instead. +

IP4_NUM_ADDRESSES

+ The variable contains the number of IPv4 addresses the script may expect. +

IP4_GATEWAY

+ The gateway IPv4 address in traditional numbers-and-dots notation. +

IP4_ROUTE_N

+ The IPv4 route in the format "address/prefix next-hop metric", where N is a number + from 0 to (# IPv4 routes - 1). +

IP4_NUM_ROUTES

+ The variable contains the number of IPv4 routes the script may expect. +

IP4_NAMESERVERS

+ The variable contains a space-separated list of the DNS servers. +

IP4_DOMAINS

+ The variable contains a space-separated list of the search domains. +

DHCP4_<dhcp-option-name>

+ If the connection used DHCP for address configuration, the received DHCP + configuration is passed in the environment using standard DHCP + option names, prefixed with "DHCP4_", like "DHCP4_HOST_NAME=foobar". +

IP6_<name> and DHCP6_<name>

+ The same variables as for IPv4 are available for IPv6, but the prefixes are IP6_ + and DHCP6_ instead. +

+

+

+

+ In case of VPN, VPN_IP_IFACE is set, and IP4_*, IP6_* variables with VPN prefix are + exported too, like VPN_IP4_ADDRESS_0, VPN_IP4_NUM_ADDRESSES. +

+

+ Dispatcher scripts are run one at a time, but asynchronously from the main + NetworkManager process, and will be killed if they run for too long. If your script + might take arbitrarily long to complete, you should spawn a child process and have the + parent return immediately. Scripts that are symbolic links pointing inside the + /etc/NetworkManager/dispatcher.d/no-wait.d/ directory are run immediately, without + waiting for the termination of previous scripts, and in parallel. Also beware that + once a script is queued, it will always be run, even if a later event renders it + obsolete. (Eg, if an interface goes up, and then back down again quickly, it is + possible that one or more "up" scripts will be run after the interface has gone down.) +

+
+
+

Options

+

The following options are understood:

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

--version | -V

Print the NetworkManager software version and exit. +

--help | -h

Print NetworkManager's available options and exit. +

--no-daemon | -n

Do not daemonize. +

--debug | -d

Do not daemonize, and direct log output to the + controlling terminal in addition to syslog. +

--pid-file | -p

Specify location of a PID file. The PID file + is used for storing PID of the running process and prevents + running multiple instances. +

--state-file

Specify file for storing state of the + NetworkManager persistently. If not specified, the default + value of /var/lib/NetworkManager/NetworkManager.state is used. +

--config

Specify configuration file to set up various + settings for NetworkManager. If not specified, the default + value of /etc/NetworkManager/NetworkManager.conf is used with + a fallback to the older 'nm-system-settings.conf' if located + in the same directory. See + NetworkManager.conf(5) + for more information on configuration file. +

--plugins

List plugins used to manage system-wide + connection settings. This list has preference over plugins + specified in the configuration file. Currently supported + plugins are: keyfile, ifcfg-rh, + ifcfg-suse, ifupdown. +

--log-level

+ Sets how much information NetworkManager sends to the log destination (usually + syslog's "daemon" facility). By default, only informational, warning, and error + messages are logged. See the section on logging in + NetworkManager.conf(5) + for more information. +

--log-domains

+ A comma-separated list specifying which operations are logged to the log + destination (usually syslog). By default, most domains are logging-enabled. + See the section on logging in + NetworkManager.conf(5) + for more information. +

--print-config

+ Print the NetworkManager configuration to stdout and exit. +

+
+
+

UDEV PROPERTIES

+

+ udev(7) + device manager is used for the network device discovery. The following + property influences how NetworkManager manages the devices: +

+
++++ + + + + +

NM_UNMANAGED

 +

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

+

+ Create an udev rule that sets this property to prevent NetworkManager + from interfering with virtual Ethernet device interfaces that are + managed by virtualization tools. +

+
+
+
+

SIGNALS

+

+ NetworkManager process handles the following signals: +

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

SIGHUP

+ The signal causes a reload of NetworkManager's configuration. + Note that not all configuration parameters can be changed at + runtime and therefore some changes may be applied only after + the next restart of the daemon. The signal also forces a + rewrite of DNS configuration. +

SIGUSR1

+ The signal forces a rewrite of DNS configuration. +

SIGUSR2

+ The signal has no effect at the moment. +

+

+

+
+
+

DEBUGGING

+

+ The following environment variables are supported to help + debugging. When used in conjunction with the + --no-daemon option (thus echoing PPP and DHCP + helper output to stdout) these can quickly help pinpoint the + source of connection issues. Also see the + --log-level and --log-domains + to enable debug logging inside NetworkManager itself. +

+

+ NM_PPP_DEBUG: When set to anything, causes + NetworkManager to turn on PPP debugging in pppd, which logs + all PPP and PPTP frames and client/server exchanges. +

+
+
+

See Also

+

+ NetworkManager.conf(5), + nmcli(1), + nmcli-examples(5), + nm-online(1), + nm-settings(5), + nm-applet(1), + nm-connection-editor(1) + udev(7) +

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html new file mode 100644 index 00000000..555898aa --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -0,0 +1,167 @@ + + + + +org.freedesktop.NetworkManager.AccessPoint: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.AccessPoint

+

org.freedesktop.NetworkManager.AccessPoint

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Flags       readable   u
+WpaFlags    readable   u
+RsnFlags    readable   u
+Ssid        readable   ay
+Frequency   readable   u
+HwAddress   readable   s
+Mode        readable   u
+MaxBitrate  readable   u
+Strength    readable   y
+LastSeen    readable   i
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Flags" property

+
+Flags  readable   u
+
+

Flags describing the capabilities of the access point.

+
+
+
+

The "WpaFlags" property

+
+WpaFlags  readable   u
+
+

Flags describing the access point's capabilities according to WPA (Wifi Protected Access).

+
+
+
+

The "RsnFlags" property

+
+RsnFlags  readable   u
+
+

Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.

+
+
+
+

The "Ssid" property

+
+Ssid  readable   ay
+
+

The Service Set Identifier identifying the access point.

+
+
+
+

The "Frequency" property

+
+Frequency  readable   u
+
+

The radio channel frequency in use by the access point, in MHz.

+
+
+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

The hardware address (BSSID) of the access point.

+
+
+
+

The "Mode" property

+
+Mode  readable   u
+
+

Describes the operating mode of the access point.

+
+
+
+

The "MaxBitrate" property

+
+MaxBitrate  readable   u
+
+

The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).

+
+
+
+

The "Strength" property

+
+Strength  readable   y
+
+

The current signal quality of the access point, in percent.

+
+
+
+

The "LastSeen" property

+
+LastSeen  readable   i
+
+

The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access point was found in scan results. A value of -1 means the access point has never been found in scan results.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html new file mode 100644 index 00000000..b1602bcf --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -0,0 +1,104 @@ + + + + +org.freedesktop.NetworkManager.AgentManager: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.AgentManager

+

org.freedesktop.NetworkManager.AgentManager

+
+
+

Methods

+
+Register                 (IN  s identifier);
+RegisterWithCapabilities (IN  s identifier,
+                          IN  u capabilities);
+Unregister               ();
+
+
+
+

Description

+

+
+
+

Method Details

+
+

The Register() method

+
+Register (IN  s identifier);
+
+

Called by secret Agents to register their ability to provide and save network secrets.

+
++++ + + + + +

IN s identifier:

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][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).

+
+
+
+

The RegisterWithCapabilities() method

+
+RegisterWithCapabilities (IN  s identifier,
+                          IN  u capabilities);
+
+

Like Register() but indicates agent capabilities to NetworkManager.

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

IN s identifier:

See the Register() method's identifier argument.

IN u capabilities:

Indicates various agent capabilities to NetworkManager.

+
+
+
+

The Unregister() method

+
+Unregister ();
+
+

Called by secret Agents to notify NetworkManager that they will no longer handle requests for network secrets. Agents are automatically unregistered when they disconnect from D-Bus.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html new file mode 100644 index 00000000..5d4db35f --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -0,0 +1,212 @@ + + + + +org.freedesktop.NetworkManager.Connection.Active: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Connection.Active

+

org.freedesktop.NetworkManager.Connection.Active

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Connection      readable   o
+SpecificObject  readable   o
+Id              readable   s
+Uuid            readable   s
+Type            readable   s
+Devices         readable   ao
+State           readable   u
+Default         readable   b
+Ip4Config       readable   o
+Dhcp4Config     readable   o
+Default6        readable   b
+Ip6Config       readable   o
+Dhcp6Config     readable   o
+Vpn             readable   b
+Master          readable   o
+
+
+
+

Description

+

Objects that implement the Connection.Active interface represent an attempt to connect to a network using the details provided by a Connection object. The Connection.Active object tracks the life-cycle of the connection attempt and if successful indicates whether the connected network is the "default" or preferred network for access. NetworkManager has the concept of connections, which can be thought of as settings, a profile or a configuration that can be applied on a networking device. Such settings-connections are exposed as D-Bus object and the active-connection expresses this relationship between device and settings-connection. At any time a settings-connection can only be activated on one device and vice versa. However, during activation and deactivation multiple active-connections can reference the same device or settings-connection as they are waiting to be activated or to be deactivated.

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Connection" property

+
+Connection  readable   o
+
+

The path of the connection.

+
+
+
+

The "SpecificObject" property

+
+SpecificObject  readable   o
+
+

A specific object associated with the active connection. This property reflects the specific object used during connection activation, and will not change over the lifetime of the ActiveConnection once set.

+
+
+
+

The "Id" property

+
+Id  readable   s
+
+

The ID of the connection, provided as a convenience so that clients do not have to retrieve all connection details.

+
+
+
+

The "Uuid" property

+
+Uuid  readable   s
+
+

The UUID of the connection, provided as a convenience so that clients do not have to retrieve all connection details.

+
+
+
+

The "Type" property

+
+Type  readable   s
+
+

The type of the connection, provided as a convenience so that clients do not have to retrieve all connection details.

+
+
+
+

The "Devices" property

+
+Devices  readable   ao
+
+

Array of object paths representing devices which are part of this active connection.

+
+
+
+

The "State" property

+
+State  readable   u
+
+

The state of this active connection.

+
+
+
+

The "Default" property

+
+Default  readable   b
+
+

Whether this active connection is the default IPv4 connection, i.e. whether it currently owns the default IPv4 route.

+
+
+
+

The "Ip4Config" property

+
+Ip4Config  readable   o
+
+

Object path of the Ip4Config object describing the configuration of the connection. Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+
+
+
+

The "Dhcp4Config" property

+
+Dhcp4Config  readable   o
+
+

Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server (assuming the connection used DHCP). Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+
+
+
+

The "Default6" property

+
+Default6  readable   b
+
+

Whether this active connection is the default IPv6 connection, i.e. whether it currently owns the default IPv6 route.

+
+
+
+

The "Ip6Config" property

+
+Ip6Config  readable   o
+
+

Object path of the Ip6Config object describing the configuration of the connection. Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+
+
+
+

The "Dhcp6Config" property

+
+Dhcp6Config  readable   o
+
+

Object path of the Dhcp6Config object describing the DHCP options returned by the DHCP server (assuming the connection used DHCP). Only valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.

+
+
+
+

The "Vpn" property

+
+Vpn  readable   b
+
+

Whether this active connection is also a VPN connection.

+
+
+
+

The "Master" property

+
+Master  readable   o
+
+

The path to the master device if the connection is a slave.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html new file mode 100644 index 00000000..6f8fed9d --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html @@ -0,0 +1,86 @@ + + + + +org.freedesktop.NetworkManager.DHCP4Config: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.DHCP4Config

+

org.freedesktop.NetworkManager.DHCP4Config

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Options  readable   a{sv}
+
+
+
+

Description

+

Options and configuration returned by the IPv4 DHCP server.

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Options" property

+
+Options  readable   a{sv}
+
+

Configuration options returned by a DHCP server, if any.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html new file mode 100644 index 00000000..e1cdb43e --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html @@ -0,0 +1,86 @@ + + + + +org.freedesktop.NetworkManager.DHCP6Config: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.DHCP6Config

+

org.freedesktop.NetworkManager.DHCP6Config

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Options  readable   a{sv}
+
+
+
+

Description

+

Options and configuration returned by the IPv6 DHCP server.

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Options" property

+
+Options  readable   a{sv}
+
+

Configuration options returned by a DHCP server, if any.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html new file mode 100644 index 00000000..3c4c7c7e --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html @@ -0,0 +1,86 @@ + + + + +org.freedesktop.NetworkManager.Device.Adsl: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Adsl

+

org.freedesktop.NetworkManager.Device.Adsl

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Carrier  readable   b
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

Indicates whether the physical carrier is found.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html new file mode 100644 index 00000000..d9fc09cc --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -0,0 +1,104 @@ + + + + +org.freedesktop.NetworkManager.Device.Bluetooth: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Bluetooth

+

org.freedesktop.NetworkManager.Device.Bluetooth

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress       readable   s
+Name            readable   s
+BtCapabilities  readable   u
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Bluetooth hardware address of the device.

+
+
+
+

The "Name" property

+
+Name  readable   s
+
+

Bluetooth name of the device.

+
+
+
+

The "BtCapabilities" property

+
+BtCapabilities  readable   u
+
+

Bluetooth capabilities of the device (either DUN or NAP).

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html new file mode 100644 index 00000000..27bfc6f8 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html @@ -0,0 +1,104 @@ + + + + +org.freedesktop.NetworkManager.Device.Bond: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Bond

+

org.freedesktop.NetworkManager.Device.Bond

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress  readable   s
+Carrier    readable   b
+Slaves     readable   ao
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

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

+
+
+
+

The "Slaves" property

+
+Slaves  readable   ao
+
+

Array of object paths representing devices which are currently slaved to this device.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html new file mode 100644 index 00000000..83f25082 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html @@ -0,0 +1,104 @@ + + + + +org.freedesktop.NetworkManager.Device.Bridge: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Bridge

+

org.freedesktop.NetworkManager.Device.Bridge

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress  readable   s
+Carrier    readable   b
+Slaves     readable   ao
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

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

+
+
+
+

The "Slaves" property

+
+Slaves  readable   ao
+
+

Array of object paths representing devices which are currently slaved to this device.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html new file mode 100644 index 00000000..73fadb87 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html @@ -0,0 +1,95 @@ + + + + +org.freedesktop.NetworkManager.Device.Generic: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Generic

+

org.freedesktop.NetworkManager.Device.Generic

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress        readable   s
+TypeDescription  readable   s
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "TypeDescription" property

+
+TypeDescription  readable   s
+
+

A (non-localized) description of the interface type, if known.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html new file mode 100644 index 00000000..ffc09320 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html @@ -0,0 +1,176 @@ + + + + +org.freedesktop.NetworkManager.Device.IPTunnel: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.IPTunnel

+

org.freedesktop.NetworkManager.Device.IPTunnel

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Mode                readable   u
+Parent              readable   o
+Local               readable   s
+Remote              readable   s
+Ttl                 readable   y
+Tos                 readable   y
+PathMtuDiscovery    readable   b
+InputKey            readable   s
+OutputKey           readable   s
+EncapsulationLimit  readable   y
+FlowLabel           readable   u
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Mode" property

+
+Mode  readable   u
+
+

The tunneling mode.

+
+
+
+

The "Parent" property

+
+Parent  readable   o
+
+

The object path of the parent device.

+
+
+
+

The "Local" property

+
+Local  readable   s
+
+

The local endpoint of the tunnel.

+
+
+
+

The "Remote" property

+
+Remote  readable   s
+
+

The remote endpoint of the tunnel.

+
+
+
+

The "Ttl" property

+
+Ttl  readable   y
+
+

The TTL assigned to tunneled packets. 0 is a special value meaning that packets inherit the TTL value

+
+
+
+

The "Tos" property

+
+Tos  readable   y
+
+

The type of service (IPv4) or traffic class (IPv6) assigned to tunneled packets.

+
+
+
+

The "PathMtuDiscovery" property

+
+PathMtuDiscovery  readable   b
+
+

Whether path MTU discovery is enabled on this tunnel.

+
+
+
+

The "InputKey" property

+
+InputKey  readable   s
+
+

The key used for incoming packets.

+
+
+
+

The "OutputKey" property

+
+OutputKey  readable   s
+
+

The key used for outgoing packets.

+
+
+
+

The "EncapsulationLimit" property

+
+EncapsulationLimit  readable   y
+
+

How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.

+
+
+
+

The "FlowLabel" property

+
+FlowLabel  readable   u
+
+

The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html new file mode 100644 index 00000000..6ba8403e --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html @@ -0,0 +1,95 @@ + + + + +org.freedesktop.NetworkManager.Device.Infiniband: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Infiniband

+

org.freedesktop.NetworkManager.Device.Infiniband

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress  readable   s
+Carrier    readable   b
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

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

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html new file mode 100644 index 00000000..ab240f49 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html @@ -0,0 +1,113 @@ + + + + +org.freedesktop.NetworkManager.Device.Macvlan: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Macvlan

+

org.freedesktop.NetworkManager.Device.Macvlan

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Parent     readable   o
+Mode       readable   s
+NoPromisc  readable   b
+Tap        readable   b
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Parent" property

+
+Parent  readable   o
+
+

The object path of the parent device.

+
+
+
+

The "Mode" property

+
+Mode  readable   s
+
+

The macvlan mode, one of "private", "vepa", "bridge", or "passthru".

+
+
+
+

The "NoPromisc" property

+
+NoPromisc  readable   b
+
+

Whether the device is blocked from going into promiscuous mode.

+
+
+
+

The "Tap" property

+
+Tap  readable   b
+
+

Whether the device is a macvtap.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html new file mode 100644 index 00000000..a587a928 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -0,0 +1,95 @@ + + + + +org.freedesktop.NetworkManager.Device.Modem: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Modem

+

org.freedesktop.NetworkManager.Device.Modem

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+ModemCapabilities    readable   u
+CurrentCapabilities  readable   u
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "ModemCapabilities" property

+
+ModemCapabilities  readable   u
+
+

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.

+
+
+
+

The "CurrentCapabilities" property

+
+CurrentCapabilities  readable   u
+
+

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

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html new file mode 100644 index 00000000..24d43344 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html @@ -0,0 +1,104 @@ + + + + +org.freedesktop.NetworkManager.Device.OlpcMesh: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.OlpcMesh

+

org.freedesktop.NetworkManager.Device.OlpcMesh

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress      readable   s
+Companion      readable   o
+ActiveChannel  readable   u
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

Emitted when the wireless device's properties changed.

+
++++ + + + + +

a{sv} properties:

A dictionary containing the FIXME: check changed parameters.

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

The hardware address of the device.

+
+
+
+

The "Companion" property

+
+Companion  readable   o
+
+

The object path of the companion device.

+
+
+
+

The "ActiveChannel" property

+
+ActiveChannel  readable   u
+
+

The currently active channel.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html new file mode 100644 index 00000000..bda719d3 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html @@ -0,0 +1,104 @@ + + + + +org.freedesktop.NetworkManager.Device.Team: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Team

+

org.freedesktop.NetworkManager.Device.Team

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress  readable   s
+Carrier    readable   b
+Slaves     readable   ao
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

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

+
+
+
+

The "Slaves" property

+
+Slaves  readable   ao
+
+

Array of object paths representing devices which are currently slaved to this device.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html new file mode 100644 index 00000000..4815cf6e --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html @@ -0,0 +1,140 @@ + + + + +org.freedesktop.NetworkManager.Device.Tun: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Tun

+

org.freedesktop.NetworkManager.Device.Tun

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Owner       readable   x
+Group       readable   x
+Mode        readable   s
+NoPi        readable   b
+VnetHdr     readable   b
+MultiQueue  readable   b
+HwAddress   readable   s
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Owner" property

+
+Owner  readable   x
+
+

The uid of the tunnel owner, or -1 if it has no owner.

+
+
+
+

The "Group" property

+
+Group  readable   x
+
+

The gid of the tunnel group, or -1 if it has no owner.

+
+
+
+

The "Mode" property

+
+Mode  readable   s
+
+

The tunnel mode, either "tun" or "tap".

+
+
+
+

The "NoPi" property

+
+NoPi  readable   b
+
+

The tunnel's "TUN_NO_PI" flag; true if no protocol info is prepended to the tunnel packets.

+
+
+
+

The "VnetHdr" property

+
+VnetHdr  readable   b
+
+

The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets include a virtio network header.

+
+
+
+

The "MultiQueue" property

+
+MultiQueue  readable   b
+
+

The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to the tap device multiple times, for multiple send/receive queues.

+
+
+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html new file mode 100644 index 00000000..6bdc741f --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html @@ -0,0 +1,86 @@ + + + + +org.freedesktop.NetworkManager.Device.Veth: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Veth

+

org.freedesktop.NetworkManager.Device.Veth

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Peer  readable   o
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Peer" property

+
+Peer  readable   o
+
+

The object path of the device's peer.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html new file mode 100644 index 00000000..75d564bb --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html @@ -0,0 +1,113 @@ + + + + +org.freedesktop.NetworkManager.Device.Vlan: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Vlan

+

org.freedesktop.NetworkManager.Device.Vlan

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress  readable   s
+Carrier    readable   b
+Parent     readable   o
+VlanId     readable   u
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

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

+
+
+
+

The "Parent" property

+
+Parent  readable   o
+
+

Object path of the parent device of this VLAN device.

+
+
+
+

The "VlanId" property

+
+VlanId  readable   u
+
+

The VLAN ID of this VLAN interface.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html new file mode 100644 index 00000000..ec4a48d4 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html @@ -0,0 +1,230 @@ + + + + +org.freedesktop.NetworkManager.Device.Vxlan: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Vxlan

+

org.freedesktop.NetworkManager.Device.Vxlan

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Parent      readable   o
+HwAddress   readable   s
+Id          readable   u
+Group       readable   s
+Local       readable   s
+Tos         readable   y
+Ttl         readable   y
+Learning    readable   b
+Ageing      readable   u
+Limit       readable   u
+DstPort     readable   q
+SrcPortMin  readable   q
+SrcPortMax  readable   q
+Proxy       readable   b
+Rsc         readable   b
+L2miss      readable   b
+L3miss      readable   b
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Parent" property

+
+Parent  readable   o
+
+

The object path of the parent device (if the VXLAN is not purely internal to this host).

+
+
+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "Id" property

+
+Id  readable   u
+
+

The VXLAN Network Identifier (VNI).

+
+
+
+

The "Group" property

+
+Group  readable   s
+
+

The IP (v4 or v6) multicast group used to communicate with other physical hosts on this VXLAN.

+
+
+
+

The "Local" property

+
+Local  readable   s
+
+

The local IPv4 or IPv6 address to use when sending VXLAN packets to other physical hosts.

+
+
+
+

The "Tos" property

+
+Tos  readable   y
+
+

The value to use in the IP ToS field for VXLAN packets sent to other physical hosts.

+
+
+
+

The "Ttl" property

+
+Ttl  readable   y
+
+

The value to use in the IP TTL field for VXLAN packets sent to other physical hosts.

+
+
+
+

The "Learning" property

+
+Learning  readable   b
+
+

True if the VXLAN dynamically learns remote IP addresses.

+
+
+
+

The "Ageing" property

+
+Ageing  readable   u
+
+

The interval in seconds at which the kernel purges stale cached addresses.

+
+
+
+

The "Limit" property

+
+Limit  readable   u
+
+

The maximum number of entries that can be added to the VXLAN's forwarding table.

+
+
+
+

The "DstPort" property

+
+DstPort  readable   q
+
+

Destination port for outgoing VXLAN packets.

+
+
+
+

The "SrcPortMin" property

+
+SrcPortMin  readable   q
+
+

The lowest source port number to use for outgoing VXLAN packets.

+
+
+
+

The "SrcPortMax" property

+
+SrcPortMax  readable   q
+
+

The highest source port number to use for outgoing VXLAN packets.

+
+
+
+

The "Proxy" property

+
+Proxy  readable   b
+
+

True if the VXLAN is implementing DOVE ARP proxying for remote clients.

+
+
+
+

The "Rsc" property

+
+Rsc  readable   b
+
+

True if the VXLAN is implementing DOVE route short-circuiting of known remote IP addresses.

+
+
+
+

The "L2miss" property

+
+L2miss  readable   b
+
+

True if the VXLAN will emit netlink notifications of L2 switch misses.

+
+
+
+

The "L3miss" property

+
+L3miss  readable   b
+
+

True if the VXLAN will emit netlink notifications of L3 switch misses.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html new file mode 100644 index 00000000..3ef7947b --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html @@ -0,0 +1,213 @@ + + + + +org.freedesktop.NetworkManager.Device.WiMax: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.WiMax

+

org.freedesktop.NetworkManager.Device.WiMax

+
+
+

Methods

+
+GetNspList (OUT ao nsps);
+
+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+NspAdded          (o     nsp);
+NspRemoved        (o     nsp);
+
+
+
+

Properties

+
+Nsps             readable   ao
+HwAddress        readable   s
+CenterFrequency  readable   u
+Rssi             readable   i
+Cinr             readable   i
+TxPower          readable   i
+Bsid             readable   s
+ActiveNsp        readable   o
+
+
+
+

Description

+

+
+
+

Method Details

+
+

The GetNspList() method

+
+GetNspList (OUT ao nsps);
+
+

Get the list of NSPs visible to this device.

+
++++ + + + + +

OUT ao nsps:

List of NSP object paths

+
+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

Emitted when the WiMax device's properties changed.

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values.

+
+
+
+

The "NspAdded" signal

+
+NspAdded (o nsp);
+
+

Emitted when a new NSP is found by the device.

+
++++ + + + + +

o nsp:

The object path of the newly found NSP.

+
+
+
+

The "NspRemoved" signal

+
+NspRemoved (o nsp);
+
+

Emitted when an NSP disappears from view of the device.

+
++++ + + + + +

o nsp:

The object path of the NSP that has disappeared.

+
+
+
+

Property Details

+
+

The "Nsps" property

+
+Nsps  readable   ao
+
+

List of object paths of Network Service Providers (NSPs) visible to this WiMAX device.

+
+
+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Hardware address of the device.

+
+
+
+

The "CenterFrequency" property

+
+CenterFrequency  readable   u
+
+

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.

+
+
+
+

The "Rssi" property

+
+Rssi  readable   i
+
+

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.

+
+
+
+

The "Cinr" property

+
+Cinr  readable   i
+
+

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.

+
+
+
+

The "TxPower" property

+
+TxPower  readable   i
+
+

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.

+
+
+
+

The "Bsid" property

+
+Bsid  readable   s
+
+

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

+
+
+
+

The "ActiveNsp" property

+
+ActiveNsp  readable   o
+
+

Object path of the NSP currently used by the WiMax device.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html new file mode 100644 index 00000000..09de05da --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html @@ -0,0 +1,122 @@ + + + + +org.freedesktop.NetworkManager.Device.Wired: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Wired

+

org.freedesktop.NetworkManager.Device.Wired

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+HwAddress        readable   s
+PermHwAddress    readable   s
+Speed            readable   u
+S390Subchannels  readable   as
+Carrier          readable   b
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

Active hardware address of the device.

+
+
+
+

The "PermHwAddress" property

+
+PermHwAddress  readable   s
+
+

Permanent hardware address of the device.

+
+
+
+

The "Speed" property

+
+Speed  readable   u
+
+

Design speed of the device, in megabits/second (Mb/s).

+
+
+
+

The "S390Subchannels" property

+
+S390Subchannels  readable   as
+
+

Array of S/390 subchannels for S/390 or z/Architecture devices.

+
+
+
+

The "Carrier" property

+
+Carrier  readable   b
+
+

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

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html new file mode 100644 index 00000000..3230bac7 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -0,0 +1,242 @@ + + + + +org.freedesktop.NetworkManager.Device.Wireless: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device.Wireless

+

org.freedesktop.NetworkManager.Device.Wireless

+
+
+

Methods

+
+GetAccessPoints    (OUT ao    access_points);
+GetAllAccessPoints (OUT ao    access_points);
+RequestScan        (IN  a{sv} options);
+
+
+
+

Signals

+
+PropertiesChanged  (a{sv} properties);
+AccessPointAdded   (o     access_point);
+AccessPointRemoved (o     access_point);
+
+
+
+

Properties

+
+HwAddress             readable   s
+PermHwAddress         readable   s
+Mode                  readable   u
+Bitrate               readable   u
+AccessPoints          readable   ao
+ActiveAccessPoint     readable   o
+WirelessCapabilities  readable   u
+
+
+
+

Description

+

+
+
+

Method Details

+
+

The GetAccessPoints() method

+
+GetAccessPoints (OUT ao access_points);
+
+

DEPRECATED. Get the list of access points visible to this device. Note that this list does not include access points which hide their SSID. To retrieve a list of all access points (including hidden ones) use the GetAllAccessPoints() method.

+
++++ + + + + +

OUT ao access_points:

List of access point object paths.

+
+
+
+

The GetAllAccessPoints() method

+
+GetAllAccessPoints (OUT ao access_points);
+
+

Get the list of all access points visible to this device, including hidden ones for which the SSID is not yet known.

+
++++ + + + + +

OUT ao access_points:

List of access point object paths.

+
+
+
+

The RequestScan() method

+
+RequestScan (IN  a{sv} options);
+
+

Request the device to scan

+
++++ + + + + +

IN a{sv} options:

Options of scan. Currently 'ssids' option with value of "aay" type is supported.

+
+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

Emitted when the wireless device's properties changed.

+
++++ + + + + +

a{sv} properties:

A dictionary containing the FIXME: check changed parameters.

+
+
+
+

The "AccessPointAdded" signal

+
+AccessPointAdded (o access_point);
+
+

Emitted when a new access point is found by the device.

+
++++ + + + + +

o access_point:

The object path of the newly found access point.

+
+
+
+

The "AccessPointRemoved" signal

+
+AccessPointRemoved (o access_point);
+
+

Emitted when an access point disappears from view of the device.

+
++++ + + + + +

o access_point:

The object path of the access point that has disappeared.

+
+
+
+

Property Details

+
+

The "HwAddress" property

+
+HwAddress  readable   s
+
+

The active hardware address of the device.

+
+
+
+

The "PermHwAddress" property

+
+PermHwAddress  readable   s
+
+

The permanent hardware address of the device.

+
+
+
+

The "Mode" property

+
+Mode  readable   u
+
+

The operating mode of the wireless device.

+
+
+
+

The "Bitrate" property

+
+Bitrate  readable   u
+
+

The bit rate currently used by the wireless device, in kilobits/second (Kb/s).

+
+
+
+

The "AccessPoints" property

+
+AccessPoints  readable   ao
+
+

List of object paths of access point visible to this wireless device.

+
+
+
+

The "ActiveAccessPoint" property

+
+ActiveAccessPoint  readable   o
+
+

Object path of the access point currently used by the wireless device.

+
+
+
+

The "WirelessCapabilities" property

+
+WirelessCapabilities  readable   u
+
+

The capabilities of the wireless device.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html new file mode 100644 index 00000000..ee7203c5 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -0,0 +1,416 @@ + + + + +org.freedesktop.NetworkManager.Device: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Device

+

org.freedesktop.NetworkManager.Device

+
+
+

Methods

+
+Reapply              (IN  a{sa{sv}} connection,
+                      IN  t         version_id,
+                      IN  u         flags);
+GetAppliedConnection (IN  u         flags,
+                      OUT a{sa{sv}} connection,
+                      OUT t         version_id);
+Disconnect           ();
+Delete               ();
+
+
+
+

Signals

+
+StateChanged (u new_state,
+              u old_state,
+              u reason);
+
+
+
+

Properties

+
+Udi                   readable   s
+Interface             readable   s
+IpInterface           readable   s
+Driver                readable   s
+DriverVersion         readable   s
+FirmwareVersion       readable   s
+Capabilities          readable   u
+Ip4Address            readable   u
+State                 readable   u
+StateReason           readable   (uu)
+ActiveConnection      readable   o
+Ip4Config             readable   o
+Dhcp4Config           readable   o
+Ip6Config             readable   o
+Dhcp6Config           readable   o
+Managed               readwrite  b
+Autoconnect           readwrite  b
+FirmwareMissing       readable   b
+NmPluginMissing       readable   b
+DeviceType            readable   u
+AvailableConnections  readable   ao
+PhysicalPortId        readable   s
+Mtu                   readable   u
+Metered               readable   u
+LldpNeighbors         readable   aa{sv}
+Real                  readable   b
+
+
+
+

Description

+

+
+
+

Method Details

+
+

The Reapply() method

+
+Reapply (IN  a{sa{sv}} connection,
+         IN  t         version_id,
+         IN  u         flags);
+
+

Attempts to update the configuration of a device without deactivating it. NetworkManager has the concept of connections, which are profiles that contain the configuration for a networking device. Those connections are exposed via D-Bus as individual objects that can be created, modified and deleted. When activating such a settings-connection on a device, the settings-connection is cloned to become an applied-connection and used to configure the device (see GetAppliedConnection). Subsequent modification of the settings-connection don't propagate automatically to the device's applied-connection (with exception of the firewall-zone and the metered property). For the changes to take effect, you can either re-activate the settings-connection, or call Reapply. The Reapply call allows you to directly update the applied-connection and reconfigure the device. Reapply can also be useful if the currently applied-connection is equal to the connection that is about to be reapplied. This allows to reconfigure the device and revert external changes like removing or adding an IP address (which NetworkManager doesn't revert automatically because it is assumed that the user made these changes intentionally outside of NetworkManager). Reapply can make the applied-connection different from the settings-connection, just like updating the settings-connection can make them different.

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

IN a{sa{sv}} connection:

The optional connection settings that will be reapplied on the device. If empty, the currently active settings-connection will be used. The connection cannot arbitrarly differ from the current applied-connection otherwise the call will fail. Only certain changes are supported, like adding or removing IP addresses.

IN t version_id:

If non-zero, the current version id of the applied-connection must match. The current version id can be retrieved via GetAppliedConnection. This optional argument allows to catch concurrent modifications between the GetAppliedConnection call and Reapply.

IN u flags:

Flags which would modify the behavior of the Reapply call. There are no flags defined currently and the users should use the value of 0.

+
+
+
+

The GetAppliedConnection() method

+
+GetAppliedConnection (IN  u         flags,
+                      OUT a{sa{sv}} connection,
+                      OUT t         version_id);
+
+

Get the currently applied connection on the device. This is a snapshot of the last activated connection on the device, that is the configuration that is currently applied on the device. Usually this is the same as GetSettings of the referenced settings connection. However, it can differ if the settings connection was subsequently modified or the applied connection was modified by Reapply. The applied connection is set when activating a device or when calling Reapply.

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

IN u flags:

Flags which would modify the behavior of the GetAppliedConnection call. There are no flags defined currently and the users should use the value of 0.

OUT a{sa{sv}} connection:

The effective connection settings that the connection has currently applied.

OUT t version_id:

The version-id of the currently applied connection. This can be specified during Reapply to avoid races where you first fetch the applied connection, modify it and try to reapply it. If the applied connection is modified in the meantime, the version_id gets incremented and Reapply will fail.

+
+
+
+

The Disconnect() method

+
+Disconnect ();
+
+

Disconnects a device and prevents the device from automatically activating further connections without user intervention.

+
+
+
+

The Delete() method

+
+Delete ();
+
+

Deletes a software device from NetworkManager and removes the interface from the system. The method returns an error when called for a hardware device.

+
+
+
+

Signal Details

+
+

The "StateChanged" signal

+
+StateChanged (u new_state,
+              u old_state,
+              u reason);
+
+

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

u new_state:

The new state of the device.

u old_state:

The previous state of the device.

u reason:

A reason for the state transition.

+
+
+
+

Property Details

+
+

The "Udi" property

+
+Udi  readable   s
+
+

Operating-system specific transient device hardware identifier. This is an opaque string representing the underlying hardware for the device, and shouldn't be used to keep track of individual devices. For some device types (Bluetooth, Modems) it is an identifier used by the hardware service (ie bluez or ModemManager) to refer to that device, and client programs use it get additional information from those services which NM does not provide. The Udi is not guaranteed to be consistent across reboots or hotplugs of the hardware. If you're looking for a way to uniquely track each device in your application, use the object path. If you're looking for a way to track a specific piece of hardware across reboot or hotplug, use a MAC address or USB serial number.

+
+
+
+

The "Interface" property

+
+Interface  readable   s
+
+

The name of the device's control (and often data) interface.

+
+
+
+

The "IpInterface" property

+
+IpInterface  readable   s
+
+

The name of the device's data interface when available. This property may not refer to the actual data interface until the device has successfully established a data connection, indicated by the device's State becoming ACTIVATED.

+
+
+
+

The "Driver" property

+
+Driver  readable   s
+
+

The driver handling the device.

+
+
+
+

The "DriverVersion" property

+
+DriverVersion  readable   s
+
+

The version of the driver handling the device.

+
+
+
+

The "FirmwareVersion" property

+
+FirmwareVersion  readable   s
+
+

The firmware version for the device.

+
+
+
+

The "Capabilities" property

+
+Capabilities  readable   u
+
+

Flags describing the capabilities of the device.

+
+
+
+

The "Ip4Address" property

+
+Ip4Address  readable   u
+
+

DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.

+
+
+
+

The "State" property

+
+State  readable   u
+
+

The current state of the device.

+
+
+
+

The "StateReason" property

+
+StateReason  readable   (uu)
+
+

The current state and reason for changing to that state.

+
+
+
+

The "ActiveConnection" property

+
+ActiveConnection  readable   o
+
+

Object path of an ActiveConnection object that "owns" this device during activation. The ActiveConnection object tracks the life-cycle of a connection to a specific network and implements the org.freedesktop.NetworkManager.Connection.Active D-Bus interface.

+
+
+
+

The "Ip4Config" property

+
+Ip4Config  readable   o
+
+

Object path of the Ip4Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+
+
+
+

The "Dhcp4Config" property

+
+Dhcp4Config  readable   o
+
+

Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+
+
+
+

The "Ip6Config" property

+
+Ip6Config  readable   o
+
+

Object path of the Ip6Config object describing the configuration of the device. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+
+
+
+

The "Dhcp6Config" property

+
+Dhcp6Config  readable   o
+
+

Object path of the Dhcp6Config object describing the DHCP options returned by the DHCP server. Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.

+
+
+
+

The "Managed" property

+
+Managed  readwrite  b
+
+

Whether or not this device is managed by NetworkManager. Setting this property has a similar effect to configuring the device as unmanaged via the keyfile.unmanaged-devices setting in NetworkManager.conf. Changes to this value are not persistent and lost after NetworkManager restart.

+
+
+
+

The "Autoconnect" property

+
+Autoconnect  readwrite  b
+
+

If TRUE, indicates the device is allowed to autoconnect. If FALSE, manual intervention is required before the device will automatically connect to a known network, such as activating a connection using the device, or setting this property to TRUE. This property cannot be set to TRUE for default-unmanaged devices, since they never autoconnect.

+
+
+
+

The "FirmwareMissing" property

+
+FirmwareMissing  readable   b
+
+

If TRUE, indicates the device is likely missing firmware necessary for its operation.

+
+
+
+

The "NmPluginMissing" property

+
+NmPluginMissing  readable   b
+
+

If TRUE, indicates the NetworkManager plugin for the device is likely missing or misconfigured.

+
+
+
+

The "DeviceType" property

+
+DeviceType  readable   u
+
+

The general type of the network device; ie Ethernet, WiFi, etc.

+
+
+
+

The "AvailableConnections" property

+
+AvailableConnections  readable   ao
+
+

An array of object paths of every configured connection that is currently 'available' through this device.

+
+
+
+

The "PhysicalPortId" property

+
+PhysicalPortId  readable   s
+
+

If non-empty, an (opaque) indicator of the physical network port associated with the device. This can be used to recognize when two seemingly-separate hardware devices are actually just different virtual interfaces to the same physical port.

+
+
+
+

The "Mtu" property

+
+Mtu  readable   u
+
+

The device MTU (maximum transmission unit).

+
+
+
+

The "Metered" property

+
+Metered  readable   u
+
+

Whether the amount of traffic flowing through the device is subject to limitations, for example set by service providers.

+
+
+
+

The "LldpNeighbors" property

+
+LldpNeighbors  readable   aa{sv}
+
+

Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV names to variant boxed values.

+
+
+
+

The "Real" property

+
+Real  readable   b
+
+

True if the device exists, or False for placeholder devices that do not yet exist but could be automatically created by NetworkManager if one of their AvailableConnections was activated.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html new file mode 100644 index 00000000..88aabf84 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html @@ -0,0 +1,167 @@ + + + + +org.freedesktop.NetworkManager.IP4Config: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.IP4Config

+

org.freedesktop.NetworkManager.IP4Config

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Addresses    readable   aau
+AddressData  readable   aa{sv}
+Gateway      readable   s
+Routes       readable   aau
+RouteData    readable   aa{sv}
+Nameservers  readable   au
+Domains      readable   as
+Searches     readable   as
+DnsOptions   readable   as
+WinsServers  readable   au
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Addresses" property

+
+Addresses  readable   aau
+
+

Array of arrays of IPv4 address/prefix/gateway. All 3 elements of each array are in network byte order. Essentially: [(addr, prefix, gateway), (addr, prefix, gateway), ...] Deprecated: use AddressData and Gateway

+
+
+
+

The "AddressData" property

+
+AddressData  readable   aa{sv}
+
+

Array of IP address data objects. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes.

+
+
+
+

The "Gateway" property

+
+Gateway  readable   s
+
+

The gateway in use.

+
+
+
+

The "Routes" property

+
+Routes  readable   aau
+
+

Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of each tuple are in network byte order. 'route' and 'next hop' are IPv4 addresses, while prefix and metric are simple unsigned integers. Essentially: [(route, prefix, next-hop, metric), (route, prefix, next-hop, metric), ...] Deprecated: use RouteData

+
+
+
+

The "RouteData" property

+
+RouteData  readable   aa{sv}
+
+

Array of IP route data objects. All routes will include "dest" (an IP address string) and "prefix" (a uint). Some routes may include "next-hop" (an IP address string), "metric" (a uint), and additional attributes.

+
+
+
+

The "Nameservers" property

+
+Nameservers  readable   au
+
+

The nameservers in use.

+
+
+
+

The "Domains" property

+
+Domains  readable   as
+
+

A list of domains this address belongs to.

+
+
+
+

The "Searches" property

+
+Searches  readable   as
+
+

A list of dns searches.

+
+
+
+

The "DnsOptions" property

+
+DnsOptions  readable   as
+
+

A list of DNS options that modify the behavior of the DNS resolver. See resolv.conf(5) manual page for the list of supported options.

+
+
+
+

The "WinsServers" property

+
+WinsServers  readable   au
+
+

The Windows Internet Name Service servers associated with the connection. Each address is in network byte order.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html new file mode 100644 index 00000000..b369e2ab --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html @@ -0,0 +1,158 @@ + + + + +org.freedesktop.NetworkManager.IP6Config: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.IP6Config

+

org.freedesktop.NetworkManager.IP6Config

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Addresses    readable   a(ayuay)
+AddressData  readable   aa{sv}
+Gateway      readable   s
+Routes       readable   a(ayuayu)
+RouteData    readable   aa{sv}
+Nameservers  readable   aay
+Domains      readable   as
+Searches     readable   as
+DnsOptions   readable   as
+
+
+
+

Description

+

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

Property Details

+
+

The "Addresses" property

+
+Addresses  readable   a(ayuay)
+
+

Array of tuples of IPv6 address/prefix/gateway. Deprecated: use AddressData and Gateway.

+
+
+
+

The "AddressData" property

+
+AddressData  readable   aa{sv}
+
+

Array of IP address data objects. All addresses will include "address" (an IP address string), and "prefix" (a uint). Some addresses may include additional attributes.

+
+
+
+

The "Gateway" property

+
+Gateway  readable   s
+
+

The gateway in use.

+
+
+
+

The "Routes" property

+
+Routes  readable   a(ayuayu)
+
+

Tuples of IPv6 route/prefix/next-hop/metric. Deprecated: use RouteData

+
+
+
+

The "RouteData" property

+
+RouteData  readable   aa{sv}
+
+

Array of IP route data objects. All routes will include "dest" (an IP address string) and "prefix" (a uint). Some routes may include "next-hop" (an IP address string), "metric" (a uint), and additional attributes.

+
+
+
+

The "Nameservers" property

+
+Nameservers  readable   aay
+
+

The nameservers in use.

+
+
+
+

The "Domains" property

+
+Domains  readable   as
+
+

A list of domains this address belongs to.

+
+
+
+

The "Searches" property

+
+Searches  readable   as
+
+

A list of dns searches.

+
+
+
+

The "DnsOptions" property

+
+DnsOptions  readable   as
+
+

A list of DNS options that modify the behavior of the DNS resolver. See resolv.conf(5) manual page for the list of supported options.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html new file mode 100644 index 00000000..a8466a8e --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html @@ -0,0 +1,133 @@ + + + + +org.freedesktop.NetworkManager.PPP: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.PPP

+

org.freedesktop.NetworkManager.PPP

+
+
+

Methods

+
+NeedSecrets  (OUT s     username,
+              OUT s     password);
+SetIp4Config (IN  a{sv} config);
+SetIp6Config (IN  a{sv} config);
+SetState     (IN  u     state);
+
+
+
+

Description

+

+
+
+

Method Details

+
+

The NeedSecrets() method

+
+NeedSecrets (OUT s username,
+             OUT s password);
+
+

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

OUT s username:

OUT s password:

+
+
+
+

The SetIp4Config() method

+
+SetIp4Config (IN  a{sv} config);
+
+

+
++++ + + + + +

IN a{sv} config:

+
+
+
+

The SetIp6Config() method

+
+SetIp6Config (IN  a{sv} config);
+
+

+
++++ + + + + +

IN a{sv} config:

+
+
+
+

The SetState() method

+
+SetState (IN  u state);
+
+

+
++++ + + + + +

IN u state:

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html new file mode 100644 index 00000000..d160c1a1 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -0,0 +1,181 @@ + + + + +org.freedesktop.NetworkManager.SecretAgent: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.SecretAgent

+

org.freedesktop.NetworkManager.SecretAgent

+
+
+

Methods

+
+GetSecrets       (IN  a{sa{sv}} connection,
+                  IN  o         connection_path,
+                  IN  s         setting_name,
+                  IN  as        hints,
+                  IN  u         flags,
+                  OUT a{sa{sv}} secrets);
+CancelGetSecrets (IN  o         connection_path,
+                  IN  s         setting_name);
+SaveSecrets      (IN  a{sa{sv}} connection,
+                  IN  o         connection_path);
+DeleteSecrets    (IN  a{sa{sv}} connection,
+                  IN  o         connection_path);
+
+
+
+

Description

+

Private D-Bus interface used by secret agents that store and provide secrets to NetworkManager. If an agent provides secrets to NetworkManager as part of connection creation, and the some of those secrets are "agent owned" the agent should store those secrets itself and should not expect its SaveSecrets() method to be called. SaveSecrets() will be called eg if some program other than the agent itself (like a connection editor) changes the secrets out of band. The agent should implement this D-Bus interface on an object with the path /org/freedesktop/NetworkManager/SecretAgent.

+
+
+

Method Details

+
+

The GetSecrets() method

+
+GetSecrets (IN  a{sa{sv}} connection,
+            IN  o         connection_path,
+            IN  s         setting_name,
+            IN  as        hints,
+            IN  u         flags,
+            OUT a{sa{sv}} secrets);
+
+

Retrieve and return stored secrets, if any, or request new secrets from the agent's user. If user interaction is allowed and the user enters new secrets, the agent is expected to save the new secrets to persistent storage (if the secret's flags include AGENT_OWNED) as NetworkManager will not send these secrets back to the same agent via a SaveSecrets() call. If the user canceled any interaction, the agent should return the UserCanceled error (see below).

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

IN a{sa{sv}} connection:

Nested settings maps containing the connection for which secrets are being requested. This may contain system-owned secrets if the agent has successfully authenticated to modify system network settings and the GetSecrets request flags allow user interaction.

IN o connection_path:

Object path of the connection for which secrets are being requested.

IN s setting_name:

Setting name for which secrets are being requested.

IN as hints:

Array of strings of key names in the requested setting for which NetworkManager thinks a secrets may be required, and/or well-known identifiers and data that may be useful to the client in processing the secrets request. Note that it's not always possible to determine which secret is required, so in some cases no hints may be given. The Agent should return any secrets it has, or that it thinks are required, regardless of what hints NetworkManager sends in this request. Some hints have special prefixes that provide information to the agent; for example, VPN requests may send server-specific messages prefixed with "x-vpn-message:".

IN u flags:

Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

OUT a{sa{sv}} secrets:

Nested settings maps containing secrets. Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.

+
+
+
+

The CancelGetSecrets() method

+
+CancelGetSecrets (IN  o connection_path,
+                  IN  s setting_name);
+
+

Cancel a pending GetSecrets request for secrets of the given connection. Any GetSecrets request with the same 'connection_path' and 'setting_name' that are given in a CancelGetSecrets request should be canceled.

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

IN o connection_path:

Object path of the connection for which, if secrets for the given 'setting_name' are being requested, the request should be canceled.

IN s setting_name:

Setting name for which secrets for this connection were originally being requested.

+
+
+
+

The SaveSecrets() method

+
+SaveSecrets (IN  a{sa{sv}} connection,
+             IN  o         connection_path);
+
+

Save given secrets to backing storage.

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

IN a{sa{sv}} connection:

Nested settings maps containing the entire connection (including secrets), for which the agent should save the secrets to backing storage. This method will not be called when the agent itself is the process creating or updating a connection; in that case the agent is assumed to have already saved those secrets since it had them already.

IN o connection_path:

Object path of the connection for which the agent should save secrets to backing storage.

+
+
+
+

The DeleteSecrets() method

+
+DeleteSecrets (IN  a{sa{sv}} connection,
+               IN  o         connection_path);
+
+

Delete secrets from backing storage.

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

IN a{sa{sv}} connection:

Nested settings maps containing the connection properties (sans secrets), for which the agent should delete the secrets from backing storage.

IN o connection_path:

Object path of the connection for which the agent should delete secrets from backing storage.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html new file mode 100644 index 00000000..db2a7d57 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html @@ -0,0 +1,222 @@ + + + + +org.freedesktop.NetworkManager.Settings.Connection: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Settings.Connection

+

org.freedesktop.NetworkManager.Settings.Connection

+
+
+

Methods

+
+Update        (IN  a{sa{sv}} properties);
+UpdateUnsaved (IN  a{sa{sv}} properties);
+Delete        ();
+GetSettings   (OUT a{sa{sv}} settings);
+GetSecrets    (IN  s         setting_name,
+               OUT a{sa{sv}} secrets);
+ClearSecrets  ();
+Save          ();
+
+
+
+

Signals

+
+Updated           ();
+Removed           ();
+PropertiesChanged (a{sv} properties);
+
+
+
+

Properties

+
+Unsaved  readable   b
+
+
+
+

Description

+

Represents a single network connection configuration.

+
+
+

Method Details

+
+

The Update() method

+
+Update (IN  a{sa{sv}} properties);
+
+

Update the connection with new settings and properties (replacing all previous settings and properties) and save the connection to disk. Secrets may be part of the update request, and will be either stored in persistent storage or sent to a Secret Agent for storage, depending on the flags associated with each secret.

+
++++ + + + + +

IN a{sa{sv}} properties:

New connection settings, properties, and (optionally) secrets.

+
+
+
+

The UpdateUnsaved() method

+
+UpdateUnsaved (IN  a{sa{sv}} properties);
+
+

Update the connection with new settings and properties (replacing all previous settings and properties) but do not immediately save the connection to disk. Secrets may be part of the update request and may sent to a Secret Agent for storage, depending on the flags associated with each secret. Use the 'Save' method to save these changes to disk. Note that unsaved changes will be lost if the connection is reloaded from disk (either automatically on file change or due to an explicit ReloadConnections call).

+
++++ + + + + +

IN a{sa{sv}} properties:

New connection settings, properties, and (optionally) secrets.

+
+
+
+

The Delete() method

+
+Delete ();
+
+

Delete the connection.

+
+
+
+

The GetSettings() method

+
+GetSettings (OUT a{sa{sv}} settings);
+
+

Get the settings maps describing this network configuration. This will never include any secrets required for connection to the network, as those are often protected. Secrets must be requested separately using the GetSecrets() call.

+
++++ + + + + +

OUT a{sa{sv}} settings:

The nested settings maps describing this object.

+
+
+
+

The GetSecrets() method

+
+GetSecrets (IN  s         setting_name,
+            OUT a{sa{sv}} secrets);
+
+

Get the secrets belonging to this network configuration. Only secrets from persistent storage or a Secret Agent running in the requestor's session will be returned. The user will never be prompted for secrets as a result of this request.

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

IN s setting_name:

Name of the setting to return secrets for. If empty, all all secrets will be returned.

OUT a{sa{sv}} secrets:

Nested settings maps containing secrets.

+
+
+
+

The ClearSecrets() method

+
+ClearSecrets ();
+
+

Clear the secrets belonging to this network connection profile.

+
+
+
+

The Save() method

+
+Save ();
+
+

Saves a "dirty" connection (that had previously been updated with UpdateUnsaved) to persistent storage.

+
+
+
+

Signal Details

+
+

The "Updated" signal

+
+Updated ();
+
+

Emitted when any settings or permissions change. When handling this signal, clients should re-read the connection using the GetSettings method to get the changes and to ensure the client still has permission to access the connection.

+
+
+
+

The "Removed" signal

+
+Removed ();
+
+

Emitted when this connection is no longer available. This happens when the connection is deleted or if it is no longer accessible by any of the system's logged-in users. After receipt of this signal, the object no longer exists. Also see the Settings.ConnectionRemoved signal.

+
+
+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values.

+
+
+
+

Property Details

+
+

The "Unsaved" property

+
+Unsaved  readable   b
+
+

If set, indicates that the in-memory state of the connection does not match the on-disk state. This flag will be set when UpdateUnsaved() is called or when any connection details change, and cleared when the connection is saved to disk via Save() or from internal operations.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html new file mode 100644 index 00000000..d4b243dc --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html @@ -0,0 +1,320 @@ + + + + +org.freedesktop.NetworkManager.Settings: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.Settings

+

org.freedesktop.NetworkManager.Settings

+
+
+

Methods

+
+ListConnections      (OUT ao        connections);
+GetConnectionByUuid  (IN  s         uuid,
+                      OUT o         connection);
+AddConnection        (IN  a{sa{sv}} connection,
+                      OUT o         path);
+AddConnectionUnsaved (IN  a{sa{sv}} connection,
+                      OUT o         path);
+LoadConnections      (IN  as        filenames,
+                      OUT b         status,
+                      OUT as        failures);
+ReloadConnections    (OUT b         status);
+SaveHostname         (IN  s         hostname);
+
+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+NewConnection     (o     connection);
+ConnectionRemoved (o     connection);
+
+
+
+

Properties

+
+Connections  readable   ao
+Hostname     readable   s
+CanModify    readable   b
+
+
+
+

Description

+

The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.

+
+
+

Method Details

+
+

The ListConnections() method

+
+ListConnections (OUT ao connections);
+
+

List the saved network connections known to NetworkManager.

+
++++ + + + + +

OUT ao connections:

List of connections.

+
+
+
+

The GetConnectionByUuid() method

+
+GetConnectionByUuid (IN  s uuid,
+                     OUT o connection);
+
+

Retrieve the object path of a connection, given that connection's UUID.

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

IN s uuid:

The UUID to find the connection object path for.

OUT o connection:

The connection's object path.

+
+
+
+

The AddConnection() method

+
+AddConnection (IN  a{sa{sv}} connection,
+               OUT o         path);
+
+

Add new connection and save it to disk. This operation does not start the network connection unless (1) device is idle and able to connect to the network described by the new connection, and (2) the connection is allowed to be started automatically.

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

IN a{sa{sv}} connection:

Connection settings and properties.

OUT o path:

Object path of the new connection that was just added.

+
+
+
+

The AddConnectionUnsaved() method

+
+AddConnectionUnsaved (IN  a{sa{sv}} connection,
+                      OUT o         path);
+
+

Add new connection but do not save it to disk immediately. This operation does not start the network connection unless (1) device is idle and able to connect to the network described by the new connection, and (2) the connection is allowed to be started automatically. Use the 'Save' method on the connection to save these changes to disk. Note that unsaved changes will be lost if the connection is reloaded from disk (either automatically on file change or due to an explicit ReloadConnections call).

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

IN a{sa{sv}} connection:

Connection settings and properties.

OUT o path:

Object path of the new connection that was just added.

+
+
+
+

The LoadConnections() method

+
+LoadConnections (IN  as filenames,
+                 OUT b  status,
+                 OUT as failures);
+
+

Loads or reloads the indicated connections from disk. You should call this after making changes directly to an on-disk connection file to make sure that NetworkManager sees the changes. (If "monitor-connection-files" in NetworkManager.conf is "true", then this will have no real effect, but is harmless.) As with AddConnection(), this operation does not necessarily start the network connection.

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

IN as filenames:

Array of paths to on-disk connection profiles in directories monitored by NetworkManager.

OUT b status:

Success or failure of the operation as a whole. True if NetworkManager at least tried to load the indicated connections, even if it did not succeed. False if an error occurred before trying to load the connections (eg, permission denied).

OUT as failures:

Paths of connection files that could not be loaded.

+
+
+
+

The ReloadConnections() method

+
+ReloadConnections (OUT b status);
+
+

Tells NetworkManager to reload all connection files from disk, including noticing any added or deleted connection files. By default, connections are re-read automatically any time they change, so you only need to use this command if you have set "monitor-connection-files=false" in NetworkManager.conf.

+
++++ + + + + +

OUT b status:

Success or failure.

+
+
+
+

The SaveHostname() method

+
+SaveHostname (IN  s hostname);
+
+

Save the hostname to persistent configuration.

+
++++ + + + + +

IN s hostname:

The hostname to save to persistent configuration. If blank, the persistent hostname is cleared.

+
+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

The "NewConnection" signal

+
+NewConnection (o connection);
+
+

Emitted when a new connection has been added after NetworkManager has started up and initialized. This signal is not emitted for connections read while starting up, because NetworkManager's D-Bus service is only available after all connections have been read, and to prevent spamming listeners with too many signals at one time. To retrieve the initial connection list, call the ListConnections() method once, and then listen for individual Settings.NewConnection and Settings.Connection.Deleted signals for further updates.

+
++++ + + + + +

o connection:

Object path of the new connection.

+
+
+
+

The "ConnectionRemoved" signal

+
+ConnectionRemoved (o connection);
+
+

Emitted when a connection is no longer available. This happens when the connection is deleted or if it is no longer accessible by any of the system's logged-in users. After receipt of this signal, the connection no longer exists and cannot be used. Also see the Settings.Connection.Removed signal.

+
++++ + + + + +

o connection:

Object path of the removed connection.

+
+
+
+

Property Details

+
+

The "Connections" property

+
+Connections  readable   ao
+
+

List of object paths of available network connection profiles.

+
+
+
+

The "Hostname" property

+
+Hostname  readable   s
+
+

The machine hostname stored in persistent configuration.

+
+
+
+

The "CanModify" property

+
+CanModify  readable   b
+
+

If true, adding and modifying connections is supported.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html new file mode 100644 index 00000000..ea6bd031 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -0,0 +1,122 @@ + + + + +org.freedesktop.NetworkManager.VPN.Connection: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.VPN.Connection

+

org.freedesktop.NetworkManager.VPN.Connection

+
+
+

Signals

+
+PropertiesChanged (a{sv} properties);
+VpnStateChanged   (u     state,
+                   u     reason);
+
+
+
+

Properties

+
+VpnState  readable   u
+Banner    readable   s
+
+
+
+

Description

+

Represents an active connection to a Virtual Private Network.

+
+
+

Signal Details

+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

+
++++ + + + + +

a{sv} properties:

A dictionary mapping property names to variant boxed values

+
+
+
+

The "VpnStateChanged" signal

+
+VpnStateChanged (u state,
+                 u reason);
+
+

Emitted when the state of the VPN connection has changed.

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

u state:

The new state of the VPN connection.

u reason:

Reason code describing the change to the new state.

+
+
+
+

Property Details

+
+

The "VpnState" property

+
+VpnState  readable   u
+
+

The VPN-specific state of the connection.

+
+
+
+

The "Banner" property

+
+Banner  readable   s
+
+

The banner string of the VPN connection.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html new file mode 100644 index 00000000..64517b2c --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -0,0 +1,392 @@ + + + + +org.freedesktop.NetworkManager.VPN.Plugin: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager.VPN.Plugin

+

org.freedesktop.NetworkManager.VPN.Plugin

+
+
+

Methods

+
+Connect            (IN  a{sa{sv}} connection);
+ConnectInteractive (IN  a{sa{sv}} connection,
+                    IN  a{sv}     details);
+NeedSecrets        (IN  a{sa{sv}} settings,
+                    OUT s         setting_name);
+Disconnect         ();
+SetConfig          (IN  a{sv}     config);
+SetIp4Config       (IN  a{sv}     config);
+SetIp6Config       (IN  a{sv}     config);
+SetFailure         (IN  s         reason);
+NewSecrets         (IN  a{sa{sv}} connection);
+
+
+
+

Signals

+
+StateChanged    (u     state);
+SecretsRequired (s     message,
+                 as    secrets);
+Config          (a{sv} config);
+Ip4Config       (a{sv} ip4config);
+Ip6Config       (a{sv} ip6config);
+LoginBanner     (s     banner);
+Failure         (u     reason);
+
+
+
+

Properties

+
+State  readable   u
+
+
+
+

Description

+

This interface is provided by plugins providing VPN services to the NetworkManager daemon.

+
+
+

Method Details

+
+

The Connect() method

+
+Connect (IN  a{sa{sv}} connection);
+
+

Tells the plugin to connect. Interactive secrets requests (eg, emitting the SecretsRequired signal) are not allowed.

+
++++ + + + + +

IN a{sa{sv}} connection:

Describes the connection to be established.

+
+
+
+

The ConnectInteractive() method

+
+ConnectInteractive (IN  a{sa{sv}} connection,
+                    IN  a{sv}     details);
+
+

Tells the plugin to connect, allowing interactive secrets requests (eg the plugin is allowed to emit the SecretsRequired signal if the VPN service indicates that it needs additional secrets during the connect process).

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

IN a{sa{sv}} connection:

Describes the connection to be established.

IN a{sv} details:

Additional details about the Connect process.

+
+
+
+

The NeedSecrets() method

+
+NeedSecrets (IN  a{sa{sv}} settings,
+             OUT s         setting_name);
+
+

Asks the plugin whether the provided connection will require secrets to connect successfully.

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

IN a{sa{sv}} settings:

Describes the connection that may need secrets.

OUT s setting_name:

The setting name within the provided connection that requires secrets, if any.

+
+
+
+

The Disconnect() method

+
+Disconnect ();
+
+

Disconnect the plugin.

+
+
+
+

The SetConfig() method

+
+SetConfig (IN  a{sv} config);
+
+

Set generic connection details on the connection.

+
++++ + + + + +

IN a{sv} config:

Generic configuration details for the connection.

+
+
+
+

The SetIp4Config() method

+
+SetIp4Config (IN  a{sv} config);
+
+

Set IPv4 details on the connection.

+
++++ + + + + +

IN a{sv} config:

Ip4Config details for the connection. You must call SetConfig() before calling this.

+
+
+
+

The SetIp6Config() method

+
+SetIp6Config (IN  a{sv} config);
+
+

Set IPv6 details on the connection.

+
++++ + + + + +

IN a{sv} config:

Ip6Config details for the connection. You must call SetConfig() before calling this.

+
+
+
+

The SetFailure() method

+
+SetFailure (IN  s reason);
+
+

Indicate a failure to the plugin.

+
++++ + + + + +

IN s reason:

The reason for the failure.

+
+
+
+

The NewSecrets() method

+
+NewSecrets (IN  a{sa{sv}} connection);
+
+

Called in response to a SecretsRequired signal to deliver updated secrets or other information to the plugin.

+
++++ + + + + +

IN a{sa{sv}} connection:

Describes the connection including the new secrets.

+
+
+
+

Signal Details

+
+

The "StateChanged" signal

+
+StateChanged (u state);
+
+

Emitted when the plugin state changes.

+
++++ + + + + +

u state:

The new state of the plugin.

+
+
+
+

The "SecretsRequired" signal

+
+SecretsRequired (s  message,
+                 as secrets);
+
+

Emitted during an ongoing ConnectInteractive() request when the plugin has determined that new secrets are required. NetworkManager will then call the NewSecrets() method with a connection hash including the new secrets.

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

s message:

Informational message, if any, about the request. For example, if a second PIN is required, could indicate to the user to wait for the token code to change until entering the next PIN.

as secrets:

Array of strings of VPN secret names which the plugin thinks secrets may be required for, or other VPN-specific data to be processed by the VPN's front-end.

+
+
+
+

The "Config" signal

+
+Config (a{sv} config);
+
+

The plugin obtained generic configuration information.

+
++++ + + + + +

a{sv} config:

The configuration information.

+
+
+
+

The "Ip4Config" signal

+
+Ip4Config (a{sv} ip4config);
+
+

The plugin obtained an IPv4 configuration.

+
++++ + + + + +

a{sv} ip4config:

The IPv4 configuration.

+
+
+
+

The "Ip6Config" signal

+
+Ip6Config (a{sv} ip6config);
+
+

The plugin obtained an IPv6 configuration.

+
++++ + + + + +

a{sv} ip6config:

The IPv6 configuration.

+
+
+
+

The "LoginBanner" signal

+
+LoginBanner (s banner);
+
+

Emitted when the plugin receives a login banner from the VPN service.

+
++++ + + + + +

s banner:

The login banner string.

+
+
+
+

The "Failure" signal

+
+Failure (u reason);
+
+

Emitted when a failure in the VPN plugin occurs.

+
++++ + + + + +

u reason:

Reason code for the failure.

+
+
+
+

Property Details

+
+

The "State" property

+
+State  readable   u
+
+

The state of the plugin.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html new file mode 100644 index 00000000..ec168881 --- /dev/null +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -0,0 +1,638 @@ + + + + +org.freedesktop.NetworkManager: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

org.freedesktop.NetworkManager

+

org.freedesktop.NetworkManager

+
+
+

Methods

+
+GetDevices               (OUT ao        devices);
+GetAllDevices            (OUT ao        devices);
+GetDeviceByIpIface       (IN  s         iface,
+                          OUT o         device);
+ActivateConnection       (IN  o         connection,
+                          IN  o         device,
+                          IN  o         specific_object,
+                          OUT o         active_connection);
+AddAndActivateConnection (IN  a{sa{sv}} connection,
+                          IN  o         device,
+                          IN  o         specific_object,
+                          OUT o         path,
+                          OUT o         active_connection);
+DeactivateConnection     (IN  o         active_connection);
+Sleep                    (IN  b         sleep);
+Enable                   (IN  b         enable);
+GetPermissions           (OUT a{ss}     permissions);
+SetLogging               (IN  s         level,
+                          IN  s         domains);
+GetLogging               (OUT s         level,
+                          OUT s         domains);
+CheckConnectivity        (OUT u         connectivity);
+state                    (OUT u         state);
+
+
+
+

Signals

+
+CheckPermissions  ();
+StateChanged      (u     state);
+PropertiesChanged (a{sv} properties);
+DeviceAdded       (o     device_path);
+DeviceRemoved     (o     device_path);
+
+
+
+

Properties

+
+Devices                  readable   ao
+AllDevices               readable   ao
+NetworkingEnabled        readable   b
+WirelessEnabled          readwrite  b
+WirelessHardwareEnabled  readable   b
+WwanEnabled              readwrite  b
+WwanHardwareEnabled      readable   b
+WimaxEnabled             readwrite  b
+WimaxHardwareEnabled     readable   b
+ActiveConnections        readable   ao
+PrimaryConnection        readable   o
+PrimaryConnectionType    readable   s
+Metered                  readable   u
+ActivatingConnection     readable   o
+Startup                  readable   b
+Version                  readable   s
+State                    readable   u
+Connectivity             readable   u
+GlobalDnsConfiguration   readwrite  a{sv}
+
+
+
+

Description

+

+
+
+

Method Details

+
+

The GetDevices() method

+
+GetDevices (OUT ao devices);
+
+

Get the list of realized network devices.

+
++++ + + + + +

OUT ao devices:

List of object paths of network devices known to the system. This list does not include device placeholders (see GetAllDevices()).

+
+
+
+

The GetAllDevices() method

+
+GetAllDevices (OUT ao devices);
+
+

Get the list of all network devices.

+
++++ + + + + +

OUT ao devices:

List of object paths of network devices and device placeholders (eg, devices that do not yet exist but which can be automatically created by NetworkManager if one of their AvailableConnections was activated).

+
+
+
+

The GetDeviceByIpIface() method

+
+GetDeviceByIpIface (IN  s iface,
+                    OUT o device);
+
+

Return the object path of the network device referenced by its IP interface name. Note that some devices (usually modems) only have an IP interface name when they are connected.

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

IN s iface:

Interface name of the device to find.

OUT o device:

Object path of the network device.

+
+
+
+

The ActivateConnection() method

+
+ActivateConnection (IN  o connection,
+                    IN  o device,
+                    IN  o specific_object,
+                    OUT o active_connection);
+
+

Activate a connection using the supplied device.

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

IN o connection:

The connection to activate. If "/" is given, a valid device path must be given, and NetworkManager picks the best connection to activate for the given device. VPN connections must always pass a valid connection path.

IN o device:

The object path of device to be activated for physical connections. This parameter is ignored for VPN connections, because the specific_object (if provided) specifies the device to use.

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, or "/" to pick an AP automatically. For VPN connections, pass the object path of an ActiveConnection object that should serve as the "base" connection (to which the VPN connections lifetime will be tied), or pass "/" and NM will automatically use the current default device.

OUT o active_connection:

The path of the active connection object representing this active connection.

+
+
+
+

The AddAndActivateConnection() method

+
+AddAndActivateConnection (IN  a{sa{sv}} connection,
+                          IN  o         device,
+                          IN  o         specific_object,
+                          OUT o         path,
+                          OUT o         active_connection);
+
+

Adds a new connection using the given details (if any) as a template (automatically filling in missing settings with the capabilities of the given device and specific object), then activate the new connection. Cannot be used for VPN connections at this time.

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

IN a{sa{sv}} connection:

Connection settings and properties; if incomplete missing settings will be automatically completed using the given device and specific object.

IN o device:

The object path of device to be activated using the given connection.

IN o specific_object:

The path of a connection-type-specific object this activation should use. This parameter is currently ignored for wired and mobile broadband connections, and the value of "/" should be used (ie, no specific object). For WiFi connections, pass the object path of a specific AP from the card's scan list, which will be used to complete the details of the newly added connection.

OUT o path:

Object path of the new connection that was just added.

OUT o active_connection:

The path of the active connection object representing this active connection.

+
+
+
+

The DeactivateConnection() method

+
+DeactivateConnection (IN  o active_connection);
+
+

Deactivate an active connection.

+
++++ + + + + +

IN o active_connection:

The currently active connection to deactivate.

+
+
+
+

The Sleep() method

+
+Sleep (IN  b sleep);
+
+

Control the NetworkManager daemon's sleep state. When asleep, all interfaces that it manages are deactivated. When awake, devices are available to be activated. This command should not be called directly by users or clients; it is intended for system suspend/resume tracking.

+
++++ + + + + +

IN b sleep:

Indicates whether the NetworkManager daemon should sleep or wake.

+
+
+
+

The Enable() method

+
+Enable (IN  b enable);
+
+

Control whether overall networking is enabled or disabled. When disabled, all interfaces that NM manages are deactivated. When enabled, all managed interfaces are re-enabled and available to be activated. This command should be used by clients that provide to users the ability to enable/disable all networking.

+
++++ + + + + +

IN b enable:

If FALSE, indicates that all networking should be disabled. If TRUE, indicates that NetworkManager should begin managing network devices.

+
+
+
+

The GetPermissions() method

+
+GetPermissions (OUT a{ss} permissions);
+
+

Returns the permissions a caller has for various authenticated operations that NetworkManager provides, like Enable/Disable networking, changing WiFi, WWAN, and WiMAX state, etc.

+
++++ + + + + +

OUT a{ss} permissions:

Dictionary of available permissions and results. Each permission is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") and each result is one of the following values: "yes" (the permission is available), "auth" (the permission is available after a successful authentication), or "no" (the permission is denied). Clients may use these values in the UI to indicate the ability to perform certain operations.

+
+
+
+

The SetLogging() method

+
+SetLogging (IN  s level,
+            IN  s domains);
+
+

Set logging verbosity and which operations are logged.

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

IN s level:

One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP]. This level is applied to the domains as specified in the domains argument. Except for the special level "KEEP", all unmentioned domains are disabled entirely. "KEEP" is special and allows not to change the current setting except for the specified domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only touch the platform domain.

IN s domains:

A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations related to that domain. Available domains are: [PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT]. In addition to these domains, the following special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged.

+
+
+
+

The GetLogging() method

+
+GetLogging (OUT s level,
+            OUT s domains);
+
+

Get current logging verbosity level and operations domains.

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

OUT s level:

One of [ERR, WARN, INFO, DEBUG, TRACE].

OUT s domains:

For available domains see SetLogging() call.

+
+
+
+

The CheckConnectivity() method

+
+CheckConnectivity (OUT u connectivity);
+
+

Re-check the network connectivity state.

+
++++ + + + + +

OUT u connectivity:

The current connectivity state.

+
+
+
+

The state() method

+
+state (OUT u state);
+
+

The overall networking state as determined by the NetworkManager daemon, based on the state of network devices under it's management.

+
++++ + + + + +

OUT u state:

+
+
+
+

Signal Details

+
+

The "CheckPermissions" signal

+
+CheckPermissions ();
+
+

Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions.

+
+
+
+

The "StateChanged" signal

+
+StateChanged (u state);
+
+

NetworkManager's state changed.

+
++++ + + + + +

u state:

The new state of NetworkManager.

+
+
+
+

The "PropertiesChanged" signal

+
+PropertiesChanged (a{sv} properties);
+
+

NetworkManager's properties changed.

+
++++ + + + + +

a{sv} properties:

The changed properties.

+
+
+
+

The "DeviceAdded" signal

+
+DeviceAdded (o device_path);
+
+

A device was added to the system

+
++++ + + + + +

o device_path:

The object path of the newly added device.

+
+
+
+

The "DeviceRemoved" signal

+
+DeviceRemoved (o device_path);
+
+

A device was removed from the system, and is no longer available.

+
++++ + + + + +

o device_path:

The object path of the device that was just removed.

+
+
+
+

Property Details

+
+

The "Devices" property

+
+Devices  readable   ao
+
+

The list of realized network devices. Realized devices are those which have backing resources (eg from the kernel or a management daemon like ModemManager, teamd, etc).

+
+
+
+

The "AllDevices" property

+
+AllDevices  readable   ao
+
+

The list of both realized and un-realized network devices. Un-realized devices are software devices which do not yet have backing resources, but for which backing resources can be created if the device is activated.

+
+
+
+

The "NetworkingEnabled" property

+
+NetworkingEnabled  readable   b
+
+

Indicates if overall networking is currently enabled or not. See the Enable() method.

+
+
+
+

The "WirelessEnabled" property

+
+WirelessEnabled  readwrite  b
+
+

Indicates if wireless is currently enabled or not.

+
+
+
+

The "WirelessHardwareEnabled" property

+
+WirelessHardwareEnabled  readable   b
+
+

Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.

+
+
+
+

The "WwanEnabled" property

+
+WwanEnabled  readwrite  b
+
+

Indicates if mobile broadband devices are currently enabled or not.

+
+
+
+

The "WwanHardwareEnabled" property

+
+WwanHardwareEnabled  readable   b
+
+

Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.

+
+
+
+

The "WimaxEnabled" property

+
+WimaxEnabled  readwrite  b
+
+

Indicates if WiMAX devices are currently enabled or not.

+
+
+
+

The "WimaxHardwareEnabled" property

+
+WimaxHardwareEnabled  readable   b
+
+

Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.

+
+
+
+

The "ActiveConnections" property

+
+ActiveConnections  readable   ao
+
+

List of active connection object paths.

+
+
+
+

The "PrimaryConnection" property

+
+PrimaryConnection  readable   o
+
+

The object path of the "primary" active connection being used to access the network. In particular, if there is no VPN active, or the VPN does not have the default route, then this indicates the connection that has the default route. If there is a VPN active with the default route, then this indicates the connection that contains the route to the VPN endpoint.

+
+
+
+

The "PrimaryConnectionType" property

+
+PrimaryConnectionType  readable   s
+
+

The connection type of the "primary" active connection being used to access the network. This is the same as the Type property on the object indicated by PrimaryConnection.

+
+
+
+

The "Metered" property

+
+Metered  readable   u
+
+

Indicates whether the connectivity is metered. This is equivalent to the metered property of the device associated with the primary connection.

+
+
+
+

The "ActivatingConnection" property

+
+ActivatingConnection  readable   o
+
+

The object path of an active connection that is currently being activated and which is expected to become the new PrimaryConnection when it finishes activating.

+
+
+
+

The "Startup" property

+
+Startup  readable   b
+
+

Indicates whether NM is still starting up; this becomes FALSE when NM has finished attempting to activate every connection that it might be able to activate at startup.

+
+
+
+

The "Version" property

+
+Version  readable   s
+
+

NetworkManager version.

+
+
+
+

The "State" property

+
+State  readable   u
+
+

The overall state of the NetworkManager daemon.

+
+
+
+

The "Connectivity" property

+
+Connectivity  readable   u
+
+

The network connectivity state.

+
+
+
+

The "GlobalDnsConfiguration" property

+
+GlobalDnsConfiguration  readwrite  a{sv}
+
+

Dictionary of global DNS settings where the key is one of "searches", "options" and "domains". The values for the "searches" and "options" keys are string arrays describing the list of search domains and resolver options, respectively. The value of the "domains" key is a second-level dictionary, where each key is a domain name, and each key's value is a third-level dictionary with the keys "servers" and "options". "servers" is a string array of DNS servers, "options" is a string array of domain-specific options.

+
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 054d41e2..dccef7c9 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -2,10 +2,10 @@ -NetworkManager D-Bus Reference Manual: NetworkManager D-Bus Reference Manual +NetworkManager D-Bus API Reference Manual: NetworkManager D-Bus API Reference Manual - - + + @@ -13,10 +13,10 @@
-
-

Version 1.1.91 +

+

Version 1.1.92

-

Copyright © 2012 The NetworkManager Authors

+

Copyright © 2012, 2016 The NetworkManager Authors

Permission is granted to copy, distribute and/or modify this @@ -43,29 +43,136 @@

-
D-Bus API Reference
+
D-Bus API Reference
+
+
Interfaces
+
+
+org.freedesktop.NetworkManager +
+
+org.freedesktop.NetworkManager.Settings +
+
+org.freedesktop.NetworkManager.AgentManager +
+
+org.freedesktop.NetworkManager.AccessPoint +
+
+org.freedesktop.NetworkManager.PPP +
+
+org.freedesktop.NetworkManager.Settings.Connection +
+
+org.freedesktop.NetworkManager.VPN.Connection +
+
+org.freedesktop.NetworkManager.Connection.Active +
+
+org.freedesktop.NetworkManager.Device +
+
+org.freedesktop.NetworkManager.Device.Adsl +
+
+org.freedesktop.NetworkManager.Device.Bond +
+
+org.freedesktop.NetworkManager.Device.Bridge +
+
+org.freedesktop.NetworkManager.Device.Bluetooth +
+
+org.freedesktop.NetworkManager.Device.Wired +
+
+org.freedesktop.NetworkManager.Device.Generic +
+
+org.freedesktop.NetworkManager.Device.Infiniband +
+
+org.freedesktop.NetworkManager.Device.IPTunnel +
+
+org.freedesktop.NetworkManager.Device.Macvlan +
+
+org.freedesktop.NetworkManager.Device.Modem +
+
+org.freedesktop.NetworkManager.Device.OlpcMesh +
+
+org.freedesktop.NetworkManager.Device.Team +
+
+org.freedesktop.NetworkManager.Device.Tun +
+
+org.freedesktop.NetworkManager.Device.Veth +
+
+org.freedesktop.NetworkManager.Device.Vlan +
+
+org.freedesktop.NetworkManager.Device.Vxlan +
+
+org.freedesktop.NetworkManager.Device.Wireless +
+
+org.freedesktop.NetworkManager.Device.WiMax +
+
+org.freedesktop.NetworkManager.DHCP4Config +
+
+org.freedesktop.NetworkManager.DHCP6Config +
+
+org.freedesktop.NetworkManager.IP4Config +
+
+org.freedesktop.NetworkManager.IP6Config +
+
+org.freedesktop.NetworkManager.VPN.Plugin +
+
+org.freedesktop.NetworkManager.SecretAgent +
+
+
Network Configuration Setting Specification
Configuration Settings
Secret flag types
-
Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
-
Architecture and D-Bus API Changes in 0.9
+
UNIX Manual Pages
-
Elimination of the User Settings Service
-
User Secret Agents
-
Settings Service Interface Changes
-
Connection Object Interface Changes
-
Permissions Methods Consolidation
-
AddConnection Returns Object Path of New Connection
-
Support for WiMAX Devices
-
New Device States
-
New Active Connection State
-
Consolidated Modem Devices
-
Secret Property Flags
-
Deprecated Methods Removed
-
+
+NetworkManager — network management daemon +
+
+NetworkManager.conf — NetworkManager configuration file +
+
+nmcli-examples — usage examples of nmcli +
+
+nm-settings — Description of settings and properties of NetworkManager connection profiles +
+
+nm-settings-keyfile — Description of keyfile settings plugin +
+
+nm-settings-ifcfg-rh — Description of ifcfg-rh settings plugin +
Index
A. License
diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml new file mode 100644 index 00000000..dc84d959 --- /dev/null +++ b/docs/api/html/index.sgml @@ -0,0 +1,434 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 54a8424f..f8e1c9d6 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -2,11 +2,11 @@ -Index: NetworkManager D-Bus Reference Manual +Index: NetworkManager D-Bus API Reference Manual - - - + + + @@ -16,13 +16,686 @@ Home -Prev +Prev Next

Index

-
+
+
+

Symbols

+
+
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint +
+
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property +
+
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property +
+
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property +
+
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property +
+
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property +
+
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property +
+
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property +
+
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property +
+
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property +
+
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager +
+
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method +
+
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method +
+
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method +
+
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device +
+
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl +
+
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth +
+
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property +
+
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property +
+
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond +
+
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property +
+
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge +
+
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property +
+
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method +
+
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method +
+
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic +
+
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property +
+
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method +
+
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband +
+
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel +
+
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property +
+
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property +
+
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan +
+
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property +
+
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property +
+
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property +
+
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property +
+
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem +
+
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property +
+
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property +
+
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh +
+
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property +
+
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property +
+
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method +
+
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team +
+
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property +
+
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun +
+
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property +
+
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property +
+
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property +
+
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property +
+
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property +
+
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property +
+
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth +
+
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property +
+
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan +
+
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property +
+
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property +
+
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan +
+
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property +
+
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property +
+
org.freedesktop.NetworkManager.Device.WiMax, org.freedesktop.NetworkManager.Device.WiMax +
+
org.freedesktop.NetworkManager.Device.WiMax.GetNspList(), The GetNspList() method +
+
org.freedesktop.NetworkManager.Device.WiMax::NspAdded, The "NspAdded" signal +
+
org.freedesktop.NetworkManager.Device.WiMax::NspRemoved, The "NspRemoved" signal +
+
org.freedesktop.NetworkManager.Device.WiMax::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp, The "ActiveNsp" property +
+
org.freedesktop.NetworkManager.Device.WiMax:Bsid, The "Bsid" property +
+
org.freedesktop.NetworkManager.Device.WiMax:CenterFrequency, The "CenterFrequency" property +
+
org.freedesktop.NetworkManager.Device.WiMax:Cinr, The "Cinr" property +
+
org.freedesktop.NetworkManager.Device.WiMax:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.WiMax:Nsps, The "Nsps" property +
+
org.freedesktop.NetworkManager.Device.WiMax:Rssi, The "Rssi" property +
+
org.freedesktop.NetworkManager.Device.WiMax:TxPower, The "TxPower" property +
+
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal +
+
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property +
+
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property +
+
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property +
+
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property +
+
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property +
+
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property +
+
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property +
+
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property +
+
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property +
+
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property +
+
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property +
+
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property +
+
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property +
+
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property +
+
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property +
+
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property +
+
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property +
+
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property +
+
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property +
+
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property +
+
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property +
+
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property +
+
org.freedesktop.NetworkManager.Device:Real, The "Real" property +
+
org.freedesktop.NetworkManager.Device:State, The "State" property +
+
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property +
+
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property +
+
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config +
+
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property +
+
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property +
+
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property +
+
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property +
+
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property +
+
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property +
+
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property +
+
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property +
+
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property +
+
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property +
+
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config +
+
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property +
+
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property +
+
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property +
+
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property +
+
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property +
+
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property +
+
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property +
+
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property +
+
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property +
+
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent +
+
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method +
+
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method +
+
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method +
+
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method +
+
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings +
+
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method +
+
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method +
+
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection +
+
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method +
+
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method +
+
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method +
+
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method +
+
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method +
+
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method +
+
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method +
+
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal +
+
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal +
+
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property +
+
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method +
+
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method +
+
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method +
+
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method +
+
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method +
+
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal +
+
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal +
+
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property +
+
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property +
+
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property +
+
+
+
+

A

+
+
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active +
+
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property +
+
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property +
+
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property +
+
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property +
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property +
+
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property +
+
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property +
+
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property +
+
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property +
+
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property +
+
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property +
+
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property +
+
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property +
+
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property +
+
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property +
+
+
+
+

D

+
+
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired +
+
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property +
+
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property +
+
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property +
+
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property +
+
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless +
+
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method +
+
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method +
+
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method +
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal +
+
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal +
+
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property +
+
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property +
+
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property +
+
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property +
+
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property +
+
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property +
+
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property +
+
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config +
+
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property +
+
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config +
+
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property +
+
+
+
+

M

+
+
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager +
+
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method +
+
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method +
+
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method +
+
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method +
+
org.freedesktop.NetworkManager.Enable(), The Enable() method +
+
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method +
+
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method +
+
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method +
+
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method +
+
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method +
+
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method +
+
org.freedesktop.NetworkManager.Sleep(), The Sleep() method +
+
org.freedesktop.NetworkManager.state(), The state() method +
+
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal +
+
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal +
+
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal +
+
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal +
+
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property +
+
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property +
+
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property +
+
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property +
+
org.freedesktop.NetworkManager:Devices, The "Devices" property +
+
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property +
+
org.freedesktop.NetworkManager:Metered, The "Metered" property +
+
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property +
+
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property +
+
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property +
+
org.freedesktop.NetworkManager:Startup, The "Startup" property +
+
org.freedesktop.NetworkManager:State, The "State" property +
+
org.freedesktop.NetworkManager:Version, The "Version" property +
+
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property +
+
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property +
+
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property +
+
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property +
+
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property +
+
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property +
+
+
+
+

P

+
+
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP +
+
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method +
+
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method +
+
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method +
+
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method +
+
+
+
+

V

+
+
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection +
+
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal +
+
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal +
+
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property +
+
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property +
+
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin +
+
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method +
+
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method +
+
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal +
+
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property +
+
+
+
Generated by GTK-Doc V1.24
diff --git a/docs/api/html/license.html b/docs/api/html/license.html index b7944bba..85292624 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -2,10 +2,10 @@ -Appendix A. License: NetworkManager D-Bus Reference Manual +Appendix A. License: NetworkManager D-Bus API Reference Manual - - + + diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html new file mode 100644 index 00000000..27015a54 --- /dev/null +++ b/docs/api/html/manpages.html @@ -0,0 +1,49 @@ + + + + +UNIX Manual Pages: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+

+UNIX Manual Pages

+
+
+NetworkManager — network management daemon +
+
+NetworkManager.conf — NetworkManager configuration file +
+
+nmcli-examples — usage examples of nmcli +
+
+nm-settings — Description of settings and properties of NetworkManager connection profiles +
+
+nm-settings-keyfile — Description of keyfile settings plugin +
+
+nm-settings-ifcfg-rh — Description of ifcfg-rh settings plugin +
+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html new file mode 100644 index 00000000..7a92c0f9 --- /dev/null +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -0,0 +1,1876 @@ + + + + +nm-settings-ifcfg-rh: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

nm-settings-ifcfg-rh

+

nm-settings-ifcfg-rh — Description of ifcfg-rh settings plugin

+
+
+

DESCRIPTION

+

+ NetworkManager is based on the concept of connection profiles that contain + network configuration (see nm-settings(5) for details). The profiles can be + stored in various formats. NetworkManager uses plugins for reading and writing + the data. The plugins can be configured in NetworkManager.conf(5). +

+

+ The ifcfg-rh plugin is used on the Fedora and Red Hat + Enterprise Linux distributions to read/write configuration from/to + the traditional /etc/sysconfig/network-scripts/ifcfg-* files. + Each NetworkManager connection maps to one ifcfg-* file, with + possible usage of keys-* for passwords, route-* + for static IPv4 routes and route6-* for static IPv6 routes. + The plugin currently supports reading and writing Ethernet, Wi-Fi, InfiniBand, + VLAN, Bond, Bridge, and Team connections. Unsupported connection types (such as + WWAN, PPPoE, VPN, or ADSL) are handled by keyfile plugin + (nm-settings-keyfile(5)). + The main reason for using ifcfg-rh plugin is the compatibility + with legacy configurations for ifup and ifdown + (initscripts). +

+
+
+

File Format

+

+ The ifcfg-rh config format is a simple text file containing + VARIABLE="value" lines. The format is described in sysconfig.txt + of initscripts package. Note that the configuration files + may be sourced by initscripts, so they must be valid shell + scripts. That means, for instance, that # character can be used + for comments, strings with spaces must be quoted, special characters must be escaped, + etc. +

+

+ Users can create or modify the ifcfg-rh connection files + manually, even if that is not the recommended way of managing the profiles. + However, if they choose to do that, they must inform NetworkManager about + their changes (see monitor-connection-file in + nm-settings(5), and nmcli con (re)load). +

+

Some ifcfg-rh configuration examples: 

+
Simple DHCP ethernet configuration:
+NAME=ethernet
+UUID=1c4ddf70-01bf-46d6-b04f-47e842bd98da
+TYPE=Ethernet
+BOOTPROTO=dhcp
+DEFROUTE=yes
+PEERDNS=yes
+PEERROUTES=yes
+IPV4_FAILURE_FATAL=no
+ONBOOT=yes
+
+
Simple ethernet configuration with static IP:
+TYPE=Ethernet
+BOOTPROTO=none
+IPADDR=10.1.0.25
+PREFIX=24
+GATEWAY=10.1.0.1
+DEFROUTE=yes
+IPV4_FAILURE_FATAL=no
+IPV6INIT=yes
+IPV6_AUTOCONF=yes
+IPV6_DEFROUTE=yes
+IPV6_PEERDNS=yes
+IPV6_PEERROUTES=yes
+IPV6_FAILURE_FATAL=no
+NAME=ethernet-em2
+UUID=51bb3904-c0fc-4dfe-83b2-0a71e7928c13
+DEVICE=em2
+ONBOOT=yes
+
+
WPA2 Enterprise WLAN (TTLS with inner MSCHAPV2 authentication):
+ESSID="CompanyWLAN"
+MODE=Managed
+KEY_MGMT=WPA-EAP
+TYPE=Wireless
+IEEE_8021X_EAP_METHODS=TTLS
+IEEE_8021X_IDENTITY=joe
+IEEE_8021X_PASSWORD_FLAGS=ask
+IEEE_8021X_INNER_AUTH_METHODS=MSCHAPV2
+IEEE_8021X_CA_CERT=/home/joe/.cert/company.crt
+BOOTPROTO=dhcp
+DEFROUTE=yes
+PEERDNS=yes
+PEERROUTES=yes
+IPV4_FAILURE_FATAL=no
+IPV6INIT=no
+NAME=MyCompany
+UUID=f79848ff-11a6-4810-9e1a-99039dea84c4
+ONBOOT=yes
+
+
Bridge and bridge port configuration:
+ifcfg-bridge:                                ifcfg-bridge-port:
+NAME=bridge                                  NAME=bridge007-port-eth0
+UUID=4be99ce0-c5b2-4764-8b77-ec226e440125    UUID=3ad56c4a-47e1-419b-b0d4-8ad86eb967a3
+DEVICE=bridge007                             DEVICE=eth0
+STP=yes                                      ONBOOT=yes
+TYPE=Bridge                                  TYPE=Ethernet
+BRIDGING_OPTS=priority=32768                 BRIDGE=bridge007
+ONBOOT=yes
+BOOTPROTO=dhcp
+
+
+
Bonding configuration:
+ifcfg-BOND:                                  ifcfg-BOND-slave:
+NAME=BOND                                    NAME=BOND-slave
+UUID=b41888aa-924c-450c-b0f8-85a4f0a51b4a    UUID=9bb048e4-286a-4cc3-b104-007dbd20decb
+DEVICE=bond100                               DEVICE=eth0
+BONDING_OPTS="mode=balance-rr miimon=100"    ONBOOT=yes
+TYPE=Bond                                    TYPE=Ethernet
+BONDING_MASTER=yes                           MASTER=bond100
+ONBOOT=yes                                   SLAVE=yes
+BOOTPROTO=dhcp
+
+
+
Team and team port configuration:
+ifcfg-my_team0:
+DEVICE=team0
+TEAM_CONFIG="{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }"
+DEVICETYPE=Team
+BOOTPROTO=dhcp
+NAME=team0-profile
+UUID=1d3460a0-7b37-457f-a300-fe8d92da4807
+ONBOOT=yes
+
+ifcfg-my_team0_slave1:
+NAME=team0-slave1
+UUID=d5aed298-c567-4cc1-b808-6d38ecef9e64
+DEVICE=eth1
+ONBOOT=yes
+TEAM_MASTER=team0
+DEVICETYPE=TeamPort
+
+ifcfg-my_team0_slave2:
+NAME=team0-slave2
+UUID=94e75f4e-e5ad-401c-8962-31e0ae5d2215
+DEVICE=eth2
+ONBOOT=yes
+TEAM_MASTER=team0
+DEVICETYPE=TeamPort
+
+

+ The UUID values in the config files must be unique. You can use uuidgen + command line tool to generate such values. Alternatively, you can leave out UUID + entirely. In that case NetworkManager will generate a UUID based on the file name. +

+
+
+

Differences against initscripts

+

+ The main differences of NetworkManager ifcfg-rh plugin and traditional + initscripts are: +

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

NM_CONTROLLED=yes|no

+ NM_CONTROLLED is NetworkManager-specific variable used by NetworkManager + for determining whether the device of the ifcfg file + should be managed. NM_CONTROLLED=yes is supposed if the variable is not + present in the file. + Note that if you have more ifcfg files for a single + device, NM_CONTROLLED=no in one of the files will cause the device not + to be managed. The profile may not even be the active one. +

New variables

+ NetworkManager has introduced some new variable, not present in initscripts, + to be able to store data for its new features. The variables are marked + as extensions in the tables below. +

Semantic change of variables

 +

+ NetworkManager had to slightly change the semantic for a few variables. +

+
    +

  • PEERDNS - + initscripts interpret PEERDNS=no to mean "never touch resolv.conf". + NetworkManager interprets it to say "never add automatic (DHCP, PPP, VPN, etc.) + nameservers to resolv.conf".

    • +

  • ONBOOT - + initscripts use ONBOOT=yes to mark the devices that are to be activated + during boot. NetworkManager extents this to also mean that this profile + can be used for auto-connecting at any time.

    • +

  • BOOTPROTO - + NetworkManager supports traditional values none (static), + dhcp. But it also allows additional values to + enable new addressing methods. They are autoip for IPv4 + link-local addressing using Avahi daemon and shared for + connection sharing. When shared is used, NetworkManager + assigns the interface 10.42.0.1, or it uses the first static address, + if configured.

    • +
+
+

+ See the next section for detailed mapping of NetworkManager properties and + ifcfg-rh variables. Variable names, format and usage + differences in NetworkManager and initscripts are documented in the tables bellow. +

+
+
+

DETAILS

+

ifcfg-rh plugin variables marked with (+) + are NetworkManager specific extensions not understood by traditional initscripts. +

+
+

Table 69. 802-1x setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
eapIEEE_8021X_EAP_METHODS(+) + EAP method for 802.1X authentication. + +Example: IEEE_8021X_EAP_METHODS=PEAP + +Allowed values: "LEAP", "PWD", "TLS", "PEAP", "TTLS", "FAST"
identityIEEE_8021X_IDENTITY(+) + Identity for EAP authentication methods. + +Example: IEEE_8021X_IDENTITY=itsme
anonymous-identityIEEE_8021X_ANON_IDENTITY(+) + Anonymous identity for EAP authentication methods.
pac-fileIEEE_8021X_PAC_FILE(+) + File with PAC (Protected Access Credential) for EAP-FAST. + +Example: IEEE_8021X_PAC_FILE=/home/joe/my-fast.pac
ca-certIEEE_8021X_CA_CERT(+) + CA certificate for EAP. + +Example: IEEE_8021X_CA_CERT=/home/joe/cacert.crt
ca-path(none) The property is not handled by ifcfg-rh plugin.
subject-matchIEEE_8021X_SUBJECT_MATCH(+) + Substring to match subject of server certificate against. + +Example: IEEE_8021X_SUBJECT_MATCH="Red Hat"
altsubject-matchesIEEE_8021X_ALTSUBJECT_MATCHES(+) + List of strings to be matched against the altSubjectName. + +Example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc"
domain-suffix-matchIEEE_8021X_DOMAIN_SUFFIX_MATCH(+) + Suffix to match domain of server certificate against.
client-certIEEE_8021X_CLIENT_CERT(+) + Client certificate for EAP. + +Example: IEEE_8021X_CLIENT_CERT=/home/joe/mycert.crt
phase1-peapverIEEE_8021X_PEAP_VERSION(+) + Use to force a specific PEAP version. + +Allowed values: 0, 1
phase1-peaplabelIEEE_8021X_PEAP_FORCE_NEW_LABEL(+) +noUse to force the new PEAP label during key derivation. + +Allowed values: yes, no
phase1-fast-provisioningIEEE_8021X_FAST_PROVISIONING(+) + Enable in-line provisioning of EAP-FAST credentials. + +Example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth" + +Allowed values: space-separated list of these values [allow-auth, allow-unauth]
phase2-authIEEE_8021X_INNER_AUTH_METHODS(+) + Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS can contain values both for 'phase2-auth' and 'phase2-autheap' properties. + +Example: IEEE_8021X_INNER_AUTH_METHODS=PAP + +Allowed values: "PAP", "CHAP", "MSCHAP", "MSCHAPV2", "GTC", "OTP", "MD5" and "TLS"
phase2-autheapIEEE_8021X_INNER_AUTH_METHODS(+) + Inner EAP-based authentication methods. Note that IEEE_8021X_INNER_AUTH_METHODS is also used for 'phase2-auth' values. + +Example: IEEE_8021X_INNER_AUTH_METHODS="MSCHAPV2 EAP-TLS" + +Allowed values: "EAP-MD5", "EAP-MSCHAPV2", "EAP-GTC", "EAP-OTP" and "EAP-TLS"
phase2-subject-matchIEEE_8021X_PHASE2_SUBJECT_MATCH(+) + Substring to match subject of server certificate against. + +Example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat"
phase2-altsubject-matchesIEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+) +  
phase2-domain-suffix-matchIEEE_8021X_PHASE2_DOMAIN_SUFFIX_MATCH(+) + Suffix to match domain of server certificate for phase 2 against.
phase2-client-certIEEE_8021X_INNER_CLIENT_CERT(+) + Client certificate for inner EAP method. + +Example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crt
passwordIEEE_8021X_PASSWORD(+) + UTF-8 encoded password used for EAP. It can also go to "key-" lookaside file, or it can be owned by a secret agent.
password-flagsIEEE_8021X_PASSWORD_FLAGS(+) + Password flags for IEEE_8021X_PASSWORD password. (see the section called “Secret flag types” for _FLAGS values)
password-raw(none) The property is not handled by ifcfg-rh plugin.
password-raw-flags(none) The property is not handled by ifcfg-rh plugin.
private-keyIEEE_8021X_PRIVATE_KEY(+) + Private key for EAP-TLS. + +Example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12
private-key-passwordIEEE_8021X_PRIVATE_KEY_PASSWORD(+) + Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" lookaside file, or it can be owned by a secret agent.
private-key-password-flagsIEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+) + Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. (see the section called “Secret flag types” for _FLAGS values)
phase2-private-keyIEEE_8021X_INNER_PRIVATE_KEY(+) + Private key for inner authentication method for EAP-TLS.
phase2-private-key-passwordIEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+) + Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" lookaside file, or it can be owned by a secret agent.
phase2-private-key-password-flagsIEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+) + Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. (see the section called “Secret flag types” for _FLAGS values)
pin(none) The property is not handled by ifcfg-rh plugin.
pin-flags(none) The property is not handled by ifcfg-rh plugin.
system-ca-certs(none) The property is not handled by ifcfg-rh plugin.
+
+
+

Table 70. bond setting

+
++++++ + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
optionsBONDING_OPTS Bonding options. + +Example: BONDING_OPTS="miimon=100 mode=broadcast"
+
+
+

Table 71. bridge-port setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
priorityBRIDGING_OPTS: priority=32STP priority. + +Allowed values: 0 - 63
path-costBRIDGING_OPTS: path_cost=100STP cost. + +Allowed values: 1 - 65535
hairpin-modeBRIDGING_OPTS: hairpin_mode=yesHairpin mode of the bridge port.
+
+
+

Table 72. bridge setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
mac-addressMACADDR(+) + MAC address of the bridge. Note that this requires a recent kernel support, originally introduced in 3.15 upstream kernel) MACADDR for bridges is an NM extension.
stpSTPnoSpan tree protocol participation.
priorityBRIDGING_OPTS: priority=32768STP priority. + +Allowed values: 0 - 32768
forward-delayDELAY15STP forwarding delay. + +Allowed values: 2 - 30
hello-timeBRIDGING_OPTS: hello_time=2STP hello time. + +Allowed values: 1 - 10
max-ageBRIDGING_OPTS: max_age=20STP maximum message age. + +Allowed values: 6 - 40
ageing-timeBRIDGING_OPTS: ageing_time=300Ethernet MAC ageing time. + +Allowed values: 0 - 1000000
multicast-snoopingBRIDGING_OPTS: multicast_snooping=1IGMP snooping support. + +Allowed values: 0 or 1
+
+
+

Table 73. connection setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
idNAME(+) + User friendly name for the connection profile.
uuidUUID(+) + UUID for the connection profile. When missing, NetworkManager creates the UUID itself (by hashing the file).
interface-nameDEVICE Interface name of the device this profile is bound to. The variable can be left out when the profile should apply for more devices. Note that DEVICE can be required for some connection types.
typeTYPE (DEVICETYPE, DEVICE) Base type of the connection. DEVICETYPE is used for teaming connections. + +Example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort + +Allowed values: Ethernet, Wireless, InfiniBand, Bridge, Bond, Vlan, Team, TeamPort
permissionsUSERS(+) + USERS restrict the access for this conenction to certain users only. + +Example: USERS="joe bob"
autoconnectONBOOTyesWhether the connection should be autoconnected (not only while booting).
autoconnect-priorityAUTOCONNECT_PRIORITY(+) +0Connection priority for automatic activation. Connections with higher numbers are preferred when selecting profiles for automatic activation. + +Example: AUTOCONNECT_PRIORITY=20 + +Allowed values: -999 to 999
zoneZONE(+) + Trust level of this connection. The string is usually used for a firewall. + +Example: ZONE=Work
masterMASTER, TEAM_MASTER, BRIDGE Reference to master connection. The variable used depends on the connection type.
slave-typeMASTER, TEAM_MASTER, DEVICETYPE, BRIDGE Slave 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=5
meteredCONNECTION_METERED Whether the device is metered + +Example: CONNECTION_METERED=yes + +Allowed values: yes,no,unknown
lldpLLDPmissing variable means global defaultwhether LLDP is enabled for the connection + +Example: LLDP=no + +Allowed values: boolean value or 'rx'
+
+
+

Table 74. dcb setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
app-fcoe-flagsDCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLINGnoFCOE flags. + +Example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes
app-fcoe-priorityDCB_APP_FCOE_PRIORITY Priority of FCoE frames. + +Allowed values: 0 - 7
app-fcoe-modeDCB_APP_FCOE_MODEfabricFCoE controller mode. + +Allowed values: fabric, vn2vn
app-iscsi-flagsDCB_APP_ISCSI_ENABLE, DCB_APP_ISCSI_ADVERTISE, DCB_APP_ISCSI_WILLINGnoiSCSI flags.
app-iscsi-priorityDCB_APP_ISCSI_PRIORITY Priority of iSCSI frames. + +Allowed values: 0 - 7
app-fip-flagsDCB_APP_FIP_ENABLE, DCB_APP_FIP_ADVERTISE, DCB_APP_FIP_WILLINGnoFIP flags.
app-fip-priorityDCB_APP_FIP_PRIORITY Priority of FIP frames. + +Allowed values: 0 - 7
priority-flow-control-flagsDCB_PFC_ENABLE, DCB_PFC_ADVERTISE, DCB_PFC_WILLINGnoPriority flow control flags.
priority-flow-controlDCB_PFC_UP Priority flow control values. String of 8 "0" and "1", where "0". means "do not transmit priority pause", "1" means "transmit pause". + +Example: DCB_PFC_UP=01101110
priority-group-flagsDCB_PG_ENABLE, DCB_PG_ADVERTISE, DCB_PG_WILLINGnoPriority groups flags.
priority-group-idDCB_PG_ID Priority groups values. String of eight priorities (0 - 7) or "f" (unrestricted). + +Example: DCB_PG_ID=1205f173
priority-group-bandwidthDCB_PG_PCT Priority groups values. Eight bandwidths (in percent), separated with commas. + +Example: DCB_PG_PCT=10,5,10,15,10,10,10,30
priority-bandwidthDCB_PG_UPPCT Priority values. Eight bandwidths (in percent), separated with commas. The sum of the numbers must be 100. + +Example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20
priority-strict-bandwidthDCB_PG_STRICT Priority values. String of eight "0" or "1", where "0" means "may not utilize all bandwidth", "1" means "may utilize all bandwidth". + +Example: DCB_PG_STRICT=01101110
priority-traffic-classDCB_PG_UP2TC Priority values. String of eight trafic class values (0 - 7). + +Example: DCB_PG_UP2TC=01623701
+
+

+ All DCB related configuration is a NetworkManager extension. DCB=yes must be + used explicitly to enable DCB so that the rest of the DCB_* variables can apply. +

+
+

Table 75. infiniband setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
mac-addressHWADDR IBoIP 20-byte hardware address of the device (in traditional hex-digits-and-colons notation). + +Example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11
mtuMTU MTU of the interface.
transport-modeCONNECTED_MODECONNECTED_MODE=noCONNECTED_MODE=yes for "connected" mode, CONNECTED_MODE=no for "datagram" mode
p-keyPKEY_ID (and PKEY=yes)PKEY=noInfiniBand P_Key. The value can be a hex number prefixed with "0x" or a decimal number. When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified. + +Example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002
parentPHYSDEV (PKEY=yes)PKEY=noInfiniBand parent device. + +Example: PHYSDEV=ib0
+
+
+

Table 76. ip-tunnel setting

+
++++++ + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
+
+
+

Table 77. ipv4 setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
methodBOOTPROTOnoneMethod used for IPv4 protocol configuration. + +Allowed values: none, dhcp (bootp), static, ibft, autoip, shared
dnsDNS1, DNS2, ... List of DNS servers. Even if NetworkManager supports many DNS servers, initscripts and resolver only care about the first three, usually. + +Example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8
dns-searchDOMAIN List of DNS search domains.
addressesIPADDR, PREFIX, IPADDR1, PREFIX1, ... List of static IP addresses. + +Example: IPADDR=10.5.5.23 PREFIX=24 IPADDR1=1.1.1.2 PREFIX1=16
gatewayGATEWAY Gateway IP address. + +Example: GATEWAY=10.5.5.1
routesADDRESS1, NETMASK1, GATEWAY1, METRIC1, ... List of static routes. They are not stored in ifcfg-* file, but in route-* file instead.
ignore-auto-routesPEERROUTES(+) +yesPEERROUTES has the opposite meaning as 'ignore-auto-routes' property.
ignore-auto-dnsPEERDNSyesPEERDNS has the opposite meaning as 'ignore-auto-dns' property.
dhcp-send-hostnameDHCP_SEND_HOSTNAME(+) +yesWhether DHCP_HOSTNAME should be sent to the DHCP server.
dhcp-hostnameDHCP_HOSTNAME Hostname to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used.
never-defaultDEFROUTE (GATEWAYDEV in /etc/sysconfig/network)yesDEFROUTE=no tells NetworkManager that this connection should not be assigned the default route. DEFROUTE has the opposite meaning as 'never-default' property.
may-failIPV4_FAILURE_FATAL(+) +noIPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property.
route-metricIPV4_ROUTE_METRIC(+) +-1IPV4_ROUTE_METRIC is the default IPv4 metric for routes on this connection. If set to -1, a default metric based on the device type is used.
dhcp-client-idDHCP_CLIENT_ID(+) + A string sent to the DHCP server to identify the local machine. + +Example: DHCP_CLIENT_ID=ax-srv-1
dad-timeoutARPING_WAITmissing variable means global default (config override or 3)Timeout (in seconds) for performing DAD before configuring IPv4 addresses. 0 turns off the DAD completely, -1 means default value. + +Example: ARPING_WAIT=2
dhcp-timeoutIPV4_DHCP_TIMEOUT(+) + A timeout after which the DHCP transaction fails in case of no response. + +Example: IPV4_DHCP_TIMEOUT=10
dhcp-fqdnDHCP_FQDN FQDN to send to the DHCP server. When both DHCP_HOSTNAME and DHCP_FQDN are specified only the latter is used. + +Example: DHCP_FQDN=foo.bar.com
+
+
+

Table 78. ipv6 setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
methodIPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6CIPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=noMethod used for IPv6 protocol configuration. ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes
dnsDNS1, DNS2, ... List of DNS servers. NetworkManager uses the variables both for IPv4 and IPv6.
dns-searchDOMAIN List of DNS search domains.
addressesIPV6ADDR, IPV6ADDR_SECONDARIES List of static IP addresses. + +Example: IPV6ADDR=ab12:9876::1 IPV6ADDR_SECONDARIES="ab12:9876::2 ab12:9876::3"
gatewayIPV6_DEFAULTGW Gateway IP address. + +Example: IPV6_DEFAULTGW=abbe::1
routes(none) List of static routes. They are not stored in ifcfg-* file, but in route6-* file instead in the form of command line for 'ip route add'.
ignore-auto-routesIPV6_PEERROUTES(+) +yesIPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property.
ignore-auto-dnsIPV6_PEERDNS(+) +yesIPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property.
dhcp-hostnameDHCP_HOSTNAME Hostname to send the DHCP server.
never-defaultIPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network)IPV6_DEFROUTE=yes (when no variable specified)IPV6_DEFROUTE=no tells NetworkManager that this connection should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite meaning as 'never-default' property.
may-failIPV6_FAILURE_FATAL(+) +noIPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property.
route-metricIPV6_ROUTE_METRIC(+) +-1IPV6_ROUTE_METRIC is the default IPv6 metric for routes on this connection. If set to -1, a default metric based on the device type is used.
ip6-privacyIPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+) +noConfigure IPv6 Privacy Extensions for SLAAC (RFC4941). + +Example: IPV6_PRIVACY=rfc3041 IPV6_PRIVACY_PREFER_PUBLIC_IP=yes + +Allowed values: IPV6_PRIVACY: no, yes (rfc3041 or rfc4941); IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no
addr-gen-modeIPV6_ADDR_GEN_MODEeui64Configure IPv6 Stable Privacy addressing for SLAAC (RFC7217). + +Example: IPV6_ADDR_GEN_MODE=stable-privacy + +Allowed values: IPV6_ADDR_GEN_MODE: eui64, stable-privacy
+
+
+

Table 79. macvlan setting

+
++++++ + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
+
+
+

Table 80. team-port setting

+
++++++ + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
configTEAM_PORT_CONFIG Team port configuration in JSON. See man teamd.conf for details.
+
+
+

Table 81. team setting

+
++++++ + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
configTEAM_CONFIG Team configuration in JSON. See man teamd.conf for details.
+
+
+

Table 82. tun setting

+
++++++ + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
+
+
+

Table 83. vlan setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
parentDEVICE or PHYSDEV Parent interface of the VLAN.
idVLAN_ID or DEVICE VLAN identifier.
flagsGVRP, MVRP, VLAN_FLAGS VLAN flags. + +Allowed values: "yes or "no" for GVRP and MVRP; "LOOSE_BINDING" and "NO_REORDER_HDR" for VLAN_FLAGS
ingress-priority-mapVLAN_INGRESS_PRIORITY_MAP Ingress priority mapping. + +Example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5
egress-priority-mapVLAN_EGRESS_PRIORITY_MAP Egress priority mapping. + +Example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7
interface-namePHYSDEV and VLAN_ID, or DEVICE VLAN interface name. If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, but VLAN id from DEVICE takes precedence over VLAN_ID. + +Example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12
+
+
+

Table 84. vxlan setting

+
++++++ + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
+
+
+

Table 85. 802-3-ethernet setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
port(none) The property is not saved by the plugin.
speed(none) The property is not saved by the plugin.
duplex(none) The property is not saved by the plugin.
auto-negotiate(none) The property is not saved by the plugin.
mac-addressHWADDR Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05).
cloned-mac-addressMACADDR Cloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).
mac-address-blacklistHWADDR_BLACKLIST(+) + It denies usage of the connection for any device whose address is listed. + +Example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55"
mtuMTU MTU of the interface.
s390-subchannelsSUBCHANNELS Subchannels for IBM S390 hosts. + +Example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c
s390-nettypeNETTYPE Network type of the S390 host. + +Example: NETTYPE=qeth + +Allowed values: "qeth", "lcs" or "ctc"
s390-optionsOPTIONS and PORTNAME, CTCPROTO, S390 device options. All options go to OPTIONS, except for "portname" and "ctcprot" that have their own variables.
+
+
+

Table 86. 802-11-wireless-security setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
key-mgmtKEY_MGMT(+) + Key management menthod. + +Allowed values: IEEE8021X, WPA-PSK, WPA-EAP
wep-tx-keyidxDEFAULTKEY1Index of active WEP key. + +Allowed values: 1, 2, 3, 4
auth-algSECURITYMODE(+) + Authentication algorithm for WEP. + +Allowed values: restricted, open, leap
protoWPA_ALLOW_WPA(+), WPA_ALLOW_WPA2(+) +noAllowed WPA protocols, WPA and WPA2 (RSN). + +Allowed values: yes, no
pairwiseCIPHER_PAIRWISE(+) + Restrict pairwise encryption algorithms, specified as a space separated list. + +Allowed values: CCMP, TKIP
groupCIPHER_GROUP(+) + Restrict group/broadcast encryption algorithms, specified as a space separated list. + +Allowed values: CCMP, TKIP, WEP40, WEP104
leap-usernameIEEE_8021X_IDENTITY(+) + Login name for LEAP.
wep-key0KEY1, KEY_PASSPHRASE1(+) + The first WEP key (used in most networks). See also DEFAULTKEY for key index.
wep-key1KEY2, KEY_PASSPHRASE2(+) + WEP key with index 1. See also DEFAULTKEY for key index.
wep-key2KEY3, KEY_PASSPHRASE3(+) + WEP key with index 2. See also DEFAULTKEY for key index.
wep-key3KEY4, KEY_PASSPHRASE4(+) + WEP key with index 3. See also DEFAULTKEY for key index.
wep-key-flagsWEP_KEY_FLAGS(+) + Password flags for KEY<i>, KEY_PASSPHRASE<i> password. (see the section called “Secret flag types” for _FLAGS values)
pskWPA_PSK Pre-Shared-Key for WPA networks.
psk-flagsWPA_PSK_FLAGS(+) + Password flags for WPA_PSK_FLAGS. (see the section called “Secret flag types” for _FLAGS values) + +Example: WPA_PSK_FLAGS=user
leap-passwordIEEE_8021X_PASSWORD(+) + Password for LEAP. It can also go to "key-" lookaside file, or it can be owned by a secret agent.
leap-password-flagsIEEE_8021X_PASSWORD_FLAGS(+) + Password flags for IEEE_8021X_PASSWORD_FLAGS. (see the section called “Secret flag types” for _FLAGS values)
wep-key-typeKEY<i> or KEY_PASSPHRASE<i>(+) + KEY is used for "key" type (10 or 26 hexadecimal characters, or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used for WEP passphrases. + +Example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey
+
+
+

Table 87. 802-11-wireless setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyIfcfg-rh VariableDefaultDescription
ssidESSID SSID of Wi-Fi network. + +Example: ESSID="Quick Net"
modeMODE Wi-Fi network mode. + +Allowed values: Ad-Hoc, Managed (Auto) [case insensitive]
bandBAND(+) + BAND alone is honored, but CHANNEL overrides BAND since it implies a band. + +Example: BAND=bg + +Allowed values: a, bg
channelCHANNEL Channel used for the Wi-Fi communication. Channels greater than 14 mean "a" band, otherwise the band is "bg". + +Example: CHANNEL=6
bssidBSSID(+) + Restricts association only to a single AP. + +Example: BSSID=00:1E:BD:64:83:21
rate(none) This property is not handled by ifcfg-rh plugin.
tx-power(none) This property is not handled by ifcfg-rh plugin.
mac-addressHWADDR Hardware address of the device in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:05).
cloned-mac-addressMACADDR Cloned (spoofed) MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:14:5A:99).
mac-address-blacklistHWADDR_BLACKLIST(+) + It denies usage of the connection for any device whose address is listed.
seen-bssids(none) This property is not handled by ifcfg-rh plugin.
mtuMTU MTU of the wireless interface.
hiddenSSID_HIDDEN(+) + Whether the network hides the SSID.
powersavePOWERSAVE(+) + Enables or disables Wi-Fi power saving. + +Example: POWERSAVE=enable + +Allowed values: default, ignore, enable, disable
mac-address-randomizationMAC_ADDRESS_RANDOMIZATION(+) + Enables or disables Wi-Fi MAC address randomization. + +Example: MAC_ADDRESS_RANDOMIZATION=always + +Allowed values: default, never, always
security(none) This property is deprecated and not handled by ifcfg-rh-plugin.
+
+

The following settings are not supported by ifcfg-rh plugin:

+

adsl, bluetooth, ppp, pppoe, serial, generic, gsm, cdma, 802-11-olpc-mesh, wimax, vpn

+
+

Secret flags

+

+ Each secret property in a NetworkManager setting has an associated + flags property that describes how to handle that secret. + In the fcfg-rh plugin variables for secret flags have a + _FLAGS suffix. The variables contain one or more of the + following values (space separated). Missing (or empty) *_FLAGS variable means + that the password is owned by NetworkManager. +

+
    +

  • user - a user-session secret agent is responsible for providing + and storing this secret; when it is required, agents will be asked to provide it.

    • +

  • ask - the associated password is not saved but it will be + requested from the user each time it is required.

    • +

  • unused - in some situations it cannot be automatically determined + that a secret is required or not. This flag hints that the secret is not required and should + not be requested from the user.

    • +
+
+
+
+

AUTHOR

+

NetworkManager developers

+
+
+

FILES

+

/etc/sysconfig/network-scripts/ifcfg-*

+

/etc/sysconfig/network-scripts/keys-*

+

/etc/sysconfig/network-scripts/route-*

+

/etc/sysconfig/network-scripts/route6-*

+

/usr/share/doc/initscripts/sysconfig.txt

+
+
+

SEE ALSO

+

https://developer.gnome.org/NetworkManager/unstable/ref-settings.html

+

nm-settings(5), nm-settings-keyfile(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html new file mode 100644 index 00000000..35135634 --- /dev/null +++ b/docs/api/html/nm-settings-keyfile.html @@ -0,0 +1,525 @@ + + + + +nm-settings-keyfile: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

nm-settings-keyfile

+

nm-settings-keyfile — Description of keyfile settings plugin

+
+
+

DESCRIPTION

+

+ NetworkManager is based on the concept of connection profiles that contain + network configuration (see nm-settings(5) for details). The profiles can be + stored in various formats. NetworkManager uses plugins for reading and writing + the data. The plugins can be configured in NetworkManager.conf(5). +

+

+ The keyfile plugin is the generic plugin that supports all + the connection types and capabilities that NetworkManager has. It writes files + out in a .ini-style format in /etc/NetworkManager/system-connections/. + This plugin is always enabled and will automatically be used to store + any connections that are not supported by any other active plugin. + For security, it will ignore files that are readable or writable by any user + or group other than 'root' since private keys and passphrases may be stored + in plaintext inside the file. +

+
+
+

File Format

+

+ The keyfile config format is a simple .ini-style + format. It consists of sections (groups) of key-value pairs. Each section + corresponds to a setting name as described in the settings specification + (nm-settings(5)). Each configuration key/value + pair in the section is one of the properties listed in the settings + specification. The majority of properties of the specification is written + in the same format into the keyfile too. However + some values are inconvenient for people to use. These are stored in the + files in more readable ways. These properties are described bellow. + An example could be IP addresses that are not written as integer arrays, + but more reasonably as "1.2.3.4/12 1.2.3.254". + More information of the generic key file format can be found at + + GLib key file format (Lines beginning with a '#' are comments, + lists are separated by character ; etc.). +

+

+ Users can create or modify the keyfile connection files + manually, even if that is not the recommended way of managing the profiles. + However, if they choose to do that, they must inform NetworkManager about + their changes (see monitor-connection-file in + nm-settings(5) and nmcli con (re)load). +

+

Examples of keyfile configuration. 

+
A sample configuration for an ethernet network:
+[connection]
+id=Main eth0
+uuid=27afa607-ee36-43f0-b8c3-9d245cdc4bb3
+type=802-3-ethernet
+autoconnect=true
+
+[ipv4]
+method=auto
+
+[802-3-ethernet]
+mac-address=00:23:5a:47:1f:71
+
+
A sample configuration for WPA-EAP (PEAP with MSCHAPv2) and always-ask secret:
+[connection]
+id=CompanyWIFI
+uuid=cdac6154-a33b-4b15-9904-666772cfa5ee
+type=wifi
+autoconnect=false
+
+[wifi]
+ssid=CorpWLAN
+mode=infrastructure
+security=802-11-wireless-security
+
+[wifi-security]
+key-mgmt=wpa-eap
+
+[ipv4]
+method=auto
+
+[ipv6]
+method=auto
+
+[802-1x]
+eap=peap;
+identity=joe
+ca-cert=/home/joe/.cert/corp.crt
+phase1-peapver=1
+phase2-auth=mschapv2
+password-flags=2
+
+
A sample configuration for openvpn:
+[connection]
+id=RedHat-openvpn
+uuid=7f9b3356-b210-4c0e-8123-bd116c9c280f
+type=vpn
+timestamp=1385401165
+
+[vpn]
+service-type=org.freedesktop.NetworkManager.openvpn
+connection-type=password
+password-flags=3
+remote=ovpn.my-company.com
+cipher=AES-256-CBC
+reneg-seconds=0
+port=443
+username=joe
+ca=/etc/openvpn/ISCA.pem
+tls-remote=ovpn.my-company.com
+
+[ipv6]
+method=auto
+
+[ipv4]
+method=auto
+ignore-auto-dns=true
+never-default=true
+
+
A sample configuration for a bridge and a bridge port:
+[connection]                                 [connection]
+id=MainBridge                                id=br-port-1
+uuid=171ae855-a0ab-42b6-bd0c-60f5812eea9d    uuid=d6e8ae98-71f8-4b3d-9d2d-2e26048fe794
+interface-name=MainBridge                    interface-name=em1
+type=bridge                                  type=ethernet
+                                             master=MainBridge
+[bridge]                                     slave-type=bridge
+interface-name=MainBridge
+
+
A sample configuration for a VLAN:
+[connection]
+id=VLAN for building 4A
+uuid=8ce1c9e0-ce7a-4d2c-aa28-077dda09dd7e
+interface-name=VLAN-4A
+type=vlan
+
+[vlan]
+interface-name=VLAN-4A
+parent=eth0
+id=4
+
+
+
+

DETAILS

+

keyfile plugin variables for the majority of NetworkManager + properties have one-to-one mapping. It means a NetworkManager property is stored + in the keyfile as a variable of the same name and in the same format. + There are several exceptions to this rule, mainly for making keyfile syntax easier + for humans. The exceptions handled specially by keyfile + plugin are listed bellow. Refer to + nm-settings(5) + for all available settings and properties and their description. +

+

Name aliases.  + Some of the NetworkManager setting names are somewhat hard to type or remember. Therefore + keyfile introduces aliases that can be used instead of the names. +

+ + + + + +
setting name keyfile alias
802-3-ethernet = ethernet
802-11-wireless = wifi
802-11-wireless-security = wifi-security
+
+

Table 61. bridge setting (section)

+
++++++ + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or semicolon separated list of 6 decimal bytes (obsolete) + +Example: mac-address=00:22:68:12:79:A2 mac-address=0;34;104;18;121;162;
+
+
+

Table 62. infiniband setting (section)

+
++++++ + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation, or or semicolon separated list of 20 decimal bytes (obsolete) + +Example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01
+
+
+

Table 63. ipv4 setting (section)

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
dnsdnslist of DNS IP addressesList of DNS servers. + +Example: dns=1.2.3.4;8.8.8.8;8.8.4.4;
addressesaddress1, address2, ...address/plenList of static IP addresses. + +Example: address1=192.168.100.100/24 address2=10.1.1.5/24
gatewaygatewaystringGateway IP addresses as a string. + +Example: gateway=192.168.100.1
routesroute1, route2, ...route/plen[,gateway,metric]List of IP routes. + +Example: route1=8.8.8.0/24,10.1.1.1,77 route2=7.7.0.0/16
+
+
+

Table 64. ipv6 setting (section)

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
dnsdnslist of DNS IP addressesList of DNS servers. + +Example: dns=2001:4860:4860::8888;2001:4860:4860::8844;
addressesaddress1, address2, ...address/plenList of static IP addresses. + +Example: address1=abbe::cafe/96 address2=2001::1234
gatewaygatewaystringGateway IP addresses as a string. + +Example: gateway=abbe::1
routesroute1, route2, ...route/plen[,gateway,metric]List of IP routes. + +Example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403
+
+
+

Table 65. serial setting (section)

+
++++++ + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
parityparity'e', 'o', or 'n'The connection parity; even, odd, or none. Note that older versions of NetworkManager stored this as an integer: 69 ('E') for even, 111 ('o') for odd, or 110 ('n') for none. + +Example: parity=n
+
+
+

Table 66. vpn setting (section)

+
++++++ + + + + + + + + + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
dataseparate variables named after keys of the dictionary The keys of the data dictionary are used as variable names directly under [vpn] section. + +Example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe
secretsseparate variables named after keys of the dictionary The keys of the secrets dictionary are used as variable names directly under [vpn-secrets] section. + +Example: password=Popocatepetl
+
+
+

Table 67. 802-3-ethernet setting (section)

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162)
cloned-mac-addresscloned-mac-addressususal hex-digits-and-colons notationCloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).
mac-address-blacklistmac-address-blacklistlist of MACs (separated with semicolons)MAC address blacklist. + +Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78
+
+
+

Table 68. 802-11-wireless setting (section)

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyKeyfile VariableFormatDescription
ssidssidstring (or decimal-byte list - obsolete)SSID of Wi-Fi network. + +Example: ssid=Quick Net
mac-addressmac-addressususal hex-digits-and-colons notationMAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;162).
cloned-mac-addresscloned-mac-addressususal hex-digits-and-colons notationCloned MAC address in traditional hex-digits-and-colons notation (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) (e.g. 0;34;104;18;121;178).
mac-address-blacklistmac-address-blacklistlist of MACs (separated with semicolons)MAC address blacklist. + +Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78
+
+
+

Secret flags

+

+ Each secret property in a NetworkManager setting has an associated flags + property that describes how to handle that secret. In the keyfile plugin, + the value of -flags variable is a decimal number (0 - 7) defined as a sum + of the following values: +

+
    +

  • 0 - (NM owned) - the system is responsible for providing and storing this secret.

    • +

  • 1 - (agent-owned) - a user-session secret agent is responsible for providing + and storing this secret; when it is required, agents will be asked to provide it.

    • +

  • 2 - (not-saved) - this secret should not be saved but should be requested + from the user each time it is required.

    • +

  • 4 - (not-required) - in some situations it cannot be automatically determined + that a secret is required or not. This flag hints that the secret is not required + and should not be requested from the user.

    • +
+
+
+
+

AUTHOR

+

NetworkManager developers

+
+
+

FILES

+

/etc/NetworkManager/system-connections/*

+
+
+

SEE ALSO

+

https://developer.gnome.org/NetworkManager/unstable/ref-settings.html

+

nm-settings(5), nm-settings-ifcfg-rh(5), NetworkManager(8), NetworkManager.conf(5), nmcli(1), nmcli-examples(5)

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html new file mode 100644 index 00000000..7a9b75e9 --- /dev/null +++ b/docs/api/html/nm-settings.html @@ -0,0 +1,2567 @@ + + + + +nm-settings: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

nm-settings

+

nm-settings — Description of settings and properties of NetworkManager connection profiles

+
+
+

DESCRIPTION

+

+ 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 + be applied and an active network connection will be established. Users are free to create + as many connection profiles as they see fit. Thus they are flexible in having various network + configurations for different networking needs. The connection profiles are handled by + NetworkManager via settings service and are exported on D-Bus + (/org/freedesktop/NetworkManager/Settings/<num> objects). + The conceptual objects can be described as follows: +

+
++++ + + + + +

Connection (profile)

+ A specific, encapsulated, independent group of settings describing + all the configuration required to connect to a specific network. + It is referred to by a unique identifier called the UUID. A connection + is tied to a one specific device type, but not necessarily a specific + hardware device. It is composed of one or more Settings + objects. +

+
++++ + + + + +

Setting

+ A group of related key/value pairs describing a specific piece of a + Connection (profile). Settings keys and allowed values are + described in the tables below. Keys are also referred to as properties. + Developers can find the setting objects and their properties in the libnm-util + sources. Look for the class_init functions near the bottom of + each setting source file. +

+
+

+ The settings and properties shown in tables below list all available connection + configuration options. However, note that not all settings are applicable to all + connection types. NetworkManager provides a command-line tool nmcli + that allows direct configuration of the settings and properties according to a connection + profile type. nmcli connection editor has also a built-in + describe command that can display description of particular settings + and properties of this page. +

+ ++++ + +
+
+
+

Table 31. 802-1x setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
altsubject-matchesarray of string[]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.
anonymous-identitystring Anonymous identity string for EAP authentication methods. Used as the unencrypted identity with EAP types that support different tunneled identity like EAP-TTLS.
ca-certbyte array 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.
ca-pathstring 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.
client-certbyte array 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.
domain-suffix-matchstring Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server. If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
eaparray of string[]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.
identitystring Identity string for EAP authentication methods. Often the user's user or login name.
namestring802-1xThe 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".
pac-filestring UTF-8 encoded file path containing PAC for EAP-FAST.
passwordstring UTF-8 encoded password used for EAP authentication methods. If both the "password" property and the "password-raw" property are specified, "password" is preferred.
password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "password" property. (see the section called “Secret flag types” for flag values)
password-rawbyte array 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.
password-raw-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "password-raw" property. (see the section called “Secret flag types” for flag values)
phase1-fast-provisioningstring 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.
phase1-peaplabelstring 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.
phase1-peapverstring 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.
phase2-altsubject-matchesarray of string[]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.
phase2-authstring 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.
phase2-autheapstring 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.
phase2-ca-certbyte array 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.
phase2-ca-pathstring 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.
phase2-client-certbyte array 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.
phase2-domain-suffix-matchstring Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication. If a matching dNSName is found, this constraint is met. If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
phase2-private-keybyte array 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 PKCS12 format private keys and the blob scheme, this property should be set to the PKCS12 data and the "phase2-private-key-password" property must be set to password used to decrypt the PKCS12 certificate and key. When using PKCS12 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 PKCS12 private key and certificate.
phase2-private-key-passwordstring 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 PKCS12 format key.
phase2-private-key-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "phase2-private-key-password" property. (see the section called “Secret flag types” for flag values)
phase2-subject-matchstring 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. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
pinstring PIN used for EAP authentication methods.
pin-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "pin" property. (see the section called “Secret flag types” for flag values)
private-keybyte array 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 PKCS12 format private keys and the blob scheme, this property should be set to the PKCS12 data and the "private-key-password" property must be set to password used to decrypt the PKCS12 certificate and key. When using PKCS12 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 PKCS12 private key and certificate. 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.
private-key-passwordstring 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 PKCS12 format key.
private-key-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "private-key-password" property. (see the section called “Secret flag types” for flag values)
subject-matchstring 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. This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
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).
+
+
+

Table 32. adsl setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
encapsulationstring Encapsulation of ADSL connection. Can be "vcmux" or "llc".
namestringadslThe 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".
passwordstring Password used to authenticate with the ADSL service.
password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "password" property. (see the section called “Secret flag types” for flag values)
protocolstring ADSL connection protocol. Can be "pppoa", "pppoe" or "ipoatm".
usernamestring Username used to authenticate with the ADSL service.
vciuint320VCI of ADSL connection
vpiuint320VPI of ADSL connection
+
+
+

Table 33. bluetooth setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
bdaddrbyte array The Bluetooth address of the device.
namestringbluetoothThe 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".
typestring Either "dun" for Dial-Up Networking connections or "panu" for Personal Area Networking connections to devices supporting the NAP profile.
+
+
+

Table 34. bond setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
interface-namestring Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bond's interface name.
namestringbondThe 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".
optionsdict of string to string{'mode': 'balance-rr'}Dictionary of key/value pairs of bonding options. Both keys and values must be strings. Option names must contain only alphanumeric characters (ie, [a-zA-Z0-9]).
+
+
+

Table 35. bridge setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
ageing-timeuint32300The Ethernet MAC address aging time, in seconds.
forward-delayuint3215The Spanning Tree Protocol (STP) forwarding delay, in seconds.
hello-timeuint322The Spanning Tree Protocol (STP) hello time, in seconds.
interface-namestring Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the bridge's interface name.
mac-addressbyte array 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.
max-ageuint3220The Spanning Tree Protocol (STP) maximum message age, in seconds.
multicast-snoopingbooleanTRUEControls whether IGMP snooping is enabled for this bridge. Note that if snooping was automatically disabled due to hash collisions, the system may refuse to enable the feature until the collisions are resolved.
namestringbridgeThe 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".
priorityuint3232768Sets the Spanning Tree Protocol (STP) priority for this bridge. Lower values are "better"; the lowest priority bridge will be elected the root bridge.
stpbooleanTRUEControls whether Spanning Tree Protocol (STP) is enabled for this bridge.
+
+
+

Table 36. bridge-port setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
hairpin-modebooleanFALSEEnables or disabled "hairpin mode" for the port, which allows frames to be sent back out through the port the frame was received on.
namestringbridge-portThe 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".
path-costuint32100The Spanning Tree Protocol (STP) port cost for destinations via this port.
priorityuint3232The Spanning Tree Protocol (STP) priority of this bridge port.
+
+
+

Table 37. cdma setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
namestringcdmaThe 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".
numberstring 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.
passwordstring 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.
password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "password" property. (see the section called “Secret flag types” for flag values)
usernamestring 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.
+
+
+

Table 38. connection setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
autoconnectbooleanTRUEWhether 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.
idstring A human readable unique identifier for the connection, like "Work Wi-Fi" or "T-Mobile 3G".
interface-namestring 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.
lldpint32-1Whether LLDP is enabled for the connection.
masterstring Interface name of the master device or UUID of the master connection.
meteredNMMetered (int32) Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.
namestringconnectionThe 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".
permissionsarray of string[]An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection. Otherwise a user is allowed to access this connection if and only if they are in this list. Each entry is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". At this time only the "user" [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the ":" character. Any [reserved] information present must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8.
read-onlybooleanFALSEFALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.
secondariesarray of string[]List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.
slave-typestring Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
timestampuint640The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).
typestring Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, "vpn" or "bridge", etc).
uuidstring A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the "id" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or "type" property changes. The UUID must be in the format "2815492f-7e56-435e-b2e9-246bd7cdc664" (ie, contains only hexadecimal characters and "-").
zonestring The trust level of a the connection. Free form case-insensitive string (for example "Home", "Work", "Public"). NULL or unspecified zone means the connection will be placed in the default zone as defined by the firewall. When updating this property on a currently activated connection, the change takes effect immediately.
+
+
+

Table 39. dcb setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
app-fcoe-flagsNMSettingDcbFlags (uint32) Specifies the NMSettingDcbFlags for the DCB FCoE application. Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
app-fcoe-modestring"fabric"The FCoE controller mode; either "fabric" (default) or "vn2vn".
app-fcoe-priorityint32-1The 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 (0x1) flag.
app-fip-flagsNMSettingDcbFlags (uint32) Specifies the NMSettingDcbFlags for the DCB FIP application. Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
app-fip-priorityint32-1The 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 (0x1) flag.
app-iscsi-flagsNMSettingDcbFlags (uint32) Specifies the NMSettingDcbFlags for the DCB iSCSI application. Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
app-iscsi-priorityint32-1The 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 (0x1) flag.
namestringdcbThe 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".
priority-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]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.
priority-flow-controlarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]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.
priority-flow-control-flagsNMSettingDcbFlags (uint32) Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
priority-group-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]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.
priority-group-flagsNMSettingDcbFlags (uint32) Specifies the NMSettingDcbFlags for DCB Priority Groups. Flags may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), NM_SETTING_DCB_FLAG_ADVERTISE (0x2), and NM_SETTING_DCB_FLAG_WILLING (0x4).
priority-group-idarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]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.
priority-strict-bandwidtharray of uint32[0, 0, 0, 0, 0, 0, 0, 0]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.
priority-traffic-classarray of uint32[0, 0, 0, 0, 0, 0, 0, 0]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.
+
+
+

Table 40. generic setting

+
++++++ + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
namestringgenericThe 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".
+
+
+

Table 41. gsm setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
apnstring 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.
device-idstring The device unique identifier (as given by the WWAN management service) which this connection applies to. If given, the connection will only apply to the specified device.
home-onlybooleanFALSEWhen TRUE, only connections to the home network will be allowed. Connections to roaming networks will not be made.
namestringgsmThe 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".
network-idstring 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.
numberstring 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.
passwordstring 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.
password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "password" property. (see the section called “Secret flag types” for flag values)
pinstring 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.
pin-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "pin" property. (see the section called “Secret flag types” for flag values)
sim-idstring The SIM card unique identifier (as given by the WWAN management service) which this connection applies to. If given, the connection will apply to any device also allowed by "device-id" which contains a SIM card matching the given identifier.
sim-operator-idstring A MCC/MNC string like "310260" or "21601" identifying the specific mobile network operator which this connection applies to. If given, the connection will apply to any device also allowed by "device-id" and "sim-id" which contains a SIM card provisioined by the given operator.
usernamestring 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.
+
+
+

Table 42. infiniband setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
mac-addressbyte array If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).
mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.
namestringinfinibandThe 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".
p-keyint32-1The 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.
parentstring 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".
transport-modestring The IP-over-InfiniBand transport mode. Either "datagram" or "connected".
+
+
+

Table 43. ipv4 setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
address-dataarray of vardict Array of IPv4 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
addressesarray of array of uint32[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. 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.
dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds.
dhcp-client-idstring 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.
dhcp-fqdnstring If the "dhcp-send-hostname" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and "dhcp-hostname" are mutually exclusive and cannot be set at the same time.
dhcp-hostnamestring If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
dhcp-send-hostnamebooleanTRUEIf 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.
dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
dnsarray of uint32[]Array of IP addresses of DNS servers (as network-byte-order integers)
dns-optionsarray of string[]Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
dns-searcharray of string[]Array of DNS search domains.
gatewaystring The 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.
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.
methodstring 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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
namestringipv4The 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".
never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
route-dataarray of vardict Array of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
route-metricint64-1The 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.
routesarray of array of uint32[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'. 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. If the metric is 0, NM will choose an appropriate default metric for the device. (There is no way to explicitly specify an actual metric of 0 with this property.)
+
+
+

Table 44. ipv6 setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
addr-gen-modeint321Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: "eui64", "stable-privacy" or unset. If the property is set to "eui64", the addresses will be generated using the interface tokens derived from hardware address. This makes the host part of the address to stay constant, making it possible to track host's presence when it changes networks. The address changes when the interface hardware is replaced. The value of "stable-privacy" enables use of cryptographically secure hash of a secret host-specific key along with the connection identification and the network address as specified by RFC7217. This makes it impossible to use the address track host's presence, and makes the address stable when the network interface hardware is replaced. Leaving this unset causes a default that could be subject to change in future versions to be used. Note that this setting is distinct from the Privacy Extensions as configured by "ip6-privacy" property and it does not affect the temporary addresses configured with this option.
address-dataarray of vardict Array of IPv6 addresses. Each address dictionary contains at least 'address' and 'prefix' entries, containing the IP address as a string, and the prefix length as a uint32. Additional attributes may also exist on some addresses.
addressesarray of legacy IPv6 address struct (a(ayuay))[]Deprecated in favor of the 'address-data' and 'gateway' properties, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'address-data' and 'gateway'. Array of IPv6 address structures. Each IPv6 address structure is composed of an IPv6 address, a prefix length (1 - 128), and an IPv6 gateway address. The gateway may be zeroed out if no gateway exists for that subnet.
dad-timeoutint32-1Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or 3 seconds). A value greater than zero is a timeout in milliseconds.
dhcp-hostnamestring If the "dhcp-send-hostname" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and "dhcp-fqdn" are mutually exclusive and cannot be set at the same time.
dhcp-send-hostnamebooleanTRUEIf 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.
dhcp-timeoutint320A timeout for a DHCP transaction in seconds.
dnsarray of byte array[]Array of IP addresses of DNS servers (in network byte order)
dns-optionsarray of string[]Array of DNS options. NULL means that the options are unset and left at the default. In this case NetworkManager will use default options. This is distinct from an empty list of properties.
dns-searcharray of string[]Array of DNS search domains.
gatewaystring The 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: -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". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.
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.
methodstring 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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
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".
never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.
route-dataarray of vardict Array of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
route-metricint64-1The 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.
routesarray of legacy IPv6 route struct (a(ayuayu))[]Deprecated in favor of the 'route-data' property, but this can be used for backward-compatibility with older daemons. Note that if you send this property the daemon will ignore 'route-data'. Array of IPv6 route structures. Each IPv6 route structure is composed of an IPv6 address, a prefix length (1 - 128), an IPv6 next hop address (which may be zeroed out if there is no next hop), and a metric. If the metric is 0, NM will choose an appropriate default metric for the device.
+
+
+

Table 45. ip-tunnel setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
encapsulation-limituint320How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.
flow-labeluint320The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.
input-keystring The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
localstring The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.
modeuint320The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or NM_IP_TUNNEL_MODE_GRE (2).
mtuuint320None
namestringip-tunnelThe 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".
output-keystring The key used for tunnel output packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.
parentstring If given, specifies the parent interface name or parent connection UUID the new device will be bound to so that tunneled packets will only be routed via that interface.
path-mtu-discoverybooleanTRUEWhether to enable Path MTU Discovery on this tunnel.
remotestring The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 address.
tosuint320The type of service (IPv4) or traffic class (IPv6) field to be set on tunneled packets.
ttluint320The TTL to assign to tunneled packets. 0 is a special value meaning that packets inherit the TTL value.
+
+
+

Table 46. macvlan setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
modeuint320The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.
namestringmacvlanThe 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".
parentstring If given, specifies the parent interface name or parent connection UUID from which this MAC-VLAN interface should be created. If this property is not specified, the connection must contain an "802-3-ethernet" setting with a "mac-address" property.
promiscuousbooleanTRUEWhether the interface should be put in promiscuous mode.
tapbooleanFALSEWhether the interface should be a MACVTAP.
+
+
+

Table 47. 802-11-olpc-mesh setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
channeluint320Channel on which the mesh network to join is located.
dhcp-anycast-addressbyte array 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.
namestring802-11-olpc-meshThe 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".
ssidbyte array SSID of the mesh network to join.
+
+
+

Table 48. ppp setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
bauduint320If 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.
crtsctsbooleanFALSEIf 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.
lcp-echo-failureuint320If 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.
lcp-echo-intervaluint320If 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.
mppe-statefulbooleanFALSEIf TRUE, stateful MPPE is used. See pppd documentation for more information on stateful MPPE.
mruuint320If 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.
mtuuint320If non-zero, instruct pppd to send packets no larger than the specified size.
namestringpppThe 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".
no-vj-compbooleanFALSEIf TRUE, Van Jacobsen TCP header compression will not be requested.
noauthbooleanTRUEIf 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.
nobsdcompbooleanFALSEIf TRUE, BSD compression will not be requested.
nodeflatebooleanFALSEIf TRUE, "deflate" compression will not be requested.
refuse-chapbooleanFALSEIf TRUE, the CHAP authentication method will not be used.
refuse-eapbooleanFALSEIf TRUE, the EAP authentication method will not be used.
refuse-mschapbooleanFALSEIf TRUE, the MSCHAP authentication method will not be used.
refuse-mschapv2booleanFALSEIf TRUE, the MSCHAPv2 authentication method will not be used.
refuse-papbooleanFALSEIf TRUE, the PAP authentication method will not be used.
require-mppebooleanFALSEIf 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.
require-mppe-128booleanFALSEIf 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.
+
+
+

Table 49. pppoe setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
namestringpppoeThe 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".
passwordstring Password used to authenticate with the PPPoE service.
password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "password" property. (see the section called “Secret flag types” for flag values)
servicestring 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.
usernamestring Username used to authenticate with the PPPoE service.
+
+
+

Table 50. serial setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
bauduint3257600Speed 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.
bitsuint328Byte-width of the serial communication. The 8 in "8n1" for example.
namestringserialThe 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".
paritybyte The connection parity: 69 (ASCII 'E') for even parity, 111 (ASCII 'o') for odd, 110 (ASCII 'n') for none.
send-delayuint640Time to delay between each byte sent to the modem, in microseconds.
stopbitsuint321Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in "8n1" for example.
+
+
+

Table 51. team setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
configstring 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.
interface-namestring Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the team's interface name.
namestringteamThe 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".
+
+
+

Table 52. team-port setting

+
++++++ + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
configstring 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.
namestringteam-portThe 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".
+
+
+

Table 53. tun setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
groupstring The group ID which will own the device. If set to NULL everyone will be able to use the device.
modeuint321The operating mode of the virtual device. Allowed values are NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and NM_SETTING_TUN_MODE_TAP (2) to create an Ethernet-like layer 2 one.
multi-queuebooleanFALSEIf the property is set to TRUE, the interface will support multiple file descriptors (queues) to parallelize packet sending or receiving. Otherwise, the interface will only support a single queue.
namestringtunThe 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".
ownerstring The user ID which will own the device. If set to NULL everyone will be able to use the device.
pibooleanFALSEIf TRUE the interface will prepend a 4 byte header describing the physical interface to the packets.
vnet-hdrbooleanFALSEIf TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network header.
+
+
+

Table 54. vlan setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
egress-priority-maparray of string[]For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities. The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
flagsNMVlanFlags (uint32) One or more flags which control the behavior and features of the VLAN interface. Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of output packet headers), NM_VLAN_FLAG_GVRP (0x2) (use of the GVRP protocol), and NM_VLAN_FLAG_LOOSE_BINDING (0x4) (loose binding of the interface to its master device's operating state). NM_VLAN_FLAG_MVRP (0x8) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.
iduint320The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.
ingress-priority-maparray of string[]For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities. The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".
interface-namestring Deprecated in favor of connection.interface-name, but can be used for backward-compatibility with older daemons, to set the vlan's interface name.
namestringvlanThe 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".
parentstring 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 "802-3-ethernet" setting with a "mac-address" property.
+
+
+

Table 55. vpn setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
datadict of string to string{}Dictionary of key/value pairs of VPN plugin specific data. Both keys and values must be strings.
namestringvpnThe 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".
persistentbooleanFALSEIf 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.
secretsdict of string to string{}Dictionary of key/value pairs of VPN plugin specific secrets like passwords or private keys. Both keys and values must be strings.
service-typestring 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.
timeoutuint320Timeout for the VPN service to establish the connection. Some services may take quite a long time to connect. Value of 0 means a default timeout, which is 60 seconds (unless overriden by vpn.timeout in configuration file). Values greater than zero mean timeout in seconds.
user-namestring 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.
+
+
+

Table 56. vxlan setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
ageinguint32300Specifies the lifetime in seconds of FDB entries learnt by the kernel.
destination-portuint328472Specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
iduint320Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to use.
l2-missbooleanFALSESpecifies whether netlink LL ADDR miss notifications are generated.
l3-missbooleanFALSESpecifies whether netlink IP ADDR miss notifications are generated.
learningbooleanTRUESpecifies whether unknown source link layer addresses and IP addresses are entered into the VXLAN device forwarding database.
limituint320Specifies the maximum number of FDB entries. A value of zero means that the kernel will store unlimited entries.
localstring If given, specifies the source IP address to use in outgoing packets.
namestringvxlanThe 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".
parentstring If given, specifies the parent interface name or parent connection UUID.
proxybooleanFALSESpecifies whether ARP proxy is turned on.
remotestring Specifies the unicast destination IP address to use in outgoing packets when the destination link layer address is not known in the VXLAN device forwarding database, or the multicast IP address to join.
rscbooleanFALSESpecifies whether route short circuit is turned on.
source-port-maxuint320Specifies the maximum UDP source port to communicate to the remote VXLAN tunnel endpoint.
source-port-minuint320Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.
tosuint320Specifies the TOS value to use in outgoing packets.
ttluint320Specifies the time-to-live value to use in outgoing packets.
+
+
+

Table 57. wimax setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
mac-addressbyte array 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). Deprecated: 1
namestringwimaxThe 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".
network-namestring Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1
+
+
+

Table 58. 802-3-ethernet setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
auto-negotiatebooleanTRUEIf 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.
cloned-mac-addressbyte array If specified, request that the device use this MAC address instead of its permanent MAC address. This is known as MAC cloning or spoofing.
duplexstring If specified, request that the device only use the specified duplex mode. Either "half" or "full".
mac-addressbyte array 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).
mac-address-blacklistarray of string[]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).
mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
namestring802-3-ethernetThe 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".
portstring 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.
s390-nettypestring s390 network device type; one of "qeth", "lcs", or "ctc", representing the different types of virtual network devices available on s390 systems.
s390-optionsdict of string to string{}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]).
s390-subchannelsarray of string[]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.
speeduint320If non-zero, request that the device use only the specified speed. In Mbit/s, ie 100 == 100Mbit/s.
wake-on-lanuint321The NMSettingWiredWakeOnLan options to enable. Not all devices support all options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST (0x4), NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST (0x8), NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST (0x10), NM_SETTING_WIRED_WAKE_ON_LAN_ARP (0x20), NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC (0x40) or the special values NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT (0x1) (to use global settings) and NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000) (to disable management of Wake-on-LAN in NetworkManager).
wake-on-lan-passwordstring If specified, the password used with magic-packet-based Wake-on-LAN, represented as an Ethernet MAC address. If NULL, no password will be required.
+
+
+

Table 59. 802-11-wireless setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
bandstring 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.
bssidbyte array 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.
channeluint320Wireless 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.
cloned-mac-addressbyte array 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.
hiddenbooleanFALSEIf 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.
mac-addressbyte array 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).
mac-address-blacklistarray of string[]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").
mac-address-randomizationuint320One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (0) (never randomize unless the user has set a global default to randomize and the supplicant supports randomization), NM_SETTING_MAC_RANDOMIZATION_NEVER (1) (never randomize the MAC address), or NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2) (always randomize the MAC address).
modestring Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap". If blank, infrastructure is assumed.
mtuuint320If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple Ethernet frames.
namestring802-11-wirelessThe 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".
powersaveuint320One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (2) (disable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (3) (enable Wi-Fi power saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (1) (don't touch currently configure setting) or NM_SETTING_WIRELESS_POWERSAVE_DEFAULT (0) (use the globally configured value). All other values are reserved.
rateuint320If 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.
securityNone This property is deprecated, but can be set to the value '802-11-wireless-security' when a wireless security setting is also present in the connection dictionary, for compatibility with very old NetworkManager daemons.
seen-bssidsarray of string[]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.
ssidbyte array SSID of the Wi-Fi network. Must be specified.
tx-poweruint320If 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.
+
+
+

Table 60. 802-11-wireless-security setting

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
auth-algstring 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.
grouparray of string[]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".
key-mgmtstring 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.
leap-passwordstring The login password for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
leap-password-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "leap-password" property. (see the section called “Secret flag types” for flag values)
leap-usernamestring The login username for legacy LEAP connections (ie, key-mgmt = "ieee8021x" and auth-alg = "leap").
namestring802-11-wireless-securityThe 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".
pairwisearray of string[]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".
protoarray of string[]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.
pskstring 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.
psk-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "psk" property. (see the section called “Secret flag types” for flag values)
wep-key-flagsNMSettingSecretFlags (uint32) Flags indicating how to handle the "wep-key0", "wep-key1", "wep-key2", and "wep-key3" properties. (see the section called “Secret flag types” for flag values)
wep-key-typeNMWepKeyType (uint32) Controls the interpretation of WEP keys. Allowed values are NM_WEP_KEY_TYPE_KEY (1), 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 (2), 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.
wep-key0string 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.
wep-key1string 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.
wep-key2string 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.
wep-key3string 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.
wep-tx-keyidxuint320When 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.
+
+
+

Secret flag types:

+

+ Each secret property in a setting has an associated flags property + that describes how to handle that secret. The flags property is a bitfield + that contains zero or more of the following values logically OR-ed together. +

+
    +

  • 0x0 (none) - the system is responsible for providing and storing this secret.

    • +

  • 0x1 (agent-owned) - a user-session secret agent is responsible for providing and storing + this secret; when it is required, agents will be asked to provide it.

    • +

  • 0x2 (not-saved) - this secret should not be saved but should be requested from the user + each time it is required. This flag should be used for One-Time-Pad secrets, PIN codes from hardware tokens, + or if the user simply does not want to save the secret.

    • +

  • 0x4 (not-required) - in some situations it cannot be automatically determined that a secret + is required or not. This flag hints that the secret is not required and should not be requested from the user.

    • +
+
+
+
+

AUTHOR

+

NetworkManager developers

+
+
+

FILES

+

/etc/NetworkManager/system-connections

+

or distro plugin-specific location

+
+
+

SEE ALSO

+

https://wiki.gnome.org/Projects/NetworkManager/ConfigurationSpecification

+

NetworkManager(8), nmcli(1), nmcli-examples(5), NetworkManager.conf(5)

+
+
+
+
Generated by GTK-Doc V1.24
+ + \ No newline at end of file diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html new file mode 100644 index 00000000..e7ac079b --- /dev/null +++ b/docs/api/html/nmcli-examples.html @@ -0,0 +1,610 @@ + + + + +nmcli-examples: NetworkManager D-Bus API Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

nmcli-examples

+

nmcli-examples — usage examples of nmcli

+
+
+

Synopsis

+

nmcli [OPTIONS...]

+
+
+

Description

+

+ nmcli is a command-line client for NetworkManager. It + allows controlling NetworkManager and reporting its status. For more information + please refer to nmcli(1) + manual page. +

+

+ The purpose of this manual page is to provide you with various examples and + usage scenarios of nmcli. +

+

Note: this page has "work-in-progress" status.

+
+
+

Examples

+
+

Example 1. Listing available Wi-Fi APs

+
+

+$ nmcli device wifi list
+
+
+*  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
+   netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
+*  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
+   LoremCorp          Infra   1     54 Mbit/s  62      ▂▄▆_  WPA2 802.1X
+   Internet           Infra   6     54 Mbit/s  29      ▂___  WPA1
+   HPB110a.F2672A     Ad-Hoc  6     54 Mbit/s  22      ▂___  --
+   Jozinet            Infra   1     54 Mbit/s  19      ▂___  WEP
+   VOIP               Infra   1     54 Mbit/s  20      ▂___  WEP
+   MARTINA            Infra   4     54 Mbit/s  32      ▂▄__  WPA2
+   N24PU1             Infra   7     11 Mbit/s  22      ▂___  --
+   alfa               Infra   1     54 Mbit/s  67      ▂▄▆_  WPA2
+   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2
+
+
+
+

+ This command shows how to list available Wi-Fi networks (APs). You can also use + --fields option for displaying different columns. + nmcli -f all dev wifi list will show all of them. +

+
+

Example 2. Showing general information and properties for a Wi-Fi interface

+
+

+$ nmcli -p -f general,wifi-properties device show wlan0
+
+
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           wifi
+GENERAL.VENDOR:                         Intel Corporation
+GENERAL.PRODUCT:                        PRO/Wireless 5100 AGN [Shiloh] Network Connection
+GENERAL.DRIVER:                         iwlwifi
+GENERAL.DRIVER-VERSION:                 3.8.13-100.fc17.x86_64
+GENERAL.FIRMWARE-VERSION:               8.83.5.1 build 33692
+GENERAL.HWADDR:                         00:1E:65:37:A1:D3
+GENERAL.MTU:                            1500
+GENERAL.STATE:                          100 (connected)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.1/0000:03:00.0/net/wlan0
+GENERAL.IP-IFACE:                       wlan0
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.CONNECTION:                     My Alfa WiFi
+GENERAL.CON-UUID:                       85194f4c-d496-4eec-bae0-d880b4cbcf26
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/10
+-------------------------------------------------------------------------------
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     no
+WIFI-PROPERTIES.ADHOC:                  yes
+-------------------------------------------------------------------------------
+
+
+
+

+ This command shows information about a Wi-Fi device. +

+
+

Example 3. Listing NetworkManager polkit permissions

+
+

+$ nmcli general permissions
+
+
+PERMISSION                                                VALUE
+org.freedesktop.NetworkManager.enable-disable-network     yes
+org.freedesktop.NetworkManager.enable-disable-wifi        yes
+org.freedesktop.NetworkManager.enable-disable-wwan        yes
+org.freedesktop.NetworkManager.enable-disable-wimax       yes
+org.freedesktop.NetworkManager.sleep-wake                 no
+org.freedesktop.NetworkManager.network-control            yes
+org.freedesktop.NetworkManager.wifi.share.protected       yes
+org.freedesktop.NetworkManager.wifi.share.open            yes
+org.freedesktop.NetworkManager.settings.modify.system     yes
+org.freedesktop.NetworkManager.settings.modify.own        yes
+org.freedesktop.NetworkManager.settings.modify.hostname   auth
+
+
+
+

+ This command shows configured polkit permissions for various NetworkManager + operations. These permissions or actions (using polkit language) are configured + by a system administrator and are not meant to be changed by users. The usual + place for the polkit configuration is /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy. + pkaction command can display description for polkit actions. +

+

+pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
+
+

+ More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit. +

+
+

Example 4. Listing NetworkManager log level and domains

+
+

+$ nmcli general logging
+
+
+LEVEL  DOMAINS
+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH
+
+
+
+

+ This command shows current NetworkManager logging status. +

+
+

Example 5. Changing NetworkManager logging

+

+$ nmcli g log level DEBUG domains CORE,ETHER,IP
+$ nmcli g log level INFO domains DEFAULT
+
+
+

+ The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and + IP domains. The second command restores the default logging state. Please refer to the + NetworkManager.conf(5) manual page + for available logging levels and domains. +

+
+

Example 6. Adding a bonding master and two slave connection profiles

+

+$ nmcli con add type bond ifname mybond0 mode active-backup
+$ nmcli con add type ethernet ifname eth1 master mybond0
+$ nmcli con add type ethernet ifname eth2 master mybond0
+
+
+

+ This example demonstrates adding a bond master connection and two slaves. The + first command adds a master bond connection, naming the bonding interface + mybond0 and using active-backup mode. + The next two commands add slaves connections, both enslaved to mybond0. + The first slave will be bound to eth1 interface, the second to + eth2. +

+
+

Example 7. Adding a team master and two slave connection profiles

+

+$ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
+$ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
+$ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
+
+
+

+ This example demonstrates adding a team master connection profile and two slaves. It is + very similar to the bonding example. The first command adds a master team profile, naming + the team interface and the profile Team1. The team configuration + for the master is read from team1-master-json.conf file. Later, you can + change the configuration with modify command + (nmcli con modify Team1 team.config team1-master-another-json.conf). + The last two commands add slaves profiles, both enslaved to Team1. + The first slave will be bound to em1 interface, the second to + em2. The slaves don't specify config and thus + teamd will use its default configuration. You will activate the whole setup + by activating both slaves: +

+

+$ nmcli con up Team1-slave1
+$ nmcli con up Team1-slave2
+
+

+ By default, the created profiles are marked for auto-activation. But if another + connection has been activated on the device, the new profile won't activate + automatically and you need to activate it manually. +

+
+

Example 8. Adding a bridge and two slave profiles

+

+$ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
+$ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
+$ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge
+$ nmcli con modify TowerBridge bridge.stp no
+
+
+

+ This example demonstrates adding a bridge master connection and two slaves. The + first command adds a master bridge connection, naming the bridge interface and + the profile as TowerBridge. + The next two commands add slaves profiles, both will be enslaved to + TowerBridge. + The first slave will be tied to ens3 interface, the second to + ens4. + The last command will disable 802.1D STP for the TowerBridge profile. +

+
+

Example 9. Adding an ethernet connection profile with manual IP configuration

+
+        
+$ nmcli con add con-name my-con-em1 ifname em1 type ethernet ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
+$ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"
+$ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4
+$ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"
+$ nmcli -p con show my-con-em1
+        
+
+
+

+ The first command adds an Ethernet connection profile named my-con-em1 + that is bound to interface name em1. The profile is configured + with static IP addresses. Three addresses are added, two IPv4 addresses and one IPv6. + The first IP 192.168.100.100 has a prefix of 24 (netmask equivalent of 255.255.255.0). + Gateway entry will become the default route if this profile is activated on em1 interface + (and there is no connection with higher priority). The next two addresses do not + specify a prefix, so a default prefix will be used, i.e. 32 for IPv4 and 128 for IPv6. + The second, third and fourth commands modify DNS parameters of the new connection profile. + The last con show command displays the profile so that all + parameters can be reviewed. +

+
+

Example 10. Escaping colon characters in tabular mode

+
+
+        
+$ nmcli -t -f general -e yes -m tab dev show eth0
+        
+
+
+GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
+
+
+
+

+ This example shows escaping colon characters in tabular mode. It may be + useful for script processing, because ':' is used as a field separator. +

+
+

Example 11. nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
#!/bin/bash
+export LC_ALL=C
+
+enable_disable_wifi ()
+{
+    result=$(nmcli dev | grep "ethernet" | grep -w "connected")
+    if [ -n "$result" ]; then
+        nmcli radio wifi off
+    else
+        nmcli radio wifi on
+    fi
+}
+
+if [ "$2" = "up" ]; then
+    enable_disable_wifi
+fi
+
+if [ "$2" = "down" ]; then
+    enable_disable_wifi
+fi
+
+ +
+

+ This dispatcher script makes Wi-Fi mutually exclusive with wired + networking. When a wired interface is connected, Wi-Fi will be set + to airplane mode (rfkilled). When the wired interface is disconnected, + Wi-Fi will be turned back on. + Name this script e.g. 70-wifi-wired-exclusive.sh and put it into /etc/NetworkManager/dispatcher.d/ + directory. + See NetworkManager(8) + manual page for more information about NetworkManager dispatcher scripts. +

+

Example sessions of interactive connection editor

+
+

Example 12. Adding an ethernet connection profile in interactive editor (a)

+
+
+        
+$ nmcli connection edit type ethernet
+        
+
+
+
+===| nmcli interactive connection editor |===
+
+Adding a new '802-3-ethernet' connection
+
+Type 'help' or '?' for available commands.
+Type 'describe [<setting>.<prop>]' for detailed property description.
+
+You may edit the following settings: connection, 802-3-ethernet (ethernet), 802-1x, ipv4, ipv6, dcb
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection.id:                          ethernet-4
+connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:              --
+connection.type:                        802-3-ethernet
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.secondaries:                 
+connection.gateway-ping-timeout:        0
+-------------------------------------------------------------------------------
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          yes
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.mac-address-blacklist:   
+802-3-ethernet.mtu:                     auto
+802-3-ethernet.s390-subchannels:        
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            
+-------------------------------------------------------------------------------
+ipv4.method:                            auto
+ipv4.dns:                               
+ipv4.dns-search:                        
+ipv4.addresses:                         
+ipv4.gateway:                           --
+ipv4.routes:                            
+ipv4.route-metric:                      -1
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+-------------------------------------------------------------------------------
+ipv6.method:                            auto
+ipv6.dns:                               
+ipv6.dns-search:                        
+ipv6.addresses:                         
+ipv6.gateway:                           --
+ipv6.routes:                            
+ipv6.route-metric:                      -1
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.dhcp-hostname:                     --
+-------------------------------------------------------------------------------
+nmcli> goto ethernet
+You may edit the following properties: port, speed, duplex, auto-negotiate, mac-address, cloned-mac-address, mac-address-blacklist, mtu, s390-subchannels, s390-nettype, s390-options
+nmcli 802-3-ethernet> set mtu 1492
+nmcli 802-3-ethernet> b
+nmcli> goto ipv4.addresses
+nmcli ipv4.addresses> desc
+
+=== [addresses] ===
+[NM property description]
+Array of IP addresses.
+
+[nmcli specific description]
+Enter a list of IPv4 addresses formatted as:
+  ip[/prefix], ip[/prefix],...
+Missing prefix is regarded as prefix of 32.
+
+Example: 192.168.1.5/24, 10.0.0.11/24
+
+nmcli ipv4.addresses> set 192.168.1.100/24
+Do you also want to set 'ipv4.method' to 'manual'? [yes]: yes
+nmcli ipv4.addresses>
+nmcli ipv4.addresses> print
+addresses: 192.168.1.100/24
+nmcli ipv4.addresses> back
+nmcli ipv4> b
+nmcli> set ipv4.gateway 192.168.1.1
+nmcli> verify
+Verify connection: OK
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection.id:                          ethernet-4
+connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:              --
+connection.type:                        802-3-ethernet
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.secondaries:                 
+connection.gateway-ping-timeout:        0
+-------------------------------------------------------------------------------
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          yes
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.mac-address-blacklist:   
+802-3-ethernet.mtu:                     1492
+802-3-ethernet.s390-subchannels:        
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            
+-------------------------------------------------------------------------------
+ipv4.method:                            manual
+ipv4.dns:                               
+ipv4.dns-search:                        
+ipv4.addresses:                         192.168.1.100/24
+ipv4.gateway:                           192.168.1.1
+ipv4.routes:                            
+ipv4.route-metric:                      -1
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+-------------------------------------------------------------------------------
+ipv6.method:                            auto
+ipv6.dns:                               
+ipv6.dns-search:                        
+ipv6.addresses:                         
+ipv6.routes:                            
+ipv6.route-metric:                      -1
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.dhcp-hostname:                     --
+-------------------------------------------------------------------------------
+nmcli> set ipv4.dns 8.8.8.8 8.8.4.4
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection.id:                          ethernet-4
+connection.uuid:                        de89cdeb-a3e1-4d53-8fa0-c22546c775f4
+connection.interface-name:              --
+connection.type:                        802-3-ethernet
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.secondaries:                 
+connection.gateway-ping-timeout:        0
+-------------------------------------------------------------------------------
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          yes
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.mac-address-blacklist:   
+802-3-ethernet.mtu:                     1492
+802-3-ethernet.s390-subchannels:        
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            
+-------------------------------------------------------------------------------
+ipv4.method:                            manual
+ipv4.dns:                               8.8.8.8,8.8.4.4
+ipv4.dns-search:                        
+ipv4.addresses:                         192.168.1.100/24
+ipv4.gateway:                           192.168.1.1
+ipv4.routes:                            
+ipv4.route-metric:                      -1
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+-------------------------------------------------------------------------------
+ipv6.method:                            auto
+ipv6.dns:                               
+ipv6.dns-search:                        
+ipv6.addresses:                         
+ipv6.gateway:                           --
+ipv6.routes:                            
+ipv6.route-metric:                      -1
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.dhcp-hostname:                     --
+-------------------------------------------------------------------------------
+nmcli> verify
+Verify connection: OK
+nmcli> save
+Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully saved.
+nmcli> quit
+
+
+
+

+ Example session in the nmcli interactive connection editor. + The scenario creates an Ethernet connection profile with static addressing (IPs and DNS). +

+
+
+

See Also

+

+ nmcli(1), + NetworkManager(8), + NetworkManager.conf(5), + nm-settings(5), + nm-online(1), + nm-applet(1), + nm-connection-editor(1) +

+
+
+
+
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 deleted file mode 100644 index 8a0b56c7..00000000 --- a/docs/api/html/ref-dbus.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - -D-Bus API Reference: NetworkManager D-Bus Reference Manual - - - - - - - - - - - - - - - - -
-

-D-Bus API Reference

-

- This part documents the D-Bus interface used to access the - NetworkManager daemon. -

-spec.html -
-
-
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 deleted file mode 100644 index 6527f738..00000000 --- a/docs/api/html/ref-migrating.html +++ /dev/null @@ -1,540 +0,0 @@ - - - - -Migrating from NetworkManager 0.8 to NetworkManager 0.9: NetworkManager D-Bus Reference Manual - - - - - - - - - - - - - - - - -
-

-Migrating from NetworkManager 0.8 to NetworkManager 0.9

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

- NetworkManager 0.9 is a new major version of NetworkManager that breaks - both API and ABI compared to previous versions. These changes are - intended to make communication with NetworkManager much simpler, especially - for network control and configuration programs. Thankfully, most changes - are not difficult to implement, and the advantages of the simpler - architecture of NetworkManager 0.9 greatly outweight the effort of - updating client programs. -

-
-

-Architecture and D-Bus API Changes in 0.9

-

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

-
-

-Elimination of the User Settings Service

-

- Previously there were two "settings services", or D-Bus services that - provided and saved network configuration information. NetworkManager - owned the "system" settings service, and one user-level applet owned the - "user" settings service. Now, the "user" settings service has been - eliminated, so clients only have to track one D-Bus service to read and - update network configuration. The functionality of the old user settings - service has been replaced with a "permissions" key on each connection - object to preserve the ability to restrict which users can use the - connection, and with a "secret agent" D-Bus API for user-session-level - secure storage of network secrets and passwords. -

-

- Elimination of the user settings service provides the following advantages - for clients of NetworkManager: -

-
    -
  • Simpler discovery of network configuration and change tracking
    • -
  • Simpler storage of user-level network secrets by control applets
    • -
  • Correct operation of fast-user switching and multi-seat configurations
    • -
  • More granular network connection permissions for system administrators
    • -
  • Connections are now system-wide by default (unless restricted by the user or system administrator)
    • -
  • Easier deployment of user-specific connections (ie, VPNs)
    • -
-

-

-

- With this change, D-Bus methods that previously took a "service name" - argument (like - org.freedesktop.NetworkManager.ActivateConnection) and - objects with service name properties (like ActiveConnection objects) no - longer have those arguments or properties. -

-

- Action: if you develop a network control - applet that talks to NetworkManager and used to provide a user settings - service, you can eliminate that code and rely on NetworkManager for all - storage of network configuration. Your applet should now implement the - Secret Agent D-Bus API (see below) to store user-specific secrets, and - add legacy user-specific configuration to NetworkManager when run. More - information about both these changes follows. -

-
-
-

-User Secret Agents

-

- Even with the elimination of the user settings service, in some cases it - is still desirable to store secrets in the user's session and not in - system-wide storage (and thus available to all users). To allow this - functionality the concept of agents has been introduced. Using the new - - org.freedesktop.NetworkManager.AgentManager - D-Bus interface provided by NetworkManager, user applications can register - themselves as "secret agents", ie programs capable of saving and providing - secrets to NetworkManager. The agent should export the - - org.freedesktop.NetworkManager.SecretAgent - D-Bus interface, but should NOT claim a bus name on the system or session - bus. Instead, NetworkManager talks to the agent directly over the D-Bus - connection which the agent used to register itself. -

-

- Each agent must send a unique identifier to NetworkManager when it - registers. This identifier must follow certain rules (see the NM D-Bus - API documentation for more details) but looks essentially the same as - a D-Bus service name. Only one agent using a given identifier may be - registered at the same time. The agent is automatically unregistered - if it disconnects from D-Bus or exits. -

-

- When NetworkManager requires secrets during the attempt to connect to a - network, and no secrets are available from the internal settings service, - NetworkManager queries each registered agent for secrets. Agents that - are in "active" user sessions (as determined by ConsoleKit) are preferred - over inactive ones. Only agents belonging to users who have permission - to view and modify the connection are queried. For more information on - connection permissions, see below. -

- When secrets are requested, the agent is also sent a set of flags that - modify the behavior of the request. By default, the agent should never - attempt to query the user for secrets, but should simply return any - available saved secrets. Other flags allow the agent to explicitly - request new secrets from the user. -

- Action: the parts of a previous user - settings service that handled secrets may be easily repurposed as the bulk - of the implementation of a secret agent. The agent is sent all available - connection settings, and from those should be able to retrieve or save - any saved user secrets, or to request new secrets from the user. -

-
-
-

-Settings Service Interface Changes

-

- With the elimination of the user settings service, the old - org.freedesktop.NetworkManagerUserSettings and - org.freedesktop.NetworkManagerSystemSettings D-Bus - service names are no longer used. Instead NetworkManager provides the - settings service using its own D-Bus service name, - org.freedesktop.NetworkManager. The object path of - the settings service has also changed to - /org/freedesktop/NetworkManager/Settings. -

-

- Additionally, the D-Bus interface of the settings service has changed - to - org.freedesktop.NetworkManager.Settings from - the old interface name of - org.freedesktop.NetworkManagerSettings, and the old - org.freedesktop.NetworkManagerSettings.System - interface has been merged into the new - - org.freedesktop.NetworkManager.Settings interface - as the split no longer made sense. This includes the - SaveHostname method and the Hostname - and CanModify properties. -

-

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

-
-
-

-Connection Object Interface Changes

-

- Consistent with the interface changes to the Settings object, the - Connection object's D-Bus interface has changed to - - org.freedesktop.NetworkManager.Settings.Connection - from the previous - org.freedesktop.NetworkManagerSettings.Connection. -

-

- Additionally, the - org.freedesktop.NetworkManager.Settings.Connection.Updated - signal of the Connection object no longer includes the updated settings - data argument, as that might allow users who are not authorized to - view the connection details to do so. Instead, when a client receives the - Updated signal, it should requery the Connection's settings with the - org.freedesktop.NetworkManager.Settings.Connection.GetSettings - method. If the client receives an error as a result of this method call, - it should assume the connection has been deleted. -

-

- Action: where code manipulates - Connection objects, update the D-Bus interface that code uses to be - org.freedesktop.NetworkManager.Settings.Connection. - Additionally, code that listens for the - org.freedesktop.NetworkManager.Settings.Connection.Updated - signal should no longer expect the new settings data as an argument, but - instead should request the new settings data using the - org.freedesktop.NetworkManager.Settings.Connection.GetSettings - method. -

-
-
-

-Permissions Methods Consolidation

-

- Previously there were two D-Bus method calls to retrieve the list of - operations that a user client could perform, and two signals notifying - callers that they should recheck permissions. Those two calls were: -

-
    -
  • -org.freedesktop.NetworkManagerSettings.System.GetPermissions - which returned a bitfield of operations the caller was allowed to - perform related to modify system network settings and the machine - hostname -
    • -
  • -org.freedesktop.NetworkManager.GetPermissions which - returned a dictionary mapping permission names to result strings like - "yes", "auth", or "no", relating to network control permissions like - the ability to enable or disable WiFi. -
    • -
-

- These two calls have been consolidated into an enhanced - org.freedesktop.NetworkManager.GetPermissions call that - uses the same arguments, but includes all permissions, including those which - the settings service used to handle. -

-

- With this change, the bitfield items from - org.freedesktop.NetworkManagerSettings.System.GetPermissions - are now string-based permissions. The mapping is as follows: -

-
-

Table 31. 

-
---- - - - - - - - - - - - - - - - - - - - - - - -
Old bitfield valueNew permission name
0x1 (connection-modify)
 - org.freedesktop.NetworkManager.settings.modify.system - or org.freedesktop.NetworkManager.settings.modify.system - depending on the permissions of the connection. - 
0x2 (wifi-share-protected)
 - org.freedesktop.NetworkManager.wifi.share.protected - 
0x4 (wifi-share-open)
 - org.freedesktop.NetworkManager.wifi.share.open - 
0x8 (hostname-modify)
 - org.freedesktop.NetworkManager.settings.modify.hostname -
-
-


-

-

- Action: modify handling of existing - code that checks permissions to recognize the new permissions names for - old system settings permissions, and remove code that used to call - org.freedesktop.NetworkManagerSettings.System.GetPermissions. -

-
-
-

-AddConnection Returns Object Path of New Connection

-

- The - org.freedesktop.NetworkManager.Settings.AddConnection - method call now returns the object path of the newly added - connection. Previously, if code wanted to manipulate a connection - post-addition, it had to wait for the new connection to be announced via - the NewConnection signal by matching connection UUIDs. Now the object - path is returned and this workaround is no longer required. -

-

- Action: update code that adds new - connections to handle the object path returned from AddConnection, and - remove workarounds for finding the new connection via signals. -

-
-
-

-Support for WiMAX Devices

-

- NetworkManager now supports Intel WiMAX mobile broadband devices. A - corresponding device type (NM_DEVICE_TYPE_WIMAX) and - a new - org.freedesktop.NetworkManager.Device.WiMax - D-Bus interface have been added. Furthermore, to support connection to - different WiMAX Network Service Providers (NSPs) the - - org.freedesktop.NetworkManager.Device.WiMax.Nsp - interface has been added to access information about each available - WiMAX network. -

-

- Action: update code that handles - devices and/or displays status to users to recognize the new device type, - and to display available WiMAX NSPs similar to how WiFi Access Points - are displayed. Also update code that creates new connections to allow - creation of new WiMAX connections. -

-
-
-

-New Device States

-

- A few new device states - have been added, and all device states have been renumbered for flexibility. - The new devices states IP_CHECK, SECONDARIES, and DEACTIVATING. -

-

- Action: where code checks device state - or shows UI indication of the device's state, make sure the new device - states are processed correctly, and that code in switch()-type statements - is updated to handle the new states. -

-
-
-

-New Active Connection State

-

- Along with the new device states, an - additional - ActiveConnection state has been added: DEACTIVATING. This state - is entered when the connection is being torn down and deactivated. -

-

- Action: where code checks active - connection states or shows UI indication of active connection states, make - sure the DEACTIVATING state is processed correctly, and that code in - switch()-type statements is updated to handle it. -

-
-
-

-Consolidated Modem Devices

-

- Many new mobile broadband devices support multiple access families, like - Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE - or UMTS/LTE modems like the Pantech UML290. The previous hard split - between CDMA/EVDO and GSM/UMTS device classes was not flexible enough to - deal with these new multi-mode devices. Thus the previously separate - CDMA and GSM device classes have been combined into a single Modem - device class, which exposes both hardware "ModemCapabilities" and - runtime "CurrentCapabilities" which represent generic access technology - families like CDMA/EVDO, GSM/UMTS, and LTE which the device supports. - ModemCapabilities indicate all the access technology families which the - modem is capable of supporting, while CurrentCapabilities indicate the - immediate access technology families the device supports without reloading - the firmware and thus restarting the device. -

-

- Along with this change, the - org.freedesktop.NetworkManager.Device.Serial - interface has been removed as it's functionality will be incorporated - into the - - org.freedesktop.NetworkManager.Device.Modem - interface in the future. -

-

- Action: combine code that checks for - the old CDMA and GSM device types, and instead handle the new Modem device - type. Where behavior must change based on the capabilities of the device, - check the CurrentCapabilities device property to determine whether to - treat the device as CDMA, GSM, or LTE for purposes of configuration and - status. -

-
-
-

-Secret Property Flags

-

- In the Connection object's configuration properties, each setting's secret - properties (like WiFi passphrases, or public key passwords, etc) now has - an associated "flags" property that changes how NetworkManager treats the - secret. The "flags" property is a bitfield of one or more of the - following values: -

-
-

Table 32. 

-
---- - - - - - - - - - - - - - - - - - - - - - - -
Flag ValueMeaning
0x00 (none)
 - NetworkManager is responsible for providing and storing this - secret (default) - 
0x01 (agent-owned)
 - A user secret agent is responsible for providing and storing - this secret; when it is required agents will be asked to - retrieve it - 
0x02 (not saved)
 - The secret is not saved, and should be requested each time it - is required. Used for OTP/token configurations where the - secret changes periodically, or if the user simply wants to - manually enter the secret each time. - 
0x04 (not required)
 - In situations where it cannot be automatically determined that - the secret is required (some VPNs and PPP providers dont require - all possible secrets) this flag indicates that the specific - secret is not required. -
-
-


-

-

- Action: user interface code which - handles entry of connection secrets should be updated to read and set - secret flags. For example, code that creates new VPN connections may want - to set the "agent-owned" flag to ensure that the user's VPN password is - not available to all users. EAP-TLS and VPN interface code might add a - checkbox that toggles the "not saved" bit to indicate that the - password/PIN code should be requested from a hardware token each time it - is required. -

-
-
-

-Deprecated Methods Removed

-

- A few methods and signals of the org.freedesktop.NetworkManager - interface deprecated in version 0.7 have been removed. All the - replacement methods and signals have existed since version 0.7 and so are - not new to this version of NetworkManager, but some older programs may - be using removed items. The following table lists the removed items and - their replacements: -

-
-

Table 33. 

-
---- - - - - - - - - - - - - - - -
Removed ItemReplacement
StateChange signal
 - Use the StateChanged signal, which has the - same arguments. - 
sleep() and wake() methods
 - Use the Sleep() method instead, which takes - a boolean argument indicating whether NetworkManager should - go to sleep or wake up. -
-
-


-

-

- Action: update code to use these - replacement methods and properties where it used old deprecated ones -

-
-
-
-
-
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 5bf9720a..e8de233c 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -2,11 +2,11 @@ -Network Configuration Setting Specification: NetworkManager D-Bus Reference Manual +Network Configuration Setting Specification: NetworkManager D-Bus API Reference Manual - - - + + + @@ -16,7 +16,7 @@ Home -Prev +Prev Next
@@ -83,6 +83,12 @@ 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. +
domain-suffix-match
+
string
+

+Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
+
+
 
eap

 
array of string

 
[]

@@ -185,6 +191,12 @@
 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.
 
 
+
phase2-domain-suffix-match

+
string

+

+Constraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
+
+
 
phase2-private-key

 
byte array

 

@@ -206,7 +218,7 @@
 
phase2-subject-match

 
string

 

-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.
+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.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
 
 
 
pin

@@ -242,7 +254,7 @@
 
subject-match

 
string

 

-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.
+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.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
 
 
 
system-ca-certs

@@ -1104,7 +1116,7 @@
 
method

 
string

 

-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.
+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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
 
 
 
name

@@ -1250,7 +1262,7 @@
 
method

 
string

 

-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.
+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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
 
 
 
name

diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html
index bb727419..89e2ca77 100644
--- a/docs/api/html/secrets-flags.html
+++ b/docs/api/html/secrets-flags.html
@@ -2,12 +2,12 @@
 
 
 
-Secret flag types: NetworkManager D-Bus Reference Manual
+Secret flag types: NetworkManager D-Bus API Reference Manual
 
-
+
 
 
-
+
 
 
 
@@ -17,7 +17,7 @@
 Home
 Up
 Prev
-Next
+Next
 
 

 

diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html
index 990fd2ba..45b98a21 100644
--- a/docs/api/html/spec.html
+++ b/docs/api/html/spec.html
@@ -1,2792 +1,139 @@
-NetworkManager D-Bus Interface Specification version 1.1.91
NetworkManager D-Bus Interface Specification
Version 1.1.91
Copyright (C) 2008 - 2016 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
-(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 Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

-  
org.freedesktop.NetworkManager
Methods:
GetDevices (
-        
-        ) →
-        ao

-        Get the list of realized network devices.
-      
Returns
devices -
-      ao

-          List of object paths of network devices known to the system.  This
-          list does not include device placeholders (see GetAllDevices()).
-        
GetAllDevices (
-        
-        ) →
-        ao

-        Get the list of all network devices.
-      
Returns
devices -
-      ao

-          List of object paths of network devices and device placeholders
-          (eg, devices that do not yet exist but which can be automatically
-          created by NetworkManager if one of their AvailableConnections
-          was activated).
-        
GetDeviceByIpIface (
-        s: iface
-        ) →
-        o

-        Return the object path of the network device referenced by its IP
-        interface name.  Note that some devices (usually modems) only have an
-        IP interface name when they are connected.
-      
Parameters
iface -
-      s

-          Interface name of the device to find.
-        
Returns
device -
-      o

-          Object path of the network device.
-        
ActivateConnection (
-        o: connection, o: device, o: specific_object
-        ) →
-        o

-        Activate a connection using the supplied device.
-      
Parameters
connection -
-      o

-          The connection to activate.  If "/" is given, a valid device path must
-          be given, and NetworkManager picks the best connection to activate for
-          the given device.  VPN connections must always pass a valid connection
-          path.
-        
device -
-      o

-          The object path of device to be activated for physical connections.
-          This parameter is ignored for VPN connections, because the
-          specific_object (if provided) specifies the device to use.
-        
specific_object -
-      o

-          The path of a connection-type-specific object this activation should use. 
-          This parameter is currently ignored for wired and mobile broadband connections,
-          and the value of "/" should be used (ie, no specific object).  For WiFi
-          connections, pass the object path of a specific AP from the card's scan
-          list, or "/" to pick an AP automatically.  For VPN connections, pass
-          the object path of an ActiveConnection object that should serve as the
-          "base" connection (to which the VPN connections lifetime will be tied),
-          or pass "/" and NM will automatically use the current default device.
-        
Returns
active_connection -
-      o

-          The path of the active connection object representing this active connection.
-        
AddAndActivateConnection (
-        a{sa{sv}}: connection, o: device, o: specific_object
-        ) →
-        o, o

-        Adds a new connection using the given details (if any) as a template
-        (automatically filling in missing settings with the capabilities of the
-        given device and specific object), then activate the new connection.
-        Cannot be used for VPN connections at this time.
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties; if incomplete missing settings will
-          be automatically completed using the given device and specific object.
-        
device -
-      o

-          The object path of device to be activated using the given connection.
-        
specific_object -
-      o

-          The path of a connection-type-specific object this activation should use. 
-          This parameter is currently ignored for wired and mobile broadband connections,
-          and the value of "/" should be used (ie, no specific object).  For WiFi
-          connections, pass the object path of a specific AP from the card's scan
-          list, which will be used to complete the details of the newly added
-          connection.
-        
Returns
path -
-      o

-          Object path of the new connection that was just added.
-        
active_connection -
-      o

-          The path of the active connection object representing this active connection.
-        
DeactivateConnection (
-        o: active_connection
-        ) →
-        nothing

-        Deactivate an active connection.
-      
Parameters
active_connection -
-      o

-          The currently active connection to deactivate.
-        
Sleep (
-        b: sleep
-        ) →
-        nothing

-        Control the NetworkManager daemon's sleep state.  When asleep, all
-        interfaces that it manages are deactivated.  When awake, devices are
-        available to be activated.  This command should not be called directly
-        by users or clients; it is intended for system suspend/resume tracking.
-      
Parameters
sleep -
-      b

-          Indicates whether the NetworkManager daemon should sleep or wake.
-        
Enable (
-        b: enable
-        ) →
-        nothing

-        Control whether overall networking is enabled or disabled.  When
-        disabled, all interfaces that NM manages are deactivated.  When enabled,
-        all managed interfaces are re-enabled and available to be activated.
-        This command should be used by clients that provide to users the ability
-        to enable/disable all networking.
-      
Parameters
enable -
-      b

-          If FALSE, indicates that all networking should be disabled.  If TRUE,
-          indicates that NetworkManager should begin managing network devices.
-        
GetPermissions (
-        
-        ) →
-        a{ss}

-        Returns the permissions a caller has for various authenticated operations
-        that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
-      
Returns
permissions -
-      a{ss}

-          Dictionary of available permissions and results.  Each permission
-          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
-          and each result is one of the following values: "yes" (the permission
-          is available), "auth" (the permission is available after a successful
-          authentication), or "no" (the permission is denied).  Clients may use
-          these values in the UI to indicate the ability to perform certain
-          operations.
-        
SetLogging (
-        s: level, s: domains
-        ) →
-        nothing

-        Set logging verbosity and which operations are logged.
-      
Parameters
level -
-      s

-          One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP].
-          This level is applied to the domains as specified in the domains
-          argument. Except for the special level "KEEP", all unmentioned
-          domains are disabled entirely. "KEEP" is special and allows
-          not to change the current setting except for the specified
-          domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only
-          touch the platform domain.
-        
domains -
-      s

-          A combination of logging domains separated by commas (','), or "NONE"
-          to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [PLATFORM, RFKILL, ETHER,
-          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
-          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
-          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,
-          TEAM, CONCHECK, DCB, DISPATCH, AUDIT].
-          In addition to these domains, the following special domains can be used:
-          [NONE, ALL, DEFAULT, DHCP, IP].  You can also specify that some domains
-          should log at a different level from the default by appending a colon (':')
-          and a log level (eg, 'WIFI:DEBUG').  If an empty string is given, the
-          log level is changed but the current set of log domains remains
-          unchanged.
-        
GetLogging (
-        
-        ) →
-        s, s

-        Get current logging verbosity level and operations domains.
-      
Returns
level -
-      s

-          One of [ERR, WARN, INFO, DEBUG, TRACE].
-        
domains -
-      s

-          For available domains see SetLogging() call.
-        
CheckConnectivity (
-        
-        ) →
-        u

-	Re-check the network connectivity state.
-      
Returns
connectivity -
-      u
-      (NM_CONNECTIVITY)
-    

-          The current connectivity state.
-        
state (
-        
-        ) →
-        u

-        The overall networking state as determined by the NetworkManager daemon,
-        based on the state of network devices under it's management.
-      
Returns
state -
-      u
-      (NM_STATE)
-    
Signals:
CheckPermissions (
-        
-        )

-        Emitted when system authorization details change, indicating that
-        clients may wish to recheck permissions with GetPermissions.
-      
StateChanged (
-        u: state
-        )

-        NetworkManager's state changed.
-      
Parameters
state -
-      u
-      (NM_STATE)
-    

-          The new state of NetworkManager.
-        
PropertiesChanged (
-        a{sv}: properties
-        )

-        NetworkManager's properties changed.
-      
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-          The changed properties.
-        
DeviceAdded (
-        o: device_path
-        )

-        A device was added to the system
-      
Parameters
device_path -
-      o

-          The object path of the newly added device.
-        
DeviceRemoved (
-        o: device_path
-        )

-        A device was removed from the system, and is no longer available.
-      
Parameters
device_path -
-      o

-          The object path of the device that was just removed.
-        
Properties:
Devices -
-      ao -
-      (read)

-        The list of realized network devices. Realized devices are those which
-        have backing resources (eg from the kernel or a management daemon like
-        ModemManager, teamd, etc).
-      
AllDevices -
-      ao -
-      (read)

-        The list of both realized and un-realized network devices. Un-realized
-        devices are software devices which do not yet have backing resources,
-        but for which backing resources can be created if the device is
-        activated.
-      
NetworkingEnabled -
-      b -
-      (read)

-        Indicates if overall networking is currently enabled or not.  See the
-        Enable() method.
-      
WirelessEnabled -
-      b -
-      (readwrite)

-        Indicates if wireless is currently enabled or not.
-      
WirelessHardwareEnabled -
-      b -
-      (read)

-        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
-      
WwanEnabled -
-      b -
-      (readwrite)

-        Indicates if mobile broadband devices are currently enabled or not.
-      
WwanHardwareEnabled -
-      b -
-      (read)

-        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
-      
WimaxEnabled -
-      b -
-      (readwrite)

-        Indicates if WiMAX devices are currently enabled or not.
-      
WimaxHardwareEnabled -
-      b -
-      (read)

-        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
-      
ActiveConnections -
-      ao -
-      (read)

-        List of active connection object paths.
-      
PrimaryConnection -
-      o -
-      (read)

-        The object path of the "primary" active connection being used
-        to access the network. In particular, if there is no VPN
-        active, or the VPN does not have the default route, then this
-        indicates the connection that has the default route. If there
-        is a VPN active with the default route, then this indicates
-        the connection that contains the route to the VPN endpoint.
-      
PrimaryConnectionType -
-      s -
-      (read)

-        The connection type of the "primary" active connection being
-        used to access the network. This is the same as the Type
-        property on the object indicated by PrimaryConnection.
-      
Metered -
-      u -
-      (read)
-      (NM_METERED)
-    

-        Indicates whether the connectivity is metered. This is equivalent
-        to the metered property of the device associated with the primary
-        connection.
-      
ActivatingConnection -
-      o -
-      (read)

-        The object path of an active connection that is currently
-        being activated and which is expected to become the new
-        PrimaryConnection when it finishes activating.
-      
Startup -
-      b -
-      (read)

-        Indicates whether NM is still starting up; this becomes FALSE
-        when NM has finished attempting to activate every connection
-        that it might be able to activate at startup.
-      
Version -
-      s -
-      (read)

-        NetworkManager version.
-      
State -
-      u -
-      (read)
-      (NM_STATE)
-    

-        The overall state of the NetworkManager daemon.
-      
Connectivity -
-      u -
-      (read)
-      (NM_CONNECTIVITY)
-    

-        The network connectivity state.
-      
GlobalDnsConfiguration -
-      a{sv} -
-      (readwrite)

-        Dictionary of global DNS settings where the key is one of
-        "searches", "options" and "domains".  The values for the
-        "searches" and "options" keys are string arrays describing the
-        list of search domains and resolver options, respectively.
-        The value of the "domains" key is a second-level dictionary,
-        where each key is a domain name, and each key's value is a
-        third-level dictionary with the keys "servers" and
-        "options". "servers" is a string array of DNS servers,
-        "options" is a string array of domain-specific options.
-      
Enumerated types:
NM_STATE

-        Describes the overall state of the daemon.
-      
NM_STATE_UNKNOWN = 0

-          Networking state is unknown.
-        
NM_STATE_ASLEEP = 10

-          Networking is inactive and all devices are disabled.
-        
NM_STATE_DISCONNECTED = 20

-          There is no active network connection.
-        
NM_STATE_DISCONNECTING = 30

-          Network connections are being cleaned up.
-        
NM_STATE_CONNECTING = 40

-          A network device is connecting to a network and there is no other
-          available network connection.
-        
NM_STATE_CONNECTED_LOCAL = 50

-          A network device is connected, but there is only link-local connectivity.
-        
NM_STATE_CONNECTED_SITE = 60

-          A network device is connected, but there is only site-local connectivity.
-        
NM_STATE_CONNECTED_GLOBAL = 70

-          A network device is connected, with global network connectivity.
-        
NM_CONNECTIVITY

-        Describes the network-connectivity state.
-      
NM_CONNECTIVITY_UNKNOWN = 0

-          Network connectivity is unknown.
-        
NM_CONNECTIVITY_NONE = 1

-          The host is not connected to any network.
-        
NM_CONNECTIVITY_PORTAL = 2

-          The host is behind a captive portal and cannot reach the
-          full Internet.
-        
NM_CONNECTIVITY_LIMITED = 3

-          The host is connected to a network, but does not appear to
-	  be able to reach the full Internet.
-        
NM_CONNECTIVITY_FULL = 4

-	  The host is connected to a network, and appears to be able
-	  to reach the full Internet
-        

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Flags -
-      u -
-      (read)
-      (NM_802_11_AP_FLAGS)
-    
Flags describing the capabilities of the access point.
WpaFlags -
-      u -
-      (read)
-      (NM_802_11_AP_SEC)
-    
Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
RsnFlags -
-      u -
-      (read)
-      (NM_802_11_AP_SEC)
-    
Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
Ssid -
-      ay -
-      (read)
The Service Set Identifier identifying the access point.
Frequency -
-      u -
-      (read)
The radio channel frequency in use by the access point, in MHz.
HwAddress -
-      s -
-      (read)
The hardware address (BSSID) of the access point.
Mode -
-      u -
-      (read)
-      (NM_802_11_MODE)
-    
Describes the operating mode of the access point.
MaxBitrate -
-      u -
-      (read)
The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
Strength -
-      y -
-      (read)
The current signal quality of the access point, in percent.
LastSeen -
-      i -
-      (read)

-        The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
-        point was found in scan results.  A value of -1 means the access point
-        has never been found in scan results.
-      
Sets of flags:
NM_802_11_AP_FLAGS

-        Flags describing the general capabilities of the access point.
-      
NM_802_11_AP_FLAGS_NONE = 0x0
Null capability - says nothing about the access point.
NM_802_11_AP_FLAGS_PRIVACY = 0x1
Access point supports privacy measures.
NM_802_11_AP_SEC

-        Flags describing the security capabilities of the access point.
-      
NM_802_11_AP_SEC_NONE = 0x0
Null flag.
NM_802_11_AP_SEC_PAIR_WEP40 = 0x1
Access point supports pairwise 40-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_WEP104 = 0x2
Access point supports pairwise 104-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_TKIP = 0x4
Access point supports pairwise TKIP encryption.
NM_802_11_AP_SEC_PAIR_CCMP = 0x8
Access point supports pairwise CCMP encryption.
NM_802_11_AP_SEC_GROUP_WEP40 = 0x10
Access point supports a group 40-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_WEP104 = 0x20
Access point supports a group 104-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_TKIP = 0x40
Access point supports a group TKIP cipher.
NM_802_11_AP_SEC_GROUP_CCMP = 0x80
Access point supports a group CCMP cipher.
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
Access point supports PSK key management.
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
Access point supports 802.1x key management.

-
-  
org.freedesktop.NetworkManager.Device
Methods:
Reapply (
-        a{sa{sv}}: connection, t: version_id, u: flags
-        ) →
-        nothing

-        Attempts to update the configuration of a device without deactivating it. NetworkManager
-        has the concept of connections, which are profiles that contain the configuration for
-        a networking device. Those connections are exposed via D-Bus as individual objects
-        that can be created, modified and deleted. When activating such a settings-connection
-        on a device, the settings-connection is cloned to become an applied-connection and used to
-        configure the device (see GetAppliedConnection). Subsequent modification of the
-        settings-connection don't propagate automatically to the device's applied-connection
-        (with exception of the firewall-zone and the metered property). For the changes to take
-        effect, you can either re-activate the settings-connection, or call Reapply.
-        The Reapply call allows you to directly update the applied-connection and reconfigure
-        the device.
-        Reapply can also be useful if the currently applied-connection is equal to the connection
-        that is about to be reapplied. This allows to reconfigure the device and revert external
-        changes like removing or adding an IP address (which NetworkManager doesn't revert
-        automatically because it is assumed that the user made these changes intentionally outside
-        of NetworkManager).
-        Reapply can make the applied-connection different from the settings-connection,
-        just like updating the settings-connection can make them different.
-      
Parameters
connection -
-      a{sa{sv}}

-          The optional connection settings that will be reapplied on the device. If empty, the
-          currently active settings-connection will be used. The connection cannot arbitrarly
-          differ from the current applied-connection otherwise the call will fail.
-          Only certain changes are supported, like adding or removing IP addresses.
-        
version_id -
-      t

-          If non-zero, the current version id of the applied-connection must match.
-          The current version id can be retrieved via GetAppliedConnection.
-          This optional argument allows to catch concurrent modifications between
-          the GetAppliedConnection call and Reapply.
-        
flags -
-      u

-          Flags which would modify the behavior of the Reapply call.
-          There are no flags defined currently and the users should use the value of 0.
-        
GetAppliedConnection (
-        u: flags
-        ) →
-        a{sa{sv}}, t

-        Get the currently applied connection on the device. This is a snapshot of the last activated
-        connection on the device, that is the configuration that is currently applied on the device.
-        Usually this is the same as GetSettings of the referenced settings connection. However, it
-        can differ if the settings connection was subsequently modified or the applied connection was
-        modified by Reapply. The applied connection is set when activating a device or when calling
-        Reapply.
-      
Parameters
flags -
-      u

-          Flags which would modify the behavior of the GetAppliedConnection call.
-          There are no flags defined currently and the users should use the value of 0.
-        
Returns
connection -
-      a{sa{sv}}

-            The effective connection settings that the connection has currently applied.
-        
version_id -
-      t

-            The version-id of the currently applied connection. This can be specified during
-            Reapply to avoid races where you first fetch the applied connection, modify it
-            and try to reapply it. If the applied connection is modified in the meantime, the
-            version_id gets incremented and Reapply will fail.
-        
Disconnect (
-        
-        ) →
-        nothing

-        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
-      
Delete (
-        
-        ) →
-        nothing

-        Deletes a software device from NetworkManager and removes the interface from the system.
-        The method returns an error when called for a hardware device.
-      
Signals:
StateChanged (
-        u: new_state, u: old_state, u: reason
-        )
Parameters
new_state -
-      u
-      (NM_DEVICE_STATE)
-    

-          The new state of the device.
-        
old_state -
-      u
-      (NM_DEVICE_STATE)
-    

-          The previous state of the device.
-        
reason -
-      u
-      (NM_DEVICE_STATE_REASON)
-    

-          A reason for the state transition.
-        
Properties:
Udi -
-      s -
-      (read)

-        Operating-system specific transient device hardware identifier.  This
-        is an opaque string representing the underlying hardware for the device,
-        and shouldn't be used to keep track of individual devices.  For some
-        device types (Bluetooth, Modems) it is an identifier used by the
-        hardware service (ie bluez or ModemManager) to refer to that device,
-        and client programs use it get additional information from those
-        services which NM does not provide.  The Udi is not guaranteed to be
-        consistent across reboots or hotplugs of the hardware. If you're looking
-        for a way to uniquely track each device in your application, use the
-        object path.  If you're looking for a way to track a specific piece of
-        hardware across reboot or hotplug, use a MAC address or USB serial
-        number.
-      
Interface -
-      s -
-      (read)

-        The name of the device's control (and often data) interface.
-      
IpInterface -
-      s -
-      (read)

-        The name of the device's data interface when available.  This property
-        may not refer to the actual data interface until the device has
-        successfully established a data connection, indicated by the device's
-        State becoming ACTIVATED.
-      
Driver -
-      s -
-      (read)

-        The driver handling the device.
-      
DriverVersion -
-      s -
-      (read)

-        The version of the driver handling the device.
-      
FirmwareVersion -
-      s -
-      (read)

-        The firmware version for the device.
-      
Capabilities -
-      u -
-      (read)
-      (NM_DEVICE_CAP)
-    

-        Flags describing the capabilities of the device.
-      
Ip4Address -
-      u -
-      (read)

-        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.
-      
State -
-      u -
-      (read)
-      (NM_DEVICE_STATE)
-    

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

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

-        Object path of an ActiveConnection object that "owns" this device during
-        activation.  The ActiveConnection object tracks the life-cycle of a
-        connection to a specific network and implements the
-        org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
-      
Ip4Config -
-      o -
-      (read)

-        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Dhcp4Config -
-      o -
-      (read)

-        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Ip6Config -
-      o -
-      (read)

-        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Dhcp6Config -
-      o -
-      (read)

-        Object path of the Dhcp6Config object describing the DHCP options
-        returned by the DHCP server.  Only valid when the device is in the
-        NM_DEVICE_STATE_ACTIVATED state.
-      
Managed -
-      b -
-      (readwrite)

-        Whether or not this device is managed by NetworkManager. Setting this
-        property has a similar effect to configuring the device as unmanaged
-        via the keyfile.unmanaged-devices setting in NetworkManager.conf.
-        Changes to this value are not persistent and lost after NetworkManager
-        restart.
-      
Autoconnect -
-      b -
-      (readwrite)

-        If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
-        manual intervention is required before the device will automatically
-        connect to a known network, such as activating a connection using the
-        device, or setting this property to TRUE.  This property cannot be
-        set to TRUE for default-unmanaged devices, since they never autoconnect.
-      
FirmwareMissing -
-      b -
-      (read)

-        If TRUE, indicates the device is likely missing firmware necessary for
-        its operation.
-      
NmPluginMissing -
-      b -
-      (read)

-        If TRUE, indicates the NetworkManager plugin for the device is likely
-        missing or misconfigured.
-      
DeviceType -
-      u -
-      (read)
-      (NM_DEVICE_TYPE)
-    

-        The general type of the network device; ie Ethernet, WiFi, etc.
-      
AvailableConnections -
-      ao -
-      (read)

-        An array of object paths of every configured connection that is currently 'available' through this device.
-      
PhysicalPortId -
-      s -
-      (read)

-        If non-empty, an (opaque) indicator of the physical network
-        port associated with the device. This can be used to recognize
-	when two seemingly-separate hardware devices are actually just
-	different virtual interfaces to the same physical port.
-      
Mtu -
-      u -
-      (read)

-        The device MTU (maximum transmission unit).
-      
Metered -
-      u -
-      (read)
-      (NM_METERED)
-    

-        Whether the amount of traffic flowing through the device is
-        subject to limitations, for example set by service providers.
-      
LldpNeighbors -
-      aa{sv} -
-      (read)

-        Array of LLDP neighbors; each element is a dictionary mapping
-        LLDP TLV names to variant boxed values.
-      
Real -
-      b -
-      (read)

-        True if the device exists, or False for placeholder devices that
-        do not yet exist but could be automatically created by NetworkManager
-        if one of their AvailableConnections was activated.
-      
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

-          The device is in an unknown state.
-        
NM_DEVICE_STATE_UNMANAGED = 10

-          The device is recognized but not managed by NetworkManager.
-        
NM_DEVICE_STATE_UNAVAILABLE = 20

-          The device cannot be used (carrier off, rfkill, etc).
-        
NM_DEVICE_STATE_DISCONNECTED = 30

-          The device is not connected.
-        
NM_DEVICE_STATE_PREPARE = 40

-          The device is preparing to connect.
-        
NM_DEVICE_STATE_CONFIG = 50

-          The device is being configured.
-        
NM_DEVICE_STATE_NEED_AUTH = 60

-          The device is awaiting secrets necessary to continue connection.
-        
NM_DEVICE_STATE_IP_CONFIG = 70

-          The IP settings of the device are being requested and configured.
-        
NM_DEVICE_STATE_IP_CHECK = 80

-          The device's IP connectivity ability is being determined.
-        
NM_DEVICE_STATE_SECONDARIES = 90

-          The device is waiting for secondary connections to be activated.
-        
NM_DEVICE_STATE_ACTIVATED = 100

-          The device is active.
-        
NM_DEVICE_STATE_DEACTIVATING = 110

-          The device's network connection is being torn down.
-        
NM_DEVICE_STATE_FAILED = 120

-          The device is in a failure state following an attempt to activate it.
-        
NM_DEVICE_TYPE
NM_DEVICE_TYPE_UNKNOWN = 0

-          The device type is unknown.
-        
NM_DEVICE_TYPE_ETHERNET = 1

-          The device is wired Ethernet device.
-        
NM_DEVICE_TYPE_WIFI = 2

-          The device is an 802.11 WiFi device.
-        
NM_DEVICE_TYPE_UNUSED1 = 3
Unused
NM_DEVICE_TYPE_UNUSED2 = 4
Unused
NM_DEVICE_TYPE_BT = 5

-          The device is Bluetooth device that provides PAN or DUN capabilities.
-        
NM_DEVICE_TYPE_OLPC_MESH = 6

-          The device is an OLPC mesh networking device.
-        
NM_DEVICE_TYPE_WIMAX = 7

-          The device is an 802.16e Mobile WiMAX device.
-        
NM_DEVICE_TYPE_MODEM = 8

-          The device is a modem supporting one or more of analog telephone,
-          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
-          wireline data network.
-        
NM_DEVICE_TYPE_INFINIBAND = 9

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

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

-          The device is a VLAN interface.
-        
NM_DEVICE_TYPE_ADSL = 12

-          The device is an ADSL device supporting PPPoE and PPPoATM protocols.
-        
NM_DEVICE_TYPE_BRIDGE = 13

-          The device is a bridge interface.
-        
NM_DEVICE_TYPE_GENERIC = 14

-          The device is a generic interface type unrecognized by NetworkManager.
-        
NM_DEVICE_TYPE_TEAM = 15

-          The device is a team master interface.
-        
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

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

-          The state change is normal.
-        
NM_DEVICE_STATE_REASON_NOW_MANAGED = 2

-          The device is now managed.
-        
NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3

-          The device is no longer managed.
-        
NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4

-          The device could not be readied for configuration.
-        
NM_DEVICE_STATE_REASON_CONFIG_UNAVAILABLE = 5

-          IP configuration could not be reserved (no available address, timeout, etc).
-        
NM_DEVICE_STATE_REASON_CONFIG_EXPIRED = 6

-          The IP configuration is no longer valid.
-        
NM_DEVICE_STATE_REASON_NO_SECRETS = 7

-          Secrets were required, but not provided.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8

-          The 802.1X supplicant disconnected from the access point or authentication server.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9

-          Configuration of the 802.1X supplicant failed.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10

-          The 802.1X supplicant quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11

-          The 802.1X supplicant took too long to authenticate.
-        
NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12

-          The PPP service failed to start within the allowed time.
-        
NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13

-          The PPP service disconnected unexpectedly.
-        
NM_DEVICE_STATE_REASON_PPP_FAILED = 14

-          The PPP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15

-          The DHCP service failed to start within the allowed time.
-        
NM_DEVICE_STATE_REASON_DHCP_ERROR = 16

-          The DHCP service reported an unexpected error.
-        
NM_DEVICE_STATE_REASON_DHCP_FAILED = 17

-          The DHCP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18

-          The shared connection service failed to start.
-        
NM_DEVICE_STATE_REASON_SHARED_FAILED = 19

-          The shared connection service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20

-          The AutoIP service failed to start.
-        
NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21

-          The AutoIP service reported an unexpected error.
-        
NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22

-          The AutoIP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_MODEM_BUSY = 23

-          Dialing failed because the line was busy.
-        
NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24

-          Dialing failed because there was no dial tone.
-        
NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25

-          Dialing failed because there was carrier.
-        
NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26

-          Dialing timed out.
-        
NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27

-          Dialing failed.
-        
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28

-          Modem initialization failed.
-        
NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29

-          Failed to select the specified GSM APN.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30

-          Not searching for networks.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31

-          Network registration was denied.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32

-          Network registration timed out.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33

-          Failed to register with the requested GSM network.
-        
NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34

-          PIN check failed.
-        
NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35

-          Necessary firmware for the device may be missing.
-        
NM_DEVICE_STATE_REASON_REMOVED = 36

-          The device was removed.
-        
NM_DEVICE_STATE_REASON_SLEEPING = 37

-          NetworkManager went to sleep.
-        
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38

-          The device's active connection was removed or disappeared.
-        
NM_DEVICE_STATE_REASON_USER_REQUESTED = 39

-          A user or client requested the disconnection.
-        
NM_DEVICE_STATE_REASON_CARRIER = 40

-          The device's carrier/link changed.
-        
NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41

-          The device's existing connection was assumed.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42

-          The 802.1x supplicant is now available.
-        
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43

-          The modem could not be found.
-        
NM_DEVICE_STATE_REASON_BT_FAILED = 44

-          The Bluetooth connection timed out or failed.
-        
NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED = 45

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

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

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

-          GSM Modem's SIM wrong
-        
NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49

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

-          A dependency of the connection failed.
-        
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51

-          Problem with the RFC 2684 Ethernet over ADSL bridge.
-        
NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52

-          ModemManager was not running or quit unexpectedly.
-        
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53

-          The 802.11 Wi-Fi network could not be found.
-        
NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54

-          A secondary connection of the base connection failed.
-        
NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED = 55

-          DCB or FCoE setup failed.
-        
NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED = 56

-          teamd control failed.
-        
NM_DEVICE_STATE_REASON_MODEM_FAILED = 57

-          Modem failed or no longer available.
-        
NM_DEVICE_STATE_REASON_MODEM_AVAILABLE = 58

-          Modem now ready and available.
-        
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.
-        
NM_METERED
NM_METERED_UNKNOWN = 0

-          The device metered status is unknown.
-        
NM_METERED_YES = 1

-          The device is metered and the value was statically set.
-        
NM_METERED_NO = 2

-          The device is not metered and the value was statically set.
-        
NM_METERED_GUESS_YES = 3

-          The device is metered and the value was guessed.
-        
NM_METERED_GUESS_NO = 4

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

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

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

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Carrier -
-      b -
-      (read)

-        Indicates whether the physical carrier is found.
-      

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

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

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

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

-        Array of object paths representing devices which are currently
-	slaved to this device.
-      

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

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

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

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

-        Array of object paths representing devices which are currently
-	slaved to this device.
-      

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

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

-        Bluetooth hardware address of the device.
-      
Name -
-      s -
-      (read)

-        Bluetooth name of the device.
-      
BtCapabilities -
-      u -
-      (read)
-      (NM_BT_CAPABILITIES)
-    

-        Bluetooth capabilities of the device (either DUN or NAP).
-      
Sets of flags:
NM_BT_CAPABILITIES

-        Flags describing the capabilities of a Bluetooth device.
-      
NM_BT_CAPABILITY_NONE = 0x0
The device has no recognized capabilities.
NM_BT_CAPABILITY_DUN = 0x1
The device supports Bluetooth Dial-Up Networking.
NM_BT_CAPABILITY_PAN = 0x2
The device supports Bluetooth Personal Area Networking.

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

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

-        Active hardware address of the device.
-      
PermHwAddress -
-      s -
-      (read)

-        Permanent hardware address of the device.
-      
Speed -
-      u -
-      (read)

-        Design speed of the device, in megabits/second (Mb/s).
-      
S390Subchannels -
-      as -
-      (read)

-        Array of S/390 subchannels for S/390 or z/Architecture devices.
-      
Carrier -
-      b -
-      (read)

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

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

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

-        Hardware address of the device.
-      
TypeDescription -
-      s -
-      (read)

-        A (non-localized) description of the interface type, if known.
-      

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

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

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

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

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Mode -
-      u -
-      (read)

-        The tunneling mode.
-      
Parent -
-      o -
-      (read)

-        The object path of the parent device.
-      
Local -
-      s -
-      (read)

-        The local endpoint of the tunnel.
-      
Remote -
-      s -
-      (read)

-        The remote endpoint of the tunnel.
-      
Ttl -
-      y -
-      (read)

-        The TTL assigned to tunneled packets. 0 is a special value
-        meaning that packets inherit the TTL value
-      
Tos -
-      y -
-      (read)

-        The type of service (IPv4) or traffic class (IPv6) assigned to
-        tunneled packets.
-      
PathMtuDiscovery -
-      b -
-      (read)

-        Whether path MTU discovery is enabled on this tunnel.
-      
InputKey -
-      s -
-      (read)

-        The key used for incoming packets.
-      
OutputKey -
-      s -
-      (read)

-        The key used for outgoing packets.
-      
EncapsulationLimit -
-      y -
-      (read)

-        How many additional levels of encapsulation are permitted to
-        be prepended to packets. This property applies only to IPv6
-        tunnels.
-      
FlowLabel -
-      u -
-      (read)

-        The flow label to assign to tunnel packets. This property
-        applies only to IPv6 tunnels.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Parent -
-      o -
-      (read)

-        The object path of the parent device.
-      
Mode -
-      s -
-      (read)

-        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
-      
NoPromisc -
-      b -
-      (read)

-        Whether the device is blocked from going into promiscuous mode.
-      
Tap -
-      b -
-      (read)

-        Whether the device is a macvtap.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
ModemCapabilities -
-      u -
-      (read)
-      (NM_DEVICE_MODEM_CAPABILITIES)
-    

-        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.
-      
CurrentCapabilities -
-      u -
-      (read)
-      (NM_DEVICE_MODEM_CAPABILITIES)
-    

-        The generic family of access technologies the modem currently supports
-        without a firmware reload or reinitialization.
-      
Sets of flags:
NM_DEVICE_MODEM_CAPABILITIES

-        Flags describing one or more of the general access technology families
-        that a modem device supports.
-      
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x0
Modem has no capabilties.
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x1

-          Modem supports the analog wired telephone network (ie 56k dialup) and
-          does not have wireless/cellular capabilities.
-        
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x2

-          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
-          revision A, or EVDO revision B.
-        
NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x4

-          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
-          HSPA+ packet switched data capability.
-        
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x8

-          Modem has at LTE data capability.
-        

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

-            Emitted when the wireless device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary containing the FIXME: check changed parameters.
-            
Properties:
HwAddress -
-      s -
-      (read)

-        The hardware address of the device.
-      
Companion -
-      o -
-      (read)

-        The object path of the companion device.
-      
ActiveChannel -
-      u -
-      (read)

-        The currently active channel.
-      

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

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

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

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

-        Array of object paths representing devices which are currently
-	slaved to this device.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Owner -
-      x -
-      (read)

-        The uid of the tunnel owner, or -1 if it has no owner.
-      
Group -
-      x -
-      (read)

-        The gid of the tunnel group, or -1 if it has no owner.
-      
Mode -
-      s -
-      (read)

-        The tunnel mode, either "tun" or "tap".
-      
NoPi -
-      b -
-      (read)

-        The tunnel's "TUN_NO_PI" flag; true if no protocol info is
-	prepended to the tunnel packets.
-      
VnetHdr -
-      b -
-      (read)

-        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
-	include a virtio network header.
-      
MultiQueue -
-      b -
-      (read)

-        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
-        the tap device multiple times, for multiple send/receive
-        queues.
-      
HwAddress -
-      s -
-      (read)

-        Hardware address of the device.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Peer -
-      o -
-      (read)

-        The object path of the device's peer.
-      

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

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

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

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

-        Object path of the parent device of this VLAN device.
-      
VlanId -
-      u -
-      (read)

-        The VLAN ID of this VLAN interface.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Parent -
-      o -
-      (read)

-        The object path of the parent device (if the VXLAN is not
-	purely internal to this host).
-      
HwAddress -
-      s -
-      (read)

-        Hardware address of the device.
-      
Id -
-      u -
-      (read)

-        The VXLAN Network Identifier (VNI).
-      
Group -
-      s -
-      (read)

-        The IP (v4 or v6) multicast group used to communicate with other physical
-	hosts on this VXLAN.
-      
Local -
-      s -
-      (read)

-        The local IPv4 or IPv6 address to use when sending VXLAN packets to other
-	physical hosts.
-      
Tos -
-      y -
-      (read)

-        The value to use in the IP ToS field for VXLAN packets sent to
-	other physical hosts.
-      
Ttl -
-      y -
-      (read)

-        The value to use in the IP TTL field for VXLAN packets sent to
-	other physical hosts.
-      
Learning -
-      b -
-      (read)

-        True if the VXLAN dynamically learns remote IP addresses.
-      
Ageing -
-      u -
-      (read)

-        The interval in seconds at which the kernel purges stale
-        cached addresses.
-      
Limit -
-      u -
-      (read)

-        The maximum number of entries that can be added to the VXLAN's
-	forwarding table.
-      
DstPort -
-      q -
-      (read)

-        Destination port for outgoing VXLAN packets.
-      
SrcPortMin -
-      q -
-      (read)

-        The lowest source port number to use for outgoing VXLAN packets.
-      
SrcPortMax -
-      q -
-      (read)

-        The highest source port number to use for outgoing VXLAN packets.
-      
Proxy -
-      b -
-      (read)

-        True if the VXLAN is implementing DOVE ARP proxying for remote
-        clients.
-      
Rsc -
-      b -
-      (read)

-        True if the VXLAN is implementing DOVE route short-circuiting
-	of known remote IP addresses.
-      
L2miss -
-      b -
-      (read)

-        True if the VXLAN will emit netlink notifications of L2 switch
-        misses.
-      
L3miss -
-      b -
-      (read)

-        True if the VXLAN will emit netlink notifications of L3 switch
-        misses.
-      

-
-  
org.freedesktop.NetworkManager.Device.Wireless
Methods:
GetAccessPoints (
-        
-        ) →
-        ao

-        DEPRECATED.  Get the list of access points visible to this device.  Note
-        that this list does not include access points which hide their SSID.  To
-        retrieve a list of all access points (including hidden ones) use the
-        GetAllAccessPoints() method.
-      
Returns
access_points -
-      ao

-          List of access point object paths.
-        
GetAllAccessPoints (
-        
-        ) →
-        ao

-        Get the list of all access points visible to this device, including
-        hidden ones for which the SSID is not yet known.
-      
Returns
access_points -
-      ao

-          List of access point object paths.
-        
RequestScan (
-        a{sv}: options
-        ) →
-        nothing

-        Request the device to scan
-      
Parameters
options -
-      a{sv}

-          Options of scan.
-          Currently 'ssids' option with value of "aay" type is supported.
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )

-            Emitted when the wireless device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary containing the FIXME: check changed parameters.
-            
AccessPointAdded (
-        o: access_point
-        )

-            Emitted when a new access point is found by the device.
-        
Parameters
access_point -
-      o

-                The object path of the newly found access point.
-            
AccessPointRemoved (
-        o: access_point
-        )

-            Emitted when an access point disappears from view of the device.
-        
Parameters
access_point -
-      o

-                The object path of the access point that has disappeared.
-            
Properties:
HwAddress -
-      s -
-      (read)

-        The active hardware address of the device.
-      
PermHwAddress -
-      s -
-      (read)

-        The permanent hardware address of the device.
-      
Mode -
-      u -
-      (read)
-      (NM_802_11_MODE)
-    

-        The operating mode of the wireless device.
-      
Bitrate -
-      u -
-      (read)

-        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
-      
AccessPoints -
-      ao -
-      (read)

-        List of object paths of access point visible to this wireless device.
-      
ActiveAccessPoint -
-      o -
-      (read)

-        Object path of the access point currently used by the wireless device.
-      
WirelessCapabilities -
-      u -
-      (read)
-      (NM_802_11_DEVICE_CAP)
-    

-        The capabilities of the wireless device.
-      
Sets of flags:
NM_802_11_DEVICE_CAP

-        Flags describing the capabilities of a wireless device.
-      
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.
NM_802_11_DEVICE_CAP_AP = 0x40
The device supports Access Point mode.
NM_802_11_DEVICE_CAP_ADHOC = 0x80
The device supports Ad-Hoc mode.
NM_802_11_DEVICE_CAP_FREQ_VALID = 0x100

-	  The device properly reports information about supported
-	  frequencies and thus both NM_802_11_DEVICE_CAP_FREQ_2GHZ and
-	  NM_802_11_DEVICE_CAP_FREQ_5GHZ are valid.
-	
NM_802_11_DEVICE_CAP_FREQ_2GHZ = 0x200

-          The device supports 2.4GHz frequencies.
-        
NM_802_11_DEVICE_CAP_FREQ_5GHZ = 0x400

-          The device supports 5GHz frequencies.
-        

-
-  
org.freedesktop.NetworkManager.Device.WiMax
Methods:
GetNspList (
-        
-        ) →
-        ao

-        Get the list of NSPs visible to this device.
-      
Returns
nsps -
-      ao

-          List of NSP object paths
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )

-            Emitted when the WiMax device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values.
-            
NspAdded (
-        o: nsp
-        )

-            Emitted when a new NSP is found by the device.
-        
Parameters
nsp -
-      o

-                The object path of the newly found NSP.
-            
NspRemoved (
-        o: nsp
-        )

-            Emitted when an NSP disappears from view of the device.
-        
Parameters
nsp -
-      o

-                The object path of the NSP that has disappeared.
-            
Properties:
Nsps -
-      ao -
-      (read)

-        List of object paths of Network Service Providers (NSPs) visible to this
-        WiMAX device.
-      
HwAddress -
-      s -
-      (read)

-        Hardware address of the device.
-      
CenterFrequency -
-      u -
-      (read)

-        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.
-      
Rssi -
-      i -
-      (read)

-        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.
-      
Cinr -
-      i -
-      (read)

-        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.
-      
TxPower -
-      i -
-      (read)

-        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.
-      
Bsid -
-      s -
-      (read)

-        The ID of the serving base station as received from the network.  Has
-        no meaning when the device is not connected.
-      
ActiveNsp -
-      o -
-      (read)

-        Object path of the NSP currently used by the WiMax device.
-      

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

-                A dictionary mapping property names to variant boxed values.
-            
Properties:
Name -
-      s -
-      (read)
The name of the NSP.
SignalQuality -
-      u -
-      (read)
The current signal quality of the NSP, in percent.
NetworkType -
-      u -
-      (read)
-      (NM_WIMAX_NSP_NETWORK_TYPE)
-    
The network type of the NSP.
Sets of flags:
NM_WIMAX_NSP_NETWORK_TYPE

-        Network type of the NSP.
-      
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0x0
Unknown network.
NM_WIMAX_NSP_NETWORK_TYPE_HOME = 0x1
Home network.
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 0x2
Partner network.
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 0x3
Roaming partner network.

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

-          A dictionary mapping property names to variant boxed values
-        
Properties:
Addresses -
-      aau -
-      (read)

-	Array of arrays of IPv4 address/prefix/gateway.  All 3
-	elements of each array are in network byte order.  Essentially:
-	[(addr, prefix, gateway), (addr, prefix, gateway), ...]
-
-	Deprecated: use AddressData and Gateway
-      
AddressData -
-      aa{sv} -
-      (read)

-	Array of IP address data objects. All addresses will include
-	"address" (an IP address string), and "prefix" (a uint). Some
-	addresses may include additional attributes.
-      
Gateway -
-      s -
-      (read)
The gateway in use.
Routes -
-      aau -
-      (read)

-	Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of
-	each tuple are in network byte order. 'route' and 'next hop'
-	are IPv4 addresses, while prefix and metric are simple
-	unsigned integers. Essentially: [(route, prefix, next-hop,
-	metric), (route, prefix, next-hop, metric), ...]
-
-	Deprecated: use RouteData
-      
RouteData -
-      aa{sv} -
-      (read)

-	Array of IP route data objects. All routes will include "dest"
-	(an IP address string) and "prefix" (a uint). Some routes may
-	include "next-hop" (an IP address string), "metric" (a uint),
-	and additional attributes.
-      
Nameservers -
-      au -
-      (read)
The nameservers in use.
Domains -
-      as -
-      (read)
A list of domains this address belongs to.
Searches -
-      as -
-      (read)
A list of dns searches.
DnsOptions -
-      as -
-      (read)

-	A list of DNS options that modify the behavior of the DNS
-	resolver. See resolv.conf(5) manual page for the list of
-	supported options.
-      
WinsServers -
-      au -
-      (read)
The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.

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

-          A dictionary mapping property names to variant boxed values
-        
Properties:
Addresses -
-      a(ayuay) -
-      (read)

-	Array of tuples of IPv6 address/prefix/gateway.
-
-	Deprecated: use AddressData and Gateway.
-      
AddressData -
-      aa{sv} -
-      (read)

-	Array of IP address data objects. All addresses will include
-	"address" (an IP address string), and "prefix" (a uint). Some
-	addresses may include additional attributes.
-      
Gateway -
-      s -
-      (read)
The gateway in use.
Routes -
-      a(ayuayu) -
-      (read)

-	Tuples of IPv6 route/prefix/next-hop/metric.
-
-	Deprecated: use RouteData
-      
RouteData -
-      aa{sv} -
-      (read)

-	Array of IP route data objects. All routes will include "dest"
-	(an IP address string) and "prefix" (a uint). Some routes may
-	include "next-hop" (an IP address string), "metric" (a uint),
-	and additional attributes.
-      
Nameservers -
-      aay -
-      (read)
The nameservers in use.
Domains -
-      as -
-      (read)
A list of domains this address belongs to.
Searches -
-      as -
-      (read)
A list of dns searches.
DnsOptions -
-      as -
-      (read)

-	A list of DNS options that modify the behavior of the DNS
-	resolver. See resolv.conf(5) manual page for the list of
-	supported options.
-      

-
-    
org.freedesktop.NetworkManager.DHCP4Config

-            Options and configuration returned by the IPv4 DHCP server.
-        
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values
-                
Properties:
Options -
-      a{sv} -
-      (read)
Configuration options returned by a DHCP server, if any.

-
-    
org.freedesktop.NetworkManager.DHCP6Config

-            Options and configuration returned by the IPv6 DHCP server.
-        
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values
-                
Properties:
Options -
-      a{sv} -
-      (read)
Configuration options returned by a DHCP server, if any.

-
-  
org.freedesktop.NetworkManager.Settings

-      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
-    
Methods:
ListConnections (
-        
-        ) →
-        ao

-        List the saved network connections known to NetworkManager.
-      
Returns
connections -
-      ao

-          List of connections.
-        
GetConnectionByUuid (
-        s: uuid
-        ) →
-        o

-        Retrieve the object path of a connection, given that connection's UUID.
-      
Parameters
uuid -
-      s

-          The UUID to find the connection object path for.
-        
Returns
connection -
-      o

-          The connection's object path.
-        
AddConnection (
-        a{sa{sv}}: connection
-        ) →
-        o

-        Add new connection and save it to disk.  This operation does not start
-        the network connection unless (1) device is idle and able to connect to
-        the network described by the new connection, and (2) the connection
-        is allowed to be started automatically.
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties.
-        
Returns
path -
-      o

-          Object path of the new connection that was just added.
-        
AddConnectionUnsaved (
-        a{sa{sv}}: connection
-        ) →
-        o

-        Add new connection but do not save it to disk immediately.  This
-        operation does not start the network connection unless (1) device is
-        idle and able to connect to the network described by the new connection,
-        and (2) the connection is allowed to be started automatically.
-
-        Use the 'Save' method on the connection to save these changes
-        to disk. Note that unsaved changes will be lost if the
-        connection is reloaded from disk (either automatically on file
-        change or due to an explicit ReloadConnections call).
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties.
-        
Returns
path -
-      o

-          Object path of the new connection that was just added.
-        
LoadConnections (
-        as: filenames
-        ) →
-        b, as

-        Loads or reloads the indicated connections from disk. You
-        should call this after making changes directly to an on-disk
-        connection file to make sure that NetworkManager sees the
-        changes. (If "monitor-connection-files" in NetworkManager.conf
-        is "true", then this will have no real effect, but is
-        harmless.) As with AddConnection(), this operation does not
-        necessarily start the network connection.
-      
Parameters
filenames -
-      as

-          Array of paths to on-disk connection profiles in directories
-          monitored by NetworkManager.
-        
Returns
status -
-      b

-          Success or failure of the operation as a whole. True if
-          NetworkManager at least tried to load the indicated
-          connections, even if it did not succeed. False if an error
-          occurred before trying to load the connections (eg,
-          permission denied).
-        
failures -
-      as

-          Paths of connection files that could not be loaded.
-        
ReloadConnections (
-        
-        ) →
-        b

-        Tells NetworkManager to reload all connection files from disk,
-        including noticing any added or deleted connection files. By
-        default, connections are re-read automatically any time they
-        change, so you only need to use this command if you have set
-        "monitor-connection-files=false" in NetworkManager.conf.
-      
Returns
status -
-      b

-          Success or failure.
-        
SaveHostname (
-        s: hostname
-        ) →
-        nothing

-        Save the hostname to persistent configuration.
-      
Parameters
hostname -
-      s

-          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
NewConnection (
-        o: connection
-        )

-        Emitted when a new connection has been added after NetworkManager has
-        started up and initialized.  This signal is not emitted for connections
-        read while starting up, because NetworkManager's D-Bus service is only
-        available after all connections have been read, and to prevent spamming
-        listeners with too many signals at one time.  To retrieve the initial
-        connection list, call the ListConnections() method once, and then listen
-        for individual Settings.NewConnection and Settings.Connection.Deleted
-        signals for further updates.
-      
Parameters
connection -
-      o

-          Object path of the new connection.
-        
ConnectionRemoved (
-        o: connection
-        )

-        Emitted when a connection is no longer available.  This happens when
-        the connection is deleted or if it is no longer accessible by any of
-        the system's logged-in users.  After receipt of this signal, the
-        connection no longer exists and cannot be used.  Also see the
-        Settings.Connection.Removed signal.
-      
Parameters
connection -
-      o

-          Object path of the removed connection.
-        
Properties:
Connections -
-      ao -
-      (read)

-        List of object paths of available network connection profiles.
-      
Hostname -
-      s -
-      (read)

-        The machine hostname stored in persistent configuration.
-      
CanModify -
-      b -
-      (read)

-        If true, adding and modifying connections is supported.
-      

-
-
-    
org.freedesktop.NetworkManager.Settings.Connection

-            Represents a single network connection configuration.
-        
Methods:
Update (
-        a{sa{sv}}: properties
-        ) →
-        nothing

-            Update the connection with new settings and properties (replacing
-            all previous settings and properties) and save the connection to
-            disk.  Secrets may be part of the update request, and will be either
-            stored in persistent storage or sent to a Secret Agent for storage,
-            depending on the flags associated with each secret.
-          
Parameters
properties -
-      a{sa{sv}}

-              New connection settings, properties, and (optionally) secrets.
-            
UpdateUnsaved (
-        a{sa{sv}}: properties
-        ) →
-        nothing

-            Update the connection with new settings and properties (replacing
-            all previous settings and properties) but do not immediately save
-            the connection to disk.  Secrets may be part of the update request
-            and may sent to a Secret Agent for storage, depending on the
-            flags associated with each secret.
-
-            Use the 'Save' method to save these changes to disk. Note
-            that unsaved changes will be lost if the connection is
-            reloaded from disk (either automatically on file change or
-            due to an explicit ReloadConnections call).
-          
Parameters
properties -
-      a{sa{sv}}

-              New connection settings, properties, and (optionally) secrets.
-            
Delete (
-        
-        ) →
-        nothing

-            Delete the connection.
-          
GetSettings (
-        
-        ) →
-        a{sa{sv}}

-                Get the settings maps describing this network configuration.
-                This will never include any secrets required for connection
-                to the network, as those are often protected.  Secrets must
-                be requested separately using the GetSecrets() call.
-            
Returns
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    The nested settings maps describing this object.
-                
GetSecrets (
-        s: setting_name
-        ) →
-        a{sa{sv}}

-                Get the secrets belonging to this network configuration.  Only
-                secrets from persistent storage or a Secret Agent running in
-                the requestor's session will be returned.  The user will never
-                be prompted for secrets as a result of this request.
-            
Parameters
setting_name -
-      s

-                    Name of the setting to return secrets for.  If empty, all
-                    all secrets will be returned.
-                
Returns
secrets -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing secrets.
-                
ClearSecrets (
-        
-        ) →
-        nothing

-            Clear the secrets belonging to this network connection profile.
-          
Save (
-        
-        ) →
-        nothing

-                Saves a "dirty" connection (that had previously been
-                updated with UpdateUnsaved) to persistent storage.
-            
Signals:
Updated (
-        
-        )

-                Emitted when any settings or permissions change.  When handling
-                this signal, clients should re-read the connection using the
-                GetSettings method to get the changes and to ensure the client
-                still has permission to access the connection.
-            
Removed (
-        
-        )

-                Emitted when this connection is no longer available.  This
-                happens when the connection is deleted or if it is no longer
-                accessible by any of the system's logged-in users.  After
-                receipt of this signal, the object no longer exists.  Also
-                see the Settings.ConnectionRemoved signal.
-            
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values.
-                
Properties:
Unsaved -
-      b -
-      (read)

-                If set, indicates that the in-memory state of the
-                connection does not match the on-disk state. This flag
-                will be set when UpdateUnsaved() is called or when any
-                connection details change, and cleared when the connection
-                is saved to disk via Save() or from internal operations.
-            

-
-
-  
org.freedesktop.NetworkManager.Connection.Active

-      Objects that implement the Connection.Active interface represent an attempt
-      to connect to a network using the details provided by a Connection object.
-      The Connection.Active object tracks the life-cycle of the connection
-      attempt and if successful indicates whether the connected network is the
-      "default" or preferred network for access.
-      NetworkManager has the concept of connections, which can be thought of as
-      settings, a profile or a configuration that can be applied on a networking
-      device.
-      Such settings-connections are exposed as D-Bus object and the active-connection
-      expresses this relationship between device and settings-connection.
-      At any time a settings-connection can only be activated on one device and vice
-      versa. However, during activation and deactivation multiple active-connections
-      can reference the same device or settings-connection as they are waiting to
-      be activated or to be deactivated.
-    
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Connection -
-      o -
-      (read)

-        The path of the connection.
-      
SpecificObject -
-      o -
-      (read)

-        A specific object associated with the active connection.  This property
-        reflects the specific object used during connection activation, and will
-        not change over the lifetime of the ActiveConnection once set.
-      
Id -
-      s -
-      (read)

-        The ID of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      
Uuid -
-      s -
-      (read)

-        The UUID of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      
Type -
-      s -
-      (read)

-        The type of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      
Devices -
-      ao -
-      (read)

-        Array of object paths representing devices which are part of this active
-        connection.
-      
State -
-      u -
-      (read)
-      (NM_ACTIVE_CONNECTION_STATE)
-    

-        The state of this active connection.
-      
Default -
-      b -
-      (read)

-        Whether this active connection is the default IPv4 connection, i.e.
-        whether it currently owns the default IPv4 route.
-      
Ip4Config -
-      o -
-      (read)

-        Object path of the Ip4Config object describing the configuration of the
-        connection. Only valid when the connection is in the
-        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-      
Dhcp4Config -
-      o -
-      (read)

-        Object path of the Dhcp4Config object describing the DHCP options
-        returned by the DHCP server (assuming the connection used DHCP). Only
-        valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
-        state.
-      
Default6 -
-      b -
-      (read)

-        Whether this active connection is the default IPv6 connection, i.e.
-        whether it currently owns the default IPv6 route.
-      
Ip6Config -
-      o -
-      (read)

-        Object path of the Ip6Config object describing the configuration of the
-        connection. Only valid when the connection is in the
-        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-      
Dhcp6Config -
-      o -
-      (read)

-        Object path of the Dhcp6Config object describing the DHCP options
-        returned by the DHCP server (assuming the connection used DHCP). Only
-        valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
-        state.
-      
Vpn -
-      b -
-      (read)

-        Whether this active connection is also a VPN connection.
-      
Master -
-      o -
-      (read)

-        The path to the master device if the connection is a slave.
-      
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

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

-          The connection is activating.
-        
NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2

-          The connection is activated.
-        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

-          The connection is being torn down and cleaned up.
-        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4

-          The connection is no longer active.
-        

-
-  
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
-        s: identifier
-        ) →
-        nothing

-        Called by secret Agents to register their ability to provide and save
-        network secrets.
-      
Parameters
identifier -
-      s

-          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][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).
-        
RegisterWithCapabilities (
-        s: identifier, u: capabilities
-        ) →
-        nothing

-        Like Register() but indicates agent capabilities to NetworkManager.
-      
Parameters
identifier -
-      s

-            See the Register() method's identifier argument.
-        
capabilities -
-      u
-      (NM_SECRET_AGENT_CAPABILITIES)
-    

-            Indicates various agent capabilities to NetworkManager.
-        
Unregister (
-        
-        ) →
-        nothing

-        Called by secret Agents to notify NetworkManager that they will no
-        longer handle requests for network secrets.  Agents are automatically
-        unregistered when they disconnect from D-Bus.
-      
Interface has no signals.
Interface has no properties.

-
-
-    
org.freedesktop.NetworkManager.SecretAgent

-            Private D-Bus interface used by secret agents that store and provide
-            secrets to NetworkManager.  If an agent provides secrets to
-            NetworkManager as part of connection creation, and the some of those
-            secrets are "agent owned" the agent should store those secrets
-            itself and should not expect its SaveSecrets() method to be called.
-            SaveSecrets() will be called eg if some program other than the
-            agent itself (like a connection editor) changes the secrets out of
-            band.  The agent should implement this D-Bus interface on an object
-            with the path /org/freedesktop/NetworkManager/SecretAgent.
-        
Methods:
GetSecrets (
-        a{sa{sv}}: connection, o: connection_path, s: setting_name, as: hints, u: flags
-        ) →
-        a{sa{sv}}

-                Retrieve and return stored secrets, if any, or request new
-                secrets from the agent's user.  If user interaction is allowed
-                and the user enters new secrets, the agent is expected to save
-                the new secrets to persistent storage (if the secret's flags
-                include AGENT_OWNED) as NetworkManager will not send these
-                secrets back to the same agent via a SaveSecrets() call.  If
-                the user canceled any interaction, the agent should return the
-                UserCanceled error (see below).
-            
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing the connection for which
-                    secrets are being requested.  This may contain system-owned
-                    secrets if the agent has successfully authenticated to
-                    modify system network settings and the GetSecrets request
-                    flags allow user interaction.
-                
connection_path -
-      o

-                    Object path of the connection for which secrets are being
-                    requested.
-                
setting_name -
-      s

-                    Setting name for which secrets are being requested.
-                
hints -
-      as

-                    Array of strings of key names in the requested setting for
-                    which NetworkManager thinks a secrets may be required,
-                    and/or well-known identifiers and data that may be useful
-                    to the client in processing the secrets request.  Note that
-                    it's not always possible to determine which secret is
-                    required, so in some cases no hints may be given.  The Agent
-                    should return any secrets it has, or that it thinks are
-                    required, regardless of what hints NetworkManager sends
-                    in this request.  Some hints have special prefixes that
-                    provide information to the agent; for example, VPN requests
-                    may send server-specific messages prefixed with
-                    "x-vpn-message:".
-                
flags -
-      u
-      (NM_SECRET_AGENT_GET_SECRETS_FLAGS)
-    

-                    Flags which modify the behavior of the secrets request.
-                    If true, new secrets are assumed to be invalid or incorrect,
-                    and the agent should ask the user for new secrets.  If false,
-                    existing secrets should be retrieved from storage and 
-                    returned without interrupting the user.
-                
Returns
secrets -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing secrets.  Each setting MUST
-                    contain at least the 'name' field, containing the name of
-                    the setting, and one or more secrets.
-                
Possible errors
org.freedesktop.NetworkManager.SecretAgent.NotAuthorized

-                      Should be returned when the process requesting secrets is
-                      not authorized to do so (like if the caller is not root
-                      or not NetworkManager).
-                  
org.freedesktop.NetworkManager.SecretAgent.InvalidConnection

-                      Should be returned if the 'connection' argument is invalid.
-                  
org.freedesktop.NetworkManager.SecretAgent.UserCanceled

-                      Should be returned when the user has canceled the request.
-                  
org.freedesktop.NetworkManager.SecretAgent.AgentCanceled

-                      Should be returned when NetworkManager has requested that
-                      the agent cancel the request.
-                  
org.freedesktop.NetworkManager.SecretAgent.InternalError

-                      Should be returned if the agent has encountered some internal
-                      error processing the request.
-                  
org.freedesktop.NetworkManager.SecretAgent.NoSecrets

-                      Should be returned if there are no available secrets, for
-                      example if user interaction is not allowed and there are
-                      no secrets stored by the agent for this connection.
-                  
CancelGetSecrets (
-        o: connection_path, s: setting_name
-        ) →
-        nothing

-                Cancel a pending GetSecrets request for secrets of the given
-                connection.  Any GetSecrets request with the same
-                'connection_path' and 'setting_name' that are given in a
-                CancelGetSecrets request should be canceled.
-            
Parameters
connection_path -
-      o

-                    Object path of the connection for which, if secrets for
-                    the given 'setting_name' are being requested, the request
-                    should be canceled.
-                
setting_name -
-      s

-                    Setting name for which secrets for this connection were
-                    originally being requested.
-                
SaveSecrets (
-        a{sa{sv}}: connection, o: connection_path
-        ) →
-        nothing

-                Save given secrets to backing storage.
-            
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing the entire connection
-                    (including secrets), for which the agent should save the
-                    secrets to backing storage.  This method will not be called
-                    when the agent itself is the process creating or updating
-                    a connection; in that case the agent is assumed to have
-                    already saved those secrets since it had them already.
-                
connection_path -
-      o

-                    Object path of the connection for which the agent should
-                    save secrets to backing storage.
-                
DeleteSecrets (
-        a{sa{sv}}: connection, o: connection_path
-        ) →
-        nothing

-                Delete secrets from backing storage.
-            
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing the connection properties
-                    (sans secrets), for which the agent should delete the
-                    secrets from backing storage.
-                
connection_path -
-      o

-                    Object path of the connection for which the agent should
-                    delete secrets from backing storage.
-                
Interface has no signals.
Interface has no properties.
Sets of flags:
NM_SECRET_AGENT_GET_SECRETS_FLAGS

-            Flags modifying the behavior of GetSecrets request.
-          
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0

-              No special behavior; by default no user interaction is allowed and
-              requests for secrets are fulfilled from persistent storage, or
-              if no secrets are available an error is returned.
-            
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1

-              Allows the request to interact with the user, possibly prompting
-              via UI for secrets if any are required, or if none are found in
-              persistent storage.
-            
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2

-              Explicitly prompt for new secrets from the user.  This flag
-              signals that NetworkManager thinks any existing secrets are
-              invalid or wrong.  This flag implies that interaction is allowed.
-            
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4

-              Set if the request was initiated by user-requested action via the
-              D-Bus interface, as opposed to automatically initiated by
-              NetworkManager in response to (for example) scan results or
-              carrier changes.
-            
NM_SECRET_AGENT_CAPABILITIES
NM_SECRET_AGENT_CAPABILITY_NONE = 0x0
No special capabilities.
NM_SECRET_AGENT_CAPABILITY_VPN_HINTS = 0x1

-                    The agent supports passing hints to VPN plugin authentication
-                    dialogs.
-                

-
-
-  
org.freedesktop.NetworkManager.VPN.Connection

-      Represents an active connection to a Virtual Private Network.
-    
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
VpnStateChanged (
-        u: state, u: reason
-        )

-        Emitted when the state of the VPN connection has changed.
-      
Parameters
state -
-      u
-      (NM_VPN_CONNECTION_STATE)
-    

-          The new state of the VPN connection.
-        
reason -
-      u
-      (NM_VPN_CONNECTION_STATE_REASON)
-    

-          Reason code describing the change to the new state.
-        
Properties:
VpnState -
-      u -
-      (read)
-      (NM_VPN_CONNECTION_STATE)
-    
The VPN-specific state of the connection.
Banner -
-      s -
-      (read)
The banner string of the VPN connection.
Enumerated types:
NM_VPN_CONNECTION_STATE
NM_VPN_CONNECTION_STATE_UNKNOWN = 0

-          The state of the VPN connection is unknown.
-        
NM_VPN_CONNECTION_STATE_PREPARE = 1

-          The VPN connection is preparing to connect.
-        
NM_VPN_CONNECTION_STATE_NEED_AUTH = 2

-          The VPN connection needs authorization credentials.
-        
NM_VPN_CONNECTION_STATE_CONNECT = 3

-          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET = 4

-          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        
NM_VPN_CONNECTION_STATE_ACTIVATED = 5

-          The VPN connection is active.
-        
NM_VPN_CONNECTION_STATE_FAILED = 6

-          The VPN connection failed.
-        
NM_VPN_CONNECTION_STATE_DISCONNECTED = 7

-          The VPN connection is disconnected.
-        
NM_VPN_CONNECTION_STATE_REASON
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0

-          The reason for the VPN connection state change is unknown.
-        
NM_VPN_CONNECTION_STATE_REASON_NONE = 1

-          No reason was given for the VPN connection state change.
-        
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2

-          The VPN connection changed state because the user disconnected it.
-        
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3

-          The VPN connection changed state because the device it was using was disconnected.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4

-          The service providing the VPN connection was stopped.
-        
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5

-          The IP config of the VPN connection was invalid.
-        
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6

-          The connection attempt to the VPN service timed out.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7

-          A timeout occurred while starting the service providing the VPN connection.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8

-          Starting the service starting the service providing the VPN connection failed.
-        
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9

-          Necessary secrets for the VPN connection were not provided.
-        
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10

-          Authentication to the VPN server failed.
-        
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11

-          The connection was deleted from settings.
-        

-
-  
org.freedesktop.NetworkManager.VPN.Plugin

-      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
-    
Methods:
Connect (
-        a{sa{sv}}: connection
-        ) →
-        nothing

-        Tells the plugin to connect.  Interactive secrets requests (eg, emitting
-        the SecretsRequired signal) are not allowed.
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection to be established.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress

-      The plugin is already starting, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted

-      The plugin is already connected, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    (generic description)
ConnectInteractive (
-        a{sa{sv}}: connection, a{sv}: details
-        ) →
-        nothing

-        Tells the plugin to connect, allowing interactive secrets requests (eg
-        the plugin is allowed to emit the SecretsRequired signal if the VPN
-        service indicates that it needs additional secrets during the connect
-        process).
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection to be established.
-        
details -
-      a{sv}
-      (String_Variant_Map)
-    

-          Additional details about the Connect process.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress

-      The plugin is already starting, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted

-      The plugin is already connected, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported

-      The request could not be processed because the plugin does not support
-      interactive operations, such as ConnectInteractive() or NewSecrets().
-    (generic description)
NeedSecrets (
-        a{sa{sv}}: settings
-        ) →
-        s

-        Asks the plugin whether the provided connection will require secrets to connect successfully.
-      
Parameters
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection that may need secrets.
-        
Returns
setting_name -
-      s

-          The setting name within the provided connection that requires secrets, if any.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid

-      The request could not be processed because the connection was invalid. It
-      usually means that the connection's VPN setting was missing some required
-      data item or secret.
-    (generic description)
Disconnect (
-        
-        ) →
-        nothing

-        Disconnect the plugin.
-      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped

-      The plugin is already stopped, and another disconnect request was received.
-    (generic description)
SetConfig (
-        a{sv}: config
-        ) →
-        nothing

-        Set generic connection details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Generic configuration details for the connection.
-        
SetIp4Config (
-        a{sv}: config
-        ) →
-        nothing

-        Set IPv4 details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Ip4Config details for the connection. You must call
-	  SetConfig() before calling this.
-        
SetIp6Config (
-        a{sv}: config
-        ) →
-        nothing

-        Set IPv6 details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Ip6Config details for the connection. You must call
-	  SetConfig() before calling this.
-        
SetFailure (
-        s: reason
-        ) →
-        nothing

-        Indicate a failure to the plugin.
-      
Parameters
reason -
-      s

-          The reason for the failure.
-        
NewSecrets (
-        a{sa{sv}}: connection
-        ) →
-        nothing

-        Called in response to a SecretsRequired signal to deliver updated secrets
-        or other information to the plugin.
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection including the new secrets.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported

-      The request could not be processed because the plugin does not support
-      interactive operations, such as ConnectInteractive() or NewSecrets().
-    (generic description)
Signals:
StateChanged (
-        u: state
-        )

-        Emitted when the plugin state changes.
-      
Parameters
state -
-      u
-      (NM_VPN_SERVICE_STATE)
-    

-          The new state of the plugin.
-        
SecretsRequired (
-        s: message, as: secrets
-        )

-        Emitted during an ongoing ConnectInteractive() request when the plugin
-        has determined that new secrets are required.  NetworkManager will then
-        call the NewSecrets() method with a connection hash including the new
-        secrets.
-      
Parameters
message -
-      s

-              Informational message, if any, about the request.  For example, if
-              a second PIN is required, could indicate to the user to wait for
-              the token code to change until entering the next PIN.
-          
secrets -
-      as

-              Array of strings of VPN secret names which the plugin thinks
-              secrets may be required for, or other VPN-specific data to be
-              processed by the VPN's front-end.
-          
Config (
-        a{sv}: config
-        )

-        The plugin obtained generic configuration information.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The configuration information.
-        
Ip4Config (
-        a{sv}: ip4config
-        )

-        The plugin obtained an IPv4 configuration.
-      
Parameters
ip4config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The IPv4 configuration.
-        
Ip6Config (
-        a{sv}: ip6config
-        )

-        The plugin obtained an IPv6 configuration.
-      
Parameters
ip6config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The IPv6 configuration.
-        
LoginBanner (
-        s: banner
-        )

-        Emitted when the plugin receives a login banner from the VPN service.
-      
Parameters
banner -
-      s

-          The login banner string.
-        
Failure (
-        u: reason
-        )

-        Emitted when a failure in the VPN plugin occurs.
-      
Parameters
reason -
-      u
-      (NM_VPN_PLUGIN_FAILURE)
-    

-          Reason code for the failure.
-        
Properties:
State -
-      u -
-      (read)
-      (NM_VPN_SERVICE_STATE)
-    

-        The state of the plugin.
-      
Enumerated types:
NM_VPN_SERVICE_STATE
NM_VPN_SERVICE_STATE_UNKNOWN = 0

-          The state of the VPN plugin is unknown.
-        
NM_VPN_SERVICE_STATE_INIT = 1

-          The VPN plugin is initialized.
-        
NM_VPN_SERVICE_STATE_SHUTDOWN = 2

-          (Not used.)
-        
NM_VPN_SERVICE_STATE_STARTING = 3

-          The plugin is attempting to connect to a VPN server.
-        
NM_VPN_SERVICE_STATE_STARTED = 4

-          The plugin has connected to a VPN server.
-        
NM_VPN_SERVICE_STATE_STOPPING = 5

-          The plugin is disconnecting from the VPN server.
-        
NM_VPN_SERVICE_STATE_STOPPED = 6

-          The plugin has disconnected from the VPN server.
-        
NM_VPN_PLUGIN_FAILURE
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0

-          Login failed.
-        
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1

-          Connect failed.
-        
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

-          Invalid IP configuration returned from the VPN plugin.
-        

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1

-        For both devices and access point objects, indicates the object is
-        part of an Ad-Hoc 802.11 network without a central coordinating access
-        point.
-      
NM_802_11_MODE_INFRA = 2

-        The wireless device or access point is in infrastructure mode.  For
-        devices, this indicates the device is an 802.11 client/station.  For
-        access point objects, this indicates the object is an access point that
-        provides connectivity to clients.
-      
NM_802_11_MODE_AP = 3

-        The device is an access point/hotspot.  Not valid for access point
-        objects themselves.
-      
Mapping types:
String_Variant_Map - a{
-        s: Key → v: Value
-        }
-      
A mapping from strings to variants representing extra
-      key-value pairs.
Members
Key -
-      s
(undocumented)
Value -
-      v
(undocumented)
String_String_Map - a{
-        s: Key → s: Value
-        }
-      
A mapping from strings to strings representing extra
-      key-value pairs.
Members
Key -
-      s
(undocumented)
Value -
-      s
(undocumented)
String_String_Variant_Map_Map - a{
-        s: Key → a{sv}: Value
-        }
-      
A mapping from strings to a map of string to variant.
Members
Key -
-      s
(undocumented)
Value -
-      a{sv}
-      (String_Variant_Map)
-    
(undocumented)
Errors:

-  
-
-  
org.freedesktop.NetworkManager.Error.UnknownConnection

-        Connection was not provided by the settings service.
-    
-
-  
org.freedesktop.NetworkManager.Error.UnknownDevice

-        Unknown device.
-    
-
-  
org.freedesktop.NetworkManager.Error.PermissionDenied

-    User does not have the permission to activate this connection.
-    
-
-
Errors:

-  
org.freedesktop.NetworkManager.VPN.Error.General
General failure without further details.
-  
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress

-      The plugin is already starting, and another connect request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted

-      The plugin is already connected, and another connect request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped

-      The plugin is already stopped, and another disconnect request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    
-  
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid

-      The request could not be processed because the connection was invalid. It
-      usually means that the connection's VPN setting was missing some required
-      data item or secret.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported

-      The request could not be processed because the plugin does not support
-      interactive operations, such as ConnectInteractive() or NewSecrets().
-    
-
Index
Index of interfaces
Index of types

\ No newline at end of file
+
+
+
+
+D-Bus API Reference: NetworkManager D-Bus API Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+D-Bus API Reference

+

+
Interfaces

+

+

+org.freedesktop.NetworkManager
+

+

+org.freedesktop.NetworkManager.Settings
+

+

+org.freedesktop.NetworkManager.AgentManager
+

+

+org.freedesktop.NetworkManager.AccessPoint
+

+

+org.freedesktop.NetworkManager.PPP
+

+

+org.freedesktop.NetworkManager.Settings.Connection
+

+

+org.freedesktop.NetworkManager.VPN.Connection
+

+

+org.freedesktop.NetworkManager.Connection.Active
+

+

+org.freedesktop.NetworkManager.Device
+

+

+org.freedesktop.NetworkManager.Device.Adsl
+

+

+org.freedesktop.NetworkManager.Device.Bond
+

+

+org.freedesktop.NetworkManager.Device.Bridge
+

+

+org.freedesktop.NetworkManager.Device.Bluetooth
+

+

+org.freedesktop.NetworkManager.Device.Wired
+

+

+org.freedesktop.NetworkManager.Device.Generic
+

+

+org.freedesktop.NetworkManager.Device.Infiniband
+

+

+org.freedesktop.NetworkManager.Device.IPTunnel
+

+

+org.freedesktop.NetworkManager.Device.Macvlan
+

+

+org.freedesktop.NetworkManager.Device.Modem
+

+

+org.freedesktop.NetworkManager.Device.OlpcMesh
+

+

+org.freedesktop.NetworkManager.Device.Team
+

+

+org.freedesktop.NetworkManager.Device.Tun
+

+

+org.freedesktop.NetworkManager.Device.Veth
+

+

+org.freedesktop.NetworkManager.Device.Vlan
+

+

+org.freedesktop.NetworkManager.Device.Vxlan
+

+

+org.freedesktop.NetworkManager.Device.Wireless
+

+

+org.freedesktop.NetworkManager.Device.WiMax
+

+

+org.freedesktop.NetworkManager.DHCP4Config
+

+

+org.freedesktop.NetworkManager.DHCP6Config
+

+

+org.freedesktop.NetworkManager.IP4Config
+

+

+org.freedesktop.NetworkManager.IP6Config
+

+

+org.freedesktop.NetworkManager.VPN.Plugin
+

+

+org.freedesktop.NetworkManager.SecretAgent
+

+

+

+

+      This part documents the D-Bus interface used to access the
+      NetworkManager daemon.
+    

+

+Interfaces

+

+

+
Generated by GTK-Doc V1.24

+
+
\ No newline at end of file
diff --git a/docs/api/migrating-to-09.xml b/docs/api/migrating-to-09.xml
deleted file mode 100644
index f282d646..00000000
--- a/docs/api/migrating-to-09.xml
+++ /dev/null
@@ -1,478 +0,0 @@
-
-
-]>
-
-  Migrating from NetworkManager 0.8 to NetworkManager 0.9
-
-  
-    NetworkManager 0.9 is a new major version of NetworkManager that breaks
-    both API and ABI compared to previous versions.  These changes are
-    intended to make communication with NetworkManager much simpler, especially
-    for network control and configuration programs.  Thankfully, most changes
-    are not difficult to implement, and the advantages of the simpler
-    architecture of NetworkManager 0.9 greatly outweight the effort of
-    updating client programs.
-  
-
-  

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

-    Elimination of the User Settings Service
-    
-      Previously there were two "settings services", or D-Bus services that
-      provided and saved network configuration information.  NetworkManager
-      owned the "system" settings service, and one user-level applet owned the
-      "user" settings service.  Now, the "user" settings service has been
-      eliminated, so clients only have to track one D-Bus service to read and
-      update network configuration.  The functionality of the old user settings
-      service has been replaced with a "permissions" key on each connection
-      object to preserve the ability to restrict which users can use the
-      connection, and with a "secret agent" D-Bus API for user-session-level
-      secure storage of network secrets and passwords.
-    
-    
-      Elimination of the user settings service provides the following advantages
-      for clients of NetworkManager:
-      
-        Simpler discovery of network configuration and change tracking
-        Simpler storage of user-level network secrets by control applets
-        Correct operation of fast-user switching and multi-seat configurations
-        More granular network connection permissions for system administrators
-        Connections are now system-wide by default (unless restricted by the user or system administrator)
-        Easier deployment of user-specific connections (ie, VPNs)
-      
-    
-    
-      With this change, D-Bus methods that previously took a "service name"
-      argument (like
-      org.freedesktop.NetworkManager.ActivateConnection) and
-      objects with service name properties (like ActiveConnection objects) no
-      longer have those arguments or properties.
-    
-    
-      Action: if you develop a network control
-      applet that talks to NetworkManager and used to provide a user settings
-      service, you can eliminate that code and rely on NetworkManager for all
-      storage of network configuration.  Your applet should now implement the
-      Secret Agent D-Bus API (see below) to store user-specific secrets, and
-      add legacy user-specific configuration to NetworkManager when run.  More
-      information about both these changes follows.
-    
-    

-
-    

-    User Secret Agents
-    
-      Even with the elimination of the user settings service, in some cases it
-      is still desirable to store secrets in the user's session and not in
-      system-wide storage (and thus available to all users).  To allow this
-      functionality the concept of agents has been introduced.  Using the new
-      
-      org.freedesktop.NetworkManager.AgentManager
-      D-Bus interface provided by NetworkManager, user applications can register
-      themselves as "secret agents", ie programs capable of saving and providing
-      secrets to NetworkManager.  The agent should export the
-      
-      org.freedesktop.NetworkManager.SecretAgent
-      D-Bus interface, but should NOT claim a bus name on the system or session
-      bus.  Instead, NetworkManager talks to the agent directly over the D-Bus
-      connection which the agent used to register itself.
-    
-    
-      Each agent must send a unique identifier to NetworkManager when it
-      registers.  This identifier must follow certain rules (see the NM D-Bus
-      API documentation for more details) but looks essentially the same as
-      a D-Bus service name.  Only one agent using a given identifier may be
-      registered at the same time.  The agent is automatically unregistered
-      if it disconnects from D-Bus or exits.
-    
-    
-      When NetworkManager requires secrets during the attempt to connect to a
-      network, and no secrets are available from the internal settings service,
-      NetworkManager queries each registered agent for secrets.  Agents that
-      are in "active" user sessions (as determined by ConsoleKit) are preferred
-      over inactive ones.  Only agents belonging to users who have permission
-      to view and modify the connection are queried.  For more information on
-      connection permissions, see below.
-    
-      When secrets are requested, the agent is also sent a set of flags that
-      modify the behavior of the request.  By default, the agent should never
-      attempt to query the user for secrets, but should simply return any
-      available saved secrets.  Other flags allow the agent to explicitly
-      request new secrets from the user.
-    
-      Action: the parts of a previous user
-      settings service that handled secrets may be easily repurposed as the bulk
-      of the implementation of a secret agent.  The agent is sent all available
-      connection settings, and from those should be able to retrieve or save
-      any saved user secrets, or to request new secrets from the user.
-    
-    

-
-    

-    Settings Service Interface Changes
-    
-      With the elimination of the user settings service, the old
-      org.freedesktop.NetworkManagerUserSettings and
-      org.freedesktop.NetworkManagerSystemSettings D-Bus
-      service names are no longer used.  Instead NetworkManager provides the
-      settings service using its own D-Bus service name,
-      org.freedesktop.NetworkManager.  The object path of
-      the settings service has also changed to
-      /org/freedesktop/NetworkManager/Settings.
-    
-    
-      Additionally, the D-Bus interface of the settings service has changed
-      to 
-      org.freedesktop.NetworkManager.Settings from
-      the old interface name of
-      org.freedesktop.NetworkManagerSettings, and the old
-      org.freedesktop.NetworkManagerSettings.System
-      interface has been merged into the new
-      
-      org.freedesktop.NetworkManager.Settings interface
-      as the split no longer made sense. This includes the
-      SaveHostname method and the Hostname
-      and CanModify properties.
-    
-    
-      Action: change the service name and
-      object path that your application uses to request system network settings
-      to org.freedesktop.NetworkManager and
-      /org/freedesktop/NetworkManager/Settings respectively,
-      and update the D-Bus interface that codes uses to talk to the settings
-      service to 
-      org.freedesktop.NetworkManager.Settings.
-      Listen for hostname changes using the new interface name as well.
-    
-    

-
-    

-    Connection Object Interface Changes
-    
-      Consistent with the interface changes to the Settings object, the
-      Connection object's D-Bus interface has changed to
-      
-      org.freedesktop.NetworkManager.Settings.Connection
-      from the previous 
-      org.freedesktop.NetworkManagerSettings.Connection.
-    
-    
-      Additionally, the
-      org.freedesktop.NetworkManager.Settings.Connection.Updated
-      signal of the Connection object no longer includes the updated settings
-      data argument, as that might allow users who are not authorized to
-      view the connection details to do so.  Instead, when a client receives the
-      Updated signal, it should requery the Connection's settings with the
-      org.freedesktop.NetworkManager.Settings.Connection.GetSettings
-      method.  If the client receives an error as a result of this method call,
-      it should assume the connection has been deleted.
-    
-    
-      Action: where code manipulates
-      Connection objects, update the D-Bus interface that code uses to be
-      org.freedesktop.NetworkManager.Settings.Connection.
-      Additionally, code that listens for the
-      org.freedesktop.NetworkManager.Settings.Connection.Updated
-      signal should no longer expect the new settings data as an argument, but
-      instead should request the new settings data using the
-      org.freedesktop.NetworkManager.Settings.Connection.GetSettings
-      method.
-    
-    

-
-    

-    Permissions Methods Consolidation
-    
-      Previously there were two D-Bus method calls to retrieve the list of
-      operations that a user client could perform, and two signals notifying
-      callers that they should recheck permissions.  Those two calls were:
-      
-        
-          org.freedesktop.NetworkManagerSettings.System.GetPermissions
-          which returned a bitfield of operations the caller was allowed to
-          perform related to modify system network settings and the machine
-          hostname
-        
-        
-          org.freedesktop.NetworkManager.GetPermissions which
-          returned a dictionary mapping permission names to result strings like
-          "yes", "auth", or "no", relating to network control permissions like
-          the ability to enable or disable WiFi.
-        
-      
-      These two calls have been consolidated into an enhanced
-      org.freedesktop.NetworkManager.GetPermissions call that
-      uses the same arguments, but includes all permissions, including those which
-      the settings service used to handle.
-    
-    
-      With this change, the bitfield items from
-      org.freedesktop.NetworkManagerSettings.System.GetPermissions
-      are now string-based permissions.  The mapping is as follows:
-      
-        
-          
-            Old bitfield valueNew permission name
-          
-          
-            
-              0x1 (connection-modify)
-              
-                org.freedesktop.NetworkManager.settings.modify.system
-                or org.freedesktop.NetworkManager.settings.modify.system
-                depending on the permissions of the connection.
-              
-            
-            
-              0x2 (wifi-share-protected)
-              
-                org.freedesktop.NetworkManager.wifi.share.protected
-              
-            
-            
-              0x4 (wifi-share-open)
-              
-                org.freedesktop.NetworkManager.wifi.share.open
-              
-            
-            
-              0x8 (hostname-modify)
-              
-                org.freedesktop.NetworkManager.settings.modify.hostname
-              
-            
-          
-        
-      

-    
-    
-      Action: modify handling of existing
-      code that checks permissions to recognize the new permissions names for
-      old system settings permissions, and remove code that used to call
-      org.freedesktop.NetworkManagerSettings.System.GetPermissions.
-    
-    

-
-    

-    AddConnection Returns Object Path of New Connection
-    
-      The 
-      org.freedesktop.NetworkManager.Settings.AddConnection
-       method call now returns the object path of the newly added
-      connection. Previously, if code wanted to manipulate a connection
-      post-addition, it had to wait for the new connection to be announced via
-      the NewConnection signal by matching connection UUIDs.  Now the object
-      path is returned and this workaround is no longer required.
-    
-    
-      Action: update code that adds new
-      connections to handle the object path returned from AddConnection, and
-      remove workarounds for finding the new connection via signals.
-    
-    

-
-    

-    Support for WiMAX Devices
-    
-      NetworkManager now supports Intel WiMAX mobile broadband devices.  A
-      corresponding device type (NM_DEVICE_TYPE_WIMAX) and
-      a new 
-      org.freedesktop.NetworkManager.Device.WiMax
-      D-Bus interface have been added.  Furthermore, to support connection to
-      different WiMAX Network Service Providers (NSPs) the
-      
-      org.freedesktop.NetworkManager.Device.WiMax.Nsp
-      interface has been added to access information about each available
-      WiMAX network.
-    
-    
-      Action: update code that handles
-      devices and/or displays status to users to recognize the new device type,
-      and to display available WiMAX NSPs similar to how WiFi Access Points
-      are displayed. Also update code that creates new connections to allow
-      creation of new WiMAX connections.
-    
-    

-
-    

-    New Device States
-    
-      A few new device states
-      have been added, and all device states have been renumbered for flexibility.
-      The new devices states IP_CHECK, SECONDARIES, and DEACTIVATING.
-    
-    
-      Action: where code checks device state
-      or shows UI indication of the device's state, make sure the new device
-      states are processed correctly, and that code in switch()-type statements
-      is updated to handle the new states.
-    
-    

-
-    

-    New Active Connection State
-    
-      Along with the new device states, an
-      additional
-      ActiveConnection state has been added: DEACTIVATING.  This state
-      is entered when the connection is being torn down and deactivated.
-    
-    
-      Action: where code checks active
-      connection states or shows UI indication of active connection states, make
-      sure the DEACTIVATING state is processed correctly, and that code in
-      switch()-type statements is updated to handle it.
-    
-    

-
-    

-    Consolidated Modem Devices
-    
-      Many new mobile broadband devices support multiple access families, like
-      Qualcomm Gobi cards (CDMA/EVDO and GSM/UMTS), or multi-mode EVDO/LTE
-      or UMTS/LTE modems like the Pantech UML290.  The previous hard split
-      between CDMA/EVDO and GSM/UMTS device classes was not flexible enough to
-      deal with these new multi-mode devices.  Thus the previously separate
-      CDMA and GSM device classes have been combined into a single Modem
-      device class, which exposes both hardware "ModemCapabilities" and
-      runtime "CurrentCapabilities" which represent generic access technology
-      families like CDMA/EVDO, GSM/UMTS, and LTE which the device supports.
-      ModemCapabilities indicate all the access technology families which the
-      modem is capable of supporting, while CurrentCapabilities indicate the
-      immediate access technology families the device supports without reloading
-      the firmware and thus restarting the device.
-    
-    
-      Along with this change, the
-      org.freedesktop.NetworkManager.Device.Serial
-      interface has been removed as it's functionality will be incorporated
-      into the 
-      
-      org.freedesktop.NetworkManager.Device.Modem
-      interface in the future.
-    
-    
-      Action: combine code that checks for
-      the old CDMA and GSM device types, and instead handle the new Modem device
-      type.  Where behavior must change based on the capabilities of the device,
-      check the CurrentCapabilities device property to determine whether to
-      treat the device as CDMA, GSM, or LTE for purposes of configuration and
-      status.
-    
-    

-
-    

-    Secret Property Flags
-    
-      In the Connection object's configuration properties, each setting's secret
-      properties (like WiFi passphrases, or public key passwords, etc) now has
-      an associated "flags" property that changes how NetworkManager treats the
-      secret.  The "flags" property is a bitfield of one or more of the
-      following values:
-      
-        
-          
-            Flag ValueMeaning
-          
-          
-            
-              0x00 (none)
-              
-                NetworkManager is responsible for providing and storing this
-                secret (default)
-              
-            
-            
-              0x01 (agent-owned)
-              
-                A user secret agent is responsible for providing and storing
-                this secret; when it is required agents will be asked to
-                retrieve it
-              
-            
-            
-              0x02 (not saved)
-              
-                The secret is not saved, and should be requested each time it
-                is required.  Used for OTP/token configurations where the
-                secret changes periodically, or if the user simply wants to
-                manually enter the secret each time.
-              
-            
-            
-              0x04 (not required)
-              
-                In situations where it cannot be automatically determined that
-                the secret is required (some VPNs and PPP providers dont require
-                all possible secrets) this flag indicates that the specific
-                secret is not required.
-              
-            
-          
-        
-      

-    
-    
-      Action: user interface code which
-      handles entry of connection secrets should be updated to read and set
-      secret flags.  For example, code that creates new VPN connections may want
-      to set the "agent-owned" flag to ensure that the user's VPN password is
-      not available to all users.  EAP-TLS and VPN interface code might add a
-      checkbox that toggles the "not saved" bit to indicate that the
-      password/PIN code should be requested from a hardware token each time it
-      is required.
-    
-    

-
-    

-    Deprecated Methods Removed
-    
-      A few methods and signals of the org.freedesktop.NetworkManager
-      interface deprecated in version 0.7 have been removed.  All the
-      replacement methods and signals have existed since version 0.7 and so are
-      not new to this version of NetworkManager, but some older programs may
-      be using removed items.  The following table lists the removed items and
-      their replacements:
-      
-        
-          
-            Removed ItemReplacement
-          
-          
-            
-              StateChange signal
-              
-                Use the StateChanged signal, which has the
-                same arguments.
-              
-            
-            
-              sleep() and wake() methods
-              
-                Use the Sleep() method instead, which takes
-                a boolean argument indicating whether NetworkManager should
-                go to sleep or wake up.
-              
-            
-          
-        
-      

-    
-    
-      Action: update code to use these
-      replacement methods and properties where it used old deprecated ones
-    
-    

-
-  

-
-
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index e8c99460..48f59265 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -5,11 +5,12 @@
 ]>
 
   
-    NetworkManager D-Bus Reference Manual
+    NetworkManager D-Bus API Reference Manual
     Version &version;
 
     
       2012
+      2016
       The NetworkManager Authors
     
 
@@ -36,13 +37,52 @@
     
   
 
-  
+  
     D-Bus API Reference
+
     
       This part documents the D-Bus interface used to access the
       NetworkManager daemon.
     
-    
+
+    

+      Interfaces
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+    

   
 
   
@@ -102,7 +142,16 @@
     
   
 
-  
+  
+    UNIX Manual Pages
+    
+    
+    
+    
+    
+    
+  
+
 
   
     Index
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml
index 31fb3102..9814af91 100644
--- a/docs/api/settings-spec.xml
+++ b/docs/api/settings-spec.xml
@@ -7,6 +7,7 @@
     ca-certbyte arrayContains 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.
     ca-pathstringUTF-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.
     client-certbyte arrayContains 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.
+    domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
     eaparray of string[]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.
     identitystringIdentity string for EAP authentication methods.  Often the user's user or login name.
     namestring802-1xThe 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".
@@ -24,16 +25,17 @@
     phase2-ca-certbyte arrayContains 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.
     phase2-ca-pathstringUTF-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.
     phase2-client-certbyte arrayContains 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.
+    phase2-domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
     phase2-private-keybyte arrayContains 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.
     phase2-private-key-passwordstringThe 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.
     phase2-private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-private-key-password" property.
-    phase2-subject-matchstringSubstring 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.
+    phase2-subject-matchstringSubstring 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.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
     pinstringPIN used for EAP authentication methods.
     pin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property.
     private-keybyte arrayContains 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. 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.
     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.
+    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.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
     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 Description
@@ -161,7 +163,7 @@
     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.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.
+    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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.namestringipv4The 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".never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.route-dataarray of vardictArray of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
@@ -184,7 +186,7 @@
     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: -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". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.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.
+    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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.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".never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.route-dataarray of vardictArray of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
diff --git a/docs/api/spec.html b/docs/api/spec.html
deleted file mode 100644
index 990fd2ba..00000000
--- a/docs/api/spec.html
+++ /dev/null
@@ -1,2792 +0,0 @@
-NetworkManager D-Bus Interface Specification version 1.1.91
NetworkManager D-Bus Interface Specification
Version 1.1.91
Copyright (C) 2008 - 2016 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
-(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 Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-
Interfaces

-  
org.freedesktop.NetworkManager
Methods:
GetDevices (
-        
-        ) →
-        ao

-        Get the list of realized network devices.
-      
Returns
devices -
-      ao

-          List of object paths of network devices known to the system.  This
-          list does not include device placeholders (see GetAllDevices()).
-        
GetAllDevices (
-        
-        ) →
-        ao

-        Get the list of all network devices.
-      
Returns
devices -
-      ao

-          List of object paths of network devices and device placeholders
-          (eg, devices that do not yet exist but which can be automatically
-          created by NetworkManager if one of their AvailableConnections
-          was activated).
-        
GetDeviceByIpIface (
-        s: iface
-        ) →
-        o

-        Return the object path of the network device referenced by its IP
-        interface name.  Note that some devices (usually modems) only have an
-        IP interface name when they are connected.
-      
Parameters
iface -
-      s

-          Interface name of the device to find.
-        
Returns
device -
-      o

-          Object path of the network device.
-        
ActivateConnection (
-        o: connection, o: device, o: specific_object
-        ) →
-        o

-        Activate a connection using the supplied device.
-      
Parameters
connection -
-      o

-          The connection to activate.  If "/" is given, a valid device path must
-          be given, and NetworkManager picks the best connection to activate for
-          the given device.  VPN connections must always pass a valid connection
-          path.
-        
device -
-      o

-          The object path of device to be activated for physical connections.
-          This parameter is ignored for VPN connections, because the
-          specific_object (if provided) specifies the device to use.
-        
specific_object -
-      o

-          The path of a connection-type-specific object this activation should use. 
-          This parameter is currently ignored for wired and mobile broadband connections,
-          and the value of "/" should be used (ie, no specific object).  For WiFi
-          connections, pass the object path of a specific AP from the card's scan
-          list, or "/" to pick an AP automatically.  For VPN connections, pass
-          the object path of an ActiveConnection object that should serve as the
-          "base" connection (to which the VPN connections lifetime will be tied),
-          or pass "/" and NM will automatically use the current default device.
-        
Returns
active_connection -
-      o

-          The path of the active connection object representing this active connection.
-        
AddAndActivateConnection (
-        a{sa{sv}}: connection, o: device, o: specific_object
-        ) →
-        o, o

-        Adds a new connection using the given details (if any) as a template
-        (automatically filling in missing settings with the capabilities of the
-        given device and specific object), then activate the new connection.
-        Cannot be used for VPN connections at this time.
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties; if incomplete missing settings will
-          be automatically completed using the given device and specific object.
-        
device -
-      o

-          The object path of device to be activated using the given connection.
-        
specific_object -
-      o

-          The path of a connection-type-specific object this activation should use. 
-          This parameter is currently ignored for wired and mobile broadband connections,
-          and the value of "/" should be used (ie, no specific object).  For WiFi
-          connections, pass the object path of a specific AP from the card's scan
-          list, which will be used to complete the details of the newly added
-          connection.
-        
Returns
path -
-      o

-          Object path of the new connection that was just added.
-        
active_connection -
-      o

-          The path of the active connection object representing this active connection.
-        
DeactivateConnection (
-        o: active_connection
-        ) →
-        nothing

-        Deactivate an active connection.
-      
Parameters
active_connection -
-      o

-          The currently active connection to deactivate.
-        
Sleep (
-        b: sleep
-        ) →
-        nothing

-        Control the NetworkManager daemon's sleep state.  When asleep, all
-        interfaces that it manages are deactivated.  When awake, devices are
-        available to be activated.  This command should not be called directly
-        by users or clients; it is intended for system suspend/resume tracking.
-      
Parameters
sleep -
-      b

-          Indicates whether the NetworkManager daemon should sleep or wake.
-        
Enable (
-        b: enable
-        ) →
-        nothing

-        Control whether overall networking is enabled or disabled.  When
-        disabled, all interfaces that NM manages are deactivated.  When enabled,
-        all managed interfaces are re-enabled and available to be activated.
-        This command should be used by clients that provide to users the ability
-        to enable/disable all networking.
-      
Parameters
enable -
-      b

-          If FALSE, indicates that all networking should be disabled.  If TRUE,
-          indicates that NetworkManager should begin managing network devices.
-        
GetPermissions (
-        
-        ) →
-        a{ss}

-        Returns the permissions a caller has for various authenticated operations
-        that NetworkManager provides, like Enable/Disable networking, changing
-        WiFi, WWAN, and WiMAX state, etc.
-      
Returns
permissions -
-      a{ss}

-          Dictionary of available permissions and results.  Each permission
-          is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")
-          and each result is one of the following values: "yes" (the permission
-          is available), "auth" (the permission is available after a successful
-          authentication), or "no" (the permission is denied).  Clients may use
-          these values in the UI to indicate the ability to perform certain
-          operations.
-        
SetLogging (
-        s: level, s: domains
-        ) →
-        nothing

-        Set logging verbosity and which operations are logged.
-      
Parameters
level -
-      s

-          One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP].
-          This level is applied to the domains as specified in the domains
-          argument. Except for the special level "KEEP", all unmentioned
-          domains are disabled entirely. "KEEP" is special and allows
-          not to change the current setting except for the specified
-          domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only
-          touch the platform domain.
-        
domains -
-      s

-          A combination of logging domains separated by commas (','), or "NONE"
-          to disable logging.  Each domain enables logging for operations
-          related to that domain.  Available domains are: [PLATFORM, RFKILL, ETHER,
-          WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,
-          VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,
-          OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,
-          TEAM, CONCHECK, DCB, DISPATCH, AUDIT].
-          In addition to these domains, the following special domains can be used:
-          [NONE, ALL, DEFAULT, DHCP, IP].  You can also specify that some domains
-          should log at a different level from the default by appending a colon (':')
-          and a log level (eg, 'WIFI:DEBUG').  If an empty string is given, the
-          log level is changed but the current set of log domains remains
-          unchanged.
-        
GetLogging (
-        
-        ) →
-        s, s

-        Get current logging verbosity level and operations domains.
-      
Returns
level -
-      s

-          One of [ERR, WARN, INFO, DEBUG, TRACE].
-        
domains -
-      s

-          For available domains see SetLogging() call.
-        
CheckConnectivity (
-        
-        ) →
-        u

-	Re-check the network connectivity state.
-      
Returns
connectivity -
-      u
-      (NM_CONNECTIVITY)
-    

-          The current connectivity state.
-        
state (
-        
-        ) →
-        u

-        The overall networking state as determined by the NetworkManager daemon,
-        based on the state of network devices under it's management.
-      
Returns
state -
-      u
-      (NM_STATE)
-    
Signals:
CheckPermissions (
-        
-        )

-        Emitted when system authorization details change, indicating that
-        clients may wish to recheck permissions with GetPermissions.
-      
StateChanged (
-        u: state
-        )

-        NetworkManager's state changed.
-      
Parameters
state -
-      u
-      (NM_STATE)
-    

-          The new state of NetworkManager.
-        
PropertiesChanged (
-        a{sv}: properties
-        )

-        NetworkManager's properties changed.
-      
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-          The changed properties.
-        
DeviceAdded (
-        o: device_path
-        )

-        A device was added to the system
-      
Parameters
device_path -
-      o

-          The object path of the newly added device.
-        
DeviceRemoved (
-        o: device_path
-        )

-        A device was removed from the system, and is no longer available.
-      
Parameters
device_path -
-      o

-          The object path of the device that was just removed.
-        
Properties:
Devices -
-      ao -
-      (read)

-        The list of realized network devices. Realized devices are those which
-        have backing resources (eg from the kernel or a management daemon like
-        ModemManager, teamd, etc).
-      
AllDevices -
-      ao -
-      (read)

-        The list of both realized and un-realized network devices. Un-realized
-        devices are software devices which do not yet have backing resources,
-        but for which backing resources can be created if the device is
-        activated.
-      
NetworkingEnabled -
-      b -
-      (read)

-        Indicates if overall networking is currently enabled or not.  See the
-        Enable() method.
-      
WirelessEnabled -
-      b -
-      (readwrite)

-        Indicates if wireless is currently enabled or not.
-      
WirelessHardwareEnabled -
-      b -
-      (read)

-        Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
-      
WwanEnabled -
-      b -
-      (readwrite)

-        Indicates if mobile broadband devices are currently enabled or not.
-      
WwanHardwareEnabled -
-      b -
-      (read)

-        Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
-      
WimaxEnabled -
-      b -
-      (readwrite)

-        Indicates if WiMAX devices are currently enabled or not.
-      
WimaxHardwareEnabled -
-      b -
-      (read)

-        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
-      
ActiveConnections -
-      ao -
-      (read)

-        List of active connection object paths.
-      
PrimaryConnection -
-      o -
-      (read)

-        The object path of the "primary" active connection being used
-        to access the network. In particular, if there is no VPN
-        active, or the VPN does not have the default route, then this
-        indicates the connection that has the default route. If there
-        is a VPN active with the default route, then this indicates
-        the connection that contains the route to the VPN endpoint.
-      
PrimaryConnectionType -
-      s -
-      (read)

-        The connection type of the "primary" active connection being
-        used to access the network. This is the same as the Type
-        property on the object indicated by PrimaryConnection.
-      
Metered -
-      u -
-      (read)
-      (NM_METERED)
-    

-        Indicates whether the connectivity is metered. This is equivalent
-        to the metered property of the device associated with the primary
-        connection.
-      
ActivatingConnection -
-      o -
-      (read)

-        The object path of an active connection that is currently
-        being activated and which is expected to become the new
-        PrimaryConnection when it finishes activating.
-      
Startup -
-      b -
-      (read)

-        Indicates whether NM is still starting up; this becomes FALSE
-        when NM has finished attempting to activate every connection
-        that it might be able to activate at startup.
-      
Version -
-      s -
-      (read)

-        NetworkManager version.
-      
State -
-      u -
-      (read)
-      (NM_STATE)
-    

-        The overall state of the NetworkManager daemon.
-      
Connectivity -
-      u -
-      (read)
-      (NM_CONNECTIVITY)
-    

-        The network connectivity state.
-      
GlobalDnsConfiguration -
-      a{sv} -
-      (readwrite)

-        Dictionary of global DNS settings where the key is one of
-        "searches", "options" and "domains".  The values for the
-        "searches" and "options" keys are string arrays describing the
-        list of search domains and resolver options, respectively.
-        The value of the "domains" key is a second-level dictionary,
-        where each key is a domain name, and each key's value is a
-        third-level dictionary with the keys "servers" and
-        "options". "servers" is a string array of DNS servers,
-        "options" is a string array of domain-specific options.
-      
Enumerated types:
NM_STATE

-        Describes the overall state of the daemon.
-      
NM_STATE_UNKNOWN = 0

-          Networking state is unknown.
-        
NM_STATE_ASLEEP = 10

-          Networking is inactive and all devices are disabled.
-        
NM_STATE_DISCONNECTED = 20

-          There is no active network connection.
-        
NM_STATE_DISCONNECTING = 30

-          Network connections are being cleaned up.
-        
NM_STATE_CONNECTING = 40

-          A network device is connecting to a network and there is no other
-          available network connection.
-        
NM_STATE_CONNECTED_LOCAL = 50

-          A network device is connected, but there is only link-local connectivity.
-        
NM_STATE_CONNECTED_SITE = 60

-          A network device is connected, but there is only site-local connectivity.
-        
NM_STATE_CONNECTED_GLOBAL = 70

-          A network device is connected, with global network connectivity.
-        
NM_CONNECTIVITY

-        Describes the network-connectivity state.
-      
NM_CONNECTIVITY_UNKNOWN = 0

-          Network connectivity is unknown.
-        
NM_CONNECTIVITY_NONE = 1

-          The host is not connected to any network.
-        
NM_CONNECTIVITY_PORTAL = 2

-          The host is behind a captive portal and cannot reach the
-          full Internet.
-        
NM_CONNECTIVITY_LIMITED = 3

-          The host is connected to a network, but does not appear to
-	  be able to reach the full Internet.
-        
NM_CONNECTIVITY_FULL = 4

-	  The host is connected to a network, and appears to be able
-	  to reach the full Internet
-        

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Flags -
-      u -
-      (read)
-      (NM_802_11_AP_FLAGS)
-    
Flags describing the capabilities of the access point.
WpaFlags -
-      u -
-      (read)
-      (NM_802_11_AP_SEC)
-    
Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
RsnFlags -
-      u -
-      (read)
-      (NM_802_11_AP_SEC)
-    
Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
Ssid -
-      ay -
-      (read)
The Service Set Identifier identifying the access point.
Frequency -
-      u -
-      (read)
The radio channel frequency in use by the access point, in MHz.
HwAddress -
-      s -
-      (read)
The hardware address (BSSID) of the access point.
Mode -
-      u -
-      (read)
-      (NM_802_11_MODE)
-    
Describes the operating mode of the access point.
MaxBitrate -
-      u -
-      (read)
The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
Strength -
-      y -
-      (read)
The current signal quality of the access point, in percent.
LastSeen -
-      i -
-      (read)

-        The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access
-        point was found in scan results.  A value of -1 means the access point
-        has never been found in scan results.
-      
Sets of flags:
NM_802_11_AP_FLAGS

-        Flags describing the general capabilities of the access point.
-      
NM_802_11_AP_FLAGS_NONE = 0x0
Null capability - says nothing about the access point.
NM_802_11_AP_FLAGS_PRIVACY = 0x1
Access point supports privacy measures.
NM_802_11_AP_SEC

-        Flags describing the security capabilities of the access point.
-      
NM_802_11_AP_SEC_NONE = 0x0
Null flag.
NM_802_11_AP_SEC_PAIR_WEP40 = 0x1
Access point supports pairwise 40-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_WEP104 = 0x2
Access point supports pairwise 104-bit WEP encryption.
NM_802_11_AP_SEC_PAIR_TKIP = 0x4
Access point supports pairwise TKIP encryption.
NM_802_11_AP_SEC_PAIR_CCMP = 0x8
Access point supports pairwise CCMP encryption.
NM_802_11_AP_SEC_GROUP_WEP40 = 0x10
Access point supports a group 40-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_WEP104 = 0x20
Access point supports a group 104-bit WEP cipher.
NM_802_11_AP_SEC_GROUP_TKIP = 0x40
Access point supports a group TKIP cipher.
NM_802_11_AP_SEC_GROUP_CCMP = 0x80
Access point supports a group CCMP cipher.
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
Access point supports PSK key management.
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
Access point supports 802.1x key management.

-
-  
org.freedesktop.NetworkManager.Device
Methods:
Reapply (
-        a{sa{sv}}: connection, t: version_id, u: flags
-        ) →
-        nothing

-        Attempts to update the configuration of a device without deactivating it. NetworkManager
-        has the concept of connections, which are profiles that contain the configuration for
-        a networking device. Those connections are exposed via D-Bus as individual objects
-        that can be created, modified and deleted. When activating such a settings-connection
-        on a device, the settings-connection is cloned to become an applied-connection and used to
-        configure the device (see GetAppliedConnection). Subsequent modification of the
-        settings-connection don't propagate automatically to the device's applied-connection
-        (with exception of the firewall-zone and the metered property). For the changes to take
-        effect, you can either re-activate the settings-connection, or call Reapply.
-        The Reapply call allows you to directly update the applied-connection and reconfigure
-        the device.
-        Reapply can also be useful if the currently applied-connection is equal to the connection
-        that is about to be reapplied. This allows to reconfigure the device and revert external
-        changes like removing or adding an IP address (which NetworkManager doesn't revert
-        automatically because it is assumed that the user made these changes intentionally outside
-        of NetworkManager).
-        Reapply can make the applied-connection different from the settings-connection,
-        just like updating the settings-connection can make them different.
-      
Parameters
connection -
-      a{sa{sv}}

-          The optional connection settings that will be reapplied on the device. If empty, the
-          currently active settings-connection will be used. The connection cannot arbitrarly
-          differ from the current applied-connection otherwise the call will fail.
-          Only certain changes are supported, like adding or removing IP addresses.
-        
version_id -
-      t

-          If non-zero, the current version id of the applied-connection must match.
-          The current version id can be retrieved via GetAppliedConnection.
-          This optional argument allows to catch concurrent modifications between
-          the GetAppliedConnection call and Reapply.
-        
flags -
-      u

-          Flags which would modify the behavior of the Reapply call.
-          There are no flags defined currently and the users should use the value of 0.
-        
GetAppliedConnection (
-        u: flags
-        ) →
-        a{sa{sv}}, t

-        Get the currently applied connection on the device. This is a snapshot of the last activated
-        connection on the device, that is the configuration that is currently applied on the device.
-        Usually this is the same as GetSettings of the referenced settings connection. However, it
-        can differ if the settings connection was subsequently modified or the applied connection was
-        modified by Reapply. The applied connection is set when activating a device or when calling
-        Reapply.
-      
Parameters
flags -
-      u

-          Flags which would modify the behavior of the GetAppliedConnection call.
-          There are no flags defined currently and the users should use the value of 0.
-        
Returns
connection -
-      a{sa{sv}}

-            The effective connection settings that the connection has currently applied.
-        
version_id -
-      t

-            The version-id of the currently applied connection. This can be specified during
-            Reapply to avoid races where you first fetch the applied connection, modify it
-            and try to reapply it. If the applied connection is modified in the meantime, the
-            version_id gets incremented and Reapply will fail.
-        
Disconnect (
-        
-        ) →
-        nothing

-        Disconnects a device and prevents the device from automatically activating further connections without user intervention.
-      
Delete (
-        
-        ) →
-        nothing

-        Deletes a software device from NetworkManager and removes the interface from the system.
-        The method returns an error when called for a hardware device.
-      
Signals:
StateChanged (
-        u: new_state, u: old_state, u: reason
-        )
Parameters
new_state -
-      u
-      (NM_DEVICE_STATE)
-    

-          The new state of the device.
-        
old_state -
-      u
-      (NM_DEVICE_STATE)
-    

-          The previous state of the device.
-        
reason -
-      u
-      (NM_DEVICE_STATE_REASON)
-    

-          A reason for the state transition.
-        
Properties:
Udi -
-      s -
-      (read)

-        Operating-system specific transient device hardware identifier.  This
-        is an opaque string representing the underlying hardware for the device,
-        and shouldn't be used to keep track of individual devices.  For some
-        device types (Bluetooth, Modems) it is an identifier used by the
-        hardware service (ie bluez or ModemManager) to refer to that device,
-        and client programs use it get additional information from those
-        services which NM does not provide.  The Udi is not guaranteed to be
-        consistent across reboots or hotplugs of the hardware. If you're looking
-        for a way to uniquely track each device in your application, use the
-        object path.  If you're looking for a way to track a specific piece of
-        hardware across reboot or hotplug, use a MAC address or USB serial
-        number.
-      
Interface -
-      s -
-      (read)

-        The name of the device's control (and often data) interface.
-      
IpInterface -
-      s -
-      (read)

-        The name of the device's data interface when available.  This property
-        may not refer to the actual data interface until the device has
-        successfully established a data connection, indicated by the device's
-        State becoming ACTIVATED.
-      
Driver -
-      s -
-      (read)

-        The driver handling the device.
-      
DriverVersion -
-      s -
-      (read)

-        The version of the driver handling the device.
-      
FirmwareVersion -
-      s -
-      (read)

-        The firmware version for the device.
-      
Capabilities -
-      u -
-      (read)
-      (NM_DEVICE_CAP)
-    

-        Flags describing the capabilities of the device.
-      
Ip4Address -
-      u -
-      (read)

-        DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.
-      
State -
-      u -
-      (read)
-      (NM_DEVICE_STATE)
-    

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

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

-        Object path of an ActiveConnection object that "owns" this device during
-        activation.  The ActiveConnection object tracks the life-cycle of a
-        connection to a specific network and implements the
-        org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
-      
Ip4Config -
-      o -
-      (read)

-        Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Dhcp4Config -
-      o -
-      (read)

-        Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Ip6Config -
-      o -
-      (read)

-        Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
-      
Dhcp6Config -
-      o -
-      (read)

-        Object path of the Dhcp6Config object describing the DHCP options
-        returned by the DHCP server.  Only valid when the device is in the
-        NM_DEVICE_STATE_ACTIVATED state.
-      
Managed -
-      b -
-      (readwrite)

-        Whether or not this device is managed by NetworkManager. Setting this
-        property has a similar effect to configuring the device as unmanaged
-        via the keyfile.unmanaged-devices setting in NetworkManager.conf.
-        Changes to this value are not persistent and lost after NetworkManager
-        restart.
-      
Autoconnect -
-      b -
-      (readwrite)

-        If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
-        manual intervention is required before the device will automatically
-        connect to a known network, such as activating a connection using the
-        device, or setting this property to TRUE.  This property cannot be
-        set to TRUE for default-unmanaged devices, since they never autoconnect.
-      
FirmwareMissing -
-      b -
-      (read)

-        If TRUE, indicates the device is likely missing firmware necessary for
-        its operation.
-      
NmPluginMissing -
-      b -
-      (read)

-        If TRUE, indicates the NetworkManager plugin for the device is likely
-        missing or misconfigured.
-      
DeviceType -
-      u -
-      (read)
-      (NM_DEVICE_TYPE)
-    

-        The general type of the network device; ie Ethernet, WiFi, etc.
-      
AvailableConnections -
-      ao -
-      (read)

-        An array of object paths of every configured connection that is currently 'available' through this device.
-      
PhysicalPortId -
-      s -
-      (read)

-        If non-empty, an (opaque) indicator of the physical network
-        port associated with the device. This can be used to recognize
-	when two seemingly-separate hardware devices are actually just
-	different virtual interfaces to the same physical port.
-      
Mtu -
-      u -
-      (read)

-        The device MTU (maximum transmission unit).
-      
Metered -
-      u -
-      (read)
-      (NM_METERED)
-    

-        Whether the amount of traffic flowing through the device is
-        subject to limitations, for example set by service providers.
-      
LldpNeighbors -
-      aa{sv} -
-      (read)

-        Array of LLDP neighbors; each element is a dictionary mapping
-        LLDP TLV names to variant boxed values.
-      
Real -
-      b -
-      (read)

-        True if the device exists, or False for placeholder devices that
-        do not yet exist but could be automatically created by NetworkManager
-        if one of their AvailableConnections was activated.
-      
Enumerated types:
NM_DEVICE_STATE
NM_DEVICE_STATE_UNKNOWN = 0

-          The device is in an unknown state.
-        
NM_DEVICE_STATE_UNMANAGED = 10

-          The device is recognized but not managed by NetworkManager.
-        
NM_DEVICE_STATE_UNAVAILABLE = 20

-          The device cannot be used (carrier off, rfkill, etc).
-        
NM_DEVICE_STATE_DISCONNECTED = 30

-          The device is not connected.
-        
NM_DEVICE_STATE_PREPARE = 40

-          The device is preparing to connect.
-        
NM_DEVICE_STATE_CONFIG = 50

-          The device is being configured.
-        
NM_DEVICE_STATE_NEED_AUTH = 60

-          The device is awaiting secrets necessary to continue connection.
-        
NM_DEVICE_STATE_IP_CONFIG = 70

-          The IP settings of the device are being requested and configured.
-        
NM_DEVICE_STATE_IP_CHECK = 80

-          The device's IP connectivity ability is being determined.
-        
NM_DEVICE_STATE_SECONDARIES = 90

-          The device is waiting for secondary connections to be activated.
-        
NM_DEVICE_STATE_ACTIVATED = 100

-          The device is active.
-        
NM_DEVICE_STATE_DEACTIVATING = 110

-          The device's network connection is being torn down.
-        
NM_DEVICE_STATE_FAILED = 120

-          The device is in a failure state following an attempt to activate it.
-        
NM_DEVICE_TYPE
NM_DEVICE_TYPE_UNKNOWN = 0

-          The device type is unknown.
-        
NM_DEVICE_TYPE_ETHERNET = 1

-          The device is wired Ethernet device.
-        
NM_DEVICE_TYPE_WIFI = 2

-          The device is an 802.11 WiFi device.
-        
NM_DEVICE_TYPE_UNUSED1 = 3
Unused
NM_DEVICE_TYPE_UNUSED2 = 4
Unused
NM_DEVICE_TYPE_BT = 5

-          The device is Bluetooth device that provides PAN or DUN capabilities.
-        
NM_DEVICE_TYPE_OLPC_MESH = 6

-          The device is an OLPC mesh networking device.
-        
NM_DEVICE_TYPE_WIMAX = 7

-          The device is an 802.16e Mobile WiMAX device.
-        
NM_DEVICE_TYPE_MODEM = 8

-          The device is a modem supporting one or more of analog telephone,
-          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
-          wireline data network.
-        
NM_DEVICE_TYPE_INFINIBAND = 9

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

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

-          The device is a VLAN interface.
-        
NM_DEVICE_TYPE_ADSL = 12

-          The device is an ADSL device supporting PPPoE and PPPoATM protocols.
-        
NM_DEVICE_TYPE_BRIDGE = 13

-          The device is a bridge interface.
-        
NM_DEVICE_TYPE_GENERIC = 14

-          The device is a generic interface type unrecognized by NetworkManager.
-        
NM_DEVICE_TYPE_TEAM = 15

-          The device is a team master interface.
-        
NM_DEVICE_STATE_REASON
NM_DEVICE_STATE_REASON_UNKNOWN = 0

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

-          The state change is normal.
-        
NM_DEVICE_STATE_REASON_NOW_MANAGED = 2

-          The device is now managed.
-        
NM_DEVICE_STATE_REASON_NOW_UNMANAGED = 3

-          The device is no longer managed.
-        
NM_DEVICE_STATE_REASON_CONFIG_FAILED = 4

-          The device could not be readied for configuration.
-        
NM_DEVICE_STATE_REASON_CONFIG_UNAVAILABLE = 5

-          IP configuration could not be reserved (no available address, timeout, etc).
-        
NM_DEVICE_STATE_REASON_CONFIG_EXPIRED = 6

-          The IP configuration is no longer valid.
-        
NM_DEVICE_STATE_REASON_NO_SECRETS = 7

-          Secrets were required, but not provided.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT = 8

-          The 802.1X supplicant disconnected from the access point or authentication server.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED = 9

-          Configuration of the 802.1X supplicant failed.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED = 10

-          The 802.1X supplicant quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT = 11

-          The 802.1X supplicant took too long to authenticate.
-        
NM_DEVICE_STATE_REASON_PPP_START_FAILED = 12

-          The PPP service failed to start within the allowed time.
-        
NM_DEVICE_STATE_REASON_PPP_DISCONNECT = 13

-          The PPP service disconnected unexpectedly.
-        
NM_DEVICE_STATE_REASON_PPP_FAILED = 14

-          The PPP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_DHCP_START_FAILED = 15

-          The DHCP service failed to start within the allowed time.
-        
NM_DEVICE_STATE_REASON_DHCP_ERROR = 16

-          The DHCP service reported an unexpected error.
-        
NM_DEVICE_STATE_REASON_DHCP_FAILED = 17

-          The DHCP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_SHARED_START_FAILED = 18

-          The shared connection service failed to start.
-        
NM_DEVICE_STATE_REASON_SHARED_FAILED = 19

-          The shared connection service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED = 20

-          The AutoIP service failed to start.
-        
NM_DEVICE_STATE_REASON_AUTOIP_ERROR = 21

-          The AutoIP service reported an unexpected error.
-        
NM_DEVICE_STATE_REASON_AUTOIP_FAILED = 22

-          The AutoIP service quit or failed unexpectedly.
-        
NM_DEVICE_STATE_REASON_MODEM_BUSY = 23

-          Dialing failed because the line was busy.
-        
NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE = 24

-          Dialing failed because there was no dial tone.
-        
NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER = 25

-          Dialing failed because there was carrier.
-        
NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT = 26

-          Dialing timed out.
-        
NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED = 27

-          Dialing failed.
-        
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED = 28

-          Modem initialization failed.
-        
NM_DEVICE_STATE_REASON_GSM_APN_FAILED = 29

-          Failed to select the specified GSM APN.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING = 30

-          Not searching for networks.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED = 31

-          Network registration was denied.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT = 32

-          Network registration timed out.
-        
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED = 33

-          Failed to register with the requested GSM network.
-        
NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED = 34

-          PIN check failed.
-        
NM_DEVICE_STATE_REASON_FIRMWARE_MISSING = 35

-          Necessary firmware for the device may be missing.
-        
NM_DEVICE_STATE_REASON_REMOVED = 36

-          The device was removed.
-        
NM_DEVICE_STATE_REASON_SLEEPING = 37

-          NetworkManager went to sleep.
-        
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED = 38

-          The device's active connection was removed or disappeared.
-        
NM_DEVICE_STATE_REASON_USER_REQUESTED = 39

-          A user or client requested the disconnection.
-        
NM_DEVICE_STATE_REASON_CARRIER = 40

-          The device's carrier/link changed.
-        
NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED = 41

-          The device's existing connection was assumed.
-        
NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE = 42

-          The 802.1x supplicant is now available.
-        
NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND = 43

-          The modem could not be found.
-        
NM_DEVICE_STATE_REASON_BT_FAILED = 44

-          The Bluetooth connection timed out or failed.
-        
NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED = 45

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

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

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

-          GSM Modem's SIM wrong
-        
NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49

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

-          A dependency of the connection failed.
-        
NM_DEVICE_STATE_REASON_BR2684_FAILED = 51

-          Problem with the RFC 2684 Ethernet over ADSL bridge.
-        
NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE = 52

-          ModemManager was not running or quit unexpectedly.
-        
NM_DEVICE_STATE_REASON_SSID_NOT_FOUND = 53

-          The 802.11 Wi-Fi network could not be found.
-        
NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED = 54

-          A secondary connection of the base connection failed.
-        
NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED = 55

-          DCB or FCoE setup failed.
-        
NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED = 56

-          teamd control failed.
-        
NM_DEVICE_STATE_REASON_MODEM_FAILED = 57

-          Modem failed or no longer available.
-        
NM_DEVICE_STATE_REASON_MODEM_AVAILABLE = 58

-          Modem now ready and available.
-        
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.
-        
NM_METERED
NM_METERED_UNKNOWN = 0

-          The device metered status is unknown.
-        
NM_METERED_YES = 1

-          The device is metered and the value was statically set.
-        
NM_METERED_NO = 2

-          The device is not metered and the value was statically set.
-        
NM_METERED_GUESS_YES = 3

-          The device is metered and the value was guessed.
-        
NM_METERED_GUESS_NO = 4

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

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

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

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Carrier -
-      b -
-      (read)

-        Indicates whether the physical carrier is found.
-      

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

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

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

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

-        Array of object paths representing devices which are currently
-	slaved to this device.
-      

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

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

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

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

-        Array of object paths representing devices which are currently
-	slaved to this device.
-      

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

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

-        Bluetooth hardware address of the device.
-      
Name -
-      s -
-      (read)

-        Bluetooth name of the device.
-      
BtCapabilities -
-      u -
-      (read)
-      (NM_BT_CAPABILITIES)
-    

-        Bluetooth capabilities of the device (either DUN or NAP).
-      
Sets of flags:
NM_BT_CAPABILITIES

-        Flags describing the capabilities of a Bluetooth device.
-      
NM_BT_CAPABILITY_NONE = 0x0
The device has no recognized capabilities.
NM_BT_CAPABILITY_DUN = 0x1
The device supports Bluetooth Dial-Up Networking.
NM_BT_CAPABILITY_PAN = 0x2
The device supports Bluetooth Personal Area Networking.

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

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

-        Active hardware address of the device.
-      
PermHwAddress -
-      s -
-      (read)

-        Permanent hardware address of the device.
-      
Speed -
-      u -
-      (read)

-        Design speed of the device, in megabits/second (Mb/s).
-      
S390Subchannels -
-      as -
-      (read)

-        Array of S/390 subchannels for S/390 or z/Architecture devices.
-      
Carrier -
-      b -
-      (read)

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

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

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

-        Hardware address of the device.
-      
TypeDescription -
-      s -
-      (read)

-        A (non-localized) description of the interface type, if known.
-      

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

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

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

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

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Mode -
-      u -
-      (read)

-        The tunneling mode.
-      
Parent -
-      o -
-      (read)

-        The object path of the parent device.
-      
Local -
-      s -
-      (read)

-        The local endpoint of the tunnel.
-      
Remote -
-      s -
-      (read)

-        The remote endpoint of the tunnel.
-      
Ttl -
-      y -
-      (read)

-        The TTL assigned to tunneled packets. 0 is a special value
-        meaning that packets inherit the TTL value
-      
Tos -
-      y -
-      (read)

-        The type of service (IPv4) or traffic class (IPv6) assigned to
-        tunneled packets.
-      
PathMtuDiscovery -
-      b -
-      (read)

-        Whether path MTU discovery is enabled on this tunnel.
-      
InputKey -
-      s -
-      (read)

-        The key used for incoming packets.
-      
OutputKey -
-      s -
-      (read)

-        The key used for outgoing packets.
-      
EncapsulationLimit -
-      y -
-      (read)

-        How many additional levels of encapsulation are permitted to
-        be prepended to packets. This property applies only to IPv6
-        tunnels.
-      
FlowLabel -
-      u -
-      (read)

-        The flow label to assign to tunnel packets. This property
-        applies only to IPv6 tunnels.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Parent -
-      o -
-      (read)

-        The object path of the parent device.
-      
Mode -
-      s -
-      (read)

-        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
-      
NoPromisc -
-      b -
-      (read)

-        Whether the device is blocked from going into promiscuous mode.
-      
Tap -
-      b -
-      (read)

-        Whether the device is a macvtap.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
ModemCapabilities -
-      u -
-      (read)
-      (NM_DEVICE_MODEM_CAPABILITIES)
-    

-        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.
-      
CurrentCapabilities -
-      u -
-      (read)
-      (NM_DEVICE_MODEM_CAPABILITIES)
-    

-        The generic family of access technologies the modem currently supports
-        without a firmware reload or reinitialization.
-      
Sets of flags:
NM_DEVICE_MODEM_CAPABILITIES

-        Flags describing one or more of the general access technology families
-        that a modem device supports.
-      
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x0
Modem has no capabilties.
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x1

-          Modem supports the analog wired telephone network (ie 56k dialup) and
-          does not have wireless/cellular capabilities.
-        
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x2

-          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
-          revision A, or EVDO revision B.
-        
NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x4

-          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
-          HSPA+ packet switched data capability.
-        
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x8

-          Modem has at LTE data capability.
-        

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

-            Emitted when the wireless device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary containing the FIXME: check changed parameters.
-            
Properties:
HwAddress -
-      s -
-      (read)

-        The hardware address of the device.
-      
Companion -
-      o -
-      (read)

-        The object path of the companion device.
-      
ActiveChannel -
-      u -
-      (read)

-        The currently active channel.
-      

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

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

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

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

-        Array of object paths representing devices which are currently
-	slaved to this device.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Owner -
-      x -
-      (read)

-        The uid of the tunnel owner, or -1 if it has no owner.
-      
Group -
-      x -
-      (read)

-        The gid of the tunnel group, or -1 if it has no owner.
-      
Mode -
-      s -
-      (read)

-        The tunnel mode, either "tun" or "tap".
-      
NoPi -
-      b -
-      (read)

-        The tunnel's "TUN_NO_PI" flag; true if no protocol info is
-	prepended to the tunnel packets.
-      
VnetHdr -
-      b -
-      (read)

-        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
-	include a virtio network header.
-      
MultiQueue -
-      b -
-      (read)

-        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
-        the tap device multiple times, for multiple send/receive
-        queues.
-      
HwAddress -
-      s -
-      (read)

-        Hardware address of the device.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Peer -
-      o -
-      (read)

-        The object path of the device's peer.
-      

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

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

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

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

-        Object path of the parent device of this VLAN device.
-      
VlanId -
-      u -
-      (read)

-        The VLAN ID of this VLAN interface.
-      

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

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Parent -
-      o -
-      (read)

-        The object path of the parent device (if the VXLAN is not
-	purely internal to this host).
-      
HwAddress -
-      s -
-      (read)

-        Hardware address of the device.
-      
Id -
-      u -
-      (read)

-        The VXLAN Network Identifier (VNI).
-      
Group -
-      s -
-      (read)

-        The IP (v4 or v6) multicast group used to communicate with other physical
-	hosts on this VXLAN.
-      
Local -
-      s -
-      (read)

-        The local IPv4 or IPv6 address to use when sending VXLAN packets to other
-	physical hosts.
-      
Tos -
-      y -
-      (read)

-        The value to use in the IP ToS field for VXLAN packets sent to
-	other physical hosts.
-      
Ttl -
-      y -
-      (read)

-        The value to use in the IP TTL field for VXLAN packets sent to
-	other physical hosts.
-      
Learning -
-      b -
-      (read)

-        True if the VXLAN dynamically learns remote IP addresses.
-      
Ageing -
-      u -
-      (read)

-        The interval in seconds at which the kernel purges stale
-        cached addresses.
-      
Limit -
-      u -
-      (read)

-        The maximum number of entries that can be added to the VXLAN's
-	forwarding table.
-      
DstPort -
-      q -
-      (read)

-        Destination port for outgoing VXLAN packets.
-      
SrcPortMin -
-      q -
-      (read)

-        The lowest source port number to use for outgoing VXLAN packets.
-      
SrcPortMax -
-      q -
-      (read)

-        The highest source port number to use for outgoing VXLAN packets.
-      
Proxy -
-      b -
-      (read)

-        True if the VXLAN is implementing DOVE ARP proxying for remote
-        clients.
-      
Rsc -
-      b -
-      (read)

-        True if the VXLAN is implementing DOVE route short-circuiting
-	of known remote IP addresses.
-      
L2miss -
-      b -
-      (read)

-        True if the VXLAN will emit netlink notifications of L2 switch
-        misses.
-      
L3miss -
-      b -
-      (read)

-        True if the VXLAN will emit netlink notifications of L3 switch
-        misses.
-      

-
-  
org.freedesktop.NetworkManager.Device.Wireless
Methods:
GetAccessPoints (
-        
-        ) →
-        ao

-        DEPRECATED.  Get the list of access points visible to this device.  Note
-        that this list does not include access points which hide their SSID.  To
-        retrieve a list of all access points (including hidden ones) use the
-        GetAllAccessPoints() method.
-      
Returns
access_points -
-      ao

-          List of access point object paths.
-        
GetAllAccessPoints (
-        
-        ) →
-        ao

-        Get the list of all access points visible to this device, including
-        hidden ones for which the SSID is not yet known.
-      
Returns
access_points -
-      ao

-          List of access point object paths.
-        
RequestScan (
-        a{sv}: options
-        ) →
-        nothing

-        Request the device to scan
-      
Parameters
options -
-      a{sv}

-          Options of scan.
-          Currently 'ssids' option with value of "aay" type is supported.
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )

-            Emitted when the wireless device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary containing the FIXME: check changed parameters.
-            
AccessPointAdded (
-        o: access_point
-        )

-            Emitted when a new access point is found by the device.
-        
Parameters
access_point -
-      o

-                The object path of the newly found access point.
-            
AccessPointRemoved (
-        o: access_point
-        )

-            Emitted when an access point disappears from view of the device.
-        
Parameters
access_point -
-      o

-                The object path of the access point that has disappeared.
-            
Properties:
HwAddress -
-      s -
-      (read)

-        The active hardware address of the device.
-      
PermHwAddress -
-      s -
-      (read)

-        The permanent hardware address of the device.
-      
Mode -
-      u -
-      (read)
-      (NM_802_11_MODE)
-    

-        The operating mode of the wireless device.
-      
Bitrate -
-      u -
-      (read)

-        The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
-      
AccessPoints -
-      ao -
-      (read)

-        List of object paths of access point visible to this wireless device.
-      
ActiveAccessPoint -
-      o -
-      (read)

-        Object path of the access point currently used by the wireless device.
-      
WirelessCapabilities -
-      u -
-      (read)
-      (NM_802_11_DEVICE_CAP)
-    

-        The capabilities of the wireless device.
-      
Sets of flags:
NM_802_11_DEVICE_CAP

-        Flags describing the capabilities of a wireless device.
-      
NM_802_11_DEVICE_CAP_NONE = 0x0
Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!
NM_802_11_DEVICE_CAP_CIPHER_WEP40 = 0x1
The device supports the 40-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_WEP104 = 0x2
The device supports the 104-bit WEP cipher.
NM_802_11_DEVICE_CAP_CIPHER_TKIP = 0x4
The device supports the TKIP cipher.
NM_802_11_DEVICE_CAP_CIPHER_CCMP = 0x8
The device supports the CCMP cipher.
NM_802_11_DEVICE_CAP_WPA = 0x10
The device supports the WPA encryption/authentication protocol.
NM_802_11_DEVICE_CAP_RSN = 0x20
The device supports the RSN encryption/authentication protocol.
NM_802_11_DEVICE_CAP_AP = 0x40
The device supports Access Point mode.
NM_802_11_DEVICE_CAP_ADHOC = 0x80
The device supports Ad-Hoc mode.
NM_802_11_DEVICE_CAP_FREQ_VALID = 0x100

-	  The device properly reports information about supported
-	  frequencies and thus both NM_802_11_DEVICE_CAP_FREQ_2GHZ and
-	  NM_802_11_DEVICE_CAP_FREQ_5GHZ are valid.
-	
NM_802_11_DEVICE_CAP_FREQ_2GHZ = 0x200

-          The device supports 2.4GHz frequencies.
-        
NM_802_11_DEVICE_CAP_FREQ_5GHZ = 0x400

-          The device supports 5GHz frequencies.
-        

-
-  
org.freedesktop.NetworkManager.Device.WiMax
Methods:
GetNspList (
-        
-        ) →
-        ao

-        Get the list of NSPs visible to this device.
-      
Returns
nsps -
-      ao

-          List of NSP object paths
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )

-            Emitted when the WiMax device's properties changed.
-        
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values.
-            
NspAdded (
-        o: nsp
-        )

-            Emitted when a new NSP is found by the device.
-        
Parameters
nsp -
-      o

-                The object path of the newly found NSP.
-            
NspRemoved (
-        o: nsp
-        )

-            Emitted when an NSP disappears from view of the device.
-        
Parameters
nsp -
-      o

-                The object path of the NSP that has disappeared.
-            
Properties:
Nsps -
-      ao -
-      (read)

-        List of object paths of Network Service Providers (NSPs) visible to this
-        WiMAX device.
-      
HwAddress -
-      s -
-      (read)

-        Hardware address of the device.
-      
CenterFrequency -
-      u -
-      (read)

-        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.
-      
Rssi -
-      i -
-      (read)

-        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.
-      
Cinr -
-      i -
-      (read)

-        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.
-      
TxPower -
-      i -
-      (read)

-        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.
-      
Bsid -
-      s -
-      (read)

-        The ID of the serving base station as received from the network.  Has
-        no meaning when the device is not connected.
-      
ActiveNsp -
-      o -
-      (read)

-        Object path of the NSP currently used by the WiMax device.
-      

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

-                A dictionary mapping property names to variant boxed values.
-            
Properties:
Name -
-      s -
-      (read)
The name of the NSP.
SignalQuality -
-      u -
-      (read)
The current signal quality of the NSP, in percent.
NetworkType -
-      u -
-      (read)
-      (NM_WIMAX_NSP_NETWORK_TYPE)
-    
The network type of the NSP.
Sets of flags:
NM_WIMAX_NSP_NETWORK_TYPE

-        Network type of the NSP.
-      
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN = 0x0
Unknown network.
NM_WIMAX_NSP_NETWORK_TYPE_HOME = 0x1
Home network.
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER = 0x2
Partner network.
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER = 0x3
Roaming partner network.

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

-          A dictionary mapping property names to variant boxed values
-        
Properties:
Addresses -
-      aau -
-      (read)

-	Array of arrays of IPv4 address/prefix/gateway.  All 3
-	elements of each array are in network byte order.  Essentially:
-	[(addr, prefix, gateway), (addr, prefix, gateway), ...]
-
-	Deprecated: use AddressData and Gateway
-      
AddressData -
-      aa{sv} -
-      (read)

-	Array of IP address data objects. All addresses will include
-	"address" (an IP address string), and "prefix" (a uint). Some
-	addresses may include additional attributes.
-      
Gateway -
-      s -
-      (read)
The gateway in use.
Routes -
-      aau -
-      (read)

-	Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of
-	each tuple are in network byte order. 'route' and 'next hop'
-	are IPv4 addresses, while prefix and metric are simple
-	unsigned integers. Essentially: [(route, prefix, next-hop,
-	metric), (route, prefix, next-hop, metric), ...]
-
-	Deprecated: use RouteData
-      
RouteData -
-      aa{sv} -
-      (read)

-	Array of IP route data objects. All routes will include "dest"
-	(an IP address string) and "prefix" (a uint). Some routes may
-	include "next-hop" (an IP address string), "metric" (a uint),
-	and additional attributes.
-      
Nameservers -
-      au -
-      (read)
The nameservers in use.
Domains -
-      as -
-      (read)
A list of domains this address belongs to.
Searches -
-      as -
-      (read)
A list of dns searches.
DnsOptions -
-      as -
-      (read)

-	A list of DNS options that modify the behavior of the DNS
-	resolver. See resolv.conf(5) manual page for the list of
-	supported options.
-      
WinsServers -
-      au -
-      (read)
The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.

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

-          A dictionary mapping property names to variant boxed values
-        
Properties:
Addresses -
-      a(ayuay) -
-      (read)

-	Array of tuples of IPv6 address/prefix/gateway.
-
-	Deprecated: use AddressData and Gateway.
-      
AddressData -
-      aa{sv} -
-      (read)

-	Array of IP address data objects. All addresses will include
-	"address" (an IP address string), and "prefix" (a uint). Some
-	addresses may include additional attributes.
-      
Gateway -
-      s -
-      (read)
The gateway in use.
Routes -
-      a(ayuayu) -
-      (read)

-	Tuples of IPv6 route/prefix/next-hop/metric.
-
-	Deprecated: use RouteData
-      
RouteData -
-      aa{sv} -
-      (read)

-	Array of IP route data objects. All routes will include "dest"
-	(an IP address string) and "prefix" (a uint). Some routes may
-	include "next-hop" (an IP address string), "metric" (a uint),
-	and additional attributes.
-      
Nameservers -
-      aay -
-      (read)
The nameservers in use.
Domains -
-      as -
-      (read)
A list of domains this address belongs to.
Searches -
-      as -
-      (read)
A list of dns searches.
DnsOptions -
-      as -
-      (read)

-	A list of DNS options that modify the behavior of the DNS
-	resolver. See resolv.conf(5) manual page for the list of
-	supported options.
-      

-
-    
org.freedesktop.NetworkManager.DHCP4Config

-            Options and configuration returned by the IPv4 DHCP server.
-        
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values
-                
Properties:
Options -
-      a{sv} -
-      (read)
Configuration options returned by a DHCP server, if any.

-
-    
org.freedesktop.NetworkManager.DHCP6Config

-            Options and configuration returned by the IPv6 DHCP server.
-        
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values
-                
Properties:
Options -
-      a{sv} -
-      (read)
Configuration options returned by a DHCP server, if any.

-
-  
org.freedesktop.NetworkManager.Settings

-      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
-    
Methods:
ListConnections (
-        
-        ) →
-        ao

-        List the saved network connections known to NetworkManager.
-      
Returns
connections -
-      ao

-          List of connections.
-        
GetConnectionByUuid (
-        s: uuid
-        ) →
-        o

-        Retrieve the object path of a connection, given that connection's UUID.
-      
Parameters
uuid -
-      s

-          The UUID to find the connection object path for.
-        
Returns
connection -
-      o

-          The connection's object path.
-        
AddConnection (
-        a{sa{sv}}: connection
-        ) →
-        o

-        Add new connection and save it to disk.  This operation does not start
-        the network connection unless (1) device is idle and able to connect to
-        the network described by the new connection, and (2) the connection
-        is allowed to be started automatically.
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties.
-        
Returns
path -
-      o

-          Object path of the new connection that was just added.
-        
AddConnectionUnsaved (
-        a{sa{sv}}: connection
-        ) →
-        o

-        Add new connection but do not save it to disk immediately.  This
-        operation does not start the network connection unless (1) device is
-        idle and able to connect to the network described by the new connection,
-        and (2) the connection is allowed to be started automatically.
-
-        Use the 'Save' method on the connection to save these changes
-        to disk. Note that unsaved changes will be lost if the
-        connection is reloaded from disk (either automatically on file
-        change or due to an explicit ReloadConnections call).
-      
Parameters
connection -
-      a{sa{sv}}

-          Connection settings and properties.
-        
Returns
path -
-      o

-          Object path of the new connection that was just added.
-        
LoadConnections (
-        as: filenames
-        ) →
-        b, as

-        Loads or reloads the indicated connections from disk. You
-        should call this after making changes directly to an on-disk
-        connection file to make sure that NetworkManager sees the
-        changes. (If "monitor-connection-files" in NetworkManager.conf
-        is "true", then this will have no real effect, but is
-        harmless.) As with AddConnection(), this operation does not
-        necessarily start the network connection.
-      
Parameters
filenames -
-      as

-          Array of paths to on-disk connection profiles in directories
-          monitored by NetworkManager.
-        
Returns
status -
-      b

-          Success or failure of the operation as a whole. True if
-          NetworkManager at least tried to load the indicated
-          connections, even if it did not succeed. False if an error
-          occurred before trying to load the connections (eg,
-          permission denied).
-        
failures -
-      as

-          Paths of connection files that could not be loaded.
-        
ReloadConnections (
-        
-        ) →
-        b

-        Tells NetworkManager to reload all connection files from disk,
-        including noticing any added or deleted connection files. By
-        default, connections are re-read automatically any time they
-        change, so you only need to use this command if you have set
-        "monitor-connection-files=false" in NetworkManager.conf.
-      
Returns
status -
-      b

-          Success or failure.
-        
SaveHostname (
-        s: hostname
-        ) →
-        nothing

-        Save the hostname to persistent configuration.
-      
Parameters
hostname -
-      s

-          The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
-        
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
NewConnection (
-        o: connection
-        )

-        Emitted when a new connection has been added after NetworkManager has
-        started up and initialized.  This signal is not emitted for connections
-        read while starting up, because NetworkManager's D-Bus service is only
-        available after all connections have been read, and to prevent spamming
-        listeners with too many signals at one time.  To retrieve the initial
-        connection list, call the ListConnections() method once, and then listen
-        for individual Settings.NewConnection and Settings.Connection.Deleted
-        signals for further updates.
-      
Parameters
connection -
-      o

-          Object path of the new connection.
-        
ConnectionRemoved (
-        o: connection
-        )

-        Emitted when a connection is no longer available.  This happens when
-        the connection is deleted or if it is no longer accessible by any of
-        the system's logged-in users.  After receipt of this signal, the
-        connection no longer exists and cannot be used.  Also see the
-        Settings.Connection.Removed signal.
-      
Parameters
connection -
-      o

-          Object path of the removed connection.
-        
Properties:
Connections -
-      ao -
-      (read)

-        List of object paths of available network connection profiles.
-      
Hostname -
-      s -
-      (read)

-        The machine hostname stored in persistent configuration.
-      
CanModify -
-      b -
-      (read)

-        If true, adding and modifying connections is supported.
-      

-
-
-    
org.freedesktop.NetworkManager.Settings.Connection

-            Represents a single network connection configuration.
-        
Methods:
Update (
-        a{sa{sv}}: properties
-        ) →
-        nothing

-            Update the connection with new settings and properties (replacing
-            all previous settings and properties) and save the connection to
-            disk.  Secrets may be part of the update request, and will be either
-            stored in persistent storage or sent to a Secret Agent for storage,
-            depending on the flags associated with each secret.
-          
Parameters
properties -
-      a{sa{sv}}

-              New connection settings, properties, and (optionally) secrets.
-            
UpdateUnsaved (
-        a{sa{sv}}: properties
-        ) →
-        nothing

-            Update the connection with new settings and properties (replacing
-            all previous settings and properties) but do not immediately save
-            the connection to disk.  Secrets may be part of the update request
-            and may sent to a Secret Agent for storage, depending on the
-            flags associated with each secret.
-
-            Use the 'Save' method to save these changes to disk. Note
-            that unsaved changes will be lost if the connection is
-            reloaded from disk (either automatically on file change or
-            due to an explicit ReloadConnections call).
-          
Parameters
properties -
-      a{sa{sv}}

-              New connection settings, properties, and (optionally) secrets.
-            
Delete (
-        
-        ) →
-        nothing

-            Delete the connection.
-          
GetSettings (
-        
-        ) →
-        a{sa{sv}}

-                Get the settings maps describing this network configuration.
-                This will never include any secrets required for connection
-                to the network, as those are often protected.  Secrets must
-                be requested separately using the GetSecrets() call.
-            
Returns
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    The nested settings maps describing this object.
-                
GetSecrets (
-        s: setting_name
-        ) →
-        a{sa{sv}}

-                Get the secrets belonging to this network configuration.  Only
-                secrets from persistent storage or a Secret Agent running in
-                the requestor's session will be returned.  The user will never
-                be prompted for secrets as a result of this request.
-            
Parameters
setting_name -
-      s

-                    Name of the setting to return secrets for.  If empty, all
-                    all secrets will be returned.
-                
Returns
secrets -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing secrets.
-                
ClearSecrets (
-        
-        ) →
-        nothing

-            Clear the secrets belonging to this network connection profile.
-          
Save (
-        
-        ) →
-        nothing

-                Saves a "dirty" connection (that had previously been
-                updated with UpdateUnsaved) to persistent storage.
-            
Signals:
Updated (
-        
-        )

-                Emitted when any settings or permissions change.  When handling
-                this signal, clients should re-read the connection using the
-                GetSettings method to get the changes and to ensure the client
-                still has permission to access the connection.
-            
Removed (
-        
-        )

-                Emitted when this connection is no longer available.  This
-                happens when the connection is deleted or if it is no longer
-                accessible by any of the system's logged-in users.  After
-                receipt of this signal, the object no longer exists.  Also
-                see the Settings.ConnectionRemoved signal.
-            
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                    A dictionary mapping property names to variant boxed values.
-                
Properties:
Unsaved -
-      b -
-      (read)

-                If set, indicates that the in-memory state of the
-                connection does not match the on-disk state. This flag
-                will be set when UpdateUnsaved() is called or when any
-                connection details change, and cleared when the connection
-                is saved to disk via Save() or from internal operations.
-            

-
-
-  
org.freedesktop.NetworkManager.Connection.Active

-      Objects that implement the Connection.Active interface represent an attempt
-      to connect to a network using the details provided by a Connection object.
-      The Connection.Active object tracks the life-cycle of the connection
-      attempt and if successful indicates whether the connected network is the
-      "default" or preferred network for access.
-      NetworkManager has the concept of connections, which can be thought of as
-      settings, a profile or a configuration that can be applied on a networking
-      device.
-      Such settings-connections are exposed as D-Bus object and the active-connection
-      expresses this relationship between device and settings-connection.
-      At any time a settings-connection can only be activated on one device and vice
-      versa. However, during activation and deactivation multiple active-connections
-      can reference the same device or settings-connection as they are waiting to
-      be activated or to be deactivated.
-    
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
Properties:
Connection -
-      o -
-      (read)

-        The path of the connection.
-      
SpecificObject -
-      o -
-      (read)

-        A specific object associated with the active connection.  This property
-        reflects the specific object used during connection activation, and will
-        not change over the lifetime of the ActiveConnection once set.
-      
Id -
-      s -
-      (read)

-        The ID of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      
Uuid -
-      s -
-      (read)

-        The UUID of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      
Type -
-      s -
-      (read)

-        The type of the connection, provided as a convenience so that clients
-        do not have to retrieve all connection details.
-      
Devices -
-      ao -
-      (read)

-        Array of object paths representing devices which are part of this active
-        connection.
-      
State -
-      u -
-      (read)
-      (NM_ACTIVE_CONNECTION_STATE)
-    

-        The state of this active connection.
-      
Default -
-      b -
-      (read)

-        Whether this active connection is the default IPv4 connection, i.e.
-        whether it currently owns the default IPv4 route.
-      
Ip4Config -
-      o -
-      (read)

-        Object path of the Ip4Config object describing the configuration of the
-        connection. Only valid when the connection is in the
-        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-      
Dhcp4Config -
-      o -
-      (read)

-        Object path of the Dhcp4Config object describing the DHCP options
-        returned by the DHCP server (assuming the connection used DHCP). Only
-        valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
-        state.
-      
Default6 -
-      b -
-      (read)

-        Whether this active connection is the default IPv6 connection, i.e.
-        whether it currently owns the default IPv6 route.
-      
Ip6Config -
-      o -
-      (read)

-        Object path of the Ip6Config object describing the configuration of the
-        connection. Only valid when the connection is in the
-        NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
-      
Dhcp6Config -
-      o -
-      (read)

-        Object path of the Dhcp6Config object describing the DHCP options
-        returned by the DHCP server (assuming the connection used DHCP). Only
-        valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
-        state.
-      
Vpn -
-      b -
-      (read)

-        Whether this active connection is also a VPN connection.
-      
Master -
-      o -
-      (read)

-        The path to the master device if the connection is a slave.
-      
Enumerated types:
NM_ACTIVE_CONNECTION_STATE
NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0

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

-          The connection is activating.
-        
NM_ACTIVE_CONNECTION_STATE_ACTIVATED = 2

-          The connection is activated.
-        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATING = 3

-          The connection is being torn down and cleaned up.
-        
NM_ACTIVE_CONNECTION_STATE_DEACTIVATED = 4

-          The connection is no longer active.
-        

-
-  
org.freedesktop.NetworkManager.AgentManager
Methods:
Register (
-        s: identifier
-        ) →
-        nothing

-        Called by secret Agents to register their ability to provide and save
-        network secrets.
-      
Parameters
identifier -
-      s

-          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][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).
-        
RegisterWithCapabilities (
-        s: identifier, u: capabilities
-        ) →
-        nothing

-        Like Register() but indicates agent capabilities to NetworkManager.
-      
Parameters
identifier -
-      s

-            See the Register() method's identifier argument.
-        
capabilities -
-      u
-      (NM_SECRET_AGENT_CAPABILITIES)
-    

-            Indicates various agent capabilities to NetworkManager.
-        
Unregister (
-        
-        ) →
-        nothing

-        Called by secret Agents to notify NetworkManager that they will no
-        longer handle requests for network secrets.  Agents are automatically
-        unregistered when they disconnect from D-Bus.
-      
Interface has no signals.
Interface has no properties.

-
-
-    
org.freedesktop.NetworkManager.SecretAgent

-            Private D-Bus interface used by secret agents that store and provide
-            secrets to NetworkManager.  If an agent provides secrets to
-            NetworkManager as part of connection creation, and the some of those
-            secrets are "agent owned" the agent should store those secrets
-            itself and should not expect its SaveSecrets() method to be called.
-            SaveSecrets() will be called eg if some program other than the
-            agent itself (like a connection editor) changes the secrets out of
-            band.  The agent should implement this D-Bus interface on an object
-            with the path /org/freedesktop/NetworkManager/SecretAgent.
-        
Methods:
GetSecrets (
-        a{sa{sv}}: connection, o: connection_path, s: setting_name, as: hints, u: flags
-        ) →
-        a{sa{sv}}

-                Retrieve and return stored secrets, if any, or request new
-                secrets from the agent's user.  If user interaction is allowed
-                and the user enters new secrets, the agent is expected to save
-                the new secrets to persistent storage (if the secret's flags
-                include AGENT_OWNED) as NetworkManager will not send these
-                secrets back to the same agent via a SaveSecrets() call.  If
-                the user canceled any interaction, the agent should return the
-                UserCanceled error (see below).
-            
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing the connection for which
-                    secrets are being requested.  This may contain system-owned
-                    secrets if the agent has successfully authenticated to
-                    modify system network settings and the GetSecrets request
-                    flags allow user interaction.
-                
connection_path -
-      o

-                    Object path of the connection for which secrets are being
-                    requested.
-                
setting_name -
-      s

-                    Setting name for which secrets are being requested.
-                
hints -
-      as

-                    Array of strings of key names in the requested setting for
-                    which NetworkManager thinks a secrets may be required,
-                    and/or well-known identifiers and data that may be useful
-                    to the client in processing the secrets request.  Note that
-                    it's not always possible to determine which secret is
-                    required, so in some cases no hints may be given.  The Agent
-                    should return any secrets it has, or that it thinks are
-                    required, regardless of what hints NetworkManager sends
-                    in this request.  Some hints have special prefixes that
-                    provide information to the agent; for example, VPN requests
-                    may send server-specific messages prefixed with
-                    "x-vpn-message:".
-                
flags -
-      u
-      (NM_SECRET_AGENT_GET_SECRETS_FLAGS)
-    

-                    Flags which modify the behavior of the secrets request.
-                    If true, new secrets are assumed to be invalid or incorrect,
-                    and the agent should ask the user for new secrets.  If false,
-                    existing secrets should be retrieved from storage and 
-                    returned without interrupting the user.
-                
Returns
secrets -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing secrets.  Each setting MUST
-                    contain at least the 'name' field, containing the name of
-                    the setting, and one or more secrets.
-                
Possible errors
org.freedesktop.NetworkManager.SecretAgent.NotAuthorized

-                      Should be returned when the process requesting secrets is
-                      not authorized to do so (like if the caller is not root
-                      or not NetworkManager).
-                  
org.freedesktop.NetworkManager.SecretAgent.InvalidConnection

-                      Should be returned if the 'connection' argument is invalid.
-                  
org.freedesktop.NetworkManager.SecretAgent.UserCanceled

-                      Should be returned when the user has canceled the request.
-                  
org.freedesktop.NetworkManager.SecretAgent.AgentCanceled

-                      Should be returned when NetworkManager has requested that
-                      the agent cancel the request.
-                  
org.freedesktop.NetworkManager.SecretAgent.InternalError

-                      Should be returned if the agent has encountered some internal
-                      error processing the request.
-                  
org.freedesktop.NetworkManager.SecretAgent.NoSecrets

-                      Should be returned if there are no available secrets, for
-                      example if user interaction is not allowed and there are
-                      no secrets stored by the agent for this connection.
-                  
CancelGetSecrets (
-        o: connection_path, s: setting_name
-        ) →
-        nothing

-                Cancel a pending GetSecrets request for secrets of the given
-                connection.  Any GetSecrets request with the same
-                'connection_path' and 'setting_name' that are given in a
-                CancelGetSecrets request should be canceled.
-            
Parameters
connection_path -
-      o

-                    Object path of the connection for which, if secrets for
-                    the given 'setting_name' are being requested, the request
-                    should be canceled.
-                
setting_name -
-      s

-                    Setting name for which secrets for this connection were
-                    originally being requested.
-                
SaveSecrets (
-        a{sa{sv}}: connection, o: connection_path
-        ) →
-        nothing

-                Save given secrets to backing storage.
-            
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing the entire connection
-                    (including secrets), for which the agent should save the
-                    secrets to backing storage.  This method will not be called
-                    when the agent itself is the process creating or updating
-                    a connection; in that case the agent is assumed to have
-                    already saved those secrets since it had them already.
-                
connection_path -
-      o

-                    Object path of the connection for which the agent should
-                    save secrets to backing storage.
-                
DeleteSecrets (
-        a{sa{sv}}: connection, o: connection_path
-        ) →
-        nothing

-                Delete secrets from backing storage.
-            
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-                    Nested settings maps containing the connection properties
-                    (sans secrets), for which the agent should delete the
-                    secrets from backing storage.
-                
connection_path -
-      o

-                    Object path of the connection for which the agent should
-                    delete secrets from backing storage.
-                
Interface has no signals.
Interface has no properties.
Sets of flags:
NM_SECRET_AGENT_GET_SECRETS_FLAGS

-            Flags modifying the behavior of GetSecrets request.
-          
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0

-              No special behavior; by default no user interaction is allowed and
-              requests for secrets are fulfilled from persistent storage, or
-              if no secrets are available an error is returned.
-            
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1

-              Allows the request to interact with the user, possibly prompting
-              via UI for secrets if any are required, or if none are found in
-              persistent storage.
-            
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2

-              Explicitly prompt for new secrets from the user.  This flag
-              signals that NetworkManager thinks any existing secrets are
-              invalid or wrong.  This flag implies that interaction is allowed.
-            
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4

-              Set if the request was initiated by user-requested action via the
-              D-Bus interface, as opposed to automatically initiated by
-              NetworkManager in response to (for example) scan results or
-              carrier changes.
-            
NM_SECRET_AGENT_CAPABILITIES
NM_SECRET_AGENT_CAPABILITY_NONE = 0x0
No special capabilities.
NM_SECRET_AGENT_CAPABILITY_VPN_HINTS = 0x1

-                    The agent supports passing hints to VPN plugin authentication
-                    dialogs.
-                

-
-
-  
org.freedesktop.NetworkManager.VPN.Connection

-      Represents an active connection to a Virtual Private Network.
-    
Interface has no methods.
Signals:
PropertiesChanged (
-        a{sv}: properties
-        )
Parameters
properties -
-      a{sv}
-      (String_Variant_Map)
-    

-                A dictionary mapping property names to variant boxed values
-            
VpnStateChanged (
-        u: state, u: reason
-        )

-        Emitted when the state of the VPN connection has changed.
-      
Parameters
state -
-      u
-      (NM_VPN_CONNECTION_STATE)
-    

-          The new state of the VPN connection.
-        
reason -
-      u
-      (NM_VPN_CONNECTION_STATE_REASON)
-    

-          Reason code describing the change to the new state.
-        
Properties:
VpnState -
-      u -
-      (read)
-      (NM_VPN_CONNECTION_STATE)
-    
The VPN-specific state of the connection.
Banner -
-      s -
-      (read)
The banner string of the VPN connection.
Enumerated types:
NM_VPN_CONNECTION_STATE
NM_VPN_CONNECTION_STATE_UNKNOWN = 0

-          The state of the VPN connection is unknown.
-        
NM_VPN_CONNECTION_STATE_PREPARE = 1

-          The VPN connection is preparing to connect.
-        
NM_VPN_CONNECTION_STATE_NEED_AUTH = 2

-          The VPN connection needs authorization credentials.
-        
NM_VPN_CONNECTION_STATE_CONNECT = 3

-          The VPN connection is being established.  FIXME: Should be CONNECTING or CONNECTED.
-        
NM_VPN_CONNECTION_STATE_IP_CONFIG_GET = 4

-          The VPN connection is getting an IP address.  FIXME: Should be an -ING 
-        
NM_VPN_CONNECTION_STATE_ACTIVATED = 5

-          The VPN connection is active.
-        
NM_VPN_CONNECTION_STATE_FAILED = 6

-          The VPN connection failed.
-        
NM_VPN_CONNECTION_STATE_DISCONNECTED = 7

-          The VPN connection is disconnected.
-        
NM_VPN_CONNECTION_STATE_REASON
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0

-          The reason for the VPN connection state change is unknown.
-        
NM_VPN_CONNECTION_STATE_REASON_NONE = 1

-          No reason was given for the VPN connection state change.
-        
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2

-          The VPN connection changed state because the user disconnected it.
-        
NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3

-          The VPN connection changed state because the device it was using was disconnected.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4

-          The service providing the VPN connection was stopped.
-        
NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5

-          The IP config of the VPN connection was invalid.
-        
NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6

-          The connection attempt to the VPN service timed out.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7

-          A timeout occurred while starting the service providing the VPN connection.
-        
NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8

-          Starting the service starting the service providing the VPN connection failed.
-        
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9

-          Necessary secrets for the VPN connection were not provided.
-        
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10

-          Authentication to the VPN server failed.
-        
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11

-          The connection was deleted from settings.
-        

-
-  
org.freedesktop.NetworkManager.VPN.Plugin

-      This interface is provided by plugins providing VPN services to the NetworkManager daemon.
-    
Methods:
Connect (
-        a{sa{sv}}: connection
-        ) →
-        nothing

-        Tells the plugin to connect.  Interactive secrets requests (eg, emitting
-        the SecretsRequired signal) are not allowed.
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection to be established.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress

-      The plugin is already starting, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted

-      The plugin is already connected, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    (generic description)
ConnectInteractive (
-        a{sa{sv}}: connection, a{sv}: details
-        ) →
-        nothing

-        Tells the plugin to connect, allowing interactive secrets requests (eg
-        the plugin is allowed to emit the SecretsRequired signal if the VPN
-        service indicates that it needs additional secrets during the connect
-        process).
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection to be established.
-        
details -
-      a{sv}
-      (String_Variant_Map)
-    

-          Additional details about the Connect process.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress

-      The plugin is already starting, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted

-      The plugin is already connected, and another connect request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported

-      The request could not be processed because the plugin does not support
-      interactive operations, such as ConnectInteractive() or NewSecrets().
-    (generic description)
NeedSecrets (
-        a{sa{sv}}: settings
-        ) →
-        s

-        Asks the plugin whether the provided connection will require secrets to connect successfully.
-      
Parameters
settings -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection that may need secrets.
-        
Returns
setting_name -
-      s

-          The setting name within the provided connection that requires secrets, if any.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid

-      The request could not be processed because the connection was invalid. It
-      usually means that the connection's VPN setting was missing some required
-      data item or secret.
-    (generic description)
Disconnect (
-        
-        ) →
-        nothing

-        Disconnect the plugin.
-      
Possible errors
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped

-      The plugin is already stopped, and another disconnect request was received.
-    (generic description)
SetConfig (
-        a{sv}: config
-        ) →
-        nothing

-        Set generic connection details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Generic configuration details for the connection.
-        
SetIp4Config (
-        a{sv}: config
-        ) →
-        nothing

-        Set IPv4 details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Ip4Config details for the connection. You must call
-	  SetConfig() before calling this.
-        
SetIp6Config (
-        a{sv}: config
-        ) →
-        nothing

-        Set IPv6 details on the connection.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          Ip6Config details for the connection. You must call
-	  SetConfig() before calling this.
-        
SetFailure (
-        s: reason
-        ) →
-        nothing

-        Indicate a failure to the plugin.
-      
Parameters
reason -
-      s

-          The reason for the failure.
-        
NewSecrets (
-        a{sa{sv}}: connection
-        ) →
-        nothing

-        Called in response to a SecretsRequired signal to deliver updated secrets
-        or other information to the plugin.
-      
Parameters
connection -
-      a{sa{sv}}
-      (String_String_Variant_Map_Map)
-    

-          Describes the connection including the new secrets.
-        
Possible errors
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    (generic description)
org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported

-      The request could not be processed because the plugin does not support
-      interactive operations, such as ConnectInteractive() or NewSecrets().
-    (generic description)
Signals:
StateChanged (
-        u: state
-        )

-        Emitted when the plugin state changes.
-      
Parameters
state -
-      u
-      (NM_VPN_SERVICE_STATE)
-    

-          The new state of the plugin.
-        
SecretsRequired (
-        s: message, as: secrets
-        )

-        Emitted during an ongoing ConnectInteractive() request when the plugin
-        has determined that new secrets are required.  NetworkManager will then
-        call the NewSecrets() method with a connection hash including the new
-        secrets.
-      
Parameters
message -
-      s

-              Informational message, if any, about the request.  For example, if
-              a second PIN is required, could indicate to the user to wait for
-              the token code to change until entering the next PIN.
-          
secrets -
-      as

-              Array of strings of VPN secret names which the plugin thinks
-              secrets may be required for, or other VPN-specific data to be
-              processed by the VPN's front-end.
-          
Config (
-        a{sv}: config
-        )

-        The plugin obtained generic configuration information.
-      
Parameters
config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The configuration information.
-        
Ip4Config (
-        a{sv}: ip4config
-        )

-        The plugin obtained an IPv4 configuration.
-      
Parameters
ip4config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The IPv4 configuration.
-        
Ip6Config (
-        a{sv}: ip6config
-        )

-        The plugin obtained an IPv6 configuration.
-      
Parameters
ip6config -
-      a{sv}
-      (String_Variant_Map)
-    

-          The IPv6 configuration.
-        
LoginBanner (
-        s: banner
-        )

-        Emitted when the plugin receives a login banner from the VPN service.
-      
Parameters
banner -
-      s

-          The login banner string.
-        
Failure (
-        u: reason
-        )

-        Emitted when a failure in the VPN plugin occurs.
-      
Parameters
reason -
-      u
-      (NM_VPN_PLUGIN_FAILURE)
-    

-          Reason code for the failure.
-        
Properties:
State -
-      u -
-      (read)
-      (NM_VPN_SERVICE_STATE)
-    

-        The state of the plugin.
-      
Enumerated types:
NM_VPN_SERVICE_STATE
NM_VPN_SERVICE_STATE_UNKNOWN = 0

-          The state of the VPN plugin is unknown.
-        
NM_VPN_SERVICE_STATE_INIT = 1

-          The VPN plugin is initialized.
-        
NM_VPN_SERVICE_STATE_SHUTDOWN = 2

-          (Not used.)
-        
NM_VPN_SERVICE_STATE_STARTING = 3

-          The plugin is attempting to connect to a VPN server.
-        
NM_VPN_SERVICE_STATE_STARTED = 4

-          The plugin has connected to a VPN server.
-        
NM_VPN_SERVICE_STATE_STOPPING = 5

-          The plugin is disconnecting from the VPN server.
-        
NM_VPN_SERVICE_STATE_STOPPED = 6

-          The plugin has disconnected from the VPN server.
-        
NM_VPN_PLUGIN_FAILURE
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED = 0

-          Login failed.
-        
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED = 1

-          Connect failed.
-        
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG = 2

-          Invalid IP configuration returned from the VPN plugin.
-        

-
Generic types:
Enumerated types:
NM_802_11_MODE
NM_802_11_MODE_UNKNOWN = 0
Mode is unknown.
NM_802_11_MODE_ADHOC = 1

-        For both devices and access point objects, indicates the object is
-        part of an Ad-Hoc 802.11 network without a central coordinating access
-        point.
-      
NM_802_11_MODE_INFRA = 2

-        The wireless device or access point is in infrastructure mode.  For
-        devices, this indicates the device is an 802.11 client/station.  For
-        access point objects, this indicates the object is an access point that
-        provides connectivity to clients.
-      
NM_802_11_MODE_AP = 3

-        The device is an access point/hotspot.  Not valid for access point
-        objects themselves.
-      
Mapping types:
String_Variant_Map - a{
-        s: Key → v: Value
-        }
-      
A mapping from strings to variants representing extra
-      key-value pairs.
Members
Key -
-      s
(undocumented)
Value -
-      v
(undocumented)
String_String_Map - a{
-        s: Key → s: Value
-        }
-      
A mapping from strings to strings representing extra
-      key-value pairs.
Members
Key -
-      s
(undocumented)
Value -
-      s
(undocumented)
String_String_Variant_Map_Map - a{
-        s: Key → a{sv}: Value
-        }
-      
A mapping from strings to a map of string to variant.
Members
Key -
-      s
(undocumented)
Value -
-      a{sv}
-      (String_Variant_Map)
-    
(undocumented)
Errors:

-  
-
-  
org.freedesktop.NetworkManager.Error.UnknownConnection

-        Connection was not provided by the settings service.
-    
-
-  
org.freedesktop.NetworkManager.Error.UnknownDevice

-        Unknown device.
-    
-
-  
org.freedesktop.NetworkManager.Error.PermissionDenied

-    User does not have the permission to activate this connection.
-    
-
-
Errors:

-  
org.freedesktop.NetworkManager.VPN.Error.General
General failure without further details.
-  
org.freedesktop.NetworkManager.VPN.Error.StartingInProgress

-      The plugin is already starting, and another connect request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStarted

-      The plugin is already connected, and another connect request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.StoppingInProgress

-      The plugin is already stopping, and another stop request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.AlreadyStopped

-      The plugin is already stopped, and another disconnect request was received.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.WrongState

-      The request could not be processed because the VPN plugin is in the wrong
-      state for this type of request.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.BadArguments

-      The request could not be processed because it contained malformed
-      arguments, or arguments of unexpected type. It usually means that one of
-      the VPN setting data items or secrets was not of the expected type (i.e.
-      int, string, bool, etc).
-    
-  
org.freedesktop.NetworkManager.VPN.Error.LaunchFailed

-      A binary providing the service failed to launch.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.ConnectionInvalid

-      The request could not be processed because the connection was invalid. It
-      usually means that the connection's VPN setting was missing some required
-      data item or secret.
-    
-  
org.freedesktop.NetworkManager.VPN.Error.InteractiveNotSupported

-      The request could not be processed because the plugin does not support
-      interactive operations, such as ConnectInteractive() or NewSecrets().
-    
-
Index
Index of interfaces
Index of types

\ No newline at end of file
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 069199b8..99f6a00b 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.1.91
+1.1.92
diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html
index 6a134317..a178775a 100644
--- a/docs/libnm-glib/html/NMAccessPoint.html
+++ b/docs/libnm-glib/html/NMAccessPoint.html
@@ -43,7 +43,7 @@
 
-
+gchar *
-
+
-
+
+gchar *
-
+
-
+
-
+
-
+
@@ -211,12 +211,12 @@
 
-
+
-
+
@@ -280,7 +280,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMAccessPoint
 

@@ -292,7 +292,7 @@
 
Functions

 

 
nm_access_point_new ()

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

 
Creates a new NMAccessPoint.

@@ -327,7 +327,7 @@ nm_access_point_new (
 
nm_access_point_get_flags ()

-
NM80211ApFlags
+
NM80211ApFlags
 nm_access_point_get_flags (NMAccessPoint *ap);

 
Gets the flags of the access point.

 

@@ -353,7 +353,7 @@ nm_access_point_get_flags (
 
nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags
+
NM80211ApSecurityFlags
 nm_access_point_get_wpa_flags (NMAccessPoint *ap);

 
Gets the WPA (version 1) flags of the access point.

 

@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (
 

 
nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags
+
NM80211ApSecurityFlags
 nm_access_point_get_rsn_flags (NMAccessPoint *ap);

 
Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.

@@ -406,7 +406,7 @@ point.

 

 

 
nm_access_point_get_ssid ()

-
const GByteArray *
+
const GByteArray *
 nm_access_point_get_ssid (NMAccessPoint *ap);

 
Gets the SSID of the access point.

 

@@ -426,7 +426,7 @@ nm_access_point_get_ssid (
 
Returns

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

 

 

@@ -460,7 +460,7 @@ not be modified or freed.

 

 

 
nm_access_point_get_frequency ()

-
guint32
+
guint32
 nm_access_point_get_frequency (NMAccessPoint *ap);

 
Gets the frequency of the access point.

 

@@ -486,7 +486,7 @@ nm_access_point_get_frequency (
 

 
nm_access_point_get_mode ()

-
NM80211Mode
+
NM80211Mode
 nm_access_point_get_mode (NMAccessPoint *ap);

 
Gets the mode of the access point.

 

@@ -512,7 +512,7 @@ nm_access_point_get_mode (
 
nm_access_point_get_max_bitrate ()

-
guint32
+
guint32
 nm_access_point_get_max_bitrate (NMAccessPoint *ap);

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

 

@@ -538,7 +538,7 @@ nm_access_point_get_max_bitrate (
 

 
nm_access_point_get_strength ()

-
guint8
+
guint8
 nm_access_point_get_strength (NMAccessPoint *ap);

 
Gets the current signal strength of the access point.

 

@@ -564,7 +564,7 @@ nm_access_point_get_strength (
 
nm_access_point_get_last_seen ()

-
gint
+
gint
 nm_access_point_get_last_seen (NMAccessPoint *ap);

 
Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the access
@@ -593,9 +593,9 @@ point has not been found in a scan.

 

 

 
nm_access_point_filter_connections ()

-
GSList *
+
GSList *
 nm_access_point_filter_connections (NMAccessPoint *ap,
-                                    const GSList *connections);

+                                    const GSList *connections);

 
Filters a given list of connections for a given NMAccessPoint object and
 return connections which may be activated with the access point.  Any
 returned connections will match the ap
@@ -622,7 +622,7 @@ filter that list with this function.

 

+NMConnection objects to filter. 

 
@@ -631,20 +631,20 @@ filter that list with this function.

 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given ap
+list of NMConnection objects that could be activated with the given ap
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. 

+be freed with g_slist_free() when it is no longer required. 

 
[transfer container][element-type NMConnection]

 

 
 

 

 
nm_access_point_connection_valid ()

-
gboolean
+
gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);

+                                  NMConnection *connection);

 
Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 ap
@@ -667,7 +667,7 @@ against

 
 

-
@@ -676,8 +676,8 @@ against

 
 

 
Returns

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

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

 

 
 

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

 
Property Details

 

 
The “bssid” property

-
  “bssid”                    gchar *

+
  “bssid”                    gchar *

 
The BSSID of the access point.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “flags” property

-
  “flags”                    guint

+
  “flags”                    guint

 
The flags of the access point.

 
Flags: Read

 
Allowed values: <= 1

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

 

 

 
The “frequency” property

-
  “frequency”                guint

+
  “frequency”                guint

 
The frequency of the access point.

 
Flags: Read

 
Allowed values: <= 10000

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware address of the access point.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “last-seen” property

-
  “last-seen”                gint

+
  “last-seen”                gint

 
The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the
 access point has not been found in a scan.

@@ -830,7 +830,7 @@ access point has not been found in a scan.

 

 

 
The “max-bitrate” property

-
  “max-bitrate”              guint

+
  “max-bitrate”              guint

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

 
Flags: Read

 
Default value: 0

@@ -838,7 +838,7 @@ access point has not been found in a scan.

 

 

 
The “mode” property

-
  “mode”                     guint

+
  “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).

@@ -849,7 +849,7 @@ coordinator of the wireless network allowing clients to connect) or
 

 

 
The “rsn-flags” property

-
  “rsn-flags”                guint

+
  “rsn-flags”                guint

 
The RSN flags of the access point.

 
Flags: Read

 
Default value: 0

@@ -864,7 +864,7 @@ coordinator of the wireless network allowing clients to connect) or
 

 

 
The “strength” property

-
  “strength”                 guchar

+
  “strength”                 guchar

 
The current signal strength of the access point.

 
Flags: Read

 
Default value: 0

@@ -872,7 +872,7 @@ coordinator of the wireless network allowing clients to connect) or
 

 

 
The “wpa-flags” property

-
  “wpa-flags”                guint

+
  “wpa-flags”                guint

 
The WPA flags of the access point.

 
Flags: Read

 
Default value: 0

diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 7187e85a..51037dca 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -43,7 +43,7 @@
 

-
+gchar *
 
-
+
-
+
@@ -210,7 +210,7 @@
 
 
+gchar *
 
@@ -228,35 +228,35 @@
 
 
+gchar *
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
@@ -336,7 +336,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVPNConnection
@@ -349,7 +349,7 @@
 
Functions

 

 
nm_active_connection_new ()

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

 
Creates a new NMActiveConnection.

@@ -386,7 +386,7 @@ nm_active_connection_new (
nm_active_connection_get_connection ()

 
const char *
 nm_active_connection_get_connection (NMActiveConnection *connection);

-
Gets the NMConnection's DBus object path.  This is often used with
+
Gets the NMConnection's DBus object path.  This is often used with
 nm_remote_settings_get_connection_by_path() to retrieve the
 NMRemoteConnection object that describes the connection.

 

@@ -406,7 +406,7 @@ nm_active_connection_get_connection (
 

 
Returns

-
 the object path of the NMConnection which this NMActiveConnection
+
 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.

 

@@ -416,7 +416,7 @@ connection, and must not be modified.

 
nm_active_connection_get_id ()

 
const char *
 nm_active_connection_get_id (NMActiveConnection *connection);

-
Gets the NMConnection's ID.

+
Gets the NMConnection's ID.

 

 
Parameters

 

     
     
     
     
     
     
     
     
     
     
 

 
-GObject *
+GObject *
 
 
 nm_access_point_new ()
@@ -51,7 +51,7 @@
 

 

 
-NM80211ApFlags
+NM80211ApFlags
 
 
 nm_access_point_get_flags ()
@@ -59,7 +59,7 @@
 

 

 
-NM80211ApSecurityFlags
+NM80211ApSecurityFlags
 
 
 nm_access_point_get_wpa_flags ()
@@ -67,14 +67,14 @@
 

 

 
-NM80211ApSecurityFlags
+NM80211ApSecurityFlags
 
 
 nm_access_point_get_rsn_flags ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_access_point_get_ssid ()
@@ -89,7 +89,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_access_point_get_frequency ()
@@ -97,7 +97,7 @@
 

 

 
-NM80211Mode
+NM80211Mode
 
 
 nm_access_point_get_mode ()
@@ -105,7 +105,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_access_point_get_max_bitrate ()
@@ -113,7 +113,7 @@
 

 

 
-guint8
+guint8
 
 
 nm_access_point_get_strength ()
@@ -121,7 +121,7 @@
 

 

 
-gint
+gint
 
 
 nm_access_point_get_last_seen ()
@@ -129,7 +129,7 @@
 

 

 
-GSList *
+GSList *
 
 
 nm_access_point_filter_connections ()
@@ -137,7 +137,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_access_point_connection_valid ()
@@ -164,43 +164,43 @@
 

 

 
-gchar *
 bssid
 Read
 

 
guintguint
 flags
 Read
 

 
guintguint
 frequency
 Read
 

 

 
-gchar *
 hw-address
 Read
 

 
gintgint
 last-seen
 Read
 

 
guintguint
 max-bitrate
 Read
 

 
guintguint
 mode
 Read
 

 
guintguint
 rsn-flags
 Read
 
Read
 

 
gucharguchar
 strength
 Read
 

 
guintguint
 wpa-flags
 Read
 

 

 
connections

 
 a list of
-NMConnection objects to filter. 
[element-type NMConnection]
 

 

 
connection
an NMConnection to validate against ap
+
an NMConnection to validate against ap
 

  
 

 

 
-GObject *
+GObject *
 
 
 nm_active_connection_new ()
@@ -85,7 +85,7 @@
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_active_connection_get_devices ()
@@ -93,7 +93,7 @@
 

 

 
-NMActiveConnectionState
+NMActiveConnectionState
 
 
 nm_active_connection_get_state ()
@@ -108,7 +108,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default ()
@@ -132,7 +132,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default6 ()
@@ -156,7 +156,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_active_connection_get_vpn ()
@@ -176,17 +176,17 @@
 

 

 
-gchar *connection
 Read
 

 
gbooleangboolean
 default
 Read
 

 
gbooleangboolean
 default6
 Read
 

 
-gchar *id
 Read
 

 
-gchar *master
 Read
 

 

 
-gchar *specific-object
 Read
 

 
guintguint
 state
 Read
 

 

 
-gchar *type
 Read
 

 

 
-gchar *uuid
 Read
 

 
gbooleangboolean
 vpn
 Read
 

@@ -434,7 +434,7 @@ nm_active_connection_get_id (
 
Returns

-
 the ID of the NMConnection that backs the NMActiveConnection.
+
 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

@@ -444,7 +444,7 @@ This is the internal string used by the connection, and must not be modified.
nm_active_connection_get_uuid ()

 
const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);

-
Gets the NMConnection's UUID.

+
Gets the NMConnection's UUID.

 

 
Parameters

 

@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (
 

 
Returns

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

 

 
@@ -472,7 +472,7 @@ This is the internal string used by the connection, and must not be modified.
const char *
 nm_active_connection_get_connection_type
                                (NMActiveConnection *connection);
-
Gets the NMConnection's type.

+
Gets the NMConnection's type.

 

 
Parameters

 

@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 
 

 
Returns

-
 the type of the NMConnection that backs the NMActiveConnection.
+
 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

@@ -526,7 +526,7 @@ connection, and must not be modified.

 

 

 
nm_active_connection_get_devices ()

-
const GPtrArray *
+
const GPtrArray *
 nm_active_connection_get_devices (NMActiveConnection *connection);

 
Gets the NMDevices used for the active connections.

 

@@ -546,7 +546,7 @@ nm_active_connection_get_devices (
 

 
Returns

-
 the GPtrArray containing NMDevices.
+
 the GPtrArray containing NMDevices.
 This is the internal copy used by the connection, and must not be modified. 

 
[element-type NMDevice]

 

@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. 

 

 

 
nm_active_connection_get_state ()

-
NMActiveConnectionState
+
NMActiveConnectionState
 nm_active_connection_get_state (NMActiveConnection *connection);

 
Gets the active connection's state.

 

@@ -607,7 +607,7 @@ This is the internal string used by the connection, and must not be modified.

 

 
nm_active_connection_get_default ()

-
gboolean
+
gboolean
 nm_active_connection_get_default (NMActiveConnection *connection);

 
Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).

@@ -628,7 +628,7 @@ the default IPv4 route and DNS information).

 

 

 
Returns

-
 TRUE if the active connection is the default IPv4 connection

+
 TRUE if the active connection is the default IPv4 connection

 

 

 

@@ -654,8 +654,8 @@ nm_active_connection_get_ip4_config (
 

 
Returns

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

 
[transfer none]

 

@@ -685,9 +685,9 @@ nm_active_connection_get_dhcp4_config (
 
Returns

-
 the NMDHCP4Config, or NULL if the
+
 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

@@ -695,7 +695,7 @@ connection does not use DHCP, or is not in the
 

 

 
nm_active_connection_get_default6 ()

-
gboolean
+
gboolean
 nm_active_connection_get_default6 (NMActiveConnection *connection);

 
Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).

@@ -716,7 +716,7 @@ the default IPv6 route and DNS information).

 

 

 
Returns

-
 TRUE if the active connection is the default IPv6 connection

+
 TRUE if the active connection is the default IPv6 connection

 

 

 

@@ -742,8 +742,8 @@ nm_active_connection_get_ip6_config (
 

 
Returns

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

 
[transfer none]

 

@@ -773,9 +773,9 @@ nm_active_connection_get_dhcp6_config (
 
Returns

-
 the NMDHCP6Config, or NULL if the
+
 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

@@ -783,7 +783,7 @@ connection does not use DHCPv6, or is not in the
 

 

 
nm_active_connection_get_vpn ()

-
gboolean
+
gboolean
 nm_active_connection_get_vpn (NMActiveConnection *connection);

 
Whether the active connection is a VPN connection.

 

@@ -803,7 +803,7 @@ nm_active_connection_get_vpn (
 
Returns

-
 TRUE if the active connection is a VPN connection

+
 TRUE if the active connection is a VPN connection

 

 
Since: 0.9.10

 

@@ -904,7 +904,7 @@ nm_active_connection_get_vpn (
Property Details

 

 
The “connection” property

-
  “connection”               gchar *

+
  “connection”               gchar *

 
The connection's path of the active connection.

 
Flags: Read

 
Default value: NULL

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

-
  “default”                  gboolean

+
  “default”                  gboolean

 
Whether the active connection is the default IPv4 one.

 
Flags: Read

 
Default value: FALSE

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

-
  “default6”                 gboolean

+
  “default6”                 gboolean

 
Whether the active connection is the default IPv6 one.

 
Flags: Read

 
Default value: FALSE

@@ -950,7 +950,7 @@ nm_active_connection_get_vpn (
 
The “id” property

-
  “id”                       gchar *

+
  “id”                       gchar *

 
The active connection's ID

 
Flags: Read

 
Default value: NULL

@@ -975,7 +975,7 @@ nm_active_connection_get_vpn (
 
The “master” property

-
  “master”                   gchar *

+
  “master”                   gchar *

 
The path of the master device if one exists.

 
Flags: Read

 
Default value: NULL

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

-
  “specific-object”          gchar *

+
  “specific-object”          gchar *

 
The specific object's path of the active connection.

 
Flags: Read

 
Default value: NULL

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

-
  “state”                    guint

+
  “state”                    guint

 
The state of the active connection.

 
Flags: Read

 
Allowed values: <= 3

@@ -1000,7 +1000,7 @@ nm_active_connection_get_vpn (
 
The “type” property

-
  “type”                     gchar *

+
  “type”                     gchar *

 
The active connection's type

 
Flags: Read

 
Default value: NULL

@@ -1009,7 +1009,7 @@ nm_active_connection_get_vpn (
 
The “uuid” property

-
  “uuid”                     gchar *

+
  “uuid”                     gchar *

 
The active connection's UUID

 
Flags: Read

 
Default value: NULL

@@ -1017,7 +1017,7 @@ nm_active_connection_get_vpn (
 
The “vpn” property

-
  “vpn”                      gboolean

+
  “vpn”                      gboolean

 
Whether the active connection is a VPN connection.

 
Flags: Read

 
Default value: FALSE

diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 4ec1469d..865c607a 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -44,7 +44,7 @@
 

-
-
-
-
+
@@ -392,12 +392,12 @@
 
-
+
-
+
@@ -408,48 +408,48 @@
 
-
+
-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
-
+
@@ -468,27 +468,27 @@
 
-
+
-
+
-
+
-
+
-
+

 

 
-GQuark
+GQuark
 
 
 nm_client_error_quark ()
@@ -75,14 +75,14 @@
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_devices ()
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_all_devices ()
@@ -146,7 +146,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_networking_get_enabled ()
@@ -162,7 +162,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wireless_get_enabled ()
@@ -178,7 +178,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wireless_hardware_get_enabled ()
@@ -186,7 +186,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wwan_get_enabled ()
@@ -202,7 +202,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wwan_hardware_get_enabled ()
@@ -210,7 +210,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wimax_get_enabled ()
@@ -226,7 +226,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wimax_hardware_get_enabled ()
@@ -241,7 +241,7 @@
 

 

 
-NMState
+NMState
 
 
 nm_client_get_state ()
@@ -249,7 +249,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_get_startup ()
@@ -257,14 +257,14 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_get_manager_running ()
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_active_connections ()
@@ -288,7 +288,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_get_logging ()
@@ -296,7 +296,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_set_logging ()
@@ -304,7 +304,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_get_connectivity ()
@@ -312,7 +312,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity ()
@@ -328,7 +328,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity_finish ()
@@ -381,7 +381,7 @@
 Read
 

 
guintguint
 connectivity
 Read
 
Read
 

 
gbooleangboolean
 manager-running
 Read
 

 
gbooleangboolean
 networking-enabled
 Read / Write
 
Read
 

 
gbooleangboolean
 startup
 Read
 

 
guintguint
 state
 Read
 

 

 
-gchar *version
 Read
 

 
gbooleangboolean
 wimax-enabled
 Read / Write
 

 
gbooleangboolean
 wimax-hardware-enabled
 Read
 

 
gbooleangboolean
 wireless-enabled
 Read / Write
 

 
gbooleangboolean
 wireless-hardware-enabled
 Read
 

 
gbooleangboolean
 wwan-enabled
 Read / Write
 

 
gbooleangboolean
 wwan-hardware-enabled
 Read
 

 void
 any-device-addedRun FirstRun First
 

 

 void
 any-device-removedRun FirstRun First
 

 

 void
 device-addedRun FirstRun First
 

 

 void
 device-removedRun FirstRun First
 

 

 void
 permission-changedRun FirstRun First
 

 
 

@@ -590,7 +590,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMClient
 

@@ -602,7 +602,7 @@
 
Functions

 

 
nm_client_error_quark ()

-
GQuark
+
GQuark
 nm_client_error_quark (void);

 
Registers an error quark for NMClient if necessary.

 

@@ -632,9 +632,9 @@ control them.  To access and modify network configuration data, use the
 

 
nm_client_new_async ()

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

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

 
Creates a new NMClient and begins asynchronously initializing it.
 callback
  will be called when it is done; use
@@ -654,7 +654,7 @@ control them.  To access and modify network configuration data, use the
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -676,8 +676,8 @@ control them.  To access and modify network configuration data, use the
 

 
nm_client_new_finish ()

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

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

 
Gets the result of an nm_client_new_async() call.

 

 
Parameters

@@ -690,12 +690,12 @@ nm_client_new_finish (
result

-
a GAsyncResult

+
a GAsyncResult

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -703,13 +703,13 @@ nm_client_new_finish (
 
Returns

-
 a new NMClient, or NULL on error

+
 a new NMClient, or NULL on error

 

 

 

 

 
nm_client_get_devices ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_devices (NMClient *client);

 
Gets all the known network devices.  Use nm_device_get_type() or the
 NM_IS_DEVICE_XXXX functions to determine what kind of
@@ -732,7 +732,7 @@ methods such as 
 
Returns

-
 a GPtrArray
+
 a GPtrArray
 containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 

 
[transfer none][element-type NMDevice]

@@ -741,7 +741,7 @@ containing all the NMDevices
 

 
nm_client_get_all_devices ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_all_devices (NMClient *client);

 
Gets both real devices and device placeholders (eg, software devices which
 do not currently exist, but could be created automatically by NetworkManager
@@ -768,7 +768,7 @@ use device-specific methods such as 
 
Returns

-
 a GPtrArray
+
 a GPtrArray
 containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 

 
[transfer none][element-type NMDevice]

@@ -807,7 +807,7 @@ nm_client_get_device_by_path (
 
Returns

 
 the NMDevice for the given object_path
-or NULL if none is found. 

+or NULL if none is found. 

 
[transfer none]

 

 

@@ -843,7 +843,7 @@ nm_client_get_device_by_iface (
 
Returns

 
 the NMDevice for the given iface
-or NULL if none is found. 

+or NULL if none is found. 

 
[transfer none]

 

 

@@ -853,19 +853,19 @@ or void
 (*NMClientActivateFn) (NMClient *client,
                        NMActiveConnection *active_connection,
-                       GError *error,
-                       gpointer user_data);
+                       GError *error,
+                       gpointer user_data);
 

 

 

 
nm_client_activate_connection ()

 
void
 nm_client_activate_connection (NMClient *client,
-                               NMConnection *connection,
+                               NMConnection *connection,
                                NMDevice *device,
                                const char *specific_object,
                                NMClientActivateFn callback,
-                               gpointer user_data);

+                               gpointer user_data);
 
Starts a connection to a particular network using the configuration settings
 from connection
  and the network device device
@@ -899,7 +899,7 @@ track the activation to its completion.

 
 
 
connection

-
 an NMConnection. 

+
 an NMConnection. 

 [allow-none]
 
 
@@ -911,7 +911,7 @@ track the activation to its completion.

 
specific_object

 
 the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -940,19 +940,19 @@ details of the newly added connection. 

 (*NMClientAddActivateFn) (NMClient *client,
                           NMActiveConnection *connection,
                           const char *new_connection_path,
-                          GError *error,
-                          gpointer user_data);
+                          GError *error,
+                          gpointer user_data);
 

 

 

 
nm_client_add_and_activate_connection ()

 
void
 nm_client_add_and_activate_connection (NMClient *client,
-                                       NMConnection *partial,
+                                       NMConnection *partial,
                                        NMDevice *device,
                                        const char *specific_object,
                                        NMClientAddActivateFn callback,
-                                       gpointer user_data);

+                                       gpointer user_data);
 
Adds a new connection using the given details (if any) as a template,
 automatically filling in missing settings with the capabilities of the
 given device and specific object.  The new connection is then activated.
@@ -977,8 +977,8 @@ track the activation to its completion.

 
 
 
partial

-
 an NMConnection to add; the connection may be
-partially filled (or even NULL) and will be completed by NetworkManager
+
 an NMConnection to add; the connection may be
+partially filled (or even NULL) and will be completed by NetworkManager
 using the given device
 and specific_object
 before being added. 

@@ -993,7 +993,7 @@ before being added. 

 
specific_object

 
 the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -1048,7 +1048,7 @@ nm_client_deactivate_connection (
 

 
nm_client_networking_get_enabled ()

-
gboolean
+
gboolean
 nm_client_networking_get_enabled (NMClient *client);

 
Whether networking is enabled or disabled.

 

@@ -1068,7 +1068,7 @@ nm_client_networking_get_enabled (
 

 
Returns

-
 TRUE if networking is enabled, FALSE if networking is disabled

+
 TRUE if networking is enabled, FALSE if networking is disabled

 

 

 

@@ -1076,7 +1076,7 @@ nm_client_networking_get_enabled (
nm_client_networking_set_enabled ()

 
void
 nm_client_networking_set_enabled (NMClient *client,
-                                  gboolean enabled);

+                                  gboolean enabled);

 
Enables or disables networking.  When networking is disabled, all controlled
 interfaces are disconnected and deactivated.  When networking is enabled,
 all controlled interfaces are available for activation.

@@ -1096,7 +1096,7 @@ all controlled interfaces are available for activation.

 
 
 
enabled

-
TRUE to set networking enabled, FALSE to set networking disabled

+
TRUE to set networking enabled, FALSE to set networking disabled

  
 
 
@@ -1106,7 +1106,7 @@ all controlled interfaces are available for activation.

 

 

 
nm_client_wireless_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wireless_get_enabled (NMClient *client);

 
Determines whether the wireless is enabled.

 

@@ -1126,7 +1126,7 @@ nm_client_wireless_get_enabled (
 

 
Returns

-
 TRUE if wireless is enabled

+
 TRUE if wireless is enabled

 

 

 

@@ -1134,7 +1134,7 @@ nm_client_wireless_get_enabled (
nm_client_wireless_set_enabled ()

 
void
 nm_client_wireless_set_enabled (NMClient *client,
-                                gboolean enabled);

+                                gboolean enabled);

 
Enables or disables wireless devices.

 

 
Parameters

@@ -1152,7 +1152,7 @@ nm_client_wireless_set_enabled (
 
 
enabled

-
TRUE to enable wireless

+
TRUE to enable wireless

  
 
 
@@ -1162,7 +1162,7 @@ nm_client_wireless_set_enabled (
 

 
nm_client_wireless_hardware_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wireless_hardware_get_enabled
                                (NMClient *client);

 
Determines whether the wireless hardware is enabled.

@@ -1183,13 +1183,13 @@ nm_client_wireless_hardware_get_enabled
 

 

 
Returns

-
 TRUE if the wireless hardware is enabled

+
 TRUE if the wireless hardware is enabled

 

 

 

 

 
nm_client_wwan_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wwan_get_enabled (NMClient *client);

 
Determines whether WWAN is enabled.

 

@@ -1209,7 +1209,7 @@ nm_client_wwan_get_enabled (
 
Returns

-
 TRUE if WWAN is enabled

+
 TRUE if WWAN is enabled

 

 

 

@@ -1217,7 +1217,7 @@ nm_client_wwan_get_enabled (
nm_client_wwan_set_enabled ()

 
void
 nm_client_wwan_set_enabled (NMClient *client,
-                            gboolean enabled);

+                            gboolean enabled);
 
Enables or disables WWAN devices.

 

 
Parameters

@@ -1235,7 +1235,7 @@ nm_client_wwan_set_enabled (
enabled

-
TRUE to enable WWAN

+
TRUE to enable WWAN

  
 
 
@@ -1245,7 +1245,7 @@ nm_client_wwan_set_enabled (
 
nm_client_wwan_hardware_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wwan_hardware_get_enabled (NMClient *client);

 
Determines whether the WWAN hardware is enabled.

 

@@ -1265,13 +1265,13 @@ nm_client_wwan_hardware_get_enabled (
 

 
Returns

-
 TRUE if the WWAN hardware is enabled

+
 TRUE if the WWAN hardware is enabled

 

 

 

 

 
nm_client_wimax_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wimax_get_enabled (NMClient *client);

 
Determines whether WiMAX is enabled.

 

@@ -1291,7 +1291,7 @@ nm_client_wimax_get_enabled (
 
Returns

-
 TRUE if WiMAX is enabled

+
 TRUE if WiMAX is enabled

 

 

 

@@ -1299,7 +1299,7 @@ nm_client_wimax_get_enabled (
nm_client_wimax_set_enabled ()

 
void
 nm_client_wimax_set_enabled (NMClient *client,
-                             gboolean enabled);

+                             gboolean enabled);

 
Enables or disables WiMAX devices.

 

 
Parameters

@@ -1317,7 +1317,7 @@ nm_client_wimax_set_enabled (
enabled

-
TRUE to enable WiMAX

+
TRUE to enable WiMAX

  
 
 
@@ -1327,7 +1327,7 @@ nm_client_wimax_set_enabled (
 
nm_client_wimax_hardware_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wimax_hardware_get_enabled (NMClient *client);

 
Determines whether the WiMAX hardware is enabled.

 

@@ -1347,7 +1347,7 @@ nm_client_wimax_hardware_get_enabled (
 
Returns

-
 TRUE if the WiMAX hardware is enabled

+
 TRUE if the WiMAX hardware is enabled

 

 

 

@@ -1379,7 +1379,7 @@ nm_client_get_version (
 
nm_client_get_state ()

-
NMState
+
NMState
 nm_client_get_state (NMClient *client);

 
Gets the current daemon state.

 

@@ -1399,13 +1399,13 @@ nm_client_get_state (
 
Returns

-
 the current NMState

+
 the current NMState

 

 

 

 

 
nm_client_get_startup ()

-
gboolean
+
gboolean
 nm_client_get_startup (NMClient *client);

 
Tests whether the daemon is still in the process of activating
 connections at startup.

@@ -1433,7 +1433,7 @@ connections at startup.

 

 

 
nm_client_get_manager_running ()

-
gboolean
+
gboolean
 nm_client_get_manager_running (NMClient *client);

 
Determines whether the daemon is running.

 

@@ -1453,13 +1453,13 @@ nm_client_get_manager_running (
 

 
Returns

-
 TRUE if the daemon is running

+
 TRUE if the daemon is running

 

 

 

 

 
nm_client_get_active_connections ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_active_connections (NMClient *client);

 
Gets the active connections.

 

@@ -1479,7 +1479,7 @@ nm_client_get_active_connections (
 

 
Returns

-
 a GPtrArray
+
 a GPtrArray
 containing all the active NMActiveConnections.
 The returned array is owned by the client and should not be modified. 

 
[transfer none][element-type NMActiveConnection]

@@ -1490,7 +1490,7 @@ The returned array is owned by the client and should not be modified. 

 
nm_client_sleep ()

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

+                 gboolean sleep_);

 
Deprecated; use nm_client_networking_set_enabled() instead.

 

 
Parameters

@@ -1508,7 +1508,7 @@ nm_client_sleep (
sleep_

-
TRUE to put the daemon to sleep

+
TRUE to put the daemon to sleep

  
 
 
@@ -1553,11 +1553,11 @@ client can or cannot perform the action the permission represents

 

 

 
nm_client_get_logging ()

-
gboolean
+
gboolean
 nm_client_get_logging (NMClient *client,
                        char **level,
                        char **domains,
-                       GError **error);

+                       GError **error);

 
Gets NetworkManager current logging level and domains.

 

 
Parameters

@@ -1586,7 +1586,7 @@ a list of domains separated by ",". 

 
 
 
error

-
 return location for a GError, or NULL. 

+
 return location for a GError, or NULL. 

 [allow-none]
 
 
@@ -1594,18 +1594,18 @@ a list of domains separated by ",". 

 

 

 
Returns

-
 TRUE on success, FALSE otherwise

+
 TRUE on success, FALSE otherwise

 

 
Since: 0.9.8

 

 

 

 
nm_client_set_logging ()

-
gboolean
+
gboolean
 nm_client_set_logging (NMClient *client,
                        const char *level,
                        const char *domains,
-                       GError **error);

+                       GError **error);

 
Sets NetworkManager logging level and/or domains.

 

 
Parameters

@@ -1623,18 +1623,18 @@ nm_client_set_logging (
level

-
 logging level to set (NULL or an empty string for no change). 

+
 logging level to set (NULL or an empty string for no change). 

 [allow-none]
 
 
 
domains

 
 logging domains to set. The string should be a list of log
-domains separated by ",". (NULL or an empty string for no change). 

+domains separated by ",". (NULL or an empty string for no change). 

 [allow-none]
 
 
 
error

-
 return location for a GError, or NULL. 

+
 return location for a GError, or NULL. 

 [allow-none]
 
 
@@ -1642,14 +1642,14 @@ domains separated by ",". (
 
Returns

-
 TRUE on success, FALSE otherwise

+
 TRUE on success, FALSE otherwise

 

 
Since: 0.9.8

 

 

 

 
nm_client_get_connectivity ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_get_connectivity (NMClient *client);

 
Gets the current network connectivity state. Contrast
 nm_client_check_connectivity() and
@@ -1679,10 +1679,10 @@ connectivity state first before returning any information.

 

 

 
nm_client_check_connectivity ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_check_connectivity (NMClient *client,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

 
Updates the network connectivity state and returns the (new)
 current state. Contrast nm_client_get_connectivity(), which returns
 the most recent known state without re-checking.

@@ -1704,12 +1704,12 @@ if you do not want to block.

 
 
 
cancellable

-
a GCancellable

+
a GCancellable

  
 
 
 
error

-
return location for a GError

+
return location for a GError

  
 
 
@@ -1726,9 +1726,9 @@ if you do not want to block.

 
nm_client_check_connectivity_async ()

 
void
 nm_client_check_connectivity_async (NMClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);

+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);

 
Asynchronously updates the network connectivity state and invokes
 callback
  when complete. Contrast nm_client_get_connectivity(),
@@ -1750,7 +1750,7 @@ re-checking, and 
cancellable

-
a GCancellable

+
a GCancellable

  
 
 
@@ -1772,10 +1772,10 @@ re-checking, and 
 
nm_client_check_connectivity_finish ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_check_connectivity_finish (NMClient *client,
-                                     GAsyncResult *result,
-                                     GError **error);

+                                     GAsyncResult *result,
+                                     GError **error);

 
Retrieves the result of an nm_client_check_connectivity_async()
 call.

 

@@ -1794,12 +1794,12 @@ call.

 
 
 
result

-
the GAsyncResult

+
the GAsyncResult

  
 
 
 
error

-
return location for a GError

+
return location for a GError

  
 
 
@@ -1824,7 +1824,7 @@ the default route. If there is a VPN active with the default route,
 then this function returns the active connection that contains the
 route to the VPN endpoint.

 
If there is no default route, or the default route is over a
-non-NetworkManager-recognized device, this will return NULL.

+non-NetworkManager-recognized device, this will return NULL.

 

 
Parameters

 

@@ -2219,7 +2219,7 @@ Type: GLib.PtrArray

 
The “connectivity” property

-
  “connectivity”             guint

+
  “connectivity”             guint

 
The network connectivity state.

 
Flags: Read

 
Allowed values: <= 4

@@ -2237,7 +2237,7 @@ Type: GLib.PtrArray

 

 

 
The “manager-running” property

-
  “manager-running”          gboolean

+
  “manager-running”          gboolean

 
Whether the daemon is running.

 
Flags: Read

 
Default value: FALSE

@@ -2245,7 +2245,7 @@ Type: GLib.PtrArray

 

 

 
The “networking-enabled” property

-
  “networking-enabled”       gboolean

+
  “networking-enabled”       gboolean

 
Whether networking is enabled.

 
Flags: Read / Write

 
Default value: TRUE

@@ -2262,7 +2262,7 @@ see 
 

 
The “startup” property

-
  “startup”                  gboolean

+
  “startup”                  gboolean

 
Whether the daemon is still starting up.

 
Flags: Read

 
Default value: FALSE

@@ -2271,7 +2271,7 @@ see 
 

 
The “state” property

-
  “state”                    guint

+
  “state”                    guint

 
The current daemon state.

 
Flags: Read

 
Allowed values: <= 70

@@ -2280,7 +2280,7 @@ see 
 

 
The “version” property

-
  “version”                  gchar *

+
  “version”                  gchar *

 
The NetworkManager version.

 
Flags: Read

 
Default value: NULL

@@ -2288,7 +2288,7 @@ see 
 

 
The “wimax-enabled” property

-
  “wimax-enabled”            gboolean

+
  “wimax-enabled”            gboolean

 
Whether WiMAX functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

@@ -2296,7 +2296,7 @@ see 
 

 
The “wimax-hardware-enabled” property

-
  “wimax-hardware-enabled”   gboolean

+
  “wimax-hardware-enabled”   gboolean

 
Whether the WiMAX hardware is enabled.

 
Flags: Read

 
Default value: FALSE

@@ -2304,7 +2304,7 @@ see 
 

 
The “wireless-enabled” property

-
  “wireless-enabled”         gboolean

+
  “wireless-enabled”         gboolean

 
Whether wireless is enabled.

 
Flags: Read / Write

 
Default value: FALSE

@@ -2312,7 +2312,7 @@ see 
 

 
The “wireless-hardware-enabled” property

-
  “wireless-hardware-enabled” gboolean

+
  “wireless-hardware-enabled” gboolean

 
Whether the wireless hardware is enabled.

 
Flags: Read

 
Default value: TRUE

@@ -2320,7 +2320,7 @@ see 
 

 
The “wwan-enabled” property

-
  “wwan-enabled”             gboolean

+
  “wwan-enabled”             gboolean

 
Whether WWAN functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

@@ -2328,7 +2328,7 @@ see 
 

 
The “wwan-hardware-enabled” property

-
  “wwan-hardware-enabled”    gboolean

+
  “wwan-hardware-enabled”    gboolean

 
Whether the WWAN hardware is enabled.

 
Flags: Read

 
Default value: FALSE

@@ -2340,8 +2340,8 @@ see 
The “any-device-added” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)
 
Notifies that a NMDevice is added.  This signal is emitted for both
 regular devices and placeholder devices.

 

@@ -2371,15 +2371,15 @@ regular devices and placeholder devices.

 
 

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “any-device-removed” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)

 
Notifies that a NMDevice is removed.  This signal is emitted for both
 regular devices and placeholder devices.

 

@@ -2409,15 +2409,15 @@ regular devices and placeholder devices.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “device-added” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)
 
Notifies that a NMDevice is added.  This signal is not emitted for
 placeholder devices.

 

@@ -2447,15 +2447,15 @@ placeholder devices.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “device-removed” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)
 
Notifies that a NMDevice is removed.  This signal is not emitted for
 placeholder devices.

 

@@ -2485,16 +2485,16 @@ placeholder devices.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “permission-changed” signal

 
void
 user_function (NMClient *client,
-               guint     permission,
-               guint     result,
-               gpointer  user_data)

+               guint     permission,
+               guint     result,
+               gpointer  user_data)
 
Notifies that a permission has changed

 

 
Parameters

@@ -2528,7 +2528,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html
index 2a068f95..87c74fef 100644
--- a/docs/libnm-glib/html/NMDHCP4Config.html
+++ b/docs/libnm-glib/html/NMDHCP4Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_dhcp4_config_new ()
@@ -51,7 +51,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_dhcp4_config_get_options ()
@@ -77,7 +77,7 @@
 
 
 
-GHashTable *
+GHashTable *
 options
 Read
 
@@ -98,7 +98,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDHCP4Config
 

@@ -110,7 +110,7 @@
 
Functions

 

 
nm_dhcp4_config_new ()

-
GObject *
+
GObject *
 nm_dhcp4_config_new (DBusGConnection *connection,
                      const char *object_path);

 
Creates a new NMDHCP4Config.

@@ -145,7 +145,7 @@ nm_dhcp4_config_new (
 
nm_dhcp4_config_get_options ()

-
GHashTable *
+
GHashTable *
 nm_dhcp4_config_get_options (NMDHCP4Config *config);

 
Gets all the options contained in the configuration.

 

@@ -165,7 +165,7 @@ nm_dhcp4_config_get_options (
 
Returns

-
 the GHashTable containing strings for keys and values.
+
 the GHashTable containing strings for keys and values.
 This is the internal copy used by the configuration, and must not be modified. 

 
[transfer none][element-type utf8 GObject.Value]

 

@@ -218,8 +218,8 @@ configuration, and must not be modified.

 
Property Details

 

 
The “options” property

-
  “options”                  GHashTable *

-
The GHashTable containing options of the configuration.

+
  “options”                  GHashTable *

+
The GHashTable containing options of the configuration.

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

 
Flags: Read

 

diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html
index 8eaf5610..7b322c5e 100644
--- a/docs/libnm-glib/html/NMDHCP6Config.html
+++ b/docs/libnm-glib/html/NMDHCP6Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_dhcp6_config_new ()
@@ -51,7 +51,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_dhcp6_config_get_options ()
@@ -77,7 +77,7 @@
 
 
 
-GHashTable *
+GHashTable *
 options
 Read
 
@@ -98,7 +98,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDHCP6Config
 

@@ -110,7 +110,7 @@
 
Functions

 

 
nm_dhcp6_config_new ()

-
GObject *
+
GObject *
 nm_dhcp6_config_new (DBusGConnection *connection,
                      const char *object_path);

 
Creates a new NMDHCP6Config.

@@ -145,7 +145,7 @@ nm_dhcp6_config_new (
 
nm_dhcp6_config_get_options ()

-
GHashTable *
+
GHashTable *
 nm_dhcp6_config_get_options (NMDHCP6Config *config);

 
Gets all the options contained in the configuration.

 

@@ -165,7 +165,7 @@ nm_dhcp6_config_get_options (
 
Returns

-
 the GHashTable containing strings for keys and values.
+
 the GHashTable containing strings for keys and values.
 This is the internal copy used by the configuration, and must not be modified. 

 
[transfer none][element-type utf8 GObject.Value]

 

@@ -218,8 +218,8 @@ configuration, and must not be modified.

 
Property Details

 

 
The “options” property

-
  “options”                  GHashTable *

-
The GHashTable containing options of the configuration.

+
  “options”                  GHashTable *

+
The GHashTable containing options of the configuration.

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

 
Flags: Read

 

diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 8996affa..7506b557 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_new ()
@@ -74,7 +74,7 @@
 
 
 
-NMDeviceType
+NMDeviceType
 
 
 nm_device_get_device_type ()
@@ -124,7 +124,7 @@
 
 
 
-NMDeviceCapabilities
+NMDeviceCapabilities
 
 
 nm_device_get_capabilities ()
@@ -132,7 +132,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_managed ()
@@ -148,7 +148,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_autoconnect ()
@@ -164,7 +164,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_firmware_missing ()
@@ -204,7 +204,7 @@
 
 
 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state ()
@@ -212,7 +212,7 @@
 
 
 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state_reason ()
@@ -227,7 +227,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_get_available_connections ()
@@ -242,7 +242,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_get_mtu ()
@@ -250,7 +250,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_is_software ()
@@ -258,7 +258,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_is_real ()
@@ -319,7 +319,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_device_filter_connections ()
@@ -327,7 +327,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_connection_valid ()
@@ -335,7 +335,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_connection_compatible ()
@@ -343,7 +343,7 @@
 
 
 
-GType
+GType
 
 
 nm_device_get_setting_type ()
@@ -376,7 +376,7 @@
 Read
 
 
-gboolean
+gboolean
 autoconnect
 Read / Write
 
@@ -387,12 +387,12 @@
 Read
 
 
-guint
+guint
 capabilities
 Read
 
 
-guint
+guint
 device-type
 Read
 
@@ -410,36 +410,36 @@
 
 
 
-gchar *
+gchar *
 driver
 Read
 
 
 
-gchar *
+gchar *
 driver-version
 Read
 
 
-gboolean
+gboolean
 firmware-missing
 Read
 
 
 
-gchar *
+gchar *
 firmware-version
 Read
 
 
 
-gchar *
+gchar *
 interface
 Read
 
 
 
-gchar *
+gchar *
 ip-interface
 Read
 
@@ -456,34 +456,34 @@
 Read
 
 
-gboolean
+gboolean
 managed
 Read
 
 
-guint
+guint
 mtu
 Read
 
 
 
-gchar *
+gchar *
 physical-port-id
 Read
 
 
 
-gchar *
+gchar *
 product
 Read
 
 
-gboolean
+gboolean
 real
 Read
 
 
-guint
+guint
 state
 Read
 
@@ -494,13 +494,13 @@
 
 
 
-gchar *
+gchar *
 udi
 Read
 
 
 
-gchar *
+gchar *
 vendor
 Read
 
@@ -518,7 +518,7 @@
 
 void
 state-changed
-Run First
+Run First
 
 

 

@@ -639,7 +639,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ├── NMDeviceEthernet
@@ -664,7 +664,7 @@
 
Functions

 

 
nm_device_error_quark ()

-
GQuark
+
GQuark
 nm_device_error_quark (void);

 
Registers an error quark for NMDevice if necessary.

 

@@ -676,7 +676,7 @@ nm_device_error_quark (void
 

 
nm_device_new ()

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

 
Creates a new NMDevice.

@@ -766,7 +766,7 @@ used by the device, and must not be modified.

 

 

 
nm_device_get_device_type ()

-
NMDeviceType
+
NMDeviceType
 nm_device_get_device_type (NMDevice *device);

 
Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.

 

@@ -952,7 +952,7 @@ nm_device_get_hw_address (
 
Returns

-
 the current MAC of the device, or NULL.
+
 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

@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.

 

 

 
nm_device_get_capabilities ()

-
NMDeviceCapabilities
+
NMDeviceCapabilities
 nm_device_get_capabilities (NMDevice *device);

 
Gets the device' capabilities.

 

@@ -986,7 +986,7 @@ nm_device_get_capabilities (
 
nm_device_get_managed ()

-
gboolean
+
gboolean
 nm_device_get_managed (NMDevice *device);

 
Whether the NMDevice is managed by NetworkManager.

 

@@ -1006,7 +1006,7 @@ nm_device_get_managed (
 
Returns

-
 TRUE if the device is managed by NetworkManager

+
 TRUE if the device is managed by NetworkManager

 

 

 

@@ -1014,7 +1014,7 @@ nm_device_get_managed (
nm_device_set_managed ()

 
void
 nm_device_set_managed (NMDevice *device,
-                       gboolean managed);

+                       gboolean managed);

 
Enables or disables management of  NMDevice by NetworkManager.

 

 
Parameters

@@ -1032,7 +1032,7 @@ nm_device_set_managed (
managed

-
TRUE to make the device managed by NetworkManager.

+
TRUE to make the device managed by NetworkManager.

  
 
 
@@ -1043,7 +1043,7 @@ nm_device_set_managed (
 
nm_device_get_autoconnect ()

-
gboolean
+
gboolean
 nm_device_get_autoconnect (NMDevice *device);

 
Whether the NMDevice can be autoconnected.

 

@@ -1063,7 +1063,7 @@ nm_device_get_autoconnect (
 
Returns

-
 TRUE if the device is allowed to be autoconnected

+
 TRUE if the device is allowed to be autoconnected

 

 

 

@@ -1071,7 +1071,7 @@ nm_device_get_autoconnect (
nm_device_set_autoconnect ()

 
void
 nm_device_set_autoconnect (NMDevice *device,
-                           gboolean autoconnect);

+                           gboolean autoconnect);

 
Enables or disables automatic activation of the NMDevice.

 

 
Parameters

@@ -1089,7 +1089,7 @@ nm_device_set_autoconnect (
autoconnect

-
TRUE to enable autoconnecting

+
TRUE to enable autoconnecting

  
 
 
@@ -1099,7 +1099,7 @@ nm_device_set_autoconnect (
 
nm_device_get_firmware_missing ()

-
gboolean
+
gboolean
 nm_device_get_firmware_missing (NMDevice *device);

 
Indicates that firmware required for the device's operation is likely
 to be missing.

@@ -1120,7 +1120,7 @@ to be missing.

 

 

 
Returns

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

 

 

@@ -1150,7 +1150,7 @@ connections.

 

 

 
Returns

-
 the NMIP4Config or NULL if the device is not activated. 

+
 the NMIP4Config or NULL if the device is not activated. 

 
[transfer none]

 

 

@@ -1180,7 +1180,7 @@ connections.

 

 

 
Returns

-
 the NMDHCP4Config or NULL if the device is not activated or not
+
 the NMDHCP4Config or NULL if the device is not activated or not
 using DHCP. 

 
[transfer none]

 

@@ -1211,7 +1211,7 @@ connections.

 

 

 
Returns

-
 the NMIP6Config or NULL if the device is not activated. 

+
 the NMIP6Config or NULL if the device is not activated. 

 
[transfer none]

 

 

@@ -1241,7 +1241,7 @@ connections.

 

 

 
Returns

-
 the NMDHCP6Config or NULL if the device is not activated or not
+
 the NMDHCP6Config or NULL if the device is not activated or not
 using DHCP. 

 
[transfer none]

 

@@ -1249,7 +1249,7 @@ using DHCP. 

 

 

 
nm_device_get_state ()

-
NMDeviceState
+
NMDeviceState
 nm_device_get_state (NMDevice *device);

 
Gets the current NMDevice state.

 

@@ -1275,9 +1275,9 @@ nm_device_get_state (
 
nm_device_get_state_reason ()

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

+                            NMDeviceStateReason *reason);

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

@@ -1297,7 +1297,7 @@ the state (reason
 
 
 
reason

-
 location to store reason (NMDeviceStateReason), or NULL. 

+
 location to store reason (NMDeviceStateReason), or NULL. 

 [out][allow-none]
 
 
@@ -1331,7 +1331,7 @@ nm_device_get_active_connection (
 

 
Returns

-
 the NMActiveConnection or NULL if the device is
+
 the NMActiveConnection or NULL if the device is
 not part of an active connection. 

 
[transfer none]

 

@@ -1339,7 +1339,7 @@ not part of an active connection. 

 

 

 
nm_device_get_available_connections ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_get_available_connections (NMDevice *device);

 
Gets the NMRemoteConnections currently known to the daemon that could
 be activated on device
@@ -1361,7 +1361,7 @@ be activated on device
 

 

 
Returns

-
 the GPtrArray
+
 the GPtrArray
 containing NMRemoteConnections. This is the internal copy used by
 the connection, and must not be modified. 

 
[element-type NMRemoteConnection]

@@ -1373,7 +1373,7 @@ the connection, and must not be modified. 

 
nm_device_get_physical_port_id ()

 
const char *
 nm_device_get_physical_port_id (NMDevice *device);

-
Gets the physical port ID of the NMDevice. If non-NULL, this is
+
Gets the physical port ID of the NMDevice. If non-NULL, this is
 an opaque string that can be used to recognize when
 seemingly-unrelated NMDevices are actually just different virtual
 ports on a single physical port. (Eg, NPAR / SR-IOV.)

@@ -1394,7 +1394,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)

 

 

 
Returns

-
 the physical port ID of the device, or NULL if the port
+
 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.

 

@@ -1403,7 +1403,7 @@ must not be modified.

 

 

 
nm_device_get_mtu ()

-
guint32
+
guint32
 nm_device_get_mtu (NMDevice *device);

 
Gets the  MTU of the NMDevice.

 

@@ -1430,7 +1430,7 @@ nm_device_get_mtu (
 
nm_device_is_software ()

-
gboolean
+
gboolean
 nm_device_is_software (NMDevice *device);

 
Whether the device is a software device.

 

@@ -1450,15 +1450,15 @@ nm_device_is_software (
 
Returns

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

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

 

 
Since: 1.0

 

 

 

 
nm_device_is_real ()

-
gboolean
+
gboolean
 nm_device_is_real (NMDevice *device);

 

 
Parameters

@@ -1477,7 +1477,7 @@ nm_device_is_real (
 
Returns

-
 TRUE if the device exists, or FALSE if it is a placeholder device
+
 TRUE if the device exists, or FALSE if it is a placeholder device
 that could be automatically created by NetworkManager if one of its
 “available-connections” was activated.

 

@@ -1611,8 +1611,8 @@ devices in devices
 
NMDeviceCallbackFn ()

 
void
 (*NMDeviceCallbackFn) (NMDevice *device,
-                       GError *error,
-                       gpointer user_data);

+                       GError *error,
+                       gpointer user_data);

 

 

 

@@ -1620,7 +1620,7 @@ devices in devices
 
void
 nm_device_disconnect (NMDevice *device,
                       NMDeviceCallbackFn callback,
-                      gpointer user_data);

+                      gpointer user_data);

 
Disconnects the device if currently connected, and prevents the device from
 automatically connecting to networks until the next manual network connection
 request.

@@ -1660,7 +1660,7 @@ operation completes. 

 
void
 nm_device_delete (NMDevice *device,
                   NMDeviceCallbackFn callback,
-                  gpointer user_data);

+                  gpointer user_data);

 
Deletes the software device. Hardware devices can't be deleted.

 

 
Parameters

@@ -1696,9 +1696,9 @@ operation completes. 

 

 

 
nm_device_filter_connections ()

-
GSList *
+
GSList *
 nm_device_filter_connections (NMDevice *device,
-                              const GSList *connections);

+                              const GSList *connections);

 
Filters a given list of connections for a given NMDevice object and return
 connections which may be activated with the device. For example if device
 
@@ -1725,7 +1725,7 @@ incompatible with the device. To get the full list of connections see
 
 
 
connections

-
 a list of NMConnection objects to filter. 

+
 a list of NMConnection objects to filter. 

 [element-type NMConnection]
 
 
@@ -1734,20 +1734,20 @@ incompatible with the device. To get the full list of connections see
 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given device
+list of NMConnection objects that could be activated with the given device
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. 

+be freed with g_slist_free() when it is no longer required. 

 
[transfer container][element-type NMConnection]

 

 

 

 

 
nm_device_connection_valid ()

-
gboolean
+
gboolean
 nm_device_connection_valid (NMDevice *device,
-                            NMConnection *connection);

+                            NMConnection *connection);

 
Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -1773,7 +1773,7 @@ against

 
 
 
connection

-
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 
@@ -1782,17 +1782,17 @@ against

 

 

 
Returns

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

 

 

 

 

 
nm_device_connection_compatible ()

-
gboolean
+
gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
-                                 GError **error);

+                                 NMConnection *connection,
+                                 GError **error);

 
Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -1821,13 +1821,13 @@ against

 
 
 
connection

-
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 
 
 
error

-
return location for a GError, or NULL

+
return location for a GError, or NULL

  
 
 
@@ -1835,16 +1835,16 @@ against

 

 

 
Returns

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

 

 

 

 

 
nm_device_get_setting_type ()

-
GType
+
GType
 nm_device_get_setting_type (NMDevice *device);

-
Gets the (primary) NMSetting subtype associated with connections
+
Gets the (primary) NMSetting subtype associated with connections
 that can be used on device
 .

 

@@ -1865,7 +1865,7 @@ that can be used on device
 

 
Returns

 
 device
-'s associated NMSetting type

+'s associated NMSetting type

 

 
Since: 0.9.10

 

@@ -1874,8 +1874,8 @@ that can be used on device
 
NMDeviceDeactivateFn ()

 
void
 (*NMDeviceDeactivateFn) (NMDevice *device,
-                         GError *error,
-                         gpointer user_data);

+                         GError *error,
+                         gpointer user_data);

 
NMDeviceDeactivateFn is deprecated and should not be used in newly-written code.

 

 

@@ -2073,7 +2073,7 @@ that can be used on device
 

 

 
The “autoconnect” property

-
  “autoconnect”              gboolean

+
  “autoconnect”              gboolean

 
Whether the device can auto-activate a connection.

 
Flags: Read / Write

 
Default value: TRUE

@@ -2089,7 +2089,7 @@ that can be used on device
 

 

 
The “capabilities” property

-
  “capabilities”             guint

+
  “capabilities”             guint

 
The capabilities of the device.

 
Flags: Read

 
Default value: 0

@@ -2097,7 +2097,7 @@ that can be used on device
 

 

 
The “device-type” property

-
  “device-type”              guint

+
  “device-type”              guint

 
The numeric type of the device.

 
Flags: Read

 
Default value: 0

@@ -2119,7 +2119,7 @@ that can be used on device
 

 

 
The “driver” property

-
  “driver”                   gchar *

+
  “driver”                   gchar *

 
The driver of the device.

 
Flags: Read

 
Default value: NULL

@@ -2127,7 +2127,7 @@ that can be used on device
 

 

 
The “driver-version” property

-
  “driver-version”           gchar *

+
  “driver-version”           gchar *

 
The version of the device driver.

 
Flags: Read

 
Default value: NULL

@@ -2135,8 +2135,8 @@ that can be used on device
 

 

 
The “firmware-missing” property

-
  “firmware-missing”         gboolean

-
When TRUE indicates the device is likely missing firmware required
+
  “firmware-missing”         gboolean

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

 
Flags: Read

 
Default value: FALSE

@@ -2144,7 +2144,7 @@ for its operation.

 

 

 
The “firmware-version” property

-
  “firmware-version”         gchar *

+
  “firmware-version”         gchar *

 
The firmware version of the device.

 
Flags: Read

 
Default value: NULL

@@ -2152,7 +2152,7 @@ for its operation.

 

 

 
The “interface” property

-
  “interface”                gchar *

+
  “interface”                gchar *

 
The interface of the device.

 
Flags: Read

 
Default value: NULL

@@ -2160,7 +2160,7 @@ for its operation.

 

 

 
The “ip-interface” property

-
  “ip-interface”             gchar *

+
  “ip-interface”             gchar *

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

 
Flags: Read

@@ -2183,7 +2183,7 @@ operations like addressing and routing.

 

 

 
The “managed” property

-
  “managed”                  gboolean

+
  “managed”                  gboolean

 
Whether the device is managed by NetworkManager.

 
Flags: Read

 
Default value: FALSE

@@ -2191,7 +2191,7 @@ operations like addressing and routing.

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “mtu”                      guint

 
The MTU of the device.

 
Flags: Read

 
Default value: 1500

@@ -2200,7 +2200,7 @@ operations like addressing and routing.

 

 

 
The “physical-port-id” property

-
  “physical-port-id”         gchar *

+
  “physical-port-id”         gchar *

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

 
Flags: Read

@@ -2210,7 +2210,7 @@ operations like addressing and routing.

 

 

 
The “product” property

-
  “product”                  gchar *

+
  “product”                  gchar *

 
The product string of the device.

 
Flags: Read

 
Default value: NULL

@@ -2218,7 +2218,7 @@ operations like addressing and routing.

 

 

 
The “real” property

-
  “real”                     gboolean

+
  “real”                     gboolean

 
Whether the device is real or is a placeholder device that could
 be created automatically by NetworkManager if one of its
 “available-connections” was activated.

@@ -2229,7 +2229,7 @@ be created automatically by NetworkManager if one of its
 

 

 
The “state” property

-
  “state”                    guint

+
  “state”                    guint

 
The state of the device.

 
Flags: Read

 
Default value: 0

@@ -2244,7 +2244,7 @@ be created automatically by NetworkManager if one of its
 

 

 
The “udi” property

-
  “udi”                      gchar *

+
  “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)
@@ -2257,7 +2257,7 @@ request more information about the device from those services.

 

 

 
The “vendor” property

-
  “vendor”                   gchar *

+
  “vendor”                   gchar *

 
The vendor string of the device.

 
Flags: Read

 
Default value: NULL

@@ -2269,10 +2269,10 @@ request more information about the device from those services.

 
The “state-changed” signal

 
void
 user_function (NMDevice *device,
-               guint     new_state,
-               guint     old_state,
-               guint     reason,
-               gpointer  user_data)

+               guint     new_state,
+               guint     old_state,
+               guint     reason,
+               gpointer  user_data)
 
Notifies the state change of a NMDevice.

 

 
Parameters

@@ -2311,7 +2311,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html
index 3b3b0563..3f108475 100644
--- a/docs/libnm-glib/html/NMDeviceAdsl.html
+++ b/docs/libnm-glib/html/NMDeviceAdsl.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_adsl_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_adsl_new ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_adsl_get_carrier ()
@@ -77,7 +77,7 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
@@ -108,7 +108,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceAdsl
@@ -121,7 +121,7 @@
 
Functions

 

 
nm_device_adsl_error_quark ()

-
GQuark
+
GQuark
 nm_device_adsl_error_quark (void);

 
Registers an error quark for NMDeviceAdsl if necessary.

 

@@ -132,7 +132,7 @@ nm_device_adsl_error_quark (void<
 

 

 
nm_device_adsl_new ()

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

 
Creates a new NMDeviceAdsl.

@@ -167,7 +167,7 @@ nm_device_adsl_new (
 
nm_device_adsl_get_carrier ()

-
gboolean
+
gboolean
 nm_device_adsl_get_carrier (NMDeviceAdsl *device);

 
Whether the device has carrier.

 

@@ -187,7 +187,7 @@ nm_device_adsl_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -246,7 +246,7 @@ nm_device_adsl_get_carrier (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html
index 691f2294..7659084c 100644
--- a/docs/libnm-glib/html/NMDeviceBond.html
+++ b/docs/libnm-glib/html/NMDeviceBond.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_bond_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_bond_new ()
@@ -66,14 +66,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bond_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bond_get_slaves ()
@@ -92,13 +92,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -144,7 +144,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBond
@@ -157,7 +157,7 @@
 
Functions

 

 
nm_device_bond_error_quark ()

-
GQuark
+
GQuark
 nm_device_bond_error_quark (void);

 
Registers an error quark for NMDeviceBond if necessary.

 

@@ -168,7 +168,7 @@ nm_device_bond_error_quark (void<
 

 

 
nm_device_bond_new ()

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

 
Creates a new NMDeviceBond.

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

 

 

 
nm_device_bond_get_carrier ()

-
gboolean
+
gboolean
 nm_device_bond_get_carrier (NMDeviceBond *device);

 
Whether the device has carrier.

 

@@ -250,13 +250,13 @@ nm_device_bond_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

 

 
nm_device_bond_get_slaves ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_bond_get_slaves (NMDeviceBond *device);

 
Gets the devices currently slaved to device
 .

@@ -277,7 +277,7 @@ nm_device_bond_get_slaves (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 

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

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html
index fc7bc0e8..f0af6d6a 100644
--- a/docs/libnm-glib/html/NMDeviceBridge.html
+++ b/docs/libnm-glib/html/NMDeviceBridge.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_bridge_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_bridge_new ()
@@ -66,14 +66,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bridge_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bridge_get_slaves ()
@@ -92,13 +92,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -144,7 +144,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBridge
@@ -157,7 +157,7 @@
 
Functions

 

 
nm_device_bridge_error_quark ()

-
GQuark
+
GQuark
 nm_device_bridge_error_quark (void);

 
Registers an error quark for NMDeviceBridge if necessary.

 

@@ -169,7 +169,7 @@ nm_device_bridge_error_quark (voi
 

 

 
nm_device_bridge_new ()

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

 
Creates a new NMDeviceBridge.

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

 

 

 
nm_device_bridge_get_carrier ()

-
gboolean
+
gboolean
 nm_device_bridge_get_carrier (NMDeviceBridge *device);

 
Whether the device has carrier.

 

@@ -253,14 +253,14 @@ nm_device_bridge_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 
Since: 0.9.8

 

 

 

 
nm_device_bridge_get_slaves ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_bridge_get_slaves (NMDeviceBridge *device);

 
Gets the devices currently slaved to device
 .

@@ -281,7 +281,7 @@ nm_device_bridge_get_slaves (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 

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

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 76305ea9..8a0df6b0 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_bt_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_bt_new ()
@@ -73,7 +73,7 @@
 
 
 
-NMBluetoothCapabilities
+NMBluetoothCapabilities
 
 
 nm_device_bt_get_capabilities ()
@@ -92,19 +92,19 @@
 
 
 
-guint
+guint
 bt-capabilities
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 name
 Read
 
@@ -144,7 +144,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBt
@@ -157,7 +157,7 @@
 
Functions

 

 
nm_device_bt_error_quark ()

-
GQuark
+
GQuark
 nm_device_bt_error_quark (void);

 
Registers an error quark for NMDeviceBt if necessary.

 

@@ -168,7 +168,7 @@ nm_device_bt_error_quark (void
 

 
nm_device_bt_new ()

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

 
Creates a new NMDeviceBt.

@@ -256,7 +256,7 @@ nm_device_bt_get_name (
 
nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities
+
NMBluetoothCapabilities
 nm_device_bt_get_capabilities (NMDeviceBt *device);

 
Returns the Bluetooth device's usable capabilities.

 

@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (
 

 
Returns

-
 a combination of NMBluetoothCapabilities

+
 a combination of NMBluetoothCapabilities

 

 

 

@@ -368,15 +368,15 @@ nm_device_bt_get_capabilities (
Property Details

 

 
The “bt-capabilities” property

-
  “bt-capabilities”          guint

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

+
  “bt-capabilities”          guint

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

 
Flags: Read

 
Default value: 0

 

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -384,7 +384,7 @@ nm_device_bt_get_capabilities (
 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

 
The name of the bluetooth device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html
index b6904673..655a0441 100644
--- a/docs/libnm-glib/html/NMDeviceEthernet.html
+++ b/docs/libnm-glib/html/NMDeviceEthernet.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_ethernet_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_ethernet_new ()
@@ -73,7 +73,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_ethernet_get_speed ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_ethernet_get_carrier ()
@@ -100,24 +100,24 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
 
-guint
+guint
 speed
 Read
 
@@ -161,7 +161,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceEthernet
@@ -174,7 +174,7 @@
 
Functions

 

 
nm_device_ethernet_error_quark ()

-
GQuark
+
GQuark
 nm_device_ethernet_error_quark (void);

 
Registers an error quark for NMDeviceEthernet if necessary.

 

@@ -185,7 +185,7 @@ nm_device_ethernet_error_quark (v
 

 

 
nm_device_ethernet_new ()

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

 
Creates a new NMDeviceEthernet.

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

 

 

 
nm_device_ethernet_get_speed ()

-
guint32
+
guint32
 nm_device_ethernet_get_speed (NMDeviceEthernet *device);

 
Gets the speed of the NMDeviceEthernet.

 

@@ -301,7 +301,7 @@ nm_device_ethernet_get_speed (
 
nm_device_ethernet_get_carrier ()

-
gboolean
+
gboolean
 nm_device_ethernet_get_carrier (NMDeviceEthernet *device);

 
Whether the device has carrier.

 

@@ -321,7 +321,7 @@ nm_device_ethernet_get_carrier (
 

 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -412,7 +412,7 @@ nm_device_ethernet_get_carrier (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

@@ -420,7 +420,7 @@ nm_device_ethernet_get_carrier (
 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The active hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -428,7 +428,7 @@ nm_device_ethernet_get_carrier (
 

 
The “perm-hw-address” property

-
  “perm-hw-address”          gchar *

+
  “perm-hw-address”          gchar *

 
The permanent hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -436,7 +436,7 @@ nm_device_ethernet_get_carrier (
 

 
The “speed” property

-
  “speed”                    guint

+
  “speed”                    guint

 
The speed of the device.

 
Flags: Read

 
Default value: 0

diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html
index 17b53a16..58b7c9ca 100644
--- a/docs/libnm-glib/html/NMDeviceGeneric.html
+++ b/docs/libnm-glib/html/NMDeviceGeneric.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_generic_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_generic_new ()
@@ -78,13 +78,13 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 type-description
 Read
 
@@ -120,7 +120,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceGeneric
@@ -133,7 +133,7 @@
 
Functions

 

 
nm_device_generic_error_quark ()

-
GQuark
+
GQuark
 nm_device_generic_error_quark (void);

 
Registers an error quark for NMDeviceGeneric if necessary.

 

@@ -145,7 +145,7 @@ nm_device_generic_error_quark (vo
 

 

 
nm_device_generic_new ()

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

 
Creates a new NMDeviceGeneric.

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

 
Property Details

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware address of the device.

 
Flags: Read

 
Default value: NULL

@@ -276,8 +276,8 @@ 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
+
  “type-description”         gchar *

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

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html
index 8a0289a8..bb9523d5 100644
--- a/docs/libnm-glib/html/NMDeviceInfiniband.html
+++ b/docs/libnm-glib/html/NMDeviceInfiniband.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_infiniband_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_infiniband_new ()
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_infiniband_get_carrier ()
@@ -85,13 +85,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -127,7 +127,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceInfiniband
@@ -140,7 +140,7 @@
 
Functions

 

 
nm_device_infiniband_error_quark ()

-
GQuark
+
GQuark
 nm_device_infiniband_error_quark (void);

 
Registers an error quark for NMDeviceInfiniband if necessary.

 

@@ -151,7 +151,7 @@ nm_device_infiniband_error_quark (
 

 
nm_device_infiniband_new ()

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

 
Creates a new NMDeviceInfiniband.

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

 

 

 
nm_device_infiniband_get_carrier ()

-
gboolean
+
gboolean
 nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);

 
Whether the device has carrier.

 

@@ -233,7 +233,7 @@ nm_device_infiniband_get_carrier (
 

 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -312,7 +312,7 @@ nm_device_infiniband_get_carrier (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

@@ -320,7 +320,7 @@ nm_device_infiniband_get_carrier (
 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index f926017a..15fe2aa1 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_modem_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_modem_capabilities ()
@@ -59,7 +59,7 @@
 
 
 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_current_capabilities ()
@@ -78,12 +78,12 @@
 
 
 
-guint
+guint
 current-capabilities
 Read
 
 
-guint
+guint
 modem-capabilities
 Read
 
@@ -119,7 +119,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceModem
@@ -132,7 +132,7 @@
 
Functions

 

 
nm_device_modem_error_quark ()

-
GQuark
+
GQuark
 nm_device_modem_error_quark (void);

 
Registers an error quark for NMDeviceModem if necessary.

 

@@ -143,7 +143,7 @@ nm_device_modem_error_quark (void
 

 

 
nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities
+
NMDeviceModemCapabilities
 nm_device_modem_get_modem_capabilities
                                (NMDeviceModem *self);

 
Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.

 

 

 
nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities
+
NMDeviceModemCapabilities
 nm_device_modem_get_current_capabilities
                                (NMDeviceModem *self);

 
Returns a bitfield of the generic access technology families the modem
@@ -268,7 +268,7 @@ a firmware reload or other reinitialization

 
Property Details

 

 
The “current-capabilities” property

-
  “current-capabilities”     guint

+
  “current-capabilities”     guint

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

 
Flags: Read

@@ -277,7 +277,7 @@ without a firmware reload or reinitialization.

 

 

 
The “modem-capabilities” property

-
  “modem-capabilities”       guint

+
  “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
diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
index efe8b75d..c48c4e36 100644
--- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_olpc_mesh_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_olpc_mesh_new ()
@@ -74,7 +74,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_olpc_mesh_get_active_channel ()
@@ -93,7 +93,7 @@
 
 
 
-guint
+guint
 active-channel
 Read
 
@@ -105,7 +105,7 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -145,7 +145,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceOlpcMesh
@@ -158,7 +158,7 @@
 
Functions

 

 
nm_device_olpc_mesh_error_quark ()

-
GQuark
+
GQuark
 nm_device_olpc_mesh_error_quark (void);

 
Registers an error quark for NMDeviceOlpcMesh if necessary.

 

@@ -169,7 +169,7 @@ nm_device_olpc_mesh_error_quark (
 

 

 
nm_device_olpc_mesh_new ()

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

 
Creates a new NMDeviceOlpcMesh.

@@ -251,14 +251,14 @@ nm_device_olpc_mesh_get_companion (
 

 
Returns

-
 the companion of the device of NULL. 

+
 the companion of the device of NULL. 

 
[transfer none]

 

 

 

 

 
nm_device_olpc_mesh_get_active_channel ()

-
guint32
+
guint32
 nm_device_olpc_mesh_get_active_channel
                                (NMDeviceOlpcMesh *device);

 
Returns the active channel of the NMDeviceOlpcMesh device.

@@ -350,7 +350,7 @@ nm_device_olpc_mesh_get_active_channel
 
Property Details

 

 
The “active-channel” property

-
  “active-channel”           guint

+
  “active-channel”           guint

 
The device's active channel.

 
Flags: Read

 
Default value: 0

@@ -365,7 +365,7 @@ nm_device_olpc_mesh_get_active_channel
 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html
index 6f8c4fb7..2195f9aa 100644
--- a/docs/libnm-glib/html/NMDeviceTeam.html
+++ b/docs/libnm-glib/html/NMDeviceTeam.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_team_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_team_new ()
@@ -66,14 +66,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_team_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_team_get_slaves ()
@@ -92,13 +92,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -144,7 +144,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceTeam
@@ -157,7 +157,7 @@
 
Functions

 

 
nm_device_team_error_quark ()

-
GQuark
+
GQuark
 nm_device_team_error_quark (void);

 
Registers an error quark for NMDeviceTeam if necessary.

 

@@ -169,7 +169,7 @@ nm_device_team_error_quark (void<
 

 

 
nm_device_team_new ()

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

 
Creates a new NMDeviceTeam.

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

 

 

 
nm_device_team_get_carrier ()

-
gboolean
+
gboolean
 nm_device_team_get_carrier (NMDeviceTeam *device);

 
Whether the device has carrier.

 

@@ -253,14 +253,14 @@ nm_device_team_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 
Since: 0.9.10

 

 

 

 
nm_device_team_get_slaves ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_team_get_slaves (NMDeviceTeam *device);

 
Gets the devices currently enslaved to device
 .

@@ -281,7 +281,7 @@ nm_device_team_get_slaves (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 

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

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html
index 5516481d..51c89f0d 100644
--- a/docs/libnm-glib/html/NMDeviceVlan.html
+++ b/docs/libnm-glib/html/NMDeviceVlan.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_vlan_error_quark ()
@@ -51,7 +51,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_vlan_new ()
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vlan_get_carrier ()
@@ -82,7 +82,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vlan_get_vlan_id ()
@@ -101,13 +101,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -118,7 +118,7 @@
 Read
 
 
-guint
+guint
 vlan-id
 Read
 
@@ -162,7 +162,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceVlan
@@ -175,7 +175,7 @@
 
Functions

 

 
nm_device_vlan_error_quark ()

-
GQuark
+
GQuark
 nm_device_vlan_error_quark (void);

 
Registers an error quark for NMDeviceVlan if necessary.

 

@@ -186,7 +186,7 @@ nm_device_vlan_error_quark (void<
 

 

 
nm_device_vlan_new ()

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

 
Creates a new NMDeviceVlan.

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

 

 

 
nm_device_vlan_get_carrier ()

-
gboolean
+
gboolean
 nm_device_vlan_get_carrier (NMDeviceVlan *device);

 
Whether the device has carrier.

 

@@ -268,7 +268,7 @@ nm_device_vlan_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -301,7 +301,7 @@ nm_device_vlan_get_parent (
 
nm_device_vlan_get_vlan_id ()

-
guint
+
guint
 nm_device_vlan_get_vlan_id (NMDeviceVlan *device);

 

 
Parameters

@@ -418,7 +418,7 @@ nm_device_vlan_get_vlan_id (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -442,7 +442,7 @@ nm_device_vlan_get_vlan_id (
 
The “vlan-id” property

-
  “vlan-id”                  guint

+
  “vlan-id”                  guint

 
The device's VLAN ID.

 
Flags: Read

 
Allowed values: <= 4095

diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index c64a4615..d739d92a 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_wifi_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_wifi_new ()
@@ -74,7 +74,7 @@
 
 
 
-NM80211Mode
+NM80211Mode
 
 
 nm_device_wifi_get_mode ()
@@ -82,7 +82,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_wifi_get_bitrate ()
@@ -90,7 +90,7 @@
 
 
 
-NMDeviceWifiCapabilities
+NMDeviceWifiCapabilities
 
 
 nm_device_wifi_get_capabilities ()
@@ -113,7 +113,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wifi_get_access_points ()
@@ -160,29 +160,29 @@
 Read
 
 
-guint
+guint
 bitrate
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
-guint
+guint
 mode
 Read
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
 
-guint
+guint
 wireless-capabilities
 Read
 
@@ -201,12 +201,12 @@
 
 void
 access-point-added
-Run First
+Run First
 
 
 void
 access-point-removed
-Run First
+Run First
 
 
 

@@ -260,7 +260,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWifi
@@ -273,7 +273,7 @@
 
Functions

 

 
nm_device_wifi_error_quark ()

-
GQuark
+
GQuark
 nm_device_wifi_error_quark (void);

 
Registers an error quark for NMDeviceWifi if necessary.

 

@@ -284,7 +284,7 @@ nm_device_wifi_error_quark (void<
 

 

 
nm_device_wifi_new ()

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

 
Creates a new NMDeviceWifi.

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

 

 

 
nm_device_wifi_get_mode ()

-
NM80211Mode
+
NM80211Mode
 nm_device_wifi_get_mode (NMDeviceWifi *device);

 
Gets the NMDeviceWifi mode.

 

@@ -400,7 +400,7 @@ nm_device_wifi_get_mode (
 
nm_device_wifi_get_bitrate ()

-
guint32
+
guint32
 nm_device_wifi_get_bitrate (NMDeviceWifi *device);

 
Gets the bit rate of the NMDeviceWifi in kbit/s.

 

@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (
 
nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities
+
NMDeviceWifiCapabilities
 nm_device_wifi_get_capabilities (NMDeviceWifi *device);

 
Gets the Wi-Fi capabilities of the NMDeviceWifi.

 

@@ -473,7 +473,7 @@ nm_device_wifi_get_active_access_point
 

 

 
Returns

-
 the access point or NULL if none is active. 

+
 the access point or NULL if none is active. 

 
[transfer none]

 

 

@@ -509,14 +509,14 @@ nm_device_wifi_get_access_point_by_path
 

 

 
Returns

-
 the access point or NULL if none is found. 

+
 the access point or NULL if none is found. 

 
[transfer none]

 

 

 

 

 
nm_device_wifi_get_access_points ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_wifi_get_access_points (NMDeviceWifi *device);

 
Gets all the scanned access points of the NMDeviceWifi.

 

@@ -536,7 +536,7 @@ nm_device_wifi_get_access_points (
 

 
Returns

-
 a GPtrArray containing all the
+
 a GPtrArray containing all the
 scanned NMAccessPoints.
 The returned array is owned by the client and should not be modified. 

 
[element-type NMAccessPoint]

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

 
NMDeviceWifiRequestScanFn ()

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

+                              GError *error,
+                              gpointer user_data);

 

 

 

@@ -556,7 +556,7 @@ The returned array is owned by the client and should not be modified. 

 
void
 nm_device_wifi_request_scan_simple (NMDeviceWifi *device,
                                     NMDeviceWifiRequestScanFn callback,
-                                    gpointer user_data);

+                                    gpointer user_data);

 
Request NM to scan for access points on the NMDeviceWifi. This function only
 instructs NM to perform scanning. Use nm_device_wifi_get_access_points()
 to get available access points.

@@ -726,7 +726,7 @@ required by the connection

 

 

 
The “bitrate” property

-
  “bitrate”                  guint

+
  “bitrate”                  guint

 
The bit rate of the device in kbit/s.

 
Flags: Read

 
Default value: 0

@@ -734,7 +734,7 @@ required by the connection

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -742,7 +742,7 @@ required by the connection

 

 

 
The “mode” property

-
  “mode”                     guint

+
  “mode”                     guint

 
The mode of the device.

 
Flags: Read

 
Allowed values: <= 3

@@ -751,7 +751,7 @@ required by the connection

 

 

 
The “perm-hw-address” property

-
  “perm-hw-address”          gchar *

+
  “perm-hw-address”          gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -759,7 +759,7 @@ required by the connection

 

 

 
The “wireless-capabilities” property

-
  “wireless-capabilities”    guint

+
  “wireless-capabilities”    guint

 
The wireless capabilities of the device.

 
Flags: Read

 
Default value: 0

@@ -771,8 +771,8 @@ required by the connection

 
The “access-point-added” signal

 
void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)

+               GObject      *ap,
+               gpointer      user_data)

 
Notifies that a NMAccessPoint is added to the Wi-Fi device.

 

 
Parameters

@@ -801,15 +801,15 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “access-point-removed” signal

 
void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)

+               GObject      *ap,
+               gpointer      user_data)

 
Notifies that a NMAccessPoint is removed from the Wi-Fi device.

 

 
Parameters

@@ -838,7 +838,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html
index 02f4dd46..93148ed9 100644
--- a/docs/libnm-glib/html/NMDeviceWimax.html
+++ b/docs/libnm-glib/html/NMDeviceWimax.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_wimax_error_quark ()
@@ -52,7 +52,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_device_wimax_new ()
@@ -82,7 +82,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wimax_get_nsps ()
@@ -90,7 +90,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_wimax_get_center_frequency ()
@@ -98,7 +98,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_rssi ()
@@ -106,7 +106,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_cinr ()
@@ -114,7 +114,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_tx_power ()
@@ -147,23 +147,23 @@
 
 
 
-gchar *
+gchar *
 bsid
 Read
 
 
-guint
+guint
 center-frequency
 Read
 
 
-gint
+gint
 cinr
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -174,12 +174,12 @@
 Read
 
 
-gint
+gint
 rssi
 Read
 
 
-gint
+gint
 tx-power
 Read
 
@@ -198,12 +198,12 @@
 
 void
 nsp-added
-Run First
+Run First
 
 
 void
 nsp-removed
-Run First
+Run First
 
 
 

@@ -261,7 +261,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWimax
@@ -274,7 +274,7 @@
 
Functions

 

 
nm_device_wimax_error_quark ()

-
GQuark
+
GQuark
 nm_device_wimax_error_quark (void);

 

 
nm_device_wimax_error_quark has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -289,7 +289,7 @@ nm_device_wimax_error_quark (void
 

 

 
nm_device_wimax_new ()

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

 

@@ -383,7 +383,7 @@ nm_device_wimax_get_active_nsp (
 

 
Returns

-
 the access point or NULL if none is active. 

+
 the access point or NULL if none is active. 

 
[transfer full]

 

 

@@ -422,14 +422,14 @@ nm_device_wimax_get_nsp_by_path (
 

 
Returns

-
 the access point or NULL if none is found. 

+
 the access point or NULL if none is found. 

 
[transfer none]

 

 

 

 

 
nm_device_wimax_get_nsps ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_wimax_get_nsps (NMDeviceWimax *wimax);

 

 
nm_device_wimax_get_nsps has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -453,7 +453,7 @@ nm_device_wimax_get_nsps (
 
Returns

-
 a GPtrArray containing
+
 a GPtrArray containing
 all the scanned NMWimaxNsps.
 The returned array is owned by the client and should not be modified. 

 
[element-type NMWimaxNsp]

@@ -462,7 +462,7 @@ The returned array is owned by the client and should not be modified. 

 

 

 
nm_device_wimax_get_center_frequency ()

-
guint
+
guint
 nm_device_wimax_get_center_frequency (NMDeviceWimax *self);

 

 
nm_device_wimax_get_center_frequency has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -494,7 +494,7 @@ device is not connected.

 

 

 
nm_device_wimax_get_rssi ()

-
gint
+
gint
 nm_device_wimax_get_rssi (NMDeviceWimax *self);

 

 
nm_device_wimax_get_rssi has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -527,7 +527,7 @@ device is not connected.

 

 

 
nm_device_wimax_get_cinr ()

-
gint
+
gint
 nm_device_wimax_get_cinr (NMDeviceWimax *self);

 

 
nm_device_wimax_get_cinr has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -559,7 +559,7 @@ meaning when the device is not connected.

 

 

 
nm_device_wimax_get_tx_power ()

-
gint
+
gint
 nm_device_wimax_get_tx_power (NMDeviceWimax *self);

 

 
nm_device_wimax_get_tx_power has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -615,7 +615,7 @@ nm_device_wimax_get_bsid (
 
Returns

-
 the ID of the serving Base Station, or NULL

+
 the ID of the serving Base Station, or NULL

 

 

 

@@ -741,7 +741,7 @@ nm_device_wimax_get_bsid (
 
The “bsid” property

-
  “bsid”                     gchar *

+
  “bsid”                     gchar *

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

 

@@ -754,7 +754,7 @@ no meaning when the device is not connected.

 

 

 
The “center-frequency” property

-
  “center-frequency”         guint

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

@@ -768,7 +768,7 @@ device is not connected.

 

 

 
The “cinr” property

-
  “cinr”                     gint

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

@@ -782,7 +782,7 @@ meaning when the device is not connected.

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 

 
NMDeviceWimax:hw-address has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -806,7 +806,7 @@ meaning when the device is not connected.

 

 

 
The “rssi” property

-
  “rssi”                     gint

+
  “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
@@ -821,7 +821,7 @@ device is not connected.

 

 

 
The “tx-power” property

-
  “tx-power”                 gint

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

@@ -839,8 +839,8 @@ device is not connected.

 
The “nsp-added” signal

 
void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)

+               GObject       *nsp,
+               gpointer       user_data)

 
Notifies that a NMWimaxNsp is added to the wimax device.

 

 
NMDeviceWimax::nsp-added has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -873,15 +873,15 @@ user_function (<
 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “nsp-removed” signal

 
void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)

+               GObject       *nsp,
+               gpointer       user_data)

 
Notifies that a NMWimaxNsp is removed from the wimax device.

 

 
NMDeviceWimax::nsp-removed has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -914,7 +914,7 @@ user_function (<
 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index bc72a055..b7b318e1 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_ip4_config_new ()
@@ -57,42 +57,42 @@
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip4_config_get_addresses ()
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip4_config_get_routes ()
 
 
 
-const GArray *
+const GArray *
 
 
 nm_ip4_config_get_nameservers ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip4_config_get_domains ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip4_config_get_searches ()
 
 
 
-const GArray *
+const GArray *
 
 
 nm_ip4_config_get_wins_servers ()
@@ -111,7 +111,7 @@
 
 
 
-gpointer
+gpointer
 addresses
 Read
 
@@ -123,7 +123,7 @@
 
 
 
-gchar *
+gchar *
 gateway
 Read
 
@@ -134,7 +134,7 @@
 Read
 
 
-gpointer
+gpointer
 routes
 Read
 
@@ -194,7 +194,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMIP4Config
 

@@ -206,7 +206,7 @@
 
Functions

 

 
nm_ip4_config_new ()

-
GObject *
+
GObject *
 nm_ip4_config_new (DBusGConnection *connection,
                    const char *object_path);

 
Creates a new NMIP4Config.

@@ -268,7 +268,7 @@ nm_ip4_config_get_gateway (
 
nm_ip4_config_get_addresses ()

-
const GSList *
+
const GSList *
 nm_ip4_config_get_addresses (NMIP4Config *config);

 
Gets the IP4 addresses (containing the address, prefix, and gateway).

 

@@ -288,7 +288,7 @@ nm_ip4_config_get_addresses (
 
Returns

-
 the GSList containing NMIP4Addresses.
+
 the GSList containing NMIP4Addresses.
 This is the internal copy used by the configuration and must not be modified. 

 
[element-type NMIP4Address]

 

@@ -296,7 +296,7 @@ This is the internal copy used by the configuration and must not be modified. 
 

 
nm_ip4_config_get_routes ()

-
const GSList *
+
const GSList *
 nm_ip4_config_get_routes (NMIP4Config *config);

 
Gets the routes.

 

@@ -316,8 +316,8 @@ nm_ip4_config_get_routes (
 
Returns

-
 the GSList containing
-NMIP4Routes. This is the internal copy used by the configuration,
+
 the GSList containing
+NMIP4Routes. This is the internal copy used by the configuration,
 and must not be modified. 

 
[element-type NMIP4Route]

 

@@ -325,7 +325,7 @@ and must not be modified. 

 

 

 
nm_ip4_config_get_nameservers ()

-
const GArray *
+
const GArray *
 nm_ip4_config_get_nameservers (NMIP4Config *config);

 
Gets the domain name servers (DNS).

 

@@ -345,7 +345,7 @@ nm_ip4_config_get_nameservers (
 

 
Returns

-
 the GArray containing guint32s.
+
 the GArray containing guint32s.
 This is the internal copy used by the configuration and must not be
 modified. 

 
[element-type guint32]

@@ -354,7 +354,7 @@ modified. 

 

 

 
nm_ip4_config_get_domains ()

-
const GPtrArray *
+
const GPtrArray *
 nm_ip4_config_get_domains (NMIP4Config *config);

 
Gets the domain names.

 

@@ -374,7 +374,7 @@ nm_ip4_config_get_domains (
 
Returns

-
 the GPtrArray containing domains as strings. This is the
+
 the GPtrArray containing domains as strings. This is the
 internal copy used by the configuration, and must not be modified. 

 
[element-type utf8]

 

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

 

 

 
nm_ip4_config_get_searches ()

-
const GPtrArray *
+
const GPtrArray *
 nm_ip4_config_get_searches (NMIP4Config *config);

 
Gets the dns searches.

 

@@ -402,7 +402,7 @@ nm_ip4_config_get_searches (
 
Returns

-
 the GPtrArray containing dns searches as strings. This is the
+
 the GPtrArray containing dns searches as strings. This is the
 internal copy used by the configuration, and must not be modified. 

 
[element-type utf8]

 

@@ -411,7 +411,7 @@ internal copy used by the configuration, and must not be modified. 

 

 

 
nm_ip4_config_get_wins_servers ()

-
const GArray *
+
const GArray *
 nm_ip4_config_get_wins_servers (NMIP4Config *config);

 
Gets the Windows Internet Name Service servers (WINS).

 

@@ -431,7 +431,7 @@ nm_ip4_config_get_wins_servers (
 

 
Returns

-
 the GArray containing guint32s.
+
 the GArray containing guint32s.
 This is the internal copy used by the configuration and must not be
 modified. 

 
[element-type guint32]

@@ -486,21 +486,21 @@ modified. 

 
Property Details

 

 
The “addresses” property

-
  “addresses”                gpointer

-
The GPtrArray containing NMIP4Addresses of the configuration.

+
  “addresses”                gpointer

+
The GPtrArray containing NMIP4Addresses of the configuration.

 
Flags: Read

 

 

 

 
The “domains” property

 
  “domains”                  NMStringArray *

-
The GPtrArray containing domain strings of the configuration.

+
The GPtrArray containing domain strings of the configuration.

 
Flags: Read

 

 

 

 
The “gateway” property

-
  “gateway”                  gchar *

+
  “gateway”                  gchar *

 
The IP4 gateway address of the configuration as string.

 
Flags: Read

 
Default value: NULL

@@ -510,21 +510,21 @@ modified. 

 

 
The “nameservers” property

 
  “nameservers”              NMUintArray *

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

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

 
Flags: Read

 

 

 

 
The “routes” property

-
  “routes”                   gpointer

-
The GPtrArray containing NMSettingIP4Routes of the configuration.

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

+
The GPtrArray containing dns search strings of the configuration.

 
Flags: Read

 
Since: 0.9.10

 

@@ -532,7 +532,7 @@ modified. 

 

 
The “wins-servers” property

 
  “wins-servers”             NMUintArray *

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

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

 
Flags: Read

 

 

diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index aa48b510..ed97f3e5 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_ip6_config_new ()
@@ -57,14 +57,14 @@
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip6_config_get_addresses ()
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip6_config_get_routes ()
@@ -72,7 +72,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_ip6_config_get_num_nameservers ()
@@ -86,21 +86,21 @@
 
 
 
-const GSList *
+const GSList *
 
 
 nm_ip6_config_get_nameservers ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip6_config_get_domains ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_ip6_config_get_searches ()
@@ -132,7 +132,7 @@
 
 
 
-gchar *
+gchar *
 gateway
 Read
 
@@ -194,7 +194,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMIP6Config
 

@@ -206,7 +206,7 @@
 
Functions

 

 
nm_ip6_config_new ()

-
GObject *
+
GObject *
 nm_ip6_config_new (DBusGConnection *connection,
                    const char *object_path);

 
Creates a new NMIP6Config.

@@ -268,7 +268,7 @@ nm_ip6_config_get_gateway (
 
nm_ip6_config_get_addresses ()

-
const GSList *
+
const GSList *
 nm_ip6_config_get_addresses (NMIP6Config *config);

 
Gets the IP6 addresses (containing the address, prefix, and gateway).

 

@@ -288,8 +288,8 @@ nm_ip6_config_get_addresses (
 
Returns

-
 the GSList containing
-NMIP6Addresses. This is the internal copy used by the configuration
+
 the GSList containing
+NMIP6Addresses. This is the internal copy used by the configuration
 and must not be modified. 

 
[element-type NMIP6Address]

 

@@ -297,7 +297,7 @@ and must not be modified. 

 

 

 
nm_ip6_config_get_routes ()

-
const GSList *
+
const GSList *
 nm_ip6_config_get_routes (NMIP6Config *config);

 
Gets the routes.

 

@@ -317,8 +317,8 @@ nm_ip6_config_get_routes (
 
Returns

-
 the GSList containing
-NMIP6Routes. This is the internal copy used by the configuration,
+
 the GSList containing
+NMIP6Routes. This is the internal copy used by the configuration,
 and must not be modified. 

 
[element-type NMIP6Route]

 

@@ -326,7 +326,7 @@ and must not be modified. 

 

 

 
nm_ip6_config_get_num_nameservers ()

-
guint32
+
guint32
 nm_ip6_config_get_num_nameservers (NMIP6Config *config);

 
Gets the number of the domain name servers in the configuration.

 

@@ -355,7 +355,7 @@ nm_ip6_config_get_num_nameservers (
nm_ip6_config_get_nameserver ()

 
const struct in6_addr *
 nm_ip6_config_get_nameserver (NMIP6Config *config,
-                              guint32 idx);

+                              guint32 idx);

 
Gets the domain name server at index idx
  in the configuration.

 

@@ -391,7 +391,7 @@ nm_ip6_config_get_nameserver (
 
nm_ip6_config_get_nameservers ()

-
const GSList *
+
const GSList *
 nm_ip6_config_get_nameservers (NMIP6Config *config);

 
Gets the domain name servers (DNS).

 
[skip]

@@ -412,7 +412,7 @@ nm_ip6_config_get_nameservers (
 

 
Returns

-
 a GSList containing elements of type 'struct in6_addr' which
+
 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.

 

@@ -420,7 +420,7 @@ internal copy used by the configuration and must not be modified.

 

 

 
nm_ip6_config_get_domains ()

-
const GPtrArray *
+
const GPtrArray *
 nm_ip6_config_get_domains (NMIP6Config *config);

 
Gets the domain names.

 

@@ -440,7 +440,7 @@ nm_ip6_config_get_domains (
 
Returns

-
 the GPtrArray containing domains as strings.
+
 the GPtrArray containing domains as strings.
 This is the internal copy used by the configuration, and must not be modified. 

 
[element-type utf8]

 

@@ -448,7 +448,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 

 

 
nm_ip6_config_get_searches ()

-
const GPtrArray *
+
const GPtrArray *
 nm_ip6_config_get_searches (NMIP6Config *config);

 
Gets the dns searches.

 

@@ -468,7 +468,7 @@ nm_ip6_config_get_searches (
 
Returns

-
 the GPtrArray containing dns searches as strings.
+
 the GPtrArray containing dns searches as strings.
 This is the internal copy used by the configuration, and must not be modified. 

 
[element-type utf8]

 

@@ -518,8 +518,8 @@ 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
+
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

 

@@ -527,13 +527,13 @@ This is the internal copy used by the configuration, and must not be modified. <
 

 
The “domains” property

 
  “domains”                  NMStringArray *

-
The GPtrArray containing domain strings of the configuration.

+
The GPtrArray containing domain strings of the configuration.

 
Flags: Read

 

 

 

 
The “gateway” property

-
  “gateway”                  gchar *

+
  “gateway”                  gchar *

 
The IPv6 gateway as string

 
Flags: Read

 
Default value: NULL

@@ -543,7 +543,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 

 
The “nameservers” property

 
  “nameservers”              NMIP6AddressArray *

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

 
Flags: Read

 

@@ -551,8 +551,8 @@ contain the addresses of nameservers of the configuration.

 

 
The “routes” property

 
  “routes”                   NMIP6RouteObjectArray *

-
The GPtrArray containing the IPv6 routes;  use
-nm_utils_ip6_routes_from_gvalue() to return a GSList of
+
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

 

@@ -560,7 +560,7 @@ contain the addresses of nameservers of the configuration.

 

 
The “searches” property

 
  “searches”                 NMStringArray *

-
The GPtrArray containing dns search strings of the configuration.

+
The GPtrArray containing dns search strings of the configuration.

 
Flags: Read

 
Since: 0.9.10

 

diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index fb4c6d24..296e0b0c 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_object_error_quark ()
@@ -85,7 +85,7 @@
 
 
 
-gchar *
+gchar *
 dbus-path
 Read / Write / Construct Only
 
@@ -103,7 +103,7 @@
 
 void
 object-creation-failed
-Run First
+Run First
 
 

 

@@ -136,7 +136,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ├── NMClient
         ├── NMDevice
@@ -156,7 +156,7 @@
 
Functions

 

 
nm_object_error_quark ()

-
GQuark
+
GQuark
 nm_object_error_quark (void);

 
Registers an error quark for NMObject if necessary.

 

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

 

 

 
The “dbus-path” property

-
  “dbus-path”                gchar *

+
  “dbus-path”                gchar *

 
Flags: Read / Write / Construct Only

 
Default value: NULL

 

@@ -291,9 +291,9 @@ device, and must not be modified.

 
The “object-creation-failed” signal

 
void
 user_function (NMObject *master_object,
-               gpointer  error,
-               gpointer  failed_path,
-               gpointer  user_data)

+               gpointer  error,
+               gpointer  failed_path,
+               gpointer  user_data)

 
Indicates that an error occured while creating an NMObject object
 during property handling of master_object
 .

@@ -331,7 +331,7 @@ during property handling of master_object
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index 6f1b753a..c099c3df 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -48,7 +48,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_remote_connection_error_quark ()
@@ -120,7 +120,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_get_unsaved ()
@@ -152,12 +152,12 @@
 
 
 
-gchar *
+gchar *
 dbus-path
 Write / Construct Only
 
 
-gboolean
+gboolean
 unsaved
 Read
 
@@ -176,17 +176,17 @@
 
 void
 removed
-Run First
+Run First
 
 
 void
 updated
-Run First
+Run First
 
 
 void
 visible
-Run First
+Run First
 
 
 

@@ -228,8 +228,8 @@
 

 

 
Object Hierarchy

-
    GObject
-    ╰── NMConnection
+
    GObject
+    ╰── NMConnection
         ╰── NMRemoteConnection
 

 

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

 

 
nm_remote_connection_error_quark ()

-
GQuark
+
GQuark
 nm_remote_connection_error_quark (void);

 
Registers an error quark for NMRemoteConnection if necessary.

 

@@ -259,8 +259,8 @@ nm_remote_connection_error_quark (
NMRemoteConnectionResultFunc ()

 
void
 (*NMRemoteConnectionResultFunc) (NMRemoteConnection *connection,
-                                 GError *error,
-                                 gpointer user_data);

+                                 GError *error,
+                                 gpointer user_data);

 
Called when NetworkManager has finished an asynchronous operation on a
 connection, like commit changes, deleting, saving, etc.

 

@@ -296,9 +296,9 @@ connection, like commit changes, deleting, saving, etc.

 
NMRemoteConnectionGetSecretsFunc ()

 
void
 (*NMRemoteConnectionGetSecretsFunc) (NMRemoteConnection *connection,
-                                     GHashTable *secrets,
-                                     GError *error,
-                                     gpointer user_data);

+                                     GHashTable *secrets,
+                                     GError *error,
+                                     gpointer user_data);

 
Called when NetworkManager returns secrets in response to a request for
 secrets via nm_remote_connection_get_secrets().

 

@@ -318,7 +318,7 @@ secrets via 
secrets

 
 on success, a hash table of
-hash tables, with each inner hash mapping a setting property to a GValue
+hash tables, with each inner hash mapping a setting property to a GValue
 containing that property's value. 

 [element-type utf8 GLib.HashTable]
 
@@ -367,7 +367,7 @@ nm_remote_connection_new (
 
Returns

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

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

 

 

 

@@ -376,7 +376,7 @@ nm_remote_connection_new (void
 nm_remote_connection_commit_changes (NMRemoteConnection *connection,
                                      NMRemoteConnectionResultFunc callback,
-                                     gpointer user_data);

+                                     gpointer user_data);

 
Send any local changes to the settings and properties of this connection to
 NetworkManager, which will immediately save them to disk.

 

@@ -416,7 +416,7 @@ commit completes. 

 nm_remote_connection_commit_changes_unsaved
                                (NMRemoteConnection *connection,
                                 NMRemoteConnectionResultFunc callback,
-                                gpointer user_data);

+                                gpointer user_data);

 
Send any local changes to the settings and properties of this connection to
 NetworkManager.  The changes are not saved to disk until either
 nm_remote_connection_save() or nm_remote_connection_commit_changes() is
@@ -458,7 +458,7 @@ commit completes. 

 
void
 nm_remote_connection_save (NMRemoteConnection *connection,
                            NMRemoteConnectionResultFunc callback,
-                           gpointer user_data);

+                           gpointer user_data);

 
Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.

 

@@ -498,7 +498,7 @@ save completes. 

 
void
 nm_remote_connection_delete (NMRemoteConnection *connection,
                              NMRemoteConnectionResultFunc callback,
-                             gpointer user_data);

+                             gpointer user_data);

 
Delete the connection.

 

 
Parameters

@@ -536,7 +536,7 @@ nm_remote_connection_delete (NMRemoteConnection *connection,
                                   const char *setting_name,
                                   NMRemoteConnectionGetSecretsFunc callback,
-                                  gpointer user_data);

+                                  gpointer user_data);

 
Request the connection's secrets.

 

 
Parameters

@@ -554,13 +554,13 @@ nm_remote_connection_get_secrets (
 
 
setting_name

-
the NMSetting object name to get secrets for

+
the NMSetting object name to get secrets for

  
 
 
 
callback

 
 a function to be called when the update completes;
-must not be NULL. 

+must not be NULL. 

 [scope async]
 
 
@@ -576,7 +576,7 @@ must not be 
 
nm_remote_connection_get_unsaved ()

-
gboolean
+
gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);

 

 
Parameters

@@ -595,8 +595,8 @@ nm_remote_connection_get_unsaved (
 

 
Returns

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

@@ -681,16 +681,16 @@ representation.

 

 

 
The “dbus-path” property

-
  “dbus-path”                gchar *

+
  “dbus-path”                gchar *

 
Flags: Write / Construct Only

 
Default value: NULL

 

 

 

 
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.

+
  “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

@@ -702,7 +702,7 @@ to disk, 
The “removed” signal

 
void
 user_function (NMRemoteConnection *connection,
-               gpointer            user_data)

+               gpointer            user_data)

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

 

@@ -716,7 +716,7 @@ invisible to the current user.

 
 
 
connection

-
a NMConnection

+
a NMConnection

  
 
 
@@ -727,14 +727,14 @@ invisible to the current user.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “updated” signal

 
void
 user_function (NMRemoteConnection *connection,
-               gpointer            user_data)

+               gpointer            user_data)

 
This signal is emitted when a connection changes, and it is
 still visible to the user.

 

@@ -748,7 +748,7 @@ still visible to the user.

 
 
 
connection

-
a NMConnection

+
a NMConnection

  
 
 
@@ -759,16 +759,16 @@ still visible to the user.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “visible” signal

 
void
 user_function (NMRemoteConnection *nmremoteconnection,
-               gboolean            arg1,
-               gpointer            user_data)

-
Flags: Run First

+               gboolean            arg1,
+               gpointer            user_data)

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index 0b79f7ec..10d37ade 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -44,7 +44,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_remote_settings_error_quark ()
@@ -100,7 +100,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_remote_settings_list_connections ()
@@ -132,7 +132,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_add_connection ()
@@ -140,7 +140,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_add_connection_unsaved ()
@@ -148,7 +148,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_load_connections ()
@@ -156,7 +156,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_reload_connections ()
@@ -164,7 +164,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_settings_save_hostname ()
@@ -189,18 +189,18 @@
 Read / Write / Construct Only
 
 
-gboolean
+gboolean
 can-modify
 Read
 
 
 
-gchar *
+gchar *
 hostname
 Read
 
 
-gboolean
+gboolean
 service-running
 Read
 
@@ -219,12 +219,12 @@
 
 void
 connections-read
-Run First
+Run First
 
 
 void
 new-connection
-Run First
+Run First
 
 
 

@@ -274,7 +274,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMRemoteSettings
 

 

@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-NMConnection object.  Once a connection is known to NetworkManager, having
+NMConnection object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 NMRemoteSettings object creates a NMRemoteConnection object which
 represents this stored connection.  Use the NMRemoteConnection object to
 perform any operations like modification or deletion.

 
To add a new network connection to the NetworkManager settings service, first
-build up a template NMConnection object.  Since this connection is not yet
+build up a template NMConnection object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an NMRemoteConnection.  Then ask NMRemoteSettings to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -366,15 +366,15 @@ the stored object known to NetworkManager.

           gpointer user_data)
 {
    if (error)
-       g_print ("Error adding connection: %s", error->message);
+       g_print ("Error adding connection: %s", error->message);
    else {
-       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
+       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
        /* Use 'remote' with nm_remote_connection_commit_changes() to save
         * changes and nm_remote_connection_delete() to delete the connection */
    }
 }
 
-static gboolean
+static gboolean
 add_wired_connection (const char *human_name)
 {
    NMConnection *connection;
@@ -383,35 +383,35 @@ the stored object known to NetworkManager.

    char *uuid;
    gboolean success;
 
-   connection = nm_connection_new ();
+   connection = nm_connection_new ();
 
    /* Build up the 'connection' setting */
-   s_con = (NMSettingConnection *) nm_setting_connection_new ();
-   uuid = nm_utils_uuid_generate ();
-   g_object_set (G_OBJECT (s_con),
-                 NM_SETTING_CONNECTION_UUID, uuid,
-                 NM_SETTING_CONNECTION_ID, human_name,
-                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
-                 NULL);
-   g_free (uuid);
-   nm_connection_add_setting (connection, NM_SETTING (s_con));
+   s_con = (NMSettingConnection *) nm_setting_connection_new ();
+   uuid = nm_utils_uuid_generate ();
+   g_object_set (G_OBJECT (s_con),
+                 NM_SETTING_CONNECTION_UUID, uuid,
+                 NM_SETTING_CONNECTION_ID, human_name,
+                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+                 NULL);
+   g_free (uuid);
+   nm_connection_add_setting (connection, NM_SETTING (s_con));
 
    /* Add the required 'wired' setting as this is a wired connection */
-   nm_connection_add_setting (connection, nm_setting_wired_new ());
+   nm_connection_add_setting (connection, nm_setting_wired_new ());
 
    /* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */
-   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
-   g_object_set (G_OBJECT (s_ip4),
-                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-                 NULL);
-   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+   g_object_set (G_OBJECT (s_ip4),
+                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+                 NULL);
+   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
 
    /* Ask NetworkManager to store the connection */
    success = nm_remote_settings_add_connection (settings, connection, added_cb, loop);
 
    /* Release the template connection; the actual stored connection will
     * be returned in added_cb() */
-   g_object_unref (connection);
+   g_object_unref (connection);
 
    /* Let glib event loop run and added_cb() will be called when NetworkManager
     * is done adding the new connection. */
@@ -429,7 +429,7 @@ the stored object known to NetworkManager.

 
Functions

 

 
nm_remote_settings_error_quark ()

-
GQuark
+
GQuark
 nm_remote_settings_error_quark (void);

 
Registers an error quark for NMRemoteSettings if necessary.

 

@@ -443,8 +443,8 @@ nm_remote_settings_error_quark (v
 
void
 (*NMRemoteSettingsAddConnectionFunc) (NMRemoteSettings *settings,
                                       NMRemoteConnection *connection,
-                                      GError *error,
-                                      gpointer user_data);

+                                      GError *error,
+                                      gpointer user_data);

 

 

 

@@ -453,16 +453,16 @@ nm_remote_settings_error_quark (v
 (*NMRemoteSettingsLoadConnectionsFunc)
                                (NMRemoteSettings *settings,
                                 char **failures,
-                                GError *error,
-                                gpointer user_data);

+                                GError *error,
+                                gpointer user_data);

 

 

 

 
NMRemoteSettingsSaveHostnameFunc ()

 
void
 (*NMRemoteSettingsSaveHostnameFunc) (NMRemoteSettings *settings,
-                                     GError *error,
-                                     gpointer user_data);

+                                     GError *error,
+                                     gpointer user_data);

 

 

 

@@ -490,7 +490,7 @@ want to avoid that.

 

 

 
Returns

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

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

 

 

 

@@ -498,9 +498,9 @@ want to avoid that.

 
nm_remote_settings_new_async ()

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

+                              GCancellable *cancellable,
+                              GAsyncReadyCallback callback,
+                              gpointer user_data);

 
Creates a new object representing the remote settings service and
 begins asynchronously initializing it. callback
  will be called
@@ -522,7 +522,7 @@ result.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -544,8 +544,8 @@ result.

 

 
nm_remote_settings_new_finish ()

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

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

 
Gets the result of an nm_remote_settings_new_async() call.

 

 
Parameters

@@ -558,12 +558,12 @@ nm_remote_settings_new_finish (
result

-
a GAsyncResult

+
a GAsyncResult

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -571,13 +571,13 @@ nm_remote_settings_new_finish (
 
Returns

-
 a new NMRemoteSettings object, or NULL on error

+
 a new NMRemoteSettings object, or NULL on error

 

 

 

 

 
nm_remote_settings_list_connections ()

-
GSList *
+
GSList *
 nm_remote_settings_list_connections (NMRemoteSettings *settings);

 

 
Parameters

@@ -601,7 +601,7 @@ list containing all connections provided by the remote settings service.
 Each element of the returned list is a NMRemoteConnection instance, which is
 owned by the NMRemoteSettings object and should not be freed by the caller.
 The returned list is, however, owned by the caller and should be freed
-using g_slist_free() when no longer required. 

+using g_slist_free() when no longer required. 

 
[transfer container][element-type NMRemoteConnection]

 

 

@@ -638,7 +638,7 @@ nm_remote_settings_get_connection_by_id
 

 

 
Returns

-
 the remote connection object on success, or NULL if no
+
 the remote connection object on success, or NULL if no
 matching object was found. 

 
[transfer none]

 

@@ -677,7 +677,7 @@ nm_remote_settings_get_connection_by_path
 

 

 
Returns

-
 the remote connection object on success, or NULL if the object was
+
 the remote connection object on success, or NULL if the object was
 not known. 

 
[transfer none]

 

@@ -715,7 +715,7 @@ nm_remote_settings_get_connection_by_uuid
 

 

 
Returns

-
 the remote connection object on success, or NULL if the object was
+
 the remote connection object on success, or NULL if the object was
 not known. 

 
[transfer none]

 

@@ -723,11 +723,11 @@ not known. 

 

 

 
nm_remote_settings_add_connection ()

-
gboolean
+
gboolean
 nm_remote_settings_add_connection (NMRemoteSettings *settings,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    NMRemoteSettingsAddConnectionFunc callback,
-                                   gpointer user_data);

+                                   gpointer user_data);

 
Requests that the remote settings service add the given settings to a new
 connection.  The connection is immediately written to disk.  connection
  is
@@ -776,18 +776,18 @@ added, not the object itself

 

 

 
Returns

-
 TRUE if the request was successful, FALSE if it failed

+
 TRUE if the request was successful, FALSE if it failed

 

 

 

 

 
nm_remote_settings_add_connection_unsaved ()

-
gboolean
+
gboolean
 nm_remote_settings_add_connection_unsaved
                                (NMRemoteSettings *settings,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMRemoteSettingsAddConnectionFunc callback,
-                                gpointer user_data);

+                                gpointer user_data);

 
Requests that the remote settings service add the given settings to a new
 connection.  The connection is not written to disk, which may be done at
 a later time by calling the connection's nm_remote_connection_commit_changes()
@@ -828,29 +828,29 @@ added, not the object itself

 

 

 
Returns

-
 TRUE if the request was successful, FALSE if it failed

+
 TRUE if the request was successful, FALSE if it failed

 

 
Since: 0.9.10

 

 

 

 
nm_remote_settings_load_connections ()

-
gboolean
+
gboolean
 nm_remote_settings_load_connections (NMRemoteSettings *settings,
                                      char **filenames,
                                      char ***failures,
-                                     GError **error);

+                                     GError **error);

 
Requests that the remote settings service load or reload the given files,
 adding or updating the connections described within.

 
The changes to the indicated files will not yet be reflected in
 settings
 's connections array when the function returns.

 
If all of the indicated files were successfully loaded, the
-function will return TRUE, and failures
- will be set to NULL. If
+function will return TRUE, and failures
+ will be set to NULL. If
 NetworkManager tried to load the files, but some (or all) failed,
 then failures
- will be set to a NULL-terminated array of the
+ will be set to a NULL-terminated array of the
 filenames that failed to load.

 

 
Parameters

@@ -868,18 +868,18 @@ filenames that failed to load.

 
 
 
filenames

-
NULL-terminated array of filenames to load

+
NULL-terminated array of filenames to load

  
 
 
 
failures

-
 on return, a NULL-terminated array of
+
 on return, a NULL-terminated array of
 filenames that failed to load. 

 [out][transfer full]
 
 
 
error

-
return location for GError

+
return location for GError

  
 
 
@@ -887,18 +887,18 @@ filenames that failed to load. 

 

 

 
Returns

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

+FALSE if an error occurred (eg, permission denied).

 

 
Since: 0.9.10

 

 

 

 
nm_remote_settings_reload_connections ()

-
gboolean
+
gboolean
 nm_remote_settings_reload_connections (NMRemoteSettings *settings,
-                                       GError **error);

+                                       GError **error);

 
Requests that the remote settings service reload all connection
 files from disk, adding, updating, and removing connections until
 the in-memory state matches the on-disk state.

@@ -918,7 +918,7 @@ the in-memory state matches the on-disk state.

 
 
 
error

-
return location for GError

+
return location for GError

  
 
 
@@ -926,18 +926,18 @@ the in-memory state matches the on-disk state.

 

 

 
Returns

-
 TRUE on success, FALSE on failure

+
 TRUE on success, FALSE on failure

 

 
Since: 0.9.10

 

 

 

 
nm_remote_settings_save_hostname ()

-
gboolean
+
gboolean
 nm_remote_settings_save_hostname (NMRemoteSettings *settings,
                                   const char *hostname,
                                   NMRemoteSettingsSaveHostnameFunc callback,
-                                  gpointer user_data);

+                                  gpointer user_data);

 
Requests that the machine's persistent hostname be set to the specified value
 or cleared.

 

@@ -956,7 +956,7 @@ or cleared.

 
 
 
hostname

-
the new persistent hostname to set, or NULL to clear any existing
+
the new persistent hostname to set, or NULL to clear any existing
 persistent hostname

  
 
@@ -977,7 +977,7 @@ hostname operation completes. 

 

 

 
Returns

-
 TRUE if the request was successful, FALSE if it failed

+
 TRUE if the request was successful, FALSE if it failed

 

 

 

@@ -1085,15 +1085,15 @@ to the system bus if not specified.

 

 

 
The “can-modify” property

-
  “can-modify”               gboolean

-
If TRUE, adding and modifying connections is supported.

+
  “can-modify”               gboolean

+
If TRUE, adding and modifying connections is supported.

 
Flags: Read

 
Default value: FALSE

 

 

 

 
The “hostname” property

-
  “hostname”                 gchar *

+
  “hostname”                 gchar *

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

 
Flags: Read

@@ -1102,7 +1102,7 @@ modified by calling 
 
The “service-running” property

-
  “service-running”          gboolean

+
  “service-running”          gboolean

 
Whether the settings service is running.

 
Flags: Read

 
Default value: FALSE

@@ -1114,17 +1114,17 @@ modified by calling 
The “connections-read” signal

 
void
 user_function (NMRemoteSettings *nmremotesettings,
-               gpointer          user_data)

-
Flags: Run First

+               gpointer          user_data)

+
Flags: Run First

 

 

 

 
The “new-connection” signal

 
void
 user_function (NMRemoteSettings *nmremotesettings,
-               GObject          *arg1,
-               gpointer          user_data)

-
Flags: Run First

+               GObject          *arg1,
+               gpointer          user_data)

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 892f28e5..8acd02c1 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -48,7 +48,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_secret_agent_error_quark ()
@@ -80,7 +80,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_secret_agent_register ()
@@ -88,7 +88,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_secret_agent_unregister ()
@@ -96,7 +96,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_secret_agent_get_registered ()
@@ -139,7 +139,7 @@
 
 
 
-gboolean
+gboolean
 auto-register
 Read / Write / Construct
 
@@ -150,12 +150,12 @@
 
 
 
-gchar *
+gchar *
 identifier
 Read / Write / Construct Only
 
 
-gboolean
+gboolean
 registered
 Read
 
@@ -173,7 +173,7 @@
 
 void
 registration-result
-Run First
+Run First
 
 

 

@@ -222,7 +222,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSecretAgent
 

 

@@ -239,7 +239,7 @@
 

 

 
nm_secret_agent_error_quark ()

-
GQuark
+
GQuark
 nm_secret_agent_error_quark (void);

 

 

@@ -247,10 +247,10 @@ nm_secret_agent_error_quark (void
 
NMSecretAgentGetSecretsFunc ()

 
void
 (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
-                                NMConnection *connection,
-                                GHashTable *secrets,
-                                GError *error,
-                                gpointer user_data);

+                                NMConnection *connection,
+                                GHashTable *secrets,
+                                GError *error,
+                                gpointer user_data);

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

 NMSettingWirelessSecurity *s_wsec;
 GHashTable *secrets_hash;
 
-secrets = nm_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-g_object_set (G_OBJECT (s_wsec),
-              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
-nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
+secrets = nm_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+g_object_set (G_OBJECT (s_wsec),
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NULL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
 (call the NMSecretAgentGetSecretsFunc with secrets_hash)
 
-g_object_unref (secrets);
-g_hash_table_unref (secrets_hash);

+g_object_unref (secrets);
+g_hash_table_unref (secrets_hash);

       
     
   
@@ -319,17 +319,17 @@ something like this:

 
connection

 
 the connection for which secrets were requested,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 

 [transfer none]
 
 
 
secrets

-
 the GHashTable containing
-the requested secrets in the same format as an NMConnection hash (as
-created by nm_connection_to_hash() for example).  Each key in secrets
-should be the name of a NMSetting object (like "802-11-wireless-security")
-and each value should be a GHashTable.  The sub-hashes map string:GValue
+
 the GHashTable containing
+the requested secrets in the same format as an NMConnection hash (as
+created by nm_connection_to_hash() for example).  Each key in secrets
+should be the name of a NMSetting object (like "802-11-wireless-security")
+and each value should be a GHashTable.  The sub-hashes map string:GValue
 where the string is the setting property name (like "psk") and the value
 is the secret. 

 [element-type utf8 GLib.HashTable]
@@ -353,9 +353,9 @@ is the secret. 

 
NMSecretAgentSaveSecretsFunc ()

 
void
 (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
-                                 NMConnection *connection,
-                                 GError *error,
-                                 gpointer user_data);

+                                 NMConnection *connection,
+                                 GError *error,
+                                 gpointer user_data);

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

@@ -377,7 +377,7 @@ should be called.

 
connection

 
 the connection for which secrets were to be saved,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 

 [transfer none]
 
@@ -400,9 +400,9 @@ has returned. 

 
NMSecretAgentDeleteSecretsFunc ()

 
void
 (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent,
-                                   NMConnection *connection,
-                                   GError *error,
-                                   gpointer user_data);

+                                   NMConnection *connection,
+                                   GError *error,
+                                   gpointer user_data);

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

@@ -424,7 +424,7 @@ should be called.

 
connection

 
 the connection for which secrets were to be deleted,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 

 [transfer none]
 
@@ -445,7 +445,7 @@ has returned. 

 

 

 
nm_secret_agent_register ()

-
gboolean
+
gboolean
 nm_secret_agent_register (NMSecretAgent *self);

 
Registers the NMSecretAgent with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is able to provide and save
@@ -469,15 +469,15 @@ asynchronous operation and its success or failure is indicated via the
 

 

 
Returns

-
 a new TRUE if registration was successfully requested (this does
-not mean registration itself was successful), FALSE if registration was not
+
 a new TRUE if registration was successfully requested (this does
+not mean registration itself was successful), FALSE if registration was not
 successfully requested.

 

 

 

 

 
nm_secret_agent_unregister ()

-
gboolean
+
gboolean
 nm_secret_agent_unregister (NMSecretAgent *self);

 
Unregisters the NMSecretAgent with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is will no longer provide or
@@ -499,13 +499,13 @@ store secrets on behalf of this user.

 

 

 
Returns

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

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

 

 

 

 

 
nm_secret_agent_get_registered ()

-
gboolean
+
gboolean
 nm_secret_agent_get_registered (NMSecretAgent *self);

 

 
Parameters

@@ -524,7 +524,7 @@ nm_secret_agent_get_registered (
 

 
Returns

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

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

 

 

 

@@ -532,12 +532,12 @@ nm_secret_agent_get_registered (
nm_secret_agent_get_secrets ()

 
void
 nm_secret_agent_get_secrets (NMSecretAgent *self,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              const char *setting_name,
                              const char **hints,
                              NMSecretAgentGetSecretsFlags flags,
                              NMSecretAgentGetSecretsFunc callback,
-                             gpointer user_data);

+                             gpointer user_data);

 
Asyncronously retrieve secrets belonging to connection
  for the
 setting setting_name
@@ -563,7 +563,7 @@ secrets from the user.

 
 
 
connection

-
the NMConnection for which we're asked secrets

+
the NMConnection for which we're asked secrets

  
 
 
@@ -601,9 +601,9 @@ secrets from the user.

 
nm_secret_agent_save_secrets ()

 
void
 nm_secret_agent_save_secrets (NMSecretAgent *self,
-                              NMConnection *connection,
+                              NMConnection *connection,
                               NMSecretAgentSaveSecretsFunc callback,
-                              gpointer user_data);

+                              gpointer user_data);

 
Asyncronously ensure that all secrets inside connection
 
 are stored to disk.

@@ -624,7 +624,7 @@ are stored to disk.

 
 
 
connection

-
a NMConnection

+
a NMConnection

  
 
 
@@ -647,9 +647,9 @@ are stored to disk.

 
nm_secret_agent_delete_secrets ()

 
void
 nm_secret_agent_delete_secrets (NMSecretAgent *self,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMSecretAgentDeleteSecretsFunc callback,
-                                gpointer user_data);

+                                gpointer user_data);

 
Asynchronously ask the agent to delete all saved secrets belonging to
 connection
 .

@@ -670,7 +670,7 @@ nm_secret_agent_delete_secrets (
 
 
connection

-
a NMConnection

+
a NMConnection

  
 
 
@@ -886,7 +886,7 @@ results or carrier changes.

 
Property Details

 

 
The “auto-register” property

-
  “auto-register”            gboolean

+
  “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
@@ -907,7 +907,7 @@ called, which re-enables auto-registration.

 

 

 
The “identifier” property

-
  “identifier”               gchar *

+
  “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
@@ -921,8 +921,8 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 

 

 
The “registered” property

-
  “registered”               gboolean

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

+
  “registered”               gboolean

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

 
Flags: Read

 
Default value: FALSE

 

@@ -933,8 +933,8 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 
The “registration-result” signal

 
void
 user_function (NMSecretAgent *agent,
-               gpointer       error,
-               gpointer       user_data)

+               gpointer       error,
+               gpointer       user_data)

 
Indicates the result of a registration request; if error
  is NULL the
 request was successful.

@@ -965,7 +965,7 @@ request was successful.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index c22c036a..7562a519 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -44,7 +44,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_vpn_connection_new ()
@@ -52,7 +52,7 @@
 
 
 
-NMVPNConnectionState
+NMVPNConnectionState
 
 
 nm_vpn_connection_get_vpn_state ()
@@ -79,12 +79,12 @@
 
 
 
-gchar *
+gchar *
 banner
 Read
 
 
-guint
+guint
 vpn-state
 Read
 
@@ -102,7 +102,7 @@
 
 void
 vpn-state-changed
-Run First
+Run First
 
 

 

@@ -127,7 +127,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVPNConnection
@@ -140,7 +140,7 @@
 
Functions

 

 
nm_vpn_connection_new ()

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

 
Creates a new NMVPNConnection.

@@ -175,7 +175,7 @@ nm_vpn_connection_new (
 
nm_vpn_connection_get_vpn_state ()

-
NMVPNConnectionState
+
NMVPNConnectionState
 nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn);

 
Gets the current NMVPNConnection state.

 

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

 
Property Details

 

 
The “banner” property

-
  “banner”                   gchar *

+
  “banner”                   gchar *

 
The VPN login banner of the active VPN connection.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “vpn-state” property

-
  “vpn-state”                guint

+
  “vpn-state”                guint

 
The VPN state of the active VPN connection.

 
Flags: Read

 
Allowed values: <= 7

@@ -265,10 +265,10 @@ string used by the connection, and must not be modified.

 
The “vpn-state-changed” signal

 
void
 user_function (NMVPNConnection *nmvpnconnection,
-               guint            arg1,
-               guint            arg2,
-               gpointer         user_data)

-
Flags: Run First

+               guint            arg1,
+               guint            arg2,
+               gpointer         user_data)

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 7f7c4d6c..91cdbfee 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -43,7 +43,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_wimax_nsp_new ()
@@ -58,7 +58,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_wimax_nsp_get_signal_quality ()
@@ -74,7 +74,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_wimax_nsp_filter_connections ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_wimax_nsp_connection_valid ()
@@ -102,17 +102,17 @@
 
 
 
-gchar *
+gchar *
 name
 Read
 
 
-guint
+guint
 network-type
 Read
 
 
-guint
+guint
 signal-quality
 Read
 
@@ -148,7 +148,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMWimaxNsp
 

@@ -160,7 +160,7 @@
 
Functions

 

 
nm_wimax_nsp_new ()

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

 
Creates a new NMWimaxNsp.

@@ -221,7 +221,7 @@ nm_wimax_nsp_get_name (
 
nm_wimax_nsp_get_signal_quality ()

-
guint32
+
guint32
 nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);

 
Gets the WPA signal quality of the wimax NSP.

 

@@ -273,9 +273,9 @@ nm_wimax_nsp_get_network_type (
 

 
nm_wimax_nsp_filter_connections ()

-
GSList *
+
GSList *
 nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
-                                 const GSList *connections);

+                                 const GSList *connections);

 
Filters a given list of connections for a given NMWimaxNsp object and
 return connections which may be activated with the access point.  Any
 returned connections will match the nsp
@@ -297,7 +297,7 @@ returned connections will match the nsp
 
 
connections

 
 a list of
-NMConnection objects to filter. 

+NMConnection objects to filter. 

 [element-type NMConnection]
 
 
@@ -306,20 +306,20 @@ returned connections will match the nsp
 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given nsp
+list of NMConnection objects that could be activated with the given nsp
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
-be freed with g_slist_free() when it is no longer required. 

+be freed with g_slist_free() when it is no longer required. 

 
[transfer container][element-type NMConnection]

 

 

 

 

 
nm_wimax_nsp_connection_valid ()

-
gboolean
+
gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);

+                               NMConnection *connection);

 
Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 nsp
@@ -341,7 +341,7 @@ against

 
 
 
connection

-
an NMConnection to validate against nsp
+
an NMConnection to validate against nsp
 

  
 
@@ -350,8 +350,8 @@ against

 

 

 
Returns

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

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

 

 

 

@@ -424,7 +424,7 @@ against

 
Property Details

 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

 
The name of the WiMAX NSP.

 
Flags: Read

 
Default value: NULL

@@ -432,7 +432,7 @@ against

 

 

 
The “network-type” property

-
  “network-type”             guint

+
  “network-type”             guint

 
The network type of the WiMAX NSP.

 
Flags: Read

 
Default value: 0

@@ -440,7 +440,7 @@ against

 

 

 
The “signal-quality” property

-
  “signal-quality”           guint

+
  “signal-quality”           guint

 
The signal quality of the WiMAX NSP.

 
Flags: Read

 
Allowed values: <= 100

diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index a39f0dc9..980a66c1 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm-glib 1.1.91
+      for libnm-glib 1.1.92
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-glib/0.9/.
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index e7ba5969..e0523b6f 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -41,7 +41,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_vpn_plugin_error_quark ()
@@ -57,7 +57,7 @@
 
 
 
-NMVPNServiceState
+NMVPNServiceState
 
 
 nm_vpn_plugin_get_state ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_disconnect ()
@@ -160,7 +160,7 @@
 
Functions

 

 
nm_vpn_plugin_error_quark ()

-
GQuark
+
GQuark
 nm_vpn_plugin_error_quark (void);

 

 

@@ -172,7 +172,7 @@ nm_vpn_plugin_get_connection (NMV
 

 

 
nm_vpn_plugin_get_state ()

-
NMVPNServiceState
+
NMVPNServiceState
 nm_vpn_plugin_get_state (NMVPNPlugin *plugin);

 

 

@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (NMVPNPlu
 
nm_vpn_plugin_set_state ()

 
void
 nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
-                         NMVPNServiceState state);

+                         NMVPNServiceState state);

 

 

 

@@ -235,35 +235,35 @@ nm_vpn_plugin_set_login_banner (N
 
nm_vpn_plugin_failure ()

 
void
 nm_vpn_plugin_failure (NMVPNPlugin *plugin,
-                       NMVPNPluginFailure reason);

+                       NMVPNPluginFailure reason);

 

 

 

 
nm_vpn_plugin_set_config ()

 
void
 nm_vpn_plugin_set_config (NMVPNPlugin *plugin,
-                          GHashTable *config);

+                          GHashTable *config);

 

 

 

 
nm_vpn_plugin_set_ip4_config ()

 
void
 nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin,
-                              GHashTable *ip4_config);

+                              GHashTable *ip4_config);

 

 

 

 
nm_vpn_plugin_set_ip6_config ()

 
void
 nm_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin,
-                              GHashTable *ip6_config);

+                              GHashTable *ip6_config);

 

 

 

 
nm_vpn_plugin_disconnect ()

-
gboolean
+
gboolean
 nm_vpn_plugin_disconnect (NMVPNPlugin *plugin,
-                          GError **err);

+                          GError **err);

 

 

 

diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index 3d3f9393..a4343675 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -65,7 +65,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_vpn_plugin_ui_interface_get_capabilities ()
@@ -73,7 +73,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_vpn_plugin_ui_interface_import ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_interface_export ()
@@ -97,7 +97,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_interface_delete_connection ()
@@ -105,7 +105,7 @@
 
 
 
-GObject *
+GObject *
 
 
 nm_vpn_plugin_ui_widget_interface_get_widget ()
@@ -113,7 +113,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_widget_interface_update_connection ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_ui_widget_interface_save_secrets ()
@@ -249,45 +249,45 @@
 

 
NMVpnPluginUiFactory ()

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

+(*NMVpnPluginUiFactory) (GError **error);
 

 

 

 
nm_vpn_plugin_ui_factory ()

 
NMVpnPluginUiInterface *
-nm_vpn_plugin_ui_factory (GError **error);

+nm_vpn_plugin_ui_factory (GError **error);
 

 

 

 
nm_vpn_plugin_ui_interface_ui_factory ()

 
NMVpnPluginUiWidgetInterface *
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
-                                       NMConnection *connection,
-                                       GError **error);

+                                       NMConnection *connection,
+                                       GError **error);
 

 

 

 
nm_vpn_plugin_ui_interface_get_capabilities ()

-
guint32
+
guint32
 nm_vpn_plugin_ui_interface_get_capabilities
                                (NMVpnPluginUiInterface *iface);

 

 

 

 
nm_vpn_plugin_ui_interface_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   GError **error);

+                                   GError **error);

 

 

 

 
nm_vpn_plugin_ui_interface_export ()

-
gboolean
+
gboolean
 nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   NMConnection *connection,
-                                   GError **error);

+                                   NMConnection *connection,
+                                   GError **error);

 

 

 

@@ -295,42 +295,42 @@ nm_vpn_plugin_ui_interface_export (char *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection);
+                                NMConnection *connection);
 

 

 

 
nm_vpn_plugin_ui_interface_delete_connection ()

-
gboolean
+
gboolean
 nm_vpn_plugin_ui_interface_delete_connection
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection,
-                                GError **error);

+                                NMConnection *connection,
+                                GError **error);

 
nm_vpn_plugin_ui_interface_delete_connection is deprecated and should not be used in newly-written code.

 

 

 

 
nm_vpn_plugin_ui_widget_interface_get_widget ()

-
GObject *
+
GObject *
 nm_vpn_plugin_ui_widget_interface_get_widget
                                (NMVpnPluginUiWidgetInterface *iface);

 

 

 

 
nm_vpn_plugin_ui_widget_interface_update_connection ()

-
gboolean
+
gboolean
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
-                                GError **error);

+                                NMConnection *connection,
+                                GError **error);

 

 

 

 
nm_vpn_plugin_ui_widget_interface_save_secrets ()

-
gboolean
+
gboolean
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
-                                GError **error);

+                                NMConnection *connection,
+                                GError **error);

 
nm_vpn_plugin_ui_widget_interface_save_secrets is deprecated and should not be used in newly-written code.

 

 

@@ -401,7 +401,7 @@ nm_vpn_plugin_ui_widget_interface_save_secrets
 

 

 
enum NMVpnPluginUiInterfaceProp

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

 

 
Members

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 2fd2f609..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
@@ -41,7 +41,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_utils_read_vpn_details ()
@@ -49,7 +49,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_plugin_utils_get_secret_flags ()
@@ -65,10 +65,10 @@
 
Functions

 

 
nm_vpn_plugin_utils_read_vpn_details ()

-
gboolean
+
gboolean
 nm_vpn_plugin_utils_read_vpn_details (int fd,
-                                      GHashTable **out_data,
-                                      GHashTable **out_secrets);

+                                      GHashTable **out_data,
+                                      GHashTable **out_secrets);

 
Parses key/value pairs from a file descriptor (normally stdin) passed by
 an applet when the applet calls the authentication dialog of the VPN plugin.

 

@@ -102,20 +102,20 @@ an applet when the applet calls the authentication dialog of the VPN plugin.

 

 

 
Returns

-
 TRUE if reading values was successful, FALSE if not

+
 TRUE if reading values was successful, FALSE if not

 

 

 

 

 
nm_vpn_plugin_utils_get_secret_flags ()

-
gboolean
-nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
+
gboolean
+nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
                                       const char *secret_name,
-                                      NMSettingSecretFlags *out_flags);

+                                      NMSettingSecretFlags *out_flags);

 
Given a VPN secret key name, attempts to find the corresponding flags data
 item in data
 .  If found, converts the flags data item to
-NMSettingSecretFlags and returns it.

+NMSettingSecretFlags and returns it.

 

 
Parameters

 

@@ -146,8 +146,8 @@ item in data

 
Returns

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

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

 

diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html
index 9f6fa6de..c6ea9297 100644
--- a/docs/libnm-glib/html/object-tree.html
+++ b/docs/libnm-glib/html/object-tree.html
@@ -23,7 +23,7 @@
 

 Object Hierarchy
-    GObject
+    GObject
     ├── NMObject
     │   ├── NMClient
     │   ├── NMDevice
@@ -49,7 +49,7 @@
     │   ├── NMDHCP4Config
     │   ╰── NMDHCP6Config
     ├── NMRemoteSettings
-    ├── NMConnection
+    ├── NMConnection
     │   ╰── NMRemoteConnection
     ╰── NMSecretAgent
 

diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index 069199b8..99f6a00b 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.1.91
+1.1.92
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index ce9cc5ea..85c39759 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -44,7 +44,7 @@
 
+gchar *
@@ -538,17 +538,17 @@
 
-
+
-
+
-
+

 
 
 
 
 
 

 
-GQuark
+GQuark
 
 
 nm_connection_error_quark ()
@@ -116,7 +116,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_replace_settings ()
@@ -124,7 +124,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_replace_settings_from_connection ()
@@ -132,7 +132,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_compare ()
@@ -140,7 +140,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_diff ()
@@ -148,7 +148,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_verify ()
@@ -156,7 +156,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_normalize ()
@@ -187,7 +187,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_update_secrets ()
@@ -224,7 +224,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_connection_is_type ()
@@ -240,7 +240,7 @@
 

 

 
-GHashTable *
+GHashTable *
 
 
 nm_connection_to_hash ()
@@ -256,7 +256,7 @@
 

 

 
-GType
+GType
 
 
 nm_connection_lookup_setting_type ()
@@ -264,7 +264,7 @@
 

 

 
-GType
+GType
 
 
 nm_connection_lookup_setting_type_by_quark ()
@@ -520,7 +520,7 @@
 
 

 
-gchar *
 path
 Read / Write / Construct
 

 void
 changedRun FirstRun First
 

 

 void
 secrets-clearedRun FirstRun First
 

 

 void
 secrets-updatedRun FirstRun First
 

 
 

@@ -598,9 +598,9 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMConnectionError
-    GObject
+    GObject
     ╰── NMConnection
 

 

@@ -627,7 +627,7 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 
Functions

 

 
nm_connection_error_quark ()

-
GQuark
+
GQuark
 nm_connection_error_quark (void);

 
Registers an error quark for NMConnection if necessary.

 

@@ -650,8 +650,8 @@ nm_connection_new (void
 
nm_connection_new_from_hash ()

 
NMConnection *
-nm_connection_new_from_hash (GHashTable *hash,
-                             GError **error);

+nm_connection_new_from_hash (GHashTable *hash,
+                             GError **error);

 
Creates a new NMConnection from a hash table describing the connection.  See
 nm_connection_to_hash() for a description of the expected hash table.

 

@@ -665,7 +665,7 @@ nm_connection_new_from_hash (
hash

-
 the GHashTable describing
+
 the GHashTable describing
 the connection. 

 [element-type utf8 GLib.HashTable]
 
@@ -680,7 +680,7 @@ the connection. 

 

 
Returns

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

 

 

@@ -735,7 +735,7 @@ nm_connection_create_setting (const 
 
Returns

-
 the new setting object, or NULL if the setting name was unknown. 

+
 the new setting object, or NULL if the setting name was unknown. 

 
[transfer full]

 

 

@@ -777,8 +777,8 @@ the setting object's reference count.

 
nm_connection_remove_setting ()

 
void
 nm_connection_remove_setting (NMConnection *connection,
-                              GType setting_type);

-
Removes the NMSetting with the given GType from the NMConnection.  This
+                              GType setting_type);
+
Removes the NMSetting with the given GType from the NMConnection.  This
 operation dereferences the NMSetting object.

 

 
Parameters

@@ -796,7 +796,7 @@ operation dereferences the 
setting_type

-
the GType of the setting object to remove

+
the GType of the setting object to remove

  
 
 
@@ -808,8 +808,8 @@ operation dereferences the 
nm_connection_get_setting ()

 
NMSetting *
 nm_connection_get_setting (NMConnection *connection,
-                           GType setting_type);

-
Gets the NMSetting with the given GType, if one has been previously added
+                           GType setting_type);
+
Gets the NMSetting with the given GType, if one has been previously added
 to the NMConnection.

 

 
Parameters

@@ -827,7 +827,7 @@ to the 
 
 
setting_type

-
the GType of the setting object to return

+
the GType of the setting object to return

  
 
 
@@ -835,7 +835,7 @@ to the 
 

 
Returns

-
 the NMSetting, or NULL if no setting of that type was previously
+
 the NMSetting, or NULL if no setting of that type was previously
 added to the NMConnection. 

 
[transfer none]

 

@@ -872,7 +872,7 @@ the 
 
Returns

-
 the NMSetting, or NULL if no setting with that name was previously
+
 the NMSetting, or NULL if no setting with that name was previously
 added to the NMConnection. 

 
[transfer none]

 

@@ -880,10 +880,10 @@ added to the 
 

 
nm_connection_replace_settings ()

-
gboolean
+
gboolean
 nm_connection_replace_settings (NMConnection *connection,
-                                GHashTable *new_settings,
-                                GError **error);

+                                GHashTable *new_settings,
+                                GError **error);

 

 
Parameters

 

@@ -900,12 +900,12 @@ nm_connection_replace_settings (
 
-
+
-
+
@@ -913,18 +913,18 @@ nm_connection_replace_settings (
 

 
Returns

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

 

 
 

 

 
nm_connection_replace_settings_from_connection ()

-
gboolean
+
gboolean
 nm_connection_replace_settings_from_connection
                                (NMConnection *connection,
                                 NMConnection *new_connection,
-                                GError **error);

+                                GError **error);

 
Deep-copies the settings of new_conenction
  and replaces the settings of connection
 
@@ -951,7 +951,7 @@ with

 
 

-
+
@@ -959,15 +959,17 @@ with

 
 

 
Returns

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

+
 TRUE if the settings were valid after replacing the connection, FALSE
+if they were not. Regardless of whether TRUE or FALSE is returned, the connection
+is successfully replaced. FALSE only means, that the connection does not verify
+at the end of the operation.

 

 
Since: 0.9.10

 
 

 

 
nm_connection_compare ()

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

@@ -1003,17 +1005,17 @@ each flag's behavior.

 

 

 
Returns

-
 TRUE if the comparison succeeds, FALSE if it does not

+
 TRUE if the comparison succeeds, FALSE if it does not

 

 
 

 

 
nm_connection_diff ()

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

+                    GHashTable **out_settings);

 
Compares two NMConnection objects for similarity, with comparison behavior
 modified by a set of flags.  See nm_setting_compare() for a description of
 each flag's behavior.  If the connections differ, settings and keys within
@@ -1057,16 +1059,16 @@ differ mapped to one or more of 
 
Returns

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

 

 
 

 

 
nm_connection_verify ()

-
gboolean
+
gboolean
 nm_connection_verify (NMConnection *connection,
-                      GError **error);

+                      GError **error);

 
Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
 example, if a Wi-Fi connection is security enabled, the NMSettingWireless
@@ -1074,7 +1076,7 @@ setting object's 'security' property must contain the setting name of the
 NMSettingWirelessSecurity object, which must also be present in the
 connection for the connection to be valid.  As another example, the
 NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
+MAC address.  The returned GError contains information about which
 setting and which property failed validation, and how it failed validation.

 

 
Parameters

@@ -1092,7 +1094,7 @@ setting and which property failed validation, and how it failed validation.

 
 

-
+
@@ -1100,22 +1102,22 @@ setting and which property failed validation, and how it failed validation.

 
 

 
Returns

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

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

 

 
 

 

 
nm_connection_normalize ()

-
gboolean
+
gboolean
 nm_connection_normalize (NMConnection *connection,
-                         GHashTable *parameters,
-                         gboolean *modified,
-                         GError **error);

+                         GHashTable *parameters,
+                         gboolean *modified,
+                         GError **error);

 
Does some basic normalization and fixup of well known inconsistencies
 and deprecated fields. If the connection was modified in any way,
 the output parameter modified
- is set TRUE.

-
Finally the connection will be verified and TRUE returns if the connection
+ is set TRUE.

+
Finally the connection will be verified and TRUE returns if the connection
 is valid. As this function only performs some specific normalization steps
 it cannot repair all connections. If the connection has errors that
 cannot be normalized, the connection will not be modified.

@@ -1135,10 +1137,10 @@ cannot be normalized, the connection will not be modified.

 
 

-
@@ -1149,7 +1151,7 @@ The values are opaque and depend on the parameter name. 

 
 
-
@@ -1158,7 +1160,7 @@ why the connection is invalid, if the function returns an error.

 
 

 
Returns

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

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

 

 
Since: 1.0

 
@@ -1167,7 +1169,7 @@ why the connection is invalid, if the function returns an error.

 
nm_connection_need_secrets ()

 
const char *
 nm_connection_need_secrets (NMConnection *connection,
-                            GPtrArray **hints);

+                            GPtrArray **hints);
 
Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
 intended as a guide to what secrets may be required, because in some
@@ -1189,10 +1191,10 @@ secrets are needed.

 
 
-
@@ -1235,7 +1237,7 @@ keeping secret data in memory when not needed.

 nm_connection_clear_secrets_with_flags
                                (NMConnection *connection,
                                 NMSettingClearSecretsWithFlagsFn func,
-                                gpointer user_data);
+                                gpointer user_data);
 
Clears and frees secrets determined by func
 .

 

@@ -1271,16 +1273,16 @@ specific secret should be cleared or not. 

 

 

 
nm_connection_update_secrets ()

-
gboolean
+
gboolean
 nm_connection_update_secrets (NMConnection *connection,
                               const char *setting_name,
-                              GHashTable *secrets,
-                              GError **error);

+                              GHashTable *secrets,
+                              GError **error);

 
Update the specified setting's secrets, given a hash table of secrets
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a hash of hashes, as would
 be returned from nm_connection_to_hash().  If setting_name
- is NULL, expects
+ is NULL, expects
 a fully serialized NMConnection as returned by nm_connection_to_hash() and
 will update all secrets from all settings contained in secrets
 .

@@ -1305,14 +1307,14 @@ will update all secrets from all settings contained in 
 

-
-
+
@@ -1320,7 +1322,7 @@ string:
 
Returns

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

 
 
@@ -1392,7 +1394,7 @@ nm_connection_get_virtual_iface_name (NULL.

+connection types, this function will return NULL.

 

 
Parameters

 

 
new_settings
 a GHashTable of settings. 
 a GHashTable of settings. 

 [element-type utf8 GLib.HashTable]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
parameters
 a GHashTable with
+
 a GHashTable with
 normalization parameters to allow customization of the normalization by providing
 specific arguments. Unknown arguments will be ignored and the default will be
-used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
+used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
 The values are opaque and depend on the parameter name. 

 [allow-none][element-type utf8 gpointer]
 

 
error
location to store error, or NULL. Contains the reason,
+
location to store error, or NULL. Contains the reason,
 why the connection is invalid, if the function returns an error.

  
 

 
hints
  the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
+
  the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
 secrets of the NMSetting which may be required; the caller owns the array
-and must free the array itself with g_ptr_array_free(), but not free its
+and must free the array itself with g_ptr_array_free(), but not free its
 elements. 

 [out][element-type utf8][allow-none][transfer container]
 

 
secrets
 a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name
+
 a GHashTable mapping
+string:GValue of setting property names and secrets of the given setting_name
 . 

 [element-type utf8 GObject.Value]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

@@ -1410,7 +1412,7 @@ connection types, this function will return 
 
Returns

-
 Name of the kernel interface or NULL

+
 Name of the kernel interface or NULL

 
 
 

@@ -1419,7 +1421,7 @@ connection types, this function will return const char *
 nm_connection_get_interface_name (NMConnection *connection);
 
Returns the interface name as stored in NMSettingConnection:interface_name.
-If the connection contains no NMSettingConnection, it will return NULL.

+If the connection contains no NMSettingConnection, it will return NULL.

 
For hardware devices and software devices created outside of NetworkManager,
 this name is used to match the device. for software devices created by
 NetworkManager, this is the name of the created interface.

@@ -1440,14 +1442,14 @@ NetworkManager, this is the name of the created interface.

 
 

 
Returns

-
 Name of the kernel interface or NULL

+
 Name of the kernel interface or NULL

 

 
Since: 1.0

 
 

 

 
nm_connection_is_type ()

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

 
A convenience function to check if the given connection
@@ -1480,8 +1482,8 @@ property of the connection and matches that against 
 

 

 
Returns

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

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

 

 
 

@@ -1490,7 +1492,7 @@ property of the connection and matches that against 
 
void
 nm_connection_for_each_setting_value (NMConnection *connection,
                                       NMSettingValueIterFn func,
-                                      gpointer user_data);

+                                      gpointer user_data);
 
Iterates over the properties of each NMSetting object in the NMConnection,
 calling the supplied user function for each property.

 

@@ -1525,14 +1527,14 @@ at each invocation

 

 

 
nm_connection_to_hash ()

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

-
Converts the NMConnection into a GHashTable describing the connection,
+
Converts the NMConnection into a GHashTable describing the connection,
 suitable for marshalling over D-Bus or serializing.  The hash table mapping
-is string:GHashTable with each element in the returned hash representing
+is string:GHashTable with each element in the returned hash representing
 a NMSetting object.  The keys are setting object names, and the values
-are GHashTables mapping string:GValue, each of which represents the
+are GHashTables mapping string:GValue, each of which represents the
 properties of the NMSetting object.

 

 
Parameters

@@ -1559,9 +1561,9 @@ properties of the 
 
Returns

 
 a new
-GHashTable describing the connection, its settings, and each setting's
+GHashTable describing the connection, its settings, and each setting's
 properties.  The caller owns the hash table and must unref the hash table
-with g_hash_table_unref() when it is no longer needed. 

+with g_hash_table_unref() when it is no longer needed. 

 
[transfer full][element-type utf8 GLib.HashTable]

 

 

@@ -1592,9 +1594,9 @@ output format is not guaranteed to be stable and may change at any time.

 

 

 
nm_connection_lookup_setting_type ()

-
GType
+
GType
 nm_connection_lookup_setting_type (const char *name);

-
Returns the GType of the setting's class for a given setting name.

+
Returns the GType of the setting's class for a given setting name.

 

 
Parameters

 

@@ -1612,16 +1614,16 @@ nm_connection_lookup_setting_type (const 
 

 
Returns

-
 the GType of the setting's class

+
 the GType of the setting's class

 

 
 

 

 
nm_connection_lookup_setting_type_by_quark ()

-
GType
+
GType
 nm_connection_lookup_setting_type_by_quark
-                               (GQuark error_quark);

-
Returns the GType of the setting's class for a given setting error quark.
+                               (GQuark error_quark);

+
Returns the GType of the setting's class for a given setting error quark.
 Useful for figuring out which setting a returned error is for.

 

 
Parameters

@@ -1640,7 +1642,7 @@ Useful for figuring out which setting a returned error is for.

 

 

 
Returns

-
 the GType of the setting's class

+
 the GType of the setting's class

 

 

 

@@ -1728,7 +1730,7 @@ nm_connection_get_connection_type (char *
 nm_connection_get_virtual_device_description
                                (NMConnection *connection);
-
Returns the name that nm_device_disambiguate_names() would
+
Returns the name that nm_device_disambiguate_names() would
 return for the virtual device that would be created for connection
 .
 Eg, "VLAN (eth1.1)".

@@ -1751,7 +1753,7 @@ Eg, "VLAN (eth1.1)".

 
Returns

 
 the name of connection
 's device,
-or NULL if connection
+or NULL if connection
 is not a virtual connection type. 

 
[transfer full]

 
@@ -1780,7 +1782,7 @@ nm_connection_get_setting_802_1x (
 

 
Returns

-
 an NMSetting8021x if the connection contains one, otherwise NULL. 

+
 an NMSetting8021x if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1807,7 +1809,7 @@ nm_connection_get_setting_bluetooth (
 

 
Returns

-
 an NMSettingBluetooth if the connection contains one, otherwise NULL. 

+
 an NMSettingBluetooth if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1834,7 +1836,7 @@ nm_connection_get_setting_bond (
 

 
Returns

-
 an NMSettingBond if the connection contains one, otherwise NULL. 

+
 an NMSettingBond if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1861,7 +1863,7 @@ nm_connection_get_setting_team (
 

 
Returns

-
 an NMSettingTeam if the connection contains one, otherwise NULL. 

+
 an NMSettingTeam if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
Since: 0.9.10

@@ -1889,7 +1891,7 @@ nm_connection_get_setting_team_port (
 

 
Returns

-
 an NMSettingTeamPort if the connection contains one, otherwise NULL. 

+
 an NMSettingTeamPort if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
Since: 0.9.10

@@ -1917,7 +1919,7 @@ nm_connection_get_setting_bridge (
 

 
Returns

-
 an NMSettingBridge if the connection contains one, otherwise NULL. 

+
 an NMSettingBridge if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1944,7 +1946,7 @@ nm_connection_get_setting_bridge_port (
 
Returns

-
 an NMSettingBridgePort if the connection contains one, otherwise NULL. 

+
 an NMSettingBridgePort if the connection contains one, otherwise NULL. 

 
[transfer none]

 
 
@@ -1971,7 +1973,7 @@ nm_connection_get_setting_cdma (
 

 
Returns

-
 an NMSettingCdma if the connection contains one, otherwise NULL. 

+
 an NMSettingCdma if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1998,7 +2000,7 @@ nm_connection_get_setting_connection (
 
Returns

-
 an NMSettingConnection if the connection contains one, otherwise NULL. 

+
 an NMSettingConnection if the connection contains one, otherwise NULL. 

 
[transfer none]

 
 
@@ -2081,7 +2083,7 @@ nm_connection_get_setting_gsm (
 

 
Returns

-
 an NMSettingGsm if the connection contains one, otherwise NULL. 

+
 an NMSettingGsm if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2108,7 +2110,7 @@ nm_connection_get_setting_infiniband (
 
Returns

-
 an NMSettingInfiniband if the connection contains one, otherwise NULL. 

+
 an NMSettingInfiniband if the connection contains one, otherwise NULL. 

 
[transfer none]

 
 
@@ -2135,7 +2137,7 @@ nm_connection_get_setting_ip4_config (
 
Returns

-
 an NMSettingIP4Config if the connection contains one, otherwise NULL. 

+
 an NMSettingIP4Config if the connection contains one, otherwise NULL. 

 
[transfer none]

 
 
@@ -2162,7 +2164,7 @@ nm_connection_get_setting_ip6_config (
 
Returns

-
 an NMSettingIP6Config if the connection contains one, otherwise NULL. 

+
 an NMSettingIP6Config if the connection contains one, otherwise NULL. 

 
[transfer none]

 
 
@@ -2189,7 +2191,7 @@ nm_connection_get_setting_olpc_mesh (
 

 
Returns

-
 an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 

+
 an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2216,7 +2218,7 @@ nm_connection_get_setting_ppp (
 

 
Returns

-
 an NMSettingPPP if the connection contains one, otherwise NULL. 

+
 an NMSettingPPP if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2243,7 +2245,7 @@ nm_connection_get_setting_pppoe (
 

 
Returns

-
 an NMSettingPPPOE if the connection contains one, otherwise NULL. 

+
 an NMSettingPPPOE if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2270,7 +2272,7 @@ nm_connection_get_setting_serial (
 

 
Returns

-
 an NMSettingSerial if the connection contains one, otherwise NULL. 

+
 an NMSettingSerial if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2297,7 +2299,7 @@ nm_connection_get_setting_vpn (
 

 
Returns

-
 an NMSettingVPN if the connection contains one, otherwise NULL. 

+
 an NMSettingVPN if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2324,7 +2326,7 @@ nm_connection_get_setting_wimax (
 

 
Returns

-
 an NMSettingWimax if the connection contains one, otherwise NULL. 

+
 an NMSettingWimax if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2351,7 +2353,7 @@ nm_connection_get_setting_adsl (
 

 
Returns

-
 an NMSettingAdsl if the connection contains one, otherwise NULL. 

+
 an NMSettingAdsl if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2378,7 +2380,7 @@ nm_connection_get_setting_wired (
 

 
Returns

-
 an NMSettingWired if the connection contains one, otherwise NULL. 

+
 an NMSettingWired if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2405,7 +2407,7 @@ nm_connection_get_setting_wireless (
 

 
Returns

-
 an NMSettingWireless if the connection contains one, otherwise NULL. 

+
 an NMSettingWireless if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2433,7 +2435,7 @@ nm_connection_get_setting_wireless_security
 
 

 
Returns

-
 an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 

+
 an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2460,7 +2462,7 @@ nm_connection_get_setting_vlan (
 

 
Returns

-
 an NMSettingVlan if the connection contains one, otherwise NULL. 

+
 an NMSettingVlan if the connection contains one, otherwise NULL. 

 
[transfer none]

 

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

 
Property Details

 

 
The “path” property

-
  “path”                     gchar *

+
  “path”                     gchar *

 
The connection's D-Bus path, used only by the calling process as a record
 of the D-Bus path of the connection as provided by a settings service.

 
Flags: Read / Write / Construct

@@ -2586,7 +2588,7 @@ of the D-Bus path of the connection as provided by a settings service.

 
The “changed” signal

 
void
 user_function (NMConnection *connection,
-               gpointer      user_data)

+               gpointer      user_data)
 
The ::changed signal is emitted when any property of any property
 (including secrets) of any setting of the connection is modified,
 or when settings are added or removed.

@@ -2612,7 +2614,7 @@ or when settings are added or removed.

 
 

 

-
Flags: Run First

+
Flags: Run First

 
Since: 0.9.10

 

 

@@ -2620,7 +2622,7 @@ or when settings are added or removed.

 
The “secrets-cleared” signal

 
void
 user_function (NMConnection *connection,
-               gpointer      user_data)

+               gpointer      user_data)
 
The ::secrets-cleared signal is emitted when the secrets of a connection
 are cleared.

 

@@ -2645,15 +2647,15 @@ are cleared.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “secrets-updated” signal

 
void
 user_function (NMConnection *connection,
-               gchar        *setting_name,
-               gpointer      user_data)

+               gchar        *setting_name,
+               gpointer      user_data)
 
The ::secrets-updated signal is emitted when the secrets of a setting
 have been changed.

 

@@ -2684,7 +2686,7 @@ updated

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 422ee86b..3ce89683 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -43,7 +43,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_setting_error_quark ()
@@ -67,7 +67,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMSettingClearSecretsWithFlagsFn) ()
@@ -83,7 +83,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_setting_to_hash ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_verify ()
@@ -122,7 +122,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_compare ()
@@ -130,7 +130,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_diff ()
@@ -170,7 +170,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_setting_need_secrets ()
@@ -178,7 +178,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_update_secrets ()
@@ -186,7 +186,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_get_secret_flags ()
@@ -194,7 +194,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_set_secret_flags ()
@@ -220,7 +220,7 @@
 
 
 
-gchar *
+gchar *
 name
 Read / Write
 
@@ -271,13 +271,13 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ├── NMSettingError
     ├── NMSettingHashFlags
     ╰── NMSettingSecretFlags
-    GObject
+    GObject
     ╰── NMSetting
         ├── NMSetting8021x
         ├── NMSettingAdsl
@@ -325,7 +325,7 @@ of properties and allowed values.

 
Functions

 

 
nm_setting_error_quark ()

-
GQuark
+
GQuark
 nm_setting_error_quark (void);

 
Registers an error quark for NMSetting if necessary.

 

@@ -360,11 +360,11 @@ nm_setting_error_quark (void
 

 
NMSettingClearSecretsWithFlagsFn ()

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

+                                     gpointer user_data);

 

 
Parameters

 

@@ -399,7 +399,7 @@ nm_setting_error_quark (void
 

 
Returns

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

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

 

 
 

@@ -408,9 +408,9 @@ nm_setting_error_quark (voidvoid
 (*NMSettingValueIterFn) (NMSetting *setting,
                          const char *key,
-                         const GValue *value,
-                         GParamFlags flags,
-                         gpointer user_data);
+                         const GValue *value,
+                         GParamFlags flags,
+                         gpointer user_data);
 

 
Parameters

 

@@ -453,10 +453,10 @@ nm_setting_error_quark (void
 

 
nm_setting_to_hash ()

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

-
Converts the NMSetting into a GHashTable mapping each setting property
+
Converts the NMSetting into a GHashTable mapping each setting property
 name to a GValue describing that property, suitable for marshalling over
 D-Bus or serializing.  The mapping is string to GValue.

 

@@ -483,7 +483,7 @@ D-Bus or serializing.  The mapping is string to GValue.

 

 

 
Returns

-
 a new GHashTable
+
 a new GHashTable
 describing the setting's properties. 

 
[transfer full][element-type utf8 GObject.Value]

 

@@ -492,8 +492,8 @@ describing the setting's properties. 

 

 
nm_setting_new_from_hash ()

 
NMSetting *
-nm_setting_new_from_hash (GType setting_type,
-                          GHashTable *hash);

+nm_setting_new_from_hash (GType setting_type,
+                          GHashTable *hash);

 
Creates a new NMSetting object and populates that object with the properties
 contained in the hash table, using each hash key as the property to set,
 and each hash value as the value to set that property to.  Setting properties
@@ -516,7 +516,7 @@ property names and value types.

 
 

-
@@ -526,7 +526,7 @@ 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

+hash table, or NULL on failure

 

 
 

@@ -587,14 +587,14 @@ like 'ppp' or 'wireless' or 'wired'.

 

 

 
nm_setting_verify ()

-
gboolean
+
gboolean
 nm_setting_verify (NMSetting *setting,
-                   GSList *all_settings,
-                   GError **error);

+                   GSList *all_settings,
+                   GError **error);

 
Validates the setting.  Each setting's properties have allowed values, and
 some are dependent on other values (hence the need for all_settings
 ).  The
-returned GError contains information about which property of the setting
+returned GError contains information about which property of the setting
 failed validation, and in what way that property failed validation.

 

 
Parameters

@@ -612,14 +612,14 @@ failed validation, and in what way that property failed validation.

 
 

-
-
+
@@ -627,13 +627,13 @@ came. 

 
 

 
Returns

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

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

 

 
 

 

 
nm_setting_compare ()

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

@@ -669,18 +669,18 @@ for a description of each flag's behavior.

 

 

 
Returns

-
 TRUE if the comparison succeeds, FALSE if it does not

+
 TRUE if the comparison succeeds, FALSE if it does not

 

 
 

 

 
nm_setting_diff ()

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

+                 gboolean invert_results,
+                 GHashTable **results);

 
Compares two NMSetting objects for similarity, with comparison behavior
 modified by a set of flags.  See the documentation for NMSettingCompareFlags
 for a description of each flag's behavior.  If the settings differ, the keys
@@ -714,7 +714,7 @@ one or more 
invert_results

 

+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.

 
@@ -731,7 +731,7 @@ 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

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

 

 
 

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

 
void
 nm_setting_enumerate_values (NMSetting *setting,
                              NMSettingValueIterFn func,
-                             gpointer user_data);

+                             gpointer user_data);
 
Iterates over each property of the NMSetting object, calling the supplied
 user function for each property.

 

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

 
Returns

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

+free with g_free()

 

 
 

@@ -832,7 +832,7 @@ leakage of information.

 
void
 nm_setting_clear_secrets_with_flags (NMSetting *setting,
                                      NMSettingClearSecretsWithFlagsFn func,
-                                     gpointer user_data);

+                                     gpointer user_data);
 
Clears and frees secrets determined by func
 .

 

@@ -868,7 +868,7 @@ specific secret should be cleared or not. 

 

 

 
nm_setting_need_secrets ()

-
GPtrArray *
+
GPtrArray *
 nm_setting_need_secrets (NMSetting *setting);

 
Returns an array of property names for each secret which may be required
 to make a successful connection.  The returned hints are only intended as a
@@ -891,9 +891,9 @@ is no way to conclusively determine exactly which secrets are needed.

 

 

 
Returns

-
 a GPtrArray containing
+
 a GPtrArray containing
 the property names of secrets of the NMSetting which may be required; the
-caller owns the array and must free it with g_ptr_array_free(), but must not
+caller owns the array and must free it with g_ptr_array_free(), but must not
 free the elements. 

 
[transfer container][element-type utf8]

 

@@ -901,10 +901,10 @@ free the elements. 

 

 

 
nm_setting_update_secrets ()

-
gboolean
+
gboolean
 nm_setting_update_secrets (NMSetting *setting,
-                           GHashTable *secrets,
-                           GError **error);

+                           GHashTable *secrets,
+                           GError **error);

 
Update the setting's secrets, given a hash table of secrets intended for that
 setting (deserialized from D-Bus for example).

 

@@ -923,13 +923,13 @@ setting (deserialized from D-Bus for example).

 

-
+
-
+
@@ -937,18 +937,18 @@ string to 
 
Returns

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

 
 
 

 

 
nm_setting_get_secret_flags ()

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

+                             GError **error);

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

 

@@ -977,7 +977,7 @@ handle that secret.

 
 

-
+
@@ -985,18 +985,18 @@ 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

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

 

 
 

 

 
nm_setting_set_secret_flags ()

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

+                             GError **error);

 
For a given secret, stores the NMSettingSecretFlags describing how to
 handle that secret.

 

@@ -1025,7 +1025,7 @@ handle that secret.

 
 

-
+
@@ -1033,8 +1033,8 @@ 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

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

 

 
 

@@ -1061,7 +1061,7 @@ needs to use if specified in the settings.

 
 

 
Returns

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

 

 
@@ -1389,7 +1389,7 @@ if you specify NM_SETTING_COMPARE_FLAG_DIFF_RESULT_W
 
Property Details

 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

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

diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index bdb3e7ce..05d9516c 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -43,7 +43,7 @@
 

-
-
-
-
-
-
-
+gchar *
 
@@ -593,7 +593,7 @@
 
 
+gchar *
 
@@ -611,24 +611,24 @@
 
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
@@ -639,25 +639,25 @@
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -669,13 +669,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -687,7 +687,7 @@
 
 
+gchar *
 
@@ -705,29 +705,29 @@
 
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
@@ -739,23 +739,23 @@
 
 
+gchar *
 
-
+
+gchar *
 
-
+
@@ -923,11 +923,11 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
     ╰── NMSetting8021xError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSetting8021x
 

@@ -962,7 +962,7 @@ following books.

 
Functions

 

 
nm_setting_802_1x_error_quark ()

-
GQuark
+
GQuark
 nm_setting_802_1x_error_quark (void);

 
Registers an error quark for NMSetting8021x if necessary.

 

@@ -984,7 +984,7 @@ nm_setting_802_1x_new (void
 

 
nm_setting_802_1x_get_num_eap_methods ()

-
guint32
+
guint32
 nm_setting_802_1x_get_num_eap_methods (NMSetting8021x *setting);

 
Returns the number of eap methods allowed for use when connecting to the
 network.  Generally only one EAP method is used.  Use the functions
@@ -1016,7 +1016,7 @@ allowed EAP methods.

 
nm_setting_802_1x_get_eap_method ()

 
const char *
 nm_setting_802_1x_get_eap_method (NMSetting8021x *setting,
-                                  guint32 i);

+                                  guint32 i);

 
Returns the name of the allowed EAP method at index i
 .

 

@@ -1050,7 +1050,7 @@ nm_setting_802_1x_get_eap_method (
 

 
nm_setting_802_1x_add_eap_method ()

-
gboolean
+
gboolean
 nm_setting_802_1x_add_eap_method (NMSetting8021x *setting,
                                   const char *eap);

 
Adds an allowed EAP method.  The setting is not valid until at least one
@@ -1080,7 +1080,7 @@ allowed EAP methods.

 

 

 
Returns

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

 

 

@@ -1089,7 +1089,7 @@ not a valid method or if it was already allowed.

 
nm_setting_802_1x_remove_eap_method ()

 
void
 nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                     guint32 i);

+                                     guint32 i);

 
Removes the allowed EAP method at the specified index.

 

 
Parameters

@@ -1117,7 +1117,7 @@ nm_setting_802_1x_remove_eap_method (
 

 
nm_setting_802_1x_remove_eap_method_by_value ()

-
gboolean
+
gboolean
 nm_setting_802_1x_remove_eap_method_by_value
                                (NMSetting8021x *setting,
                                 const char *eap);

@@ -1147,7 +1147,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 

 

 
Returns

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

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

 

 
Since: 0.9.10

 

@@ -1259,12 +1259,12 @@ nm_setting_802_1x_get_pac_file (
 

 
nm_setting_802_1x_get_system_ca_certs ()

-
gboolean
+
gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);

 
Sets the “system-ca-certs” property. The
 “ca-path” and “phase2-ca-path”
 properties are ignored if the “system-ca-certs” property is
-TRUE, in which case a system-wide CA certificate directory specified at
+TRUE, in which case a system-wide CA certificate directory specified at
 compile time (using the --system-ca-path configure option) is used in place
 of these properties.

 

@@ -1284,7 +1284,7 @@ of these properties.

 

 

 
Returns

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

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

 

 

 

@@ -1378,7 +1378,7 @@ if 
 
nm_setting_802_1x_get_ca_cert_blob ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_ca_cert_blob (NMSetting8021x *setting);

 
Returns the CA certificate blob if the CA certificate is stored using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
@@ -1440,12 +1440,12 @@ of the network cannot be confirmed by the client.

 

 

 
nm_setting_802_1x_set_ca_cert ()

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

+                               GError **error);

 
Reads a certificate from disk and sets the “ca-cert” property
 with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
@@ -1470,7 +1470,7 @@ scheme, or with the path to the certificate file if using the
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
 file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the CA certificate.

 

@@ -1494,7 +1494,7 @@ clears the CA certificate.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -1521,14 +1521,14 @@ nm_setting_802_1x_get_subject_match (
Returns

 
 the “subject-match” property. This is the
 substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
+server certificate, or NULL no subject verification is to be
 performed.

 
 
 

 

 
nm_setting_802_1x_get_num_altsubject_matches ()

-
guint32
+
guint32
 nm_setting_802_1x_get_num_altsubject_matches
                                (NMSetting8021x *setting);

 
Returns the number of entries in the
@@ -1559,7 +1559,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
const char *
 nm_setting_802_1x_get_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the altSubjectName match at index i
 .

 

@@ -1593,7 +1593,7 @@ nm_setting_802_1x_get_altsubject_match
 

 

 
nm_setting_802_1x_add_altsubject_match ()

-
gboolean
+
gboolean
 nm_setting_802_1x_add_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);

@@ -1624,8 +1624,8 @@ server is not verified.

 

 

 
Returns

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

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

 

 

 

@@ -1634,7 +1634,7 @@ successfully added, void
 nm_setting_802_1x_remove_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
+                                guint32 i);
 
Removes the allowed altSubjectName at the specified index.

 

 
Parameters

@@ -1662,7 +1662,7 @@ nm_setting_802_1x_remove_altsubject_match
 

 

 
nm_setting_802_1x_remove_altsubject_match_by_value ()

-
gboolean
+
gboolean
 nm_setting_802_1x_remove_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);

@@ -1692,8 +1692,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.

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

 

 
Since: 0.9.10

 

@@ -1752,7 +1752,7 @@ if 
 
nm_setting_802_1x_get_client_cert_blob ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_client_cert_blob
                                (NMSetting8021x *setting);

 
Client certificates are used to identify the connecting client to the network
@@ -1810,12 +1810,12 @@ authentication method.

 

 

 
nm_setting_802_1x_set_client_cert ()

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

+                                   GError **error);

 
Reads a certificate from disk and sets the “client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -1843,7 +1843,7 @@ authentication method.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the client certificate.

 

@@ -1868,7 +1868,7 @@ clears the client certificate.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -1895,7 +1895,7 @@ nm_setting_802_1x_get_phase1_peapver (
Returns

 
 the "phase 1" PEAP version to be used when authenticating with
 EAP-PEAP as contained in the “phase1-peapver” property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

 
 
 

@@ -1923,7 +1923,7 @@ nm_setting_802_1x_get_phase1_peaplabel
 
Returns

 
 whether the "phase 1" PEAP label is new-style or old-style, to be
 used when authenticating with EAP-PEAP, as contained in the
-“phase1-peaplabel” property.  Valid values are NULL (unset),
+“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.

 
@@ -2041,7 +2041,7 @@ use 
 
nm_setting_802_1x_get_phase2_ca_cert_blob ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_phase2_ca_cert_blob
                                (NMSetting8021x *setting);

 
Returns the "phase 2" CA certificate blob if the CA certificate is stored
@@ -2105,12 +2105,12 @@ of the network cannot be confirmed by the client.

 

 

 
nm_setting_802_1x_set_phase2_ca_cert ()

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

+                                      GError **error);

 
Reads a certificate from disk and sets the “phase2-ca-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2135,7 +2135,7 @@ file if using the NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
 certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the "phase2" CA certificate.

 

@@ -2159,7 +2159,7 @@ clears the "phase2" CA certificate.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -2187,14 +2187,14 @@ nm_setting_802_1x_get_phase2_subject_match
 
Returns

 
 the “phase2-subject-match” property. This is
 the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
+authentication server certificate, or NULL no subject verification
 is to be performed.

 
 
 

 

 
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

-
guint32
+
guint32
 nm_setting_802_1x_get_num_phase2_altsubject_matches
                                (NMSetting8021x *setting);

 
Returns the number of entries in the
@@ -2225,7 +2225,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
const char *
 nm_setting_802_1x_get_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the "phase 2" altSubjectName match at index i
 .

 

@@ -2259,7 +2259,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 

 

 
nm_setting_802_1x_add_phase2_altsubject_match ()

-
gboolean
+
gboolean
 nm_setting_802_1x_add_phase2_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);

@@ -2291,8 +2291,8 @@ connection

 

 

 
Returns

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

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

 

 

 

@@ -2301,7 +2301,7 @@ successfully added, void
 nm_setting_802_1x_remove_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
+                                guint32 i);
 
Removes the allowed "phase 2" altSubjectName at the specified index.

 

 
Parameters

@@ -2329,7 +2329,7 @@ nm_setting_802_1x_remove_phase2_altsubject_match
 

 

 
nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()

-
gboolean
+
gboolean
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);

@@ -2359,8 +2359,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.

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

 

 
Since: 0.9.10

 

@@ -2421,7 +2421,7 @@ returned scheme is 
 
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_phase2_client_cert_blob
                                (NMSetting8021x *setting);

 
Client certificates are used to identify the connecting client to the network
@@ -2479,13 +2479,13 @@ authentication method.

 

 

 
nm_setting_802_1x_set_phase2_client_cert ()

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

+                                GError **error);

 
Reads a certificate from disk and sets the “phase2-client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2513,7 +2513,7 @@ authentication method.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the "phase2" client certificate.

 

@@ -2538,7 +2538,7 @@ clears the "phase2" client certificate.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -2595,7 +2595,7 @@ nm_setting_802_1x_get_password_flags (
 
nm_setting_802_1x_get_password_raw ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);

 

 
Parameters

@@ -2732,7 +2732,7 @@ nm_setting_802_1x_get_private_key_scheme
 

 

 
nm_setting_802_1x_get_private_key_blob ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_private_key_blob
                                (NMSetting8021x *setting);

 
Private keys are used to authenticate the connecting client to the network
@@ -2793,13 +2793,13 @@ authentication method.

 

 

 
nm_setting_802_1x_set_private_key ()

-
gboolean
+
gboolean
 nm_setting_802_1x_set_private_key (NMSetting8021x *setting,
                                    const char *key_path,
                                    const char *password,
                                    NMSetting8021xCKScheme scheme,
                                    NMSetting8021xCKFormat *out_format,
-                                   GError **error);

+                                   GError **error);

 
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

@@ -2813,7 +2813,7 @@ verify that password
  is correct, and if it is, updates the
 “private-key-password” property with the given password
 .  If
-the decryption is unsuccessful, FALSE is returned, error
+the decryption is unsuccessful, FALSE is returned, error
  is set, and no
 internal data is changed.  If no password
  is given, the private key is
@@ -2843,13 +2843,13 @@ key password to prevent unauthorized access to unencrypted private key data.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
 (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the private key.

 

-
@@ -2874,7 +2874,7 @@ an error is returned.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -2993,7 +2993,7 @@ scheme is 
 
nm_setting_802_1x_get_phase2_private_key_blob ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_802_1x_get_phase2_private_key_blob
                                (NMSetting8021x *setting);

 
Private keys are used to authenticate the connecting client to the network
@@ -3054,14 +3054,14 @@ authentication method.

 

 

 
nm_setting_802_1x_set_phase2_private_key ()

-
gboolean
+
gboolean
 nm_setting_802_1x_set_phase2_private_key
                                (NMSetting8021x *setting,
                                 const char *key_path,
                                 const char *password,
                                 NMSetting8021xCKScheme scheme,
                                 NMSetting8021xCKFormat *out_format,
-                                GError **error);

+                                GError **error);

 
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

@@ -3075,7 +3075,7 @@ verify that password
  is correct, and if it is, updates the
 “phase2-private-key-password” property with the given
 password
-.  If the decryption is unsuccessful, FALSE is returned, error
+.  If the decryption is unsuccessful, FALSE is returned, error
  is
 set, and no internal data is changed.  If no password
  is given, the private
@@ -3105,14 +3105,14 @@ key password to prevent unauthorized access to unencrypted private key data.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
 key file (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
 scheme
 clears the private key.

 

-
@@ -3137,7 +3137,7 @@ an error is returned.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -3571,7 +3571,7 @@ no verification of the server certificate's altSubjectName is performed.

 

 

 
The “anonymous-identity” property

-
  “anonymous-identity”       gchar *

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

@@ -3599,7 +3599,7 @@ but this allows man-in-the-middle attacks and is NOT recommended.

 

 

 
The “ca-path” property

-
  “ca-path”                  gchar *

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

@@ -3636,7 +3636,7 @@ allowed combinations.

 

 

 
The “identity” property

-
  “identity”                 gchar *

+
  “identity”                 gchar *

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

 
Flags: Read / Write

@@ -3645,7 +3645,7 @@ login name.

 

 

 
The “pac-file” property

-
  “pac-file”                 gchar *

+
  “pac-file”                 gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -3653,7 +3653,7 @@ login name.

 

 

 
The “password” property

-
  “password”                 gchar *

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

@@ -3663,7 +3663,7 @@ property are specified, 
 
The “password-flags” property

-
  “password-flags”           guint

+
  “password-flags”           guint

 
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -3682,7 +3682,7 @@ property are specified, 
 
The “password-raw-flags” property

-
  “password-raw-flags”       guint

+
  “password-raw-flags”       guint

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

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -3691,7 +3691,7 @@ property are specified, 
 
The “phase1-fast-provisioning” property

-
  “phase1-fast-provisioning” gchar *

+
  “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
@@ -3704,7 +3704,7 @@ wpa_supplicant documentation for more details.

 

 

 
The “phase1-peaplabel” property

-
  “phase1-peaplabel”         gchar *

+
  “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
@@ -3715,7 +3715,7 @@ wpa_supplicant documentation for more details.

 

 

 
The “phase1-peapver” property

-
  “phase1-peapver”           gchar *

+
  “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
@@ -3738,7 +3738,7 @@ server certificate's altSubjectName is performed.

 

 

 
The “phase2-auth” property

-
  “phase2-auth”              gchar *

+
  “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
@@ -3751,7 +3751,7 @@ authentication; see the wpa_supplicant documentation for more details.

 

 

 
The “phase2-autheap” property

-
  “phase2-autheap”           gchar *

+
  “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
@@ -3783,7 +3783,7 @@ but this allows man-in-the-middle attacks and is NOT recommended.

 

 

 
The “phase2-ca-path” property

-
  “phase2-ca-path”           gchar *

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

@@ -3837,7 +3837,7 @@ the password used to decode the PKCS#12 private key and certificate.

 

 

 
The “phase2-private-key-password” property

-
  “phase2-private-key-password” gchar *

+
  “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
@@ -3850,7 +3850,7 @@ private key by the 
 
The “phase2-private-key-password-flags” property

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

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

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

 
Flags: Read / Write

@@ -3860,7 +3860,7 @@ private key by the 
 
The “phase2-subject-match” property

-
  “phase2-subject-match”     gchar *

+
  “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
@@ -3871,7 +3871,7 @@ certificate's subject is performed.

 

 

 
The “pin” property

-
  “pin”                      gchar *

+
  “pin”                      gchar *

 
PIN used for EAP authentication methods.

 
Flags: Read / Write

 
Default value: NULL

@@ -3879,7 +3879,7 @@ certificate's subject is performed.

 

 

 
The “pin-flags” property

-
  “pin-flags”                guint

+
  “pin-flags”                guint

 
Flags indicating how to handle the “pin” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -3917,7 +3917,7 @@ private key data.

 

 

 
The “private-key-password” property

-
  “private-key-password”     gchar *

+
  “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
@@ -3930,7 +3930,7 @@ the private key by the 
 
The “private-key-password-flags” property

-
  “private-key-password-flags” guint

+
  “private-key-password-flags” guint

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

 
Flags: Read / Write

@@ -3940,7 +3940,7 @@ property.

 

 

 
The “subject-match” property

-
  “subject-match”            gchar *

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

@@ -3950,8 +3950,8 @@ authentication server certificate's subject is performed.

 

 

 
The “system-ca-certs” property

-
  “system-ca-certs”          gboolean

-
When TRUE, overrides the “ca-path” and
+
  “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
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index e5fe4124..165177b5 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -43,7 +43,7 @@
 

+gchar *
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
-
+
@@ -236,9 +236,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingAdslError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingAdsl
 

@@ -257,7 +257,7 @@ properties of ADSL connections.

 
Functions

 

 
nm_setting_adsl_error_quark ()

-
GQuark
+
GQuark
 nm_setting_adsl_error_quark (void);

 
Registers an error quark for NMSettingAdsl if necessary.

 

@@ -379,7 +379,7 @@ nm_setting_adsl_get_encapsulation (
 

 
nm_setting_adsl_get_vpi ()

-
guint32
+
guint32
 nm_setting_adsl_get_vpi (NMSettingAdsl *setting);

 

 
Parameters

@@ -404,7 +404,7 @@ nm_setting_adsl_get_vpi (
 
nm_setting_adsl_get_vci ()

-
guint32
+
guint32
 nm_setting_adsl_get_vci (NMSettingAdsl *setting);

 

 
Parameters

@@ -580,7 +580,7 @@ required

 
Property Details

 

 
The “encapsulation” property

-
  “encapsulation”            gchar *

+
  “encapsulation”            gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -588,7 +588,7 @@ required

 

 

 
The “password” property

-
  “password”                 gchar *

+
  “password”                 gchar *

 
Password used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

@@ -596,7 +596,7 @@ required

 

 

 
The “password-flags” property

-
  “password-flags”           guint

+
  “password-flags”           guint

 
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -605,7 +605,7 @@ required

 

 

 
The “protocol” property

-
  “protocol”                 gchar *

+
  “protocol”                 gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -613,7 +613,7 @@ required

 

 

 
The “username” property

-
  “username”                 gchar *

+
  “username”                 gchar *

 
Username used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

@@ -621,7 +621,7 @@ required

 

 

 
The “vci” property

-
  “vci”                      guint

+
  “vci”                      guint

 
VCI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

@@ -630,7 +630,7 @@ required

 

 

 
The “vpi” property

-
  “vpi”                      guint

+
  “vpi”                      guint

 
VPI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index d1719203..b011f98f 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -43,7 +43,7 @@
 

-
+gchar *
 
@@ -139,9 +139,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBluetoothError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBluetooth
 

@@ -162,7 +162,7 @@ Point (NAP) profiles.

 
Functions

 

 
nm_setting_bluetooth_error_quark ()

-
GQuark
+
GQuark
 nm_setting_bluetooth_error_quark (void);

 
Registers an error quark for NMSettingBluetooth if necessary.

 

@@ -185,7 +185,7 @@ nm_setting_bluetooth_new (void
 

 
nm_setting_bluetooth_get_bdaddr ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_bluetooth_get_bdaddr (NMSettingBluetooth *setting);

 
Gets the Bluetooth address of the remote device which this setting
 describes a connection to.

@@ -339,7 +339,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.

 

 

 
The “type” property

-
  “type”                     gchar *

+
  “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

diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index 4d6695e2..8d0e4d48 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -43,7 +43,7 @@
 

+gchar *
 
@@ -244,9 +244,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBondError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBond
 

@@ -265,7 +265,7 @@ necessary for bond connections.

 
Functions

 

 
nm_setting_bond_error_quark ()

-
GQuark
+
GQuark
 nm_setting_bond_error_quark (void);

 
Registers an error quark for NMSettingBond if necessary.

 

@@ -313,7 +313,7 @@ nm_setting_bond_get_interface_name (
 

 
nm_setting_bond_get_num_options ()

-
guint32
+
guint32
 nm_setting_bond_get_num_options (NMSettingBond *setting);

 
Returns the number of options that should be set for this bond when it
 is activated. This can be used to retrieve each option individually
@@ -341,9 +341,9 @@ using 
 

 
nm_setting_bond_get_option ()

-
gboolean
+
gboolean
 nm_setting_bond_get_option (NMSettingBond *setting,
-                            guint32 idx,
+                            guint32 idx,
                             const char **out_name,
                             const char **out_value);

 
Given an index, return the value of the bonding option at that index.  Indexes
@@ -388,8 +388,8 @@ option; this value is owned by the setting and should not be modified. 

 

 

 
Returns

-
 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
+
 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)

 

 

@@ -426,14 +426,14 @@ nm_setting_bond_get_option_by_name (
 

 
Returns

-
 the value, or NULL if the key/value pair was never added to the
+
 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

 

 

 

 

 
nm_setting_bond_add_option ()

-
gboolean
+
gboolean
 nm_setting_bond_add_option (NMSettingBond *setting,
                             const char *name,
                             const char *value);

@@ -472,14 +472,14 @@ 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.

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

 

 

 

 

 
nm_setting_bond_remove_option ()

-
gboolean
+
gboolean
 nm_setting_bond_remove_option (NMSettingBond *setting,
                                const char *name);

 
Remove the bonding option referenced by name
@@ -509,14 +509,14 @@ list.

 

 

 
Returns

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

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

 

 

 

 

 
nm_setting_bond_validate_option ()

-
gboolean
+
gboolean
 nm_setting_bond_validate_option (const char *name,
                                  const char *value);

 
Checks whether name
@@ -524,7 +524,7 @@ nm_setting_bond_validate_option (const name
 . If value
- is NULL, the function only validates the option name.

+ is NULL, the function only validates the option name.

 

 
Parameters

 

 
hash
 the GHashTable containing a
+
 the GHashTable containing a
 string to GValue mapping of properties that apply to the setting. 

 [element-type utf8 GObject.Value]
 

 
all_settings
 a GSList of all settings
+
 a GSList of all settings
 in the connection from which setting
 came. 

 [element-type NMSetting]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

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

 

 

 
secrets
 a GHashTable mapping
-string to GValue of setting property names and secrets. 
 a GHashTable mapping
+string to GValue of setting property names and secrets. 

 [element-type utf8 GObject.Value]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 
 

 
-GQuark
+GQuark
 
 
 nm_setting_802_1x_error_quark ()
@@ -59,7 +59,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_eap_methods ()
@@ -74,7 +74,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_eap_method ()
@@ -90,7 +90,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_eap_method_by_value ()
@@ -127,7 +127,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_get_system_ca_certs ()
@@ -156,7 +156,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_ca_cert_blob ()
@@ -171,7 +171,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_ca_cert ()
@@ -186,7 +186,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_altsubject_matches ()
@@ -201,7 +201,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_altsubject_match ()
@@ -217,7 +217,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_altsubject_match_by_value ()
@@ -240,7 +240,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_client_cert_blob ()
@@ -255,7 +255,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_client_cert ()
@@ -305,7 +305,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_phase2_ca_cert_blob ()
@@ -320,7 +320,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_ca_cert ()
@@ -335,7 +335,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_phase2_altsubject_matches ()
@@ -350,7 +350,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_phase2_altsubject_match ()
@@ -366,7 +366,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()
@@ -389,7 +389,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_phase2_client_cert_blob ()
@@ -404,7 +404,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_client_cert ()
@@ -426,7 +426,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_password_raw ()
@@ -464,7 +464,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_private_key_blob ()
@@ -479,7 +479,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_private_key ()
@@ -517,7 +517,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_802_1x_get_phase2_private_key_blob ()
@@ -532,7 +532,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_private_key ()
@@ -581,7 +581,7 @@
 

 

 
-gchar *anonymous-identity
 Read / Write
 

 
-gchar *ca-path
 Read / Write
 

 
-gchar *identity
 Read / Write
 

 

 
-gchar *pac-file
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
guintguint
 password-flags
 Read / Write
 
Read / Write
 

 
guintguint
 password-raw-flags
 Read / Write
 

 

 
-gchar *phase1-fast-provisioning
 Read / Write
 

 

 
-gchar *phase1-peaplabel
 Read / Write
 

 

 
-gchar *phase1-peapver
 Read / Write
 

 
-gchar *phase2-auth
 Read / Write
 

 

 
-gchar *phase2-autheap
 Read / Write
 

 
-gchar *phase2-ca-path
 Read / Write
 

 
-gchar *phase2-private-key-password
 Read / Write
 

 
guintguint
 phase2-private-key-password-flags
 Read / Write
 

 

 
-gchar *phase2-subject-match
 Read / Write
 

 

 
-gchar *pin
 Read / Write
 

 
guintguint
 pin-flags
 Read / Write
 

 
-gchar *private-key-password
 Read / Write
 

 
guintguint
 private-key-password-flags
 Read / Write
 

 

 
-gchar *subject-match
 Read / Write
 

 
gbooleangboolean
 system-ca-certs
 Read / Write / Construct
 
 
 
  
 
  
 

 

 
password
password used to decrypt the private key, or NULL if the password
+
password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.

   
 

 

 
password
password used to decrypt the private key, or NULL if the password
+
password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.

  

 

 
-GQuark
+GQuark
 
 
 nm_setting_adsl_error_quark ()
@@ -87,7 +87,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vpi ()
@@ -95,7 +95,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vci ()
@@ -123,40 +123,40 @@
 

 

 
-gchar *encapsulation
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
guintguint
 password-flags
 Read / Write
 

 

 
-gchar *protocol
 Read / Write
 

 

 
-gchar *username
 Read / Write
 

 
guintguint
 vci
 Read / Write
 

 
guintguint
 vpi
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_bluetooth_error_quark ()
@@ -58,7 +58,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_bluetooth_get_bdaddr ()
@@ -91,7 +91,7 @@
 

 

 
-gchar *type
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_bond_error_quark ()
@@ -66,7 +66,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_bond_get_num_options ()
@@ -74,7 +74,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bond_get_option ()
@@ -89,7 +89,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bond_add_option ()
@@ -97,7 +97,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bond_remove_option ()
@@ -105,7 +105,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bond_validate_option ()
@@ -139,7 +139,7 @@
 

 

 
-gchar *interface-name
 Read / Write
 

@@ -549,10 +549,10 @@ the name
 
 

 
Returns

-
 TRUE, if the value
+
 TRUE, if the value
 is valid for the given name.
 If the name
-is not a valid option, FALSE will be returned.

+is not a valid option, FALSE will be returned.

 

 
Since: 0.9.10

 
@@ -579,7 +579,7 @@ nm_setting_bond_get_valid_options (
 

 
Returns

-
 a NULL-terminated array of strings of valid bond options. 

+
 a NULL-terminated array of strings of valid bond options. 

 
[transfer none]

 

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

 
Property Details

 

 
The “interface-name” property

-
  “interface-name”           gchar *

+
  “interface-name”           gchar *

 
The name of the virtual in-kernel bonding network interface

 
Flags: Read / Write

 
Default value: NULL

diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index fad770b0..71cdd58f 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -43,7 +43,7 @@
 

-
-
+
-
+
-
+
+gchar *
 
@@ -159,17 +159,17 @@
 
-
+
-
+
-
+
@@ -233,9 +233,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBridgeError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBridge
 

@@ -254,7 +254,7 @@ necessary for bridging connections.

 
Functions

 

 
nm_setting_bridge_error_quark ()

-
GQuark
+
GQuark
 nm_setting_bridge_error_quark (void);

 
Registers an error quark for NMSettingBridge if necessary.

 

@@ -305,7 +305,7 @@ nm_setting_bridge_get_interface_name (
 
nm_setting_bridge_get_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_bridge_get_mac_address (NMSettingBridge *setting);

 

 
Parameters

@@ -331,7 +331,7 @@ nm_setting_bridge_get_mac_address (
 

 
nm_setting_bridge_get_stp ()

-
gboolean
+
gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting);

 

 
Parameters

@@ -357,7 +357,7 @@ nm_setting_bridge_get_stp (
 
nm_setting_bridge_get_priority ()

-
guint16
+
guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting);

 

 
Parameters

@@ -383,7 +383,7 @@ nm_setting_bridge_get_priority (
 

 
nm_setting_bridge_get_forward_delay ()

-
guint16
+
guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

 

 
Parameters

@@ -409,7 +409,7 @@ nm_setting_bridge_get_forward_delay (
 

 
nm_setting_bridge_get_hello_time ()

-
guint16
+
guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting);

 

 
Parameters

@@ -435,7 +435,7 @@ nm_setting_bridge_get_hello_time (
 

 
nm_setting_bridge_get_max_age ()

-
guint16
+
guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting);

 

 
Parameters

@@ -461,7 +461,7 @@ nm_setting_bridge_get_max_age (
 

 
nm_setting_bridge_get_ageing_time ()

-
guint32
+
guint32
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);

 

 
Parameters

@@ -590,7 +590,7 @@ required

 
Property Details

 

 
The “ageing-time” property

-
  “ageing-time”              guint

+
  “ageing-time”              guint

 
The Ethernet MAC address aging time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 1000000

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

 

 

 
The “forward-delay” property

-
  “forward-delay”            guint

+
  “forward-delay”            guint

 
The Spanning Tree Protocol (STP) forwarding delay, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 30

@@ -610,7 +610,7 @@ required

 

 

 
The “hello-time” property

-
  “hello-time”               guint

+
  “hello-time”               guint

 
The Spanning Tree Protocol (STP) hello time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 10

@@ -620,7 +620,7 @@ required

 

 

 
The “interface-name” property

-
  “interface-name”           gchar *

+
  “interface-name”           gchar *

 
The name of the virtual in-kernel bridging network interface

 
Flags: Read / Write

 
Default value: NULL

@@ -639,7 +639,7 @@ NetworkManager created) bridge, this MAC address must match.

 

 

 
The “max-age” property

-
  “max-age”                  guint

+
  “max-age”                  guint

 
The Spanning Tree Protocol (STP) maximum message age, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 40

@@ -649,7 +649,7 @@ NetworkManager created) bridge, this MAC address must match.

 

 

 
The “priority” property

-
  “priority”                 guint

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

@@ -661,7 +661,7 @@ bridge.

 

 

 
The “stp” property

-
  “stp”                      gboolean

+
  “stp”                      gboolean

 
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

 
Flags: Read / Write / Construct

 
Default value: TRUE

diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index e35476fa..bc204181 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -43,7 +43,7 @@
 

-
+
-
+
-
+
@@ -148,9 +148,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBridgePortError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingBridgePort
 

@@ -169,7 +169,7 @@ optional properties that apply to bridge ports.

 
Functions

 

 
nm_setting_bridge_port_error_quark ()

-
GQuark
+
GQuark
 nm_setting_bridge_port_error_quark (void);

 
Registers an error quark for NMSettingBridgePort if necessary.

 

@@ -194,7 +194,7 @@ nm_setting_bridge_port_new (void<
 

 

 
nm_setting_bridge_port_get_priority ()

-
guint16
+
guint16
 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

 

 
Parameters

@@ -220,7 +220,7 @@ nm_setting_bridge_port_get_priority (
 

 
nm_setting_bridge_port_get_path_cost ()

-
guint16
+
guint16
 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);

 

 
Parameters

@@ -246,7 +246,7 @@ nm_setting_bridge_port_get_path_cost (
 
nm_setting_bridge_port_get_hairpin_mode ()

-
gboolean
+
gboolean
 nm_setting_bridge_port_get_hairpin_mode
                                (NMSettingBridgePort *setting);

 

@@ -346,7 +346,7 @@ is required

 
Property Details

 

 
The “hairpin-mode” property

-
  “hairpin-mode”             gboolean

+
  “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

@@ -356,7 +356,7 @@ be sent back out through the port the frame was received on.

 

 

 
The “path-cost” property

-
  “path-cost”                guint

+
  “path-cost”                guint

 
The Spanning Tree Protocol (STP) port cost for destinations via this
 port.

 
Flags: Read / Write / Construct

@@ -367,7 +367,7 @@ port.

 

 

 
The “priority” property

-
  “priority”                 guint

+
  “priority”                 guint

 
The Spanning Tree Protocol (STP) priority of this bridge port.

 
Flags: Read / Write / Construct

 
Allowed values: <= 63

diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index e2104fe2..43980d9d 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -43,7 +43,7 @@
 

+gchar *
 
+gchar *
 
-
+
+gchar *
 
@@ -165,9 +165,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingCdmaError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingCdma
 

@@ -187,7 +187,7 @@ networks, including those using CDMA2000/EVDO technology.

 
Functions

 

 
nm_setting_cdma_error_quark ()

-
GQuark
+
GQuark
 nm_setting_cdma_error_quark (void);

 
Registers an error quark for NMSettingCdma if necessary.

 

@@ -395,7 +395,7 @@ is missing in the connection

 
Property Details

 

 
The “number” property

-
  “number”                   gchar *

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

@@ -405,7 +405,7 @@ is used when required.

 

 

 
The “password” property

-
  “password”                 gchar *

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

@@ -415,7 +415,7 @@ password is required, it is specified here.

 

 

 
The “password-flags” property

-
  “password-flags”           guint

+
  “password-flags”           guint

 
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -424,7 +424,7 @@ password is required, it is specified here.

 

 

 
The “username” property

-
  “username”                 gchar *

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

diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 5601139d..ba73eb00 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -43,7 +43,7 @@
 

-
+
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -280,7 +280,7 @@
 
-
+
@@ -292,30 +292,30 @@
 
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -403,9 +403,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingConnectionError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingConnection
 

@@ -426,7 +426,7 @@ a 
Functions

 

 
nm_setting_connection_error_quark ()

-
GQuark
+
GQuark
 nm_setting_connection_error_quark (void);

 
Registers an error quark for NMSettingConnection if necessary.

 

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

 

 
nm_setting_connection_get_autoconnect ()

-
gboolean
+
gboolean
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);

 
Returns the “autoconnect” property of the connection.

 

@@ -581,7 +581,7 @@ nm_setting_connection_get_autoconnect (
 
nm_setting_connection_get_timestamp ()

-
guint64
+
guint64
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 
Returns the “timestamp” property of the connection.

 

@@ -607,7 +607,7 @@ nm_setting_connection_get_timestamp (
 

 
nm_setting_connection_get_read_only ()

-
gboolean
+
gboolean
 nm_setting_connection_get_read_only (NMSettingConnection *setting);

 
Returns the “read-only” property of the connection.

 

@@ -627,13 +627,13 @@ nm_setting_connection_get_read_only (
 

 
Returns

-
 TRUE if the connection is read-only, FALSE if it is not

+
 TRUE if the connection is read-only, FALSE if it is not

 

 

 

 

 
nm_setting_connection_get_num_permissions ()

-
guint32
+
guint32
 nm_setting_connection_get_num_permissions
                                (NMSettingConnection *setting);

 
Returns the number of entires in the “permissions”
@@ -661,9 +661,9 @@ property of this setting.

 

 

 
nm_setting_connection_get_permission ()

-
gboolean
+
gboolean
 nm_setting_connection_get_permission (NMSettingConnection *setting,
-                                      guint32 idx,
+                                      guint32 idx,
                                       const char **out_ptype,
                                       const char **out_pitem,
                                       const char **out_detail);

@@ -702,7 +702,7 @@ of this setting.

 
 

-
+
@@ -710,7 +710,7 @@ of this setting.

 
 

 
Returns

-
 TRUE if a permission was returned, FALSE if idx
+
 TRUE if a permission was returned, FALSE if idx
 was invalid

 

 
@@ -743,7 +743,7 @@ nm_setting_connection_get_zone (
 

 
nm_setting_connection_permissions_user_allowed ()

-
gboolean
+
gboolean
 nm_setting_connection_permissions_user_allowed
                                (NMSettingConnection *setting,
                                 const char *uname);

@@ -772,14 +772,14 @@ 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

+
 TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection

 

 
 

 

 
nm_setting_connection_add_permission ()

-
gboolean
+
gboolean
 nm_setting_connection_add_permission (NMSettingConnection *setting,
                                       const char *ptype,
                                       const char *pitem,
@@ -815,7 +815,7 @@ the "user" permission type is supported, and pitem
 

-
+
@@ -823,8 +823,8 @@ the "user" permission type is supported, and pitem
 

 
Returns

-
 TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype
+
 TRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype
 or pitem
 was invalid or it the permission was already
 present in the list

@@ -836,7 +836,7 @@ present in the list

 
void
 nm_setting_connection_remove_permission
                                (NMSettingConnection *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the permission at index idx
  from the connection.

 

@@ -865,7 +865,7 @@ nm_setting_connection_remove_permission
 

 

 
nm_setting_connection_remove_permission_by_value ()

-
gboolean
+
gboolean
 nm_setting_connection_remove_permission_by_value
                                (NMSettingConnection *setting,
                                 const char *ptype,
@@ -902,7 +902,7 @@ be a username. See 
detail

-

+
@@ -910,7 +910,7 @@ be a username. See 
 
Returns

-
 TRUE if the permission was found and removed; FALSE if it was not.

+
 TRUE if the permission was found and removed; FALSE if it was not.

 
 
Since: 0.9.10

 
@@ -944,7 +944,7 @@ connection.

 

 

 
nm_setting_connection_is_slave_type ()

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

 

@@ -973,7 +973,7 @@ against setting
 

 

 
Returns

-
 TRUE if connection is of the given slave type
+
 TRUE if connection is of the given slave type
 

 

 

@@ -1006,7 +1006,7 @@ nm_setting_connection_get_slave_type (
 
nm_setting_connection_get_num_secondaries ()

-
guint32
+
guint32
 nm_setting_connection_get_num_secondaries
                                (NMSettingConnection *setting);

 

@@ -1035,7 +1035,7 @@ nm_setting_connection_get_num_secondaries
 
nm_setting_connection_get_secondary ()

 
const char *
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                     guint32 idx);

+                                     guint32 idx);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_bridge_error_quark ()
@@ -65,7 +65,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_bridge_get_mac_address ()
@@ -73,7 +73,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bridge_get_stp ()
@@ -81,7 +81,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_priority ()
@@ -89,7 +89,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_forward_delay ()
@@ -97,7 +97,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_hello_time ()
@@ -105,7 +105,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_max_age ()
@@ -113,7 +113,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_bridge_get_ageing_time ()
@@ -132,23 +132,23 @@
 
 

 
guintguint
 ageing-time
 Read / Write / Construct
 

 
guintguint
 forward-delay
 Read / Write / Construct
 

 
guintguint
 hello-time
 Read / Write / Construct
 

 

 
-gchar *interface-name
 Read / Write
 
Read / Write
 

 
guintguint
 max-age
 Read / Write / Construct
 

 
guintguint
 priority
 Read / Write / Construct
 

 
gbooleangboolean
 stp
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_bridge_port_error_quark ()
@@ -59,7 +59,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_priority ()
@@ -67,7 +67,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_path_cost ()
@@ -75,7 +75,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bridge_port_get_hairpin_mode ()
@@ -94,17 +94,17 @@
 
 

 
gbooleangboolean
 hairpin-mode
 Read / Write
 

 
guintguint
 path-cost
 Read / Write / Construct
 

 
guintguint
 priority
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_cdma_error_quark ()
@@ -100,24 +100,24 @@
 

 

 
-gchar *number
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
guintguint
 password-flags
 Read / Write
 

 

 
-gchar *username
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_connection_error_quark ()
@@ -87,7 +87,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_autoconnect ()
@@ -95,7 +95,7 @@
 

 

 
-guint64
+guint64
 
 
 nm_setting_connection_get_timestamp ()
@@ -103,7 +103,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_read_only ()
@@ -111,7 +111,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_permissions ()
@@ -119,7 +119,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_permission ()
@@ -134,7 +134,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_permissions_user_allowed ()
@@ -142,7 +142,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_permission ()
@@ -158,7 +158,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_permission_by_value ()
@@ -173,7 +173,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_is_slave_type ()
@@ -188,7 +188,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_secondaries ()
@@ -203,7 +203,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_secondary ()
@@ -219,7 +219,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_secondary_by_value ()
@@ -227,7 +227,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_connection_get_gateway_ping_timeout ()
@@ -246,30 +246,30 @@
 
 

 
gbooleangboolean
 autoconnect
 Read / Write / Construct
 

 
guintguint
 gateway-ping-timeout
 Read / Write / Construct
 

 

 
-gchar *id
 Read / Write
 

 

 
-gchar *interface-name
 Read / Write
 

 

 
-gchar *master
 Read / Write
 
Read / Write
 

 
gbooleangboolean
 read-only
 Read / Write / Construct
 

 
-gchar *slave-type
 Read / Write
 

 
guint64guint64
 timestamp
 Read / Write / Construct
 

 

 
-gchar *type
 Read / Write
 

 

 
-gchar *uuid
 Read / Write
 

 

 
-gchar *zone
 Read / Write / Construct
 

 
out_detail
on return, the permission detail (at this time, always NULL)
on return, the permission detail (at this time, always NULL)

  
 

 

 
detail
 unused at this time; must be NULL. 
 unused at this time; must be NULL. 

 [allow-none]
 

 
 unused at this time; must be NULL. 
 unused at this time; must be NULL. 

 [allow-none]
 

 

@@ -1068,7 +1068,7 @@ nm_setting_connection_get_secondary (
 

 
nm_setting_connection_add_secondary ()

-
gboolean
+
gboolean
 nm_setting_connection_add_secondary (NMSettingConnection *setting,
                                      const char *sec_uuid);

 
Adds a new secondary connetion UUID to the setting.

@@ -1096,7 +1096,7 @@ nm_setting_connection_add_secondary (
 

 
Returns

-
 TRUE if the secondary connection UUID was added; FALSE if the UUID
+
 TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present

 

 
Since: 0.9.8

@@ -1107,7 +1107,7 @@ was already present

 
void
 nm_setting_connection_remove_secondary
                                (NMSettingConnection *setting,
-                                guint32 idx);

+                                guint32 idx);

 
Removes the secondary coonnection UUID at index idx
 .

 

@@ -1137,7 +1137,7 @@ nm_setting_connection_remove_secondary
 

 

 
nm_setting_connection_remove_secondary_by_value ()

-
gboolean
+
gboolean
 nm_setting_connection_remove_secondary_by_value
                                (NMSettingConnection *setting,
                                 const char *sec_uuid);

@@ -1167,14 +1167,14 @@ nm_setting_connection_remove_secondary_by_value
 

 

 
Returns

-
 TRUE if the secondary connection UUID was found and removed; FALSE if it was not.

+
 TRUE if the secondary connection UUID was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

 

 

 
nm_setting_connection_get_gateway_ping_timeout ()

-
guint32
+
guint32
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);

 

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

 
Property Details

 

 
The “autoconnect” property

-
  “autoconnect”              gboolean

+
  “autoconnect”              gboolean

 
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
+TRUE to automatically activate the connection, FALSE to require manual
 intervention to activate the connection.

 
Flags: Read / Write / Construct

 
Default value: TRUE

@@ -1372,7 +1372,7 @@ intervention to activate the connection.

 

 

 
The “gateway-ping-timeout” property

-
  “gateway-ping-timeout”     guint

+
  “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

@@ -1383,7 +1383,7 @@ timeout is reached, or an IP gateway replies to a ping.

 

 

 
The “id” property

-
  “id”                       gchar *

+
  “id”                       gchar *

 
A human readable unique identifier for the connection, like "Work Wi-Fi"
 or "T-Mobile 3G".

 
Flags: Read / Write

@@ -1392,7 +1392,7 @@ or "T-Mobile 3G".

 

 

 
The “interface-name” property

-
  “interface-name”           gchar *

+
  “interface-name”           gchar *

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

@@ -1409,7 +1409,7 @@ connection may be applied to the wrong interface.

 

 

 
The “master” property

-
  “master”                   gchar *

+
  “master”                   gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -1419,7 +1419,7 @@ connection may be applied to the wrong interface.

 
The “permissions” property

 
  “permissions”              GSList_gchararray_ *

 
An array of strings defining what access a given user has to this
-connection.  If this is NULL or empty, all users are allowed to access
+connection.  If this is NULL or empty, all users are allowed to access
 this connection.  Otherwise a user is allowed to access this connection
 if and only if they are in this list. Each entry is of the form
 "[type]:[id]:[reserved]"; for example, "user:dcbw:blah".

@@ -1433,9 +1433,9 @@ use.  All of [type], [id], and [reserved] must be valid UTF-8.

 

 

 
The “read-only” property

-
  “read-only”                gboolean

-
FALSE if the connection can be modified using the provided settings
-service's D-Bus interface with the right privileges, or TRUE if the
+
  “read-only”                gboolean

+
FALSE if the connection can be modified using the provided settings
+service's D-Bus interface with the right privileges, or TRUE if the
 connection is read-only and cannot be modified.

 
Flags: Read / Write / Construct

 
Default value: FALSE

@@ -1453,9 +1453,9 @@ supported.

 

 

 
The “slave-type” property

-
  “slave-type”               gchar *

+
  “slave-type”               gchar *

 
Setting name of the device type of this slave's master connection (eg,
-NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
+NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
 slave.

 
Flags: Read / Write

 
Default value: NULL

@@ -1463,7 +1463,7 @@ slave.

 

 

 
The “timestamp” property

-
  “timestamp”                guint64

+
  “timestamp”                guint64

 
The time, in seconds since the Unix Epoch, that the connection was last
 _successfully_ fully activated.

 
NetworkManager updates the connection timestamp periodically when the
@@ -1476,7 +1476,7 @@ property will not be preserved).

 

 

 
The “type” property

-
  “type”                     gchar *

+
  “type”                     gchar *

 
Base type of the connection. For hardware-dependent connections, should
 contain the setting name of the hardware-type specific setting (ie,
 "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for
@@ -1488,7 +1488,7 @@ the setting name of that setting type (ie, "vpn" or "bridge", etc).

 

 

 
The “uuid” property

-
  “uuid”                     gchar *

+
  “uuid”                     gchar *

 
A universally unique identifier for the connection, for example generated
 with libuuid.  It should be assigned when the connection is created, and
 never changed as long as the connection still applies to the same
@@ -1506,9 +1506,9 @@ be generated by 
 
The “zone” property

-
  “zone”                     gchar *

+
  “zone”                     gchar *

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

 
Flags: Read / Write / Construct

diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index 43b6c323..5cd1cd53 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -43,7 +43,7 @@
 

-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
@@ -285,7 +285,7 @@
 
-
+
@@ -296,7 +296,7 @@
 
-
+
@@ -418,10 +418,10 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingDcbError
     ╰── NMSettingDcbFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingDcb
 

@@ -443,7 +443,7 @@ of storage technologies like Fibre Channel over Ethernet (FCoE) and iSCSI.

 
Functions

 

 
nm_setting_dcb_error_quark ()

-
GQuark
+
GQuark
 nm_setting_dcb_error_quark (void);

 
Registers an error quark for NMSettingDcb if necessary.

 

@@ -494,7 +494,7 @@ nm_setting_dcb_get_app_fcoe_flags (
 

 
nm_setting_dcb_get_app_fcoe_priority ()

-
gint
+
gint
 nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting);

 

 
Parameters

@@ -572,7 +572,7 @@ nm_setting_dcb_get_app_iscsi_flags (
 

 
nm_setting_dcb_get_app_iscsi_priority ()

-
gint
+
gint
 nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);

 

 
Parameters

@@ -624,7 +624,7 @@ nm_setting_dcb_get_app_fip_flags (
 

 
nm_setting_dcb_get_app_fip_priority ()

-
gint
+
gint
 nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);

 

 
Parameters

@@ -677,10 +677,10 @@ nm_setting_dcb_get_priority_flow_control_flags
 

 

 
nm_setting_dcb_get_priority_flow_control ()

-
gboolean
+
gboolean
 nm_setting_dcb_get_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority);

+                                guint user_priority);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_dcb_error_quark ()
@@ -67,7 +67,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fcoe_priority ()
@@ -90,7 +90,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_dcb_get_app_iscsi_priority ()
@@ -106,7 +106,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fip_priority ()
@@ -122,7 +122,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_flow_control ()
@@ -146,7 +146,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_id ()
@@ -162,7 +162,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_bandwidth ()
@@ -178,7 +178,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_bandwidth ()
@@ -194,7 +194,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_strict_bandwidth ()
@@ -210,7 +210,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_traffic_class ()
@@ -237,38 +237,38 @@
 
 

 
guintguint
 app-fcoe-flags
 Read / Write
 

 

 
-gchar *app-fcoe-mode
 Read / Write / Construct
 

 
gintgint
 app-fcoe-priority
 Read / Write / Construct
 

 
guintguint
 app-fip-flags
 Read / Write
 

 
gintgint
 app-fip-priority
 Read / Write / Construct
 

 
guintguint
 app-iscsi-flags
 Read / Write
 

 
gintgint
 app-iscsi-priority
 Read / Write / Construct
 
Read / Write
 

 
guintguint
 priority-flow-control-flags
 Read / Write
 
Read / Write
 

 
guintguint
 priority-group-flags
 Read / Write
 

@@ -705,9 +705,9 @@ nm_setting_dcb_get_priority_flow_control
 
 

 
Returns

-
 TRUE if flow control is enabled for the given user_priority
+
 TRUE if flow control is enabled for the given user_priority
 ,
-FALSE if not enabled

+FALSE if not enabled

 

 
Since: 0.9.10

 
@@ -717,8 +717,8 @@ nm_setting_dcb_get_priority_flow_control
 
void
 nm_setting_dcb_set_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean enabled);

+                                guint user_priority,
+                                gboolean enabled);
 
These values are only valid when “priority-flow-control” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -742,7 +742,7 @@ the 
 

-
+
@@ -780,9 +780,9 @@ nm_setting_dcb_get_priority_group_flags
 

 

 
nm_setting_dcb_get_priority_group_id ()

-
guint
+
guint
 nm_setting_dcb_get_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority);

+                                      guint user_priority);

 

 
Parameters

 

 
enabled
TRUE to enable flow control for this priority, FALSE to disable it
TRUE to enable flow control for this priority, FALSE to disable it

  
 

 

@@ -819,8 +819,8 @@ only valid when 
nm_setting_dcb_set_priority_group_id ()

 
void
 nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority,
-                                      guint group_id);

+                                      guint user_priority,
+                                      guint group_id);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -857,10 +857,10 @@ unrestricted group.

 

 

 
nm_setting_dcb_get_priority_group_bandwidth ()

-
guint
+
guint
 nm_setting_dcb_get_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id);

+                                guint group_id);

 

 
Parameters

 

@@ -898,8 +898,8 @@ only valid when void
 nm_setting_dcb_set_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id,
-                                guint bandwidth_percent);
+                                guint group_id,
+                                guint bandwidth_percent);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -935,9 +935,9 @@ to

 

 

 
nm_setting_dcb_get_priority_bandwidth ()

-
guint
+
guint
 nm_setting_dcb_get_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority);

+                                       guint user_priority);

 

 
Parameters

 

@@ -974,8 +974,8 @@ These values are only valid when 
nm_setting_dcb_set_priority_bandwidth ()

 
void
 nm_setting_dcb_set_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority,
-                                       guint bandwidth_percent);

+                                       guint user_priority,
+                                       guint bandwidth_percent);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -1012,10 +1012,10 @@ allowed to use within its priority group

 

 

 
nm_setting_dcb_get_priority_strict_bandwidth ()

-
gboolean
+
gboolean
 nm_setting_dcb_get_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority);

+                                guint user_priority);

 

 
Parameters

 

@@ -1040,9 +1040,9 @@ nm_setting_dcb_get_priority_strict_bandwidth
 
 

 
Returns

-
 TRUE if user_priority
+
 TRUE if user_priority
 may use all of the bandwidth allocated to its
-assigned group, or FALSE if not. These values are only valid when
+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

@@ -1053,8 +1053,8 @@ assigned group, or void
 nm_setting_dcb_set_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean strict);
+                                guint user_priority,
+                                gboolean strict);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -1078,9 +1078,9 @@ the 
 

-
+its priority group, or FALSE if not

 
@@ -1091,10 +1091,10 @@ its priority group, or 
 
nm_setting_dcb_get_priority_traffic_class ()

-
guint
+
guint
 nm_setting_dcb_get_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority);

+                                guint user_priority);

 

 
Parameters

 

 
strict
TRUE to allow user_priority
+
TRUE to allow user_priority
 to use all the bandwidth allocated to
-its priority group, or FALSE if not
 
 

 

@@ -1132,8 +1132,8 @@ valid when void
 nm_setting_dcb_set_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                guint traffic_class);
+                                guint user_priority,
+                                guint traffic_class);
 
 
 

@@ -1345,7 +1345,7 @@ peer configuration advertisements

 
Property Details

 

 
The “app-fcoe-flags” property

-
  “app-fcoe-flags”           guint

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

@@ -1357,7 +1357,7 @@ be any combination of 
 
The “app-fcoe-mode” property

-
  “app-fcoe-mode”            gchar *

+
  “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

@@ -1367,7 +1367,7 @@ be any combination of 
 
The “app-fcoe-priority” property

-
  “app-fcoe-priority”        gint

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

@@ -1379,7 +1379,7 @@ property includes the 
 
The “app-fip-flags” property

-
  “app-fip-flags”            guint

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

@@ -1391,7 +1391,7 @@ be any combination of 
 
The “app-fip-priority” property

-
  “app-fip-priority”         gint

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

@@ -1403,7 +1403,7 @@ property includes the 
 
The “app-iscsi-flags” property

-
  “app-iscsi-flags”          guint

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

@@ -1415,7 +1415,7 @@ may be any combination of 
 
The “app-iscsi-priority” property

-
  “app-iscsi-priority”       gint

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

@@ -1450,7 +1450,7 @@ transmit pause) and 1 (transmit pause).

 

 

 
The “priority-flow-control-flags” property

-
  “priority-flow-control-flags” guint

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

@@ -1473,7 +1473,7 @@ sum of all values must total 100 percent.

 

 

 
The “priority-group-flags” property

-
  “priority-group-flags”     guint

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

diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index a829f8a9..b6cc9066 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -42,7 +42,7 @@
 

-
+
+gchar *
 
-
+
+gchar *
 
-
+
+gchar *
 
+gchar *
 
-
+
+gchar *
 
-
+
+gchar *
 
@@ -296,11 +296,11 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingGsmError
     ├── NMSettingGsmNetworkBand
     ╰── NMSettingGsmNetworkType
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingGsm
 

@@ -320,7 +320,7 @@ networks, including those using GPRS/EDGE and UMTS/HSPA technology.

 
Functions

 

 
nm_setting_gsm_error_quark ()

-
GQuark
+
GQuark
 nm_setting_gsm_error_quark (void);

 
Registers an error quark for NMSettingGsm if necessary.

 

@@ -503,7 +503,7 @@ nm_setting_gsm_get_pin (
 
nm_setting_gsm_get_home_only ()

-
gboolean
+
gboolean
 nm_setting_gsm_get_home_only (NMSettingGsm *setting);

 

 
Parameters

@@ -607,7 +607,7 @@ nm_setting_gsm_get_network_type (
 

 
nm_setting_gsm_get_allowed_bands ()

-
guint32
+
guint32
 nm_setting_gsm_get_allowed_bands (NMSettingGsm *setting);

 

 
nm_setting_gsm_get_allowed_bands has been deprecated since version 0.9.10 and should not be used in newly-written code.

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

 
Property Details

 

 
The “allowed-bands” property

-
  “allowed-bands”            guint

+
  “allowed-bands”            guint

 
Bitfield of allowed frequency bands.  Note that not all devices allow
 frequency band control.  Permitted values are those specified by
 NMSettingGsmNetworkBand.

@@ -984,7 +984,7 @@ talking to ModemManager directly.

 

 

 
The “apn” property

-
  “apn”                      gchar *

+
  “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
@@ -998,8 +998,8 @@ The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
 

 

 
The “home-only” property

-
  “home-only”                gboolean

-
When TRUE, only connections to the home network will be allowed.
+
  “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

@@ -1007,7 +1007,7 @@ Connections to roaming networks will not be made.

 

 

 
The “network-id” property

-
  “network-id”               gchar *

+
  “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.
@@ -1019,7 +1019,7 @@ roaming control of the device is not otherwise possible.

 

 

 
The “network-type” property

-
  “network-type”             gint

+
  “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,
@@ -1041,7 +1041,7 @@ by talking to ModemManager directly.

 

 

 
The “number” property

-
  “number”                   gchar *

+
  “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
@@ -1052,7 +1052,7 @@ allows NetworkManager to select the appropriate settings automatically.

 

 

 
The “password” property

-
  “password”                 gchar *

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

@@ -1062,7 +1062,7 @@ password is required, it is specified here.

 

 

 
The “password-flags” property

-
  “password-flags”           guint

+
  “password-flags”           guint

 
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -1071,7 +1071,7 @@ password is required, it is specified here.

 

 

 
The “pin” property

-
  “pin”                      gchar *

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

@@ -1081,7 +1081,7 @@ device.

 

 

 
The “pin-flags” property

-
  “pin-flags”                guint

+
  “pin-flags”                guint

 
Flags indicating how to handle the “pin” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -1090,7 +1090,7 @@ device.

 

 

 
The “username” property

-
  “username”                 gchar *

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

diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index 37f3dce3..b14b4721 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -43,7 +43,7 @@
 

+gchar *
 
+gchar *
 
-
+
-
+
@@ -570,33 +570,33 @@
 
-
+
-
+
-
+
+gchar *
 
-
+
-
+
@@ -710,12 +710,12 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIP4Address
     ╰── NMIP4Route
-    GEnum
+    GEnum
     ╰── NMSettingIP4ConfigError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIP4Config
 

@@ -734,7 +734,7 @@ properties related to IPv4 addressing, routing, and Domain Name Service

 
Functions

 

 
nm_setting_ip4_config_error_quark ()

-
GQuark
+
GQuark
 nm_setting_ip4_config_error_quark (void);

 
Registers an error quark for NMSettingIP4Config if necessary.

 

@@ -829,7 +829,7 @@ reaches zero, the object will be destroyed.

 

 

 
nm_ip4_address_compare ()

-
gboolean
+
gboolean
 nm_ip4_address_compare (NMIP4Address *address,
                         NMIP4Address *other);

 
Determines if two NMIP4Address objects contain the same values.

@@ -858,13 +858,13 @@ to.

 

 

 
Returns

-
 TRUE if the objects contain the same values, FALSE if they do not.

+
 TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

 

 
nm_ip4_address_get_address ()

-
guint32
+
guint32
 nm_ip4_address_get_address (NMIP4Address *address);

 
Gets the IPv4 address property of this address object.

 

@@ -892,7 +892,7 @@ nm_ip4_address_get_address (
nm_ip4_address_set_address ()

 
void
 nm_ip4_address_set_address (NMIP4Address *address,
-                            guint32 addr);

+                            guint32 addr);

 
Sets the IPv4 address property of this object.

 

 
Parameters

@@ -920,7 +920,7 @@ nm_ip4_address_set_address (
 
nm_ip4_address_get_prefix ()

-
guint32
+
guint32
 nm_ip4_address_get_prefix (NMIP4Address *address);

 
Gets the IPv4 address prefix (ie "24" or "30" etc) property of this address
 object.

@@ -949,7 +949,7 @@ object.

 
nm_ip4_address_set_prefix ()

 
void
 nm_ip4_address_set_prefix (NMIP4Address *address,
-                           guint32 prefix);

+                           guint32 prefix);

 
Sets the IPv4 address prefix.

 

 
Parameters

@@ -977,7 +977,7 @@ nm_ip4_address_set_prefix (
 
nm_ip4_address_get_gateway ()

-
guint32
+
guint32
 nm_ip4_address_get_gateway (NMIP4Address *address);

 
Gets the IPv4 default gateway property of this address object.

 

@@ -1005,7 +1005,7 @@ nm_ip4_address_get_gateway (
nm_ip4_address_set_gateway ()

 
void
 nm_ip4_address_set_gateway (NMIP4Address *address,
-                            guint32 gateway);

+                            guint32 gateway);

 
Sets the IPv4 default gateway property of this address object.

 

 
Parameters

@@ -1117,7 +1117,7 @@ reaches zero, the object will be destroyed.

 

 

 
nm_ip4_route_compare ()

-
gboolean
+
gboolean
 nm_ip4_route_compare (NMIP4Route *route,
                       NMIP4Route *other);

 
Determines if two NMIP4Route objects contain the same values.

@@ -1146,13 +1146,13 @@ to.

 

 

 
Returns

-
 TRUE if the objects contain the same values, FALSE if they do not.

+
 TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

 

 
nm_ip4_route_get_dest ()

-
guint32
+
guint32
 nm_ip4_route_get_dest (NMIP4Route *route);

 
Gets the IPv4 destination address property of this route object.

 

@@ -1180,7 +1180,7 @@ nm_ip4_route_get_dest (
nm_ip4_route_set_dest ()

 
void
 nm_ip4_route_set_dest (NMIP4Route *route,
-                       guint32 dest);

+                       guint32 dest);

 
Sets the IPv4 destination address property of this route object.

 

 
Parameters

@@ -1208,7 +1208,7 @@ nm_ip4_route_set_dest (
 
nm_ip4_route_get_prefix ()

-
guint32
+
guint32
 nm_ip4_route_get_prefix (NMIP4Route *route);

 
Gets the IPv4 prefix (ie "24" or "30" etc) of this route.

 

@@ -1236,7 +1236,7 @@ nm_ip4_route_get_prefix (
nm_ip4_route_set_prefix ()

 
void
 nm_ip4_route_set_prefix (NMIP4Route *route,
-                         guint32 prefix);

+                         guint32 prefix);

 
Sets the IPv4 prefix of this route.

 

 
Parameters

@@ -1264,7 +1264,7 @@ nm_ip4_route_set_prefix (
 
nm_ip4_route_get_next_hop ()

-
guint32
+
guint32
 nm_ip4_route_get_next_hop (NMIP4Route *route);

 
Gets the IPv4 address of the next hop of this route.

 

@@ -1292,7 +1292,7 @@ nm_ip4_route_get_next_hop (
nm_ip4_route_set_next_hop ()

 
void
 nm_ip4_route_set_next_hop (NMIP4Route *route,
-                           guint32 next_hop);

+                           guint32 next_hop);

 
Sets the IPv4 address of the next hop of this route.

 

 
Parameters

@@ -1320,7 +1320,7 @@ nm_ip4_route_set_next_hop (
 
nm_ip4_route_get_metric ()

-
guint32
+
guint32
 nm_ip4_route_get_metric (NMIP4Route *route);

 
Gets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.

@@ -1349,7 +1349,7 @@ nm_ip4_route_get_metric (
nm_ip4_route_set_metric ()

 
void
 nm_ip4_route_set_metric (NMIP4Route *route,
-                         guint32 metric);

+                         guint32 metric);

 
Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.

 

@@ -1415,7 +1415,7 @@ nm_setting_ip4_config_get_method (
 

 
nm_setting_ip4_config_get_num_dns ()

-
guint32
+
guint32
 nm_setting_ip4_config_get_num_dns (NMSettingIP4Config *setting);

 

 
Parameters

@@ -1440,9 +1440,9 @@ nm_setting_ip4_config_get_num_dns (
 

 
nm_setting_ip4_config_get_dns ()

-
guint32
+
guint32
 nm_setting_ip4_config_get_dns (NMSettingIP4Config *setting,
-                               guint32 i);

+                               guint32 i);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_generic_error_quark ()
@@ -84,9 +84,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingGenericError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingGeneric
 

@@ -108,7 +108,7 @@ the "connection type" setting on 
 
Functions

 

 
nm_setting_generic_error_quark ()

-
GQuark
+
GQuark
 nm_setting_generic_error_quark (void);

 
Registers an error quark for NMSettingGeneric if necessary.

 

diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index c0e6955e..1e725b02 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -43,7 +43,7 @@
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_gsm_error_quark ()
@@ -105,7 +105,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_gsm_get_home_only ()
@@ -137,7 +137,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_gsm_get_allowed_bands ()
@@ -156,63 +156,63 @@
 
 

 
guintguint
 allowed-bands
 Read / Write / Construct
 

 

 
-gchar *apn
 Read / Write
 

 
gbooleangboolean
 home-only
 Read / Write
 

 

 
-gchar *network-id
 Read / Write
 

 
gintgint
 network-type
 Read / Write / Construct
 

 

 
-gchar *number
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
guintguint
 password-flags
 Read / Write
 

 

 
-gchar *pin
 Read / Write
 

 
guintguint
 pin-flags
 Read / Write
 

 

 
-gchar *username
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_ip4_config_error_quark ()
@@ -83,7 +83,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_ip4_address_compare ()
@@ -91,7 +91,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_address_get_address ()
@@ -107,7 +107,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_address_get_prefix ()
@@ -123,7 +123,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_address_get_gateway ()
@@ -171,7 +171,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_ip4_route_compare ()
@@ -179,7 +179,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_route_get_dest ()
@@ -195,7 +195,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_route_get_prefix ()
@@ -211,7 +211,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_route_get_next_hop ()
@@ -227,7 +227,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip4_route_get_metric ()
@@ -258,7 +258,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_dns ()
@@ -266,7 +266,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_dns ()
@@ -274,7 +274,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_dns ()
@@ -290,7 +290,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_dns_by_value ()
@@ -306,7 +306,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_dns_searches ()
@@ -321,7 +321,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_dns_search ()
@@ -337,7 +337,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_dns_search_by_value ()
@@ -353,7 +353,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_addresses ()
@@ -369,7 +369,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_address ()
@@ -385,7 +385,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_address_by_value ()
@@ -401,7 +401,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip4_config_get_num_routes ()
@@ -417,7 +417,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_add_route ()
@@ -433,7 +433,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_remove_route_by_value ()
@@ -449,7 +449,7 @@
 

 

 
-gint64
+gint64
 
 
 nm_setting_ip4_config_get_route_metric ()
@@ -457,7 +457,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_ignore_auto_routes ()
@@ -465,7 +465,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_ignore_auto_dns ()
@@ -480,7 +480,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_dhcp_send_hostname ()
@@ -503,7 +503,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_never_default ()
@@ -511,7 +511,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip4_config_get_may_fail ()
@@ -537,23 +537,23 @@
 

 

 
-gchar *dhcp-client-id
 Read / Write
 

 

 
-gchar *dhcp-hostname
 Read / Write
 

 
gbooleangboolean
 dhcp-send-hostname
 Read / Write / Construct
 

 
guintguint
 dhcp-timeout
 Read / Write
 
Read / Write
 

 
gbooleangboolean
 ignore-auto-dns
 Read / Write / Construct
 

 
gbooleangboolean
 ignore-auto-routes
 Read / Write / Construct
 

 
gbooleangboolean
 may-fail
 Read / Write / Construct
 

 

 
-gchar *method
 Read / Write
 

 
gbooleangboolean
 never-default
 Read / Write / Construct
 

 
gint64gint64
 route-metric
 Read / Write / Construct
 

@@ -1475,9 +1475,9 @@ nm_setting_ip4_config_get_dns (
 

 
nm_setting_ip4_config_add_dns ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_add_dns (NMSettingIP4Config *setting,
-                               guint32 dns);

+                               guint32 dns);

 
Adds a new DNS server to the setting.

 

 
Parameters

@@ -1503,7 +1503,7 @@ nm_setting_ip4_config_add_dns (
 

 
Returns

-
 TRUE if the DNS server was added; FALSE if the server was already
+
 TRUE if the DNS server was added; FALSE if the server was already
 known

 

 

@@ -1512,7 +1512,7 @@ known

 
nm_setting_ip4_config_remove_dns ()

 
void
 nm_setting_ip4_config_remove_dns (NMSettingIP4Config *setting,
-                                  guint32 i);

+                                  guint32 i);
 
Removes the DNS server at index i
 .

 

@@ -1541,10 +1541,10 @@ nm_setting_ip4_config_remove_dns (
 

 
nm_setting_ip4_config_remove_dns_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_remove_dns_by_value
                                (NMSettingIP4Config *setting,
-                                guint32 dns);

+                                guint32 dns);

 
Removes the DNS server dns
 .

 

@@ -1571,7 +1571,7 @@ nm_setting_ip4_config_remove_dns_by_value
 

 

 
Returns

-
 TRUE if the DNS server was found and removed; FALSE if it was not.
+
 TRUE if the DNS server was found and removed; FALSE if it was not.
 domain was already known

 

 
Since: 0.9.10

@@ -1601,7 +1601,7 @@ nm_setting_ip4_config_clear_dns (
 

 
nm_setting_ip4_config_get_num_dns_searches ()

-
guint32
+
guint32
 nm_setting_ip4_config_get_num_dns_searches
                                (NMSettingIP4Config *setting);

 

@@ -1629,7 +1629,7 @@ nm_setting_ip4_config_get_num_dns_searches
 
nm_setting_ip4_config_get_dns_search ()

 
const char *
 nm_setting_ip4_config_get_dns_search (NMSettingIP4Config *setting,
-                                      guint32 i);

+                                      guint32 i);

 

 
Parameters

 

@@ -1661,7 +1661,7 @@ nm_setting_ip4_config_get_dns_search (
 
nm_setting_ip4_config_add_dns_search ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_add_dns_search (NMSettingIP4Config *setting,
                                       const char *dns_search);

 
Adds a new DNS search domain to the setting.

@@ -1689,7 +1689,7 @@ nm_setting_ip4_config_add_dns_search (
 
Returns

-
 TRUE if the DNS search domain was added; FALSE if the search
+
 TRUE if the DNS search domain was added; FALSE if the search
 domain was already known

 
 
@@ -1699,7 +1699,7 @@ domain was already known

 
void
 nm_setting_ip4_config_remove_dns_search
                                (NMSettingIP4Config *setting,
-                                guint32 i);

+                                guint32 i);

 
Removes the DNS search domain at index i
 .

 

@@ -1728,7 +1728,7 @@ nm_setting_ip4_config_remove_dns_search
 

 

 
nm_setting_ip4_config_remove_dns_search_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_remove_dns_search_by_value
                                (NMSettingIP4Config *setting,
                                 const char *dns_search);

@@ -1758,7 +1758,7 @@ 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.

+
 TRUE if the DNS search domain was found and removed; FALSE if it was not.

 
Since 0.9.10

 

 

@@ -1788,7 +1788,7 @@ nm_setting_ip4_config_clear_dns_searches
 

 

 
nm_setting_ip4_config_get_num_addresses ()

-
guint32
+
guint32
 nm_setting_ip4_config_get_num_addresses
                                (NMSettingIP4Config *setting);

 

@@ -1816,7 +1816,7 @@ nm_setting_ip4_config_get_num_addresses
 
nm_setting_ip4_config_get_address ()

 
NMIP4Address *
 nm_setting_ip4_config_get_address (NMSettingIP4Config *setting,
-                                   guint32 i);

+                                   guint32 i);

 

 
Parameters

 

@@ -1848,7 +1848,7 @@ nm_setting_ip4_config_get_address (
 

 
nm_setting_ip4_config_add_address ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_add_address (NMSettingIP4Config *setting,
                                    NMIP4Address *address);

 
Adds a new IPv4 address and associated information to the setting.  The
@@ -1877,7 +1877,7 @@ 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
+
 TRUE if the address was added; FALSE if the address was already
 known.

 

 
@@ -1886,7 +1886,7 @@ known.

 
nm_setting_ip4_config_remove_address ()

 
void
 nm_setting_ip4_config_remove_address (NMSettingIP4Config *setting,
-                                      guint32 i);

+                                      guint32 i);
 
Removes the address at index i
 .

 

@@ -1915,7 +1915,7 @@ nm_setting_ip4_config_remove_address (
 
nm_setting_ip4_config_remove_address_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_remove_address_by_value
                                (NMSettingIP4Config *setting,
                                 NMIP4Address *address);

@@ -1945,7 +1945,7 @@ nm_setting_ip4_config_remove_address_by_value
 

 

 
Returns

-
 TRUE if the address was found and removed; FALSE if it was not.

+
 TRUE if the address was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 
@@ -1974,7 +1974,7 @@ nm_setting_ip4_config_clear_addresses (
 
nm_setting_ip4_config_get_num_routes ()

-
guint32
+
guint32
 nm_setting_ip4_config_get_num_routes (NMSettingIP4Config *setting);

 

 
Parameters

@@ -2001,7 +2001,7 @@ nm_setting_ip4_config_get_num_routes (
nm_setting_ip4_config_get_route ()

 
NMIP4Route *
 nm_setting_ip4_config_get_route (NMSettingIP4Config *setting,
-                                 guint32 i);

+                                 guint32 i);

 

 
Parameters

 

@@ -2033,7 +2033,7 @@ nm_setting_ip4_config_get_route (
 

 
nm_setting_ip4_config_add_route ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_add_route (NMSettingIP4Config *setting,
                                  NMIP4Route *route);

 
Adds a new IPv4 route and associated information to the setting.  The
@@ -2062,7 +2062,7 @@ 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.

+
 TRUE if the route was added; FALSE if the route was already known.

 

 
 

@@ -2070,7 +2070,7 @@ given route is duplicated internally and is not changed by this function.

 
nm_setting_ip4_config_remove_route ()

 
void
 nm_setting_ip4_config_remove_route (NMSettingIP4Config *setting,
-                                    guint32 i);

+                                    guint32 i);
 
Removes the route at index i
 .

 

@@ -2099,7 +2099,7 @@ nm_setting_ip4_config_remove_route (
 

 
nm_setting_ip4_config_remove_route_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_remove_route_by_value
                                (NMSettingIP4Config *setting,
                                 NMIP4Route *route);

@@ -2129,7 +2129,7 @@ nm_setting_ip4_config_remove_route_by_value
 

 

 
Returns

-
 TRUE if the route was found and removed; FALSE if it was not.

+
 TRUE if the route was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

@@ -2158,7 +2158,7 @@ nm_setting_ip4_config_clear_routes (
 

 
nm_setting_ip4_config_get_route_metric ()

-
gint64
+
gint64
 nm_setting_ip4_config_get_route_metric
                                (NMSettingIP4Config *setting);

 
Returns the value contained in the “route-metric”
@@ -2188,7 +2188,7 @@ specify a metric. See 
 
nm_setting_ip4_config_get_ignore_auto_routes ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_get_ignore_auto_routes
                                (NMSettingIP4Config *setting);

 
Returns the value contained in the “ignore-auto-routes”
@@ -2210,14 +2210,14 @@ property.

 

 

 
Returns

-
 TRUE if automatically configured (ie via DHCP) routes should be
+
 TRUE if automatically configured (ie via DHCP) routes should be
 ignored.

 

 
 

 

 
nm_setting_ip4_config_get_ignore_auto_dns ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_get_ignore_auto_dns
                                (NMSettingIP4Config *setting);

 
Returns the value contained in the “ignore-auto-dns”
@@ -2239,7 +2239,7 @@ property.

 

 

 
Returns

-
 TRUE if automatically configured (ie via DHCP) DNS information
+
 TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.

 

 
@@ -2275,7 +2275,7 @@ addresses via DHCP.

 

 

 
nm_setting_ip4_config_get_dhcp_send_hostname ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_get_dhcp_send_hostname
                                (NMSettingIP4Config *setting);

 
Returns the value contained in the “dhcp-send-hostname”
@@ -2297,7 +2297,7 @@ property.

 

 

 
Returns

-
 TRUE if NetworkManager should send the machine hostname to the
+
 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.

 

@@ -2362,7 +2362,7 @@ fails or zero for "default".

 

 

 
nm_setting_ip4_config_get_never_default ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_get_never_default
                                (NMSettingIP4Config *setting);

 
Returns the value contained in the “never-default”
@@ -2384,14 +2384,14 @@ property.

 

 

 
Returns

-
 TRUE if this connection should never be the default connection
+
 TRUE if this connection should never be the default connection
 for IPv4 addressing

 

 
 

 

 
nm_setting_ip4_config_get_may_fail ()

-
gboolean
+
gboolean
 nm_setting_ip4_config_get_may_fail (NMSettingIP4Config *setting);

 
Returns the value contained in the “may-fail”
 property.

@@ -2412,7 +2412,7 @@ property.

 

 

 
Returns

-
 TRUE if this connection doesn't require IPv4 addressing to complete
+
 TRUE if this connection doesn't require IPv4 addressing to complete
 for the connection to succeed.

 

 
@@ -2623,7 +2623,7 @@ either automatic or disabled with these methods.

 

 

 
The “dhcp-client-id” property

-
  “dhcp-client-id”           gchar *

+
  “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

@@ -2632,8 +2632,8 @@ DHCP server may use to customize the DHCP lease and options.

 

 

 
The “dhcp-hostname” property

-
  “dhcp-hostname”            gchar *

-
If the “dhcp-send-hostname” property is TRUE, then the
+
  “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

@@ -2641,19 +2641,19 @@ specified name will be sent to the DHCP server when acquiring a lease.

 

 

 
The “dhcp-send-hostname” property

-
  “dhcp-send-hostname”       gboolean

-
If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
+
  “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.

+TRUE, the current persistent hostname of the computer is sent.

 
Flags: Read / Write / Construct

 
Default value: TRUE

 

 

 

 
The “dhcp-timeout” property

-
  “dhcp-timeout”             guint

+
  “dhcp-timeout”             guint

 
Number of seconds after which the unfinished DHCP transaction fails
 or zero for default.

 
Flags: Read / Write

@@ -2685,8 +2685,8 @@ are used as the only search domains for this connection.

 

 

 
The “ignore-auto-dns” property

-
  “ignore-auto-dns”          gboolean

-
When the method is set to "auto" and this property to TRUE,
+
  “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
@@ -2697,8 +2697,8 @@ any, are used.

 

 

 
The “ignore-auto-routes” property

-
  “ignore-auto-routes”       gboolean

-
When the method is set to "auto" and this property to TRUE,
+
  “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

@@ -2707,11 +2707,11 @@ the 
 

 
The “may-fail” property

-
  “may-fail”                 gboolean

-
If TRUE, allow overall network configuration to proceed even if IPv4
+
  “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
+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

@@ -2720,7 +2720,7 @@ configuration completes successfully.

 

 

 
The “method” property

-
  “method”                   gchar *

+
  “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
@@ -2739,8 +2739,8 @@ This property must be set.

 

 

 
The “never-default” property

-
  “never-default”            gboolean

-
If TRUE, this connection will never be the default IPv4 connection,
+
  “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

@@ -2748,7 +2748,7 @@ meaning it will never be assigned the default route by NetworkManager.

 

 

 
The “route-metric” property

-
  “route-metric”             gint64

+
  “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.
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 9abb7792..eb42de11 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -43,7 +43,7 @@
 

+gchar *
 
@@ -533,38 +533,38 @@
 
-
+
-
+
-
+
-
+
+gchar *
 
-
+
-
+
@@ -677,13 +677,13 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIP6Address
     ╰── NMIP6Route
-    GEnum
+    GEnum
     ├── NMSettingIP6ConfigError
     ╰── NMSettingIP6ConfigPrivacy
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIP6Config
 

@@ -702,7 +702,7 @@ properties related to IPv6 addressing, routing, and Domain Name Service

 
Functions

 

 
nm_setting_ip6_config_error_quark ()

-
GQuark
+
GQuark
 nm_setting_ip6_config_error_quark (void);

 
Registers an error quark for NMSettingIP6Config if necessary.

 

@@ -797,7 +797,7 @@ reaches zero, the object will be destroyed.

 

 

 
nm_ip6_address_compare ()

-
gboolean
+
gboolean
 nm_ip6_address_compare (NMIP6Address *address,
                         NMIP6Address *other);

 
Determines if two NMIP6Address objects contain the same values.

@@ -826,7 +826,7 @@ to.

 

 

 
Returns

-
 TRUE if the objects contain the same values, FALSE if they do not.

+
 TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

@@ -889,7 +889,7 @@ nm_ip6_address_set_address (
 
nm_ip6_address_get_prefix ()

-
guint32
+
guint32
 nm_ip6_address_get_prefix (NMIP6Address *address);

 
Gets the IPv6 address prefix property of this address object.

 

@@ -917,7 +917,7 @@ nm_ip6_address_get_prefix (
nm_ip6_address_set_prefix ()

 
void
 nm_ip6_address_set_prefix (NMIP6Address *address,
-                           guint32 prefix);

+                           guint32 prefix);

 
Sets the IPv6 address prefix.

 

 
Parameters

@@ -1086,7 +1086,7 @@ reaches zero, the object will be destroyed.

 

 

 
nm_ip6_route_compare ()

-
gboolean
+
gboolean
 nm_ip6_route_compare (NMIP6Route *route,
                       NMIP6Route *other);

 
Determines if two NMIP6Route objects contain the same values.

@@ -1115,7 +1115,7 @@ to.

 

 

 
Returns

-
 TRUE if the objects contain the same values, FALSE if they do not.

+
 TRUE if the objects contain the same values, FALSE if they do not.

 

 

 

@@ -1178,7 +1178,7 @@ nm_ip6_route_set_dest (
 
nm_ip6_route_get_prefix ()

-
guint32
+
guint32
 nm_ip6_route_get_prefix (NMIP6Route *route);

 
Gets the IPv6 prefix (ie "32" or "64" etc) of this route.

 

@@ -1206,7 +1206,7 @@ nm_ip6_route_get_prefix (
nm_ip6_route_set_prefix ()

 
void
 nm_ip6_route_set_prefix (NMIP6Route *route,
-                         guint32 prefix);

+                         guint32 prefix);

 
Sets the IPv6 prefix of this route.

 

 
Parameters

@@ -1291,7 +1291,7 @@ nm_ip6_route_set_next_hop (
 
nm_ip6_route_get_metric ()

-
guint32
+
guint32
 nm_ip6_route_get_metric (NMIP6Route *route);

 
Gets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.

@@ -1320,7 +1320,7 @@ nm_ip6_route_get_metric (
nm_ip6_route_set_metric ()

 
void
 nm_ip6_route_set_metric (NMIP6Route *route,
-                         guint32 metric);

+                         guint32 metric);

 
Sets the route metric property of this route object; lower values indicate
 "better" or more preferred routes.

 

@@ -1386,7 +1386,7 @@ nm_setting_ip6_config_get_method (
 

 
nm_setting_ip6_config_get_num_dns ()

-
guint32
+
guint32
 nm_setting_ip6_config_get_num_dns (NMSettingIP6Config *setting);

 

 
Parameters

@@ -1413,7 +1413,7 @@ nm_setting_ip6_config_get_num_dns (
nm_setting_ip6_config_get_dns ()

 
const struct in6_addr *
 nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting,
-                               guint32 i);

+                               guint32 i);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_ip6_config_error_quark ()
@@ -83,7 +83,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_ip6_address_compare ()
@@ -106,7 +106,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip6_address_get_prefix ()
@@ -169,7 +169,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_ip6_route_compare ()
@@ -192,7 +192,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip6_route_get_prefix ()
@@ -223,7 +223,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_ip6_route_get_metric ()
@@ -254,7 +254,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_dns ()
@@ -269,7 +269,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_dns ()
@@ -285,7 +285,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_dns_by_value ()
@@ -301,7 +301,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_dns_searches ()
@@ -316,7 +316,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_dns_search ()
@@ -332,7 +332,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_dns_search_by_value ()
@@ -348,7 +348,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_addresses ()
@@ -364,7 +364,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_address ()
@@ -380,7 +380,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_address_by_value ()
@@ -396,7 +396,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_ip6_config_get_num_routes ()
@@ -412,7 +412,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_add_route ()
@@ -428,7 +428,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_remove_route_by_value ()
@@ -444,7 +444,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_ignore_auto_routes ()
@@ -452,7 +452,7 @@
 

 

 
-gint64
+gint64
 
 
 nm_setting_ip6_config_get_route_metric ()
@@ -460,7 +460,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_ignore_auto_dns ()
@@ -475,7 +475,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_never_default ()
@@ -483,7 +483,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip6_config_get_may_fail ()
@@ -516,7 +516,7 @@
 

 

 
-gchar *dhcp-hostname
 Read / Write
 
Read / Write
 

 
gbooleangboolean
 ignore-auto-dns
 Read / Write / Construct
 

 
gbooleangboolean
 ignore-auto-routes
 Read / Write / Construct
 

 
gintgint
 ip6-privacy
 Read / Write / Construct
 

 
gbooleangboolean
 may-fail
 Read / Write / Construct
 

 

 
-gchar *method
 Read / Write
 

 
gbooleangboolean
 never-default
 Read / Write / Construct
 

 
gint64gint64
 route-metric
 Read / Write / Construct
 

@@ -1446,7 +1446,7 @@ nm_setting_ip6_config_get_dns (
 

 
nm_setting_ip6_config_add_dns ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_add_dns (NMSettingIP6Config *setting,
                                const struct in6_addr *dns);

 
Adds a new DNS server to the setting.

@@ -1474,7 +1474,7 @@ nm_setting_ip6_config_add_dns (
 

 
Returns

-
 TRUE if the DNS server was added; FALSE if the server was already
+
 TRUE if the DNS server was added; FALSE if the server was already
 known

 

 

@@ -1483,7 +1483,7 @@ known

 
nm_setting_ip6_config_remove_dns ()

 
void
 nm_setting_ip6_config_remove_dns (NMSettingIP6Config *setting,
-                                  guint32 i);

+                                  guint32 i);
 
Removes the DNS server at index i
 .

 

@@ -1512,7 +1512,7 @@ nm_setting_ip6_config_remove_dns (
 

 
nm_setting_ip6_config_remove_dns_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_remove_dns_by_value
                                (NMSettingIP6Config *setting,
                                 const struct in6_addr *dns);

@@ -1542,7 +1542,7 @@ nm_setting_ip6_config_remove_dns_by_value
 

 

 
Returns

-
 TRUE if the DNS server was found and removed; FALSE if it was not.

+
 TRUE if the DNS server was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

@@ -1571,7 +1571,7 @@ nm_setting_ip6_config_clear_dns (
 

 
nm_setting_ip6_config_get_num_dns_searches ()

-
guint32
+
guint32
 nm_setting_ip6_config_get_num_dns_searches
                                (NMSettingIP6Config *setting);

 

@@ -1599,7 +1599,7 @@ nm_setting_ip6_config_get_num_dns_searches
 
nm_setting_ip6_config_get_dns_search ()

 
const char *
 nm_setting_ip6_config_get_dns_search (NMSettingIP6Config *setting,
-                                      guint32 i);

+                                      guint32 i);

 

 
Parameters

 

@@ -1631,7 +1631,7 @@ nm_setting_ip6_config_get_dns_search (
 
nm_setting_ip6_config_add_dns_search ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_add_dns_search (NMSettingIP6Config *setting,
                                       const char *dns_search);

 
Adds a new DNS search domain to the setting.

@@ -1659,7 +1659,7 @@ nm_setting_ip6_config_add_dns_search (
 
Returns

-
 TRUE if the DNS search domain was added; FALSE if the search
+
 TRUE if the DNS search domain was added; FALSE if the search
 domain was already known

 
 
@@ -1669,7 +1669,7 @@ domain was already known

 
void
 nm_setting_ip6_config_remove_dns_search
                                (NMSettingIP6Config *setting,
-                                guint32 i);

+                                guint32 i);

 
Removes the DNS search domain at index i
 .

 

@@ -1698,7 +1698,7 @@ nm_setting_ip6_config_remove_dns_search
 

 

 
nm_setting_ip6_config_remove_dns_search_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_remove_dns_search_by_value
                                (NMSettingIP6Config *setting,
                                 const char *dns_search);

@@ -1728,7 +1728,7 @@ 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.

+
 TRUE if the DNS search domain was found and removed; FALSE if it was not.

 
Since 0.9.10

 

 

@@ -1758,7 +1758,7 @@ nm_setting_ip6_config_clear_dns_searches
 

 

 
nm_setting_ip6_config_get_num_addresses ()

-
guint32
+
guint32
 nm_setting_ip6_config_get_num_addresses
                                (NMSettingIP6Config *setting);

 

@@ -1786,7 +1786,7 @@ nm_setting_ip6_config_get_num_addresses
 
nm_setting_ip6_config_get_address ()

 
NMIP6Address *
 nm_setting_ip6_config_get_address (NMSettingIP6Config *setting,
-                                   guint32 i);

+                                   guint32 i);

 

 
Parameters

 

@@ -1818,7 +1818,7 @@ nm_setting_ip6_config_get_address (
 

 
nm_setting_ip6_config_add_address ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_add_address (NMSettingIP6Config *setting,
                                    NMIP6Address *address);

 
Adds a new IPv6 address and associated information to the setting.  The
@@ -1847,7 +1847,7 @@ 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
+
 TRUE if the address was added; FALSE if the address was already
 known.

 

 
@@ -1856,7 +1856,7 @@ known.

 
nm_setting_ip6_config_remove_address ()

 
void
 nm_setting_ip6_config_remove_address (NMSettingIP6Config *setting,
-                                      guint32 i);

+                                      guint32 i);
 
Removes the address at index i
 .

 

@@ -1885,7 +1885,7 @@ nm_setting_ip6_config_remove_address (
 
nm_setting_ip6_config_remove_address_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_remove_address_by_value
                                (NMSettingIP6Config *setting,
                                 NMIP6Address *address);

@@ -1915,7 +1915,7 @@ nm_setting_ip6_config_remove_address_by_value
 

 

 
Returns

-
 TRUE if the address was found and removed; FALSE if it was not.

+
 TRUE if the address was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 
@@ -1944,7 +1944,7 @@ nm_setting_ip6_config_clear_addresses (
 
nm_setting_ip6_config_get_num_routes ()

-
guint32
+
guint32
 nm_setting_ip6_config_get_num_routes (NMSettingIP6Config *setting);

 

 
Parameters

@@ -1971,7 +1971,7 @@ nm_setting_ip6_config_get_num_routes (
nm_setting_ip6_config_get_route ()

 
NMIP6Route *
 nm_setting_ip6_config_get_route (NMSettingIP6Config *setting,
-                                 guint32 i);

+                                 guint32 i);

 

 
Parameters

 

@@ -2003,7 +2003,7 @@ nm_setting_ip6_config_get_route (
 

 
nm_setting_ip6_config_add_route ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_add_route (NMSettingIP6Config *setting,
                                  NMIP6Route *route);

 
Adds a new IPv6 route and associated information to the setting.  The
@@ -2032,7 +2032,7 @@ 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.

+
 TRUE if the route was added; FALSE if the route was already known.

 

 
 

@@ -2040,7 +2040,7 @@ given route is duplicated internally and is not changed by this function.

 
nm_setting_ip6_config_remove_route ()

 
void
 nm_setting_ip6_config_remove_route (NMSettingIP6Config *setting,
-                                    guint32 i);

+                                    guint32 i);
 
Removes the route at index i
 .

 

@@ -2069,7 +2069,7 @@ nm_setting_ip6_config_remove_route (
 

 
nm_setting_ip6_config_remove_route_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_remove_route_by_value
                                (NMSettingIP6Config *setting,
                                 NMIP6Route *route);

@@ -2099,7 +2099,7 @@ nm_setting_ip6_config_remove_route_by_value
 

 

 
Returns

-
 TRUE if the route was found and removed; FALSE if it was not.

+
 TRUE if the route was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

@@ -2128,7 +2128,7 @@ nm_setting_ip6_config_clear_routes (
 

 
nm_setting_ip6_config_get_ignore_auto_routes ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_get_ignore_auto_routes
                                (NMSettingIP6Config *setting);

 
Returns the value contained in the “ignore-auto-routes”
@@ -2150,14 +2150,14 @@ property.

 

 

 
Returns

-
 TRUE if automatically configured (ie via DHCP) routes should be
+
 TRUE if automatically configured (ie via DHCP) routes should be
 ignored.

 

 
 

 

 
nm_setting_ip6_config_get_route_metric ()

-
gint64
+
gint64
 nm_setting_ip6_config_get_route_metric
                                (NMSettingIP6Config *setting);

 
Returns the value contained in the “route-metric”
@@ -2187,7 +2187,7 @@ specify a metric. See 
 
nm_setting_ip6_config_get_ignore_auto_dns ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_get_ignore_auto_dns
                                (NMSettingIP6Config *setting);

 
Returns the value contained in the “ignore-auto-dns”
@@ -2209,7 +2209,7 @@ property.

 

 

 
Returns

-
 TRUE if automatically configured (ie via DHCP or router
+
 TRUE if automatically configured (ie via DHCP or router
 advertisements) DNS information should be ignored.

 

 
@@ -2245,7 +2245,7 @@ property.

 

 

 
nm_setting_ip6_config_get_never_default ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_get_never_default
                                (NMSettingIP6Config *setting);

 
Returns the value contained in the “never-default”
@@ -2267,14 +2267,14 @@ property.

 

 

 
Returns

-
 TRUE if this connection should never be the default connection
+
 TRUE if this connection should never be the default connection
 for IPv6 addressing

 

 
 

 

 
nm_setting_ip6_config_get_may_fail ()

-
gboolean
+
gboolean
 nm_setting_ip6_config_get_may_fail (NMSettingIP6Config *setting);

 
Returns the value contained in the “may-fail”
 property.

@@ -2295,7 +2295,7 @@ property.

 

 

 
Returns

-
 TRUE if this connection doesn't require IPv6 addressing to complete
+
 TRUE if this connection doesn't require IPv6 addressing to complete
 for the connection to succeed.

 

 
@@ -2581,7 +2581,7 @@ assigned an address with these methods.

 

 

 
The “dhcp-hostname” property

-
  “dhcp-hostname”            gchar *

+
  “dhcp-hostname”            gchar *

 
The specified name will be sent to the DHCP server when acquiring a
 lease.

 
Flags: Read / Write

@@ -2615,9 +2615,9 @@ the only search domains for this connection.

 

 

 
The “ignore-auto-dns” property

-
  “ignore-auto-dns”          gboolean

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

@@ -2627,9 +2627,9 @@ any, are used.

 

 

 
The “ignore-auto-routes” property

-
  “ignore-auto-routes”       gboolean

+
  “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
+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

@@ -2637,7 +2637,7 @@ specified in the 
 
The “ip6-privacy” property

-
  “ip6-privacy”              gint

+
  “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
@@ -2652,11 +2652,11 @@ addresses).

 

 

 
The “may-fail” property

-
  “may-fail”                 gboolean

-
If TRUE, allow overall network configuration to proceed even if IPv6
+
  “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
+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

@@ -2665,7 +2665,7 @@ configuration completes successfully.

 

 

 
The “method” property

-
  “method”                   gchar *

+
  “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
@@ -2682,8 +2682,8 @@ yet supported.

 

 

 
The “never-default” property

-
  “never-default”            gboolean

-
If TRUE, this connection will never be the default IPv6 connection,
+
  “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

@@ -2692,7 +2692,7 @@ NetworkManager.

 

 

 
The “route-metric” property

-
  “route-metric”             gint64

+
  “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.
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index 0ae4811a..82db623e 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -43,7 +43,7 @@
 

-
-
+
-
+
+gchar *
 
+gchar *
 
@@ -182,9 +182,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingInfinibandError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingInfiniband
 

@@ -203,7 +203,7 @@ necessary for connection to IP-over-InfiniBand networks.

 
Functions

 

 
nm_setting_infiniband_error_quark ()

-
GQuark
+
GQuark
 nm_setting_infiniband_error_quark (void);

 
Registers an error quark for NMSettingInfiniband if necessary.

 

@@ -226,7 +226,7 @@ nm_setting_infiniband_new (void
 

 
nm_setting_infiniband_get_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_infiniband_get_mac_address (NMSettingInfiniband *setting);

 

 
Parameters

@@ -251,7 +251,7 @@ nm_setting_infiniband_get_mac_address (
 
nm_setting_infiniband_get_mtu ()

-
guint32
+
guint32
 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);

 

 
Parameters

@@ -451,7 +451,7 @@ address of the device (i.e. MAC spoofing).

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “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

@@ -460,7 +460,7 @@ breaking larger packets up into multiple frames.

 

 

 
The “p-key” property

-
  “p-key”                    gint

+
  “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"
@@ -472,8 +472,8 @@ P_Key.

 

 

 
The “parent” property

-
  “parent”                   gchar *

-
The interface name of the parent device of this device. Normally NULL,
+
  “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”.

@@ -483,7 +483,7 @@ specify the base device by setting either this property or
 

 

 
The “transport-mode” property

-
  “transport-mode”           gchar *

+
  “transport-mode”           gchar *

 
The IP-over-InfiniBand transport mode. Either "datagram" or
 "connected".

 
Flags: Read / Write / Construct

diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index 85f41842..d9a5d1d0 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -43,7 +43,7 @@
 

-
-
-
+
@@ -148,9 +148,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingOlpcMeshError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingOlpcMesh
 

@@ -162,7 +162,7 @@
 
Functions

 

 
nm_setting_olpc_mesh_error_quark ()

-
GQuark
+
GQuark
 nm_setting_olpc_mesh_error_quark (void);

 

 

@@ -179,19 +179,19 @@ nm_setting_olpc_mesh_new (void
 

 
nm_setting_olpc_mesh_get_ssid ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);

 

 

 

 
nm_setting_olpc_mesh_get_channel ()

-
guint32
+
guint32
 nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);

 

 

 

 
nm_setting_olpc_mesh_get_dhcp_anycast_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_olpc_mesh_get_dhcp_anycast_address
                                (NMSettingOlpcMesh *setting);

 

@@ -270,7 +270,7 @@ required

 
Property Details

 

 
The “channel” property

-
  “channel”                  guint

+
  “channel”                  guint

 
Channel on which the mesh network to join is located.

 
Flags: Read / Write / Construct

 
Default value: 0

diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 31ca59bb..c66bd595 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -44,7 +44,7 @@ that require PPP to deliver IP capability

 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -404,9 +404,9 @@ that require PPP to deliver IP capability

 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingPPPError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingPPP
 

@@ -426,7 +426,7 @@ cable and DSL modems and some mobile broadband devices.

 
Functions

 

 
nm_setting_ppp_error_quark ()

-
GQuark
+
GQuark
 nm_setting_ppp_error_quark (void);

 
Registers an error quark for NMSettingPPP if necessary.

 

@@ -449,7 +449,7 @@ nm_setting_ppp_new (void
 

 
nm_setting_ppp_get_noauth ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_noauth (NMSettingPPP *setting);

 

 
Parameters

@@ -474,7 +474,7 @@ nm_setting_ppp_get_noauth (
 
nm_setting_ppp_get_refuse_eap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting);

 

 
Parameters

@@ -499,7 +499,7 @@ nm_setting_ppp_get_refuse_eap (
 

 
nm_setting_ppp_get_refuse_pap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting);

 

 
Parameters

@@ -524,7 +524,7 @@ nm_setting_ppp_get_refuse_pap (
 

 
nm_setting_ppp_get_refuse_chap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting);

 

 
Parameters

@@ -549,7 +549,7 @@ nm_setting_ppp_get_refuse_chap (
 

 
nm_setting_ppp_get_refuse_mschap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting);

 

 
Parameters

@@ -574,7 +574,7 @@ nm_setting_ppp_get_refuse_mschap (
 

 
nm_setting_ppp_get_refuse_mschapv2 ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting);

 

 
Parameters

@@ -599,7 +599,7 @@ nm_setting_ppp_get_refuse_mschapv2 (
 

 
nm_setting_ppp_get_nobsdcomp ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting);

 

 
Parameters

@@ -624,7 +624,7 @@ nm_setting_ppp_get_nobsdcomp (
 
nm_setting_ppp_get_nodeflate ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_nodeflate (NMSettingPPP *setting);

 

 
Parameters

@@ -649,7 +649,7 @@ nm_setting_ppp_get_nodeflate (
 
nm_setting_ppp_get_no_vj_comp ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting);

 

 
Parameters

@@ -674,7 +674,7 @@ nm_setting_ppp_get_no_vj_comp (
 

 
nm_setting_ppp_get_require_mppe ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_require_mppe (NMSettingPPP *setting);

 

 
Parameters

@@ -699,7 +699,7 @@ nm_setting_ppp_get_require_mppe (
 

 
nm_setting_ppp_get_require_mppe_128 ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);

 

 
Parameters

@@ -724,7 +724,7 @@ nm_setting_ppp_get_require_mppe_128 (
 

 
nm_setting_ppp_get_mppe_stateful ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting);

 

 
Parameters

@@ -749,7 +749,7 @@ nm_setting_ppp_get_mppe_stateful (
 

 
nm_setting_ppp_get_crtscts ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_crtscts (NMSettingPPP *setting);

 

 
Parameters

@@ -774,7 +774,7 @@ nm_setting_ppp_get_crtscts (
 
nm_setting_ppp_get_baud ()

-
guint32
+
guint32
 nm_setting_ppp_get_baud (NMSettingPPP *setting);

 

 
Parameters

@@ -799,7 +799,7 @@ nm_setting_ppp_get_baud (
 
nm_setting_ppp_get_mru ()

-
guint32
+
guint32
 nm_setting_ppp_get_mru (NMSettingPPP *setting);

 

 
Parameters

@@ -824,7 +824,7 @@ nm_setting_ppp_get_mru (
 
nm_setting_ppp_get_mtu ()

-
guint32
+
guint32
 nm_setting_ppp_get_mtu (NMSettingPPP *setting);

 

 
Parameters

@@ -849,7 +849,7 @@ nm_setting_ppp_get_mtu (
 
nm_setting_ppp_get_lcp_echo_failure ()

-
guint32
+
guint32
 nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);

 

 
Parameters

@@ -874,7 +874,7 @@ nm_setting_ppp_get_lcp_echo_failure (
 

 
nm_setting_ppp_get_lcp_echo_interval ()

-
guint32
+
guint32
 nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);

 

 
Parameters

@@ -1069,7 +1069,7 @@ with other setting configuration parameters

 
Property Details

 

 
The “baud” property

-
  “baud”                     guint

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

@@ -1079,17 +1079,17 @@ choose the speed.

 

 

 
The “crtscts” property

-
  “crtscts”                  gboolean

-
If TRUE, specify that pppd should set the serial port to use hardware
+
  “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.

+to FALSE.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “lcp-echo-failure” property

-
  “lcp-echo-failure”         guint

+
  “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
@@ -1100,7 +1100,7 @@ value if this property is used.

 

 

 
The “lcp-echo-interval” property

-
  “lcp-echo-interval”        guint

+
  “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
@@ -1111,8 +1111,8 @@ possible to autodetect this.

 

 

 
The “mppe-stateful” property

-
  “mppe-stateful”            gboolean

-
If TRUE, stateful MPPE is used.  See pppd documentation for more
+
  “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

@@ -1120,7 +1120,7 @@ information on stateful MPPE.

 

 

 
The “mru” property

-
  “mru”                      guint

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

@@ -1131,7 +1131,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “mtu”                      guint

 
If non-zero, instruct pppd to send packets no larger than the specified
 size.

 
Flags: Read / Write / Construct

@@ -1140,82 +1140,82 @@ size.

 

 

 
The “no-vj-comp” property

-
  “no-vj-comp”               gboolean

-
If TRUE, Van Jacobsen TCP header compression will not be requested.

+
  “no-vj-comp”               gboolean

+
If TRUE, Van Jacobsen TCP header compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
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.

+
  “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

 

 

 

 
The “nobsdcomp” property

-
  “nobsdcomp”                gboolean

-
If TRUE, BSD compression will not be requested.

+
  “nobsdcomp”                gboolean

+
If TRUE, BSD compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “nodeflate” property

-
  “nodeflate”                gboolean

-
If TRUE, "deflate" compression will not be requested.

+
  “nodeflate”                gboolean

+
If TRUE, "deflate" compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-chap” property

-
  “refuse-chap”              gboolean

-
If TRUE, the CHAP authentication method will not be used.

+
  “refuse-chap”              gboolean

+
If TRUE, the CHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-eap” property

-
  “refuse-eap”               gboolean

-
If TRUE, the EAP authentication method will not be used.

+
  “refuse-eap”               gboolean

+
If TRUE, the EAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-mschap” property

-
  “refuse-mschap”            gboolean

-
If TRUE, the MSCHAP authentication method will not be used.

+
  “refuse-mschap”            gboolean

+
If TRUE, the MSCHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-mschapv2” property

-
  “refuse-mschapv2”          gboolean

-
If TRUE, the MSCHAPv2 authentication method will not be used.

+
  “refuse-mschapv2”          gboolean

+
If TRUE, the MSCHAPv2 authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-pap” property

-
  “refuse-pap”               gboolean

-
If TRUE, the PAP authentication method will not be used.

+
  “refuse-pap”               gboolean

+
If TRUE, the PAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “require-mppe” property

-
  “require-mppe”             gboolean

-
If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+
  “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.

@@ -1225,10 +1225,10 @@ connections.

 

 

 
The “require-mppe-128” property

-
  “require-mppe-128”         gboolean

-
If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+
  “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.

+be set to TRUE.  If 128-bit MPPE is not available the session will fail.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index c2eb6faa..c7abaffe 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -43,7 +43,7 @@
 

+gchar *
 
-
+
+gchar *
 
+gchar *
 
@@ -165,9 +165,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingPPPOEError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingPPPOE
 

@@ -187,7 +187,7 @@ to provide IP transport, for example cable or DSL modems.

 
Functions

 

 
nm_setting_pppoe_error_quark ()

-
GQuark
+
GQuark
 nm_setting_pppoe_error_quark (void);

 
Registers an error quark for NMSettingPPPOE if necessary.

 

@@ -396,7 +396,7 @@ did not contain a required PPP setting for PPP related options

 
Property Details

 

 
The “password” property

-
  “password”                 gchar *

+
  “password”                 gchar *

 
Password used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

@@ -404,7 +404,7 @@ did not contain a required PPP setting for PPP related options

 

 

 
The “password-flags” property

-
  “password-flags”           guint

+
  “password-flags”           guint

 
Flags indicating how to handle the “password” property.

 
Flags: Read / Write

 
Allowed values: <= 7

@@ -413,7 +413,7 @@ did not contain a required PPP setting for PPP related options

 

 

 
The “service” property

-
  “service”                  gchar *

+
  “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
@@ -424,7 +424,7 @@ access concentrators or a specific service is known to be required.

 

 

 
The “username” property

-
  “username”                 gchar *

+
  “username”                 gchar *

 
Username used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index 38b3786d..43c21e9e 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -44,7 +44,7 @@ serial communications

 

-
+
-
+
-
+
-
+
-
+
@@ -183,9 +183,9 @@ serial communications

 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingSerial
 

@@ -205,7 +205,7 @@ such as mobile broadband or analog telephone connections.

 
Functions

 

 
nm_setting_serial_error_quark ()

-
GQuark
+
GQuark
 nm_setting_serial_error_quark (void);

 
Registers an error quark for NMSettingSerial if necessary.

 

@@ -228,7 +228,7 @@ nm_setting_serial_new (void
 

 
nm_setting_serial_get_baud ()

-
guint
+
guint
 nm_setting_serial_get_baud (NMSettingSerial *setting);

 

 
Parameters

@@ -253,7 +253,7 @@ nm_setting_serial_get_baud (
 
nm_setting_serial_get_bits ()

-
guint
+
guint
 nm_setting_serial_get_bits (NMSettingSerial *setting);

 

 
Parameters

@@ -303,7 +303,7 @@ nm_setting_serial_get_parity (
 
nm_setting_serial_get_stopbits ()

-
guint
+
guint
 nm_setting_serial_get_stopbits (NMSettingSerial *setting);

 

 
Parameters

@@ -328,7 +328,7 @@ nm_setting_serial_get_stopbits (
 

 
nm_setting_serial_get_send_delay ()

-
guint64
+
guint64
 nm_setting_serial_get_send_delay (NMSettingSerial *setting);

 

 
Parameters

@@ -445,7 +445,7 @@ setting requires the connection to contain an 
Property Details

 

 
The “baud” property

-
  “baud”                     guint

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

@@ -455,7 +455,7 @@ ignore speed settings and use the highest available speed.

 

 

 
The “bits” property

-
  “bits”                     guint

+
  “bits”                     guint

 
Byte-width of the serial communication. The 8 in "8n1" for example.

 
Flags: Read / Write / Construct

 
Allowed values: [5,8]

@@ -464,7 +464,7 @@ ignore speed settings and use the highest available speed.

 

 

 
The “parity” property

-
  “parity”                   gchar

+
  “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

@@ -474,7 +474,7 @@ odd parity, or 'n' for no parity.

 

 

 
The “send-delay” property

-
  “send-delay”               guint64

+
  “send-delay”               guint64

 
Time to delay between each byte sent to the modem, in microseconds.

 
Flags: Read / Write / Construct

 
Default value: 0

@@ -482,7 +482,7 @@ odd parity, or 'n' for no parity.

 

 

 
The “stopbits” property

-
  “stopbits”                 guint

+
  “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

diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 273a7cfb..2e40a312 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -43,7 +43,7 @@
 

+gchar *
 
+gchar *
 
@@ -131,9 +131,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTeamError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingTeam
 

@@ -152,7 +152,7 @@ necessary for team connections.

 
Functions

 

 
nm_setting_team_error_quark ()

-
GQuark
+
GQuark
 nm_setting_team_error_quark (void);

 
Registers an error quark for NMSettingTeam if necessary.

 

@@ -295,7 +295,7 @@ required

 
Property Details

 

 
The “config” property

-
  “config”                   gchar *

+
  “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
@@ -306,7 +306,7 @@ configuration is used.  See man teamd.conf for the format details.

 

 

 
The “interface-name” property

-
  “interface-name”           gchar *

+
  “interface-name”           gchar *

 
The name of the virtual in-kernel team network interface

 
Flags: Read / Write

 
Default value: NULL

diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index dccd39c1..c08a4eb0 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -43,7 +43,7 @@
 

+gchar *
 
@@ -112,9 +112,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTeamPortError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingTeamPort
 

@@ -133,7 +133,7 @@ optional properties that apply to team ports.

 
Functions

 

 
nm_setting_team_port_error_quark ()

-
GQuark
+
GQuark
 nm_setting_team_port_error_quark (void);

 
Registers an error quark for NMSettingTeamPort if necessary.

 

@@ -244,7 +244,7 @@ is required

 
Property Details

 

 
The “config” property

-
  “config”                   gchar *

+
  “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
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 53cc69c9..e3243206 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -43,7 +43,7 @@
 

-
+
@@ -194,13 +194,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -256,9 +256,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingVpnError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVPN
 

@@ -282,7 +282,7 @@ properties.

 
Functions

 

 
nm_setting_vpn_error_quark ()

-
GQuark
+
GQuark
 nm_setting_vpn_error_quark (void);

 
Registers an error quark for NMSettingVPN if necessary.

 

@@ -296,7 +296,7 @@ nm_setting_vpn_error_quark (void<
 
void
 (*NMVPNIterFunc) (const char *key,
                   const char *value,
-                  gpointer user_data);

+                  gpointer user_data);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_infiniband_error_quark ()
@@ -58,7 +58,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_infiniband_get_mac_address ()
@@ -66,7 +66,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_infiniband_get_mtu ()
@@ -113,24 +113,24 @@
 Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 
gintgint
 p-key
 Read / Write / Construct
 

 

 
-gchar *parent
 Read / Write / Construct
 

 

 
-gchar *transport-mode
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_olpc_mesh_error_quark ()
@@ -58,7 +58,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_olpc_mesh_get_ssid ()
@@ -66,14 +66,14 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_olpc_mesh_get_channel ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_olpc_mesh_get_dhcp_anycast_address ()
@@ -92,7 +92,7 @@
 
 

 
guintguint
 channel
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_ppp_error_quark ()
@@ -60,7 +60,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_noauth ()
@@ -68,7 +68,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_eap ()
@@ -76,7 +76,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_pap ()
@@ -84,7 +84,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_chap ()
@@ -92,7 +92,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschap ()
@@ -100,7 +100,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschapv2 ()
@@ -108,7 +108,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nobsdcomp ()
@@ -116,7 +116,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nodeflate ()
@@ -124,7 +124,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_no_vj_comp ()
@@ -132,7 +132,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe ()
@@ -140,7 +140,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe_128 ()
@@ -148,7 +148,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_mppe_stateful ()
@@ -156,7 +156,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_crtscts ()
@@ -164,7 +164,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_baud ()
@@ -172,7 +172,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mru ()
@@ -180,7 +180,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mtu ()
@@ -188,7 +188,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_failure ()
@@ -196,7 +196,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_interval ()
@@ -215,92 +215,92 @@ that require PPP to deliver IP capability

 
 

 
guintguint
 baud
 Read / Write / Construct
 

 
gbooleangboolean
 crtscts
 Read / Write / Construct
 

 
guintguint
 lcp-echo-failure
 Read / Write / Construct
 

 
guintguint
 lcp-echo-interval
 Read / Write / Construct
 

 
gbooleangboolean
 mppe-stateful
 Read / Write / Construct
 

 
guintguint
 mru
 Read / Write / Construct
 

 
guintguint
 mtu
 Read / Write / Construct
 

 
gbooleangboolean
 no-vj-comp
 Read / Write / Construct
 

 
gbooleangboolean
 noauth
 Read / Write / Construct
 

 
gbooleangboolean
 nobsdcomp
 Read / Write / Construct
 

 
gbooleangboolean
 nodeflate
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-chap
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-eap
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-mschap
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-mschapv2
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-pap
 Read / Write / Construct
 

 
gbooleangboolean
 require-mppe
 Read / Write / Construct
 

 
gbooleangboolean
 require-mppe-128
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_pppoe_error_quark ()
@@ -100,24 +100,24 @@
 

 

 
-gchar *password
 Read / Write
 

 
guintguint
 password-flags
 Read / Write
 

 

 
-gchar *service
 Read / Write
 

 

 
-gchar *username
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_serial_error_quark ()
@@ -60,7 +60,7 @@ serial communications

 

 

 
-guint
+guint
 
 
 nm_setting_serial_get_baud ()
@@ -68,7 +68,7 @@ serial communications

 

 

 
-guint
+guint
 
 
 nm_setting_serial_get_bits ()
@@ -84,7 +84,7 @@ serial communications

 

 

 
-guint
+guint
 
 
 nm_setting_serial_get_stopbits ()
@@ -92,7 +92,7 @@ serial communications

 

 

 
-guint64
+guint64
 
 
 nm_setting_serial_get_send_delay ()
@@ -111,27 +111,27 @@ serial communications

 
 

 
guintguint
 baud
 Read / Write / Construct
 

 
guintguint
 bits
 Read / Write / Construct
 

 
gchargchar
 parity
 Read / Write / Construct
 

 
guint64guint64
 send-delay
 Read / Write / Construct
 

 
guintguint
 stopbits
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_team_error_quark ()
@@ -85,13 +85,13 @@
 

 

 
-gchar *config
 Read / Write
 

 

 
-gchar *interface-name
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_team_port_error_quark ()
@@ -77,7 +77,7 @@
 
 

 
-gchar *config
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_vpn_error_quark ()
@@ -81,7 +81,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vpn_get_persistent ()
@@ -89,7 +89,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_data_items ()
@@ -112,7 +112,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_data_item ()
@@ -128,7 +128,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_secrets ()
@@ -151,7 +151,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_secret ()
@@ -183,7 +183,7 @@
 Read / Write
 

 
gbooleangboolean
 persistent
 Read / Write
 

 
-gchar *service-type
 Read / Write
 

 

 
-gchar *user-name
 Read / Write
 

@@ -393,7 +393,7 @@ nm_setting_vpn_get_user_name (
 
nm_setting_vpn_get_persistent ()

-
gboolean
+
gboolean
 nm_setting_vpn_get_persistent (NMSettingVPN *setting);

 

 
Parameters

@@ -418,7 +418,7 @@ nm_setting_vpn_get_persistent (
 

 
nm_setting_vpn_get_num_data_items ()

-
guint32
+
guint32
 nm_setting_vpn_get_num_data_items (NMSettingVPN *setting);

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

 

@@ -521,7 +521,7 @@ by 
 
nm_setting_vpn_remove_data_item ()

-
gboolean
+
gboolean
 nm_setting_vpn_remove_data_item (NMSettingVPN *setting,
                                  const char *key);

 
Deletes a key/value relationship previously established by
@@ -550,8 +550,8 @@ 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.

+
 TRUE if the data item was found and removed from the internal list,
+FALSE if it was not.

 

 

 

@@ -560,7 +560,7 @@ nm_setting_vpn_remove_data_item (void
 nm_setting_vpn_foreach_data_item (NMSettingVPN *setting,
                                   NMVPNIterFunc func,
-                                  gpointer user_data);

+                                  gpointer user_data);

 
Iterates all data items stored in this setting.  It is safe to add, remove,
 and modify data items inside func
 , though any additions or removals made
@@ -597,7 +597,7 @@ during iteration will not be part of the iteration.

 

 

 
nm_setting_vpn_get_num_secrets ()

-
guint32
+
guint32
 nm_setting_vpn_get_num_secrets (NMSettingVPN *setting);

 
Gets number of VPN plugin specific secrets in the setting.

 

@@ -699,7 +699,7 @@ by 
 
nm_setting_vpn_remove_secret ()

-
gboolean
+
gboolean
 nm_setting_vpn_remove_secret (NMSettingVPN *setting,
                               const char *key);

 
Deletes a key/value relationship previously established by
@@ -728,8 +728,8 @@ nm_setting_vpn_remove_secret (
 
Returns

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

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

 

 

 

@@ -738,7 +738,7 @@ nm_setting_vpn_remove_secret (void
 nm_setting_vpn_foreach_secret (NMSettingVPN *setting,
                                NMVPNIterFunc func,
-                               gpointer user_data);
+                               gpointer user_data);
 
Iterates all secrets stored in this setting.  It is safe to add, remove,
 and modify secrets inside func
 , though any additions or removals made during
@@ -873,8 +873,8 @@ values must be strings.

 

 

 
The “persistent” property

-
  “persistent”               gboolean

-
If the VPN service supports persistence, and this property is TRUE,
+
  “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

@@ -891,7 +891,7 @@ passwords or private keys.  Both keys and values must be strings.

 

 

 
The “service-type” property

-
  “service-type”             gchar *

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

@@ -901,7 +901,7 @@ plugin.

 

 

 
The “user-name” property

-
  “user-name”                gchar *

+
  “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
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index 125f1353..df603abd 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -43,7 +43,7 @@
 

-
+
-
+
@@ -191,13 +191,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -261,11 +261,11 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingVlanError
     ├── NMVlanFlags
     ╰── NMVlanPriorityMap
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVlan
 

@@ -284,7 +284,7 @@ necessary for connection to VLAN interfaces.

 
Functions

 

 
nm_setting_vlan_error_quark ()

-
GQuark
+
GQuark
 nm_setting_vlan_error_quark (void);

 
Registers an error quark for NMSettingVlan if necessary.

 

@@ -362,7 +362,7 @@ nm_setting_vlan_get_parent (
 
nm_setting_vlan_get_id ()

-
guint32
+
guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);

 

 
Parameters

@@ -387,7 +387,7 @@ nm_setting_vlan_get_id (
 
nm_setting_vlan_get_flags ()

-
guint32
+
guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);

 

 
Parameters

@@ -412,7 +412,7 @@ nm_setting_vlan_get_flags (
 
nm_setting_vlan_get_num_priorities ()

-
gint32
+
gint32
 nm_setting_vlan_get_num_priorities (NMSettingVlan *setting,
                                     NMVlanPriorityMap map);

 
Returns the number of entires in the
@@ -448,12 +448,12 @@ properties of this setting.

 

 

 
nm_setting_vlan_get_priority ()

-
gboolean
+
gboolean
 nm_setting_vlan_get_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 idx,
-                              guint32 *out_from,
-                              guint32 *out_to);

+                              guint32 idx,
+                              guint32 *out_from,
+                              guint32 *out_to);

 
Retrieve one of the entries of the “ingress_priority_map”
 or “egress_priority_map” properties of this setting.

 

@@ -495,17 +495,17 @@ or 
 

 
Returns

-
 TRUE if a priority map was returned, FALSE if error

+
 TRUE if a priority map was returned, FALSE if error

 

 

 

 

 
nm_setting_vlan_add_priority ()

-
gboolean
+
gboolean
 nm_setting_vlan_add_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 from,
-                              guint32 to);

+                              guint32 from,
+                              guint32 to);

 
Adds a priority mapping to the “ingress_priority_map” or
 “egress_priority_map” properties of the setting. If from
  is
@@ -558,8 +558,8 @@ to

 

 

 
Returns

-
 TRUE if the new priority mapping was successfully added to the
-list, FALSE if error

+
 TRUE if the new priority mapping was successfully added to the
+list, FALSE if error

 

 

 

@@ -568,7 +568,7 @@ list, void
 nm_setting_vlan_remove_priority (NMSettingVlan *setting,
                                  NMVlanPriorityMap map,
-                                 guint32 idx);

+                                 guint32 idx);

 
Removes the priority map at index idx
  from the
 “ingress_priority_map” or “egress_priority_map”
@@ -604,12 +604,12 @@ properties.

 

 

 
nm_setting_vlan_remove_priority_by_value ()

-
gboolean
+
gboolean
 nm_setting_vlan_remove_priority_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
-                                guint32 from,
-                                guint32 to);

+                                guint32 from,
+                                guint32 to);

 
Removes the priority map form
 :to
  from the “ingress_priority_map”
@@ -652,14 +652,14 @@ to

 

 

 
Returns

-
 TRUE if the priority mapping was found and removed; FALSE if it was not.

+
 TRUE if the priority mapping was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

 

 

 
nm_setting_vlan_remove_priority_str_by_value ()

-
gboolean
+
gboolean
 nm_setting_vlan_remove_priority_str_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
@@ -698,7 +698,7 @@ properties.

 

 

 
Returns

-
 TRUE if the priority mapping was found and removed; FALSE if it was not.

+
 TRUE if the priority mapping was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

@@ -736,7 +736,7 @@ nm_setting_vlan_clear_priorities (
 

 
nm_setting_vlan_add_priority_str ()

-
gboolean
+
gboolean
 nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
                                   NMVlanPriorityMap map,
                                   const char *str);

@@ -772,8 +772,8 @@ 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

+
 TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error

 

 

 

@@ -968,7 +968,7 @@ both "from" and "to" are unsigned integers, ie "7:3".

 

 

 
The “flags” property

-
  “flags”                    guint

+
  “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),
@@ -981,7 +981,7 @@ protocol).

 

 

 
The “id” property

-
  “id”                       guint

+
  “id”                       guint

 
The VLAN identifier that the interface created by this connection should
 be assigned.

 
Flags: Read / Write / Construct

@@ -1000,7 +1000,7 @@ SKB priorities.  The mapping is given in the format "from:to" where both
 

 

 
The “interface-name” property

-
  “interface-name”           gchar *

+
  “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
@@ -1012,7 +1012,7 @@ the 
 

 
The “parent” property

-
  “parent”                   gchar *

+
  “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
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index f9b2a7cd..26544076 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -43,7 +43,7 @@
 

-
+gchar *
 
@@ -131,9 +131,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWimaxError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWimax
 

@@ -155,7 +155,7 @@ connections cannot be activated.

 
Functions

 

 
nm_setting_wimax_error_quark ()

-
GQuark
+
GQuark
 nm_setting_wimax_error_quark (void);

 

 
nm_setting_wimax_error_quark has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -216,7 +216,7 @@ specific WiMAX network this setting describes a connection to.

 

 

 
nm_setting_wimax_get_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wimax_get_mac_address (NMSettingWimax *setting);

 

 
nm_setting_wimax_get_mac_address has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -326,7 +326,7 @@ device (known as MAC spoofing).

 

 

 
The “network-name” property

-
  “network-name”             gchar *

+
  “network-name”             gchar *

 
Network Service Provider (NSP) name of the WiMAX network this connection
 should use.

 

diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index fe8a4fc6..75184b1b 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -43,7 +43,7 @@
 

-
-
-
-
-
+
@@ -248,7 +248,7 @@
 
 
+gchar *
 
@@ -265,19 +265,19 @@
 
-
+
+gchar *
 
+gchar *
 
@@ -293,7 +293,7 @@
 
-
+
@@ -369,9 +369,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWiredError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWired
 

@@ -390,7 +390,7 @@ necessary for connection to Ethernet networks.

 
Functions

 

 
nm_setting_wired_error_quark ()

-
GQuark
+
GQuark
 nm_setting_wired_error_quark (void);

 
Registers an error quark for NMSettingWired if necessary.

 

@@ -438,7 +438,7 @@ nm_setting_wired_get_port (
 
nm_setting_wired_get_speed ()

-
guint32
+
guint32
 nm_setting_wired_get_speed (NMSettingWired *setting);

 

 
Parameters

@@ -488,7 +488,7 @@ nm_setting_wired_get_duplex (
 
nm_setting_wired_get_auto_negotiate ()

-
gboolean
+
gboolean
 nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

 

 
Parameters

@@ -513,7 +513,7 @@ nm_setting_wired_get_auto_negotiate (
 

 
nm_setting_wired_get_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wired_get_mac_address (NMSettingWired *setting);

 

 
Parameters

@@ -538,7 +538,7 @@ nm_setting_wired_get_mac_address (
 

 
nm_setting_wired_get_cloned_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wired_get_cloned_mac_address
                                (NMSettingWired *setting);

 

@@ -564,7 +564,7 @@ nm_setting_wired_get_cloned_mac_address
 

 

 
nm_setting_wired_get_mac_address_blacklist ()

-
const GSList *
+
const GSList *
 nm_setting_wired_get_mac_address_blacklist
                                (NMSettingWired *setting);

 

@@ -592,7 +592,7 @@ property of the setting. 

 

 

 
nm_setting_wired_get_num_mac_blacklist_items ()

-
guint32
+
guint32
 nm_setting_wired_get_num_mac_blacklist_items
                                (NMSettingWired *setting);

 

@@ -622,7 +622,7 @@ nm_setting_wired_get_num_mac_blacklist_items
 
const char *
 nm_setting_wired_get_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);

+                                guint32 idx);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_vlan_error_quark ()
@@ -77,7 +77,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vlan_get_id ()
@@ -85,7 +85,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vlan_get_flags ()
@@ -93,7 +93,7 @@
 

 

 
-gint32
+gint32
 
 
 nm_setting_vlan_get_num_priorities ()
@@ -101,7 +101,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_get_priority ()
@@ -109,7 +109,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority ()
@@ -125,7 +125,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_by_value ()
@@ -133,7 +133,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_str_by_value ()
@@ -149,7 +149,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority_str ()
@@ -174,12 +174,12 @@
 Read / Write
 

 
guintguint
 flags
 Read / Write / Construct
 

 
guintguint
 id
 Read / Write / Construct
 

 
-gchar *interface-name
 Read / Write / Construct
 

 

 
-gchar *parent
 Read / Write / Construct
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_wimax_error_quark ()
@@ -65,7 +65,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wimax_get_mac_address ()
@@ -91,7 +91,7 @@
 

 

 
-gchar *network-name
 Read / Write
 

 

 
-GQuark
+GQuark
 
 
 nm_setting_wired_error_quark ()
@@ -66,7 +66,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_speed ()
@@ -81,28 +81,28 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_auto_negotiate ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wired_get_mac_address ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wired_get_cloned_mac_address ()
 
 

 
const GSList *
+const GSList *
 
 
 nm_setting_wired_get_mac_address_blacklist ()
@@ -110,7 +110,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_mac_blacklist_items ()
@@ -125,7 +125,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_mac_blacklist_item ()
@@ -141,7 +141,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_mac_blacklist_item_by_value ()
@@ -157,14 +157,14 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_mtu ()
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_setting_wired_get_s390_subchannels ()
@@ -179,7 +179,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_s390_options ()
@@ -187,7 +187,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_s390_option ()
@@ -202,7 +202,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_s390_option ()
@@ -210,7 +210,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_s390_option ()
@@ -236,7 +236,7 @@
 
 

 
gbooleangboolean
 auto-negotiate
 Read / Write / Construct
 

 
-gchar *duplex
 Read / Write
 
Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 

 
-gchar *port
 Read / Write
 

 

 
-gchar *s390-nettype
 Read / Write
 
Read / Write
 

 
guintguint
 speed
 Read / Write / Construct
 

@@ -656,7 +656,7 @@ at index idx
 

 

 
nm_setting_wired_add_mac_blacklist_item ()

-
gboolean
+
gboolean
 nm_setting_wired_add_mac_blacklist_item
                                (NMSettingWired *setting,
                                 const char *mac);

@@ -685,7 +685,7 @@ nm_setting_wired_add_mac_blacklist_item
 

 

 
Returns

-
 TRUE if the MAC address was added; FALSE if the MAC address
+
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

 

 
Since: 0.9.10

@@ -696,7 +696,7 @@ is invalid or was already present

 
void
 nm_setting_wired_remove_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the MAC address at index idx
  from the blacklist.

 

@@ -726,7 +726,7 @@ nm_setting_wired_remove_mac_blacklist_item
 

 

 
nm_setting_wired_remove_mac_blacklist_item_by_value ()

-
gboolean
+
gboolean
 nm_setting_wired_remove_mac_blacklist_item_by_value
                                (NMSettingWired *setting,
                                 const char *mac);

@@ -757,7 +757,7 @@ the blacklist

 

 

 
Returns

-
 TRUE if the MAC address was found and removed; FALSE if it was not.

+
 TRUE if the MAC address was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

@@ -788,7 +788,7 @@ nm_setting_wired_clear_mac_blacklist_items
 

 

 
nm_setting_wired_get_mtu ()

-
guint32
+
guint32
 nm_setting_wired_get_mtu (NMSettingWired *setting);

 

 
Parameters

@@ -813,7 +813,7 @@ nm_setting_wired_get_mtu (
 
nm_setting_wired_get_s390_subchannels ()

-
const GPtrArray *
+
const GPtrArray *
 nm_setting_wired_get_s390_subchannels (NMSettingWired *setting);

 
Return the list of s390 subchannels that identify the device that this
 connection is applicable to.  The connection should only be used in
@@ -835,7 +835,7 @@ conjunction with that device.

 

 

 
Returns

-
 GPtrArray of strings, each specifying one
+
 GPtrArray of strings, each specifying one
 subchannel the s390 device uses to communicate to the host. 

 
[element-type utf8]

 

@@ -870,7 +870,7 @@ of 'qeth', 'lcs', or 'ctc'.

 

 

 
nm_setting_wired_get_num_s390_options ()

-
guint32
+
guint32
 nm_setting_wired_get_num_s390_options (NMSettingWired *setting);

 
Returns the number of s390-specific options that should be set for this
 device when it is activated.  This can be used to retrieve each s390
@@ -898,9 +898,9 @@ option individually using 
 
nm_setting_wired_get_s390_option ()

-
gboolean
+
gboolean
 nm_setting_wired_get_s390_option (NMSettingWired *setting,
-                                  guint32 idx,
+                                  guint32 idx,
                                   const char **out_key,
                                   const char **out_value);

 
Given an index, return the value of the s390 option at that index.  indexes
@@ -945,8 +945,8 @@ option; this value is owned by the setting and should not be modified. 

 

 

 
Returns

-
 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
+
 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)

 

 

@@ -984,14 +984,14 @@ nm_setting_wired_get_s390_option_by_key
 
 

 
Returns

-
 the value, or NULL if the key/value pair was never added to the
+
 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

 

 
 

 

 
nm_setting_wired_add_s390_option ()

-
gboolean
+
gboolean
 nm_setting_wired_add_s390_option (NMSettingWired *setting,
                                   const char *key,
                                   const char *value);

@@ -1028,14 +1028,14 @@ may already exist.

 

 

 
Returns

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

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

 

 
 

 

 
nm_setting_wired_remove_s390_option ()

-
gboolean
+
gboolean
 nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                      const char *key);

 
Remove the s390-specific option referenced by key
@@ -1065,8 +1065,8 @@ list.

 

 

 
Returns

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

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

 

 
 

@@ -1093,7 +1093,7 @@ nm_setting_wired_get_valid_s390_options
 
 

 
Returns

-
 a NULL-terminated array of strings of valid s390 options. 

+
 a NULL-terminated array of strings of valid s390 options. 

 
[transfer none]

 

 
Since: 0.9.10

@@ -1221,9 +1221,9 @@ required

 
Property Details

 

 
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
+
  “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

@@ -1239,7 +1239,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.

 

 

 
The “duplex” property

-
  “duplex”                   gchar *

+
  “duplex”                   gchar *

 
If specified, request that the device only use the specified duplex mode.
 Either "half" or "full".

 
Flags: Read / Write

@@ -1267,7 +1267,7 @@ address is in the standard hex-digits-and-colons notation
 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “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

@@ -1276,7 +1276,7 @@ breaking larger packets up into multiple Ethernet frames.

 

 

 
The “port” property

-
  “port”                     gchar *

+
  “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.
@@ -1287,7 +1287,7 @@ If the device supports only one port type, this setting is ignored.

 

 

 
The “s390-nettype” property

-
  “s390-nettype”             gchar *

+
  “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

@@ -1319,7 +1319,7 @@ period (.) character.

 

 

 
The “speed” property

-
  “speed”                    guint

+
  “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

diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index f7f77404..1db2d508 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -43,7 +43,7 @@
 

-
-
-
-
-
+gchar *
 
@@ -264,7 +264,7 @@
 
-
+
@@ -275,7 +275,7 @@
 
-
+
@@ -293,28 +293,28 @@
 
 
+gchar *
 
-
+
-
+
-
+
+gchar *
 
@@ -331,7 +331,7 @@
 
-
+
@@ -435,9 +435,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessError
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWireless
 

@@ -456,7 +456,7 @@ necessary for connection to 802.11 Wi-Fi networks.

 
Functions

 

 
nm_setting_wireless_error_quark ()

-
GQuark
+
GQuark
 nm_setting_wireless_error_quark (void);

 
Registers an error quark for NMSettingWireless if necessary.

 

@@ -479,7 +479,7 @@ nm_setting_wireless_new (void
 

 
nm_setting_wireless_get_ssid ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wireless_get_ssid (NMSettingWireless *setting);

 

 
Parameters

@@ -554,7 +554,7 @@ nm_setting_wireless_get_band (
 
nm_setting_wireless_get_channel ()

-
guint32
+
guint32
 nm_setting_wireless_get_channel (NMSettingWireless *setting);

 

 
Parameters

@@ -579,7 +579,7 @@ nm_setting_wireless_get_channel (
 

 
nm_setting_wireless_get_bssid ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wireless_get_bssid (NMSettingWireless *setting);

 

 
Parameters

@@ -604,7 +604,7 @@ nm_setting_wireless_get_bssid (
 

 
nm_setting_wireless_get_rate ()

-
guint32
+
guint32
 nm_setting_wireless_get_rate (NMSettingWireless *setting);

 

 
Parameters

@@ -629,7 +629,7 @@ nm_setting_wireless_get_rate (
 
nm_setting_wireless_get_tx_power ()

-
guint32
+
guint32
 nm_setting_wireless_get_tx_power (NMSettingWireless *setting);

 

 
Parameters

@@ -654,7 +654,7 @@ nm_setting_wireless_get_tx_power (
 

 
nm_setting_wireless_get_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wireless_get_mac_address (NMSettingWireless *setting);

 

 
Parameters

@@ -679,7 +679,7 @@ nm_setting_wireless_get_mac_address (
 

 
nm_setting_wireless_get_cloned_mac_address ()

-
const GByteArray *
+
const GByteArray *
 nm_setting_wireless_get_cloned_mac_address
                                (NMSettingWireless *setting);

 

@@ -705,7 +705,7 @@ nm_setting_wireless_get_cloned_mac_address
 

 

 
nm_setting_wireless_get_mac_address_blacklist ()

-
const GSList *
+
const GSList *
 nm_setting_wireless_get_mac_address_blacklist
                                (NMSettingWireless *setting);

 

@@ -733,7 +733,7 @@ nm_setting_wireless_get_mac_address_blacklist
 

 

 
nm_setting_wireless_get_num_mac_blacklist_items ()

-
guint32
+
guint32
 nm_setting_wireless_get_num_mac_blacklist_items
                                (NMSettingWireless *setting);

 

@@ -763,7 +763,7 @@ nm_setting_wireless_get_num_mac_blacklist_items
 
const char *
 nm_setting_wireless_get_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);

+                                guint32 idx);

 

 
Parameters

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_wireless_error_quark ()
@@ -58,7 +58,7 @@
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_ssid ()
@@ -80,14 +80,14 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_channel ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_bssid ()
@@ -95,7 +95,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_rate ()
@@ -103,28 +103,28 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_tx_power ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_mac_address ()
 
 

 
const GByteArray *
+const GByteArray *
 
 
 nm_setting_wireless_get_cloned_mac_address ()
 
 

 
const GSList *
+const GSList *
 
 
 nm_setting_wireless_get_mac_address_blacklist ()
@@ -132,7 +132,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_mac_blacklist_items ()
@@ -147,7 +147,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_mac_blacklist_item ()
@@ -163,7 +163,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_remove_mac_blacklist_item_by_value ()
@@ -179,7 +179,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_mtu ()
@@ -187,7 +187,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_get_hidden ()
@@ -195,7 +195,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_powersave ()
@@ -203,7 +203,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_seen_bssid ()
@@ -211,7 +211,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_seen_bssids ()
@@ -226,7 +226,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_ap_security_compatible ()
@@ -253,7 +253,7 @@
 

 

 
-gchar *band
 Read / Write
 
Read / Write
 

 
guintguint
 channel
 Read / Write / Construct
 
Read / Write
 

 
gbooleangboolean
 hidden
 Read / Write
 

 
-gchar *mode
 Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 
guintguint
 powersave
 Read / Write
 

 
guintguint
 rate
 Read / Write / Construct
 

 

 
-gchar *security
 Read / Write
 
Read / Write
 

 
guintguint
 tx-power
 Read / Write / Construct
 

@@ -797,7 +797,7 @@ at index idx
 

 

 
nm_setting_wireless_add_mac_blacklist_item ()

-
gboolean
+
gboolean
 nm_setting_wireless_add_mac_blacklist_item
                                (NMSettingWireless *setting,
                                 const char *mac);

@@ -826,7 +826,7 @@ nm_setting_wireless_add_mac_blacklist_item
 

 

 
Returns

-
 TRUE if the MAC address was added; FALSE if the MAC address
+
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

 

 
Since: 0.9.10

@@ -837,7 +837,7 @@ is invalid or was already present

 
void
 nm_setting_wireless_remove_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the MAC address at index idx
  from the blacklist.

 

@@ -867,7 +867,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 

 

 
nm_setting_wireless_remove_mac_blacklist_item_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_remove_mac_blacklist_item_by_value
                                (NMSettingWireless *setting,
                                 const char *mac);

@@ -898,7 +898,7 @@ the blacklist

 

 

 
Returns

-
 TRUE if the MAC address was found and removed; FALSE if it was not.

+
 TRUE if the MAC address was found and removed; FALSE if it was not.

 

 
Since: 0.9.10

 

@@ -929,7 +929,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 

 

 
nm_setting_wireless_get_mtu ()

-
guint32
+
guint32
 nm_setting_wireless_get_mtu (NMSettingWireless *setting);

 

 
Parameters

@@ -954,7 +954,7 @@ nm_setting_wireless_get_mtu (
 
nm_setting_wireless_get_hidden ()

-
gboolean
+
gboolean
 nm_setting_wireless_get_hidden (NMSettingWireless *setting);

 

 
Parameters

@@ -979,7 +979,7 @@ nm_setting_wireless_get_hidden (
 

 
nm_setting_wireless_get_powersave ()

-
guint32
+
guint32
 nm_setting_wireless_get_powersave (NMSettingWireless *setting);

 

 
Parameters

@@ -1005,7 +1005,7 @@ nm_setting_wireless_get_powersave (
 

 
nm_setting_wireless_add_seen_bssid ()

-
gboolean
+
gboolean
 nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
                                     const char *bssid);

 
Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
@@ -1036,14 +1036,14 @@ not be preserved.

 

 

 
Returns

-
 TRUE if bssid
-was already known, FALSE if not

+
 TRUE if bssid
+was already known, FALSE if not

 

 

 

 

 
nm_setting_wireless_get_num_seen_bssids ()

-
guint32
+
guint32
 nm_setting_wireless_get_num_seen_bssids
                                (NMSettingWireless *setting);

 

@@ -1071,7 +1071,7 @@ nm_setting_wireless_get_num_seen_bssids
 
nm_setting_wireless_get_seen_bssid ()

 
const char *
 nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
-                                    guint32 i);

+                                    guint32 i);

 

 
Parameters

 

@@ -1103,7 +1103,7 @@ nm_setting_wireless_get_seen_bssid (
 

 
nm_setting_wireless_ap_security_compatible ()

-
gboolean
+
gboolean
 nm_setting_wireless_ap_security_compatible
                                (NMSettingWireless *s_wireless,
                                 NMSettingWirelessSecurity *s_wireless_sec,
@@ -1133,7 +1133,7 @@ compatible with which access points.

 
 

-
+
@@ -1163,8 +1163,8 @@ capabilities

 
 

 
Returns

-
 TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.

+
 TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.

 

 
 

@@ -1384,7 +1384,7 @@ for this connection.

 
Property Details

 

 
The “band” property

-
  “band”                     gchar *

+
  “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
@@ -1407,7 +1407,7 @@ creating an Ad-Hoc network and is unlikely to in the future.

 

 

 
The “channel” property

-
  “channel”                  guint

+
  “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
@@ -1426,8 +1426,8 @@ of its permanent MAC address.  This is known as MAC cloning or spoofing.

 

 

 
The “hidden” property

-
  “hidden”                   gboolean

-
If TRUE, indicates this network is a non-broadcasting network that hides
+
  “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,
@@ -1456,7 +1456,7 @@ standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").

 

 

 
The “mode” property

-
  “mode”                     gchar *

+
  “mode”                     gchar *

 
Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
 infrastructure is assumed.

 
Flags: Read / Write

@@ -1465,7 +1465,7 @@ infrastructure is assumed.

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “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

@@ -1474,9 +1474,9 @@ breaking larger packets up into multiple Ethernet frames.

 

 

 
The “powersave” property

-
  “powersave”                guint

-
If set to FALSE, Wi-Fi power saving behavior is disabled.  If set to
-TRUE, Wi-Fi power saving behavior is enabled.  All other values are
+
  “powersave”                guint

+
If set to FALSE, Wi-Fi power saving behavior is disabled.  If set to
+TRUE, Wi-Fi power saving behavior is enabled.  All other values are
 reserved.  Note that even though only boolean values are allowed, the
 property type is an unsigned integer to allow for future expansion.

 
Flags: Read / Write

@@ -1486,7 +1486,7 @@ property type is an unsigned integer to allow for future expansion.

 

 

 
The “rate” property

-
  “rate”                     guint

+
  “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
@@ -1497,7 +1497,7 @@ support setting a static bitrate.

 

 

 
The “security” property

-
  “security”                 gchar *

+
  “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
@@ -1533,7 +1533,7 @@ preserved.

 

 

 
The “tx-power” property

-
  “tx-power”                 guint

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

diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 1c740e1c..d091dda2 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -44,7 +44,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

+gchar *
 
@@ -315,24 +315,24 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 
+gchar *
 
+gchar *
 
-
+
+gchar *
 
@@ -350,51 +350,51 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 
+gchar *
 
-
+
-
+
-
+
+gchar *
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
@@ -498,10 +498,10 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingWirelessSecurityError
     ╰── NMWepKeyType
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWirelessSecurity
 

@@ -530,7 +530,7 @@ of how Wi-Fi security works, you may want to get copies of the following books.<
 
Functions

 

 
nm_setting_wireless_security_error_quark ()

-
GQuark
+
GQuark
 nm_setting_wireless_security_error_quark
                                (void);

 
Registers an error quark for NMSettingWired if necessary.

@@ -580,7 +580,7 @@ nm_setting_wireless_security_get_key_mgmt
 

 

 
nm_setting_wireless_security_get_num_protos ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_num_protos
                                (NMSettingWirelessSecurity *setting);

 

@@ -610,7 +610,7 @@ connecting to secure Wi-Fi networks

 
const char *
 nm_setting_wireless_security_get_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);

 

 
Parameters

 

 
s_wireless_sec
a NMSettingWirelessSecurity or NULL
a NMSettingWirelessSecurity or NULL

  
 

 

 

 
-GQuark
+GQuark
 
 
 nm_setting_wireless_security_error_quark ()
@@ -67,7 +67,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_protos ()
@@ -82,7 +82,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_proto ()
@@ -98,7 +98,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_proto_by_value ()
@@ -114,7 +114,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_pairwise ()
@@ -129,7 +129,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_pairwise ()
@@ -145,7 +145,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_pairwise_by_value ()
@@ -161,7 +161,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_groups ()
@@ -176,7 +176,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_group ()
@@ -192,7 +192,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_group_by_value ()
@@ -260,7 +260,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_wep_tx_keyidx ()
@@ -303,7 +303,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gchar *auth-alg
 Read / Write
 

 
-gchar *key-mgmt
 Read / Write
 

 

 
-gchar *leap-password
 Read / Write
 

 
guintguint
 leap-password-flags
 Read / Write
 

 

 
-gchar *leap-username
 Read / Write
 

 
-gchar *psk
 Read / Write
 

 
guintguint
 psk-flags
 Read / Write
 

 
guintguint
 wep-key-flags
 Read / Write
 

 
guintguint
 wep-key-type
 Read / Write / Construct
 

 

 
-gchar *wep-key0
 Read / Write
 

 

 
-gchar *wep-key1
 Read / Write
 

 

 
-gchar *wep-key2
 Read / Write
 

 

 
-gchar *wep-key3
 Read / Write
 

 
guintguint
 wep-tx-keyidx
 Read / Write / Construct
 

@@ -642,7 +642,7 @@ nm_setting_wireless_security_get_proto
 

 

 
nm_setting_wireless_security_add_proto ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_add_proto
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);

@@ -676,8 +676,8 @@ 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

+
 TRUE if the protocol was new and and was added to the allowed
+protocol list, or FALSE if it was already in the list

 

 
 

@@ -686,7 +686,7 @@ protocol list, or void
 nm_setting_wireless_security_remove_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
+                                guint32 i);
 
Removes a protocol from the allowed protocol list.

 

 
Parameters

@@ -714,7 +714,7 @@ nm_setting_wireless_security_remove_proto
 

 

 
nm_setting_wireless_security_remove_proto_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_remove_proto_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);

@@ -743,7 +743,7 @@ nm_setting_wireless_security_remove_proto_by_value
 

 

 
Returns

-
 TRUE if the protocol was found and removed; FALSE it it was not.

+
 TRUE if the protocol was found and removed; FALSE it it was not.

 

 
Since: 0.9.10

 

@@ -774,7 +774,7 @@ specified then all protocols are allowed.

 

 

 
nm_setting_wireless_security_get_num_pairwise ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_num_pairwise
                                (NMSettingWirelessSecurity *setting);

 

@@ -803,7 +803,7 @@ nm_setting_wireless_security_get_num_pairwise
 
const char *
 nm_setting_wireless_security_get_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.

 

@@ -837,7 +837,7 @@ list.

 

 

 
nm_setting_wireless_security_add_pairwise ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_add_pairwise
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);

@@ -869,7 +869,7 @@ compatible with this connection.

 

 

 
Returns

-
 TRUE if the algorithm was added to the list, FALSE if it was
+
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

 

 

@@ -879,7 +879,7 @@ already in the list

 
void
 nm_setting_wireless_security_remove_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);
 
Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.

 

@@ -908,7 +908,7 @@ algorithm list.

 

 

 
nm_setting_wireless_security_remove_pairwise_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_remove_pairwise_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);

@@ -938,7 +938,7 @@ algorithm list.

 

 

 
Returns

-
 TRUE if the encryption algorith was found and removed; FALSE it it was not.

+
 TRUE if the encryption algorith was found and removed; FALSE it it was not.

 

 
Since: 0.9.10

 

@@ -969,7 +969,7 @@ specified then all pairwise encryption algorithms are allowed.

 

 

 
nm_setting_wireless_security_get_num_groups ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_num_groups
                                (NMSettingWirelessSecurity *setting);

 

@@ -998,7 +998,7 @@ nm_setting_wireless_security_get_num_groups
 
const char *
 nm_setting_wireless_security_get_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.

 

@@ -1032,7 +1032,7 @@ list.

 

 

 
nm_setting_wireless_security_add_group ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_add_group
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);

@@ -1065,7 +1065,7 @@ compatible with this connection.

 

 

 
Returns

-
 TRUE if the algorithm was added to the list, FALSE if it was
+
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

 

 

@@ -1075,7 +1075,7 @@ already in the list

 
void
 nm_setting_wireless_security_remove_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);
 
Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.

 

@@ -1104,7 +1104,7 @@ algorithm list.

 

 

 
nm_setting_wireless_security_remove_group_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_remove_group_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);

@@ -1135,7 +1135,7 @@ algorithm list.

 

 

 
Returns

-
 TRUE if the algorithm was found and removed; FALSE it it was not.

+
 TRUE if the algorithm was found and removed; FALSE it it was not.

 

 
Since: 0.9.10

 

@@ -1300,7 +1300,7 @@ nm_setting_wireless_security_get_leap_password_flags
 
const char *
 nm_setting_wireless_security_get_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx);

+                                guint32 idx);
 

 
Parameters

 

@@ -1334,7 +1334,7 @@ nm_setting_wireless_security_get_wep_key
 
void
 nm_setting_wireless_security_set_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx,
+                                guint32 idx,
                                 const char *key);

 
Sets a WEP key in the given index.

 

@@ -1370,7 +1370,7 @@ property.

 

 

 
nm_setting_wireless_security_get_wep_tx_keyidx ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_wep_tx_keyidx
                                (NMSettingWirelessSecurity *setting);

 

@@ -1722,7 +1722,7 @@ the actual WEP key using the MD5 hash algorithm.

 
Property Details

 

 
The “auth-alg” property

-
  “auth-alg”                 gchar *

+
  “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
@@ -1744,7 +1744,7 @@ list element may be one of "wep40", "wep104", "tkip", or "ccmp".

 

 

 
The “key-mgmt” property

-
  “key-mgmt”                 gchar *

+
  “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
@@ -1755,7 +1755,7 @@ any Wi-Fi connection that uses security.

 

 

 
The “leap-password” property

-
  “leap-password”            gchar *

+
  “leap-password”            gchar *

 
The login password for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

@@ -1764,7 +1764,7 @@ any Wi-Fi connection that uses security.

 

 

 
The “leap-password-flags” property

-
  “leap-password-flags”      guint

+
  “leap-password-flags”      guint

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

 
Flags: Read / Write

@@ -1774,7 +1774,7 @@ any Wi-Fi connection that uses security.

 

 

 
The “leap-username” property

-
  “leap-username”            gchar *

+
  “leap-username”            gchar *

 
The login username for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

@@ -1802,7 +1802,7 @@ not specified, both WPA and RSN connections are allowed.

 

 

 
The “psk” property

-
  “psk”                      gchar *

+
  “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
@@ -1815,7 +1815,7 @@ connecting to the Wi-Fi network.

 

 

 
The “psk-flags” property

-
  “psk-flags”                guint

+
  “psk-flags”                guint

 
Flags indicating how to handle the “psk”
 property.

 
Flags: Read / Write

@@ -1825,7 +1825,7 @@ property.

 

 

 
The “wep-key-flags” property

-
  “wep-key-flags”            guint

+
  “wep-key-flags”            guint

 
Flags indicating how to handle the “wep-key0”,
 “wep-key1”, “wep-key2”,
 and “wep-key3” properties.

@@ -1836,7 +1836,7 @@ and 
 
The “wep-key-type” property

-
  “wep-key-type”             guint

+
  “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;
@@ -1850,7 +1850,7 @@ the actual WEP key.

 

 

 
The “wep-key0” property

-
  “wep-key0”                 gchar *

+
  “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

@@ -1859,7 +1859,7 @@ the actual WEP key.

 

 

 
The “wep-key1” property

-
  “wep-key1”                 gchar *

+
  “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

@@ -1868,7 +1868,7 @@ the actual WEP key.

 

 

 
The “wep-key2” property

-
  “wep-key2”                 gchar *

+
  “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

@@ -1877,7 +1877,7 @@ the actual WEP key.

 

 

 
The “wep-key3” property

-
  “wep-key3”                 gchar *

+
  “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

@@ -1886,7 +1886,7 @@ the actual WEP key.

 

 

 
The “wep-tx-keyidx” property

-
  “wep-tx-keyidx”            guint

+
  “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
diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html
index db1e69fb..cf28ac5a 100644
--- a/docs/libnm-util/html/api-index-full.html
+++ b/docs/libnm-util/html/api-index-full.html
@@ -701,43 +701,43 @@ DBUS_TYPE_NM_IP_ROUTES, macro in nm-dbus-glib-types
 

 
G

 

-g_value_array_append, macro in nm-gvaluearray-compat
+g_value_array_append, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_copy, macro in nm-gvaluearray-compat
+g_value_array_copy, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_free, function in nm-gvaluearray-compat
+g_value_array_free, function in nm-gvaluearray-compat
 

 

 

-g_value_array_get_nth, macro in nm-gvaluearray-compat
+g_value_array_get_nth, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_insert, macro in nm-gvaluearray-compat
+g_value_array_insert, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_new, macro in nm-gvaluearray-compat
+g_value_array_new, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_prepend, macro in nm-gvaluearray-compat
+g_value_array_prepend, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_remove, macro in nm-gvaluearray-compat
+g_value_array_remove, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_sort, macro in nm-gvaluearray-compat
+g_value_array_sort, macro in nm-gvaluearray-compat
 

 

 

-g_value_array_sort_with_data, macro in nm-gvaluearray-compat
+g_value_array_sort_with_data, macro in nm-gvaluearray-compat
 

 

 
I

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 25568018..e0772888 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm-util 1.1.91
+      for libnm-util 1.1.92
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/0.9/.
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index cf1ba5fb..57851572 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -646,7 +646,7 @@
 

 
enum NMDeviceType

 
NMDeviceType values indicate the type of hardware represented by
-an NMDevice.

+an NMDevice.

 
(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)

 

 
Members

diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 5b725b7d..9507d0ab 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -42,7 +42,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_init ()
@@ -58,7 +58,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_empty_ssid ()
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_same_ssid ()
@@ -89,7 +89,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_utils_gvalue_hash_dup ()
@@ -105,7 +105,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_security_valid ()
@@ -113,7 +113,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_ap_mode_security_valid ()
@@ -121,7 +121,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wep_key_valid ()
@@ -129,7 +129,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wpa_psk_valid ()
@@ -137,7 +137,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_utils_ip4_addresses_from_gvalue ()
@@ -153,7 +153,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_utils_ip4_routes_from_gvalue ()
@@ -169,7 +169,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_netmask_to_prefix ()
@@ -177,7 +177,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_prefix_to_netmask ()
@@ -185,7 +185,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_get_default_prefix ()
@@ -193,7 +193,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_utils_ip6_addresses_from_gvalue ()
@@ -209,7 +209,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_utils_ip6_routes_from_gvalue ()
@@ -225,7 +225,7 @@
 
 
 
-GSList *
+GSList *
 
 
 nm_utils_ip6_dns_from_gvalue ()
@@ -257,7 +257,7 @@
 
 
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_rsa_key_encrypt ()
@@ -265,7 +265,7 @@
 
 
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_rsa_key_encrypt_aes ()
@@ -273,7 +273,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_pkcs12 ()
@@ -281,7 +281,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMUtilsFileSearchInPathsPredicate) ()
@@ -296,7 +296,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_freq_to_channel ()
@@ -304,7 +304,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_channel_to_freq ()
@@ -312,7 +312,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_find_next_channel ()
@@ -320,7 +320,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wifi_is_channel_valid ()
@@ -352,7 +352,7 @@
 
 
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_hwaddr_atoba ()
@@ -360,7 +360,7 @@
 
 
 
-guint8 *
+guint8 *
 
 
 nm_utils_hwaddr_aton ()
@@ -376,7 +376,7 @@
 
 
 
-guint8 *
+guint8 *
 
 
 nm_utils_hwaddr_aton_len ()
@@ -384,7 +384,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_hwaddr_valid ()
@@ -416,7 +416,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_iface_valid_name ()
@@ -424,7 +424,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_uuid ()
@@ -446,7 +446,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_check_virtual_device_compatibility ()
@@ -480,7 +480,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
 

 

@@ -498,8 +498,8 @@ access points and devices, among other things.

 
Functions

 

 
nm_utils_init ()

-
gboolean
-nm_utils_init (GError **error);

+
gboolean
+nm_utils_init (GError **error);

 
Initializes libnm-util; should be called when starting any program that
 uses libnm-util.  This function can be called more than once.

 

@@ -512,14 +512,14 @@ uses libnm-util.  This function can be called more than once.

 
 
 
error

-
location to store error, or NULL

+
location to store error, or NULL

  
 
 

 

 

 
Returns

-
 TRUE if the initialization was successful, FALSE on failure.

+
 TRUE if the initialization was successful, FALSE on failure.

 

 

 

@@ -533,8 +533,8 @@ does not have any effect, and does not ever need to be called.

 

 

 
nm_utils_is_empty_ssid ()

-
gboolean
-nm_utils_is_empty_ssid (const guint8 *ssid,
+
gboolean
+nm_utils_is_empty_ssid (const guint8 *ssid,
                         int len);

 
Different manufacturers use different mechanisms for not broadcasting the
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
@@ -564,15 +564,15 @@ number of known SSID-cloaking methods.

 

 

 
Returns

-
 TRUE if the SSID is "empty", FALSE if it is not

+
 TRUE if the SSID is "empty", FALSE if it is not

 

 

 

 

 
nm_utils_escape_ssid ()

 
const char *
-nm_utils_escape_ssid (const guint8 *ssid,
-                      guint32 len);

+nm_utils_escape_ssid (const guint8 *ssid,
+                      guint32 len);

 
This function does a quick printable character conversion of the SSID, simply
 replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
@@ -609,10 +609,10 @@ and will be overwritten by subsequent calls to this function

 

 

 
nm_utils_same_ssid ()

-
gboolean
-nm_utils_same_ssid (const GByteArray *ssid1,
-                    const GByteArray *ssid2,
-                    gboolean ignore_trailing_null);

+
gboolean
+nm_utils_same_ssid (const GByteArray *ssid1,
+                    const GByteArray *ssid2,
+                    gboolean ignore_trailing_null);

 
Earlier versions of the Linux kernel added a NULL byte to the end of the
 SSID to enable easy printing of the SSID on the console or in a terminal,
 but this behavior was problematic (SSIDs are simply byte arrays, not strings)
@@ -640,7 +640,7 @@ NULLs, even though that is functionally pointless.

 
 
 
ignore_trailing_null

-
TRUE to ignore one trailing NULL byte

+
TRUE to ignore one trailing NULL byte

  
 
 
@@ -648,14 +648,14 @@ NULLs, even though that is functionally pointless.

 

 

 
Returns

-
 TRUE if the SSIDs are the same, FALSE if they are not

+
 TRUE if the SSIDs are the same, FALSE if they are not

 

 

 

 

 
nm_utils_ssid_to_utf8 ()

 
char *
-nm_utils_ssid_to_utf8 (const GByteArray *ssid);

+nm_utils_ssid_to_utf8 (const GByteArray *ssid);

 
Wi-Fi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
 useful to print the SSID out for debugging purposes, but that should be the
@@ -693,17 +693,17 @@ _only_.

 

 
Returns

 
 an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. 

+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. 

 
[transfer full]

 

 

 

 

 
nm_utils_gvalue_hash_dup ()

-
GHashTable *
-nm_utils_gvalue_hash_dup (GHashTable *hash);

-
Utility function to duplicate a hash table of GValues.

+
GHashTable *
+nm_utils_gvalue_hash_dup (GHashTable *hash);

+
Utility function to duplicate a hash table of GValues.

 

 
Parameters

 

@@ -714,15 +714,15 @@ nm_utils_gvalue_hash_dup (
hash

-
+
a GHashTable mapping string:GValue
a GHashTable mapping string:GValue

  
 

 

 

 

 
Returns

-
 a newly allocated duplicated GHashTable, caller must free the
-returned hash with g_hash_table_unref() or g_hash_table_destroy(). 

+
 a newly allocated duplicated GHashTable, caller must free the
+returned hash with g_hash_table_unref() or g_hash_table_destroy(). 

 
[transfer container][element-type utf8 GObject.Value]

 

 

@@ -730,13 +730,13 @@ returned hash with 
 
nm_utils_slist_free ()

 
void
-nm_utils_slist_free (GSList *list,
-                     GDestroyNotify elem_destroy_fn);

+nm_utils_slist_free (GSList *list,
+                     GDestroyNotify elem_destroy_fn);
 

 
nm_utils_slist_free is deprecated and should not be used in newly-written code.

-
use g_slist_free_full().

+
use g_slist_free_full().

 

-
Utility function to free a GSList.

+
Utility function to free a GSList.

 
[skip]

 

 
Parameters

@@ -749,7 +749,7 @@ nm_utils_slist_free (
list

-
a GSList

+
a GSList

  
 
 
@@ -765,11 +765,11 @@ nm_utils_slist_free (
 
nm_utils_security_valid ()

-
gboolean
+
gboolean
 nm_utils_security_valid (NMUtilsSecurityType type,
                          NMDeviceWifiCapabilities wifi_caps,
-                         gboolean have_ap,
-                         gboolean adhoc,
+                         gboolean have_ap,
+                         gboolean adhoc,
                          NM80211ApFlags ap_flags,
                          NM80211ApSecurityFlags ap_wpa,
                          NM80211ApSecurityFlags ap_rsn);

@@ -834,15 +834,15 @@ e.g. (
 
Returns

-
 TRUE if the device capabilities and AP capabilties intersect and are
+
 TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
-, FALSE if they are not

+, FALSE if they are not

 

 

 

 

 
nm_utils_ap_mode_security_valid ()

-
gboolean
+
gboolean
 nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
                                  NMDeviceWifiCapabilities wifi_caps);

 
Given a set of device capabilities, and a desired security type to check
@@ -874,16 +874,16 @@ e.g. 
 

 
Returns

-
 TRUE if the device capabilities are compatible with the desired
+
 TRUE if the device capabilities are compatible with the desired
 type
-, FALSE if they are not.

+, FALSE if they are not.

 

 
Since: 0.9.8

 

 

 

 
nm_utils_wep_key_valid ()

-
gboolean
+
gboolean
 nm_utils_wep_key_valid (const char *key,
                         NMWepKeyType wep_type);

 
Checks if key
@@ -912,15 +912,15 @@ nm_utils_wep_key_valid (const cha
 

 

 
Returns

-
 TRUE if key
-is a WEP key, FALSE if not

+
 TRUE if key
+is a WEP key, FALSE if not

 

 
Since: 0.9.8

 

 

 

 
nm_utils_wpa_psk_valid ()

-
gboolean
+
gboolean
 nm_utils_wpa_psk_valid (const char *psk);

 
Checks if psk
  is a valid WPA PSK

@@ -941,20 +941,20 @@ nm_utils_wpa_psk_valid (const cha
 

 

 
Returns

-
 TRUE if psk
-is a WPA PSK, FALSE if not

+
 TRUE if psk
+is a WPA PSK, FALSE if not

 

 
Since: 0.9.8

 

 

 

 
nm_utils_ip4_addresses_from_gvalue ()

-
GSList *
-nm_utils_ip4_addresses_from_gvalue (const GValue *value);

-
Utility function to convert a GPtrArray of GArrays of guint32s representing
+
GSList *
+nm_utils_ip4_addresses_from_gvalue (const GValue *value);

+
Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 addresses (which is a tuple of address, gateway,
-and prefix) into a GSList of NMIP4Address objects.  The specific format of
-this serialization is not guaranteed to be stable and the GArray may be
+and prefix) into a GSList of NMIP4Address objects.  The specific format of
+this serialization is not guaranteed to be stable and the GArray may be
 extended in the future.

 

 
Parameters

@@ -966,14 +966,14 @@ extended in the future.

 
 
 
value

-
GValue containing a GPtrArray of GArrays of guint32s

+
GValue containing a GPtrArray of GArrays of guint32s

  
 
 

 

 

 
Returns

-
 a newly allocated GSList of NMIP4Address objects. 

+
 a newly allocated GSList of NMIP4Address objects. 

 
[transfer full][element-type NMIP4Address]

 

 

@@ -981,10 +981,10 @@ extended in the future.

 

 
nm_utils_ip4_addresses_to_gvalue ()

 
void
-nm_utils_ip4_addresses_to_gvalue (GSList *list,
-                                  GValue *value);

-
Utility function to convert a GSList of NMIP4Address objects into a
-GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
+nm_utils_ip4_addresses_to_gvalue (GSList *list,
+                                  GValue *value);
+
Utility function to convert a GSList of NMIP4Address objects into a
+GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 addresses (which is a tuple of address, gateway, and prefix).   The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.

@@ -1004,9 +1004,9 @@ extended in the future.

 
 
 
value

-
a pointer to a GValue into which to place the converted addresses,
+
a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().

+g_value_unset().

  
 
 
@@ -1016,11 +1016,11 @@ which should be unset by the caller (when no longer needed) with
 

 

 
nm_utils_ip4_routes_from_gvalue ()

-
GSList *
-nm_utils_ip4_routes_from_gvalue (const GValue *value);

-
Utility function to convert a GPtrArray of GArrays of guint32s representing
+
GSList *
+nm_utils_ip4_routes_from_gvalue (const GValue *value);

+
Utility function to convert a GPtrArray of GArrays of guint32s representing
 a list of NetworkManager IPv4 routes (which is a tuple of route, next hop,
-prefix, and metric) into a GSList of NMIP4Route objects.  The specific
+prefix, and metric) into a GSList of NMIP4Route objects.  The specific
 format of this serialization is not guaranteed to be stable and may be
 extended in the future.

 

@@ -1033,14 +1033,14 @@ extended in the future.

 
 
 
value

-
GValue containing a GPtrArray of GArrays of guint32s

+
GValue containing a GPtrArray of GArrays of guint32s

  
 
 

 

 

 
Returns

-
 a newly allocated GSList of NMIP4Route objects. 

+
 a newly allocated GSList of NMIP4Route objects. 

 
[transfer full][element-type NMIP4Route]

 

 

@@ -1048,10 +1048,10 @@ extended in the future.

 

 
nm_utils_ip4_routes_to_gvalue ()

 
void
-nm_utils_ip4_routes_to_gvalue (GSList *list,
-                               GValue *value);

-
Utility function to convert a GSList of NMIP4Route objects into a
-GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
+nm_utils_ip4_routes_to_gvalue (GSList *list,
+                               GValue *value);
+
Utility function to convert a GSList of NMIP4Route objects into a
+GPtrArray of GArrays of guint32s representing a list of NetworkManager IPv4
 routes (which is a tuple of route, next hop, prefix, and metric).   The
 specific format of this serialization is not guaranteed to be stable and may
 be extended in the future.

@@ -1071,9 +1071,9 @@ be extended in the future.

 
 
 
value

-
a pointer to a GValue into which to place the converted routes,
+
a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().

+g_value_unset().

  
 
 
@@ -1083,8 +1083,8 @@ which should be unset by the caller (when no longer needed) with
 

 

 
nm_utils_ip4_netmask_to_prefix ()

-
guint32
-nm_utils_ip4_netmask_to_prefix (guint32 netmask);

+
guint32
+nm_utils_ip4_netmask_to_prefix (guint32 netmask);

 

 
Parameters

 

@@ -1108,8 +1108,8 @@ nm_utils_ip4_netmask_to_prefix (
 
nm_utils_ip4_prefix_to_netmask ()

-
guint32
-nm_utils_ip4_prefix_to_netmask (guint32 prefix);

+
guint32
+nm_utils_ip4_prefix_to_netmask (guint32 prefix);

 

 
Parameters

 

@@ -1133,8 +1133,8 @@ nm_utils_ip4_prefix_to_netmask (
 
nm_utils_ip4_get_default_prefix ()

-
guint32
-nm_utils_ip4_get_default_prefix (guint32 ip);

+
guint32
+nm_utils_ip4_get_default_prefix (guint32 ip);

 
When the Internet was originally set up, various ranges of IP addresses were
 segmented into three network classes: A, B, and C.  This function will return
 a prefix that is associated with the IP address specified defining where it
@@ -1162,12 +1162,12 @@ falls in the predefined classes.

 

 

 
nm_utils_ip6_addresses_from_gvalue ()

-
GSList *
-nm_utils_ip6_addresses_from_gvalue (const GValue *value);

-
Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
+
GSList *
+nm_utils_ip6_addresses_from_gvalue (const GValue *value);

+
Utility function to convert a GPtrArray of GValueArrays of (GArray of guchars) and guint32
 representing a list of NetworkManager IPv6 addresses (which is a tuple of address,
-prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
-this serialization is not guaranteed to be stable and the GValueArray may be
+prefix, and gateway), into a GSList of NMIP6Address objects.  The specific format of
+this serialization is not guaranteed to be stable and the GValueArray may be
 extended in the future.

 

 
Parameters

@@ -1179,14 +1179,14 @@ extended in the future.

 
 

-
+

 
value
gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32
gvalue containing a GPtrArray of GValueArrays of (GArray of guchars) and guint32

  
 

 

 

 

 
Returns

-
 a newly allocated GSList of NMIP6Address objects. 

+
 a newly allocated GSList of NMIP6Address objects. 

 
[transfer full][element-type NMIP6Address]

 

 

@@ -1194,10 +1194,10 @@ extended in the future.

 

 
nm_utils_ip6_addresses_to_gvalue ()

 
void
-nm_utils_ip6_addresses_to_gvalue (GSList *list,
-                                  GValue *value);

-
Utility function to convert a GSList of NMIP6Address objects into a
-GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
+nm_utils_ip6_addresses_to_gvalue (GSList *list,
+                                  GValue *value);
+
Utility function to convert a GSList of NMIP6Address objects into a
+GPtrArray of GValueArrays representing a list of NetworkManager IPv6 addresses
 (which is a tuple of address, prefix, and gateway). The specific format of
 this serialization is not guaranteed to be stable and may be extended in the
 future.

@@ -1217,9 +1217,9 @@ future.

 
 
 
value

-
a pointer to a GValue into which to place the converted addresses,
+
a pointer to a GValue into which to place the converted addresses,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().

+g_value_unset().

  
 
 
@@ -1229,12 +1229,12 @@ which should be unset by the caller (when no longer needed) with
 

 

 
nm_utils_ip6_routes_from_gvalue ()

-
GSList *
-nm_utils_ip6_routes_from_gvalue (const GValue *value);

-
Utility function GPtrArray of GValueArrays of (GArray of guchars), guint32,
-(GArray of guchars), and guint32 representing a list of NetworkManager IPv6
+
GSList *
+nm_utils_ip6_routes_from_gvalue (const GValue *value);

+
Utility function GPtrArray of GValueArrays of (GArray of guchars), guint32,
+(GArray of guchars), and guint32 representing a list of NetworkManager IPv6
 routes (which is a tuple of destination, prefix, next hop, and metric)
-into a GSList of NMIP6Route objects.  The specific format of this serialization
+into a GSList of NMIP6Route objects.  The specific format of this serialization
 is not guaranteed to be stable and may be extended in the future.

 

 
Parameters

@@ -1246,15 +1246,15 @@ is not guaranteed to be stable and may be extended in the future.

 
 
 
value

-
GValue containing a GPtrArray of GValueArrays of (GArray of guchars), guint32,
-(GArray of guchars), and guint32

+
GValue containing a GPtrArray of GValueArrays of (GArray of guchars), guint32,
+(GArray of guchars), and guint32

  
 
 

 

 

 
Returns

-
 a newly allocated GSList of NMIP6Route objects. 

+
 a newly allocated GSList of NMIP6Route objects. 

 
[transfer full][element-type NMIP6Route]

 

 

@@ -1262,10 +1262,10 @@ is not guaranteed to be stable and may be extended in the future.

 

 
nm_utils_ip6_routes_to_gvalue ()

 
void
-nm_utils_ip6_routes_to_gvalue (GSList *list,
-                               GValue *value);

-
Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
-GValueArrays of (GArray of guchars), guint32, (GArray of guchars), and guint32
+nm_utils_ip6_routes_to_gvalue (GSList *list,
+                               GValue *value);
+
Utility function to convert a GSList of NMIP6Route objects into a GPtrArray of
+GValueArrays of (GArray of guchars), guint32, (GArray of guchars), and guint32
 representing a list of NetworkManager IPv6 routes (which is a tuple of destination,
 prefix, next hop, and metric).  The specific format of this serialization is not
 guaranteed to be stable and may be extended in the future.

@@ -1285,9 +1285,9 @@ guaranteed to be stable and may be extended in the future.

 
 
 
value

-
a pointer to a GValue into which to place the converted routes,
+
a pointer to a GValue into which to place the converted routes,
 which should be unset by the caller (when no longer needed) with
-g_value_unset().

+g_value_unset().

  
 
 
@@ -1297,10 +1297,10 @@ which should be unset by the caller (when no longer needed) with
 

 

 
nm_utils_ip6_dns_from_gvalue ()

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

+
GSList *
+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

@@ -1312,24 +1312,24 @@ nm_utils_ip6_dns_from_gvalue (const 
value

-
a GValue

+
a GValue

  
 
 

 

 

 
Returns

-
 a GSList of IP6 addresses.

+
 a GSList of IP6 addresses.

 

 

 

 

 
nm_utils_ip6_dns_to_gvalue ()

 
void
-nm_utils_ip6_dns_to_gvalue (GSList *list,
-                            GValue *value);

-
Utility function to convert a GSList of struct
-in6_addr structs into a GPtrArray of GByteArrays
+nm_utils_ip6_dns_to_gvalue (GSList *list,
+                            GValue *value);
+
Utility function to convert a GSList of struct
+in6_addr structs into a GPtrArray of GByteArrays
 representing each server's IPv6 addresses in network byte order.
 The specific format of this serialization is not guaranteed to be
 stable and may be extended in the future.

@@ -1350,9 +1350,9 @@ stable and may be extended in the future.

 
 
 
value

-
a pointer to a GValue into which to place the converted DNS server
+
a pointer to a GValue into which to place the converted DNS server
 addresses, which should be unset by the caller (when no longer needed) with
-g_value_unset().

+g_value_unset().

  
 
 
@@ -1367,7 +1367,7 @@ 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()

+object's “id”: property.  Should be freed with g_free()

 

 

 

@@ -1401,11 +1401,11 @@ object's 
 

 
nm_utils_rsa_key_encrypt ()

-
GByteArray *
-nm_utils_rsa_key_encrypt (const GByteArray *data,
+
GByteArray *
+nm_utils_rsa_key_encrypt (const GByteArray *data,
                           const char *in_password,
                           char **out_password,
-                          GError **error);

+                          GError **error);

 
Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
 suitable for writing to a file. It uses Triple DES cipher for the encryption.

@@ -1431,7 +1431,7 @@ suitable for writing to a file. It uses Triple DES cipher for the encryption.

 
out_password

 
 if in_password
-was NULL, a random password will be generated
+was NULL, a random password will be generated
 and returned in this argument. 

 [out][allow-none]
 
@@ -1453,11 +1453,11 @@ certificate/private key file. 

 

 

 
nm_utils_rsa_key_encrypt_aes ()

-
GByteArray *
-nm_utils_rsa_key_encrypt_aes (const GByteArray *data,
+
GByteArray *
+nm_utils_rsa_key_encrypt_aes (const GByteArray *data,
                               const char *in_password,
                               char **out_password,
-                              GError **error);

+                              GError **error);

 
Encrypts the given RSA private key data with the given password (or generates
 a password if no password was given) and converts the data to PEM format
 suitable for writing to a file.  It uses AES cipher for the encryption.

@@ -1483,7 +1483,7 @@ suitable for writing to a file.  It uses AES cipher for the encryption.

 
 
out_password

 
 if in_password
-was NULL, a random password will be generated
+was NULL, a random password will be generated
 and returned in this argument. 

 [out][allow-none]
 
@@ -1505,7 +1505,7 @@ certificate/private key file. 

 

 

 
nm_utils_file_is_pkcs12 ()

-
gboolean
+
gboolean
 nm_utils_file_is_pkcs12 (const char *filename);

 
Utility function to find out if the filename
  is in PKCS#12 format.

@@ -1526,15 +1526,15 @@ nm_utils_file_is_pkcs12 (const ch
 

 

 
Returns

-
 TRUE if the file is PKCS#12, FALSE if it is not

+
 TRUE if the file is PKCS#12, FALSE if it is not

 

 

 

 

 
NMUtilsFileSearchInPathsPredicate ()

-
gboolean
+
gboolean
 (*NMUtilsFileSearchInPathsPredicate) (const char *filename,
-                                      gpointer user_data);

+                                      gpointer user_data);

 

 

 

@@ -1543,10 +1543,10 @@ nm_utils_file_is_pkcs12 (const ch
 nm_utils_file_search_in_paths (const char *progname,
                                const char *try_first,
                                const char *const *paths,
-                               GFileTest file_test_flags,
+                               GFileTest file_test_flags,
                                NMUtilsFileSearchInPathsPredicate predicate,
-                               gpointer user_data,
-                               GError **error);
+                               gpointer user_data,
+                               GError **error);
 
Searches for a progname
  file in a list of search paths
 .

@@ -1573,16 +1573,16 @@ It is silently ignored if it is empty or not an absolute path. 

 
 
 
paths

-
 a NULL terminated list of search paths.
-Can be empty or NULL, in which case only try_first
+
 a NULL terminated list of search paths.
+Can be empty or NULL, in which case only try_first
 is checked. 

 [allow-none]
 
 
 
file_test_flags

-
the flags passed to g_file_test() when searching
+
the flags passed to g_file_test() when searching
 for progname
-. Set it to 0 to skip the g_file_test().

+. Set it to 0 to skip the g_file_test().

  
 
 
@@ -1603,7 +1603,7 @@ function. 

 
 
 
error

-
 on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 

+
 on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 

 [allow-none]
 
 
@@ -1611,7 +1611,7 @@ function. 

 

 

 
Returns

-
 the full path to the helper, if found, or NULL if not found.
+
 the full path to the helper, if found, or NULL if not found.
 The returned string is not owned by the caller, but later
 invocations of the function might overwrite it. 

 
[transfer none]

@@ -1620,8 +1620,8 @@ invocations of the function might overwrite it. 

 

 

 
nm_utils_wifi_freq_to_channel ()

-
guint32
-nm_utils_wifi_freq_to_channel (guint32 freq);

+
guint32
+nm_utils_wifi_freq_to_channel (guint32 freq);

 
Utility function to translate a Wi-Fi frequency to its corresponding channel.

 

 
Parameters

@@ -1646,8 +1646,8 @@ nm_utils_wifi_freq_to_channel (
 
nm_utils_wifi_channel_to_freq ()

-
guint32
-nm_utils_wifi_channel_to_freq (guint32 channel,
+
guint32
+nm_utils_wifi_channel_to_freq (guint32 channel,
                                const char *band);

 
Utility function to translate a Wi-Fi channel to its corresponding frequency.

 

@@ -1682,8 +1682,8 @@ is invalid

 

 

 
nm_utils_wifi_find_next_channel ()

-
guint32
-nm_utils_wifi_find_next_channel (guint32 channel,
+
guint32
+nm_utils_wifi_find_next_channel (guint32 channel,
                                  int direction,
                                  char *band);

 
Utility function to find out next/previous Wi-Fi channel for a channel.

@@ -1722,8 +1722,8 @@ nm_utils_wifi_find_next_channel (
 
nm_utils_wifi_is_channel_valid ()

-
gboolean
-nm_utils_wifi_is_channel_valid (guint32 channel,
+
gboolean
+nm_utils_wifi_is_channel_valid (guint32 channel,
                                 const char *band);

 
Utility function to verify Wi-Fi channel validity.

 

@@ -1750,7 +1750,7 @@ nm_utils_wifi_is_channel_valid (
 
Returns

-
 TRUE or FALSE

+
 TRUE or FALSE

 

 

 

@@ -1823,7 +1823,7 @@ a length; but you can just use 
 
nm_utils_hwaddr_ntoa ()

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

 
Converts addr
  to textual form.

@@ -1862,12 +1862,12 @@ a type.

 

 

 
nm_utils_hwaddr_atoba ()

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

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

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

 

 
Parameters

 

@@ -1893,7 +1893,7 @@ nm_utils_hwaddr_atoba (const char
 
 

 
Returns

-
 a new GByteArray, or NULL if asc
+
 a new GByteArray, or NULL if asc
 couldn't
 be parsed. 

 
[transfer full]

@@ -1902,15 +1902,15 @@ be parsed. 

 

 

 
nm_utils_hwaddr_aton ()

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

+                      gpointer buffer);

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

+GByteArray.

 
See also nm_utils_hwaddr_aton_len(), which takes an output length
 instead of a type.

 

@@ -1944,7 +1944,7 @@ instead of a type.

 

 
Returns

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

 

 

@@ -1952,8 +1952,8 @@ couldn't be parsed

 

 
nm_utils_hwaddr_ntoa_len ()

 
char *
-nm_utils_hwaddr_ntoa_len (gconstpointer addr,
-                          gsize length);

+nm_utils_hwaddr_ntoa_len (gconstpointer addr,
+                          gsize length);
 
Converts addr
  to textual form.

 

@@ -1990,10 +1990,10 @@ nm_utils_hwaddr_ntoa_len (
 
nm_utils_hwaddr_aton_len ()

-
guint8 *
+
guint8 *
 nm_utils_hwaddr_aton_len (const char *asc,
-                          gpointer buffer,
-                          gsize length);

+                          gpointer buffer,
+                          gsize length);

 
Parses asc
  and converts it to binary form in buffer
 .
@@ -2030,7 +2030,7 @@ the size of the buffer in bytes.

 

 
Returns

 
 buffer
-, or NULL if asc
+, or NULL if asc
 couldn't be parsed
 or would be shorter or longer than length
 .

@@ -2040,7 +2040,7 @@ or would be shorter or longer than length
 

 
nm_utils_hwaddr_valid ()

-
gboolean
+
gboolean
 nm_utils_hwaddr_valid (const char *asc);

 
Parses asc
  to see if it is a valid hardware address of some type.

@@ -2061,9 +2061,9 @@ nm_utils_hwaddr_valid (const char
 

 

 
Returns

-
 TRUE if asc
+
 TRUE if asc
 appears to be a valid hardware address
-of some type, FALSE if not.

+of some type, FALSE if not.

 

 
Since: 0.9.10

 

@@ -2178,7 +2178,7 @@ string (it has to be even)

 

 

 
Returns

-
 a array of bytes, or NULL on error. 

+
 a array of bytes, or NULL on error. 

 
[transfer full]

 

 
Since: 0.9.10

@@ -2186,7 +2186,7 @@ string (it has to be even)

 

 

 
nm_utils_iface_valid_name ()

-
gboolean
+
gboolean
 nm_utils_iface_valid_name (const char *name);

 
This function is a 1:1 copy of the kernel's interface validation
 function in net/core/dev.c.

@@ -2207,14 +2207,14 @@ function in net/core/dev.c.

 

 

 
Returns

-
 TRUE if interface name is valid, otherwise FALSE is returned.

+
 TRUE if interface name is valid, otherwise FALSE is returned.

 

 
Since: 0.9.8

 

 

 

 
nm_utils_is_uuid ()

-
gboolean
+
gboolean
 nm_utils_is_uuid (const char *str);

 
Checks if str
  is a UUID

@@ -2235,8 +2235,8 @@ nm_utils_is_uuid (const char
 

 
Returns

-
 TRUE if str
-is a UUID, FALSE if not

+
 TRUE if str
+is a UUID, FALSE if not

 

 
Since: 0.9.8

 

@@ -2266,7 +2266,7 @@ nm_utils_inet4_ntop (in_addr_t
dst

 
Returns

 
 the input buffer dst
 , or a pointer to an
-internal, static buffer. NULL is not allowed as in6addr
+internal, static buffer. NULL is not allowed as in6addr
 ,
 otherwise, this function cannot fail.

 
@@ -2339,10 +2339,10 @@ otherwise, this function cannot fail.

 

 

 
nm_utils_check_virtual_device_compatibility ()

-
gboolean
+
gboolean
 nm_utils_check_virtual_device_compatibility
-                               (GType virtual_type,
-                                GType other_type);

+                               (GType virtual_type,
+                                GType other_type);

 
Determines if a connection of type virtual_type
  can (in the
 general case) work with connections of type other_type
@@ -2356,7 +2356,7 @@ general case) work with connections of type other_ty
 then this checks if other_type
  is a valid type for a slave of that
 master.

-
Note that even if this returns TRUE it is not guaranteed that
+
Note that even if this returns TRUE it is not guaranteed that
 every connection of type other_type
  is
 compatible with virtual_type
@@ -2388,7 +2388,7 @@ underlying device driver.

 

 

 
Returns

-
 TRUE or FALSE

+
 TRUE or FALSE

 

 
Since: 0.9.10

 
diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 350a7100..9c2eaa40 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -23,7 +23,7 @@
 

 Object Hierarchy

 
-    GObject
+    GObject
     ├── NMSetting
     │   ├── NMSetting8021x
     │   ├── NMSettingAdsl
@@ -52,7 +52,7 @@
     │   ├── NMSettingWirelessSecurity
     │   ╰── NMSettingVPN
     ╰── NMConnection
-    GEnum
+    GEnum
     ├── NMConnectionError
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
@@ -95,7 +95,7 @@
     ├── NMVlanFlags
     ├── NMVlanPriorityMap
     ╰── NMWepKeyType
-    GBoxed
+    GBoxed
     ├── NMIP4Address
     ├── NMIP4Route
     ├── NMIP6Address
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index 069199b8..99f6a00b 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.1.91
+1.1.92
diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html
index 9155943d..b1469048 100644
--- a/docs/libnm/html/NMAccessPoint.html
+++ b/docs/libnm/html/NMAccessPoint.html
@@ -67,7 +67,7 @@
 

+gchar *
 
@@ -160,23 +160,23 @@
 
-
+
+gchar *
 
-
+
-
+
@@ -192,12 +192,12 @@
 
 
+GBytes *
 
-
+
@@ -266,7 +266,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMAccessPoint
 

@@ -357,7 +357,7 @@ point.

 

 

 
nm_access_point_get_ssid ()

-
GBytes *
+
GBytes *
 nm_access_point_get_ssid (NMAccessPoint *ap);

 
Gets the SSID of the access point.

 

@@ -377,7 +377,7 @@ nm_access_point_get_ssid (
 
Returns

-
 the GBytes containing the SSID, or NULL if the
+
 the GBytes containing the SSID, or NULL if the
 SSID is unknown. 

 
[transfer none]

 

@@ -412,7 +412,7 @@ not be modified or freed.

 

 

 
nm_access_point_get_frequency ()

-
guint32
+
guint32
 nm_access_point_get_frequency (NMAccessPoint *ap);

 
Gets the frequency of the access point.

 

@@ -464,7 +464,7 @@ nm_access_point_get_mode (
 
nm_access_point_get_max_bitrate ()

-
guint32
+
guint32
 nm_access_point_get_max_bitrate (NMAccessPoint *ap);

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

 

@@ -490,7 +490,7 @@ nm_access_point_get_max_bitrate (
 

 
nm_access_point_get_strength ()

-
guint8
+
guint8
 nm_access_point_get_strength (NMAccessPoint *ap);

 
Gets the current signal strength of the access point.

 

@@ -516,7 +516,7 @@ nm_access_point_get_strength (
 
nm_access_point_get_last_seen ()

-
gint
+
gint
 nm_access_point_get_last_seen (NMAccessPoint *ap);

 
Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the access
@@ -545,9 +545,9 @@ point has not been found in a scan.

 

 

 
nm_access_point_filter_connections ()

-
GPtrArray *
+
GPtrArray *
 nm_access_point_filter_connections (NMAccessPoint *ap,
-                                    const GPtrArray *connections);

+                                    const GPtrArray *connections);

 
Filters a given array of connections for a given NMAccessPoint object and
 returns connections which may be activated with the access point.  Any
 returned connections will match the ap
@@ -573,7 +573,7 @@ with this function.

 
 

-
@@ -583,18 +583,18 @@ filter. 

 

 
Returns

 
 an array of
-NMConnections that could be activated with the given ap
+NMConnections that could be activated with the given ap
 .  The array should
-be freed with g_ptr_array_unref() when it is no longer required. 

+be freed with g_ptr_array_unref() when it is no longer required. 

 
[transfer container][element-type NMConnection]

 

 
 

 

 
nm_access_point_connection_valid ()

-
gboolean
+
gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);

+                                  NMConnection *connection);

 
Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 ap
@@ -617,7 +617,7 @@ against

 
 

-
@@ -626,8 +626,8 @@ against

 
 

 
Returns

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

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

 

 
 
@@ -703,7 +703,7 @@ against

 
Property Details

 

 
The “bssid” property

-
  “bssid”                    gchar *

+
  “bssid”                    gchar *

 
The BSSID of the access point.

 
Flags: Read

 
Default value: NULL

@@ -718,7 +718,7 @@ against

 

 

 
The “frequency” property

-
  “frequency”                guint

+
  “frequency”                guint

 
The frequency of the access point.

 
Flags: Read

 
Allowed values: <= 10000

@@ -727,7 +727,7 @@ against

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

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

@@ -739,7 +739,7 @@ against

 

 

 
The “last-seen” property

-
  “last-seen”                gint

+
  “last-seen”                gint

 
The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
 access point was found in scan results.  A value of -1 means the
 access point has not been found in a scan.

@@ -751,7 +751,7 @@ access point has not been found in a scan.

 

 

 
The “max-bitrate” property

-
  “max-bitrate”              guint

+
  “max-bitrate”              guint

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

 
Flags: Read

 
Default value: 0

@@ -776,14 +776,14 @@ coordinator of the wireless network allowing clients to connect) or
 

 

 
The “ssid” property

-
  “ssid”                     GBytes *

-
The SSID of the access point, or NULL if it is not known.

+
  “ssid”                     GBytes *

+
The SSID of the access point, or NULL if it is not known.

 
Flags: Read

 

 

 

 
The “strength” property

-
  “strength”                 guchar

+
  “strength”                 guchar

 
The current signal strength of the access point.

 
Flags: Read

 
Default value: 0

diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index d0f09298..bcd2410d 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -78,7 +78,7 @@
 
 
 

-
-
+
-
+
+GPtrArray *
 
@@ -204,7 +204,7 @@
 
 
+gchar *
 
@@ -228,7 +228,7 @@
 
 
+gchar *
 
@@ -239,18 +239,18 @@
 
 
+gchar *
 
+gchar *
 
-
+
@@ -330,7 +330,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVpnConnection
@@ -374,7 +374,7 @@ nm_active_connection_get_connection (
nm_active_connection_get_id ()

 
const char *
 nm_active_connection_get_id (NMActiveConnection *connection);

-
Gets the NMConnection's ID.

+
Gets the NMConnection's ID.

 

 
Parameters

 
the destination buffer, it must contain at least
 INET_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet6_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2313,7 +2313,7 @@ nm_utils_inet6_ntop (const struct
 
dst

 
the destination buffer, it must contain at least
 INET6_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet4_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2330,7 +2330,7 @@ buffer to avoid these issues.

 

 

 
-GBytes *
+GBytes *
 
 
 nm_access_point_get_ssid ()
@@ -82,7 +82,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_access_point_get_frequency ()
@@ -98,7 +98,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_access_point_get_max_bitrate ()
@@ -106,7 +106,7 @@
 

 

 
-guint8
+guint8
 
 
 nm_access_point_get_strength ()
@@ -114,7 +114,7 @@
 

 

 
-gint
+gint
 
 
 nm_access_point_get_last_seen ()
@@ -122,7 +122,7 @@
 

 

 
-GPtrArray *
+GPtrArray *
 
 
 nm_access_point_filter_connections ()
@@ -130,7 +130,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_access_point_connection_valid ()
@@ -150,7 +150,7 @@
 

 

 
-gchar *bssid
 Read
 
Read
 

 
guintguint
 frequency
 Read
 

 

 
-gchar *hw-address
 Read
 

 
gintgint
 last-seen
 Read
 

 
guintguint
 max-bitrate
 Read
 

 
-GBytes *ssid
 Read
 

 
gucharguchar
 strength
 Read
 

 
connections
 an array of NMConnections to
+
 an array of NMConnections to
 filter. 

 [element-type NMConnection]
 

 
connection
an NMConnection to validate against ap
+
an NMConnection to validate against ap
 

  
 
const GPtrArray *
+const GPtrArray *
 
 
 nm_active_connection_get_devices ()
@@ -102,7 +102,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default ()
@@ -126,7 +126,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_active_connection_get_default6 ()
@@ -150,7 +150,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_active_connection_get_vpn ()
@@ -175,18 +175,18 @@
 Read
 

 
gbooleangboolean
 default
 Read
 

 
gbooleangboolean
 default6
 Read
 

 

 
-GPtrArray *devices
 Read
 

 
-gchar *id
 Read
 

 
-gchar *specific-object-path
 Read
 

 
-gchar *type
 Read
 

 

 
-gchar *uuid
 Read
 

 
gbooleangboolean
 vpn
 Read
 

@@ -392,7 +392,7 @@ nm_active_connection_get_id (
 
Returns

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

 
 
@@ -401,7 +401,7 @@ This is the internal string used by the connection, and must not be modified.
nm_active_connection_get_uuid ()

 
const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);

-
Gets the NMConnection's UUID.

+
Gets the NMConnection's UUID.

 

 
Parameters

 

@@ -419,7 +419,7 @@ nm_active_connection_get_uuid (
 

 
Returns

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

 

 
@@ -429,7 +429,7 @@ This is the internal string used by the connection, and must not be modified.
const char *
 nm_active_connection_get_connection_type
                                (NMActiveConnection *connection);
-
Gets the NMConnection's type.

+
Gets the NMConnection's type.

 

 
Parameters

 

@@ -447,7 +447,7 @@ nm_active_connection_get_connection_type
 
 

 
Returns

-
 the type of the NMConnection that backs the NMActiveConnection.
+
 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 +488,7 @@ by the connection, and must not be modified.

 

 

 
nm_active_connection_get_devices ()

-
const GPtrArray *
+
const GPtrArray *
 nm_active_connection_get_devices (NMActiveConnection *connection);

 
Gets the NMDevices used for the active connections.

 

@@ -508,7 +508,7 @@ nm_active_connection_get_devices (
 

 
Returns

-
 the GPtrArray containing NMDevices.
+
 the GPtrArray containing NMDevices.
 This is the internal copy used by the connection, and must not be modified. 

 
[element-type NMDevice]

 

@@ -569,7 +569,7 @@ nm_active_connection_get_master (
 

 
nm_active_connection_get_default ()

-
gboolean
+
gboolean
 nm_active_connection_get_default (NMActiveConnection *connection);

 
Whether the active connection is the default IPv4 one (that is, is used for
 the default IPv4 route and DNS information).

@@ -590,7 +590,7 @@ the default IPv4 route and DNS information).

 

 

 
Returns

-
 TRUE if the active connection is the default IPv4 connection

+
 TRUE if the active connection is the default IPv4 connection

 

 

 

@@ -616,7 +616,7 @@ nm_active_connection_get_ip4_config (
 

 
Returns

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

 
[transfer none]

 

@@ -645,7 +645,7 @@ nm_active_connection_get_dhcp4_config (
 
Returns

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

 
[transfer none]

@@ -654,7 +654,7 @@ state. 

 

 

 
nm_active_connection_get_default6 ()

-
gboolean
+
gboolean
 nm_active_connection_get_default6 (NMActiveConnection *connection);

 
Whether the active connection is the default IPv6 one (that is, is used for
 the default IPv6 route and DNS information).

@@ -675,7 +675,7 @@ the default IPv6 route and DNS information).

 

 

 
Returns

-
 TRUE if the active connection is the default IPv6 connection

+
 TRUE if the active connection is the default IPv6 connection

 

 

 

@@ -701,7 +701,7 @@ nm_active_connection_get_ip6_config (
 

 
Returns

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

 
[transfer none]

 

@@ -730,7 +730,7 @@ nm_active_connection_get_dhcp6_config (
 
Returns

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

 
[transfer none]

@@ -739,7 +739,7 @@ state. 

 

 

 
nm_active_connection_get_vpn ()

-
gboolean
+
gboolean
 nm_active_connection_get_vpn (NMActiveConnection *connection);

 
Whether the active connection is a VPN connection.

 

@@ -759,7 +759,7 @@ nm_active_connection_get_vpn (
 
Returns

-
 TRUE if the active connection is a VPN connection

+
 TRUE if the active connection is a VPN connection

 

 

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

-
  “default”                  gboolean

+
  “default”                  gboolean

 
Whether the active connection is the default IPv4 one.

 
Flags: Read

 
Default value: FALSE

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

-
  “default6”                 gboolean

+
  “default6”                 gboolean

 
Whether the active connection is the default IPv6 one.

 
Flags: Read

 
Default value: FALSE

@@ -882,7 +882,7 @@ nm_active_connection_get_vpn (
 
The “devices” property

-
  “devices”                  GPtrArray *

+
  “devices”                  GPtrArray *

 
The devices of the active connection.

 
Element-type: NMDevice

 
Flags: Read

@@ -904,7 +904,7 @@ nm_active_connection_get_vpn (
 
The “id” property

-
  “id”                       gchar *

+
  “id”                       gchar *

 
The active connection's ID

 
Flags: Read

 
Default value: NULL

@@ -933,7 +933,7 @@ nm_active_connection_get_vpn (
 
The “specific-object-path” property

-
  “specific-object-path”     gchar *

+
  “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

@@ -950,7 +950,7 @@ nm_active_connection_get_vpn (
 
The “type” property

-
  “type”                     gchar *

+
  “type”                     gchar *

 
The active connection's type

 
Flags: Read

 
Default value: NULL

@@ -958,7 +958,7 @@ nm_active_connection_get_vpn (
 
The “uuid” property

-
  “uuid”                     gchar *

+
  “uuid”                     gchar *

 
The active connection's UUID

 
Flags: Read

 
Default value: NULL

@@ -966,7 +966,7 @@ nm_active_connection_get_vpn (
 
The “vpn” property

-
  “vpn”                      gboolean

+
  “vpn”                      gboolean

 
Whether the active connection is a VPN connection.

 
Flags: Read

 
Default value: FALSE

diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index 2be7c5e8..1e51c552 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -44,7 +44,7 @@
 
-
-
-
-
+GPtrArray *
 
+GPtrArray *
 
-
+
+GPtrArray *
 
@@ -525,28 +525,28 @@
 
 
+GPtrArray *
 
+gchar *
 
-
+
-
+
-
+
@@ -557,7 +557,7 @@
 
-
+
@@ -568,37 +568,37 @@
 
 
+gchar *
 
-
+
-
+
-
+
-
+
-
+
-
+
@@ -617,37 +617,37 @@
 
-
+
-
+
-
+
-
+
-
+
-
+
-
+

 

 
-GQuark
+GQuark
 
 
 nm_client_error_quark ()
@@ -91,7 +91,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_get_startup ()
@@ -99,7 +99,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_get_nm_running ()
@@ -107,7 +107,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_networking_get_enabled ()
@@ -115,7 +115,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_networking_set_enabled ()
@@ -123,7 +123,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wireless_get_enabled ()
@@ -139,7 +139,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wireless_hardware_get_enabled ()
@@ -147,7 +147,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wwan_get_enabled ()
@@ -163,7 +163,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wwan_hardware_get_enabled ()
@@ -171,7 +171,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wimax_get_enabled ()
@@ -187,7 +187,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_wimax_hardware_get_enabled ()
@@ -195,7 +195,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_get_logging ()
@@ -203,7 +203,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_set_logging ()
@@ -251,7 +251,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_save_hostname ()
@@ -267,21 +267,21 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_save_hostname_finish ()
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_devices ()
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_all_devices ()
@@ -304,7 +304,7 @@
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_active_connections ()
@@ -360,7 +360,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_deactivate_connection ()
@@ -376,14 +376,14 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_deactivate_connection_finish ()
 
 

 
const GPtrArray *
+const GPtrArray *
 
 
 nm_client_get_connections ()
@@ -431,7 +431,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_load_connections ()
@@ -447,7 +447,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_load_connections_finish ()
@@ -455,7 +455,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_reload_connections ()
@@ -471,7 +471,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_client_reload_connections_finish ()
@@ -497,24 +497,24 @@
 

 

 
-GPtrArray *active-connections
 Read
 

 

 
-GPtrArray *all-devices
 Read
 

 
gbooleangboolean
 can-modify
 Read
 

 

 
-GPtrArray *connections
 Read
 

 
-GPtrArray *devices
 Read
 

 

 
-gchar *hostname
 Read
 

 
guintguint
 metered
 Read
 

 
gbooleangboolean
 networking-enabled
 Read / Write
 

 
gbooleangboolean
 nm-running
 Read
 
Read
 

 
gbooleangboolean
 startup
 Read
 

 
-gchar *version
 Read
 

 
gbooleangboolean
 wimax-enabled
 Read / Write
 

 
gbooleangboolean
 wimax-hardware-enabled
 Read
 

 
gbooleangboolean
 wireless-enabled
 Read / Write
 

 
gbooleangboolean
 wireless-hardware-enabled
 Read
 

 
gbooleangboolean
 wwan-enabled
 Read / Write
 

 
gbooleangboolean
 wwan-hardware-enabled
 Read
 

 void
 any-device-addedRun FirstRun First
 

 

 void
 any-device-removedRun FirstRun First
 

 

 void
 connection-addedRun FirstRun First
 

 

 void
 connection-removedRun FirstRun First
 

 

 void
 device-addedRun FirstRun First
 

 

 void
 device-removedRun FirstRun First
 

 

 void
 permission-changedRun FirstRun First
 

 
 

@@ -793,11 +793,11 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMClientError
     ├── NMClientPermission
     ╰── NMClientPermissionResult
-    GObject
+    GObject
     ╰── NMClient
 

 

@@ -808,7 +808,7 @@
 
Functions

 

 
nm_client_error_quark ()

-
GQuark
+
GQuark
 nm_client_error_quark (void);

 
Registers an error quark for NMClient if necessary.

 

@@ -820,8 +820,8 @@ nm_client_error_quark (void
 
nm_client_new ()

 
NMClient *
-nm_client_new (GCancellable *cancellable,
-               GError **error);

+nm_client_new (GCancellable *cancellable,
+               GError **error);

 
Creates a new NMClient.

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

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -857,9 +857,9 @@ that.

 

 
nm_client_new_async ()

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

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

 
Creates a new NMClient and begins asynchronously initializing it.
 callback
  will be called when it is done; use
@@ -876,7 +876,7 @@ the callback can be invoked with two first parameters as NULL.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -898,8 +898,8 @@ the callback can be invoked with two first parameters as NULL.

 

 
nm_client_new_finish ()

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

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

 
Gets the result of an nm_client_new_async() call.

 

 
Parameters

@@ -912,12 +912,12 @@ nm_client_new_finish (
result

-
a GAsyncResult

+
a GAsyncResult

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -925,7 +925,7 @@ nm_client_new_finish (
 
Returns

-
 a new NMClient, or NULL on error

+
 a new NMClient, or NULL on error

 

 

 

@@ -951,7 +951,7 @@ nm_client_get_version (
 
Returns

-
 string with the version (or NULL if NetworkManager is not running)

+
 string with the version (or NULL if NetworkManager is not running)

 

 

 

@@ -983,7 +983,7 @@ nm_client_get_state (
 
nm_client_get_startup ()

-
gboolean
+
gboolean
 nm_client_get_startup (NMClient *client);

 
Tests whether the daemon is still in the process of activating
 connections at startup.

@@ -1010,7 +1010,7 @@ connections at startup.

 

 

 
nm_client_get_nm_running ()

-
gboolean
+
gboolean
 nm_client_get_nm_running (NMClient *client);

 
Determines whether the daemon is running.

 

@@ -1030,13 +1030,13 @@ nm_client_get_nm_running (
 
Returns

-
 TRUE if the daemon is running

+
 TRUE if the daemon is running

 

 

 

 

 
nm_client_networking_get_enabled ()

-
gboolean
+
gboolean
 nm_client_networking_get_enabled (NMClient *client);

 
Whether networking is enabled or disabled.

 

@@ -1056,16 +1056,16 @@ nm_client_networking_get_enabled (
 

 
Returns

-
 TRUE if networking is enabled, FALSE if networking is disabled

+
 TRUE if networking is enabled, FALSE if networking is disabled

 

 

 

 

 
nm_client_networking_set_enabled ()

-
gboolean
+
gboolean
 nm_client_networking_set_enabled (NMClient *client,
-                                  gboolean enabled,
-                                  GError **error);

+                                  gboolean enabled,
+                                  GError **error);

 
Enables or disables networking.  When networking is disabled, all controlled
 interfaces are disconnected and deactivated.  When networking is enabled,
 all controlled interfaces are available for activation.

@@ -1085,12 +1085,12 @@ all controlled interfaces are available for activation.

 
 
 
enabled

-
TRUE to set networking enabled, FALSE to set networking disabled

+
TRUE to set networking enabled, FALSE to set networking disabled

  
 
 
 
error

-
 return location for a GError, or NULL. 

+
 return location for a GError, or NULL. 

 [allow-none]
 
 
@@ -1098,13 +1098,13 @@ all controlled interfaces are available for activation.

 

 

 
Returns

-
 TRUE on success, FALSE otherwise

+
 TRUE on success, FALSE otherwise

 

 

 

 

 
nm_client_wireless_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wireless_get_enabled (NMClient *client);

 
Determines whether the wireless is enabled.

 

@@ -1124,7 +1124,7 @@ nm_client_wireless_get_enabled (
 

 
Returns

-
 TRUE if wireless is enabled

+
 TRUE if wireless is enabled

 

 

 

@@ -1132,7 +1132,7 @@ nm_client_wireless_get_enabled (
nm_client_wireless_set_enabled ()

 
void
 nm_client_wireless_set_enabled (NMClient *client,
-                                gboolean enabled);

+                                gboolean enabled);

 
Enables or disables wireless devices.

 

 
Parameters

@@ -1150,7 +1150,7 @@ nm_client_wireless_set_enabled (
 
 
enabled

-
TRUE to enable wireless

+
TRUE to enable wireless

  
 
 
@@ -1160,7 +1160,7 @@ nm_client_wireless_set_enabled (
 

 
nm_client_wireless_hardware_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wireless_hardware_get_enabled
                                (NMClient *client);

 
Determines whether the wireless hardware is enabled.

@@ -1181,13 +1181,13 @@ nm_client_wireless_hardware_get_enabled
 

 

 
Returns

-
 TRUE if the wireless hardware is enabled

+
 TRUE if the wireless hardware is enabled

 

 

 

 

 
nm_client_wwan_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wwan_get_enabled (NMClient *client);

 
Determines whether WWAN is enabled.

 

@@ -1207,7 +1207,7 @@ nm_client_wwan_get_enabled (
 
Returns

-
 TRUE if WWAN is enabled

+
 TRUE if WWAN is enabled

 

 

 

@@ -1215,7 +1215,7 @@ nm_client_wwan_get_enabled (
nm_client_wwan_set_enabled ()

 
void
 nm_client_wwan_set_enabled (NMClient *client,
-                            gboolean enabled);

+                            gboolean enabled);

 
Enables or disables WWAN devices.

 

 
Parameters

@@ -1233,7 +1233,7 @@ nm_client_wwan_set_enabled (
enabled

-
TRUE to enable WWAN

+
TRUE to enable WWAN

  
 
 
@@ -1243,7 +1243,7 @@ nm_client_wwan_set_enabled (
 
nm_client_wwan_hardware_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wwan_hardware_get_enabled (NMClient *client);

 
Determines whether the WWAN hardware is enabled.

 

@@ -1263,13 +1263,13 @@ nm_client_wwan_hardware_get_enabled (
 

 
Returns

-
 TRUE if the WWAN hardware is enabled

+
 TRUE if the WWAN hardware is enabled

 

 

 

 

 
nm_client_wimax_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wimax_get_enabled (NMClient *client);

 
Determines whether WiMAX is enabled.

 

@@ -1289,7 +1289,7 @@ nm_client_wimax_get_enabled (
 
Returns

-
 TRUE if WiMAX is enabled

+
 TRUE if WiMAX is enabled

 

 

 

@@ -1297,7 +1297,7 @@ nm_client_wimax_get_enabled (
nm_client_wimax_set_enabled ()

 
void
 nm_client_wimax_set_enabled (NMClient *client,
-                             gboolean enabled);

+                             gboolean enabled);

 
Enables or disables WiMAX devices.

 

 
Parameters

@@ -1315,7 +1315,7 @@ nm_client_wimax_set_enabled (
enabled

-
TRUE to enable WiMAX

+
TRUE to enable WiMAX

  
 
 
@@ -1325,7 +1325,7 @@ nm_client_wimax_set_enabled (
 
nm_client_wimax_hardware_get_enabled ()

-
gboolean
+
gboolean
 nm_client_wimax_hardware_get_enabled (NMClient *client);

 
Determines whether the WiMAX hardware is enabled.

 

@@ -1345,17 +1345,17 @@ nm_client_wimax_hardware_get_enabled (
 
Returns

-
 TRUE if the WiMAX hardware is enabled

+
 TRUE if the WiMAX hardware is enabled

 

 

 

 

 
nm_client_get_logging ()

-
gboolean
+
gboolean
 nm_client_get_logging (NMClient *client,
                        char **level,
                        char **domains,
-                       GError **error);

+                       GError **error);

 
Gets NetworkManager current logging level and domains.

 

 
Parameters

@@ -1384,7 +1384,7 @@ a list of domains separated by ",". 

 
 
 
error

-
 return location for a GError, or NULL. 

+
 return location for a GError, or NULL. 

 [allow-none]
 
 
@@ -1392,17 +1392,17 @@ a list of domains separated by ",". 

 

 

 
Returns

-
 TRUE on success, FALSE otherwise

+
 TRUE on success, FALSE otherwise

 

 

 

 

 
nm_client_set_logging ()

-
gboolean
+
gboolean
 nm_client_set_logging (NMClient *client,
                        const char *level,
                        const char *domains,
-                       GError **error);

+                       GError **error);

 
Sets NetworkManager logging level and/or domains.

 

 
Parameters

@@ -1420,18 +1420,18 @@ nm_client_set_logging (
level

-
 logging level to set (NULL or an empty string for no change). 

+
 logging level to set (NULL or an empty string for no change). 

 [allow-none]
 
 
 
domains

 
 logging domains to set. The string should be a list of log
-domains separated by ",". (NULL or an empty string for no change). 

+domains separated by ",". (NULL or an empty string for no change). 

 [allow-none]
 
 
 
error

-
 return location for a GError, or NULL. 

+
 return location for a GError, or NULL. 

 [allow-none]
 
 
@@ -1439,7 +1439,7 @@ domains separated by ",". (
 
Returns

-
 TRUE on success, FALSE otherwise

+
 TRUE on success, FALSE otherwise

 

 

 

@@ -1511,8 +1511,8 @@ connectivity state first before returning any information.

 
nm_client_check_connectivity ()

 
NMConnectivityState
 nm_client_check_connectivity (NMClient *client,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);
 
Updates the network connectivity state and returns the (new)
 current state. Contrast nm_client_get_connectivity(), which returns
 the most recent known state without re-checking.

@@ -1534,12 +1534,12 @@ if you do not want to block.

 
 
 
cancellable

-
a GCancellable

+
a GCancellable

  
 
 
 
error

-
return location for a GError

+
return location for a GError

  
 
 
@@ -1555,9 +1555,9 @@ if you do not want to block.

 
nm_client_check_connectivity_async ()

 
void
 nm_client_check_connectivity_async (NMClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);

+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
 
Asynchronously updates the network connectivity state and invokes
 callback
  when complete. Contrast nm_client_get_connectivity(),
@@ -1579,7 +1579,7 @@ re-checking, and 
cancellable

-
a GCancellable

+
a GCancellable

  
 
 
@@ -1602,8 +1602,8 @@ re-checking, and 
nm_client_check_connectivity_finish ()

 
NMConnectivityState
 nm_client_check_connectivity_finish (NMClient *client,
-                                     GAsyncResult *result,
-                                     GError **error);

+                                     GAsyncResult *result,
+                                     GError **error);
 
Retrieves the result of an nm_client_check_connectivity_async()
 call.

 

@@ -1622,12 +1622,12 @@ call.

 
 
 
result

-
the GAsyncResult

+
the GAsyncResult

  
 
 
 
error

-
return location for a GError

+
return location for a GError

  
 
 
@@ -1641,11 +1641,11 @@ call.

 

 

 
nm_client_save_hostname ()

-
gboolean
+
gboolean
 nm_client_save_hostname (NMClient *client,
                          const char *hostname,
-                         GCancellable *cancellable,
-                         GError **error);

+                         GCancellable *cancellable,
+                         GError **error);

 
Requests that the machine's persistent hostname be set to the specified value
 or cleared.

 

@@ -1664,18 +1664,18 @@ or cleared.

 
 
 
hostname

-
 the new persistent hostname to set, or NULL to
+
 the new persistent hostname to set, or NULL to
 clear any existing persistent hostname. 

 [allow-none]
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
return location for GError

+
return location for GError

  
 
 
@@ -1683,7 +1683,7 @@ clear any existing persistent hostname. 

 

 

 
Returns

-
 TRUE if the request was successful, FALSE if it failed

+
 TRUE if the request was successful, FALSE if it failed

 

 

 

@@ -1692,9 +1692,9 @@ clear any existing persistent hostname. 

 
void
 nm_client_save_hostname_async (NMClient *client,
                                const char *hostname,
-                               GCancellable *cancellable,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);

+                               GCancellable *cancellable,
+                               GAsyncReadyCallback callback,
+                               gpointer user_data);
 
Requests that the machine's persistent hostname be set to the specified value
 or cleared.

 

@@ -1713,13 +1713,13 @@ or cleared.

 
 
 
hostname

-
 the new persistent hostname to set, or NULL to
+
 the new persistent hostname to set, or NULL to
 clear any existing persistent hostname. 

 [allow-none]
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -1740,10 +1740,10 @@ clear any existing persistent hostname. 

 

 

 
nm_client_save_hostname_finish ()

-
gboolean
+
gboolean
 nm_client_save_hostname_finish (NMClient *client,
-                                GAsyncResult *result,
-                                GError **error);

+                                GAsyncResult *result,
+                                GError **error);

 
Gets the result of an nm_client_save_hostname_async() call.

 

 
Parameters

@@ -1761,12 +1761,12 @@ nm_client_save_hostname_finish (
 
 
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
 
error

-
return location for GError

+
return location for GError

  
 
 
@@ -1774,13 +1774,13 @@ nm_client_save_hostname_finish (
 

 
Returns

-
 TRUE if the request was successful, FALSE if it failed

+
 TRUE if the request was successful, FALSE if it failed

 

 

 

 

 
nm_client_get_devices ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_devices (NMClient *client);

 
Gets all the known network devices.  Use nm_device_get_type() or the
 NM_IS_DEVICE_XXXX functions to determine what kind of
@@ -1803,7 +1803,7 @@ methods such as 
 
Returns

-
 a GPtrArray
+
 a GPtrArray
 containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 

 
[transfer none][element-type NMDevice]

@@ -1812,7 +1812,7 @@ containing all the NMDevices
 

 
nm_client_get_all_devices ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_all_devices (NMClient *client);

 
Gets both real devices and device placeholders (eg, software devices which
 do not currently exist, but could be created automatically by NetworkManager
@@ -1839,7 +1839,7 @@ use device-specific methods such as 
 
Returns

-
 a GPtrArray
+
 a GPtrArray
 containing all the NMDevices.  The returned array is owned by the
 NMClient object and should not be modified. 

 
[transfer none][element-type NMDevice]

@@ -1878,7 +1878,7 @@ nm_client_get_device_by_path (
 
Returns

 
 the NMDevice for the given object_path
-or NULL if none is found. 

+or NULL if none is found. 

 
[transfer none]

 

 

@@ -1914,14 +1914,14 @@ nm_client_get_device_by_iface (
 
Returns

 
 the NMDevice for the given iface
-or NULL if none is found. 

+or NULL if none is found. 

 
[transfer none]

 

 

 

 

 
nm_client_get_active_connections ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_active_connections (NMClient *client);

 
Gets the active connections.

 

@@ -1941,7 +1941,7 @@ nm_client_get_active_connections (
 

 
Returns

-
 a GPtrArray
+
 a GPtrArray
 containing all the active NMActiveConnections.
 The returned array is owned by the client and should not be modified. 

 
[transfer none][element-type NMActiveConnection]

@@ -1960,7 +1960,7 @@ the default route. If there is a VPN active with the default route,
 then this function returns the active connection that contains the
 route to the VPN endpoint.

 
If there is no default route, or the default route is over a
-non-NetworkManager-recognized device, this will return NULL.

+non-NetworkManager-recognized device, this will return NULL.

 

 
Parameters

 

@@ -2018,12 +2018,12 @@ any. 
nm_client_activate_connection_async ()
void
 nm_client_activate_connection_async (NMClient *client,
-                                     NMConnection *connection,
+                                     NMConnection *connection,
                                      NMDevice *device,
                                      const char *specific_object,
-                                     GCancellable *cancellable,
-                                     GAsyncReadyCallback callback,
-                                     gpointer user_data);

+                                     GCancellable *cancellable,
+                                     GAsyncReadyCallback callback,
+                                     gpointer user_data);
Asynchronously starts a connection to a particular network using the
 configuration settings from connection
  and the network device device
@@ -2058,7 +2058,7 @@ track the activation to its completion.

-
+
@@ -2070,7 +2070,7 @@ track the activation to its completion.

-
+
@@ -2103,8 +2103,8 @@ details of the newly added connection. 
nm_client_activate_connection_finish ()
NMActiveConnection *
 nm_client_activate_connection_finish (NMClient *client,
-                                      GAsyncResult *result,
-                                      GError **error);

+                                      GAsyncResult *result,
+                                      GError **error);
Gets the result of a call to nm_client_activate_connection_async().

 
Parameters

@@ -2122,12 +2122,12 @@ nm_client_activate_connection_finish (
result

-

+
-
+
@@ -2135,7 +2135,7 @@ nm_client_activate_connection_finish (
 
Returns

-
 the new NMActiveConnection on success, NULL on
+
 the new NMActiveConnection on success, NULL on
 failure, in which case error
 will be set. 

 
[transfer full]

@@ -2147,12 +2147,12 @@ will be set. 

 
void
 nm_client_add_and_activate_connection_async
                                (NMClient *client,
-                                NMConnection *partial,
+                                NMConnection *partial,
                                 NMDevice *device,
                                 const char *specific_object,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);

+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
Adds a new connection using the given details (if any) as a template,
 automatically filling in missing settings with the capabilities of the given
 device and specific object.  The new connection is then asynchronously
@@ -2178,8 +2178,8 @@ track the activation to its completion.

 
 
-
@@ -2194,7 +2194,7 @@ before being added. 

 
-
+
@@ -2228,11 +2228,11 @@ details of the newly added connection. 

 
NMActiveConnection *
 nm_client_add_and_activate_connection_finish
                                (NMClient *client,
-                                GAsyncResult *result,
-                                GError **error);

+                                GAsyncResult *result,
+                                GError **error);
 
Gets the result of a call to nm_client_add_and_activate_connection_async().

 
You can call nm_active_connection_get_connection() on the returned
-NMActiveConnection to find the path of the created NMConnection.

+NMActiveConnection to find the path of the created NMConnection.

 

 
Parameters

 

 
 
 
 
 

 
connection
 an NMConnection. 
 an NMConnection. 

 [allow-none]
 

 

 
specific_object

 
 the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -2080,7 +2080,7 @@ details of the newly added connection. 

 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
 
 
 
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
partial
 an NMConnection to add; the connection may be
-partially filled (or even NULL) and will be completed by NetworkManager
+
 an NMConnection to add; the connection may be
+partially filled (or even NULL) and will be completed by NetworkManager
 using the given device
 and specific_object
 before being added. 
specific_object

 
 the object path of a connection-type-specific
 object this activation should use. This parameter is currently ignored for
-wired and mobile broadband connections, and the value of NULL should be used
+wired and mobile broadband connections, and the value of NULL should be used
 (ie, no specific object).  For Wi-Fi or WiMAX connections, pass the object
 path of a NMAccessPoint or NMWimaxNsp owned by device
 , which you can
@@ -2204,7 +2204,7 @@ details of the newly added connection. 

 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

@@ -2249,12 +2249,12 @@ nm_client_add_and_activate_connection_finish
 
 
-
+
-
+
@@ -2262,7 +2262,7 @@ nm_client_add_and_activate_connection_finish
 
 

 
Returns

-
 the new NMActiveConnection on success, NULL on
+
 the new NMActiveConnection on success, NULL on
 failure, in which case error
 will be set. 

 
[transfer full]

@@ -2271,11 +2271,11 @@ will be set. 

 

 

 
nm_client_deactivate_connection ()

-
gboolean
+
gboolean
 nm_client_deactivate_connection (NMClient *client,
                                  NMActiveConnection *active,
-                                 GCancellable *cancellable,
-                                 GError **error);

+                                 GCancellable *cancellable,
+                                 GError **error);

 
Deactivates an active NMActiveConnection.

 

 
Parameters

@@ -2298,12 +2298,12 @@ nm_client_deactivate_connection (
 

-
+
-
+
@@ -2320,9 +2320,9 @@ nm_client_deactivate_connection (void
 nm_client_deactivate_connection_async (NMClient *client,
                                        NMActiveConnection *active,
-                                       GCancellable *cancellable,
-                                       GAsyncReadyCallback callback,
-                                       gpointer user_data);
+                                       GCancellable *cancellable,
+                                       GAsyncReadyCallback callback,
+                                       gpointer user_data);
 
Asynchronously deactivates an active NMActiveConnection.

 

 
Parameters

@@ -2345,7 +2345,7 @@ nm_client_deactivate_connection_async (
cancellable

-

+
@@ -2366,11 +2366,11 @@ nm_client_deactivate_connection_async (
 
nm_client_deactivate_connection_finish ()

-
gboolean
+
gboolean
 nm_client_deactivate_connection_finish
                                (NMClient *client,
-                                GAsyncResult *result,
-                                GError **error);

+                                GAsyncResult *result,
+                                GError **error);

 
Gets the result of a call to nm_client_deactivate_connection_async().

 

 
Parameters

@@ -2388,12 +2388,12 @@ nm_client_deactivate_connection_finish
 

-
+
-
+
@@ -2407,7 +2407,7 @@ nm_client_deactivate_connection_finish
 

 

 
nm_client_get_connections ()

-
const GPtrArray *
+
const GPtrArray *
 nm_client_get_connections (NMClient *client);

 

 
Parameters

@@ -2428,7 +2428,9 @@ nm_client_get_connections (
Returns

 
 an array
 containing all connections provided by the remote settings service.  The
-returned array is owned by the NMClient object and should not be modified. 

+returned array is owned by the NMClient object and should not be modified.

+
The connections are as received from D-Bus and might not validate according
+to nm_connection_verify(). 

 
[transfer none][element-type NMRemoteConnection]

 

 

@@ -2464,8 +2466,10 @@ nm_client_get_connection_by_id (
 

 
Returns

-
 the remote connection object on success, or NULL if no
-matching object was found. 

+
 the remote connection object on success, or NULL if no
+matching object was found.

+
The connection is as received from D-Bus and might not validate according
+to nm_connection_verify(). 

 
[transfer none]

 

 
@@ -2501,8 +2505,10 @@ nm_client_get_connection_by_path (
 

 
Returns

-
 the remote connection object on success, or NULL if the object was
-not known. 

+
 the remote connection object on success, or NULL if the object was
+not known

+
The connection is as received from D-Bus and might not validate according
+to nm_connection_verify(). 

 
[transfer none]

 

 
@@ -2538,8 +2544,10 @@ nm_client_get_connection_by_uuid (
 

 
Returns

-
 the remote connection object on success, or NULL if the object was
-not known. 

+
 the remote connection object on success, or NULL if the object was
+not known

+
The connection is as received from D-Bus and might not validate according
+to nm_connection_verify(). 

 
[transfer none]

 

 
@@ -2548,14 +2556,14 @@ not known. 

 
nm_client_add_connection_async ()

 
void
 nm_client_add_connection_async (NMClient *client,
-                                NMConnection *connection,
-                                gboolean save_to_disk,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);

+                                NMConnection *connection,
+                                gboolean save_to_disk,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
Requests that the remote settings service add the given settings to a new
 connection.  If save_to_disk
- is TRUE, the connection is immediately written
+ is TRUE, the connection is immediately written
 to disk; otherwise it is initially only stored in memory, but may be saved
 later by calling the connection's nm_remote_connection_commit_changes()
 method.

@@ -2597,7 +2605,7 @@ added, not the object itself

 
 
-
+
@@ -2620,8 +2628,8 @@ added, not the object itself

 
nm_client_add_connection_finish ()

 
NMRemoteConnection *
 nm_client_add_connection_finish (NMClient *client,
-                                 GAsyncResult *result,
-                                 GError **error);

+                                 GAsyncResult *result,
+                                 GError **error);
 
Gets the result of a call to nm_client_add_connection_async().

 

 
Parameters

@@ -2639,12 +2647,12 @@ nm_client_add_connection_finish (
 

-
+
-
+
@@ -2652,7 +2660,7 @@ nm_client_add_connection_finish (
 

 
Returns

-
 the new NMRemoteConnection on success, NULL on
+
 the new NMRemoteConnection on success, NULL on
 failure, in which case error
 will be set. 

 
[transfer full]

@@ -2661,23 +2669,23 @@ will be set. 

 

 

 
nm_client_load_connections ()

-
gboolean
+
gboolean
 nm_client_load_connections (NMClient *client,
                             char **filenames,
                             char ***failures,
-                            GCancellable *cancellable,
-                            GError **error);

+                            GCancellable *cancellable,
+                            GError **error);

 
Requests that the remote settings service load or reload the given files,
 adding or updating the connections described within.

 
The changes to the indicated files will not yet be reflected in
 client
 's connections array when the function returns.

 
If all of the indicated files were successfully loaded, the
-function will return TRUE, and failures
- will be set to NULL. If
+function will return TRUE, and failures
+ will be set to NULL. If
 NetworkManager tried to load the files, but some (or all) failed,
 then failures
- will be set to a NULL-terminated array of the
+ will be set to a NULL-terminated array of the
 filenames that failed to load.

 

 
Parameters

@@ -2695,23 +2703,23 @@ filenames that failed to load.

 
 

-
+
-
-
+
-
+
@@ -2719,9 +2727,9 @@ filenames that failed to load. 

 
 

 
Returns

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

+FALSE if an error occurred (eg, permission denied).

 

 
 

@@ -2730,9 +2738,9 @@ filenames that failed to load. 

 
void
 nm_client_load_connections_async (NMClient *client,
                                   char **filenames,
-                                  GCancellable *cancellable,
-                                  GAsyncReadyCallback callback,
-                                  gpointer user_data);

+                                  GCancellable *cancellable,
+                                  GAsyncReadyCallback callback,
+                                  gpointer user_data);
 
Requests that the remote settings service asynchronously load or reload the
 given files, adding or updating the connections described within.

 
See nm_client_load_connections() for more details.

@@ -2752,12 +2760,12 @@ given files, adding or updating the connections described within.

 
 
-
+
-
+
@@ -2778,11 +2786,11 @@ given files, adding or updating the connections described within.

 

 

 
nm_client_load_connections_finish ()

-
gboolean
+
gboolean
 nm_client_load_connections_finish (NMClient *client,
                                    char ***failures,
-                                   GAsyncResult *result,
-                                   GError **error);

+                                   GAsyncResult *result,
+                                   GError **error);

 
Gets the result of an nm_client_load_connections_async() call.

 
See nm_client_load_connections() for more details.

 

@@ -2801,18 +2809,18 @@ nm_client_load_connections_finish (
 

-
-
+
-
+
@@ -2820,18 +2828,18 @@ filenames that failed to load. 

 
 

 
Returns

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

+FALSE if an error occurred (eg, permission denied).

 

 
 

 

 
nm_client_reload_connections ()

-
gboolean
+
gboolean
 nm_client_reload_connections (NMClient *client,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

 
Requests that the remote settings service reload all connection
 files from disk, adding, updating, and removing connections until
 the in-memory state matches the on-disk state.

@@ -2851,12 +2859,12 @@ the in-memory state matches the on-disk state.

 
 

-
+
-
+
@@ -2864,7 +2872,7 @@ the in-memory state matches the on-disk state.

 
 

 
Returns

-
 TRUE on success, FALSE on failure

+
 TRUE on success, FALSE on failure

 

 
 

@@ -2872,9 +2880,9 @@ the in-memory state matches the on-disk state.

 
nm_client_reload_connections_async ()

 
void
 nm_client_reload_connections_async (NMClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);

+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
 
Requests that the remote settings service begin reloading all connection
 files from disk, adding, updating, and removing connections until the
 in-memory state matches the on-disk state.

@@ -2894,7 +2902,7 @@ in-memory state matches the on-disk state.

 
 
-
+
@@ -2915,10 +2923,10 @@ in-memory state matches the on-disk state.

 

 

 
nm_client_reload_connections_finish ()

-
gboolean
+
gboolean
 nm_client_reload_connections_finish (NMClient *client,
-                                     GAsyncResult *result,
-                                     GError **error);

+                                     GAsyncResult *result,
+                                     GError **error);

 
Gets the result of an nm_client_reload_connections_async() call.

 

 
Parameters

@@ -2936,12 +2944,12 @@ nm_client_reload_connections_finish (
 

-
+
-
+
@@ -2949,7 +2957,7 @@ nm_client_reload_connections_finish (
 

 
Returns

-
 TRUE on success, FALSE on failure

+
 TRUE on success, FALSE on failure

 

 
 
@@ -3353,7 +3361,7 @@ likely to become the new 
 
The “active-connections” property

-
  “active-connections”       GPtrArray *

+
  “active-connections”       GPtrArray *

 
The active connections.

 
Element-type: NMActiveConnection

 
Flags: Read

@@ -3361,7 +3369,7 @@ likely to become the new 
 
The “all-devices” property

-
  “all-devices”              GPtrArray *

+
  “all-devices”              GPtrArray *

 
List of both real devices and device placeholders.

 
Element-type: NMDevice

 
Flags: Read

@@ -3370,15 +3378,15 @@ likely to become the new 
 
The “can-modify” property

-
  “can-modify”               gboolean

-
If TRUE, adding and modifying connections is supported.

+
  “can-modify”               gboolean

+
If TRUE, adding and modifying connections is supported.

 
Flags: Read

 
Default value: FALSE

 
 

 

 
The “connections” property

-
  “connections”              GPtrArray *

+
  “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
@@ -3397,7 +3405,7 @@ permission to read the details of.)

 

 

 
The “devices” property

-
  “devices”                  GPtrArray *

+
  “devices”                  GPtrArray *

 
List of real network devices.  Does not include placeholder devices.

 
Element-type: NMDevice

 
Flags: Read

@@ -3405,7 +3413,7 @@ permission to read the details of.)

 

 

 
The “hostname” property

-
  “hostname”                 gchar *

+
  “hostname”                 gchar *

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

 
Flags: Read

@@ -3414,7 +3422,7 @@ modified by calling 
 

 
The “metered” property

-
  “metered”                  guint

+
  “metered”                  guint

 
Whether the connectivity is metered.

 
Flags: Read

 
Default value: 0

@@ -3423,7 +3431,7 @@ modified by calling 
 

 
The “networking-enabled” property

-
  “networking-enabled”       gboolean

+
  “networking-enabled”       gboolean

 
Whether networking is enabled.

 
Flags: Read / Write

 
Default value: TRUE

@@ -3431,7 +3439,7 @@ modified by calling 
 

 
The “nm-running” property

-
  “nm-running”               gboolean

+
  “nm-running”               gboolean

 
Whether the daemon is running.

 
Flags: Read

 
Default value: FALSE

@@ -3447,7 +3455,7 @@ see 
 

 
The “startup” property

-
  “startup”                  gboolean

+
  “startup”                  gboolean

 
Whether the daemon is still starting up.

 
Flags: Read

 
Default value: FALSE

@@ -3463,7 +3471,7 @@ see 
 

 
The “version” property

-
  “version”                  gchar *

+
  “version”                  gchar *

 
The NetworkManager version.

 
Flags: Read

 
Default value: NULL

@@ -3471,7 +3479,7 @@ see 
 

 
The “wimax-enabled” property

-
  “wimax-enabled”            gboolean

+
  “wimax-enabled”            gboolean

 
Whether WiMAX functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

@@ -3479,7 +3487,7 @@ see 
 

 
The “wimax-hardware-enabled” property

-
  “wimax-hardware-enabled”   gboolean

+
  “wimax-hardware-enabled”   gboolean

 
Whether the WiMAX hardware is enabled.

 
Flags: Read

 
Default value: FALSE

@@ -3487,7 +3495,7 @@ see 
 

 
The “wireless-enabled” property

-
  “wireless-enabled”         gboolean

+
  “wireless-enabled”         gboolean

 
Whether wireless is enabled.

 
Flags: Read / Write

 
Default value: FALSE

@@ -3495,7 +3503,7 @@ see 
 

 
The “wireless-hardware-enabled” property

-
  “wireless-hardware-enabled” gboolean

+
  “wireless-hardware-enabled” gboolean

 
Whether the wireless hardware is enabled.

 
Flags: Read

 
Default value: TRUE

@@ -3503,7 +3511,7 @@ see 
 

 
The “wwan-enabled” property

-
  “wwan-enabled”             gboolean

+
  “wwan-enabled”             gboolean

 
Whether WWAN functionality is enabled.

 
Flags: Read / Write

 
Default value: FALSE

@@ -3511,7 +3519,7 @@ see 
 

 
The “wwan-hardware-enabled” property

-
  “wwan-hardware-enabled”    gboolean

+
  “wwan-hardware-enabled”    gboolean

 
Whether the WWAN hardware is enabled.

 
Flags: Read

 
Default value: FALSE

@@ -3523,8 +3531,8 @@ see 
The “any-device-added” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)
 
Notifies that a NMDevice is added.  This signal is emitted for both
 regular devices and placeholder devices.

 

@@ -3554,15 +3562,15 @@ regular devices and placeholder devices.

 
 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
filenames
NULL-terminated array of filenames to load
NULL-terminated array of filenames to load

  
 

 

 
failures
 on return, a NULL-terminated array of
+
 on return, a NULL-terminated array of
 filenames that failed to load. 

 [out][transfer full]
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
return location for GError
return location for GError

  
 

 

 
filenames
NULL-terminated array of filenames to load
NULL-terminated array of filenames to load

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
failures
 on return, a NULL-terminated array of
+
 on return, a NULL-terminated array of
 filenames that failed to load. 

 [out][transfer full]
 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
return location for GError
return location for GError

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
return location for GError
return location for GError

  
 

 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “any-device-removed” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)

 
Notifies that a NMDevice is removed.  This signal is emitted for both
 regular devices and placeholder devices.

 

@@ -3592,7 +3600,7 @@ regular devices and placeholder devices.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

@@ -3600,8 +3608,8 @@ regular devices and placeholder devices.

 
void
 user_function (NMClient           *client,
                NMRemoteConnection *connection,
-               gpointer            user_data)

-
Notifies that a NMConnection has been added.

+               gpointer            user_data)
+
Notifies that a NMConnection has been added.

 

 
Parameters

 

@@ -3629,7 +3637,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

@@ -3637,8 +3645,8 @@ user_function (void
 user_function (NMClient           *client,
                NMRemoteConnection *connection,
-               gpointer            user_data)
-
Notifies that a NMConnection has been removed.

+               gpointer            user_data)
+
Notifies that a NMConnection has been removed.

 

 
Parameters

 

@@ -3666,15 +3674,15 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “device-added” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)
 
Notifies that a NMDevice is added.  This signal is not emitted for
 placeholder devices.

 

@@ -3704,15 +3712,15 @@ placeholder devices.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “device-removed” signal

 
void
 user_function (NMClient *client,
-               GObject  *device,
-               gpointer  user_data)

+               GObject  *device,
+               gpointer  user_data)
 
Notifies that a NMDevice is removed.  This signal is not emitted for
 placeholder devices.

 

@@ -3742,16 +3750,16 @@ placeholder devices.

 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “permission-changed” signal

 
void
 user_function (NMClient *client,
-               guint     permission,
-               guint     result,
-               gpointer  user_data)

+               guint     permission,
+               guint     result,
+               gpointer  user_data)
 
Notifies that a permission has changed

 

 
Parameters

@@ -3785,7 +3793,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index b463fae9..67f70037 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -116,7 +116,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_managed ()
@@ -132,7 +132,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_autoconnect ()
@@ -148,7 +148,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_firmware_missing ()
@@ -156,7 +156,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_get_nm_plugin_missing ()
@@ -219,7 +219,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_get_available_connections ()
@@ -234,7 +234,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_get_mtu ()
@@ -242,7 +242,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_is_real ()
@@ -250,7 +250,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_is_software ()
@@ -287,7 +287,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_device_get_lldp_neighbors ()
@@ -303,7 +303,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_reapply ()
@@ -319,7 +319,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_reapply_finish ()
@@ -327,7 +327,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_device_get_applied_connection ()
@@ -343,7 +343,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_device_get_applied_connection_finish ()
@@ -351,7 +351,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_disconnect ()
@@ -367,7 +367,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_disconnect_finish ()
@@ -375,7 +375,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_delete ()
@@ -391,7 +391,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_delete_finish ()
@@ -399,7 +399,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_device_filter_connections ()
@@ -407,7 +407,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_connection_valid ()
@@ -415,7 +415,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_connection_compatible ()
@@ -423,7 +423,7 @@
 
 
 
-GType
+GType
 
 
 nm_device_get_setting_type ()
@@ -463,7 +463,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_lldp_neighbor_get_attr_string_value ()
@@ -471,14 +471,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_lldp_neighbor_get_attr_uint_value ()
 
 
 
-const GVariantType *
+const GVariantType *
 
 
 nm_lldp_neighbor_get_attr_type ()
@@ -503,13 +503,13 @@
 Read
 
 
-gboolean
+gboolean
 autoconnect
 Read / Write
 
 
 
-GPtrArray *
+GPtrArray *
 available-connections
 Read
 
@@ -537,36 +537,36 @@
 
 
 
-gchar *
+gchar *
 driver
 Read
 
 
 
-gchar *
+gchar *
 driver-version
 Read
 
 
-gboolean
+gboolean
 firmware-missing
 Read
 
 
 
-gchar *
+gchar *
 firmware-version
 Read
 
 
 
-gchar *
+gchar *
 interface
 Read
 
 
 
-gchar *
+gchar *
 ip-interface
 Read
 
@@ -584,44 +584,44 @@
 
 
 
-GPtrArray *
+GPtrArray *
 lldp-neighbors
 Read
 
 
-gboolean
+gboolean
 managed
 Read
 
 
-guint
+guint
 metered
 Read
 
 
-guint
+guint
 mtu
 Read
 
 
-gboolean
+gboolean
 nm-plugin-missing
 Read
 
 
 
-gchar *
+gchar *
 physical-port-id
 Read
 
 
 
-gchar *
+gchar *
 product
 Read
 
 
-gboolean
+gboolean
 real
 Read
 
@@ -631,19 +631,19 @@
 Read
 
 
-guint
+guint
 state-reason
 Read
 
 
 
-gchar *
+gchar *
 udi
 Read
 
 
 
-gchar *
+gchar *
 vendor
 Read
 
@@ -661,7 +661,7 @@
 
 void
 state-changed
-Run First
+Run First
 
 

 
@@ -786,9 +786,9 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── NMLldpNeighbor
-    GObject
+    GObject
     ╰── NMObject
         ╰── NMDevice
             ├── NMDeviceAdsl
@@ -1057,7 +1057,7 @@ nm_device_get_hw_address (
 
Returns

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

 

 
@@ -1090,7 +1090,7 @@ nm_device_get_capabilities (
 
nm_device_get_managed ()

-
gboolean
+
gboolean
 nm_device_get_managed (NMDevice *device);

 
Whether the NMDevice is managed by NetworkManager.

 

@@ -1110,7 +1110,7 @@ nm_device_get_managed (
 
Returns

-
 TRUE if the device is managed by NetworkManager

+
 TRUE if the device is managed by NetworkManager

 

 
 

@@ -1118,7 +1118,7 @@ nm_device_get_managed (
nm_device_set_managed ()

 
void
 nm_device_set_managed (NMDevice *device,
-                       gboolean managed);

+                       gboolean managed);

 
Enables or disables management of  NMDevice by NetworkManager.

 

 
Parameters

@@ -1136,7 +1136,7 @@ nm_device_set_managed (
managed

-
TRUE to make the device managed by NetworkManager.

+
TRUE to make the device managed by NetworkManager.

  
 
 
@@ -1147,7 +1147,7 @@ nm_device_set_managed (
 
nm_device_get_autoconnect ()

-
gboolean
+
gboolean
 nm_device_get_autoconnect (NMDevice *device);

 
Whether the NMDevice can be autoconnected.

 

@@ -1167,7 +1167,7 @@ nm_device_get_autoconnect (
 
Returns

-
 TRUE if the device is allowed to be autoconnected

+
 TRUE if the device is allowed to be autoconnected

 

 

 

@@ -1175,7 +1175,7 @@ nm_device_get_autoconnect (
nm_device_set_autoconnect ()

 
void
 nm_device_set_autoconnect (NMDevice *device,
-                           gboolean autoconnect);

+                           gboolean autoconnect);
 
Enables or disables automatic activation of the NMDevice.

 

 
Parameters

@@ -1193,7 +1193,7 @@ nm_device_set_autoconnect (
autoconnect

-
TRUE to enable autoconnecting

+
TRUE to enable autoconnecting

  
 
 
@@ -1203,7 +1203,7 @@ nm_device_set_autoconnect (
 
nm_device_get_firmware_missing ()

-
gboolean
+
gboolean
 nm_device_get_firmware_missing (NMDevice *device);

 
Indicates that firmware required for the device's operation is likely
 to be missing.

@@ -1224,14 +1224,14 @@ to be missing.

 

 

 
Returns

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

 

 
 

 

 
nm_device_get_nm_plugin_missing ()

-
gboolean
+
gboolean
 nm_device_get_nm_plugin_missing (NMDevice *device);

 
Indicates that the NetworkManager plugin for the device is not installed.

 

@@ -1251,7 +1251,7 @@ nm_device_get_nm_plugin_missing (
 

 
Returns

-
 TRUE if the device plugin not installed.

+
 TRUE if the device plugin not installed.

 

 
Since: 1.2

 

@@ -1280,7 +1280,7 @@ works with VPN connections.

 

 

 
Returns

-
 the IPv4 NMIPConfig, or NULL if the device is not
+
 the IPv4 NMIPConfig, or NULL if the device is not
 activated. 

 
[transfer none]

 

@@ -1310,7 +1310,7 @@ works with VPN connections.

 
 

 
Returns

-
 the IPv4 NMDhcpConfig, or NULL if the device is
+
 the IPv4 NMDhcpConfig, or NULL if the device is
 not activated or not using DHCP. 

 
[transfer none]

 

@@ -1340,7 +1340,7 @@ works with VPN connections.

 
 

 
Returns

-
 the IPv6 NMIPConfig or NULL if the device is not activated. 

+
 the IPv6 NMIPConfig or NULL if the device is not activated. 

 
[transfer none]

 

 
@@ -1369,7 +1369,7 @@ works with VPN connections.

 
 

 
Returns

-
 the IPv6 NMDhcpConfig, or NULL if the device is
+
 the IPv6 NMDhcpConfig, or NULL if the device is
 not activated or not using DHCPv6. 

 
[transfer none]

 

@@ -1449,7 +1449,7 @@ nm_device_get_active_connection (
 

 
Returns

-
 the NMActiveConnection or NULL if the device is
+
 the NMActiveConnection or NULL if the device is
 not part of an active connection. 

 
[transfer none]

 

@@ -1457,7 +1457,7 @@ not part of an active connection. 

 

 

 
nm_device_get_available_connections ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_get_available_connections (NMDevice *device);

 
Gets the NMRemoteConnections currently known to the daemon that could
 be activated on device
@@ -1479,7 +1479,7 @@ be activated on device
 

 

 
Returns

-
 the GPtrArray
+
 the GPtrArray
 containing NMRemoteConnections. This is the internal copy used by
 the connection, and must not be modified. 

 
[element-type NMRemoteConnection]

@@ -1490,7 +1490,7 @@ the connection, and must not be modified. 

 
nm_device_get_physical_port_id ()

 
const char *
 nm_device_get_physical_port_id (NMDevice *device);

-
Gets the physical port ID of the NMDevice. If non-NULL, this is
+
Gets the physical port ID of the NMDevice. If non-NULL, this is
 an opaque string that can be used to recognize when
 seemingly-unrelated NMDevices are actually just different virtual
 ports on a single physical port. (Eg, NPAR / SR-IOV.)

@@ -1511,7 +1511,7 @@ ports on a single physical port. (Eg, NPAR / SR-IOV.)

 

 

 
Returns

-
 the physical port ID of the device, or NULL if the port
+
 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.

 

@@ -1519,7 +1519,7 @@ must not be modified.

 

 

 
nm_device_get_mtu ()

-
guint32
+
guint32
 nm_device_get_mtu (NMDevice *device);

 
Gets the  MTU of the NMDevice.

 

@@ -1545,7 +1545,7 @@ nm_device_get_mtu (
 
nm_device_is_real ()

-
gboolean
+
gboolean
 nm_device_is_real (NMDevice *device);

 

 
Parameters

@@ -1564,7 +1564,7 @@ nm_device_is_real (
 
Returns

-
 TRUE if the device exists, or FALSE if it is a placeholder device
+
 TRUE if the device exists, or FALSE if it is a placeholder device
 that could be automatically created by NetworkManager if one of its
 “available-connections” was activated.

 

@@ -1573,7 +1573,7 @@ that could be automatically created by NetworkManager if one of its
 

 

 
nm_device_is_software ()

-
gboolean
+
gboolean
 nm_device_is_software (NMDevice *device);

 
Whether the device is a software device.

 

@@ -1593,8 +1593,8 @@ nm_device_is_software (
 
Returns

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

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

 

 

 

@@ -1710,7 +1710,7 @@ nm_device_get_metered (
 
nm_device_get_lldp_neighbors ()

-
GPtrArray *
+
GPtrArray *
 nm_device_get_lldp_neighbors (NMDevice *device);

 
Gets the list of neighbors discovered through LLDP.

 

@@ -1730,7 +1730,7 @@ nm_device_get_lldp_neighbors (
 
Returns

-
 the GPtrArray
+
 the GPtrArray
 containing NMLldpNeighbors. This is the internal copy used by the
 device and must not be modified. The library never modifies the returned
 array and thus it is safe for callers to reference and keep using it. 

@@ -1779,13 +1779,13 @@ devices in devices
 

 

 
nm_device_reapply ()

-
gboolean
+
gboolean
 nm_device_reapply (NMDevice *device,
-                   NMConnection *connection,
-                   guint64 version_id,
-                   guint32 flags,
-                   GCancellable *cancellable,
-                   GError **error);

+                   NMConnection *connection,
+                   guint64 version_id,
+                   guint32 flags,
+                   GCancellable *cancellable,
+                   GError **error);

 
Attempts to update device with changes to the currently active connection
 made since it was last applied.

 

@@ -1804,7 +1804,7 @@ made since it was last applied.

 
 
 
connection

-
the NMConnection to replace the applied settings with or NULL to reuse existing

+
the NMConnection to replace the applied settings with or NULL to reuse existing

  
 
 
@@ -1821,12 +1821,12 @@ catch concurrent accesses.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -1834,7 +1834,7 @@ catch concurrent accesses.

 

 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 
Since: 1.2

@@ -1844,12 +1844,12 @@ will be set.

 
nm_device_reapply_async ()

 
void
 nm_device_reapply_async (NMDevice *device,
-                         NMConnection *connection,
-                         guint64 version_id,
-                         guint32 flags,
-                         GCancellable *cancellable,
-                         GAsyncReadyCallback callback,
-                         gpointer user_data);

+                         NMConnection *connection,
+                         guint64 version_id,
+                         guint32 flags,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);

 
Asynchronously begins an attempt to update device with changes to the
 currently active connection made since it was last applied.

 

@@ -1868,7 +1868,7 @@ currently active connection made since it was last applied.

 
 
 
connection

-
the NMConnection to replace the applied settings with or NULL to reuse existing

+
the NMConnection to replace the applied settings with or NULL to reuse existing

  
 
 
@@ -1885,7 +1885,7 @@ catch concurrent accesses.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -1907,10 +1907,10 @@ catch concurrent accesses.

 

 

 
nm_device_reapply_finish ()

-
gboolean
+
gboolean
 nm_device_reapply_finish (NMDevice *device,
-                          GAsyncResult *result,
-                          GError **error);

+                          GAsyncResult *result,
+                          GError **error);

 
Gets the result of a call to nm_device_reapply_async().

 

 
Parameters

@@ -1928,12 +1928,12 @@ nm_device_reapply_finish (
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -1941,7 +1941,7 @@ nm_device_reapply_finish (
 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 
Since: 1.2

@@ -1949,12 +1949,12 @@ will be set.

 

 

 
nm_device_get_applied_connection ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection (NMDevice *device,
-                                  guint32 flags,
-                                  guint64 *version_id,
-                                  GCancellable *cancellable,
-                                  GError **error);

+                                  guint32 flags,
+                                  guint64 *version_id,
+                                  GCancellable *cancellable,
+                                  GError **error);

 
Fetch the currently applied connection on the device.

 

 
Parameters

@@ -1983,12 +1983,12 @@ the applied connection. 

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -1996,8 +1996,10 @@ the applied connection. 

 

 

 
Returns

-
 a NMConnection with the currently applied settings
-or NULL on error. 

+
 a NMConnection with the currently applied settings
+or NULL on error.

+
The connection is as received from D-Bus and might not validate according
+to nm_connection_verify(). 

 
[transfer full]

 

 
Since: 1.2

@@ -2008,10 +2010,10 @@ or void
 nm_device_get_applied_connection_async
                                (NMDevice *device,
-                                guint32 flags,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);

+                                guint32 flags,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);

 
Asynchronously begins an get the a currently applied connection.

 

 
Parameters

@@ -2034,7 +2036,7 @@ nm_device_get_applied_connection_async
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -2056,12 +2058,12 @@ nm_device_get_applied_connection_async
 

 

 
nm_device_get_applied_connection_finish ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection_finish
                                (NMDevice *device,
-                                GAsyncResult *result,
-                                guint64 *version_id,
-                                GError **error);

+                                GAsyncResult *result,
+                                guint64 *version_id,
+                                GError **error);

 
Gets the result of a call to nm_device_get_applied_connection_async().

 

 
Parameters

@@ -2079,7 +2081,7 @@ nm_device_get_applied_connection_finish
 
 
 
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
@@ -2090,7 +2092,7 @@ connection. 

 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -2098,8 +2100,10 @@ connection. 

 

 

 
Returns

-
 a currently applied NMConnection or NULL in case
-of error. 

+
 a currently applied NMConnection or NULL in case
+of error.

+
The connection is as received from D-Bus and might not validate according
+to nm_connection_verify(). 

 
[transfer full]

 

 
Since: 1.2

@@ -2107,10 +2111,10 @@ of error. 

 

 

 
nm_device_disconnect ()

-
gboolean
+
gboolean
 nm_device_disconnect (NMDevice *device,
-                      GCancellable *cancellable,
-                      GError **error);

+                      GCancellable *cancellable,
+                      GError **error);

 
Disconnects the device if currently connected, and prevents the device from
 automatically connecting to networks until the next manual network connection
 request.

@@ -2130,12 +2134,12 @@ request.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -2143,7 +2147,7 @@ request.

 

 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 

@@ -2152,9 +2156,9 @@ will be set.

 
nm_device_disconnect_async ()

 
void
 nm_device_disconnect_async (NMDevice *device,
-                            GCancellable *cancellable,
-                            GAsyncReadyCallback callback,
-                            gpointer user_data);

+                            GCancellable *cancellable,
+                            GAsyncReadyCallback callback,
+                            gpointer user_data);
 
Asynchronously begins disconnecting the device if currently connected, and
 prevents the device from automatically connecting to networks until the next
 manual network connection request.

@@ -2174,7 +2178,7 @@ manual network connection request.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -2195,10 +2199,10 @@ manual network connection request.

 

 

 
nm_device_disconnect_finish ()

-
gboolean
+
gboolean
 nm_device_disconnect_finish (NMDevice *device,
-                             GAsyncResult *result,
-                             GError **error);

+                             GAsyncResult *result,
+                             GError **error);

 
Gets the result of a call to nm_device_disconnect_async().

 

 
Parameters

@@ -2216,12 +2220,12 @@ nm_device_disconnect_finish (
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -2229,17 +2233,17 @@ nm_device_disconnect_finish (
 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 

 

 

 
nm_device_delete ()

-
gboolean
+
gboolean
 nm_device_delete (NMDevice *device,
-                  GCancellable *cancellable,
-                  GError **error);

+                  GCancellable *cancellable,
+                  GError **error);

 
Deletes the software device. Hardware devices can't be deleted.

 

 
Parameters

@@ -2257,12 +2261,12 @@ nm_device_delete (
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -2270,7 +2274,7 @@ nm_device_delete (
 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 

@@ -2279,9 +2283,9 @@ will be set.

 
nm_device_delete_async ()

 
void
 nm_device_delete_async (NMDevice *device,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);

+                        GCancellable *cancellable,
+                        GAsyncReadyCallback callback,
+                        gpointer user_data);
 
Asynchronously begins deleteing the software device. Hardware devices can't
 be deleted.

 

@@ -2300,7 +2304,7 @@ be deleted.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -2321,10 +2325,10 @@ be deleted.

 

 

 
nm_device_delete_finish ()

-
gboolean
+
gboolean
 nm_device_delete_finish (NMDevice *device,
-                         GAsyncResult *result,
-                         GError **error);

+                         GAsyncResult *result,
+                         GError **error);

 
Gets the result of a call to nm_device_delete_async().

 

 
Parameters

@@ -2342,12 +2346,12 @@ nm_device_delete_finish (
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -2355,16 +2359,16 @@ nm_device_delete_finish (
 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 

 

 

 
nm_device_filter_connections ()

-
GPtrArray *
+
GPtrArray *
 nm_device_filter_connections (NMDevice *device,
-                              const GPtrArray *connections);

+                              const GPtrArray *connections);

 
Filters a given array of connections for a given NMDevice object and returns
 connections which may be activated with the device. For example if device
 
@@ -2391,7 +2395,7 @@ incompatible with the device. To get the full list of connections see
 
 
 
connections

-
 an array of NMConnections to filter. 

+
 an array of NMConnections to filter. 

 [element-type NMConnection]
 
 
@@ -2400,18 +2404,18 @@ incompatible with the device. To get the full list of connections see
 

 
Returns

 
 an array of
-NMConnections that could be activated with the given device
+NMConnections that could be activated with the given device
 .  The array
-should be freed with g_ptr_array_unref() when it is no longer required. 

+should be freed with g_ptr_array_unref() when it is no longer required. 

 
[transfer container][element-type NMConnection]

 

 

 

 

 
nm_device_connection_valid ()

-
gboolean
+
gboolean
 nm_device_connection_valid (NMDevice *device,
-                            NMConnection *connection);

+                            NMConnection *connection);

 
Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -2437,7 +2441,7 @@ against

 
 
 
connection

-
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 
@@ -2446,17 +2450,17 @@ against

 

 

 
Returns

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

 

 

 

 

 
nm_device_connection_compatible ()

-
gboolean
+
gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
-                                 GError **error);

+                                 NMConnection *connection,
+                                 GError **error);

 
Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -2485,13 +2489,13 @@ against

 
 
 
connection

-
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 
 
 
error

-
return location for a GError, or NULL

+
return location for a GError, or NULL

  
 
 
@@ -2499,14 +2503,14 @@ against

 

 

 
Returns

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

 

 

 

 

 
nm_device_get_setting_type ()

-
GType
+
GType
 nm_device_get_setting_type (NMDevice *device);

 
Gets the (primary) NMSetting subtype associated with connections
 that can be used on device
@@ -2616,7 +2620,7 @@ nm_lldp_neighbor_get_attr_names (
 

 
Returns

-
 a NULL-terminated array of attribute names. 

+
 a NULL-terminated array of attribute names. 

 
[transfer full]

 

 
Since: 1.2

@@ -2624,7 +2628,7 @@ nm_lldp_neighbor_get_attr_names (
 

 
nm_lldp_neighbor_get_attr_string_value ()

-
gboolean
+
gboolean
 nm_lldp_neighbor_get_attr_string_value
                                (NMLldpNeighbor *neighbor,
                                 char *name,
@@ -2661,18 +2665,18 @@ nm_lldp_neighbor_get_attr_string_value
 

 

 
Returns

-
 TRUE if a string attribute with name name
-was found, FALSE otherwise

+
 TRUE if a string attribute with name name
+was found, FALSE otherwise

 

 
Since: 1.2

 

 

 

 
nm_lldp_neighbor_get_attr_uint_value ()

-
gboolean
+
gboolean
 nm_lldp_neighbor_get_attr_uint_value (NMLldpNeighbor *neighbor,
                                       char *name,
-                                      guint *out_value);

+                                      guint *out_value);

 
Gets the uint value of attribute with name name
  on neighbor
 

@@ -2705,15 +2709,15 @@ nm_lldp_neighbor_get_attr_uint_value (
 
Returns

-
 TRUE if a uint attribute with name name
-was found, FALSE otherwise

+
 TRUE if a uint attribute with name name
+was found, FALSE otherwise

 

 
Since: 1.2

 

 

 

 
nm_lldp_neighbor_get_attr_type ()

-
const GVariantType *
+
const GVariantType *
 nm_lldp_neighbor_get_attr_type (NMLldpNeighbor *neighbor,
                                 char *name);

 
Get the type of an attribute.

@@ -2741,7 +2745,7 @@ nm_lldp_neighbor_get_attr_type (
 

 
Returns

-
 the GVariantType of the attribute with name name
+
 the GVariantType of the attribute with name name
 

 

 
Since: 1.2

@@ -2922,7 +2926,7 @@ nm_lldp_neighbor_get_attr_type (
 

 
The “autoconnect” property

-
  “autoconnect”              gboolean

+
  “autoconnect”              gboolean

 
Whether the device can auto-activate a connection.

 
Flags: Read / Write

 
Default value: TRUE

@@ -2930,7 +2934,7 @@ nm_lldp_neighbor_get_attr_type (
 

 
The “available-connections” property

-
  “available-connections”    GPtrArray *

+
  “available-connections”    GPtrArray *

 
The available connections of the device

 
Element-type: NMRemoteConnection

 
Flags: Read

@@ -2967,7 +2971,7 @@ nm_lldp_neighbor_get_attr_type (
 

 
The “driver” property

-
  “driver”                   gchar *

+
  “driver”                   gchar *

 
The driver of the device.

 
Flags: Read

 
Default value: NULL

@@ -2975,7 +2979,7 @@ nm_lldp_neighbor_get_attr_type (
 

 
The “driver-version” property

-
  “driver-version”           gchar *

+
  “driver-version”           gchar *

 
The version of the device driver.

 
Flags: Read

 
Default value: NULL

@@ -2983,8 +2987,8 @@ nm_lldp_neighbor_get_attr_type (
 

 
The “firmware-missing” property

-
  “firmware-missing”         gboolean

-
When TRUE indicates the device is likely missing firmware required
+
  “firmware-missing”         gboolean

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

 
Flags: Read

 
Default value: FALSE

@@ -2992,7 +2996,7 @@ for its operation.

 

 

 
The “firmware-version” property

-
  “firmware-version”         gchar *

+
  “firmware-version”         gchar *

 
The firmware version of the device.

 
Flags: Read

 
Default value: NULL

@@ -3000,7 +3004,7 @@ for its operation.

 

 

 
The “interface” property

-
  “interface”                gchar *

+
  “interface”                gchar *

 
The interface of the device.

 
Flags: Read

 
Default value: NULL

@@ -3008,7 +3012,7 @@ for its operation.

 

 

 
The “ip-interface” property

-
  “ip-interface”             gchar *

+
  “ip-interface”             gchar *

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

 
Flags: Read

@@ -3018,7 +3022,7 @@ operations like addressing and routing.

 

 
The “ip4-config” property

 
  “ip4-config”               NMIPConfig *

-
The NMIP4Config of the device.

+
The NMIP4Config of the device.

 
Flags: Read

 

 

@@ -3031,14 +3035,14 @@ operations like addressing and routing.

 

 

 
The “lldp-neighbors” property

-
  “lldp-neighbors”           GPtrArray *

+
  “lldp-neighbors”           GPtrArray *

 
The LLDP neighbors.

 
Flags: Read

 

 

 

 
The “managed” property

-
  “managed”                  gboolean

+
  “managed”                  gboolean

 
Whether the device is managed by NetworkManager.

 
Flags: Read

 
Default value: FALSE

@@ -3046,7 +3050,7 @@ operations like addressing and routing.

 

 

 
The “metered” property

-
  “metered”                  guint

+
  “metered”                  guint

 
Whether the device is metered.

 
Flags: Read

 
Default value: 0

@@ -3055,7 +3059,7 @@ operations like addressing and routing.

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “mtu”                      guint

 
The MTU of the device.

 
Flags: Read

 
Default value: 1500

@@ -3063,8 +3067,8 @@ operations like addressing and routing.

 

 

 
The “nm-plugin-missing” property

-
  “nm-plugin-missing”        gboolean

-
When TRUE indicates that the NetworkManager plugin for the device
+
  “nm-plugin-missing”        gboolean

+
When TRUE indicates that the NetworkManager plugin for the device
 is not installed.

 
Flags: Read

 
Default value: FALSE

@@ -3073,7 +3077,7 @@ is not installed.

 

 

 
The “physical-port-id” property

-
  “physical-port-id”         gchar *

+
  “physical-port-id”         gchar *

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

 
Flags: Read

@@ -3082,7 +3086,7 @@ is not installed.

 

 

 
The “product” property

-
  “product”                  gchar *

+
  “product”                  gchar *

 
The product string of the device.

 
Flags: Read

 
Default value: NULL

@@ -3090,7 +3094,7 @@ is not installed.

 

 

 
The “real” property

-
  “real”                     gboolean

+
  “real”                     gboolean

 
Whether the device is real or is a placeholder device that could
 be created automatically by NetworkManager if one of its
 “available-connections” was activated.

@@ -3109,7 +3113,7 @@ be created automatically by NetworkManager if one of its
 

 

 
The “state-reason” property

-
  “state-reason”             guint

+
  “state-reason”             guint

 
The reason for the device state.

 
Flags: Read

 
Default value: 0

@@ -3117,7 +3121,7 @@ be created automatically by NetworkManager if one of its
 

 

 
The “udi” property

-
  “udi”                      gchar *

+
  “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)
@@ -3130,7 +3134,7 @@ request more information about the device from those services.

 

 

 
The “vendor” property

-
  “vendor”                   gchar *

+
  “vendor”                   gchar *

 
The vendor string of the device.

 
Flags: Read

 
Default value: NULL

@@ -3142,10 +3146,10 @@ request more information about the device from those services.

 
The “state-changed” signal

 
void
 user_function (NMDevice *device,
-               guint     new_state,
-               guint     old_state,
-               guint     reason,
-               gpointer  user_data)

+               guint     new_state,
+               guint     old_state,
+               guint     reason,
+               gpointer  user_data)

 
Notifies the state change of a NMDevice.

 

 
Parameters

@@ -3184,7 +3188,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 
 
 
diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html
index 5611b4f7..7c9c5612 100644
--- a/docs/libnm/html/NMDeviceAdsl.html
+++ b/docs/libnm/html/NMDeviceAdsl.html
@@ -42,7 +42,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_adsl_get_carrier ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
@@ -80,7 +80,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceAdsl
@@ -93,7 +93,7 @@
 
Functions

 

 
nm_device_adsl_get_carrier ()

-
gboolean
+
gboolean
 nm_device_adsl_get_carrier (NMDeviceAdsl *device);

 
Whether the device has carrier.

 

@@ -113,7 +113,7 @@ nm_device_adsl_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -129,7 +129,7 @@ nm_device_adsl_get_carrier (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index c2a2069d..b99d8ba3 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -50,14 +50,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bond_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bond_get_slaves ()
@@ -76,19 +76,19 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 slaves
 Read
 
@@ -120,7 +120,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBond
@@ -160,7 +160,7 @@ device, and must not be modified.

 

 

 
nm_device_bond_get_carrier ()

-
gboolean
+
gboolean
 nm_device_bond_get_carrier (NMDeviceBond *device);

 
Whether the device has carrier.

 

@@ -180,13 +180,13 @@ nm_device_bond_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

 

 
nm_device_bond_get_slaves ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_bond_get_slaves (NMDeviceBond *device);

 
Gets the devices currently slaved to device
 .

@@ -207,7 +207,7 @@ nm_device_bond_get_slaves (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 

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

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “slaves” property

-
  “slaves”                   GPtrArray *

+
  “slaves”                   GPtrArray *

 
The devices slaved to the bond device.

 
Element-type: NMDevice

 
Flags: Read

diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 986dbf57..dee83c75 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -50,14 +50,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_bridge_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_bridge_get_slaves ()
@@ -76,19 +76,19 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 slaves
 Read
 
@@ -120,7 +120,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBridge
@@ -160,7 +160,7 @@ device, and must not be modified.

 

 

 
nm_device_bridge_get_carrier ()

-
gboolean
+
gboolean
 nm_device_bridge_get_carrier (NMDeviceBridge *device);

 
Whether the device has carrier.

 

@@ -180,13 +180,13 @@ nm_device_bridge_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

 

 
nm_device_bridge_get_slaves ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_bridge_get_slaves (NMDeviceBridge *device);

 
Gets the devices currently slaved to device
 .

@@ -207,7 +207,7 @@ nm_device_bridge_get_slaves (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 

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

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “slaves” property

-
  “slaves”                   GPtrArray *

+
  “slaves”                   GPtrArray *

 
The devices slaved to the bridge device.

 
Element-type: NMDevice

 
Flags: Read

diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html
index 90c0b9bc..b8cb2689 100644
--- a/docs/libnm/html/NMDeviceBt.html
+++ b/docs/libnm/html/NMDeviceBt.html
@@ -82,13 +82,13 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 name
 Read
 
@@ -120,7 +120,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceBt
@@ -241,7 +241,7 @@ nm_device_bt_get_capabilities (
 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -249,7 +249,7 @@ nm_device_bt_get_capabilities (
 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

 
The name of the bluetooth device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html
index b1d65f64..0b6dc4a2 100644
--- a/docs/libnm/html/NMDeviceEthernet.html
+++ b/docs/libnm/html/NMDeviceEthernet.html
@@ -57,7 +57,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_ethernet_get_speed ()
@@ -65,7 +65,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_ethernet_get_carrier ()
@@ -91,29 +91,29 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
 
-GStrv
+GStrv
 s390-subchannels
 Read
 
 
-guint
+guint
 speed
 Read
 
@@ -153,7 +153,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceEthernet
@@ -221,7 +221,7 @@ device, and must not be modified.

 

 

 
nm_device_ethernet_get_speed ()

-
guint32
+
guint32
 nm_device_ethernet_get_speed (NMDeviceEthernet *device);

 
Gets the speed of the NMDeviceEthernet.

 

@@ -247,7 +247,7 @@ nm_device_ethernet_get_speed (
 
nm_device_ethernet_get_carrier ()

-
gboolean
+
gboolean
 nm_device_ethernet_get_carrier (NMDeviceEthernet *device);

 
Whether the device has carrier.

 

@@ -267,7 +267,7 @@ nm_device_ethernet_get_carrier (
 

 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -337,7 +337,7 @@ one subchannel the s390 device uses to communicate to the host. 

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

@@ -345,7 +345,7 @@ one subchannel the s390 device uses to communicate to the host. 

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The active hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -353,7 +353,7 @@ one subchannel the s390 device uses to communicate to the host. 

 

 

 
The “perm-hw-address” property

-
  “perm-hw-address”          gchar *

+
  “perm-hw-address”          gchar *

 
The permanent hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -361,7 +361,7 @@ one subchannel the s390 device uses to communicate to the host. 

 

 

 
The “s390-subchannels” property

-
  “s390-subchannels”         GStrv

+
  “s390-subchannels”         GStrv

 
Identifies subchannels of this network device used for
 communication with z/VM or s390 host.

 
Flags: Read

@@ -370,7 +370,7 @@ communication with z/VM or s390 host.

 

 

 
The “speed” property

-
  “speed”                    guint

+
  “speed”                    guint

 
The speed of the device.

 
Flags: Read

 
Default value: 0

diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html
index 765052c5..8144c52f 100644
--- a/docs/libnm/html/NMDeviceGeneric.html
+++ b/docs/libnm/html/NMDeviceGeneric.html
@@ -60,13 +60,13 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 type-description
 Read
 
@@ -94,7 +94,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceGeneric
@@ -150,7 +150,7 @@ device, and must not be modified.

 
Property Details

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware address of the device.

 
Flags: Read

 
Default value: NULL

@@ -158,8 +158,8 @@ 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
+
  “type-description”         gchar *

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

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html
index d17bf082..771b9c45 100644
--- a/docs/libnm/html/NMDeviceIPTunnel.html
+++ b/docs/libnm/html/NMDeviceIPTunnel.html
@@ -73,7 +73,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_device_ip_tunnel_get_ttl ()
@@ -81,7 +81,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_device_ip_tunnel_get_tos ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_ip_tunnel_get_path_mtu_discovery ()
@@ -111,7 +111,7 @@
 
 
 
-guint8
+guint8
 
 
 nm_device_ip_tunnel_get_encapsulation_limit ()
@@ -119,7 +119,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_ip_tunnel_get_flow_label ()
@@ -138,35 +138,35 @@
 
 
 
-guchar
+guchar
 encapsulation-limit
 Read
 
 
-guint
+guint
 flow-label
 Read
 
 
 
-gchar *
+gchar *
 input-key
 Read
 
 
 
-gchar *
+gchar *
 local
 Read
 
 
-guint
+guint
 mode
 Read
 
 
 
-gchar *
+gchar *
 output-key
 Read
 
@@ -177,23 +177,23 @@
 Read
 
 
-gboolean
+gboolean
 path-mtu-discovery
 Read
 
 
 
-gchar *
+gchar *
 remote
 Read
 
 
-guchar
+guchar
 tos
 Read
 
 
-guchar
+guchar
 ttl
 Read
 
@@ -257,7 +257,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceIPTunnel
@@ -375,7 +375,7 @@ nm_device_ip_tunnel_get_remote (
 

 
nm_device_ip_tunnel_get_ttl ()

-
guint8
+
guint8
 nm_device_ip_tunnel_get_ttl (NMDeviceIPTunnel *device);

 

 
Parameters

@@ -401,7 +401,7 @@ nm_device_ip_tunnel_get_ttl (
 
nm_device_ip_tunnel_get_tos ()

-
guint8
+
guint8
 nm_device_ip_tunnel_get_tos (NMDeviceIPTunnel *device);

 

 
Parameters

@@ -428,7 +428,7 @@ to tunneled packets.

 

 

 
nm_device_ip_tunnel_get_path_mtu_discovery ()

-
gboolean
+
gboolean
 nm_device_ip_tunnel_get_path_mtu_discovery
                                (NMDeviceIPTunnel *device);

 

@@ -507,7 +507,7 @@ nm_device_ip_tunnel_get_output_key (
 

 
nm_device_ip_tunnel_get_encapsulation_limit ()

-
guint8
+
guint8
 nm_device_ip_tunnel_get_encapsulation_limit
                                (NMDeviceIPTunnel *device);

 

@@ -534,7 +534,7 @@ nm_device_ip_tunnel_get_encapsulation_limit
 

 

 
nm_device_ip_tunnel_get_flow_label ()

-
guint
+
guint
 nm_device_ip_tunnel_get_flow_label (NMDeviceIPTunnel *device);

 

 
Parameters

@@ -630,7 +630,7 @@ nm_device_ip_tunnel_get_flow_label (
Property Details

 

 
The “encapsulation-limit” property

-
  “encapsulation-limit”      guchar

+
  “encapsulation-limit”      guchar

 
How many additional levels of encapsulation are permitted to
 be prepended to packets. This property applies only to IPv6
 tunnels.

@@ -641,7 +641,7 @@ tunnels.

 

 

 
The “flow-label” property

-
  “flow-label”               guint

+
  “flow-label”               guint

 
The flow label to assign to tunnel packets. This property
 applies only to IPv6 tunnels.

 
Flags: Read

@@ -652,7 +652,7 @@ applies only to IPv6 tunnels.

 

 

 
The “input-key” property

-
  “input-key”                gchar *

+
  “input-key”                gchar *

 
The key used for tunneled input packets, if applicable.

 
Flags: Read

 
Default value: NULL

@@ -661,7 +661,7 @@ applies only to IPv6 tunnels.

 

 

 
The “local” property

-
  “local”                    gchar *

+
  “local”                    gchar *

 
The local endpoint of the tunnel.

 
Flags: Read

 
Default value: NULL

@@ -670,7 +670,7 @@ applies only to IPv6 tunnels.

 

 

 
The “mode” property

-
  “mode”                     guint

+
  “mode”                     guint

 
The tunneling mode of the device.

 
Flags: Read

 
Default value: 0

@@ -679,7 +679,7 @@ applies only to IPv6 tunnels.

 

 

 
The “output-key” property

-
  “output-key”               gchar *

+
  “output-key”               gchar *

 
The key used for tunneled output packets, if applicable.

 
Flags: Read

 
Default value: NULL

@@ -696,7 +696,7 @@ applies only to IPv6 tunnels.

 

 

 
The “path-mtu-discovery” property

-
  “path-mtu-discovery”       gboolean

+
  “path-mtu-discovery”       gboolean

 
Whether path MTU discovery is enabled on this tunnel.

 
Flags: Read

 
Default value: FALSE

@@ -705,7 +705,7 @@ applies only to IPv6 tunnels.

 

 

 
The “remote” property

-
  “remote”                   gchar *

+
  “remote”                   gchar *

 
The remote endpoint of the tunnel.

 
Flags: Read

 
Default value: NULL

@@ -714,7 +714,7 @@ applies only to IPv6 tunnels.

 

 

 
The “tos” property

-
  “tos”                      guchar

+
  “tos”                      guchar

 
The type of service (IPv4) or traffic class (IPv6) assigned to
 tunneled packets.

 
Flags: Read

@@ -724,7 +724,7 @@ tunneled packets.

 

 

 
The “ttl” property

-
  “ttl”                      guchar

+
  “ttl”                      guchar

 
The TTL assigned to tunneled packets. 0 is a special value
  meaning that packets inherit the TTL value

 
Flags: Read

diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html
index 955467bc..ccfcbef2 100644
--- a/docs/libnm/html/NMDeviceInfiniband.html
+++ b/docs/libnm/html/NMDeviceInfiniband.html
@@ -50,7 +50,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_infiniband_get_carrier ()
@@ -69,13 +69,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -103,7 +103,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceInfiniband
@@ -143,7 +143,7 @@ device, and must not be modified.

 

 

 
nm_device_infiniband_get_carrier ()

-
gboolean
+
gboolean
 nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);

 
Whether the device has carrier.

 

@@ -163,7 +163,7 @@ nm_device_infiniband_get_carrier (
 

 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -185,7 +185,7 @@ nm_device_infiniband_get_carrier (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

@@ -193,7 +193,7 @@ nm_device_infiniband_get_carrier (
 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html
index a01552e6..f5866285 100644
--- a/docs/libnm/html/NMDeviceMacvlan.html
+++ b/docs/libnm/html/NMDeviceMacvlan.html
@@ -58,7 +58,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_macvlan_get_no_promisc ()
@@ -66,7 +66,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_macvlan_get_tap ()
@@ -93,18 +93,18 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 mode
 Read
 
 
-gboolean
+gboolean
 no-promisc
 Read
 
@@ -115,7 +115,7 @@
 Read
 
 
-gboolean
+gboolean
 tap
 Read
 
@@ -155,7 +155,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceMacvlan
@@ -223,7 +223,7 @@ device, and must not be modified.

 

 

 
nm_device_macvlan_get_no_promisc ()

-
gboolean
+
gboolean
 nm_device_macvlan_get_no_promisc (NMDeviceMacvlan *device);

 
Gets the no-promiscuous flag of the device.

 

@@ -250,7 +250,7 @@ nm_device_macvlan_get_no_promisc (
 

 
nm_device_macvlan_get_tap ()

-
gboolean
+
gboolean
 nm_device_macvlan_get_tap (NMDeviceMacvlan *device);

 
Gets the device type (MACVLAN or MACVTAP).

 

@@ -270,7 +270,7 @@ nm_device_macvlan_get_tap (
 
Returns

-
 TRUE if the device is a MACVTAP, FALSE if it is a MACVLAN.

+
 TRUE if the device is a MACVTAP, FALSE if it is a MACVLAN.

 

 
Since: 1.2

 

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

 
Property Details

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “mode” property

-
  “mode”                     gchar *

+
  “mode”                     gchar *

 
The MACVLAN mode.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “no-promisc” property

-
  “no-promisc”               gboolean

+
  “no-promisc”               gboolean

 
Whether the device has the no-promiscuos flag.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “tap” property

-
  “tap”                      gboolean

+
  “tap”                      gboolean

 
Whether the device is a MACVTAP.

 
Flags: Read

 
Default value: FALSE

diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html
index b79d21a8..48227b60 100644
--- a/docs/libnm/html/NMDeviceModem.html
+++ b/docs/libnm/html/NMDeviceModem.html
@@ -103,7 +103,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceModem
diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html
index f902904a..92f9a5e6 100644
--- a/docs/libnm/html/NMDeviceOlpcMesh.html
+++ b/docs/libnm/html/NMDeviceOlpcMesh.html
@@ -58,7 +58,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_olpc_mesh_get_active_channel ()
@@ -77,7 +77,7 @@
 
 
 
-guint
+guint
 active-channel
 Read
 
@@ -89,7 +89,7 @@
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -121,7 +121,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceOlpcMesh
@@ -181,14 +181,14 @@ nm_device_olpc_mesh_get_companion (
 

 
Returns

-
 the companion of the device of NULL. 

+
 the companion of the device of NULL. 

 
[transfer none]

 

 

 

 

 
nm_device_olpc_mesh_get_active_channel ()

-
guint32
+
guint32
 nm_device_olpc_mesh_get_active_channel
                                (NMDeviceOlpcMesh *device);

 
Returns the active channel of the NMDeviceOlpcMesh device.

@@ -237,7 +237,7 @@ nm_device_olpc_mesh_get_active_channel
 
Property Details

 

 
The “active-channel” property

-
  “active-channel”           guint

+
  “active-channel”           guint

 
The device's active channel.

 
Flags: Read

 
Default value: 0

@@ -252,7 +252,7 @@ nm_device_olpc_mesh_get_active_channel
 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index 8c397647..e166abba 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -50,14 +50,14 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_team_get_carrier ()
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_team_get_slaves ()
@@ -76,19 +76,19 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 slaves
 Read
 
@@ -120,7 +120,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceTeam
@@ -160,7 +160,7 @@ device, and must not be modified.

 

 

 
nm_device_team_get_carrier ()

-
gboolean
+
gboolean
 nm_device_team_get_carrier (NMDeviceTeam *device);

 
Whether the device has carrier.

 

@@ -180,13 +180,13 @@ nm_device_team_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

 

 
nm_device_team_get_slaves ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_team_get_slaves (NMDeviceTeam *device);

 
Gets the devices currently enslaved to device
 .

@@ -207,7 +207,7 @@ nm_device_team_get_slaves (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMDevices that are slaves of device
 . This is the internal
 copy used by the device, and must not be modified. 

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

 
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

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

 

 

 
The “slaves” property

-
  “slaves”                   GPtrArray *

+
  “slaves”                   GPtrArray *

 
The devices enslaved to the team device.

 
Element-type: NMDevice

 
Flags: Read

diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html
index 5b30f9d1..24157784 100644
--- a/docs/libnm/html/NMDeviceTun.html
+++ b/docs/libnm/html/NMDeviceTun.html
@@ -57,7 +57,7 @@
 
 
 
-gint64
+gint64
 
 
 nm_device_tun_get_owner ()
@@ -65,7 +65,7 @@
 
 
 
-gint64
+gint64
 
 
 nm_device_tun_get_group ()
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_tun_get_no_pi ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_tun_get_vnet_hdr ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_tun_get_multi_queue ()
@@ -108,39 +108,39 @@
 
 
 
-gint64
+gint64
 group
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-gchar *
+gchar *
 mode
 Read
 
 
-gboolean
+gboolean
 multi-queue
 Read
 
 
-gboolean
+gboolean
 no-pi
 Read
 
 
-gint64
+gint64
 owner
 Read
 
 
-gboolean
+gboolean
 vnet-hdr
 Read
 
@@ -188,7 +188,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceTun
@@ -256,7 +256,7 @@ nm_device_tun_get_mode (
 
nm_device_tun_get_owner ()

-
gint64
+
gint64
 nm_device_tun_get_owner (NMDeviceTun *device);

 
Gets the tunnel owner.

 

@@ -283,7 +283,7 @@ nm_device_tun_get_owner (
 
nm_device_tun_get_group ()

-
gint64
+
gint64
 nm_device_tun_get_group (NMDeviceTun *device);

 
Gets the tunnel group.

 

@@ -310,13 +310,13 @@ nm_device_tun_get_group (
 
nm_device_tun_get_no_pi ()

-
gboolean
+
gboolean
 nm_device_tun_get_no_pi (NMDeviceTun *device);

 

 

 

 
nm_device_tun_get_vnet_hdr ()

-
gboolean
+
gboolean
 nm_device_tun_get_vnet_hdr (NMDeviceTun *device);

 
Returns whether the NMDeviceTun has the IFF_VNET_HDR flag.

 

@@ -336,14 +336,14 @@ nm_device_tun_get_vnet_hdr (
 
Returns

-
 TRUE if the device has the flag, FALSE otherwise

+
 TRUE if the device has the flag, FALSE otherwise

 

 
Since: 1.2

 

 

 

 
nm_device_tun_get_multi_queue ()

-
gboolean
+
gboolean
 nm_device_tun_get_multi_queue (NMDeviceTun *device);

 
Returns whether the NMDeviceTun has the IFF_MULTI_QUEUE flag.

 

@@ -363,7 +363,7 @@ nm_device_tun_get_multi_queue (
 

 
Returns

-
 TRUE if the device doesn't have the flag, FALSE otherwise

+
 TRUE if the device doesn't have the flag, FALSE otherwise

 

 
Since: 1.2

 

@@ -416,7 +416,7 @@ nm_device_tun_get_multi_queue (
Property Details

 

 
The “group” property

-
  “group”                    gint64

+
  “group”                    gint64

 
The gid of the tunnel group, or -1 if it has no owner.

 
Flags: Read

 
Allowed values: [-1,4294967295]

@@ -426,7 +426,7 @@ nm_device_tun_get_multi_queue (
 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -435,7 +435,7 @@ nm_device_tun_get_multi_queue (
 

 
The “mode” property

-
  “mode”                     gchar *

+
  “mode”                     gchar *

 
The tunnel mode, either "tun" or "tap".

 
Flags: Read

 
Default value: NULL

@@ -444,7 +444,7 @@ nm_device_tun_get_multi_queue (
 

 
The “multi-queue” property

-
  “multi-queue”              gboolean

+
  “multi-queue”              gboolean

 
The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
 the tap device multiple times, for multiple send/receive
 queues.

@@ -455,7 +455,7 @@ queues.

 

 

 
The “no-pi” property

-
  “no-pi”                    gboolean

+
  “no-pi”                    gboolean

 
The tunnel's "TUN_NO_PI" flag; true if no protocol info is
 prepended to the tunnel packets.

 
Flags: Read

@@ -465,7 +465,7 @@ prepended to the tunnel packets.

 

 

 
The “owner” property

-
  “owner”                    gint64

+
  “owner”                    gint64

 
The uid of the tunnel owner, or -1 if it has no owner.

 
Flags: Read

 
Allowed values: [-1,4294967295]

@@ -475,7 +475,7 @@ prepended to the tunnel packets.

 

 

 
The “vnet-hdr” property

-
  “vnet-hdr”                 gboolean

+
  “vnet-hdr”                 gboolean

 
The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
 include a virtio network header.

 
Flags: Read

diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html
index 17cefa9f..08ab3bf0 100644
--- a/docs/libnm/html/NMDeviceVlan.html
+++ b/docs/libnm/html/NMDeviceVlan.html
@@ -50,7 +50,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vlan_get_carrier ()
@@ -66,7 +66,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vlan_get_vlan_id ()
@@ -85,13 +85,13 @@
 
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -102,7 +102,7 @@
 Read
 
 
-guint
+guint
 vlan-id
 Read
 
@@ -138,7 +138,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceVlan
@@ -178,7 +178,7 @@ device, and must not be modified.

 

 

 
nm_device_vlan_get_carrier ()

-
gboolean
+
gboolean
 nm_device_vlan_get_carrier (NMDeviceVlan *device);

 
Whether the device has carrier.

 

@@ -198,7 +198,7 @@ nm_device_vlan_get_carrier (
 
Returns

-
 TRUE if the device has carrier

+
 TRUE if the device has carrier

 

 

 

@@ -230,7 +230,7 @@ nm_device_vlan_get_parent (
 
nm_device_vlan_get_vlan_id ()

-
guint
+
guint
 nm_device_vlan_get_vlan_id (NMDeviceVlan *device);

 

 
Parameters

@@ -283,7 +283,7 @@ nm_device_vlan_get_vlan_id (
Property Details

 

 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

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

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -306,7 +306,7 @@ nm_device_vlan_get_vlan_id (
 
The “vlan-id” property

-
  “vlan-id”                  guint

+
  “vlan-id”                  guint

 
The device's VLAN ID.

 
Flags: Read

 
Allowed values: <= 4095

diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html
index 2190608d..074a37fb 100644
--- a/docs/libnm/html/NMDeviceVxlan.html
+++ b/docs/libnm/html/NMDeviceVxlan.html
@@ -50,7 +50,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_carrier ()
@@ -66,7 +66,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_id ()
@@ -88,7 +88,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_src_port_min ()
@@ -96,7 +96,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_src_port_max ()
@@ -104,7 +104,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_dst_port ()
@@ -112,7 +112,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_learning ()
@@ -120,7 +120,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_ageing ()
@@ -128,7 +128,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_tos ()
@@ -136,7 +136,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_ttl ()
@@ -144,7 +144,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_vxlan_get_limit ()
@@ -152,7 +152,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_proxy ()
@@ -160,7 +160,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_rsc ()
@@ -168,7 +168,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_l2miss ()
@@ -176,7 +176,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_vxlan_get_l3miss ()
@@ -195,60 +195,60 @@
 
 
 
-guint
+guint
 ageing
 Read
 
 
-gboolean
+gboolean
 carrier
 Read
 
 
-guint
+guint
 dst-port
 Read
 
 
 
-gchar *
+gchar *
 group
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
-guint
+guint
 id
 Read
 
 
-gboolean
+gboolean
 l2miss
 Read
 
 
-gboolean
+gboolean
 l3miss
 Read
 
 
-gboolean
+gboolean
 learning
 Read
 
 
-guint
+guint
 limit
 Read
 
 
 
-gchar *
+gchar *
 local
 Read
 
@@ -259,32 +259,32 @@
 Read
 
 
-gboolean
+gboolean
 proxy
 Read
 
 
-gboolean
+gboolean
 rsc
 Read
 
 
-guint
+guint
 src-port-max
 Read
 
 
-guint
+guint
 src-port-min
 Read
 
 
-guchar
+guchar
 tos
 Read
 
 
-guchar
+guchar
 ttl
 Read
 
@@ -376,7 +376,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceVxlan
@@ -417,7 +417,7 @@ device, and must not be modified.

 

 

 
nm_device_vxlan_get_carrier ()

-
gboolean
+
gboolean
 nm_device_vxlan_get_carrier (NMDeviceVxlan *device);

 
Whether the device has carrier.

 

@@ -437,7 +437,7 @@ nm_device_vxlan_get_carrier (
 
Returns

-
 TRUE if the device has carrier.

+
 TRUE if the device has carrier.

 

 
Since: 1.2

 

@@ -471,7 +471,7 @@ nm_device_vxlan_get_parent (
 
nm_device_vxlan_get_id ()

-
guint
+
guint
 nm_device_vxlan_get_id (NMDeviceVxlan *device);

 

 
Parameters

@@ -550,7 +550,7 @@ nm_device_vxlan_get_local (
 
nm_device_vxlan_get_src_port_min ()

-
guint
+
guint
 nm_device_vxlan_get_src_port_min (NMDeviceVxlan *device);

 

 
Parameters

@@ -576,7 +576,7 @@ nm_device_vxlan_get_src_port_min (
 

 
nm_device_vxlan_get_src_port_max ()

-
guint
+
guint
 nm_device_vxlan_get_src_port_max (NMDeviceVxlan *device);

 

 
Parameters

@@ -602,7 +602,7 @@ nm_device_vxlan_get_src_port_max (
 

 
nm_device_vxlan_get_dst_port ()

-
guint
+
guint
 nm_device_vxlan_get_dst_port (NMDeviceVxlan *device);

 

 
Parameters

@@ -628,7 +628,7 @@ nm_device_vxlan_get_dst_port (
 
nm_device_vxlan_get_learning ()

-
gboolean
+
gboolean
 nm_device_vxlan_get_learning (NMDeviceVxlan *device);

 

 
Parameters

@@ -654,7 +654,7 @@ nm_device_vxlan_get_learning (
 
nm_device_vxlan_get_ageing ()

-
guint
+
guint
 nm_device_vxlan_get_ageing (NMDeviceVxlan *device);

 

 
Parameters

@@ -680,7 +680,7 @@ nm_device_vxlan_get_ageing (
 
nm_device_vxlan_get_tos ()

-
guint
+
guint
 nm_device_vxlan_get_tos (NMDeviceVxlan *device);

 

 
Parameters

@@ -706,7 +706,7 @@ nm_device_vxlan_get_tos (
 
nm_device_vxlan_get_ttl ()

-
guint
+
guint
 nm_device_vxlan_get_ttl (NMDeviceVxlan *device);

 

 
Parameters

@@ -732,7 +732,7 @@ nm_device_vxlan_get_ttl (
 
nm_device_vxlan_get_limit ()

-
guint
+
guint
 nm_device_vxlan_get_limit (NMDeviceVxlan *device);

 

 
Parameters

@@ -759,7 +759,7 @@ forwarding table

 

 

 
nm_device_vxlan_get_proxy ()

-
gboolean
+
gboolean
 nm_device_vxlan_get_proxy (NMDeviceVxlan *device);

 

 
Parameters

@@ -785,7 +785,7 @@ nm_device_vxlan_get_proxy (
 
nm_device_vxlan_get_rsc ()

-
gboolean
+
gboolean
 nm_device_vxlan_get_rsc (NMDeviceVxlan *device);

 

 
Parameters

@@ -811,7 +811,7 @@ nm_device_vxlan_get_rsc (
 
nm_device_vxlan_get_l2miss ()

-
gboolean
+
gboolean
 nm_device_vxlan_get_l2miss (NMDeviceVxlan *device);

 

 
Parameters

@@ -837,7 +837,7 @@ nm_device_vxlan_get_l2miss (
 
nm_device_vxlan_get_l3miss ()

-
gboolean
+
gboolean
 nm_device_vxlan_get_l3miss (NMDeviceVxlan *device);

 

 
Parameters

@@ -975,7 +975,7 @@ nm_device_vxlan_get_l3miss (
Property Details

 

 
The “ageing” property

-
  “ageing”                   guint

+
  “ageing”                   guint

 
The lifetime in seconds of FDB entries learnt by the kernel.

 
Flags: Read

 
Default value: 0

@@ -984,7 +984,7 @@ nm_device_vxlan_get_l3miss (
 
The “carrier” property

-
  “carrier”                  gboolean

+
  “carrier”                  gboolean

 
Whether the device has carrier.

 
Flags: Read

 
Default value: FALSE

@@ -993,7 +993,7 @@ nm_device_vxlan_get_l3miss (
 
The “dst-port” property

-
  “dst-port”                 guint

+
  “dst-port”                 guint

 
The UDP destination port used to communicate with the remote VXLAN tunnel
 endpoint.

 
Flags: Read

@@ -1004,7 +1004,7 @@ endpoint.

 

 

 
The “group” property

-
  “group”                    gchar *

+
  “group”                    gchar *

 
The unicast destination IP address used in outgoing packets when the
 destination link layer address is not known in the VXLAN device
 forwarding database or the multicast IP address joined.

@@ -1015,7 +1015,7 @@ forwarding database or the multicast IP address joined.

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -1024,7 +1024,7 @@ forwarding database or the multicast IP address joined.

 

 

 
The “id” property

-
  “id”                       guint

+
  “id”                       guint

 
The device's VXLAN ID.

 
Flags: Read

 
Allowed values: <= 16777215

@@ -1034,7 +1034,7 @@ forwarding database or the multicast IP address joined.

 

 

 
The “l2miss” property

-
  “l2miss”                   gboolean

+
  “l2miss”                   gboolean

 
Whether netlink LL ADDR miss notifications are generated.

 
Flags: Read

 
Default value: FALSE

@@ -1043,7 +1043,7 @@ forwarding database or the multicast IP address joined.

 

 

 
The “l3miss” property

-
  “l3miss”                   gboolean

+
  “l3miss”                   gboolean

 
Whether netlink IP ADDR miss notifications are generated.

 
Flags: Read

 
Default value: FALSE

@@ -1052,7 +1052,7 @@ forwarding database or the multicast IP address joined.

 

 

 
The “learning” property

-
  “learning”                 gboolean

+
  “learning”                 gboolean

 
Whether unknown source link layer addresses and IP addresses are entered
 into the VXLAN device forwarding database.

 
Flags: Read

@@ -1062,7 +1062,7 @@ into the VXLAN device forwarding database.

 

 

 
The “limit” property

-
  “limit”                    guint

+
  “limit”                    guint

 
The maximum number of entries that can be added to the forwarding table.

 
Flags: Read

 
Default value: 0

@@ -1071,7 +1071,7 @@ into the VXLAN device forwarding database.

 

 

 
The “local” property

-
  “local”                    gchar *

+
  “local”                    gchar *

 
The source IP address to use in outgoing packets.

 
Flags: Read

 
Default value: NULL

@@ -1088,7 +1088,7 @@ into the VXLAN device forwarding database.

 

 

 
The “proxy” property

-
  “proxy”                    gboolean

+
  “proxy”                    gboolean

 
Whether ARP proxy is turned on.

 
Flags: Read

 
Default value: FALSE

@@ -1097,7 +1097,7 @@ into the VXLAN device forwarding database.

 

 

 
The “rsc” property

-
  “rsc”                      gboolean

+
  “rsc”                      gboolean

 
Whether route short circuit is turned on.

 
Flags: Read

 
Default value: FALSE

@@ -1106,7 +1106,7 @@ into the VXLAN device forwarding database.

 

 

 
The “src-port-max” property

-
  “src-port-max”             guint

+
  “src-port-max”             guint

 
The maximum UDP source port used to communicate with the remote VXLAN
 tunnel endpoint.

 
Flags: Read

@@ -1117,7 +1117,7 @@ tunnel endpoint.

 

 

 
The “src-port-min” property

-
  “src-port-min”             guint

+
  “src-port-min”             guint

 
The minimum UDP source port used to communicate with the remote VXLAN
 tunnel endpoint.

 
Flags: Read

@@ -1128,7 +1128,7 @@ tunnel endpoint.

 

 

 
The “tos” property

-
  “tos”                      guchar

+
  “tos”                      guchar

 
The TOS value to use in outgoing packets.

 
Flags: Read

 
Default value: 0

@@ -1137,7 +1137,7 @@ tunnel endpoint.

 

 

 
The “ttl” property

-
  “ttl”                      guchar

+
  “ttl”                      guchar

 
The time-to-live value to use in outgoing packets.

 
Flags: Read

 
Default value: 0

diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html
index 38421ce9..c9c6128c 100644
--- a/docs/libnm/html/NMDeviceWifi.html
+++ b/docs/libnm/html/NMDeviceWifi.html
@@ -66,7 +66,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_device_wifi_get_bitrate ()
@@ -97,7 +97,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wifi_get_access_points ()
@@ -105,7 +105,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_wifi_request_scan ()
@@ -113,7 +113,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_wifi_request_scan_options ()
@@ -137,7 +137,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_device_wifi_request_scan_finish ()
@@ -157,7 +157,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 access-points
 Read
 
@@ -168,13 +168,13 @@
 Read
 
 
-guint
+guint
 bitrate
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
@@ -185,7 +185,7 @@
 
 
 
-gchar *
+gchar *
 perm-hw-address
 Read
 
@@ -209,12 +209,12 @@
 
 void
 access-point-added
-Run First
+Run First
 
 
 void
 access-point-removed
-Run First
+Run First
 
 
 

@@ -260,7 +260,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWifi
@@ -354,7 +354,7 @@ nm_device_wifi_get_mode (
 
nm_device_wifi_get_bitrate ()

-
guint32
+
guint32
 nm_device_wifi_get_bitrate (NMDeviceWifi *device);

 
Gets the bit rate of the NMDeviceWifi in kbit/s.

 

@@ -427,7 +427,7 @@ nm_device_wifi_get_active_access_point
 

 

 
Returns

-
 the access point or NULL if none is active. 

+
 the access point or NULL if none is active. 

 
[transfer none]

 

 

@@ -463,14 +463,14 @@ nm_device_wifi_get_access_point_by_path
 

 

 
Returns

-
 the access point or NULL if none is found. 

+
 the access point or NULL if none is found. 

 
[transfer none]

 

 

 

 

 
nm_device_wifi_get_access_points ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_wifi_get_access_points (NMDeviceWifi *device);

 
Gets all the scanned access points of the NMDeviceWifi.

 

@@ -490,7 +490,7 @@ nm_device_wifi_get_access_points (
 

 
Returns

-
 a GPtrArray containing all the
+
 a GPtrArray containing all the
 scanned NMAccessPoints.
 The returned array is owned by the client and should not be modified. 

 
[element-type NMAccessPoint]

@@ -499,10 +499,10 @@ The returned array is owned by the client and should not be modified. 

 

 

 
nm_device_wifi_request_scan ()

-
gboolean
+
gboolean
 nm_device_wifi_request_scan (NMDeviceWifi *device,
-                             GCancellable *cancellable,
-                             GError **error);

+                             GCancellable *cancellable,
+                             GError **error);

 
Request NM to scan for access points on device
 . Note that the function
 returns immediately after requesting the scan, and it may take some time
@@ -523,12 +523,12 @@ after that for the scan to complete.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -536,7 +536,7 @@ after that for the scan to complete.

 

 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be
 set.

 

@@ -544,11 +544,11 @@ set.

 

 

 
nm_device_wifi_request_scan_options ()

-
gboolean
+
gboolean
 nm_device_wifi_request_scan_options (NMDeviceWifi *device,
-                                     GVariant *options,
-                                     GCancellable *cancellable,
-                                     GError **error);

+                                     GVariant *options,
+                                     GCancellable *cancellable,
+                                     GError **error);

 
Request NM to scan for access points on device
 . Note that the function
 returns immediately after requesting the scan, and it may take some time
@@ -575,17 +575,17 @@ D-Bus call. Valid otions inside the dictionary are:
 
 
 
options

-
dictionary with options for RequestScan(), or NULL

+
dictionary with options for RequestScan(), or NULL

  
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -593,7 +593,7 @@ D-Bus call. Valid otions inside the dictionary are:
 

 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be
 set.

 

@@ -604,9 +604,9 @@ set.

 
nm_device_wifi_request_scan_async ()

 
void
 nm_device_wifi_request_scan_async (NMDeviceWifi *device,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);

+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data);

 
Request NM to scan for access points on device
 . Note that callback
  will be
@@ -628,7 +628,7 @@ that for the scan to complete.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -652,10 +652,10 @@ that for the scan to complete.

 
void
 nm_device_wifi_request_scan_options_async
                                (NMDeviceWifi *device,
-                                GVariant *options,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);

+                                GVariant *options,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);

 
Request NM to scan for access points on device
 . Note that callback
  will be
@@ -683,12 +683,12 @@ D-Bus call. Valid otions inside the dictionary are:
 
 
 
options

-
dictionary with options for RequestScan(), or NULL

+
dictionary with options for RequestScan(), or NULL

  
 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -710,10 +710,10 @@ D-Bus call. Valid otions inside the dictionary are:
 

 

 
nm_device_wifi_request_scan_finish ()

-
gboolean
+
gboolean
 nm_device_wifi_request_scan_finish (NMDeviceWifi *device,
-                                    GAsyncResult *result,
-                                    GError **error);

+                                    GAsyncResult *result,
+                                    GError **error);

 
Gets the result of a call to nm_device_wifi_request_scan_async().

 

 
Parameters

@@ -731,12 +731,12 @@ nm_device_wifi_request_scan_finish (
 
 
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
 
error

-
location for a GError, or NULL

+
location for a GError, or NULL

  
 
 
@@ -744,7 +744,7 @@ nm_device_wifi_request_scan_finish (
 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be
 set.

 

@@ -798,7 +798,7 @@ set.

 
Property Details

 

 
The “access-points” property

-
  “access-points”            GPtrArray *

+
  “access-points”            GPtrArray *

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

 
Element-type: NMAccessPoint

 
Flags: Read

@@ -813,7 +813,7 @@ set.

 

 

 
The “bitrate” property

-
  “bitrate”                  guint

+
  “bitrate”                  guint

 
The bit rate of the device in kbit/s.

 
Flags: Read

 
Default value: 0

@@ -821,7 +821,7 @@ set.

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -837,7 +837,7 @@ set.

 

 

 
The “perm-hw-address” property

-
  “perm-hw-address”          gchar *

+
  “perm-hw-address”          gchar *

 
The hardware (MAC) address of the device.

 
Flags: Read

 
Default value: NULL

@@ -856,8 +856,8 @@ set.

 
The “access-point-added” signal

 
void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)

+               GObject      *ap,
+               gpointer      user_data)

 
Notifies that a NMAccessPoint is added to the Wi-Fi device.

 

 
Parameters

@@ -886,15 +886,15 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “access-point-removed” signal

 
void
 user_function (NMDeviceWifi *device,
-               GObject      *ap,
-               gpointer      user_data)

+               GObject      *ap,
+               gpointer      user_data)

 
Notifies that a NMAccessPoint is removed from the Wi-Fi device.

 

 
Parameters

@@ -923,7 +923,7 @@ user_function (
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html
index a593d1b9..24c99f8e 100644
--- a/docs/libnm/html/NMDeviceWimax.html
+++ b/docs/libnm/html/NMDeviceWimax.html
@@ -66,7 +66,7 @@
 
 
 
-const GPtrArray *
+const GPtrArray *
 
 
 nm_device_wimax_get_nsps ()
@@ -74,7 +74,7 @@
 
 
 
-guint
+guint
 
 
 nm_device_wimax_get_center_frequency ()
@@ -82,7 +82,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_rssi ()
@@ -90,7 +90,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_cinr ()
@@ -98,7 +98,7 @@
 
 
 
-gint
+gint
 
 
 nm_device_wimax_get_tx_power ()
@@ -131,39 +131,39 @@
 
 
 
-gchar *
+gchar *
 bsid
 Read
 
 
-guint
+guint
 center-frequency
 Read
 
 
-gint
+gint
 cinr
 Read
 
 
 
-gchar *
+gchar *
 hw-address
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 nsps
 Read
 
 
-gint
+gint
 rssi
 Read
 
 
-gint
+gint
 tx-power
 Read
 
@@ -182,12 +182,12 @@
 
 void
 nsp-added
-Run First
+Run First
 
 
 void
 nsp-removed
-Run First
+Run First
 
 
 

@@ -237,7 +237,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDevice
             ╰── NMDeviceWimax
@@ -305,7 +305,7 @@ nm_device_wimax_get_active_nsp (
 

 
Returns

-
 the access point or NULL if none is active. 

+
 the access point or NULL if none is active. 

 
[transfer full]

 

 

@@ -344,14 +344,14 @@ nm_device_wimax_get_nsp_by_path (
 

 
Returns

-
 the access point or NULL if none is found. 

+
 the access point or NULL if none is found. 

 
[transfer none]

 

 

 

 

 
nm_device_wimax_get_nsps ()

-
const GPtrArray *
+
const GPtrArray *
 nm_device_wimax_get_nsps (NMDeviceWimax *wimax);

 

 
nm_device_wimax_get_nsps has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -375,7 +375,7 @@ nm_device_wimax_get_nsps (
 
Returns

-
 a GPtrArray containing
+
 a GPtrArray containing
 all the scanned NMWimaxNsps.
 The returned array is owned by the client and should not be modified. 

 
[element-type NMWimaxNsp]

@@ -384,7 +384,7 @@ The returned array is owned by the client and should not be modified. 

 

 

 
nm_device_wimax_get_center_frequency ()

-
guint
+
guint
 nm_device_wimax_get_center_frequency (NMDeviceWimax *self);

 

 
nm_device_wimax_get_center_frequency has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -416,7 +416,7 @@ device is not connected.

 

 

 
nm_device_wimax_get_rssi ()

-
gint
+
gint
 nm_device_wimax_get_rssi (NMDeviceWimax *self);

 

 
nm_device_wimax_get_rssi has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -449,7 +449,7 @@ device is not connected.

 

 

 
nm_device_wimax_get_cinr ()

-
gint
+
gint
 nm_device_wimax_get_cinr (NMDeviceWimax *self);

 

 
nm_device_wimax_get_cinr has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -481,7 +481,7 @@ meaning when the device is not connected.

 

 

 
nm_device_wimax_get_tx_power ()

-
gint
+
gint
 nm_device_wimax_get_tx_power (NMDeviceWimax *self);

 

 
nm_device_wimax_get_tx_power has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -537,7 +537,7 @@ nm_device_wimax_get_bsid (
 
Returns

-
 the ID of the serving Base Station, or NULL

+
 the ID of the serving Base Station, or NULL

 

 

 

@@ -606,7 +606,7 @@ nm_device_wimax_get_bsid (
 
The “bsid” property

-
  “bsid”                     gchar *

+
  “bsid”                     gchar *

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

 

@@ -619,7 +619,7 @@ no meaning when the device is not connected.

 

 

 
The “center-frequency” property

-
  “center-frequency”         guint

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

@@ -633,7 +633,7 @@ device is not connected.

 

 

 
The “cinr” property

-
  “cinr”                     gint

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

@@ -647,7 +647,7 @@ meaning when the device is not connected.

 

 

 
The “hw-address” property

-
  “hw-address”               gchar *

+
  “hw-address”               gchar *

 
The hardware (MAC) address of the device.

 

 
NMDeviceWimax:hw-address has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -659,7 +659,7 @@ meaning when the device is not connected.

 

 

 
The “nsps” property

-
  “nsps”                     GPtrArray *

+
  “nsps”                     GPtrArray *

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

 
Element-type: NMWimaxNsp

 
Flags: Read

@@ -667,7 +667,7 @@ meaning when the device is not connected.

 

 

 
The “rssi” property

-
  “rssi”                     gint

+
  “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
@@ -682,7 +682,7 @@ device is not connected.

 

 

 
The “tx-power” property

-
  “tx-power”                 gint

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

@@ -700,8 +700,8 @@ device is not connected.

 
The “nsp-added” signal

 
void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)

+               GObject       *nsp,
+               gpointer       user_data)

 
Notifies that a NMWimaxNsp is added to the wimax device.

 

 
NMDeviceWimax::nsp-added has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -734,15 +734,15 @@ user_function (<
 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

 
The “nsp-removed” signal

 
void
 user_function (NMDeviceWimax *self,
-               GObject       *nsp,
-               gpointer       user_data)

+               GObject       *nsp,
+               gpointer       user_data)

 
Notifies that a NMWimaxNsp is removed from the wimax device.

 

 
NMDeviceWimax::nsp-removed has been deprecated since version 1.2 and should not be used in newly-written code.

@@ -775,7 +775,7 @@ user_function (<
 
 

 

-
Flags: Run First

+
Flags: Run First

 

 

 

diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html
index 8bc84506..b506c4b1 100644
--- a/docs/libnm/html/NMDhcpConfig.html
+++ b/docs/libnm/html/NMDhcpConfig.html
@@ -51,7 +51,7 @@
 
 
 
-GHashTable *
+GHashTable *
 
 
 nm_dhcp_config_get_options ()
@@ -77,13 +77,13 @@
 
 
 
-gint
+gint
 family
 Read
 
 
 
-GHashTable *
+GHashTable *
 options
 Read
 
@@ -111,7 +111,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMDhcpConfig
 

@@ -150,7 +150,7 @@ nm_dhcp_config_get_family (
 
nm_dhcp_config_get_options ()

-
GHashTable *
+
GHashTable *
 nm_dhcp_config_get_options (NMDhcpConfig *config);

 
Gets all the options contained in the configuration.

 

@@ -170,7 +170,7 @@ nm_dhcp_config_get_options (
 
Returns

-
 the GHashTable containing
+
 the GHashTable containing
 strings for keys and values.  This is the internal copy used by the
 configuration, and must not be modified. 

 
[transfer none][element-type utf8 utf8]

@@ -230,7 +230,7 @@ configuration, and must not be modified.

 
Property Details

 

 
The “family” property

-
  “family”                   gint

+
  “family”                   gint

 
The IP address family of the configuration; either
 AF_INET or AF_INET6.

 
Flags: Read

@@ -240,8 +240,8 @@ configuration, and must not be modified.

 

 

 
The “options” property

-
  “options”                  GHashTable *

-
The GHashTable containing options of the configuration.

+
  “options”                  GHashTable *

+
The GHashTable containing options of the configuration.

 
Type: GLib.HashTable(utf8,utf8)

 
Flags: Read

 

diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html
index 10987785..b21fc882 100644
--- a/docs/libnm/html/NMIPConfig.html
+++ b/docs/libnm/html/NMIPConfig.html
@@ -58,7 +58,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_ip_config_get_addresses ()
@@ -66,7 +66,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_ip_config_get_routes ()
@@ -114,44 +114,44 @@
 
 
 
-GPtrArray *
+GPtrArray *
 addresses
 Read
 
 
-GStrv
+GStrv
 domains
 Read
 
 
-gint
+gint
 family
 Read
 
 
 
-gchar *
+gchar *
 gateway
 Read
 
 
-GStrv
+GStrv
 nameservers
 Read
 
 
 
-GPtrArray *
+GPtrArray *
 routes
 Read
 
 
-GStrv
+GStrv
 searches
 Read
 
 
-GStrv
+GStrv
 wins-servers
 Read
 
@@ -203,7 +203,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMIPConfig
 

@@ -269,7 +269,7 @@ nm_ip_config_get_gateway (
 
nm_ip_config_get_addresses ()

-
GPtrArray *
+
GPtrArray *
 nm_ip_config_get_addresses (NMIPConfig *config);

 
Gets the IP addresses (containing the address, prefix, and gateway).

 

@@ -289,7 +289,7 @@ nm_ip_config_get_addresses (
 
Returns

-
 the GPtrArray
+
 the GPtrArray
 containing NMIPAddresses.  This is the internal copy used by the
 configuration and must not be modified. The library never modifies the
 returned array and thus it is safe for callers to reference and keep using it. 

@@ -299,7 +299,7 @@ returned array and thus it is safe for callers to reference and keep using it. <
 

 

 
nm_ip_config_get_routes ()

-
GPtrArray *
+
GPtrArray *
 nm_ip_config_get_routes (NMIPConfig *config);

 
Gets the routes.

 

@@ -319,7 +319,7 @@ nm_ip_config_get_routes (
 
Returns

-
 the GPtrArray containing
+
 the GPtrArray containing
 NMIPRoutes. This is the internal copy used by the configuration, and must
 not be modified. The library never modifies the returned array and thus it is
 safe for callers to reference and keep using it. 

@@ -377,7 +377,7 @@ nm_ip_config_get_domains (
 
Returns

 
 the array of domains.
-(This is never NULL, though it may be 0-length). 

+(This is never NULL, though it may be 0-length). 

 
[transfer none]

 

 

@@ -405,7 +405,7 @@ nm_ip_config_get_searches (
 
Returns

 
 the array of DNS search strings.
-(This is never NULL, though it may be 0-length). 

+(This is never NULL, though it may be 0-length). 

 
[transfer none]

 

 

@@ -433,7 +433,7 @@ nm_ip_config_get_wins_servers (
 
Returns

 
 the arry of WINS server IP address strings.
-(This is never NULL, though it may be 0-length.). 

+(This is never NULL, though it may be 0-length.). 

 
[transfer none]

 

 

@@ -492,21 +492,21 @@ nm_ip_config_get_wins_servers (
Property Details

 

 
The “addresses” property

-
  “addresses”                GPtrArray *

-
A GPtrArray containing the addresses (NMIPAddress) of the configuration.

+
  “addresses”                GPtrArray *

+
A GPtrArray containing the addresses (NMIPAddress) of the configuration.

 
Flags: Read

 

 

 

 
The “domains” property

-
  “domains”                  GStrv

+
  “domains”                  GStrv

 
The array containing domain strings of the configuration.

 
Flags: Read

 

 

 

 
The “family” property

-
  “family”                   gint

+
  “family”                   gint

 
The IP address family of the configuration; either
 AF_INET or AF_INET6.

 
Flags: Read

@@ -516,7 +516,7 @@ nm_ip_config_get_wins_servers (
 

 
The “gateway” property

-
  “gateway”                  gchar *

+
  “gateway”                  gchar *

 
The IP gateway address of the configuration as string.

 
Flags: Read

 
Default value: NULL

@@ -524,28 +524,28 @@ nm_ip_config_get_wins_servers (
 

 
The “nameservers” property

-
  “nameservers”              GStrv

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

+
  “routes”                   GPtrArray *

+
A GPtrArray containing the routes (NMIPRoute) of the configuration.

 
Flags: Read

 

 

 

 
The “searches” property

-
  “searches”                 GStrv

+
  “searches”                 GStrv

 
The array containing DNS search strings of the configuration.

 
Flags: Read

 

 

 

 
The “wins-servers” property

-
  “wins-servers”             GStrv

+
  “wins-servers”             GStrv

 
The array containing WINS server IP addresses of the configuration.
 (This will always be empty for IPv6 configurations.)

 
Flags: Read

diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html
index 16db2f94..c9779152 100644
--- a/docs/libnm/html/NMObject.html
+++ b/docs/libnm/html/NMObject.html
@@ -60,18 +60,18 @@
 
 
 
-GDBusConnection *
+GDBusConnection *
 dbus-connection
 Read / Write / Construct Only
 
 
-gboolean
+gboolean
 nm-running-internal
 Read
 
 
 
-gchar *
+gchar *
 path
 Read / Write / Construct Only
 
@@ -99,7 +99,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ├── NMAccessPoint
         ├── NMActiveConnection
@@ -160,22 +160,22 @@ device, and must not be modified.

 
Property Details

 

 
The “dbus-connection” property

-
  “dbus-connection”          GDBusConnection *

-
The GDBusConnection of the object.

+
  “dbus-connection”          GDBusConnection *

+
The GDBusConnection of the object.

 
[skip]

 
Flags: Read / Write / Construct Only

 

 

 

 
The “nm-running-internal” property

-
  “nm-running-internal”      gboolean

+
  “nm-running-internal”      gboolean

 
Flags: Read

 
Default value: FALSE

 

 

 

 
The “path” property

-
  “path”                     gchar *

+
  “path”                     gchar *

 
The D-Bus object path.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html
index cdf5a9f1..dac135b3 100644
--- a/docs/libnm/html/NMRemoteConnection.html
+++ b/docs/libnm/html/NMRemoteConnection.html
@@ -43,7 +43,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_commit_changes ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_commit_changes_finish ()
@@ -67,7 +67,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_save ()
@@ -83,7 +83,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_save_finish ()
@@ -91,7 +91,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_delete ()
@@ -107,7 +107,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_delete_finish ()
@@ -115,7 +115,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_remote_connection_get_secrets ()
@@ -131,7 +131,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_remote_connection_get_secrets_finish ()
@@ -139,7 +139,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_get_unsaved ()
@@ -147,7 +147,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_remote_connection_get_visible ()
@@ -166,12 +166,12 @@
 
 
 
-gboolean
+gboolean
 unsaved
 Read
 
 
-gboolean
+gboolean
 visible
 Read
 
@@ -207,7 +207,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMRemoteConnection
 

@@ -219,16 +219,16 @@
 
Functions

 

 
nm_remote_connection_commit_changes ()

-
gboolean
+
gboolean
 nm_remote_connection_commit_changes (NMRemoteConnection *connection,
-                                     gboolean save_to_disk,
-                                     GCancellable *cancellable,
-                                     GError **error);

+                                     gboolean save_to_disk,
+                                     GCancellable *cancellable,
+                                     GError **error);

 
Send any local changes to the settings and properties of connection
  to
 NetworkManager. If save_to_disk
- is TRUE, the updated connection will be saved to
-disk; if FALSE, then only the in-memory representation will be changed.

+ is TRUE, the updated connection will be saved to
+disk; if FALSE, then only the in-memory representation will be changed.

 

 
Parameters

 

@@ -250,12 +250,12 @@ disk; if 
cancellable

-
+
-
+
@@ -263,7 +263,7 @@ disk; if 
 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

@@ -273,15 +273,15 @@ will be set.
void
 nm_remote_connection_commit_changes_async
                                (NMRemoteConnection *connection,
-                                gboolean save_to_disk,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);

+                                gboolean save_to_disk,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
Asynchronously sends any local changes to the settings and properties of
 connection
  to NetworkManager. If save
- is TRUE, the updated connection will
-be saved to disk; if FALSE, then only the in-memory representation will be
+ is TRUE, the updated connection will
+be saved to disk; if FALSE, then only the in-memory representation will be
 changed.

 
Parameters

@@ -304,7 +304,7 @@ changed.

 
 

-
+
@@ -325,11 +325,11 @@ changed.

 
nm_remote_connection_commit_changes_finish ()

-
gboolean
+
gboolean
 nm_remote_connection_commit_changes_finish
                                (NMRemoteConnection *connection,
-                                GAsyncResult *result,
-                                GError **error);

+                                GAsyncResult *result,
+                                GError **error);

 
Gets the result of a call to nm_remote_connection_commit_changes_async().

 

 
Parameters

@@ -347,12 +347,12 @@ nm_remote_connection_commit_changes_finish
 

-
+
-
+
@@ -360,17 +360,17 @@ nm_remote_connection_commit_changes_finish
 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 
nm_remote_connection_save ()

-
gboolean
+
gboolean
 nm_remote_connection_save (NMRemoteConnection *connection,
-                           GCancellable *cancellable,
-                           GError **error);

+                           GCancellable *cancellable,
+                           GError **error);

 
Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.

 

@@ -389,12 +389,12 @@ been written to disk, or if the connection has never been saved.

 
 

-
+
-
+
@@ -402,7 +402,7 @@ been written to disk, or if the connection has never been saved.

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

@@ -411,9 +411,9 @@ will be set.
nm_remote_connection_save_async ()
void
 nm_remote_connection_save_async (NMRemoteConnection *connection,
-                                 GCancellable *cancellable,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data);

+                                 GCancellable *cancellable,
+                                 GAsyncReadyCallback callback,
+                                 gpointer user_data);
Saves the connection to disk if the connection has changes that have not yet
 been written to disk, or if the connection has never been saved.

@@ -432,7 +432,7 @@ been written to disk, or if the connection has never been saved.

 
 

-
+
@@ -453,10 +453,10 @@ been written to disk, or if the connection has never been saved.

 
nm_remote_connection_save_finish ()

-
gboolean
+
gboolean
 nm_remote_connection_save_finish (NMRemoteConnection *connection,
-                                  GAsyncResult *result,
-                                  GError **error);

+                                  GAsyncResult *result,
+                                  GError **error);

 
Gets the result of a call to nm_remote_connection_save_async().

 

 
Parameters

@@ -474,12 +474,12 @@ nm_remote_connection_save_finish (
 

-
+
-
+
@@ -487,17 +487,17 @@ nm_remote_connection_save_finish (
 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 
 

 

 
nm_remote_connection_delete ()

-
gboolean
+
gboolean
 nm_remote_connection_delete (NMRemoteConnection *connection,
-                             GCancellable *cancellable,
-                             GError **error);

+                             GCancellable *cancellable,
+                             GError **error);

 
Deletes the connection.

 

 
Parameters

@@ -515,12 +515,12 @@ nm_remote_connection_delete (
cancellable

-

+
-
+
@@ -528,7 +528,7 @@ nm_remote_connection_delete (
 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 
 
@@ -537,9 +537,9 @@ will be set.

 
nm_remote_connection_delete_async ()

 
void
 nm_remote_connection_delete_async (NMRemoteConnection *connection,
-                                   GCancellable *cancellable,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data);

+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data);
 
Asynchronously deletes the connection.

 

 
Parameters

@@ -557,7 +557,7 @@ nm_remote_connection_delete_async (
 

-
+
@@ -578,10 +578,10 @@ nm_remote_connection_delete_async (
 

 
nm_remote_connection_delete_finish ()

-
gboolean
+
gboolean
 nm_remote_connection_delete_finish (NMRemoteConnection *connection,
-                                    GAsyncResult *result,
-                                    GError **error);

+                                    GAsyncResult *result,
+                                    GError **error);

 
Gets the result of a call to nm_remote_connection_delete_async().

 

 
Parameters

@@ -599,12 +599,12 @@ nm_remote_connection_delete_finish (
 

-
+
-
+
@@ -612,18 +612,18 @@ nm_remote_connection_delete_finish (
 

 
Returns

-
 TRUE on success, FALSE on error, in which case error
+
 TRUE on success, FALSE on error, in which case error
 will be set.

 

 
 

 

 
nm_remote_connection_get_secrets ()

-
GVariant *
+
GVariant *
 nm_remote_connection_get_secrets (NMRemoteConnection *connection,
                                   const char *setting_name,
-                                  GCancellable *cancellable,
-                                  GError **error);

+                                  GCancellable *cancellable,
+                                  GError **error);

 
Request the connection's secrets. Note that this is a blocking D-Bus call,
 not a simple property accessor.

 

@@ -647,12 +647,12 @@ not a simple property accessor.

 
 

-
+
-
+
@@ -660,9 +660,9 @@ not a simple property accessor.

 
 

 
Returns

-
 a GVariant of type NM_VARIANT_TYPE_CONNECTION containing
+
 a GVariant of type NM_VARIANT_TYPE_CONNECTION containing
 connection
-'s secrets, or NULL on error.

+'s secrets, or NULL on error.

 

 
 

@@ -672,9 +672,9 @@ not a simple property accessor.

 nm_remote_connection_get_secrets_async
                                (NMRemoteConnection *connection,
                                 const char *setting_name,
-                                GCancellable *cancellable,
-                                GAsyncReadyCallback callback,
-                                gpointer user_data);
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
 
Asynchronously requests the connection's secrets.

 

 
Parameters

@@ -697,7 +697,7 @@ nm_remote_connection_get_secrets_async
 
 

-
+
@@ -718,11 +718,11 @@ nm_remote_connection_get_secrets_async
 

 

 
nm_remote_connection_get_secrets_finish ()

-
GVariant *
+
GVariant *
 nm_remote_connection_get_secrets_finish
                                (NMRemoteConnection *connection,
-                                GAsyncResult *result,
-                                GError **error);

+                                GAsyncResult *result,
+                                GError **error);

 
Gets the result of a call to nm_remote_connection_get_secrets_async().

 

 
Parameters

@@ -740,12 +740,12 @@ nm_remote_connection_get_secrets_finish
 

-
+
-
+
@@ -753,16 +753,16 @@ nm_remote_connection_get_secrets_finish
 
 

 
Returns

-
 a GVariant of type NM_VARIANT_TYPE_CONNECTION
+
 a GVariant of type NM_VARIANT_TYPE_CONNECTION
 containing connection
-'s secrets, or NULL on error. 

+'s secrets, or NULL on error. 

 
[transfer full]

 

 
 

 

 
nm_remote_connection_get_unsaved ()

-
gboolean
+
gboolean
 nm_remote_connection_get_unsaved (NMRemoteConnection *connection);

 

 
Parameters

@@ -781,21 +781,21 @@ nm_remote_connection_get_unsaved (
 

 
Returns

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

 

 

 

 

 
nm_remote_connection_get_visible ()

-
gboolean
+
gboolean
 nm_remote_connection_get_visible (NMRemoteConnection *connection);

 
Checks if the connection is visible to the current user.  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
+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.)

@@ -816,8 +816,8 @@ reference to it.)

 

 

 
Returns

-
 TRUE if the remote connection is visible to the current
-user, FALSE if not.

+
 TRUE if the remote connection is visible to the current
+user, FALSE if not.

 

 

 
@@ -851,21 +851,21 @@ user, 
Property Details

 

 
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.

+
  “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

 

 

 

 
The “visible” property

-
  “visible”                  gboolean

-
TRUE if the remote connection is visible to the current user, FALSE if
+
  “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
+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

diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html
index 499ef3a1..c95971c3 100644
--- a/docs/libnm/html/NMSecretAgentOld.html
+++ b/docs/libnm/html/NMSecretAgentOld.html
@@ -67,7 +67,7 @@
 
 

-
+
@@ -169,12 +169,12 @@
 
 
+gchar *
 
-
+
@@ -210,7 +210,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSecretAgentOld
 

 

@@ -223,10 +223,10 @@
 
NMSecretAgentOldGetSecretsFunc ()

 
void
 (*NMSecretAgentOldGetSecretsFunc) (NMSecretAgentOld *agent,
-                                   NMConnection *connection,
-                                   GVariant *secrets,
-                                   GError *error,
-                                   gpointer user_data);

+                                   NMConnection *connection,
+                                   GVariant *secrets,
+                                   GError *error,
+                                   gpointer user_data);
 
Called as a result of a request by NM to retrieve secrets.  When the
 NMSecretAgentOld subclass has finished retrieving secrets and is ready to
 return them, or to return an error, this function should be called with
@@ -261,16 +261,16 @@ something like this:

 
 secrets = nm_simple_connection_new ();
 s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
-g_object_set (G_OBJECT (s_wsec),
+g_object_set (G_OBJECT (s_wsec),
               NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
-              NULL);
+              NULL);
 nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
 secrets_dict = nm_connection_to_dbus (secrets, NM_CONNECTION_SERIALIZE_ALL);
 
 (call the NMSecretAgentOldGetSecretsFunc with secrets_dict)
 
-g_object_unref (secrets);
-g_variant_unref (secrets_dict);
+g_object_unref (secrets);
+g_variant_unref (secrets_dict);
       
     
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 
 
 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 
 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 
 
 
 
 
 
 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 

 
result
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
location for a GError, or NULL
location for a GError, or NULL

  
 

 

 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_register ()
@@ -83,7 +83,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_register_finish ()
@@ -91,7 +91,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_unregister ()
@@ -107,7 +107,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_unregister_finish ()
@@ -115,7 +115,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_secret_agent_old_get_registered ()
@@ -158,7 +158,7 @@
 
 

 
gbooleangboolean
 auto-register
 Read / Write / Construct
 

 
-gchar *identifier
 Read / Write / Construct Only
 

 
gbooleangboolean
 registered
 Read
 

   

@@ -295,13 +295,13 @@ something like this:

 
connection

 
 the connection for which secrets were requested,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 

 [transfer none]
 
 
 
secrets

-
the GVariant of type NM_VARIANT_TYPE_CONNECTION containing the requested
+
the GVariant of type NM_VARIANT_TYPE_CONNECTION containing the requested
 secrets (as created by nm_connection_to_dbus() for example).  Each key in secrets
 should be the name of a NMSetting object (like "802-11-wireless-security")
 and each value should be an NM_VARIANT_TYPE_SETTING variant.  The sub-dicts
@@ -328,9 +328,9 @@ and the value is the secret

 
NMSecretAgentOldSaveSecretsFunc ()

 
void
 (*NMSecretAgentOldSaveSecretsFunc) (NMSecretAgentOld *agent,
-                                    NMConnection *connection,
-                                    GError *error,
-                                    gpointer user_data);

+                                    NMConnection *connection,
+                                    GError *error,
+                                    gpointer user_data);

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

@@ -352,7 +352,7 @@ should be called.

 
connection

 
 the connection for which secrets were to be saved,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 

 [transfer none]
 
@@ -375,9 +375,9 @@ has returned. 

 
NMSecretAgentOldDeleteSecretsFunc ()

 
void
 (*NMSecretAgentOldDeleteSecretsFunc) (NMSecretAgentOld *agent,
-                                      NMConnection *connection,
-                                      GError *error,
-                                      gpointer user_data);

+                                      NMConnection *connection,
+                                      GError *error,
+                                      gpointer user_data);

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

@@ -399,7 +399,7 @@ should be called.

 
connection

 
 the connection for which secrets were to be deleted,
 note that this object will be unrefed after the callback has returned, use
-g_object_ref()/g_object_unref() if you want to use this object after the callback
+g_object_ref()/g_object_unref() if you want to use this object after the callback
 has returned. 

 [transfer none]
 
@@ -420,10 +420,10 @@ has returned. 

 

 

 
nm_secret_agent_old_register ()

-
gboolean
+
gboolean
 nm_secret_agent_old_register (NMSecretAgentOld *self,
-                              GCancellable *cancellable,
-                              GError **error);

+                              GCancellable *cancellable,
+                              GError **error);

 
Registers the NMSecretAgentOld with the NetworkManager secret manager,
 indicating to NetworkManager that the agent is able to provide and save
 secrets for connections on behalf of its user.

@@ -445,12 +445,12 @@ registered, or in the process of registering.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
 
error

-
return location for a GError, or NULL

+
return location for a GError, or NULL

  
 
 
@@ -458,7 +458,7 @@ registered, or in the process of registering.

 

 

 
Returns

-
 TRUE if registration was successful, FALSE on error.

+
 TRUE if registration was successful, FALSE on error.

 

 

 

@@ -466,9 +466,9 @@ registered, or in the process of registering.

 
nm_secret_agent_old_register_async ()

 
void
 nm_secret_agent_old_register_async (NMSecretAgentOld *self,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data);

+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);

 
Asynchronously registers the NMSecretAgentOld with the NetworkManager secret
 manager, indicating to NetworkManager that the agent is able to provide and
 save secrets for connections on behalf of its user.

@@ -490,7 +490,7 @@ registered, or in the process of registering.

 
 
 
cancellable

-
a GCancellable, or NULL

+
a GCancellable, or NULL

  
 
 
@@ -511,10 +511,10 @@ registered, or in the process of registering.

 

 

 
nm_secret_agent_old_register_finish ()

-
gboolean
+
gboolean
 nm_secret_agent_old_register_finish (NMSecretAgentOld *self,
-                                     GAsyncResult *result,
-                                     GError **error);

+                                     GAsyncResult *result,
+                                     GError **error);

 
Gets the result of a call to nm_secret_agent_old_register_async().

 

 
Parameters

@@ -532,12 +532,12 @@ nm_secret_agent_old_register_finish (
 
 
result

-
the result passed to the GAsyncReadyCallback

+
the result passed to the GAsyncReadyCallback

  
 
 
 
error

-
return location for a GError, or NULL

+
return location for a GError, or NULL

  
 
 
@@ -545,23 +545,21 @@ nm_secret_agent_old_register_finish (
 

 
Returns

-
 TRUE if registration was successful, FALSE on error.

+
 TRUE if registration was successful, FALSE on error.

 

 

 

 

 
nm_secret_agent_old_unregister ()

-
gboolean
+
gboolean
 nm_secret_agent_old_unregister (NMSecretAgentOld *self,
-                                GCancellable *cancellable,
-                                GError **error);

+                                GCancellable *cancellable,
+                                GError **error);

 
Unregisters the NMSecretAgentOld with the NetworkManager secret manager,
 indicating to NetworkManager that the agent will no longer provide or
 store secrets on behalf of this user.

-
It is a programmer error to attempt to unregister an agent that is not
-registered.

 

-
Parameters

+
Parameters

 
@@ -576,20 +574,20 @@ registered.

-
+
-
+

 
 

 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
error
return location for a GError, or NULL
return location for a GError, or NULL

  
 

 
 

 

 

-
Returns

-
 TRUE if unregistration was successful, FALSE on error

+
Returns

+
 TRUE if unregistration was successful, FALSE on error

 

 

 

@@ -597,16 +595,14 @@ registered.

 
nm_secret_agent_old_unregister_async ()

 
void
 nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
-                                      GCancellable *cancellable,
-                                      GAsyncReadyCallback callback,
-                                      gpointer user_data);

+                                      GCancellable *cancellable,
+                                      GAsyncReadyCallback callback,
+                                      gpointer user_data);

 
Asynchronously unregisters the NMSecretAgentOld with the NetworkManager secret
 manager, indicating to NetworkManager that the agent will no longer provide
 or store secrets on behalf of this user.

-
It is a programmer error to attempt to unregister an agent that is not
-registered.

 

-
Parameters

+
Parameters

 
@@ -621,7 +617,7 @@ registered.

-
+
@@ -642,10 +638,10 @@ registered.

 
nm_secret_agent_old_unregister_finish ()

-
gboolean
+
gboolean
 nm_secret_agent_old_unregister_finish (NMSecretAgentOld *self,
-                                       GAsyncResult *result,
-                                       GError **error);

+                                       GAsyncResult *result,
+                                       GError **error);

 
Gets the result of a call to nm_secret_agent_old_unregister_async().

 

 
Parameters

@@ -663,12 +659,12 @@ nm_secret_agent_old_unregister_finish (
result

-

+
-
+
@@ -676,13 +672,13 @@ nm_secret_agent_old_unregister_finish (
 
Returns

-
 TRUE if unregistration was successful, FALSE on error.

+
 TRUE if unregistration was successful, FALSE on error.

 
 
 

 

 
nm_secret_agent_old_get_registered ()

-
gboolean
+
gboolean
 nm_secret_agent_old_get_registered (NMSecretAgentOld *self);

 

 
Parameters

@@ -701,7 +697,7 @@ nm_secret_agent_old_get_registered (
 

 
Returns

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

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

 

 

 

@@ -709,12 +705,12 @@ nm_secret_agent_old_get_registered (
nm_secret_agent_old_get_secrets ()

 
void
 nm_secret_agent_old_get_secrets (NMSecretAgentOld *self,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  const char *setting_name,
                                  const char **hints,
                                  NMSecretAgentGetSecretsFlags flags,
                                  NMSecretAgentOldGetSecretsFunc callback,
-                                 gpointer user_data);

+                                 gpointer user_data);

 
Asynchronously retrieves secrets belonging to connection
  for the
 setting setting_name
@@ -740,7 +736,7 @@ secrets from the user.

 
 

-
+
@@ -778,9 +774,9 @@ secrets from the user.

 
nm_secret_agent_old_save_secrets ()

 
void
 nm_secret_agent_old_save_secrets (NMSecretAgentOld *self,
-                                  NMConnection *connection,
+                                  NMConnection *connection,
                                   NMSecretAgentOldSaveSecretsFunc callback,
-                                  gpointer user_data);

+                                  gpointer user_data);
 
Asynchronously ensures that all secrets inside connection
  are stored to
 disk.

@@ -801,7 +797,7 @@ disk.

 
-
+
@@ -824,9 +820,9 @@ disk.

 
nm_secret_agent_old_delete_secrets ()

 
void
 nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     NMSecretAgentOldDeleteSecretsFunc callback,
-                                    gpointer user_data);

+                                    gpointer user_data);
 
Asynchronously asks the agent to delete all saved secrets belonging to
 connection
 .

@@ -847,7 +843,7 @@ nm_secret_agent_old_delete_secrets (
 
-
+
@@ -896,15 +892,15 @@ nm_secret_agent_old_delete_secrets (
Property Details

 

 
The “auto-register” property

-
  “auto-register”            gboolean

-
If TRUE (the default), the agent will always be registered when
+
  “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
+
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
+
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
@@ -924,7 +920,7 @@ you expect it to be unregistered.

 

 

 
The “identifier” property

-
  “identifier”               gchar *

+
  “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
@@ -938,8 +934,8 @@ of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
 

 

 
The “registered” property

-
  “registered”               gboolean

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

+
  “registered”               gboolean

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

 
Flags: Read

 
Default value: FALSE

 

diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index a0fdf80f..65b56b96 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -55,7 +55,7 @@
 

-
+gchar *
 
@@ -219,13 +219,13 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ╰── NMSettingMacRandomization
-    GFlags
+    GFlags
     ╰── NMSettingSecretFlags
-    GObject
+    GObject
     ╰── NMSetting
         ├── NMSetting8021x
         ├── NMSettingAdsl
@@ -263,7 +263,7 @@
 
Each NMSetting contains properties that describe configuration that applies
 to a specific network layer (like IPv4 or IPv6 configuration) or device type
 (like Ethernet, or Wi-Fi).  A collection of individual settings together
-make up an NMConnection. Each property is strongly typed and usually has
+make up an NMConnection. Each property is strongly typed and usually has
 a number of allowed values.  See each NMSetting subclass for a description
 of properties and allowed values.

 

@@ -289,11 +289,11 @@ of properties and allowed values.

 

 

 
NMSettingClearSecretsWithFlagsFn ()

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

+                                     gpointer user_data);

 

 
Parameters

 

 
 

 
 

 
cancellable
a GCancellable, or NULL
a GCancellable, or NULL

  
 

 

 
 
the result passed to the GAsyncReadyCallback
the result passed to the GAsyncReadyCallback

  
 

 

 
error
return location for a GError, or NULL
return location for a GError, or NULL

  
 

 

 
connection
the NMConnection for which we're asked secrets
the NMConnection for which we're asked secrets

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 

 
-gboolean
+gboolean
 
 
 (*NMSettingClearSecretsWithFlagsFn) ()
@@ -71,7 +71,7 @@
 

 

 
-GType
+GType
 
 
 nm_setting_lookup_type ()
@@ -94,7 +94,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_verify ()
@@ -102,7 +102,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_verify_secrets ()
@@ -110,7 +110,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_compare ()
@@ -118,7 +118,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_diff ()
@@ -142,7 +142,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_get_secret_flags ()
@@ -150,14 +150,14 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_set_secret_flags ()
 
 

 
const GVariantType *
+const GVariantType *
 
 
 nm_setting_get_dbus_property_type ()
@@ -176,7 +176,7 @@
 
 

 
-gchar *name
 Read
 

@@ -328,7 +328,7 @@ of properties and allowed values.

 
 

 
Returns

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

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

 

 
 

@@ -337,9 +337,9 @@ of properties and allowed values.

 
void
 (*NMSettingValueIterFn) (NMSetting *setting,
                          const char *key,
-                         const GValue *value,
-                         GParamFlags flags,
-                         gpointer user_data);

+                         const GValue *value,
+                         GParamFlags flags,
+                         gpointer user_data);
 

 
Parameters

 

@@ -382,9 +382,9 @@ of properties and allowed values.

 

 

 
nm_setting_lookup_type ()

-
GType
+
GType
 nm_setting_lookup_type (const char *name);

-
Returns the GType of the setting's class for a given setting name.

+
Returns the GType of the setting's class for a given setting name.

 

 
Parameters

 

@@ -402,7 +402,7 @@ nm_setting_lookup_type (const cha
 
 

 
Returns

-
 the GType of the setting's class, or G_TYPE_INVALID if
+
 the GType of the setting's class, or G_TYPE_INVALID if
 name
 is not recognized.

 

@@ -465,14 +465,14 @@ like 'ppp' or 'wireless' or 'wired'.

 

 

 
nm_setting_verify ()

-
gboolean
+
gboolean
 nm_setting_verify (NMSetting *setting,
-                   NMConnection *connection,
-                   GError **error);

+                   NMConnection *connection,
+                   GError **error);

 
Validates the setting.  Each setting's properties have allowed values, and
 some are dependent on other values (hence the need for connection
 ).  The
-returned GError contains information about which property of the setting
+returned GError contains information about which property of the setting
 failed validation, and in what way that property failed validation.

 

 
Parameters

@@ -490,15 +490,15 @@ failed validation, and in what way that property failed validation.

 
 

-
-
+
@@ -506,18 +506,18 @@ is being verified in isolation. 

 
 

 
Returns

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

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

 

 
 

 

 
nm_setting_verify_secrets ()

-
gboolean
+
gboolean
 nm_setting_verify_secrets (NMSetting *setting,
-                           NMConnection *connection,
-                           GError **error);

+                           NMConnection *connection,
+                           GError **error);

 
Verifies the secrets in the setting.
-The returned GError contains information about which secret of the setting
+The returned GError contains information about which secret of the setting
 failed validation, and in what way that secret failed validation.
 The secret validation is done separately from main setting validation, because
 in some cases connection failure is not desired just for the secrets.

@@ -537,15 +537,15 @@ in some cases connection failure is not desired just for the secrets.

 
 

-
-
+
@@ -553,14 +553,14 @@ is being verified in isolation. 

 
 

 
Returns

-
 TRUE if the setting secrets are valid, FALSE if they are not

+
 TRUE if the setting secrets are valid, FALSE if they are not

 

 
Since: 1.2

 
 

 

 
nm_setting_compare ()

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

@@ -596,18 +596,18 @@ for a description of each flag's behavior.

 

 

 
Returns

-
 TRUE if the comparison succeeds, FALSE if it does not

+
 TRUE if the comparison succeeds, FALSE if it does not

 

 
 

 

 
nm_setting_diff ()

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

+                 gboolean invert_results,
+                 GHashTable **results);

 
Compares two NMSetting objects for similarity, with comparison behavior
 modified by a set of flags.  See the documentation for NMSettingCompareFlags
 for a description of each flag's behavior.  If the settings differ, the keys
@@ -641,7 +641,7 @@ one or more 
invert_results

 

+be set to FALSE.  If TRUE inverts the meaning of the NMSettingDiffResult.

 
@@ -658,7 +658,7 @@ 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

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

 

 
 

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

 
void
 nm_setting_enumerate_values (NMSetting *setting,
                              NMSettingValueIterFn func,
-                             gpointer user_data);

+                             gpointer user_data);
 
Iterates over each property of the NMSetting object, calling the supplied
 user function for each property.

 

@@ -726,17 +726,17 @@ output format is not guaranteed to be stable and may change at any time.

 
Returns

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

+free with g_free()

 

 
 

 

 
nm_setting_get_secret_flags ()

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

+                             GError **error);

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

 

@@ -765,7 +765,7 @@ handle that secret.

 

-
+
@@ -773,18 +773,18 @@ 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

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

 

 
 

 

 
nm_setting_set_secret_flags ()

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

+                             GError **error);

 
For a given secret, stores the NMSettingSecretFlags describing how to
 handle that secret.

 

@@ -813,7 +813,7 @@ handle that secret.

 
 

-
+
@@ -821,19 +821,19 @@ 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

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

 

 
 

 

 
nm_setting_get_dbus_property_type ()

-
const GVariantType *
+
const GVariantType *
 nm_setting_get_dbus_property_type (NMSetting *setting,
                                    const char *property_name);

 
Gets the D-Bus marshalling type of a property. property_name
  is a D-Bus
-property name, which may not necessarily be a GObject property.

+property name, which may not necessarily be a GObject property.

 

 
Parameters

 

 
connection
 the NMConnection that setting
+
 the NMConnection that setting
 came from, or
-NULL if setting
+NULL if setting
 is being verified in isolation. 

 [allow-none]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
connection
 the NMConnection that setting
+
 the NMConnection that setting
 came from, or
-NULL if setting
+NULL if setting
 is being verified in isolation. 

 [allow-none]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

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

 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

@@ -1140,7 +1140,7 @@ if you specify NM_SETTING_COMPARE_FLAG_DIFF_RESULT_W
 
Property Details

 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

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

diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 993d2bde..a71d5022 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -59,7 +59,7 @@
 
 

+
+
+
+
@@ -242,7 +249,7 @@
 
+
+
+
+
@@ -393,7 +407,7 @@
 
-
+
+gchar *
 
+GBytes *
 
+gchar *
 
+GBytes *
 
-
+
+
+
+
+
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -639,7 +659,7 @@
 
 
+GBytes *
 
@@ -650,66 +670,72 @@
 
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
+GBytes *
 
+gchar *
 
+GBytes *
 
+gchar *
+
+
+
+
+
+gchar *
 
@@ -720,13 +746,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -737,13 +763,13 @@
 
 
+GBytes *
 
+gchar *
 
@@ -754,12 +780,12 @@
 
 
+gchar *
 
-
+
@@ -824,6 +850,10 @@
 
 
+
+
+
+
@@ -864,6 +894,10 @@
 
+
+
+
+
@@ -923,10 +957,10 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ╰── NMSetting8021xCKScheme
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSetting8021x
 

@@ -968,9 +1002,9 @@ nm_setting_802_1x_new (void
 
nm_setting_802_1x_check_cert_scheme ()

 
NMSetting8021xCKScheme
-nm_setting_802_1x_check_cert_scheme (gconstpointer pdata,
-                                     gsize length,
-                                     GError **error);

+nm_setting_802_1x_check_cert_scheme (gconstpointer pdata,
+                                     gsize length,
+                                     GError **error);

 
Determines and verifies the blob type.
 When setting certificate properties of NMSetting8021x
 the blob must be not UNKNOWN (or NULL).

@@ -1011,7 +1045,7 @@ For NULL it also returns NM_SETTING_802_1X_CK_SCHEME_UNKNOWN.

 

 

 
nm_setting_802_1x_get_num_eap_methods ()

-
guint32
+
guint32
 nm_setting_802_1x_get_num_eap_methods (NMSetting8021x *setting);

 
Returns the number of eap methods allowed for use when connecting to the
 network.  Generally only one EAP method is used.  Use the functions
@@ -1043,7 +1077,7 @@ allowed EAP methods.

 
nm_setting_802_1x_get_eap_method ()

 
const char *
 nm_setting_802_1x_get_eap_method (NMSetting8021x *setting,
-                                  guint32 i);

+                                  guint32 i);

 
Returns the name of the allowed EAP method at index i
 .

 

@@ -1077,7 +1111,7 @@ nm_setting_802_1x_get_eap_method (
 

 
nm_setting_802_1x_add_eap_method ()

-
gboolean
+
gboolean
 nm_setting_802_1x_add_eap_method (NMSetting8021x *setting,
                                   const char *eap);

 
Adds an allowed EAP method.  The setting is not valid until at least one
@@ -1107,7 +1141,7 @@ allowed EAP methods.

 

 

 
Returns

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

 

 

@@ -1116,7 +1150,7 @@ not a valid method or if it was already allowed.

 
nm_setting_802_1x_remove_eap_method ()

 
void
 nm_setting_802_1x_remove_eap_method (NMSetting8021x *setting,
-                                     guint32 i);

+                                     guint32 i);
 
Removes the allowed EAP method at the specified index.

 

 
Parameters

@@ -1144,7 +1178,7 @@ nm_setting_802_1x_remove_eap_method (
 

 
nm_setting_802_1x_remove_eap_method_by_value ()

-
gboolean
+
gboolean
 nm_setting_802_1x_remove_eap_method_by_value
                                (NMSetting8021x *setting,
                                 const char *eap);

@@ -1174,7 +1208,7 @@ nm_setting_802_1x_remove_eap_method_by_value
 

 

 
Returns

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

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

 

 

 

@@ -1285,12 +1319,12 @@ nm_setting_802_1x_get_pac_file (
 

 
nm_setting_802_1x_get_system_ca_certs ()

-
gboolean
+
gboolean
 nm_setting_802_1x_get_system_ca_certs (NMSetting8021x *setting);

 
Sets the “system-ca-certs” property. The
 “ca-path” and “phase2-ca-path”
 properties are ignored if the “system-ca-certs” property is
-TRUE, in which case a system-wide CA certificate directory specified at
+TRUE, in which case a system-wide CA certificate directory specified at
 compile time (using the --system-ca-path configure option) is used in place
 of these properties.

 

@@ -1310,7 +1344,7 @@ of these properties.

 

 

 
Returns

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

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

 

 

 

@@ -1404,7 +1438,7 @@ if 
 
nm_setting_802_1x_get_ca_cert_blob ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_ca_cert_blob (NMSetting8021x *setting);

 
Returns the CA certificate blob if the CA certificate is stored using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme.  Not all EAP methods use a
@@ -1467,12 +1501,12 @@ of the network cannot be confirmed by the client.

 

 

 
nm_setting_802_1x_set_ca_cert ()

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

+                               GError **error);

 
Reads a certificate from disk and sets the “ca-cert” property
 with the raw certificate data if using the NM_SETTING_802_1X_CK_SCHEME_BLOB
 scheme, or with the path to the certificate file if using the
@@ -1497,7 +1531,7 @@ scheme, or with the path to the certificate file if using the
 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the CA certificate
 file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the CA certificate.

 

@@ -1521,7 +1555,7 @@ clears the CA certificate.

 
 

 
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 
 

@@ -1548,14 +1582,14 @@ nm_setting_802_1x_get_subject_match (
Returns

 
 the “subject-match” property. This is the
 substring to be matched against the subject of the authentication
-server certificate, or NULL no subject verification is to be
+server certificate, or NULL no subject verification is to be
 performed.

 
 
 

 

 
nm_setting_802_1x_get_num_altsubject_matches ()

-
guint32
+
guint32
 nm_setting_802_1x_get_num_altsubject_matches
                                (NMSetting8021x *setting);

 
Returns the number of entries in the
@@ -1586,7 +1620,7 @@ nm_setting_802_1x_get_num_altsubject_matches
 
const char *
 nm_setting_802_1x_get_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the altSubjectName match at index i
 .

 

@@ -1620,7 +1654,7 @@ nm_setting_802_1x_get_altsubject_match
 

 

 
nm_setting_802_1x_add_altsubject_match ()

-
gboolean
+
gboolean
 nm_setting_802_1x_add_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);

@@ -1651,8 +1685,8 @@ server is not verified.

 

 

 
Returns

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

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

 

 

 

@@ -1661,7 +1695,7 @@ successfully added, void
 nm_setting_802_1x_remove_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);
+                                guint32 i);
 
Removes the allowed altSubjectName at the specified index.

 

 
Parameters

@@ -1689,7 +1723,7 @@ nm_setting_802_1x_remove_altsubject_match
 

 

 
nm_setting_802_1x_remove_altsubject_match_by_value ()

-
gboolean
+
gboolean
 nm_setting_802_1x_remove_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *altsubject_match);

@@ -1719,8 +1753,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.

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

 

 

 

@@ -1748,6 +1782,33 @@ nm_setting_802_1x_clear_altsubject_matches
 

 

 

+
nm_setting_802_1x_get_domain_suffix_match ()

+
const char *
+nm_setting_802_1x_get_domain_suffix_match
+                               (NMSetting8021x *setting);

+

+
Parameters

+

 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_eap_methods ()
@@ -74,7 +74,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_eap_method ()
@@ -90,7 +90,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_eap_method_by_value ()
@@ -127,7 +127,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_get_system_ca_certs ()
@@ -157,7 +157,7 @@
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_ca_cert_blob ()
@@ -172,7 +172,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_ca_cert ()
@@ -187,7 +187,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_altsubject_matches ()
@@ -202,7 +202,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_altsubject_match ()
@@ -218,7 +218,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_altsubject_match_by_value ()
@@ -233,6 +233,13 @@
 
 

 
const char *
+
+nm_setting_802_1x_get_domain_suffix_match ()
+

 
 NMSetting8021xCKScheme
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_client_cert_blob ()
@@ -257,7 +264,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_client_cert ()
@@ -308,7 +315,7 @@
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_phase2_ca_cert_blob ()
@@ -323,7 +330,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_ca_cert ()
@@ -338,7 +345,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_802_1x_get_num_phase2_altsubject_matches ()
@@ -353,7 +360,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_add_phase2_altsubject_match ()
@@ -369,7 +376,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()
@@ -384,6 +391,13 @@
 
 

 
const char *
+
+nm_setting_802_1x_get_phase2_domain_suffix_match ()
+

 
 NMSetting8021xCKScheme
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_phase2_client_cert_blob ()
@@ -408,7 +422,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_client_cert ()
@@ -431,7 +445,7 @@
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_password_raw ()
@@ -470,7 +484,7 @@
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_private_key_blob ()
@@ -485,7 +499,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_private_key ()
@@ -524,7 +538,7 @@
 

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_802_1x_get_phase2_private_key_blob ()
@@ -539,7 +553,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_802_1x_set_phase2_private_key ()
@@ -581,54 +595,60 @@
 
 

 
GStrvGStrv
 altsubject-matches
 Read / Write
 

 

 
-gchar *anonymous-identity
 Read / Write
 

 

 
-GBytes *ca-cert
 Read / Write
 

 

 
-gchar *ca-path
 Read / Write
 

 

 
-GBytes *client-cert
 Read / Write
 

 
GStrv
+gchar *domain-suffix-matchRead / Write
GStrv
 eap
 Read / Write
 

 

 
-gchar *identity
 Read / Write
 

 

 
-gchar *pac-file
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
-GBytes *password-raw
 Read / Write
 

 
-gchar *phase1-fast-provisioning
 Read / Write
 

 

 
-gchar *phase1-peaplabel
 Read / Write
 

 

 
-gchar *phase1-peapver
 Read / Write
 

 
GStrvGStrv
 phase2-altsubject-matches
 Read / Write
 

 

 
-gchar *phase2-auth
 Read / Write
 

 

 
-gchar *phase2-autheap
 Read / Write
 

 

 
-GBytes *phase2-ca-cert
 Read / Write
 

 

 
-gchar *phase2-ca-path
 Read / Write
 

 

 
-GBytes *phase2-client-cert
 Read / Write
 

 

 
-GBytes *phase2-domain-suffix-matchRead / Write

+GBytes *
 phase2-private-key
 Read / Write
 

 

 
-gchar *phase2-private-key-password
 Read / Write
 

 
-gchar *phase2-subject-match
 Read / Write
 

 

 
-gchar *pin
 Read / Write
 

 
-GBytes *private-key
 Read / Write
 

 

 
-gchar *private-key-password
 Read / Write
 

 
-gchar *subject-match
 Read / Write
 

 
gbooleangboolean
 system-ca-certs
 Read / Write / Construct
 

 #defineNM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH
#define
 NM_SETTING_802_1X_CLIENT_CERT
 

 

 

 #defineNM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH
#define
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 

 
 
 

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the “domain-suffix-match” property.

+

+
Since: 1.2

+

+

+

 
nm_setting_802_1x_get_client_cert_scheme ()

 
NMSetting8021xCKScheme
 nm_setting_802_1x_get_client_cert_scheme
@@ -1756,7 +1817,7 @@ nm_setting_802_1x_get_client_cert_scheme
 is NM_SETTING_802_1X_CK_SCHEME_BLOB, use nm_setting_802_1x_get_client_cert_blob();
 if NM_SETTING_802_1X_CK_SCHEME_PATH, use nm_setting_802_1x_get_client_cert_path().

 

-
Parameters

+
Parameters

 
@@ -1771,21 +1832,21 @@ if 
-
Returns

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

 
nm_setting_802_1x_get_client_cert_blob ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_client_cert_blob
                                (NMSetting8021x *setting);

 
Client certificates are used to identify the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

 

-
Parameters

+
Parameters

 

 
 

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

 
 

 

 

 

-
Returns

+
Returns

 
 the client certificate data. 

 
[transfer none]

 

@@ -1815,7 +1876,7 @@ nm_setting_802_1x_get_client_cert_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

 

-
Parameters

+
Parameters

 
@@ -1830,19 +1891,19 @@ authentication method.

 
 

 

 

 

-
Returns

+
Returns

 
 path to the client certificate file

 

 

 

 

 
nm_setting_802_1x_set_client_cert ()

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

+                                   GError **error);

 
Reads a certificate from disk and sets the “client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -1851,7 +1912,7 @@ file if using the 
 

-
Parameters

+
Parameters

 
@@ -1870,7 +1931,7 @@ authentication method.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the client certificate.

@@ -1894,8 +1955,8 @@ clears the client certificate.

 
 

 
 
 

 

 

-
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

@@ -1904,7 +1965,7 @@ clears the client certificate.

 
const char *
 nm_setting_802_1x_get_phase1_peapver (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -1919,10 +1980,10 @@ nm_setting_802_1x_get_phase1_peapver (
-
Returns

+
Returns

 
 the "phase 1" PEAP version to be used when authenticating with
 EAP-PEAP as contained in the “phase1-peapver” property.  Valid
-values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

+values are NULL (unset), "0" (PEAP version 0), and "1" (PEAP version 1).

 
 
 

@@ -1932,7 +1993,7 @@ values are NMSetting8021x *setting);
 

-
Parameters

+
Parameters

 

 
 

@@ -1947,10 +2008,10 @@ nm_setting_802_1x_get_phase1_peaplabel
 

 
 


 

 

-
Returns

+
Returns

 
 whether the "phase 1" PEAP label is new-style or old-style, to be
 used when authenticating with EAP-PEAP, as contained in the
-“phase1-peaplabel” property.  Valid values are NULL (unset),
+“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.

 

@@ -1962,7 +2023,7 @@ wpa_supplicant documentation for more details.

 nm_setting_802_1x_get_phase1_fast_provisioning
                                (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -1977,7 +2038,7 @@ nm_setting_802_1x_get_phase1_fast_provisioning
 

 
 


 

 

-
Returns

+
Returns

 
 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.

@@ -1989,7 +2050,7 @@ wpa_supplicant documentation for more details.

 
const char *
 nm_setting_802_1x_get_phase2_auth (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2004,7 +2065,7 @@ nm_setting_802_1x_get_phase2_auth (
 
 

-
Returns

+
Returns

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

 

@@ -2015,7 +2076,7 @@ specified by the const char *
 nm_setting_802_1x_get_phase2_autheap (NMSetting8021x *setting);
 

-
Parameters

+
Parameters

 

 
 

@@ -2030,7 +2091,7 @@ nm_setting_802_1x_get_phase2_autheap (
-
Returns

+
Returns

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

 
@@ -2046,7 +2107,7 @@ returned scheme is nm_setting_802_1x_get_ca_cert_blob(); if NM_SETTING_802_1X_CK_SCHEME_PATH,
 use nm_setting_802_1x_get_ca_cert_path().

 

-
Parameters

+
Parameters

 

 
 

@@ -2061,14 +2122,14 @@ use 
-
Returns

+
Returns

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

 
 
 

 

 
nm_setting_802_1x_get_phase2_ca_cert_blob ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_phase2_ca_cert_blob
                                (NMSetting8021x *setting);

 
Returns the "phase 2" CA certificate blob if the CA certificate is stored
@@ -2078,7 +2139,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.

 

-
Parameters

+
Parameters

 

 
 

@@ -2093,7 +2154,7 @@ of the network cannot be confirmed by the client.

 

 
 


 

 

-
Returns

+
Returns

 
 the "phase 2" CA certificate data. 

 
[transfer none]

 

@@ -2111,7 +2172,7 @@ CA certificate allow it to be unset.  Note that lack of a CA certificate
 reduces security by allowing man-in-the-middle attacks, because the identity
 of the network cannot be confirmed by the client.

 

-
Parameters

+
Parameters

 
@@ -2126,25 +2187,25 @@ of the network cannot be confirmed by the client.

 
 

 

 

 

-
Returns

+
Returns

 
 path to the "phase 2" CA certificate file

 

 

 

 

 
nm_setting_802_1x_set_phase2_ca_cert ()

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

+                                      GError **error);

 
Reads a certificate from disk and sets the “phase2-ca-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
 file if using the NM_SETTING_802_1X_CK_SCHEME_PATH scheme.

 

-
Parameters

+
Parameters

 
@@ -2163,7 +2224,7 @@ file if using the NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" CA
 certificate file (PEM or DER format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the "phase2" CA certificate.

@@ -2186,8 +2247,8 @@ clears the "phase2" CA certificate.

 
 

 
 
 

 

 

 

-
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

@@ -2197,7 +2258,7 @@ clears the "phase2" CA certificate.

 nm_setting_802_1x_get_phase2_subject_match
                                (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2212,23 +2273,23 @@ nm_setting_802_1x_get_phase2_subject_match
 

 
 


 

 

-
Returns

+
Returns

 
 the “phase2-subject-match” property. This is
 the substring to be matched against the subject of the "phase 2"
-authentication server certificate, or NULL no subject verification
+authentication server certificate, or NULL no subject verification
 is to be performed.

 

 

 

 

 
nm_setting_802_1x_get_num_phase2_altsubject_matches ()

-
guint32
+
guint32
 nm_setting_802_1x_get_num_phase2_altsubject_matches
                                (NMSetting8021x *setting);

 
Returns the number of entries in the
 “phase2-altsubject-matches” property of this setting.

 

-
Parameters

+
Parameters

 
@@ -2243,7 +2304,7 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 

 
 


 

 

-
Returns

+
Returns

 
 the number of phase2-altsubject-matches entries.

 

 

@@ -2253,11 +2314,11 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches
 
const char *
 nm_setting_802_1x_get_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the "phase 2" altSubjectName match at index i
 .

 

-
Parameters

+
Parameters

 
@@ -2279,7 +2340,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 

 
 


 

 

-
Returns

+
Returns

 
 the "phase 2" altSubjectName match at index i
 

 

@@ -2287,7 +2348,7 @@ nm_setting_802_1x_get_phase2_altsubject_match
 

 

 
nm_setting_802_1x_add_phase2_altsubject_match ()

-
gboolean
+
gboolean
 nm_setting_802_1x_add_phase2_altsubject_match
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);

@@ -2295,7 +2356,7 @@ nm_setting_802_1x_add_phase2_altsubject_match
 at least one match is added, the altSubjectName of the "phase 2"
 remote authentication server is not verified.

 

-
Parameters

+
Parameters

 
@@ -2318,9 +2379,9 @@ connection

 
 

 

 

 

-
Returns

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

+
Returns

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

 

 

 

@@ -2329,10 +2390,10 @@ successfully added, void
 nm_setting_802_1x_remove_phase2_altsubject_match
                                (NMSetting8021x *setting,
-                                guint32 i);

+                                guint32 i);

 
Removes the allowed "phase 2" altSubjectName at the specified index.

 

-
Parameters

+
Parameters

 
@@ -2357,14 +2418,14 @@ nm_setting_802_1x_remove_phase2_altsubject_match
 

 
nm_setting_802_1x_remove_phase2_altsubject_match_by_value ()

-
gboolean
+
gboolean
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value
                                (NMSetting8021x *setting,
                                 const char *phase2_altsubject_match);

 
Removes the allowed "phase 2" altSubjectName phase2_altsubject_match
 .

 

-
Parameters

+
Parameters

 

 
 

 
@@ -2386,9 +2447,9 @@ 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.

+
Returns

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

 

 

 

@@ -2399,7 +2460,7 @@ nm_setting_802_1x_clear_phase2_altsubject_matches
                                (NMSetting8021x *setting);

 
Clears all "phase 2" altSubjectName matches.

 

-
Parameters

+
Parameters

 
@@ -2416,6 +2477,33 @@ nm_setting_802_1x_clear_phase2_altsubject_matches
 

+
nm_setting_802_1x_get_phase2_domain_suffix_match ()

+
const char *
+nm_setting_802_1x_get_phase2_domain_suffix_match
+                               (NMSetting8021x *setting);

+

+
Parameters

+

 
 

 
 

+++++
+
+
+
+
+
+





setting
the NMSetting8021x
 

+

+

+
Returns

+
 the “phase2-domain-suffix-match” property.

+

+
Since: 1.2

+

+

+

 
nm_setting_802_1x_get_phase2_client_cert_scheme ()

 
NMSetting8021xCKScheme
 nm_setting_802_1x_get_phase2_client_cert_scheme
@@ -2426,7 +2514,7 @@ returned scheme is NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().

 

-
Parameters

+
Parameters

 
@@ -2441,21 +2529,21 @@ returned scheme is 
-
Returns

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

 
nm_setting_802_1x_get_phase2_client_cert_blob ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_phase2_client_cert_blob
                                (NMSetting8021x *setting);

 
Client certificates are used to identify the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

 

-
Parameters

+
Parameters

 

 
 

 
 
 
 
 
@@ -2470,7 +2558,7 @@ authentication method.

 
 

 

 

 

-
Returns

+
Returns

 
 the "phase 2" client certificate data. 

 
[transfer none]

 

@@ -2485,7 +2573,7 @@ nm_setting_802_1x_get_phase2_client_cert_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

 

-
Parameters

+
Parameters

 
@@ -2500,20 +2588,20 @@ authentication method.

 
 

 

 

 

-
Returns

+
Returns

 
 path to the "phase 2" client certificate file

 

 

 

 

 
nm_setting_802_1x_set_phase2_client_cert ()

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

+                                GError **error);

 
Reads a certificate from disk and sets the “phase2-client-cert”
 property with the raw certificate data if using the
 NM_SETTING_802_1X_CK_SCHEME_BLOB scheme, or with the path to the certificate
@@ -2522,7 +2610,7 @@ file if using the 
 

-
Parameters

+
Parameters

 
@@ -2541,7 +2629,7 @@ authentication method.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH
 or NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" client
 certificate file (PEM, DER, or PKCS#12 format).  The path must be UTF-8
-encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
+encoded; use g_filename_to_utf8() to convert if needed.  Passing NULL with
 any scheme
 clears the "phase2" client certificate.

@@ -2565,8 +2653,8 @@ clears the "phase2" client certificate.

 
 

 
 
 

 

 

-
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

@@ -2575,7 +2663,7 @@ clears the "phase2" client certificate.

 
const char *
 nm_setting_802_1x_get_password (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2590,7 +2678,7 @@ nm_setting_802_1x_get_password (
 
 

-
Returns

+
Returns

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

 

@@ -2601,7 +2689,7 @@ by the NMSettingSecretFlags
 nm_setting_802_1x_get_password_flags (NMSetting8021x *setting);
 

-
Parameters

+
Parameters

 

 
 

@@ -2616,17 +2704,17 @@ nm_setting_802_1x_get_password_flags (
-
Returns

+
Returns

 
 the NMSettingSecretFlags pertaining to the “password”

 
 
 

 

 
nm_setting_802_1x_get_password_raw ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_password_raw (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 

 
 

@@ -2641,7 +2729,7 @@ nm_setting_802_1x_get_password_raw (
 
 

-
Returns

+
Returns

 
 the password used by the authentication method as a
 UTF-8-encoded array of bytes, as specified by the
 “password-raw” property. 

@@ -2655,7 +2743,7 @@ UTF-8-encoded array of bytes, as specified by the
 nm_setting_802_1x_get_password_raw_flags
                                (NMSetting8021x *setting);
 

-
Parameters

+
Parameters

 

 
 

@@ -2670,7 +2758,7 @@ nm_setting_802_1x_get_password_raw_flags
 

 
 


 

 

-
Returns

+
Returns

 
 the NMSettingSecretFlags pertaining to the
 “password-raw”

 

@@ -2681,7 +2769,7 @@ nm_setting_802_1x_get_password_raw_flags
 
const char *
 nm_setting_802_1x_get_pin (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2696,7 +2784,7 @@ nm_setting_802_1x_get_pin (
-
Returns

+
Returns

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

 
@@ -2707,7 +2795,7 @@ by the NMSettingSecretFlags
 nm_setting_802_1x_get_pin_flags (NMSetting8021x *setting);
 

-
Parameters

+
Parameters

 

 
 

@@ -2722,7 +2810,7 @@ nm_setting_802_1x_get_pin_flags (
 
 

-
Returns

+
Returns

 
 the NMSettingSecretFlags pertaining to the
 “pin”

 

@@ -2739,7 +2827,7 @@ nm_setting_802_1x_get_private_key_scheme
 NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().

 

-
Parameters

+
Parameters

 

 
 

@@ -2754,14 +2842,14 @@ nm_setting_802_1x_get_private_key_scheme
 

 
 


 

 

-
Returns

+
Returns

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

 

 

 

 

 
nm_setting_802_1x_get_private_key_blob ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_private_key_blob
                                (NMSetting8021x *setting);

 
Private keys are used to authenticate the connecting client to the network
@@ -2771,7 +2859,7 @@ authentication method.

 unencrypted private key data may be readable by unprivileged users.  Private
 keys should always be encrypted with a private key password.

 

-
Parameters

+
Parameters

 
@@ -2786,7 +2874,7 @@ keys should always be encrypted with a private key password.

 
 

 

 

 

-
Returns

+
Returns

 
 the private key data. 

 
[transfer none]

 

@@ -2801,7 +2889,7 @@ nm_setting_802_1x_get_private_key_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

 

-
Parameters

+
Parameters

 
@@ -2816,20 +2904,20 @@ authentication method.

 
 

 

 

 

-
Returns

+
Returns

 
 path to the private key file

 

 

 

 

 
nm_setting_802_1x_set_private_key ()

-
gboolean
+
gboolean
 nm_setting_802_1x_set_private_key (NMSetting8021x *setting,
                                    const char *key_path,
                                    const char *password,
                                    NMSetting8021xCKScheme scheme,
                                    NMSetting8021xCKFormat *out_format,
-                                   GError **error);

+                                   GError **error);

 
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

@@ -2843,7 +2931,7 @@ verify that password
  is correct, and if it is, updates the
 “private-key-password” property with the given password
 .  If
-the decryption is unsuccessful, FALSE is returned, error
+the decryption is unsuccessful, FALSE is returned, error
  is set, and no
 internal data is changed.  If no password
  is given, the private key is
@@ -2854,7 +2942,7 @@ 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.

 

-
Parameters

+
Parameters

 
@@ -2873,13 +2961,13 @@ key password to prevent unauthorized access to unencrypted private key data.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the private key file
 (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded; use
-g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
+g_filename_to_utf8() to convert if needed.  Passing NULL with any scheme
 clears the private key.

-
@@ -2903,8 +2991,8 @@ an error is returned.

 
 

 
 
 

 

 
password
password used to decrypt the private key, or NULL if the password
+
password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.

  
 

 

 

-
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

@@ -2914,7 +3002,7 @@ an error is returned.

 nm_setting_802_1x_get_private_key_password
                                (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2929,7 +3017,7 @@ nm_setting_802_1x_get_private_key_password
 

 
 


 

 

-
Returns

+
Returns

 
 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.

@@ -2942,7 +3030,7 @@ previously set with NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2957,7 +3045,7 @@ nm_setting_802_1x_get_private_key_password_flags
 

 
 


 

 

-
Returns

+
Returns

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

 

@@ -2969,7 +3057,7 @@ nm_setting_802_1x_get_private_key_password_flags
 nm_setting_802_1x_get_private_key_format
                                (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -2984,7 +3072,7 @@ nm_setting_802_1x_get_private_key_format
 

 
 


 

 

-
Returns

+
Returns

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

 

@@ -3001,7 +3089,7 @@ scheme is NM_SETTING_802_1X_CK_SCHEME_PATH, use
 nm_setting_802_1x_get_client_cert_path().

 

-
Parameters

+
Parameters

 
@@ -3016,14 +3104,14 @@ scheme is 
-
Returns

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

 
nm_setting_802_1x_get_phase2_private_key_blob ()

-
GBytes *
+
GBytes *
 nm_setting_802_1x_get_phase2_private_key_blob
                                (NMSetting8021x *setting);

 
Private keys are used to authenticate the connecting client to the network
@@ -3033,7 +3121,7 @@ authentication method.

 unencrypted private key data may be readable by unprivileged users.  Private
 keys should always be encrypted with a private key password.

 

-
Parameters

+
Parameters

 

 
 

 
 
 
 
 
@@ -3048,7 +3136,7 @@ keys should always be encrypted with a private key password.

 
 

 

 

 

-
Returns

+
Returns

 
 the "phase 2" private key data. 

 
[transfer none]

 

@@ -3063,7 +3151,7 @@ nm_setting_802_1x_get_phase2_private_key_path
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

 

-
Parameters

+
Parameters

 
@@ -3078,21 +3166,21 @@ authentication method.

 
 

 

 

 

-
Returns

+
Returns

 
 path to the "phase 2" private key file

 

 

 

 

 
nm_setting_802_1x_set_phase2_private_key ()

-
gboolean
+
gboolean
 nm_setting_802_1x_set_phase2_private_key
                                (NMSetting8021x *setting,
                                 const char *key_path,
                                 const char *password,
                                 NMSetting8021xCKScheme scheme,
                                 NMSetting8021xCKFormat *out_format,
-                                GError **error);

+                                GError **error);

 
Private keys are used to authenticate the connecting client to the network
 when EAP-TLS is used as either the "phase 1" or "phase 2" 802.1x
 authentication method.

@@ -3106,7 +3194,7 @@ verify that password
  is correct, and if it is, updates the
 “phase2-private-key-password” property with the given
 password
-.  If the decryption is unsuccessful, FALSE is returned, error
+.  If the decryption is unsuccessful, FALSE is returned, error
  is
 set, and no internal data is changed.  If no password
  is given, the private
@@ -3117,7 +3205,7 @@ 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.

 

-
Parameters

+
Parameters

 
@@ -3136,14 +3224,14 @@ key password to prevent unauthorized access to unencrypted private key data.

 is set to either NM_SETTING_802_1X_CK_SCHEME_PATH or
 NM_SETTING_802_1X_CK_SCHEME_BLOB, pass the path of the "phase2" private
 key file (PEM, DER, or PKCS#12 format).  The path must be UTF-8 encoded;
-use g_filename_to_utf8() to convert if needed.  Passing NULL with any
+use g_filename_to_utf8() to convert if needed.  Passing NULL with any
 scheme
 clears the private key.

-
@@ -3167,8 +3255,8 @@ an error is returned.

 
 

 
 
 

 

 
password
password used to decrypt the private key, or NULL if the password
+
password used to decrypt the private key, or NULL if the password
 is unknown.  If the password is given but fails to decrypt the private key,
 an error is returned.

  
 

 

 

-
Returns

-
 TRUE if the operation succeeded, FALSE if it was unsuccessful

+
Returns

+
 TRUE if the operation succeeded, FALSE if it was unsuccessful

 

 

 

@@ -3178,7 +3266,7 @@ an error is returned.

 nm_setting_802_1x_get_phase2_private_key_password
                                (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -3193,7 +3281,7 @@ nm_setting_802_1x_get_phase2_private_key_password
 

 
 


 

 

-
Returns

+
Returns

 
 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.

@@ -3206,7 +3294,7 @@ previously set with NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -3221,7 +3309,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 

 
 


 

 

-
Returns

+
Returns

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

 

@@ -3233,7 +3321,7 @@ nm_setting_802_1x_get_phase2_private_key_password_flags
 nm_setting_802_1x_get_phase2_private_key_format
                                (NMSetting8021x *setting);

 

-
Parameters

+
Parameters

 
@@ -3248,7 +3336,7 @@ nm_setting_802_1x_get_phase2_private_key_format
 

 
 


 

 

-
Returns

+
Returns

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

 

@@ -3408,6 +3496,12 @@ to a file containing the certificate or key data

 

 

 

+
NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH

+
#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
+

+

+

+

 
NM_SETTING_802_1X_CLIENT_CERT

 
#define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 

@@ -3468,6 +3562,12 @@ to a file containing the certificate or key data

 

 

 

+
NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH

+
#define NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH "phase2-domain-suffix-match"
+

+

+

+

 
NM_SETTING_802_1X_PHASE2_CLIENT_CERT

 
#define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 

@@ -3555,7 +3655,7 @@ to a file containing the certificate or key data

 
Property Details

 

 
The “altsubject-matches” property

-
  “altsubject-matches”       GStrv

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

@@ -3564,7 +3664,7 @@ no verification of the server certificate's altSubjectName is performed.

 

 

 
The “anonymous-identity” property

-
  “anonymous-identity”       gchar *

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

@@ -3574,7 +3674,7 @@ identity like EAP-TTLS.

 

 

 
The “ca-cert” property

-
  “ca-cert”                  GBytes *

+
  “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
@@ -3592,7 +3692,7 @@ but this allows man-in-the-middle attacks and is NOT recommended.

 

 

 
The “ca-path” property

-
  “ca-path”                  gchar *

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

@@ -3602,7 +3702,7 @@ certificate specified in the 
 
The “client-cert” property

-
  “client-cert”              GBytes *

+
  “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
@@ -3617,8 +3717,21 @@ with the string "file://" and ending with a terminating NUL byte.

 

 

 

+
The “domain-suffix-match” property

+
  “domain-suffix-match”      gchar *

+
Constraint for server domain name. If set, this FQDN is used as a suffix
+match requirement for dNSName element(s) of the certificate presented by
+the authentication server.  If a matching dNSName is found, this
+constraint is met.  If no dNSName values are present, this constraint is
+matched against SubjectName CN using same suffix match comparison.

+
Flags: Read / Write

+
Default value: NULL

+
Since: 1.2

+

+

+

 
The “eap” property

-
  “eap”                      GStrv

+
  “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
@@ -3629,7 +3742,7 @@ allowed combinations.

 

 

 
The “identity” property

-
  “identity”                 gchar *

+
  “identity”                 gchar *

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

 
Flags: Read / Write

@@ -3638,7 +3751,7 @@ login name.

 

 

 
The “pac-file” property

-
  “pac-file”                 gchar *

+
  “pac-file”                 gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -3646,7 +3759,7 @@ login name.

 

 

 
The “password” property

-
  “password”                 gchar *

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

@@ -3663,7 +3776,7 @@ property are specified, 
 
The “password-raw” property

-
  “password-raw”             GBytes *

+
  “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”
@@ -3680,7 +3793,7 @@ property are specified, 
 
The “phase1-fast-provisioning” property

-
  “phase1-fast-provisioning” gchar *

+
  “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
@@ -3693,7 +3806,7 @@ wpa_supplicant documentation for more details.

 

 

 
The “phase1-peaplabel” property

-
  “phase1-peaplabel”         gchar *

+
  “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
@@ -3704,7 +3817,7 @@ wpa_supplicant documentation for more details.

 

 

 
The “phase1-peapver” property

-
  “phase1-peapver”           gchar *

+
  “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
@@ -3717,7 +3830,7 @@ version.

 

 

 
The “phase2-altsubject-matches” property

-
  “phase2-altsubject-matches” GStrv

+
  “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
@@ -3727,7 +3840,7 @@ server certificate's altSubjectName is performed.

 

 

 
The “phase2-auth” property

-
  “phase2-auth”              gchar *

+
  “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
@@ -3740,7 +3853,7 @@ authentication; see the wpa_supplicant documentation for more details.

 

 

 
The “phase2-autheap” property

-
  “phase2-autheap”           gchar *

+
  “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
@@ -3753,7 +3866,7 @@ wpa_supplicant documentation for more details.

 

 

 
The “phase2-ca-cert” property

-
  “phase2-ca-cert”           GBytes *

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

@@ -3772,7 +3885,7 @@ but this allows man-in-the-middle attacks and is NOT recommended.

 

 

 
The “phase2-ca-path” property

-
  “phase2-ca-path”           gchar *

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

@@ -3782,7 +3895,7 @@ certificate specified in the 
 
The “phase2-client-cert” property

-
  “phase2-client-cert”       GBytes *

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

@@ -3800,8 +3913,22 @@ but this allows man-in-the-middle attacks and is NOT recommended.

 

 

 

+
The “phase2-domain-suffix-match” property

+
  “phase2-domain-suffix-match” gchar *

+
Constraint for server domain name. If set, this FQDN is used as a suffix
+match requirement for dNSName element(s) of the certificate presented by
+the authentication server during the inner "phase 2" authentication.  If
+a matching dNSName is found, this constraint is met.  If no dNSName
+values are present, this constraint is matched against SubjectName CN
+using same suffix match comparison.

+
Flags: Read / Write

+
Default value: NULL

+
Since: 1.2

+

+

+

 
The “phase2-private-key” property

-
  “phase2-private-key”       GBytes *

+
  “phase2-private-key”       GBytes *

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

@@ -3827,7 +3954,7 @@ password used to decode the PKCS#12 private key and certificate.

 

 

 
The “phase2-private-key-password” property

-
  “phase2-private-key-password” gchar *

+
  “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
@@ -3849,18 +3976,20 @@ function.

 

 

 
The “phase2-subject-match” property

-
  “phase2-subject-match”     gchar *

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

+certificate's subject is performed.  This property provides little security,
+if any, and its use is deprecated in favor of
+NMSetting8021x:phase2-domain-suffix-match.

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 
The “pin” property

-
  “pin”                      gchar *

+
  “pin”                      gchar *

 
PIN used for EAP authentication methods.

 
Flags: Read / Write

 
Default value: NULL

@@ -3875,7 +4004,7 @@ certificate's subject is performed.

 

 

 
The “private-key” property

-
  “private-key”              GBytes *

+
  “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
@@ -3905,7 +4034,7 @@ private key data.

 

 

 
The “private-key-password” property

-
  “private-key-password”     gchar *

+
  “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
@@ -3926,18 +4055,20 @@ property.

 

 

 
The “subject-match” property

-
  “subject-match”            gchar *

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

+authentication server certificate's subject is performed.  This property
+provides little security, if any, and its use is deprecated in favor of
+NMSetting8021x:domain-suffix-match.

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 
The “system-ca-certs” property

-
  “system-ca-certs”          gboolean

-
When TRUE, overrides the “ca-path” and
+
  “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
diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html
index 2bf11de2..3b890722 100644
--- a/docs/libnm/html/NMSettingAdsl.html
+++ b/docs/libnm/html/NMSettingAdsl.html
@@ -79,7 +79,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vpi ()
@@ -87,7 +87,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_adsl_get_vci ()
@@ -115,13 +115,13 @@
 
 
 
-gchar *
+gchar *
 encapsulation
 Read / Write
 
 
 
-gchar *
+gchar *
 password
 Read / Write
 
@@ -132,23 +132,23 @@
 
 
 
-gchar *
+gchar *
 protocol
 Read / Write
 
 
 
-gchar *
+gchar *
 username
 Read / Write
 
 
-guint
+guint
 vci
 Read / Write
 
 
-guint
+guint
 vpi
 Read / Write
 
@@ -220,7 +220,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingAdsl
 

@@ -345,7 +345,7 @@ nm_setting_adsl_get_encapsulation (
 

 
nm_setting_adsl_get_vpi ()

-
guint32
+
guint32
 nm_setting_adsl_get_vpi (NMSettingAdsl *setting);

 

 
Parameters

@@ -370,7 +370,7 @@ nm_setting_adsl_get_vpi (
 
nm_setting_adsl_get_vci ()

-
guint32
+
guint32
 nm_setting_adsl_get_vci (NMSettingAdsl *setting);

 

 
Parameters

@@ -502,7 +502,7 @@ nm_setting_adsl_get_password_flags (
Property Details

 

 
The “encapsulation” property

-
  “encapsulation”            gchar *

+
  “encapsulation”            gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -510,7 +510,7 @@ nm_setting_adsl_get_password_flags (
 

 
The “password” property

-
  “password”                 gchar *

+
  “password”                 gchar *

 
Password used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

@@ -525,7 +525,7 @@ nm_setting_adsl_get_password_flags (
 

 
The “protocol” property

-
  “protocol”                 gchar *

+
  “protocol”                 gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -533,7 +533,7 @@ nm_setting_adsl_get_password_flags (
 

 
The “username” property

-
  “username”                 gchar *

+
  “username”                 gchar *

 
Username used to authenticate with the ADSL service.

 
Flags: Read / Write

 
Default value: NULL

@@ -541,7 +541,7 @@ nm_setting_adsl_get_password_flags (
 

 
The “vci” property

-
  “vci”                      guint

+
  “vci”                      guint

 
VCI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

@@ -550,7 +550,7 @@ nm_setting_adsl_get_password_flags (
 

 
The “vpi” property

-
  “vpi”                      guint

+
  “vpi”                      guint

 
VPI of ADSL connection

 
Flags: Read / Write

 
Allowed values: <= 65536

diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html
index 2fff9f80..dc9095c9 100644
--- a/docs/libnm/html/NMSettingBluetooth.html
+++ b/docs/libnm/html/NMSettingBluetooth.html
@@ -77,13 +77,13 @@
 
 
 
-gchar *
+gchar *
 bdaddr
 Read / Write
 
 
 
-gchar *
+gchar *
 type
 Read / Write
 
@@ -123,7 +123,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingBluetooth
 

@@ -245,7 +245,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.

 
Property Details

 

 
The “bdaddr” property

-
  “bdaddr”                   gchar *

+
  “bdaddr”                   gchar *

 
The Bluetooth address of the device.

 
Flags: Read / Write

 
Default value: NULL

@@ -253,7 +253,7 @@ NAP (Network Access Point) protocol, which accepts connections via PANU.

 

 

 
The “type” property

-
  “type”                     gchar *

+
  “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

diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html
index 8680857d..edf00c34 100644
--- a/docs/libnm/html/NMSettingBond.html
+++ b/docs/libnm/html/NMSettingBond.html
@@ -51,7 +51,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_setting_bond_get_num_options ()
@@ -59,7 +59,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_get_option ()
@@ -74,7 +74,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_add_option ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_remove_option ()
@@ -90,7 +90,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_setting_bond_validate_option ()
@@ -123,7 +123,7 @@
 
 
 
-GHashTable *
+GHashTable *
 options
 Read / Write
 
@@ -210,7 +210,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingBond
 

@@ -236,7 +236,7 @@ nm_setting_bond_new (void<
 

 

 
nm_setting_bond_get_num_options ()

-
guint32
+
guint32
 nm_setting_bond_get_num_options (NMSettingBond *setting);

 
Returns the number of options that should be set for this bond when it
 is activated. This can be used to retrieve each option individually
@@ -264,9 +264,9 @@ using 
 

 
nm_setting_bond_get_option ()

-
gboolean
+
gboolean
 nm_setting_bond_get_option (NMSettingBond *setting,
-                            guint32 idx,
+                            guint32 idx,
                             const char **out_name,
                             const char **out_value);

 
Given an index, return the value of the bonding option at that index.  Indexes
@@ -312,8 +312,8 @@ modified. 

 

 

 
Returns

-
 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
+
 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)

 

 

@@ -350,14 +350,14 @@ nm_setting_bond_get_option_by_name (
 

 
Returns

-
 the value, or NULL if the key/value pair was never added to the
+
 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

 

 

 

 

 
nm_setting_bond_add_option ()

-
gboolean
+
gboolean
 nm_setting_bond_add_option (NMSettingBond *setting,
                             const char *name,
                             const char *value);

@@ -396,14 +396,14 @@ 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.

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

 

 

 

 

 
nm_setting_bond_remove_option ()

-
gboolean
+
gboolean
 nm_setting_bond_remove_option (NMSettingBond *setting,
                                const char *name);

 
Remove the bonding option referenced by name
@@ -433,14 +433,14 @@ list.

 

 

 
Returns

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

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

 

 

 

 

 
nm_setting_bond_validate_option ()

-
gboolean
+
gboolean
 nm_setting_bond_validate_option (const char *name,
                                  const char *value);

 
Checks whether name
@@ -448,7 +448,7 @@ nm_setting_bond_validate_option (const name
 . If value
- is NULL, the function only validates the option name.

+ is NULL, the function only validates the option name.

 

 
Parameters

 

@@ -473,10 +473,10 @@ the name

 
Returns

-
 TRUE, if the value
+
 TRUE, if the value
 is valid for the given name.
 If the name
-is not a valid option, FALSE will be returned.

+is not a valid option, FALSE will be returned.

 

@@ -502,7 +502,7 @@ nm_setting_bond_get_valid_options (
 

 
Returns

-
 a NULL-terminated array of strings of valid bond options. 

+
 a NULL-terminated array of strings of valid bond options. 

 
[transfer none]

 

 
@@ -649,7 +649,7 @@ the 
Property Details

 

 
The “options” property

-
  “options”                  GHashTable *

+
  “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]).

diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html
index 3eb490ae..a5286057 100644
--- a/docs/libnm/html/NMSettingBridge.html
+++ b/docs/libnm/html/NMSettingBridge.html
@@ -58,7 +58,7 @@
 
 

-
+
-
+
-
+
+gchar *
 
-
+
-
+
-
+
-
+
@@ -217,7 +217,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingBridge
 

@@ -268,7 +268,7 @@ nm_setting_bridge_get_mac_address (
 

 
nm_setting_bridge_get_stp ()

-
gboolean
+
gboolean
 nm_setting_bridge_get_stp (NMSettingBridge *setting);

 

 
Parameters

@@ -293,7 +293,7 @@ nm_setting_bridge_get_stp (
 
nm_setting_bridge_get_priority ()

-
guint16
+
guint16
 nm_setting_bridge_get_priority (NMSettingBridge *setting);

 

 
Parameters

@@ -318,7 +318,7 @@ nm_setting_bridge_get_priority (
 

 
nm_setting_bridge_get_forward_delay ()

-
guint16
+
guint16
 nm_setting_bridge_get_forward_delay (NMSettingBridge *setting);

 

 
Parameters

@@ -343,7 +343,7 @@ nm_setting_bridge_get_forward_delay (
 

 
nm_setting_bridge_get_hello_time ()

-
guint16
+
guint16
 nm_setting_bridge_get_hello_time (NMSettingBridge *setting);

 

 
Parameters

@@ -368,7 +368,7 @@ nm_setting_bridge_get_hello_time (
 

 
nm_setting_bridge_get_max_age ()

-
guint16
+
guint16
 nm_setting_bridge_get_max_age (NMSettingBridge *setting);

 

 
Parameters

@@ -393,7 +393,7 @@ nm_setting_bridge_get_max_age (
 

 
nm_setting_bridge_get_ageing_time ()

-
guint32
+
guint32
 nm_setting_bridge_get_ageing_time (NMSettingBridge *setting);

 

 
Parameters

@@ -418,7 +418,7 @@ nm_setting_bridge_get_ageing_time (
 

 
nm_setting_bridge_get_multicast_snooping ()

-
gboolean
+
gboolean
 nm_setting_bridge_get_multicast_snooping
                                (NMSettingBridge *setting);

 

@@ -503,7 +503,7 @@ nm_setting_bridge_get_multicast_snooping
 
Property Details

 

 
The “ageing-time” property

-
  “ageing-time”              guint

+
  “ageing-time”              guint

 
The Ethernet MAC address aging time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 1000000

@@ -512,7 +512,7 @@ nm_setting_bridge_get_multicast_snooping
 

 

 
The “forward-delay” property

-
  “forward-delay”            guint

+
  “forward-delay”            guint

 
The Spanning Tree Protocol (STP) forwarding delay, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 30

@@ -521,7 +521,7 @@ nm_setting_bridge_get_multicast_snooping
 

 

 
The “hello-time” property

-
  “hello-time”               guint

+
  “hello-time”               guint

 
The Spanning Tree Protocol (STP) hello time, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 10

@@ -530,7 +530,7 @@ nm_setting_bridge_get_multicast_snooping
 

 

 
The “mac-address” property

-
  “mac-address”              gchar *

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

@@ -540,7 +540,7 @@ NetworkManager created) bridge, this MAC address must match.

 

 

 
The “max-age” property

-
  “max-age”                  guint

+
  “max-age”                  guint

 
The Spanning Tree Protocol (STP) maximum message age, in seconds.

 
Flags: Read / Write / Construct

 
Allowed values: <= 40

@@ -549,7 +549,7 @@ NetworkManager created) bridge, this MAC address must match.

 

 

 
The “multicast-snooping” property

-
  “multicast-snooping”       gboolean

+
  “multicast-snooping”       gboolean

 
Controls whether IGMP snooping is enabled for this bridge.
 Note that if snooping was automatically disabled due to hash collisions,
 the system may refuse to enable the feature until the collisions are
@@ -561,7 +561,7 @@ resolved.

 

 

 
The “priority” property

-
  “priority”                 guint

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

@@ -572,7 +572,7 @@ bridge.

 

 

 
The “stp” property

-
  “stp”                      gboolean

+
  “stp”                      gboolean

 
Controls whether Spanning Tree Protocol (STP) is enabled for this bridge.

 
Flags: Read / Write / Construct

 
Default value: TRUE

diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html
index 5c2274fa..b6aee68e 100644
--- a/docs/libnm/html/NMSettingBridgePort.html
+++ b/docs/libnm/html/NMSettingBridgePort.html
@@ -51,7 +51,7 @@
 
 

-
+
-
+
-
+
@@ -132,7 +132,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingBridgePort
 

@@ -158,7 +158,7 @@ nm_setting_bridge_port_new (void<
 

 

 
nm_setting_bridge_port_get_priority ()

-
guint16
+
guint16
 nm_setting_bridge_port_get_priority (NMSettingBridgePort *setting);

 

 
Parameters

@@ -183,7 +183,7 @@ nm_setting_bridge_port_get_priority (
 

 
nm_setting_bridge_port_get_path_cost ()

-
guint16
+
guint16
 nm_setting_bridge_port_get_path_cost (NMSettingBridgePort *setting);

 

 
Parameters

@@ -208,7 +208,7 @@ nm_setting_bridge_port_get_path_cost (
 
nm_setting_bridge_port_get_hairpin_mode ()

-
gboolean
+
gboolean
 nm_setting_bridge_port_get_hairpin_mode
                                (NMSettingBridgePort *setting);

 

@@ -262,7 +262,7 @@ nm_setting_bridge_port_get_hairpin_mode
 
Property Details

 

 
The “hairpin-mode” property

-
  “hairpin-mode”             gboolean

+
  “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

@@ -271,7 +271,7 @@ be sent back out through the port the frame was received on.

 

 

 
The “path-cost” property

-
  “path-cost”                guint

+
  “path-cost”                guint

 
The Spanning Tree Protocol (STP) port cost for destinations via this
 port.

 
Flags: Read / Write / Construct

@@ -281,7 +281,7 @@ port.

 

 

 
The “priority” property

-
  “priority”                 guint

+
  “priority”                 guint

 
The Spanning Tree Protocol (STP) priority of this bridge port.

 
Flags: Read / Write / Construct

 
Allowed values: <= 63

diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html
index 08b1cc20..18180f06 100644
--- a/docs/libnm/html/NMSettingCdma.html
+++ b/docs/libnm/html/NMSettingCdma.html
@@ -92,13 +92,13 @@
 

+gchar *
 
+gchar *
 
@@ -109,7 +109,7 @@
 
 
+gchar *
 
@@ -149,7 +149,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingCdma
 

@@ -309,7 +309,7 @@ nm_setting_cdma_get_password_flags (
Property Details

 

 
The “number” property

-
  “number”                   gchar *

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

@@ -319,7 +319,7 @@ is used when required.

 

 

 
The “password” property

-
  “password”                 gchar *

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

@@ -336,7 +336,7 @@ password is required, it is specified here.

 

 

 
The “username” property

-
  “username”                 gchar *

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

diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 4347ec7f..8c845502 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -79,7 +79,7 @@
 
 

-
+
-
+
@@ -285,30 +285,30 @@
 
-
+
+gchar *
 
+gchar *
 
-
+
+gchar *
 
@@ -318,46 +318,46 @@
 
-
+
-
+
-
+
+gchar *
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -473,10 +473,10 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingConnectionAutoconnectSlaves
     ╰── NMSettingConnectionLldp
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingConnection
 

@@ -484,8 +484,8 @@
 

 
Description

 
The NMSettingConnection object is a NMSetting subclass that describes
-properties that apply to all NMConnection objects, regardless of what type
-of network connection they describe.  Each NMConnection object must contain
+properties that apply to all NMConnection objects, regardless of what type
+of network connection they describe.  Each NMConnection object must contain
 a NMSettingConnection setting.

 

 

@@ -609,7 +609,7 @@ nm_setting_connection_get_connection_type
 

 

 
nm_setting_connection_get_autoconnect ()

-
gboolean
+
gboolean
 nm_setting_connection_get_autoconnect (NMSettingConnection *setting);

 
Returns the “autoconnect” property of the connection.

 

@@ -635,7 +635,7 @@ nm_setting_connection_get_autoconnect (
 
nm_setting_connection_get_autoconnect_priority ()

-
gint
+
gint
 nm_setting_connection_get_autoconnect_priority
                                (NMSettingConnection *setting);

 
Returns the “autoconnect-priority” property of the connection.
@@ -663,7 +663,7 @@ The higher number, the higher priority.

 

 

 
nm_setting_connection_get_timestamp ()

-
guint64
+
guint64
 nm_setting_connection_get_timestamp (NMSettingConnection *setting);

 
Returns the “timestamp” property of the connection.

 

@@ -689,7 +689,7 @@ nm_setting_connection_get_timestamp (
 

 
nm_setting_connection_get_read_only ()

-
gboolean
+
gboolean
 nm_setting_connection_get_read_only (NMSettingConnection *setting);

 
Returns the “read-only” property of the connection.

 

@@ -709,13 +709,13 @@ nm_setting_connection_get_read_only (
 

 
Returns

-
 TRUE if the connection is read-only, FALSE if it is not

+
 TRUE if the connection is read-only, FALSE if it is not

 

 

 

 

 
nm_setting_connection_get_num_permissions ()

-
guint32
+
guint32
 nm_setting_connection_get_num_permissions
                                (NMSettingConnection *setting);

 
Returns the number of entires in the “permissions”
@@ -743,9 +743,9 @@ property of this setting.

 

 

 
nm_setting_connection_get_permission ()

-
gboolean
+
gboolean
 nm_setting_connection_get_permission (NMSettingConnection *setting,
-                                      guint32 idx,
+                                      guint32 idx,
                                       const char **out_ptype,
                                       const char **out_pitem,
                                       const char **out_detail);

@@ -784,7 +784,7 @@ of this setting.

 
 

-
+
@@ -792,7 +792,7 @@ of this setting.

 
 

 
Returns

-
 TRUE if a permission was returned, FALSE if idx
+
 TRUE if a permission was returned, FALSE if idx
 was invalid

 

 
@@ -825,7 +825,7 @@ nm_setting_connection_get_zone (
 

 
nm_setting_connection_permissions_user_allowed ()

-
gboolean
+
gboolean
 nm_setting_connection_permissions_user_allowed
                                (NMSettingConnection *setting,
                                 const char *uname);

@@ -854,14 +854,14 @@ 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

+
 TRUE if the requested user is allowed to view this connection,
+FALSE if the given user is not allowed to view this connection

 

 
 

 

 
nm_setting_connection_add_permission ()

-
gboolean
+
gboolean
 nm_setting_connection_add_permission (NMSettingConnection *setting,
                                       const char *ptype,
                                       const char *pitem,
@@ -897,7 +897,7 @@ the "user" permission type is supported, and pitem
 

-
+
@@ -905,8 +905,8 @@ the "user" permission type is supported, and pitem
 

 
Returns

-
 TRUE if the permission was unique and was successfully added to the
-list, FALSE if ptype
+
 TRUE if the permission was unique and was successfully added to the
+list, FALSE if ptype
 or pitem
 was invalid or it the permission was already
 present in the list

@@ -918,7 +918,7 @@ present in the list

 
void
 nm_setting_connection_remove_permission
                                (NMSettingConnection *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the permission at index idx
  from the connection.

 

@@ -947,7 +947,7 @@ nm_setting_connection_remove_permission
 

 

 
nm_setting_connection_remove_permission_by_value ()

-
gboolean
+
gboolean
 nm_setting_connection_remove_permission_by_value
                                (NMSettingConnection *setting,
                                 const char *ptype,
@@ -984,7 +984,7 @@ be a username. See 
detail

-

+
@@ -992,7 +992,7 @@ be a username. See 
 
Returns

-
 TRUE if the permission was found and removed; FALSE if it was not.

+
 TRUE if the permission was found and removed; FALSE if it was not.

 
 
 

@@ -1025,7 +1025,7 @@ connection.

 

 

 
nm_setting_connection_is_slave_type ()

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

 

@@ -1054,7 +1054,7 @@ against setting
 

 

 
Returns

-
 TRUE if connection is of the given slave type
+
 TRUE if connection is of the given slave type
 

 

 

@@ -1116,7 +1116,7 @@ with the connection.

 

 

 
nm_setting_connection_get_num_secondaries ()

-
guint32
+
guint32
 nm_setting_connection_get_num_secondaries
                                (NMSettingConnection *setting);

 

@@ -1144,7 +1144,7 @@ nm_setting_connection_get_num_secondaries
 
nm_setting_connection_get_secondary ()

 
const char *
 nm_setting_connection_get_secondary (NMSettingConnection *setting,
-                                     guint32 idx);

+                                     guint32 idx);

 

 
Parameters

 

 
 
 
 

 
-gboolean
+gboolean
 
 
 nm_setting_bridge_get_stp ()
@@ -66,7 +66,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_priority ()
@@ -74,7 +74,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_forward_delay ()
@@ -82,7 +82,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_hello_time ()
@@ -90,7 +90,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_get_max_age ()
@@ -98,7 +98,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_bridge_get_ageing_time ()
@@ -106,7 +106,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bridge_get_multicast_snooping ()
@@ -125,43 +125,43 @@
 
 

 
guintguint
 ageing-time
 Read / Write / Construct
 

 
guintguint
 forward-delay
 Read / Write / Construct
 

 
guintguint
 hello-time
 Read / Write / Construct
 

 

 
-gchar *mac-address
 Read / Write
 

 
guintguint
 max-age
 Read / Write / Construct
 

 
gbooleangboolean
 multicast-snooping
 Read / Write / Construct
 

 
guintguint
 priority
 Read / Write / Construct
 

 
gbooleangboolean
 stp
 Read / Write / Construct
 

 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_priority ()
@@ -59,7 +59,7 @@
 

 

 
-guint16
+guint16
 
 
 nm_setting_bridge_port_get_path_cost ()
@@ -67,7 +67,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_bridge_port_get_hairpin_mode ()
@@ -86,17 +86,17 @@
 
 

 
gbooleangboolean
 hairpin-mode
 Read / Write
 

 
guintguint
 path-cost
 Read / Write / Construct
 

 
guintguint
 priority
 Read / Write / Construct
 

 

 
-gchar *number
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
-gchar *username
 Read / Write
 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_autoconnect ()
@@ -87,7 +87,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_connection_get_autoconnect_priority ()
@@ -95,7 +95,7 @@
 

 

 
-guint64
+guint64
 
 
 nm_setting_connection_get_timestamp ()
@@ -103,7 +103,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_read_only ()
@@ -111,7 +111,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_permissions ()
@@ -119,7 +119,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_get_permission ()
@@ -134,7 +134,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_permissions_user_allowed ()
@@ -142,7 +142,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_permission ()
@@ -158,7 +158,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_permission_by_value ()
@@ -173,7 +173,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_is_slave_type ()
@@ -196,7 +196,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_connection_get_num_secondaries ()
@@ -211,7 +211,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_add_secondary ()
@@ -227,7 +227,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_connection_remove_secondary_by_value ()
@@ -235,7 +235,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_connection_get_gateway_ping_timeout ()
@@ -270,12 +270,12 @@
 
 

 
gbooleangboolean
 autoconnect
 Read / Write / Construct
 

 
gintgint
 autoconnect-priority
 Read / Write / Construct
 
Read / Write / Construct
 

 
guintguint
 gateway-ping-timeout
 Read / Write / Construct
 

 

 
-gchar *id
 Read / Write
 

 

 
-gchar *interface-name
 Read / Write
 

 
gintgint
 lldp
 Read / Write / Construct
 

 

 
-gchar *master
 Read / Write
 
Read / Write
 

 
GStrvGStrv
 permissions
 Read / Write
 

 
gbooleangboolean
 read-only
 Read / Write / Construct
 

 
GStrvGStrv
 secondaries
 Read / Write
 

 

 
-gchar *slave-type
 Read / Write
 

 
guint64guint64
 timestamp
 Read / Write / Construct
 

 

 
-gchar *type
 Read / Write
 

 

 
-gchar *uuid
 Read / Write
 

 

 
-gchar *zone
 Read / Write / Construct
 

 
out_detail
on return, the permission detail (at this time, always NULL)
on return, the permission detail (at this time, always NULL)

  
 

 

 
detail
 unused at this time; must be NULL. 
 unused at this time; must be NULL. 

 [allow-none]
 

 
 unused at this time; must be NULL. 
 unused at this time; must be NULL. 

 [allow-none]
 

 

@@ -1176,7 +1176,7 @@ nm_setting_connection_get_secondary (
 

 
nm_setting_connection_add_secondary ()

-
gboolean
+
gboolean
 nm_setting_connection_add_secondary (NMSettingConnection *setting,
                                      const char *sec_uuid);

 
Adds a new secondary connetion UUID to the setting.

@@ -1204,7 +1204,7 @@ nm_setting_connection_add_secondary (
 

 
Returns

-
 TRUE if the secondary connection UUID was added; FALSE if the UUID
+
 TRUE if the secondary connection UUID was added; FALSE if the UUID
 was already present

 

 

@@ -1214,7 +1214,7 @@ was already present

 
void
 nm_setting_connection_remove_secondary
                                (NMSettingConnection *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the secondary coonnection UUID at index idx
 .

 

@@ -1243,7 +1243,7 @@ nm_setting_connection_remove_secondary
 

 

 
nm_setting_connection_remove_secondary_by_value ()

-
gboolean
+
gboolean
 nm_setting_connection_remove_secondary_by_value
                                (NMSettingConnection *setting,
                                 const char *sec_uuid);

@@ -1273,13 +1273,13 @@ nm_setting_connection_remove_secondary_by_value
 

 

 
Returns

-
 TRUE if the secondary connection UUID was found and removed; FALSE if it was not.

+
 TRUE if the secondary connection UUID was found and removed; FALSE if it was not.

 

 

 

 

 
nm_setting_connection_get_gateway_ping_timeout ()

-
guint32
+
guint32
 nm_setting_connection_get_gateway_ping_timeout
                                (NMSettingConnection *setting);

 

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

 
Property Details

 

 
The “autoconnect” property

-
  “autoconnect”              gboolean

+
  “autoconnect”              gboolean

 
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
+TRUE to automatically activate the connection, FALSE to require manual
 intervention to activate the connection.

 
Flags: Read / Write / Construct

 
Default value: TRUE

@@ -1587,7 +1587,7 @@ intervention to activate the connection.

 

 

 
The “autoconnect-priority” property

-
  “autoconnect-priority”     gint

+
  “autoconnect-priority”     gint

 
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.

@@ -1613,7 +1613,7 @@ determine the real value. If it is default as well, this fallbacks to 0.

 

 

 
The “gateway-ping-timeout” property

-
  “gateway-ping-timeout”     guint

+
  “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

@@ -1623,7 +1623,7 @@ timeout is reached, or an IP gateway replies to a ping.

 

 

 
The “id” property

-
  “id”                       gchar *

+
  “id”                       gchar *

 
A human readable unique identifier for the connection, like "Work Wi-Fi"
 or "T-Mobile 3G".

 
Flags: Read / Write

@@ -1632,7 +1632,7 @@ or "T-Mobile 3G".

 

 

 
The “interface-name” property

-
  “interface-name”           gchar *

+
  “interface-name”           gchar *

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

@@ -1648,7 +1648,7 @@ connection may be applied to the wrong interface.

 

 

 
The “lldp” property

-
  “lldp”                     gint

+
  “lldp”                     gint

 
Whether LLDP is enabled for the connection.

 
Flags: Read / Write / Construct

 
Default value: -1

@@ -1657,7 +1657,7 @@ connection may be applied to the wrong interface.

 

 

 
The “master” property

-
  “master”                   gchar *

+
  “master”                   gchar *

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

 
Flags: Read / Write

 
Default value: NULL

@@ -1676,9 +1676,9 @@ the change takes effect immediately.

 

 

 
The “permissions” property

-
  “permissions”              GStrv

+
  “permissions”              GStrv

 
An array of strings defining what access a given user has to this
-connection.  If this is NULL or empty, all users are allowed to access
+connection.  If this is NULL or empty, all users are allowed to access
 this connection.  Otherwise a user is allowed to access this connection
 if and only if they are in this list. Each entry is of the form
 "[type]:[id]:[reserved]"; for example, "user:dcbw:blah".

@@ -1692,9 +1692,9 @@ use.  All of [type], [id], and [reserved] must be valid UTF-8.

 

 

 
The “read-only” property

-
  “read-only”                gboolean

-
FALSE if the connection can be modified using the provided settings
-service's D-Bus interface with the right privileges, or TRUE if the
+
  “read-only”                gboolean

+
FALSE if the connection can be modified using the provided settings
+service's D-Bus interface with the right privileges, or TRUE if the
 connection is read-only and cannot be modified.

 
Flags: Read / Write / Construct

 
Default value: FALSE

@@ -1702,7 +1702,7 @@ connection is read-only and cannot be modified.

 

 

 
The “secondaries” property

-
  “secondaries”              GStrv

+
  “secondaries”              GStrv

 
List of connection UUIDs that should be activated when the base
 connection itself is activated. Currently only VPN connections are
 supported.

@@ -1711,9 +1711,9 @@ supported.

 

 

 
The “slave-type” property

-
  “slave-type”               gchar *

+
  “slave-type”               gchar *

 
Setting name of the device type of this slave's master connection (eg,
-NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
+NM_SETTING_BOND_SETTING_NAME), or NULL if this connection is not a
 slave.

 
Flags: Read / Write

 
Default value: NULL

@@ -1721,7 +1721,7 @@ slave.

 

 

 
The “timestamp” property

-
  “timestamp”                guint64

+
  “timestamp”                guint64

 
The time, in seconds since the Unix Epoch, that the connection was last
 _successfully_ fully activated.

 
NetworkManager updates the connection timestamp periodically when the
@@ -1734,7 +1734,7 @@ property will not be preserved).

 

 

 
The “type” property

-
  “type”                     gchar *

+
  “type”                     gchar *

 
Base type of the connection. For hardware-dependent connections, should
 contain the setting name of the hardware-type specific setting (ie,
 "802-3-ethernet" or "802-11-wireless" or "bluetooth", etc), and for
@@ -1746,7 +1746,7 @@ the setting name of that setting type (ie, "vpn" or "bridge", etc).

 

 

 
The “uuid” property

-
  “uuid”                     gchar *

+
  “uuid”                     gchar *

 
A universally unique identifier for the connection, for example generated
 with libuuid.  It should be assigned when the connection is created, and
 never changed as long as the connection still applies to the same
@@ -1757,16 +1757,16 @@ provider, or nm_utils_uuid_generate() or
-nm_utils_uuid_generate_from_string().

+nm_utils_uuid_generate_from_string().

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 
The “zone” property

-
  “zone”                     gchar *

+
  “zone”                     gchar *

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

 
When updating this property on a currently activated connection,
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 365fb9d8..a662d108 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -59,7 +59,7 @@
 
 

+gchar *
 
-
+
@@ -250,7 +250,7 @@
 
-
+
@@ -260,19 +260,19 @@
 
-
+
+GArray *
 
+GArray *
 
@@ -283,7 +283,7 @@
 
 
+GArray *
 
@@ -294,19 +294,19 @@
 
 
+GArray *
 
+GArray *
 
+GArray *
 
@@ -402,9 +402,9 @@
 
 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingDcbFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingDcb
 

@@ -458,7 +458,7 @@ nm_setting_dcb_get_app_fcoe_flags (
 

 
nm_setting_dcb_get_app_fcoe_priority ()

-
gint
+
gint
 nm_setting_dcb_get_app_fcoe_priority (NMSettingDcb *setting);

 

 
Parameters

@@ -533,7 +533,7 @@ nm_setting_dcb_get_app_iscsi_flags (
 

 
nm_setting_dcb_get_app_iscsi_priority ()

-
gint
+
gint
 nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);

 

 
Parameters

@@ -583,7 +583,7 @@ nm_setting_dcb_get_app_fip_flags (
 

 
nm_setting_dcb_get_app_fip_priority ()

-
gint
+
gint
 nm_setting_dcb_get_app_fip_priority (NMSettingDcb *setting);

 

 
Parameters

@@ -634,10 +634,10 @@ nm_setting_dcb_get_priority_flow_control_flags
 

 

 
nm_setting_dcb_get_priority_flow_control ()

-
gboolean
+
gboolean
 nm_setting_dcb_get_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority);

+                                guint user_priority);

 

 
Parameters

 

 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fcoe_priority ()
@@ -82,7 +82,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_dcb_get_app_iscsi_priority ()
@@ -98,7 +98,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_dcb_get_app_fip_priority ()
@@ -114,7 +114,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_flow_control ()
@@ -138,7 +138,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_id ()
@@ -154,7 +154,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_group_bandwidth ()
@@ -170,7 +170,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_bandwidth ()
@@ -186,7 +186,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_dcb_get_priority_strict_bandwidth ()
@@ -202,7 +202,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_dcb_get_priority_traffic_class ()
@@ -235,12 +235,12 @@
 

 

 
-gchar *app-fcoe-mode
 Read / Write / Construct
 

 
gintgint
 app-fcoe-priority
 Read / Write / Construct
 
Read / Write
 

 
gintgint
 app-fip-priority
 Read / Write / Construct
 
Read / Write
 

 
gintgint
 app-iscsi-priority
 Read / Write / Construct
 

 

 
-GArray *priority-bandwidth
 Read / Write
 

 

 
-GArray *priority-flow-control
 Read / Write
 

 
-GArray *priority-group-bandwidth
 Read / Write
 

 
-GArray *priority-group-id
 Read / Write
 

 

 
-GArray *priority-strict-bandwidth
 Read / Write
 

 

 
-GArray *priority-traffic-class
 Read / Write
 

@@ -662,9 +662,9 @@ nm_setting_dcb_get_priority_flow_control
 
 

 
Returns

-
 TRUE if flow control is enabled for the given user_priority
+
 TRUE if flow control is enabled for the given user_priority
 ,
-FALSE if not enabled

+FALSE if not enabled

 

 
 

@@ -673,8 +673,8 @@ nm_setting_dcb_get_priority_flow_control
 
void
 nm_setting_dcb_set_priority_flow_control
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean enabled);

+                                guint user_priority,
+                                gboolean enabled);
 
These values are only valid when “priority-flow-control” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -698,7 +698,7 @@ the 
 

-
+
@@ -734,9 +734,9 @@ nm_setting_dcb_get_priority_group_flags
 

 

 
nm_setting_dcb_get_priority_group_id ()

-
guint
+
guint
 nm_setting_dcb_get_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority);

+                                      guint user_priority);

 

 
Parameters

 

 
enabled
TRUE to enable flow control for this priority, FALSE to disable it
TRUE to enable flow control for this priority, FALSE to disable it

  
 

 

@@ -772,8 +772,8 @@ only valid when 
nm_setting_dcb_set_priority_group_id ()

 
void
 nm_setting_dcb_set_priority_group_id (NMSettingDcb *setting,
-                                      guint user_priority,
-                                      guint group_id);

+                                      guint user_priority,
+                                      guint group_id);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -809,10 +809,10 @@ unrestricted group.

 

 

 
nm_setting_dcb_get_priority_group_bandwidth ()

-
guint
+
guint
 nm_setting_dcb_get_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id);

+                                guint group_id);

 

 
Parameters

 

@@ -849,8 +849,8 @@ only valid when void
 nm_setting_dcb_set_priority_group_bandwidth
                                (NMSettingDcb *setting,
-                                guint group_id,
-                                guint bandwidth_percent);
+                                guint group_id,
+                                guint bandwidth_percent);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -885,9 +885,9 @@ to

 

 

 
nm_setting_dcb_get_priority_bandwidth ()

-
guint
+
guint
 nm_setting_dcb_get_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority);

+                                       guint user_priority);

 

 
Parameters

 

@@ -923,8 +923,8 @@ These values are only valid when 
nm_setting_dcb_set_priority_bandwidth ()

 
void
 nm_setting_dcb_set_priority_bandwidth (NMSettingDcb *setting,
-                                       guint user_priority,
-                                       guint bandwidth_percent);

+                                       guint user_priority,
+                                       guint bandwidth_percent);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -960,10 +960,10 @@ allowed to use within its priority group

 

 

 
nm_setting_dcb_get_priority_strict_bandwidth ()

-
gboolean
+
gboolean
 nm_setting_dcb_get_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority);

+                                guint user_priority);

 

 
Parameters

 

@@ -988,9 +988,9 @@ nm_setting_dcb_get_priority_strict_bandwidth
 
 

 
Returns

-
 TRUE if user_priority
+
 TRUE if user_priority
 may use all of the bandwidth allocated to its
-assigned group, or FALSE if not. These values are only valid when
+assigned group, or FALSE if not. These values are only valid when
 “priority-group-flags” includes the NM_SETTING_DCB_FLAG_ENABLE flag.

 

 
@@ -1000,8 +1000,8 @@ assigned group, or void
 nm_setting_dcb_set_priority_strict_bandwidth
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                gboolean strict);
+                                guint user_priority,
+                                gboolean strict);
 
These values are only valid when “priority-group-flags” includes
 the NM_SETTING_DCB_FLAG_ENABLE flag.

 

@@ -1025,9 +1025,9 @@ the 
 

-
+its priority group, or FALSE if not

 
@@ -1037,10 +1037,10 @@ its priority group, or 
 
nm_setting_dcb_get_priority_traffic_class ()

-
guint
+
guint
 nm_setting_dcb_get_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority);

+                                guint user_priority);

 

 
Parameters

 

 
strict
TRUE to allow user_priority
+
TRUE to allow user_priority
 to use all the bandwidth allocated to
-its priority group, or FALSE if not
 
 

 

@@ -1077,8 +1077,8 @@ valid when void
 nm_setting_dcb_set_priority_traffic_class
                                (NMSettingDcb *setting,
-                                guint user_priority,
-                                guint traffic_class);
+                                guint user_priority,
+                                guint traffic_class);
 
 
 

@@ -1252,7 +1252,7 @@ be any combination of 
 
The “app-fcoe-mode” property

-
  “app-fcoe-mode”            gchar *

+
  “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

@@ -1261,7 +1261,7 @@ be any combination of 
 
The “app-fcoe-priority” property

-
  “app-fcoe-priority”        gint

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

@@ -1281,7 +1281,7 @@ be any combination of 
 
The “app-fip-priority” property

-
  “app-fip-priority”         gint

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

@@ -1301,7 +1301,7 @@ may be any combination of 
 
The “app-iscsi-priority” property

-
  “app-iscsi-priority”       gint

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

@@ -1312,7 +1312,7 @@ property includes the 
 
The “priority-bandwidth” property

-
  “priority-bandwidth”       GArray *

+
  “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
@@ -1324,7 +1324,7 @@ percent.

 

 

 
The “priority-flow-control” property

-
  “priority-flow-control”    GArray *

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

@@ -1343,7 +1343,7 @@ Flags may be any combination of 
 
The “priority-group-bandwidth” property

-
  “priority-group-bandwidth” GArray *

+
  “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
@@ -1363,7 +1363,7 @@ any combination of 
 
The “priority-group-id” property

-
  “priority-group-id”        GArray *

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

@@ -1373,7 +1373,7 @@ Priority Group ID values are 0 - 7 or 15 for the unrestricted group.

 

 

 
The “priority-strict-bandwidth” property

-
  “priority-strict-bandwidth” GArray *

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

@@ -1383,7 +1383,7 @@ use all of the bandwidth allocated to its assigned group.

 

 

 
The “priority-traffic-class” property

-
  “priority-traffic-class”   GArray *

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

diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html
index c314fff0..f1975597 100644
--- a/docs/libnm/html/NMSettingGeneric.html
+++ b/docs/libnm/html/NMSettingGeneric.html
@@ -64,7 +64,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingGeneric
 

@@ -75,7 +75,7 @@
 optional properties that apply to "generic" devices (ie, devices that
 NetworkManager does not specifically recognize).

 
There are currently no properties on this object; it exists only to be
-the "connection type" setting on NMConnections for generic devices.

+the "connection type" setting on NMConnections for generic devices.

 

 

 
Functions

diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html
index 506ac99b..50ac79d3 100644
--- a/docs/libnm/html/NMSettingGsm.html
+++ b/docs/libnm/html/NMSettingGsm.html
@@ -93,7 +93,7 @@
 
 

+gchar *
 
+gchar *
 
-
+
+gchar *
 
+gchar *
 
+gchar *
 
@@ -190,7 +190,7 @@
 
 
+gchar *
 
@@ -201,19 +201,19 @@
 
 
+gchar *
 
+gchar *
 
+gchar *
 
@@ -285,7 +285,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingGsm
 

@@ -461,7 +461,7 @@ nm_setting_gsm_get_pin (
 
nm_setting_gsm_get_home_only ()

-
gboolean
+
gboolean
 nm_setting_gsm_get_home_only (NMSettingGsm *setting);

 

 
Parameters

@@ -696,7 +696,7 @@ nm_setting_gsm_get_password_flags (
Property Details

 

 
The “apn” property

-
  “apn”                      gchar *

+
  “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
@@ -710,7 +710,7 @@ The APN may only be composed of the characters a-z, 0-9, ., and - per GSM
 

 

 
The “device-id” property

-
  “device-id”                gchar *

+
  “device-id”                gchar *

 
The device unique identifier (as given by the WWAN management service)
 which this connection applies to.  If given, the connection will only
 apply to the specified device.

@@ -721,8 +721,8 @@ apply to the specified device.

 

 

 
The “home-only” property

-
  “home-only”                gboolean

-
When TRUE, only connections to the home network will be allowed.
+
  “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

@@ -730,7 +730,7 @@ Connections to roaming networks will not be made.

 

 

 
The “network-id” property

-
  “network-id”               gchar *

+
  “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.
@@ -742,7 +742,7 @@ roaming control of the device is not otherwise possible.

 

 

 
The “number” property

-
  “number”                   gchar *

+
  “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
@@ -753,7 +753,7 @@ allows NetworkManager to select the appropriate settings automatically.

 

 

 
The “password” property

-
  “password”                 gchar *

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

@@ -770,7 +770,7 @@ password is required, it is specified here.

 

 

 
The “pin” property

-
  “pin”                      gchar *

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

@@ -787,7 +787,7 @@ device.

 

 

 
The “sim-id” property

-
  “sim-id”                   gchar *

+
  “sim-id”                   gchar *

 
The SIM card unique identifier (as given by the WWAN management service)
 which this connection applies to.  If given, the connection will apply
 to any device also allowed by “device-id” which contains a
@@ -799,7 +799,7 @@ SIM card matching the given identifier.

 

 

 
The “sim-operator-id” property

-
  “sim-operator-id”          gchar *

+
  “sim-operator-id”          gchar *

 
A MCC/MNC string like "310260" or "21601" identifying the specific
 mobile network operator which this connection applies to.  If given,
 the connection will apply to any device also allowed by
@@ -812,7 +812,7 @@ card provisioined by the given operator.

 

 

 
The “username” property

-
  “username”                 gchar *

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

diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html
index c5c10599..79eb39d2 100644
--- a/docs/libnm/html/NMSettingIP4Config.html
+++ b/docs/libnm/html/NMSettingIP4Config.html
@@ -77,13 +77,13 @@
 

+gchar *
 
+gchar *
 
@@ -135,7 +135,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingIPConfig
             ╰── NMSettingIP4Config
@@ -299,7 +299,7 @@ through that interface to the default network.

 
Property Details

 

 
The “dhcp-client-id” property

-
  “dhcp-client-id”           gchar *

+
  “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

@@ -308,8 +308,8 @@ DHCP server may use to customize the DHCP lease and options.

 

 

 
The “dhcp-fqdn” property

-
  “dhcp-fqdn”                gchar *

-
If the “dhcp-send-hostname” property is TRUE, then the
+
  “dhcp-fqdn”                gchar *

+
If the “dhcp-send-hostname” property is TRUE, then the
 specified FQDN will be sent to the DHCP server when acquiring a lease. This
 property and “dhcp-hostname” are mutually exclusive and
 cannot be set at the same time.

diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 4e26f893..8d733c14 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -78,7 +78,7 @@
 
 

-
+
@@ -147,10 +147,10 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingIP6ConfigAddrGenMode
     ╰── NMSettingIP6ConfigPrivacy
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIPConfig
             ╰── NMSettingIP6Config
@@ -406,7 +406,7 @@ specified by RFC7217.

 
Property Details

 

 
The “addr-gen-mode” property

-
  “addr-gen-mode”            gint

+
  “addr-gen-mode”            gint

 
Configure method for creating the address for use with RFC4862 IPv6
 Stateless Address Autoconfiguration. The permitted values are: "eui64",
 "stable-privacy" or unset.

diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index dcfaa740..cfa53456 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -76,7 +76,7 @@
 
 

+GPtrArray *
 
-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
+gchar *
 
-
+
-
+
-
+
+gchar *
 
-
+
-
+
+GPtrArray *
 
@@ -918,10 +918,10 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIPAddress
     ╰── NMIPRoute
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingIPConfig
             ├── NMSettingIP4Config
@@ -946,8 +946,8 @@ related to IP addressing, routing, and Domain Name Service.

 
NMIPAddress *
 nm_ip_address_new (int family,
                    const char *addr,
-                   guint prefix,
-                   GError **error);

+                   guint prefix,
+                   GError **error);

 
Creates a new NMIPAddress object.

 

 
Parameters

@@ -976,7 +976,7 @@ nm_ip_address_new (int fam
 
 

-
+
@@ -984,7 +984,7 @@ nm_ip_address_new (int fam
 
 

 
Returns

-
 the new NMIPAddress object, or NULL on error. 

+
 the new NMIPAddress object, or NULL on error. 

 
[transfer full]

 

 
@@ -993,9 +993,9 @@ nm_ip_address_new (int fam
 
nm_ip_address_new_binary ()

 
NMIPAddress *
 nm_ip_address_new_binary (int family,
-                          gconstpointer addr,
-                          guint prefix,
-                          GError **error);

+                          gconstpointer addr,
+                          guint prefix,
+                          GError **error);
 
Creates a new NMIPAddress object. addr
  must point to a buffer of the
 correct size for family
@@ -1027,7 +1027,7 @@ correct size for family
 
 

-
+
@@ -1035,7 +1035,7 @@ correct size for family
 
 

 
Returns

-
 the new NMIPAddress object, or NULL on error. 

+
 the new NMIPAddress object, or NULL on error. 

 
[transfer full]

 

 
@@ -1087,7 +1087,7 @@ reaches zero, the object will be destroyed.

 

 

 
nm_ip_address_equal ()

-
gboolean
+
gboolean
 nm_ip_address_equal (NMIPAddress *address,
                      NMIPAddress *other);

 
Determines if two NMIPAddress objects contain the same address and prefix
@@ -1117,7 +1117,7 @@ to.

 

 

 
Returns

-
 TRUE if the objects contain the same values, FALSE if they do not.

+
 TRUE if the objects contain the same values, FALSE if they do not.

 

 
 

@@ -1241,7 +1241,7 @@ have a valid address, use 
nm_ip_address_get_address_binary ()

 
void
 nm_ip_address_get_address_binary (NMIPAddress *address,
-                                  gpointer addr);

+                                  gpointer addr);
 
Gets the IP address property of this address object.

 
addr
  must point to a buffer that is the correct size for address
@@ -1275,7 +1275,7 @@ nm_ip_address_get_address_binary (
nm_ip_address_set_address_binary ()

 
void
 nm_ip_address_set_address_binary (NMIPAddress *address,
-                                  gconstpointer addr);

+                                  gconstpointer addr);
 
Sets the IP address property of this address object.

 
addr
  must point to a buffer that is the correct size for address
@@ -1307,7 +1307,7 @@ nm_ip_address_set_address_binary (
 

 
nm_ip_address_get_prefix ()

-
guint
+
guint
 nm_ip_address_get_prefix (NMIPAddress *address);

 
Gets the IP address prefix (ie "24" or "30" etc) property of this address
 object.

@@ -1336,7 +1336,7 @@ object.

 
nm_ip_address_set_prefix ()

 
void
 nm_ip_address_set_prefix (NMIPAddress *address,
-                          guint prefix);

+                          guint prefix);

 
Sets the IP address prefix property of this address object.

 

 
Parameters

@@ -1385,14 +1385,14 @@ nm_ip_address_get_attribute_names (
 

 
Returns

-
 a NULL-terminated array of attribute names,. 

+
 a NULL-terminated array of attribute names,. 

 
[transfer full]

 

 

 

 

 
nm_ip_address_get_attribute ()

-
GVariant *
+
GVariant *
 nm_ip_address_get_attribute (NMIPAddress *address,
                              const char *name);

 
Gets the value of the attribute with name name
@@ -1425,7 +1425,7 @@ nm_ip_address_get_attribute (name
 on
 address
-, or NULL if address
+, or NULL if address
 has no such attribute. 

 
[transfer none]

 

@@ -1436,7 +1436,7 @@ has no such attribute. 

 
void
 nm_ip_address_set_attribute (NMIPAddress *address,
                              const char *name,
-                             GVariant *value);

+                             GVariant *value);
 
Sets or clears the named attribute on address
  to the given value.

 

@@ -1473,10 +1473,10 @@ nm_ip_address_set_attribute (NMIPRoute *
 nm_ip_route_new (int family,
                  const char *dest,
-                 guint prefix,
+                 guint prefix,
                  const char *next_hop,
-                 gint64 metric,
-                 GError **error);
+                 gint64 metric,
+                 GError **error);
 
Creates a new NMIPRoute object.

 

 
Parameters

@@ -1505,7 +1505,7 @@ nm_ip_route_new (int famil
 
 

-
+
@@ -1515,7 +1515,7 @@ nm_ip_route_new (int famil
 
-
+
@@ -1523,7 +1523,7 @@ nm_ip_route_new (int famil
 
 

 
Returns

-
 the new NMIPRoute object, or NULL on error. 

+
 the new NMIPRoute object, or NULL on error. 

 
[transfer full]

 

 
@@ -1532,14 +1532,14 @@ nm_ip_route_new (int famil
 
nm_ip_route_new_binary ()

 
NMIPRoute *
 nm_ip_route_new_binary (int family,
-                        gconstpointer dest,
-                        guint prefix,
-                        gconstpointer next_hop,
-                        gint64 metric,
-                        GError **error);

+                        gconstpointer dest,
+                        guint prefix,
+                        gconstpointer next_hop,
+                        gint64 metric,
+                        GError **error);
 
Creates a new NMIPRoute object. dest
  and next_hop
- (if non-NULL) must
+ (if non-NULL) must
 point to buffers of the correct size for family
 .

 

@@ -1569,7 +1569,7 @@ point to buffers of the correct size for family
 

-
+
@@ -1579,7 +1579,7 @@ point to buffers of the correct size for family
 
-
+
@@ -1587,7 +1587,7 @@ point to buffers of the correct size for family
 

 
Returns

-
 the new NMIPRoute object, or NULL on error. 

+
 the new NMIPRoute object, or NULL on error. 

 
[transfer full]

 

 
@@ -1639,7 +1639,7 @@ reaches zero, the object will be destroyed.

 

 

 
nm_ip_route_equal ()

-
gboolean
+
gboolean
 nm_ip_route_equal (NMIPRoute *route,
                    NMIPRoute *other);

 
Determines if two NMIPRoute objects contain the same destination, prefix,
@@ -1669,7 +1669,7 @@ to.

 

 

 
Returns

-
 TRUE if the objects contain the same values, FALSE if they do not.

+
 TRUE if the objects contain the same values, FALSE if they do not.

 

 
 

@@ -1793,7 +1793,7 @@ have a valid address, use 
nm_ip_route_get_dest_binary ()

 
void
 nm_ip_route_get_dest_binary (NMIPRoute *route,
-                             gpointer dest);

+                             gpointer dest);
 
Gets the destination property of this route object.

 
dest
  must point to a buffer that is the correct size for route
@@ -1827,7 +1827,7 @@ nm_ip_route_get_dest_binary (
nm_ip_route_set_dest_binary ()

 
void
 nm_ip_route_set_dest_binary (NMIPRoute *route,
-                             gconstpointer dest);

+                             gconstpointer dest);
 
Sets the destination property of this route object.

 
dest
  must point to a buffer that is the correct size for route
@@ -1859,7 +1859,7 @@ nm_ip_route_set_dest_binary (
 
nm_ip_route_get_prefix ()

-
guint
+
guint
 nm_ip_route_get_prefix (NMIPRoute *route);

 
Gets the IP prefix (ie "24" or "30" etc) of this route.

 

@@ -1887,7 +1887,7 @@ nm_ip_route_get_prefix (
nm_ip_route_set_prefix ()

 
void
 nm_ip_route_set_prefix (NMIPRoute *route,
-                        guint prefix);

+                        guint prefix);

 
Sets the prefix property of this route object.

 

 
Parameters

@@ -1917,7 +1917,7 @@ nm_ip_route_set_prefix (
nm_ip_route_get_next_hop ()

 
const char *
 nm_ip_route_get_next_hop (NMIPRoute *route);

-
Gets the IP address of the next hop of this route; this will be NULL if the
+
Gets the IP address of the next hop of this route; this will be NULL if the
 route has no next hop.

 

 
Parameters

@@ -1936,7 +1936,7 @@ route has no next hop.

 

 

 
Returns

-
 the IP address of the next hop, or NULL if this is a device route.

+
 the IP address of the next hop, or NULL if this is a device route.

 

 

 

@@ -1947,7 +1947,7 @@ nm_ip_route_set_next_hop (const char *next_hop);
 
Sets the next-hop property of this route object.

 
next_hop
- (if non-NULL) must be a valid address of route
+ (if non-NULL) must be a valid address of route
 's family. If you
 aren't sure you have a valid address, use nm_utils_ipaddr_valid() to check
 it.

@@ -1977,9 +1977,9 @@ it.

 

 

 
nm_ip_route_get_next_hop_binary ()

-
gboolean
+
gboolean
 nm_ip_route_get_next_hop_binary (NMIPRoute *route,
-                                 gpointer next_hop);

+                                 gpointer next_hop);

 
Gets the next hop property of this route object.

 
next_hop
  must point to a buffer that is the correct size for route
@@ -2009,8 +2009,8 @@ nm_ip_route_get_next_hop_binary (
 

 
Returns

-
 TRUE if route
-has a next hop, FALSE if not (in which case
+
 TRUE if route
+has a next hop, FALSE if not (in which case
 next_hop
 will be zeroed out)

 

@@ -2020,10 +2020,10 @@ will be zeroed out)

 
nm_ip_route_set_next_hop_binary ()

 
void
 nm_ip_route_set_next_hop_binary (NMIPRoute *route,
-                                 gconstpointer next_hop);

+                                 gconstpointer next_hop);
 
Sets the destination property of this route object.

 
next_hop
- (if non-NULL) must point to a buffer that is the correct size for
+ (if non-NULL) must point to a buffer that is the correct size for
 route
 's family.

 
[skip]

@@ -2053,7 +2053,7 @@ nm_ip_route_set_next_hop_binary (
 

 
nm_ip_route_get_metric ()

-
gint64
+
gint64
 nm_ip_route_get_metric (NMIPRoute *route);

 
Gets the route metric property of this route object; lower values
 indicate "better" or more preferred routes; -1 indicates "default"
@@ -2083,7 +2083,7 @@ indicate "better" or more preferred routes; -1 indicates "default"
 
nm_ip_route_set_metric ()

 
void
 nm_ip_route_set_metric (NMIPRoute *route,
-                        gint64 metric);

+                        gint64 metric);

 
Sets the metric property of this route object.

 

 
Parameters

@@ -2132,14 +2132,14 @@ nm_ip_route_get_attribute_names (
 

 
Returns

-
 a NULL-terminated array of attribute names. 

+
 a NULL-terminated array of attribute names. 

 
[transfer full]

 

 

 

 

 
nm_ip_route_get_attribute ()

-
GVariant *
+
GVariant *
 nm_ip_route_get_attribute (NMIPRoute *route,
                            const char *name);

 
Gets the value of the attribute with name name
@@ -2172,7 +2172,7 @@ nm_ip_route_get_attribute (name
 on
 route
-, or NULL if route
+, or NULL if route
 has no such attribute. 

 
[transfer none]

 

@@ -2183,7 +2183,7 @@ has no such attribute. 

 
void
 nm_ip_route_set_attribute (NMIPRoute *route,
                            const char *name,
-                           GVariant *value);

+                           GVariant *value);
 
Sets the named attribute on route
  to the given value.

 

@@ -2244,7 +2244,7 @@ methods available with each type.

 

 

 
nm_setting_ip_config_get_num_dns ()

-
guint
+
guint
 nm_setting_ip_config_get_num_dns (NMSettingIPConfig *setting);

 

 
Parameters

@@ -2303,7 +2303,7 @@ nm_setting_ip_config_get_dns (
 
nm_setting_ip_config_add_dns ()

-
gboolean
+
gboolean
 nm_setting_ip_config_add_dns (NMSettingIPConfig *setting,
                               const char *dns);

 
Adds a new DNS server to the setting.

@@ -2331,7 +2331,7 @@ nm_setting_ip_config_add_dns (
 
Returns

-
 TRUE if the DNS server was added; FALSE if the server was already
+
 TRUE if the DNS server was added; FALSE if the server was already
 known

 

 

@@ -2369,7 +2369,7 @@ nm_setting_ip_config_remove_dns (
 

 
nm_setting_ip_config_remove_dns_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip_config_remove_dns_by_value
                                (NMSettingIPConfig *setting,
                                 const char *dns);

@@ -2399,7 +2399,7 @@ nm_setting_ip_config_remove_dns_by_value
 

 

 
Returns

-
 TRUE if the DNS server was found and removed; FALSE if it was not.

+
 TRUE if the DNS server was found and removed; FALSE if it was not.

 

 

 

@@ -2427,7 +2427,7 @@ nm_setting_ip_config_clear_dns (
 

 
nm_setting_ip_config_get_num_dns_searches ()

-
guint
+
guint
 nm_setting_ip_config_get_num_dns_searches
                                (NMSettingIPConfig *setting);

 

@@ -2487,7 +2487,7 @@ nm_setting_ip_config_get_dns_search (
 

 
nm_setting_ip_config_add_dns_search ()

-
gboolean
+
gboolean
 nm_setting_ip_config_add_dns_search (NMSettingIPConfig *setting,
                                      const char *dns_search);

 
Adds a new DNS search domain to the setting.

@@ -2515,7 +2515,7 @@ nm_setting_ip_config_add_dns_search (
 

 
Returns

-
 TRUE if the DNS search domain was added; FALSE if the search
+
 TRUE if the DNS search domain was added; FALSE if the search
 domain was already known

 

 

@@ -2554,7 +2554,7 @@ nm_setting_ip_config_remove_dns_search
 

 

 
nm_setting_ip_config_remove_dns_search_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip_config_remove_dns_search_by_value
                                (NMSettingIPConfig *setting,
                                 const char *dns_search);

@@ -2584,7 +2584,7 @@ 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.

+
 TRUE if the DNS search domain was found and removed; FALSE if it was not.

 
Since 0.9.10

 

 

@@ -2614,7 +2614,7 @@ nm_setting_ip_config_clear_dns_searches
 

 

 
nm_setting_ip_config_get_num_dns_options ()

-
guint
+
guint
 nm_setting_ip_config_get_num_dns_options
                                (NMSettingIPConfig *setting);

 

@@ -2641,7 +2641,7 @@ nm_setting_ip_config_get_num_dns_options
 

 

 
nm_setting_ip_config_has_dns_options ()

-
gboolean
+
gboolean
 nm_setting_ip_config_has_dns_options (NMSettingIPConfig *setting);

 
NMSettingIPConfig can have a list of dns-options. If the list
 is empty, there are two similar (but differentiated) states.
@@ -2673,7 +2673,7 @@ a default configuration, while the former explicitly means "no-options".

 
nm_setting_ip_config_get_dns_option ()

 
const char *
 nm_setting_ip_config_get_dns_option (NMSettingIPConfig *setting,
-                                     guint idx);

+                                     guint idx);

 

 
Parameters

 

 
-gboolean
+gboolean
 
 
 nm_setting_gsm_get_home_only ()
@@ -150,36 +150,36 @@
 

 

 
-gchar *apn
 Read / Write
 

 

 
-gchar *device-id
 Read / Write
 

 
gbooleangboolean
 home-only
 Read / Write
 

 

 
-gchar *network-id
 Read / Write
 

 

 
-gchar *number
 Read / Write
 

 

 
-gchar *password
 Read / Write
 

 
-gchar *pin
 Read / Write
 

 
-gchar *sim-id
 Read / Write
 

 

 
-gchar *sim-operator-id
 Read / Write
 

 

 
-gchar *username
 Read / Write
 

 

 
-gchar *dhcp-client-id
 Read / Write
 

 

 
-gchar *dhcp-fqdn
 Read / Write
 

 
gintgint
 addr-gen-mode
 Read / Write / Construct
 

 
-gboolean
+gboolean
 
 
 nm_ip_address_equal ()
@@ -131,7 +131,7 @@
 

 

 
-guint
+guint
 
 
 nm_ip_address_get_prefix ()
@@ -155,7 +155,7 @@
 

 

 
-GVariant *
+GVariant *
 
 
 nm_ip_address_get_attribute ()
@@ -203,7 +203,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_ip_route_equal ()
@@ -258,7 +258,7 @@
 

 

 
-guint
+guint
 
 
 nm_ip_route_get_prefix ()
@@ -289,7 +289,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_ip_route_get_next_hop_binary ()
@@ -305,7 +305,7 @@
 

 

 
-gint64
+gint64
 
 
 nm_ip_route_get_metric ()
@@ -329,7 +329,7 @@
 

 

 
-GVariant *
+GVariant *
 
 
 nm_ip_route_get_attribute ()
@@ -352,7 +352,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_dns ()
@@ -367,7 +367,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_dns ()
@@ -383,7 +383,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_dns_by_value ()
@@ -399,7 +399,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_dns_searches ()
@@ -414,7 +414,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_dns_search ()
@@ -430,7 +430,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_dns_search_by_value ()
@@ -446,7 +446,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_dns_options ()
@@ -454,7 +454,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_has_dns_options ()
@@ -469,7 +469,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_ip_config_next_valid_dns_option ()
@@ -477,7 +477,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_dns_option ()
@@ -493,7 +493,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_dns_option_by_value ()
@@ -509,7 +509,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_addresses ()
@@ -525,7 +525,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_address ()
@@ -541,7 +541,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_address_by_value ()
@@ -564,7 +564,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_config_get_num_routes ()
@@ -580,7 +580,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_add_route ()
@@ -596,7 +596,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_remove_route_by_value ()
@@ -612,7 +612,7 @@
 

 

 
-gint64
+gint64
 
 
 nm_setting_ip_config_get_route_metric ()
@@ -620,7 +620,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_ignore_auto_routes ()
@@ -628,7 +628,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_ignore_auto_dns ()
@@ -643,7 +643,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_dhcp_send_hostname ()
@@ -651,7 +651,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_never_default ()
@@ -659,7 +659,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_config_get_may_fail ()
@@ -667,7 +667,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_ip_config_get_dad_timeout ()
@@ -675,7 +675,7 @@
 

 

 
-gint
+gint
 
 
 nm_setting_ip_config_get_dhcp_timeout ()
@@ -695,86 +695,86 @@
 

 

 
-GPtrArray *addresses
 Read / Write
 

 
gintgint
 dad-timeout
 Read / Write / Construct
 

 

 
-gchar *dhcp-hostname
 Read / Write
 

 
gbooleangboolean
 dhcp-send-hostname
 Read / Write / Construct
 

 
gintgint
 dhcp-timeout
 Read / Write
 

 
GStrvGStrv
 dns
 Read / Write
 

 
GStrvGStrv
 dns-options
 Read / Write
 

 
GStrvGStrv
 dns-search
 Read / Write
 

 

 
-gchar *gateway
 Read / Write
 

 
gbooleangboolean
 ignore-auto-dns
 Read / Write / Construct
 

 
gbooleangboolean
 ignore-auto-routes
 Read / Write / Construct
 

 
gbooleangboolean
 may-fail
 Read / Write / Construct
 

 

 
-gchar *method
 Read / Write
 

 
gbooleangboolean
 never-default
 Read / Write / Construct
 

 
gint64gint64
 route-metric
 Read / Write / Construct
 

 

 
-GPtrArray *routes
 Read / Write
 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
next_hop
 the IP address of the next hop (or NULL). 
 the IP address of the next hop (or NULL). 

 [allow-none]
 

 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

 
next_hop
 the IP address of the next hop (or NULL). 
 the IP address of the next hop (or NULL). 

 [allow-none]
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 

@@ -2706,10 +2706,10 @@ nm_setting_ip_config_get_dns_option (
 

 
nm_setting_ip_config_next_valid_dns_option ()

-
gint
+
gint
 nm_setting_ip_config_next_valid_dns_option
                                (NMSettingIPConfig *setting,
-                                guint idx);

+                                guint idx);

 

 
Parameters

 

@@ -2743,7 +2743,7 @@ DNS option, or -1 if no valid option is found

 

 

 
nm_setting_ip_config_add_dns_option ()

-
gboolean
+
gboolean
 nm_setting_ip_config_add_dns_option (NMSettingIPConfig *setting,
                                      const char *dns_option);

 
Adds a new DNS option to the setting.

@@ -2771,7 +2771,7 @@ nm_setting_ip_config_add_dns_option (
 

 
Returns

-
 TRUE if the DNS option was added; FALSE otherwise

+
 TRUE if the DNS option was added; FALSE otherwise

 

 
Since: 1.2

 

@@ -2811,7 +2811,7 @@ nm_setting_ip_config_remove_dns_option
 

 

 
nm_setting_ip_config_remove_dns_option_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip_config_remove_dns_option_by_value
                                (NMSettingIPConfig *setting,
                                 const char *dns_option);

@@ -2841,7 +2841,7 @@ nm_setting_ip_config_remove_dns_option_by_value
 

 

 
Returns

-
 TRUE if the DNS option was found and removed; FALSE if it was not.

+
 TRUE if the DNS option was found and removed; FALSE if it was not.

 

 
Since: 1.2

 
@@ -2851,7 +2851,7 @@ nm_setting_ip_config_remove_dns_option_by_value
 
void
 nm_setting_ip_config_clear_dns_options
                                (NMSettingIPConfig *setting,
-                                gboolean is_set);

+                                gboolean is_set);
 
Removes all configured DNS options.

 

 
Parameters

@@ -2881,7 +2881,7 @@ Specify how to clear the options.

 

 

 
nm_setting_ip_config_get_num_addresses ()

-
guint
+
guint
 nm_setting_ip_config_get_num_addresses
                                (NMSettingIPConfig *setting);

 

@@ -2942,7 +2942,7 @@ nm_setting_ip_config_get_address (
 

 
nm_setting_ip_config_add_address ()

-
gboolean
+
gboolean
 nm_setting_ip_config_add_address (NMSettingIPConfig *setting,
                                   NMIPAddress *address);

 
Adds a new IP address and associated information to the setting.  The
@@ -2971,7 +2971,7 @@ 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
+
 TRUE if the address was added; FALSE if the address was already
 known.

 

 

@@ -3009,7 +3009,7 @@ nm_setting_ip_config_remove_address (
 

 
nm_setting_ip_config_remove_address_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip_config_remove_address_by_value
                                (NMSettingIPConfig *setting,
                                 NMIPAddress *address);

@@ -3039,7 +3039,7 @@ nm_setting_ip_config_remove_address_by_value
 

 

 
Returns

-
 TRUE if the address was found and removed; FALSE if it was not.

+
 TRUE if the address was found and removed; FALSE if it was not.

 

 

 

@@ -3087,13 +3087,13 @@ nm_setting_ip_config_get_gateway (
 
Returns

 
 the IP address of the gateway associated with this configuration, or
-NULL.

+NULL.

 

 
 

 

 
nm_setting_ip_config_get_num_routes ()

-
guint
+
guint
 nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting);

 

 
Parameters

@@ -3153,7 +3153,7 @@ nm_setting_ip_config_get_route (
 

 
nm_setting_ip_config_add_route ()

-
gboolean
+
gboolean
 nm_setting_ip_config_add_route (NMSettingIPConfig *setting,
                                 NMIPRoute *route);

 
Adds a new route and associated information to the setting.  The
@@ -3182,7 +3182,7 @@ 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.

+
 TRUE if the route was added; FALSE if the route was already known.

 

 

 

@@ -3219,7 +3219,7 @@ nm_setting_ip_config_remove_route (
 

 
nm_setting_ip_config_remove_route_by_value ()

-
gboolean
+
gboolean
 nm_setting_ip_config_remove_route_by_value
                                (NMSettingIPConfig *setting,
                                 NMIPRoute *route);

@@ -3249,7 +3249,7 @@ nm_setting_ip_config_remove_route_by_value
 

 

 
Returns

-
 TRUE if the route was found and removed; FALSE if it was not.

+
 TRUE if the route was found and removed; FALSE if it was not.

 

 

 

@@ -3277,7 +3277,7 @@ nm_setting_ip_config_clear_routes (
 

 
nm_setting_ip_config_get_route_metric ()

-
gint64
+
gint64
 nm_setting_ip_config_get_route_metric (NMSettingIPConfig *setting);

 
Returns the value contained in the “route-metric”
 property.

@@ -3305,7 +3305,7 @@ specify a metric. See 
 
nm_setting_ip_config_get_ignore_auto_routes ()

-
gboolean
+
gboolean
 nm_setting_ip_config_get_ignore_auto_routes
                                (NMSettingIPConfig *setting);

 
Returns the value contained in the “ignore-auto-routes”
@@ -3327,14 +3327,14 @@ property.

 

 

 
Returns

-
 TRUE if automatically configured (ie via DHCP) routes should be
+
 TRUE if automatically configured (ie via DHCP) routes should be
 ignored.

 

 
 

 

 
nm_setting_ip_config_get_ignore_auto_dns ()

-
gboolean
+
gboolean
 nm_setting_ip_config_get_ignore_auto_dns
                                (NMSettingIPConfig *setting);

 
Returns the value contained in the “ignore-auto-dns”
@@ -3356,7 +3356,7 @@ property.

 

 

 
Returns

-
 TRUE if automatically configured (ie via DHCP) DNS information
+
 TRUE if automatically configured (ie via DHCP) DNS information
 should be ignored.

 

 
@@ -3391,7 +3391,7 @@ property.

 

 

 
nm_setting_ip_config_get_dhcp_send_hostname ()

-
gboolean
+
gboolean
 nm_setting_ip_config_get_dhcp_send_hostname
                                (NMSettingIPConfig *setting);

 
Returns the value contained in the “dhcp-send-hostname”
@@ -3413,7 +3413,7 @@ property.

 

 

 
Returns

-
 TRUE if NetworkManager should send the machine hostname to the
+
 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.

 

@@ -3421,7 +3421,7 @@ update DNS information for this machine.

 

 

 
nm_setting_ip_config_get_never_default ()

-
gboolean
+
gboolean
 nm_setting_ip_config_get_never_default
                                (NMSettingIPConfig *setting);

 
Returns the value contained in the “never-default”
@@ -3443,14 +3443,14 @@ property.

 

 

 
Returns

-
 TRUE if this connection should never be the default
+
 TRUE if this connection should never be the default
 connection

 

 
 

 

 
nm_setting_ip_config_get_may_fail ()

-
gboolean
+
gboolean
 nm_setting_ip_config_get_may_fail (NMSettingIPConfig *setting);

 
Returns the value contained in the “may-fail”
 property.

@@ -3471,14 +3471,14 @@ property.

 

 

 
Returns

-
 TRUE if this connection doesn't require this type of IP
+
 TRUE if this connection doesn't require this type of IP
 addressing to complete for the connection to succeed.

 

 
 

 

 
nm_setting_ip_config_get_dad_timeout ()

-
gint
+
gint
 nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting);

 

 
Parameters

@@ -3504,7 +3504,7 @@ nm_setting_ip_config_get_dad_timeout (
 
nm_setting_ip_config_get_dhcp_timeout ()

-
gint
+
gint
 nm_setting_ip_config_get_dhcp_timeout (NMSettingIPConfig *setting);

 
Returns the value contained in the “dhcp-timeout”
 property.

@@ -3723,7 +3723,7 @@ the particular kind of device.

 
Property Details

 

 
The “addresses” property

-
  “addresses”                GPtrArray *

+
  “addresses”                GPtrArray *

 
Array of IP addresses.

 
Element-Type: NMIPAddress

 
Flags: Read / Write

@@ -3731,7 +3731,7 @@ the particular kind of device.

 

 

 
The “dad-timeout” property

-
  “dad-timeout”              gint

+
  “dad-timeout”              gint

 
Timeout in milliseconds used to check for the presence of duplicate IP
 addresses on the network.  If an address conflict is detected, the
 activation will fail.  A zero value means that no duplicate address
@@ -3746,8 +3746,8 @@ timeout in milliseconds.

 

 

 
The “dhcp-hostname” property

-
  “dhcp-hostname”            gchar *

-
If the “dhcp-send-hostname” property is TRUE, then the
+
  “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.
 This property and “dhcp-fqdn” are mutually exclusive and
 cannot be set at the same time.

@@ -3757,19 +3757,19 @@ cannot be set at the same time.

 

 

 
The “dhcp-send-hostname” property

-
  “dhcp-send-hostname”       gboolean

-
If TRUE, a hostname is sent to the DHCP server when acquiring a lease.
+
  “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.

+“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

 

 

 

 
The “dhcp-timeout” property

-
  “dhcp-timeout”             gint

+
  “dhcp-timeout”             gint

 
A timeout for a DHCP transaction in seconds.

 
Flags: Read / Write

 
Allowed values: >= 0

@@ -3778,16 +3778,16 @@ providing a static hostname for the computer.  If the
 

 

 
The “dns” property

-
  “dns”                      GStrv

+
  “dns”                      GStrv

 
Array of IP addresses of DNS servers.

 
Flags: Read / Write

 

 

 

 
The “dns-options” property

-
  “dns-options”              GStrv

+
  “dns-options”              GStrv

 
Array of DNS options.

-
NULL means that the options are unset and left at the default.
+
NULL means that the options are unset and left at the default.
 In this case NetworkManager will use default options. This is
 distinct from an empty list of properties.

 
Flags: Read / Write

@@ -3796,14 +3796,14 @@ distinct from an empty list of properties.

 

 

 
The “dns-search” property

-
  “dns-search”               GStrv

+
  “dns-search”               GStrv

 
Array of DNS search domains.

 
Flags: Read / Write

 

 

 

 
The “gateway” property

-
  “gateway”                  gchar *

+
  “gateway”                  gchar *

 
The gateway associated with this configuration. This is only meaningful
 if “addresses” is also set.

 
Flags: Read / Write

@@ -3812,9 +3812,9 @@ if 
 

 
The “ignore-auto-dns” property

-
  “ignore-auto-dns”          gboolean

+
  “ignore-auto-dns”          gboolean

 
When “method” is set to "auto" and this property to
-TRUE, automatically configured nameservers and search domains are
+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.

@@ -3824,9 +3824,9 @@ any, are used.

 

 

 
The “ignore-auto-routes” property

-
  “ignore-auto-routes”       gboolean

+
  “ignore-auto-routes”       gboolean

 
When “method” is set to "auto" and this property to
-TRUE, automatically configured routes are ignored and only routes
+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

@@ -3834,12 +3834,12 @@ specified in the 
 
The “may-fail” property

-
  “may-fail”                 gboolean

-
If TRUE, allow overall network configuration to proceed even if the
+
  “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
+TRUE on the NMSettingIP4Config allows the overall network configuration
 to succeed if IPv4 configuration fails but IPv6 configuration completes
 successfully.

 
Flags: Read / Write / Construct

@@ -3848,7 +3848,7 @@ successfully.

 

 

 
The “method” property

-
  “method”                   gchar *

+
  “method”                   gchar *

 
IP configuration method.

 
NMSettingIP4Config and NMSettingIP6Config both support "auto",
 "manual", and "link-local". See the subclass-specific documentation for
@@ -3860,14 +3860,16 @@ configuration.  The “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.

+
For IPv4 method "shared", the IP subnet can be configured by adding one
+manual IPv4 address or otherwise 10.42.x.0/24 is chosen.

 
Flags: Read / Write

 
Default value: NULL

 

 

 

 
The “never-default” property

-
  “never-default”            gboolean

-
If TRUE, this connection will never be the default connection for this
+
  “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

@@ -3876,7 +3878,7 @@ NetworkManager.

 

 

 
The “route-metric” property

-
  “route-metric”             gint64

+
  “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.
@@ -3894,7 +3896,7 @@ For IPv4, zero is a regular value for the metric.

 

 

 
The “routes” property

-
  “routes”                   GPtrArray *

+
  “routes”                   GPtrArray *

 
Array of IP routes.

 
Element-Type: NMIPRoute

 
Flags: Read / Write

diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html
index 84bd6fe0..795afe74 100644
--- a/docs/libnm/html/NMSettingIPTunnel.html
+++ b/docs/libnm/html/NMSettingIPTunnel.html
@@ -80,7 +80,7 @@
 
 

-
+
-
+
+gchar *
 
+gchar *
 
-
+
-
+
+gchar *
 
+gchar *
 
-
+
+gchar *
 
-
+
-
+
@@ -285,7 +285,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingIPTunnel
 

@@ -418,7 +418,7 @@ nm_setting_ip_tunnel_get_remote (
 

 
nm_setting_ip_tunnel_get_ttl ()

-
guint
+
guint
 nm_setting_ip_tunnel_get_ttl (NMSettingIPTunnel *setting);

 
Returns the “ttl” property of the setting.

 

@@ -445,7 +445,7 @@ nm_setting_ip_tunnel_get_ttl (
 
nm_setting_ip_tunnel_get_tos ()

-
guint
+
guint
 nm_setting_ip_tunnel_get_tos (NMSettingIPTunnel *setting);

 
Returns the “tos” property of the setting.

 

@@ -472,7 +472,7 @@ nm_setting_ip_tunnel_get_tos (
 
nm_setting_ip_tunnel_get_path_mtu_discovery ()

-
gboolean
+
gboolean
 nm_setting_ip_tunnel_get_path_mtu_discovery
                                (NMSettingIPTunnel *setting);

 
Returns the “path-mtu-discovery” property of the setting.

@@ -554,7 +554,7 @@ nm_setting_ip_tunnel_get_output_key (
 

 
nm_setting_ip_tunnel_get_encapsulation_limit ()

-
guint
+
guint
 nm_setting_ip_tunnel_get_encapsulation_limit
                                (NMSettingIPTunnel *setting);

 
Returns the “encapsulation-limit” property of the setting.

@@ -582,7 +582,7 @@ nm_setting_ip_tunnel_get_encapsulation_limit
 

 

 
nm_setting_ip_tunnel_get_flow_label ()

-
guint
+
guint
 nm_setting_ip_tunnel_get_flow_label (NMSettingIPTunnel *setting);

 
Returns the “flow-label” property of the setting.

 

@@ -609,7 +609,7 @@ nm_setting_ip_tunnel_get_flow_label (
 

 
nm_setting_ip_tunnel_get_mtu ()

-
guint
+
guint
 nm_setting_ip_tunnel_get_mtu (NMSettingIPTunnel *setting);

 
Returns the “mtu” property of the setting.

 

@@ -718,7 +718,7 @@ nm_setting_ip_tunnel_get_mtu (
Property Details

 

 
The “encapsulation-limit” property

-
  “encapsulation-limit”      guint

+
  “encapsulation-limit”      guint

 
How many additional levels of encapsulation are permitted to be prepended
 to packets. This property applies only to IPv6 tunnels.

 
Flags: Read / Write / Construct

@@ -729,7 +729,7 @@ to packets. This property applies only to IPv6 tunnels.

 

 

 
The “flow-label” property

-
  “flow-label”               guint

+
  “flow-label”               guint

 
The flow label to assign to tunnel packets. This property applies only to
 IPv6 tunnels.

 
Flags: Read / Write / Construct

@@ -740,7 +740,7 @@ IPv6 tunnels.

 

 

 
The “input-key” property

-
  “input-key”                gchar *

+
  “input-key”                gchar *

 
The key used for tunnel input packets; the property is valid only for
 certain tunnel modes (GRE, IP6GRE). If empty, no key is used.

 
Flags: Read / Write

@@ -750,7 +750,7 @@ certain tunnel modes (GRE, IP6GRE). If empty, no key is used.

 

 

 
The “local” property

-
  “local”                    gchar *

+
  “local”                    gchar *

 
The local endpoint of the tunnel; the value can be empty, otherwise it
 must contain an IPv4 or IPv6 address.

 
Flags: Read / Write

@@ -760,7 +760,7 @@ must contain an IPv4 or IPv6 address.

 

 

 
The “mode” property

-
  “mode”                     guint

+
  “mode”                     guint

 
The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP or
 NM_IP_TUNNEL_MODE_GRE.

 
Flags: Read / Write

@@ -770,14 +770,14 @@ must contain an IPv4 or IPv6 address.

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “mtu”                      guint

 
Flags: Read / Write / Construct

 
Default value: 0

 

 

 

 
The “output-key” property

-
  “output-key”               gchar *

+
  “output-key”               gchar *

 
The key used for tunnel output packets; the property is valid only for
 certain tunnel modes (GRE, IP6GRE). If empty, no key is used.

 
Flags: Read / Write

@@ -787,7 +787,7 @@ certain tunnel modes (GRE, IP6GRE). If empty, no key is used.

 

 

 
The “parent” property

-
  “parent”                   gchar *

+
  “parent”                   gchar *

 
If given, specifies the parent interface name or parent connection UUID
 the new device will be bound to so that tunneled packets will only be
 routed via that interface.

@@ -798,7 +798,7 @@ routed via that interface.

 

 

 
The “path-mtu-discovery” property

-
  “path-mtu-discovery”       gboolean

+
  “path-mtu-discovery”       gboolean

 
Whether to enable Path MTU Discovery on this tunnel.

 
Flags: Read / Write / Construct

 
Default value: TRUE

@@ -807,7 +807,7 @@ routed via that interface.

 

 

 
The “remote” property

-
  “remote”                   gchar *

+
  “remote”                   gchar *

 
The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6
 address.

 
Flags: Read / Write

@@ -817,7 +817,7 @@ address.

 

 

 
The “tos” property

-
  “tos”                      guint

+
  “tos”                      guint

 
The type of service (IPv4) or traffic class (IPv6) field to be set on
 tunneled packets.

 
Flags: Read / Write / Construct

@@ -828,7 +828,7 @@ tunneled packets.

 

 

 
The “ttl” property

-
  “ttl”                      guint

+
  “ttl”                      guint

 
The TTL to assign to tunneled packets. 0 is a special value meaning that
 packets inherit the TTL value.

 
Flags: Read / Write / Construct

diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html
index ee15ef18..985657f0 100644
--- a/docs/libnm/html/NMSettingInfiniband.html
+++ b/docs/libnm/html/NMSettingInfiniband.html
@@ -58,7 +58,7 @@
 
 

+gchar *
 
-
+
-
+
+gchar *
 
+gchar *
 
@@ -173,7 +173,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingInfiniband
 

@@ -224,7 +224,7 @@ nm_setting_infiniband_get_mac_address (
 
nm_setting_infiniband_get_mtu ()

-
guint32
+
guint32
 nm_setting_infiniband_get_mtu (NMSettingInfiniband *setting);

 

 
Parameters

@@ -336,7 +336,7 @@ nm_setting_infiniband_get_virtual_interface_name
                                (NMSettingInfiniband *setting);

 
Returns the interface name created by combining “parent”
 and “p-key”. (If either property is unset, this will
-return NULL.)

+return NULL.)

 

 
Parameters

 

 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_ttl ()
@@ -88,7 +88,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_tos ()
@@ -96,7 +96,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ip_tunnel_get_path_mtu_discovery ()
@@ -118,7 +118,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_encapsulation_limit ()
@@ -126,7 +126,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_flow_label ()
@@ -134,7 +134,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_ip_tunnel_get_mtu ()
@@ -153,67 +153,67 @@
 
 

 
guintguint
 encapsulation-limit
 Read / Write / Construct
 

 
guintguint
 flow-label
 Read / Write / Construct
 

 

 
-gchar *input-key
 Read / Write
 

 

 
-gchar *local
 Read / Write
 

 
guintguint
 mode
 Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 

 
-gchar *output-key
 Read / Write
 

 

 
-gchar *parent
 Read / Write
 

 
gbooleangboolean
 path-mtu-discovery
 Read / Write / Construct
 

 

 
-gchar *remote
 Read / Write
 

 
guintguint
 tos
 Read / Write / Construct
 

 
guintguint
 ttl
 Read / Write / Construct
 

 
-guint32
+guint32
 
 
 nm_setting_infiniband_get_mtu ()
@@ -107,29 +107,29 @@
 

 

 
-gchar *mac-address
 Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 
gintgint
 p-key
 Read / Write / Construct
 

 

 
-gchar *parent
 Read / Write / Construct
 

 

 
-gchar *transport-mode
 Read / Write / Construct
 

@@ -354,7 +354,7 @@ return 
 
Returns

-
 the interface name, or NULL

+
 the interface name, or NULL

 
 
 
@@ -400,7 +400,7 @@ return 
Property Details

 

 
The “mac-address” property

-
  “mac-address”              gchar *

+
  “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).

@@ -410,7 +410,7 @@ address of the device (i.e. MAC spoofing).

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “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

@@ -419,7 +419,7 @@ breaking larger packets up into multiple frames.

 

 

 
The “p-key” property

-
  “p-key”                    gint

+
  “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"
@@ -431,8 +431,8 @@ P_Key.

 

 

 
The “parent” property

-
  “parent”                   gchar *

-
The interface name of the parent device of this device. Normally NULL,
+
  “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”.

@@ -442,7 +442,7 @@ specify the base device by setting either this property or
 

 

 
The “transport-mode” property

-
  “transport-mode”           gchar *

+
  “transport-mode”           gchar *

 
The IP-over-InfiniBand transport mode. Either "datagram" or
 "connected".

 
Flags: Read / Write / Construct

diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html
index da936350..c96ffbb4 100644
--- a/docs/libnm/html/NMSettingMacvlan.html
+++ b/docs/libnm/html/NMSettingMacvlan.html
@@ -66,7 +66,7 @@
 
 

-
+
+gchar *
 
-
+
-
+
@@ -153,9 +153,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingMacvlanMode
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingMacvlan
 

@@ -234,7 +234,7 @@ nm_setting_macvlan_get_mode (
 
nm_setting_macvlan_get_promiscuous ()

-
gboolean
+
gboolean
 nm_setting_macvlan_get_promiscuous (NMSettingMacvlan *setting);

 

 
Parameters

@@ -260,7 +260,7 @@ nm_setting_macvlan_get_promiscuous (
 

 
nm_setting_macvlan_get_tap ()

-
gboolean
+
gboolean
 nm_setting_macvlan_get_tap (NMSettingMacvlan *setting);

 

 
Parameters

@@ -388,7 +388,7 @@ nm_setting_macvlan_get_tap (
Property Details

 

 
The “mode” property

-
  “mode”                     guint

+
  “mode”                     guint

 
The macvlan mode, which specifies the communication mechanism between multiple
 macvlans on the same lower device.

 
Flags: Read / Write / Construct

@@ -398,7 +398,7 @@ macvlans on the same lower device.

 

 

 
The “parent” property

-
  “parent”                   gchar *

+
  “parent”                   gchar *

 
If given, specifies the parent interface name or parent connection UUID
 from which this MAC-VLAN interface should be created.  If this property is
 not specified, the connection must contain an NMSettingWired setting
@@ -410,7 +410,7 @@ with a 
 

 
The “promiscuous” property

-
  “promiscuous”              gboolean

+
  “promiscuous”              gboolean

 
Whether the interface should be put in promiscuous mode.

 
Flags: Read / Write / Construct

 
Default value: TRUE

@@ -419,7 +419,7 @@ with a 
 

 
The “tap” property

-
  “tap”                      gboolean

+
  “tap”                      gboolean

 
Whether the interface should be a MACVTAP.

 
Flags: Read / Write / Construct

 
Default value: FALSE

diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html
index c930ede2..8b6e59fb 100644
--- a/docs/libnm/html/NMSettingOlpcMesh.html
+++ b/docs/libnm/html/NMSettingOlpcMesh.html
@@ -51,7 +51,7 @@
 
 

-
+
+gchar *
 
+GBytes *
 
@@ -133,7 +133,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingOlpcMesh
 

@@ -158,7 +158,7 @@ nm_setting_olpc_mesh_new (void
 

 
nm_setting_olpc_mesh_get_ssid ()

-
GBytes *
+
GBytes *
 nm_setting_olpc_mesh_get_ssid (NMSettingOlpcMesh *setting);

 

 
Parameters

@@ -184,7 +184,7 @@ nm_setting_olpc_mesh_get_ssid (
 

 
nm_setting_olpc_mesh_get_channel ()

-
guint32
+
guint32
 nm_setting_olpc_mesh_get_channel (NMSettingOlpcMesh *setting);

 

 

@@ -225,7 +225,7 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 
Property Details

 

 
The “channel” property

-
  “channel”                  guint

+
  “channel”                  guint

 
Channel on which the mesh network to join is located.

 
Flags: Read / Write / Construct

 
Default value: 0

@@ -233,7 +233,7 @@ nm_setting_olpc_mesh_get_dhcp_anycast_address
 

 

 
The “dhcp-anycast-address” property

-
  “dhcp-anycast-address”     gchar *

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

@@ -243,7 +243,7 @@ answers the request.

 

 

 
The “ssid” property

-
  “ssid”                     GBytes *

+
  “ssid”                     GBytes *

 
SSID of the mesh network to join.

 
Flags: Read / Write

 

diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html
index 6c9b58ac..a9eb83f6 100644
--- a/docs/libnm/html/NMSettingPpp.html
+++ b/docs/libnm/html/NMSettingPpp.html
@@ -52,7 +52,7 @@ that require PPP to deliver IP capability

 
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -388,7 +388,7 @@ that require PPP to deliver IP capability

 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingPpp
 

@@ -415,7 +415,7 @@ nm_setting_ppp_new (void
 

 
nm_setting_ppp_get_noauth ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_noauth (NMSettingPpp *setting);

 

 
Parameters

@@ -440,7 +440,7 @@ nm_setting_ppp_get_noauth (
 
nm_setting_ppp_get_refuse_eap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting);

 

 
Parameters

@@ -465,7 +465,7 @@ nm_setting_ppp_get_refuse_eap (
 

 
nm_setting_ppp_get_refuse_pap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting);

 

 
Parameters

@@ -490,7 +490,7 @@ nm_setting_ppp_get_refuse_pap (
 

 
nm_setting_ppp_get_refuse_chap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting);

 

 
Parameters

@@ -515,7 +515,7 @@ nm_setting_ppp_get_refuse_chap (
 

 
nm_setting_ppp_get_refuse_mschap ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting);

 

 
Parameters

@@ -540,7 +540,7 @@ nm_setting_ppp_get_refuse_mschap (
 

 
nm_setting_ppp_get_refuse_mschapv2 ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting);

 

 
Parameters

@@ -565,7 +565,7 @@ nm_setting_ppp_get_refuse_mschapv2 (
 

 
nm_setting_ppp_get_nobsdcomp ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting);

 

 
Parameters

@@ -590,7 +590,7 @@ nm_setting_ppp_get_nobsdcomp (
 
nm_setting_ppp_get_nodeflate ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_nodeflate (NMSettingPpp *setting);

 

 
Parameters

@@ -615,7 +615,7 @@ nm_setting_ppp_get_nodeflate (
 
nm_setting_ppp_get_no_vj_comp ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting);

 

 
Parameters

@@ -640,7 +640,7 @@ nm_setting_ppp_get_no_vj_comp (
 

 
nm_setting_ppp_get_require_mppe ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_require_mppe (NMSettingPpp *setting);

 

 
Parameters

@@ -665,7 +665,7 @@ nm_setting_ppp_get_require_mppe (
 

 
nm_setting_ppp_get_require_mppe_128 ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting);

 

 
Parameters

@@ -690,7 +690,7 @@ nm_setting_ppp_get_require_mppe_128 (
 

 
nm_setting_ppp_get_mppe_stateful ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting);

 

 
Parameters

@@ -715,7 +715,7 @@ nm_setting_ppp_get_mppe_stateful (
 

 
nm_setting_ppp_get_crtscts ()

-
gboolean
+
gboolean
 nm_setting_ppp_get_crtscts (NMSettingPpp *setting);

 

 
Parameters

@@ -740,7 +740,7 @@ nm_setting_ppp_get_crtscts (
 
nm_setting_ppp_get_baud ()

-
guint32
+
guint32
 nm_setting_ppp_get_baud (NMSettingPpp *setting);

 

 
Parameters

@@ -765,7 +765,7 @@ nm_setting_ppp_get_baud (
 
nm_setting_ppp_get_mru ()

-
guint32
+
guint32
 nm_setting_ppp_get_mru (NMSettingPpp *setting);

 

 
Parameters

@@ -790,7 +790,7 @@ nm_setting_ppp_get_mru (
 
nm_setting_ppp_get_mtu ()

-
guint32
+
guint32
 nm_setting_ppp_get_mtu (NMSettingPpp *setting);

 

 
Parameters

@@ -815,7 +815,7 @@ nm_setting_ppp_get_mtu (
 
nm_setting_ppp_get_lcp_echo_failure ()

-
guint32
+
guint32
 nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting);

 

 
Parameters

@@ -840,7 +840,7 @@ nm_setting_ppp_get_lcp_echo_failure (
 

 
nm_setting_ppp_get_lcp_echo_interval ()

-
guint32
+
guint32
 nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);

 

 
Parameters

@@ -983,7 +983,7 @@ nm_setting_ppp_get_lcp_echo_interval (
Property Details

 

 
The “baud” property

-
  “baud”                     guint

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

@@ -993,17 +993,17 @@ choose the speed.

 

 

 
The “crtscts” property

-
  “crtscts”                  gboolean

-
If TRUE, specify that pppd should set the serial port to use hardware
+
  “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.

+to FALSE.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “lcp-echo-failure” property

-
  “lcp-echo-failure”         guint

+
  “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
@@ -1014,7 +1014,7 @@ value if this property is used.

 

 

 
The “lcp-echo-interval” property

-
  “lcp-echo-interval”        guint

+
  “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
@@ -1025,8 +1025,8 @@ possible to autodetect this.

 

 

 
The “mppe-stateful” property

-
  “mppe-stateful”            gboolean

-
If TRUE, stateful MPPE is used.  See pppd documentation for more
+
  “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

@@ -1034,7 +1034,7 @@ information on stateful MPPE.

 

 

 
The “mru” property

-
  “mru”                      guint

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

@@ -1045,7 +1045,7 @@ larger than the specified size.  If non-zero, the MRU should be between
 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “mtu”                      guint

 
If non-zero, instruct pppd to send packets no larger than the specified
 size.

 
Flags: Read / Write / Construct

@@ -1054,82 +1054,82 @@ size.

 

 

 
The “no-vj-comp” property

-
  “no-vj-comp”               gboolean

-
If TRUE, Van Jacobsen TCP header compression will not be requested.

+
  “no-vj-comp”               gboolean

+
If TRUE, Van Jacobsen TCP header compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
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.

+
  “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

 

 

 

 
The “nobsdcomp” property

-
  “nobsdcomp”                gboolean

-
If TRUE, BSD compression will not be requested.

+
  “nobsdcomp”                gboolean

+
If TRUE, BSD compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “nodeflate” property

-
  “nodeflate”                gboolean

-
If TRUE, "deflate" compression will not be requested.

+
  “nodeflate”                gboolean

+
If TRUE, "deflate" compression will not be requested.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-chap” property

-
  “refuse-chap”              gboolean

-
If TRUE, the CHAP authentication method will not be used.

+
  “refuse-chap”              gboolean

+
If TRUE, the CHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-eap” property

-
  “refuse-eap”               gboolean

-
If TRUE, the EAP authentication method will not be used.

+
  “refuse-eap”               gboolean

+
If TRUE, the EAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-mschap” property

-
  “refuse-mschap”            gboolean

-
If TRUE, the MSCHAP authentication method will not be used.

+
  “refuse-mschap”            gboolean

+
If TRUE, the MSCHAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-mschapv2” property

-
  “refuse-mschapv2”          gboolean

-
If TRUE, the MSCHAPv2 authentication method will not be used.

+
  “refuse-mschapv2”          gboolean

+
If TRUE, the MSCHAPv2 authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “refuse-pap” property

-
  “refuse-pap”               gboolean

-
If TRUE, the PAP authentication method will not be used.

+
  “refuse-pap”               gboolean

+
If TRUE, the PAP authentication method will not be used.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

 

 

 
The “require-mppe” property

-
  “require-mppe”             gboolean

-
If TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
+
  “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.

@@ -1139,10 +1139,10 @@ connections.

 

 

 
The “require-mppe-128” property

-
  “require-mppe-128”         gboolean

-
If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
+
  “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.

+be set to TRUE.  If 128-bit MPPE is not available the session will fail.

 
Flags: Read / Write / Construct

 
Default value: FALSE

 

diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html
index d114a589..232cb5b4 100644
--- a/docs/libnm/html/NMSettingPppoe.html
+++ b/docs/libnm/html/NMSettingPppoe.html
@@ -92,7 +92,7 @@
 

+gchar *
 
@@ -103,13 +103,13 @@
 
 
+gchar *
 
+gchar *
 
@@ -149,7 +149,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingPppoe
 

@@ -310,7 +310,7 @@ nm_setting_pppoe_get_password_flags (
Property Details

 

 
The “password” property

-
  “password”                 gchar *

+
  “password”                 gchar *

 
Password used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

@@ -325,7 +325,7 @@ nm_setting_pppoe_get_password_flags (
 

 
The “service” property

-
  “service”                  gchar *

+
  “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
@@ -336,7 +336,7 @@ access concentrators or a specific service is known to be required.

 

 

 
The “username” property

-
  “username”                 gchar *

+
  “username”                 gchar *

 
Username used to authenticate with the PPPoE service.

 
Flags: Read / Write

 
Default value: NULL

diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index 48bddea7..41240d6b 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -52,7 +52,7 @@ serial communications

 
 

-
+
-
+
@@ -118,12 +118,12 @@ serial communications

 
-
+
-
+
@@ -171,9 +171,9 @@ serial communications

 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialParity
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingSerial
 

@@ -200,7 +200,7 @@ nm_setting_serial_new (void
 

 
nm_setting_serial_get_baud ()

-
guint
+
guint
 nm_setting_serial_get_baud (NMSettingSerial *setting);

 

 
Parameters

@@ -225,7 +225,7 @@ nm_setting_serial_get_baud (
 
nm_setting_serial_get_bits ()

-
guint
+
guint
 nm_setting_serial_get_bits (NMSettingSerial *setting);

 

 
Parameters

@@ -275,7 +275,7 @@ nm_setting_serial_get_parity (
 
nm_setting_serial_get_stopbits ()

-
guint
+
guint
 nm_setting_serial_get_stopbits (NMSettingSerial *setting);

 

 
Parameters

@@ -300,7 +300,7 @@ nm_setting_serial_get_stopbits (
 

 
nm_setting_serial_get_send_delay ()

-
guint64
+
guint64
 nm_setting_serial_get_send_delay (NMSettingSerial *setting);

 

 
Parameters

@@ -403,7 +403,7 @@ nm_setting_serial_get_send_delay (
Property Details

 

 
The “baud” property

-
  “baud”                     guint

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

@@ -413,7 +413,7 @@ ignore speed settings and use the highest available speed.

 

 

 
The “bits” property

-
  “bits”                     guint

+
  “bits”                     guint

 
Byte-width of the serial communication. The 8 in "8n1" for example.

 
Flags: Read / Write / Construct

 
Allowed values: [5,8]

@@ -430,7 +430,7 @@ ignore speed settings and use the highest available speed.

 

 

 
The “send-delay” property

-
  “send-delay”               guint64

+
  “send-delay”               guint64

 
Time to delay between each byte sent to the modem, in microseconds.

 
Flags: Read / Write / Construct

 
Default value: 0

@@ -438,7 +438,7 @@ ignore speed settings and use the highest available speed.

 

 

 
The “stopbits” property

-
  “stopbits”                 guint

+
  “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

diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index 9fc4ac4e..56fd8330 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -69,7 +69,7 @@
 
 

+gchar *
 
@@ -96,7 +96,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingTeam
 

@@ -163,7 +163,7 @@ nm_setting_team_get_config (
Property Details

 

 
The “config” property

-
  “config”                   gchar *

+
  “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
diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html
index 9e8c0c0e..77e59635 100644
--- a/docs/libnm/html/NMSettingTeamPort.html
+++ b/docs/libnm/html/NMSettingTeamPort.html
@@ -69,7 +69,7 @@
 
 

+gchar *
 
@@ -96,7 +96,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingTeamPort
 

@@ -163,7 +163,7 @@ nm_setting_team_port_get_config (
Property Details

 

 
The “config” property

-
  “config”                   gchar *

+
  “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
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index 46054e5e..b6be30d1 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -73,7 +73,7 @@
 
 

+gchar *
 
-
+
-
+
+gchar *
 
-
+
-
+
@@ -187,9 +187,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTunMode
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingTun
 

@@ -294,7 +294,7 @@ nm_setting_tun_get_group (
 
nm_setting_tun_get_pi ()

-
gboolean
+
gboolean
 nm_setting_tun_get_pi (NMSettingTun *setting);

 

 
Parameters

@@ -320,7 +320,7 @@ nm_setting_tun_get_pi (
 
nm_setting_tun_get_vnet_hdr ()

-
gboolean
+
gboolean
 nm_setting_tun_get_vnet_hdr (NMSettingTun *setting);

 

 
Parameters

@@ -346,7 +346,7 @@ nm_setting_tun_get_vnet_hdr (
 
nm_setting_tun_get_multi_queue ()

-
gboolean
+
gboolean
 nm_setting_tun_get_multi_queue (NMSettingTun *setting);

 

 
Parameters

@@ -456,8 +456,8 @@ nm_setting_tun_get_multi_queue (
Property Details

 

 
The “group” property

-
  “group”                    gchar *

-
The group ID which will own the device. If set to NULL everyone
+
  “group”                    gchar *

+
The group ID which will own the device. If set to NULL everyone
 will be able to use the device.

 
Flags: Read / Write

 
Default value: NULL

@@ -466,7 +466,7 @@ will be able to use the device.

 

 

 
The “mode” property

-
  “mode”                     guint

+
  “mode”                     guint

 
The operating mode of the virtual device. Allowed values are
 NM_SETTING_TUN_MODE_TUN to create a layer 3 device and
 NM_SETTING_TUN_MODE_TAP to create an Ethernet-like layer 2
@@ -478,8 +478,8 @@ one.

 

 

 
The “multi-queue” property

-
  “multi-queue”              gboolean

-
If the property is set to TRUE, the interface will support
+
  “multi-queue”              gboolean

+
If the property is set to TRUE, the interface will support
 multiple file descriptors (queues) to parallelize packet
 sending or receiving. Otherwise, the interface will only
 support a single queue.

@@ -490,8 +490,8 @@ support a single queue.

 

 

 
The “owner” property

-
  “owner”                    gchar *

-
The user ID which will own the device. If set to NULL everyone
+
  “owner”                    gchar *

+
The user ID which will own the device. If set to NULL everyone
 will be able to use the device.

 
Flags: Read / Write

 
Default value: NULL

@@ -500,8 +500,8 @@ will be able to use the device.

 

 

 
The “pi” property

-
  “pi”                       gboolean

-
If TRUE the interface will prepend a 4 byte header describing the
+
  “pi”                       gboolean

+
If TRUE the interface will prepend a 4 byte header describing the
 physical interface to the packets.

 
Flags: Read / Write

 
Default value: FALSE

@@ -510,8 +510,8 @@ physical interface to the packets.

 

 

 
The “vnet-hdr” property

-
  “vnet-hdr”                 gboolean

-
If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
+
  “vnet-hdr”                 gboolean

+
If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio
 network header.

 
Flags: Read / Write

 
Default value: FALSE

diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index e49a1e50..ed4cd4f7 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -62,7 +62,7 @@
 
 

-
+
@@ -163,18 +163,18 @@
 
-
+
-
+
+gchar *
 
@@ -226,11 +226,11 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMVlanPriorityMap
-    GFlags
+    GFlags
     ╰── NMVlanFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVlan
 

@@ -286,7 +286,7 @@ nm_setting_vlan_get_parent (
 
nm_setting_vlan_get_id ()

-
guint32
+
guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);

 

 
Parameters

@@ -311,7 +311,7 @@ nm_setting_vlan_get_id (
 
nm_setting_vlan_get_flags ()

-
guint32
+
guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);

 

 
Parameters

@@ -336,7 +336,7 @@ nm_setting_vlan_get_flags (
 
nm_setting_vlan_get_num_priorities ()

-
gint32
+
gint32
 nm_setting_vlan_get_num_priorities (NMSettingVlan *setting,
                                     NMVlanPriorityMap map);

 
Returns the number of entires in the
@@ -372,12 +372,12 @@ properties of this setting.

 

 

 
nm_setting_vlan_get_priority ()

-
gboolean
+
gboolean
 nm_setting_vlan_get_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 idx,
-                              guint32 *out_from,
-                              guint32 *out_to);

+                              guint32 idx,
+                              guint32 *out_from,
+                              guint32 *out_to);

 
Retrieve one of the entries of the “ingress_priority_map”
 or “egress_priority_map” properties of this setting.

 

@@ -419,17 +419,17 @@ or 
 

 
Returns

-
 TRUE if a priority map was returned, FALSE if error

+
 TRUE if a priority map was returned, FALSE if error

 

 

 

 

 
nm_setting_vlan_add_priority ()

-
gboolean
+
gboolean
 nm_setting_vlan_add_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 from,
-                              guint32 to);

+                              guint32 from,
+                              guint32 to);

 
Adds a priority mapping to the “ingress_priority_map” or
 “egress_priority_map” properties of the setting. If from
  is
@@ -482,8 +482,8 @@ to

 

 

 
Returns

-
 TRUE if the new priority mapping was successfully added to the
-list, FALSE if error

+
 TRUE if the new priority mapping was successfully added to the
+list, FALSE if error

 

 

 

@@ -492,7 +492,7 @@ list, void
 nm_setting_vlan_remove_priority (NMSettingVlan *setting,
                                  NMVlanPriorityMap map,
-                                 guint32 idx);

+                                 guint32 idx);

 
Removes the priority map at index idx
  from the
 “ingress_priority_map” or “egress_priority_map”
@@ -528,12 +528,12 @@ properties.

 

 

 
nm_setting_vlan_remove_priority_by_value ()

-
gboolean
+
gboolean
 nm_setting_vlan_remove_priority_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
-                                guint32 from,
-                                guint32 to);

+                                guint32 from,
+                                guint32 to);

 
Removes the priority map form
 :to
  from the “ingress_priority_map”
@@ -576,13 +576,13 @@ to

 

 

 
Returns

-
 TRUE if the priority mapping was found and removed; FALSE if it was not.

+
 TRUE if the priority mapping was found and removed; FALSE if it was not.

 

 

 

 

 
nm_setting_vlan_remove_priority_str_by_value ()

-
gboolean
+
gboolean
 nm_setting_vlan_remove_priority_str_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
@@ -621,7 +621,7 @@ properties.

 

 

 
Returns

-
 TRUE if the priority mapping was found and removed; FALSE if it was not.

+
 TRUE if the priority mapping was found and removed; FALSE if it was not.

 

 

 

@@ -658,7 +658,7 @@ nm_setting_vlan_clear_priorities (
 

 
nm_setting_vlan_add_priority_str ()

-
gboolean
+
gboolean
 nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
                                   NMVlanPriorityMap map,
                                   const char *str);

@@ -694,8 +694,8 @@ 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

+
 TRUE if the entry was successfully added to the list, or it
+overwrote the old value, FALSE if error

 

 
 
@@ -823,7 +823,7 @@ to 802.1p priorities used in VLANs.

 
Property Details

 

 
The “egress-priority-map” property

-
  “egress-priority-map”      GStrv

+
  “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".

@@ -849,7 +849,7 @@ is still considered as 0.

 

 

 
The “id” property

-
  “id”                       guint

+
  “id”                       guint

 
The VLAN identifier that the interface created by this connection should
 be assigned. The valid range is from 0 to 4094, without the reserved id 4095.

 
Flags: Read / Write / Construct

@@ -859,7 +859,7 @@ be assigned. The valid range is from 0 to 4094, without the reserved id 4095.

 

 
The “ingress-priority-map” property

-
  “ingress-priority-map”     GStrv

+
  “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".

@@ -868,7 +868,7 @@ SKB priorities.  The mapping is given in the format "from:to" where both
 

 

 
The “parent” property

-
  “parent”                   gchar *

+
  “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
diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html
index 64cf31cb..a3413677 100644
--- a/docs/libnm/html/NMSettingVpn.html
+++ b/docs/libnm/html/NMSettingVpn.html
@@ -73,7 +73,7 @@
 
 

+GHashTable *
 
-
+
+GHashTable *
 
+gchar *
 
-
+
+gchar *
 
@@ -255,7 +255,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingVpn
 

@@ -277,7 +277,7 @@ properties.

 
void
 (*NMVpnIterFunc) (const char *key,
                   const char *value,
-                  gpointer user_data);

+                  gpointer user_data);

 

 
Parameters

 

 
-gboolean
+gboolean
 
 
 nm_setting_macvlan_get_promiscuous ()
@@ -74,7 +74,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_macvlan_get_tap ()
@@ -93,23 +93,23 @@
 
 

 
guintguint
 mode
 Read / Write / Construct
 

 

 
-gchar *parent
 Read / Write / Construct
 

 
gbooleangboolean
 promiscuous
 Read / Write / Construct
 

 
gbooleangboolean
 tap
 Read / Write / Construct
 

 
-GBytes *
+GBytes *
 
 
 nm_setting_olpc_mesh_get_ssid ()
@@ -59,7 +59,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_olpc_mesh_get_channel ()
@@ -85,19 +85,19 @@
 
 

 
guintguint
 channel
 Read / Write / Construct
 

 

 
-gchar *dhcp-anycast-address
 Read / Write
 

 

 
-GBytes *ssid
 Read / Write
 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_noauth ()
@@ -60,7 +60,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_eap ()
@@ -68,7 +68,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_pap ()
@@ -76,7 +76,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_chap ()
@@ -84,7 +84,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschap ()
@@ -92,7 +92,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_refuse_mschapv2 ()
@@ -100,7 +100,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nobsdcomp ()
@@ -108,7 +108,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_nodeflate ()
@@ -116,7 +116,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_no_vj_comp ()
@@ -124,7 +124,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe ()
@@ -132,7 +132,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_require_mppe_128 ()
@@ -140,7 +140,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_mppe_stateful ()
@@ -148,7 +148,7 @@ that require PPP to deliver IP capability

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_ppp_get_crtscts ()
@@ -156,7 +156,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_baud ()
@@ -164,7 +164,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mru ()
@@ -172,7 +172,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_mtu ()
@@ -180,7 +180,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_failure ()
@@ -188,7 +188,7 @@ that require PPP to deliver IP capability

 

 

 
-guint32
+guint32
 
 
 nm_setting_ppp_get_lcp_echo_interval ()
@@ -207,92 +207,92 @@ that require PPP to deliver IP capability

 
 

 
guintguint
 baud
 Read / Write / Construct
 

 
gbooleangboolean
 crtscts
 Read / Write / Construct
 

 
guintguint
 lcp-echo-failure
 Read / Write / Construct
 

 
guintguint
 lcp-echo-interval
 Read / Write / Construct
 

 
gbooleangboolean
 mppe-stateful
 Read / Write / Construct
 

 
guintguint
 mru
 Read / Write / Construct
 

 
guintguint
 mtu
 Read / Write / Construct
 

 
gbooleangboolean
 no-vj-comp
 Read / Write / Construct
 

 
gbooleangboolean
 noauth
 Read / Write / Construct
 

 
gbooleangboolean
 nobsdcomp
 Read / Write / Construct
 

 
gbooleangboolean
 nodeflate
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-chap
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-eap
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-mschap
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-mschapv2
 Read / Write / Construct
 

 
gbooleangboolean
 refuse-pap
 Read / Write / Construct
 

 
gbooleangboolean
 require-mppe
 Read / Write / Construct
 

 
gbooleangboolean
 require-mppe-128
 Read / Write / Construct
 

 

 
-gchar *password
 Read / Write
 

 
-gchar *service
 Read / Write
 

 

 
-gchar *username
 Read / Write
 

 
-guint
+guint
 
 
 nm_setting_serial_get_baud ()
@@ -60,7 +60,7 @@ serial communications

 

 

 
-guint
+guint
 
 
 nm_setting_serial_get_bits ()
@@ -76,7 +76,7 @@ serial communications

 

 

 
-guint
+guint
 
 
 nm_setting_serial_get_stopbits ()
@@ -84,7 +84,7 @@ serial communications

 

 

 
-guint64
+guint64
 
 
 nm_setting_serial_get_send_delay ()
@@ -103,12 +103,12 @@ serial communications

 
 

 
guintguint
 baud
 Read / Write / Construct
 

 
guintguint
 bits
 Read / Write / Construct
 
Read / Write / Construct
 

 
guint64guint64
 send-delay
 Read / Write / Construct
 

 
guintguint
 stopbits
 Read / Write / Construct
 

 
-gchar *config
 Read / Write
 

 
-gchar *config
 Read / Write
 

 
-gboolean
+gboolean
 
 
 nm_setting_tun_get_pi ()
@@ -81,7 +81,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_tun_get_vnet_hdr ()
@@ -89,7 +89,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_tun_get_multi_queue ()
@@ -109,33 +109,33 @@
 

 

 
-gchar *group
 Read / Write
 

 
guintguint
 mode
 Read / Write / Construct
 

 
gbooleangboolean
 multi-queue
 Read / Write
 

 

 
-gchar *owner
 Read / Write
 

 
gbooleangboolean
 pi
 Read / Write
 

 
gbooleangboolean
 vnet-hdr
 Read / Write
 

 
-guint32
+guint32
 
 
 nm_setting_vlan_get_id ()
@@ -70,7 +70,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vlan_get_flags ()
@@ -78,7 +78,7 @@
 

 

 
-gint32
+gint32
 
 
 nm_setting_vlan_get_num_priorities ()
@@ -86,7 +86,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_get_priority ()
@@ -94,7 +94,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority ()
@@ -110,7 +110,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_by_value ()
@@ -118,7 +118,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_remove_priority_str_by_value ()
@@ -134,7 +134,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vlan_add_priority_str ()
@@ -153,7 +153,7 @@
 
 

 
GStrvGStrv
 egress-priority-map
 Read / Write
 
Read / Write / Construct
 

 
guintguint
 id
 Read / Write / Construct
 

 
GStrvGStrv
 ingress-priority-map
 Read / Write
 

 

 
-gchar *parent
 Read / Write / Construct
 

 
-gboolean
+gboolean
 
 
 nm_setting_vpn_get_persistent ()
@@ -81,7 +81,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_data_items ()
@@ -104,7 +104,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_data_item ()
@@ -120,7 +120,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vpn_get_num_secrets ()
@@ -143,7 +143,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vpn_remove_secret ()
@@ -159,7 +159,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_vpn_get_timeout ()
@@ -179,35 +179,35 @@
 

 

 
-GHashTable *data
 Read / Write
 

 
gbooleangboolean
 persistent
 Read / Write
 

 

 
-GHashTable *secrets
 Read / Write
 

 

 
-gchar *service-type
 Read / Write
 

 
guintguint
 timeout
 Read / Write
 

 

 
-gchar *user-name
 Read / Write
 

@@ -374,7 +374,7 @@ nm_setting_vpn_get_user_name (
 
nm_setting_vpn_get_persistent ()

-
gboolean
+
gboolean
 nm_setting_vpn_get_persistent (NMSettingVpn *setting);

 

 
Parameters

@@ -399,7 +399,7 @@ nm_setting_vpn_get_persistent (
 

 
nm_setting_vpn_get_num_data_items ()

-
guint32
+
guint32
 nm_setting_vpn_get_num_data_items (NMSettingVpn *setting);

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

 

@@ -502,7 +502,7 @@ by 
 
nm_setting_vpn_remove_data_item ()

-
gboolean
+
gboolean
 nm_setting_vpn_remove_data_item (NMSettingVpn *setting,
                                  const char *key);

 
Deletes a key/value relationship previously established by
@@ -531,8 +531,8 @@ 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.

+
 TRUE if the data item was found and removed from the internal list,
+FALSE if it was not.

 

 

 

@@ -541,7 +541,7 @@ nm_setting_vpn_remove_data_item (void
 nm_setting_vpn_foreach_data_item (NMSettingVpn *setting,
                                   NMVpnIterFunc func,
-                                  gpointer user_data);

+                                  gpointer user_data);

 
Iterates all data items stored in this setting.  It is safe to add, remove,
 and modify data items inside func
 , though any additions or removals made
@@ -578,7 +578,7 @@ during iteration will not be part of the iteration.

 

 

 
nm_setting_vpn_get_num_secrets ()

-
guint32
+
guint32
 nm_setting_vpn_get_num_secrets (NMSettingVpn *setting);

 
Gets number of VPN plugin specific secrets in the setting.

 

@@ -680,7 +680,7 @@ by 
 
nm_setting_vpn_remove_secret ()

-
gboolean
+
gboolean
 nm_setting_vpn_remove_secret (NMSettingVpn *setting,
                               const char *key);

 
Deletes a key/value relationship previously established by
@@ -709,8 +709,8 @@ nm_setting_vpn_remove_secret (
 
Returns

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

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

 

 

 

@@ -719,7 +719,7 @@ nm_setting_vpn_remove_secret (void
 nm_setting_vpn_foreach_secret (NMSettingVpn *setting,
                                NMVpnIterFunc func,
-                               gpointer user_data);
+                               gpointer user_data);
 
Iterates all secrets stored in this setting.  It is safe to add, remove,
 and modify secrets inside func
 , though any additions or removals made during
@@ -756,7 +756,7 @@ iteration will not be part of the iteration.

 

 

 
nm_setting_vpn_get_timeout ()

-
guint32
+
guint32
 nm_setting_vpn_get_timeout (NMSettingVpn *setting);

 

 
Parameters

@@ -828,7 +828,7 @@ nm_setting_vpn_get_timeout (
Property Details

 

 
The “data” property

-
  “data”                     GHashTable *

+
  “data”                     GHashTable *

 
Dictionary of key/value pairs of VPN plugin specific data.  Both keys and
 values must be strings.

 
Type: GHashTable(utf8,utf8)

@@ -837,8 +837,8 @@ values must be strings.

 

 

 
The “persistent” property

-
  “persistent”               gboolean

-
If the VPN service supports persistence, and this property is TRUE,
+
  “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

@@ -847,7 +847,7 @@ until explicitly disconnected.

 

 

 
The “secrets” property

-
  “secrets”                  GHashTable *

+
  “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)

@@ -856,7 +856,7 @@ passwords or private keys.  Both keys and values must be strings.

 

 

 
The “service-type” property

-
  “service-type”             gchar *

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

@@ -866,7 +866,7 @@ plugin.

 

 

 
The “timeout” property

-
  “timeout”                  guint

+
  “timeout”                  guint

 
Timeout for the VPN service to establish the connection. Some services
 may take quite a long time to connect.
 Value of 0 means a default timeout, which is 60 seconds (unless overriden
@@ -879,7 +879,7 @@ timeout in seconds.

 

 

 
The “user-name” property

-
  “user-name”                gchar *

+
  “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
diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html
index 87cde4ac..c22da680 100644
--- a/docs/libnm/html/NMSettingVxlan.html
+++ b/docs/libnm/html/NMSettingVxlan.html
@@ -58,7 +58,7 @@
 
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
+gchar *
 
+gchar *
 
-
+
+gchar *
 
-
+
-
+
-
+
-
+
-
+
@@ -353,7 +353,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingVxlan
 

@@ -406,7 +406,7 @@ nm_setting_vxlan_get_parent (
 
nm_setting_vxlan_get_id ()

-
guint
+
guint
 nm_setting_vxlan_get_id (NMSettingVxlan *setting);

 

 
Parameters

@@ -484,7 +484,7 @@ nm_setting_vxlan_get_remote (
 
nm_setting_vxlan_get_source_port_min ()

-
guint
+
guint
 nm_setting_vxlan_get_source_port_min (NMSettingVxlan *setting);

 

 
Parameters

@@ -510,7 +510,7 @@ nm_setting_vxlan_get_source_port_min (
 
nm_setting_vxlan_get_source_port_max ()

-
guint
+
guint
 nm_setting_vxlan_get_source_port_max (NMSettingVxlan *setting);

 

 
Parameters

@@ -536,7 +536,7 @@ nm_setting_vxlan_get_source_port_max (
 
nm_setting_vxlan_get_destination_port ()

-
guint
+
guint
 nm_setting_vxlan_get_destination_port (NMSettingVxlan *setting);

 

 
Parameters

@@ -562,7 +562,7 @@ nm_setting_vxlan_get_destination_port (
 
nm_setting_vxlan_get_tos ()

-
guint
+
guint
 nm_setting_vxlan_get_tos (NMSettingVxlan *setting);

 

 
Parameters

@@ -588,7 +588,7 @@ nm_setting_vxlan_get_tos (
 
nm_setting_vxlan_get_ttl ()

-
guint
+
guint
 nm_setting_vxlan_get_ttl (NMSettingVxlan *setting);

 

 
Parameters

@@ -614,7 +614,7 @@ nm_setting_vxlan_get_ttl (
 
nm_setting_vxlan_get_ageing ()

-
guint
+
guint
 nm_setting_vxlan_get_ageing (NMSettingVxlan *setting);

 

 
Parameters

@@ -640,7 +640,7 @@ nm_setting_vxlan_get_ageing (
 
nm_setting_vxlan_get_limit ()

-
guint
+
guint
 nm_setting_vxlan_get_limit (NMSettingVxlan *setting);

 

 
Parameters

@@ -666,7 +666,7 @@ nm_setting_vxlan_get_limit (
 
nm_setting_vxlan_get_proxy ()

-
gboolean
+
gboolean
 nm_setting_vxlan_get_proxy (NMSettingVxlan *setting);

 

 
Parameters

@@ -692,7 +692,7 @@ nm_setting_vxlan_get_proxy (
 
nm_setting_vxlan_get_learning ()

-
gboolean
+
gboolean
 nm_setting_vxlan_get_learning (NMSettingVxlan *setting);

 

 
Parameters

@@ -718,7 +718,7 @@ nm_setting_vxlan_get_learning (
 

 
nm_setting_vxlan_get_rsc ()

-
gboolean
+
gboolean
 nm_setting_vxlan_get_rsc (NMSettingVxlan *setting);

 

 
Parameters

@@ -744,7 +744,7 @@ nm_setting_vxlan_get_rsc (
 
nm_setting_vxlan_get_l2_miss ()

-
gboolean
+
gboolean
 nm_setting_vxlan_get_l2_miss (NMSettingVxlan *setting);

 

 
Parameters

@@ -770,7 +770,7 @@ nm_setting_vxlan_get_l2_miss (
 
nm_setting_vxlan_get_l3_miss ()

-
gboolean
+
gboolean
 nm_setting_vxlan_get_l3_miss (NMSettingVxlan *setting);

 

 
Parameters

@@ -902,7 +902,7 @@ nm_setting_vxlan_get_l3_miss (
Property Details

 

 
The “ageing” property

-
  “ageing”                   guint

+
  “ageing”                   guint

 
Specifies the lifetime in seconds of FDB entries learnt by the kernel.

 
Flags: Read / Write / Construct

 
Default value: 300

@@ -911,7 +911,7 @@ nm_setting_vxlan_get_l3_miss (
 
The “destination-port” property

-
  “destination-port”         guint

+
  “destination-port”         guint

 
Specifies the UDP destination port to communicate to the remote VXLAN
 tunnel endpoint.

 
Flags: Read / Write / Construct

@@ -922,7 +922,7 @@ tunnel endpoint.

 

 

 
The “id” property

-
  “id”                       guint

+
  “id”                       guint

 
Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to
 use.

 
Flags: Read / Write / Construct

@@ -933,7 +933,7 @@ use.

 

 

 
The “l2-miss” property

-
  “l2-miss”                  gboolean

+
  “l2-miss”                  gboolean

 
Specifies whether netlink LL ADDR miss notifications are generated.

 
Flags: Read / Write / Construct

 
Default value: FALSE

@@ -942,7 +942,7 @@ use.

 

 

 
The “l3-miss” property

-
  “l3-miss”                  gboolean

+
  “l3-miss”                  gboolean

 
Specifies whether netlink IP ADDR miss notifications are generated.

 
Flags: Read / Write / Construct

 
Default value: FALSE

@@ -951,7 +951,7 @@ use.

 

 

 
The “learning” property

-
  “learning”                 gboolean

+
  “learning”                 gboolean

 
Specifies whether unknown source link layer addresses and IP addresses
 are entered into the VXLAN device forwarding database.

 
Flags: Read / Write / Construct

@@ -961,7 +961,7 @@ are entered into the VXLAN device forwarding database.

 

 

 
The “limit” property

-
  “limit”                    guint

+
  “limit”                    guint

 
Specifies the maximum number of FDB entries. A value of zero means that
 the kernel will store unlimited entries.

 
Flags: Read / Write / Construct

@@ -971,7 +971,7 @@ the kernel will store unlimited entries.

 

 

 
The “local” property

-
  “local”                    gchar *

+
  “local”                    gchar *

 
If given, specifies the source IP address to use in outgoing packets.

 
Flags: Read / Write / Construct

 
Default value: NULL

@@ -980,7 +980,7 @@ the kernel will store unlimited entries.

 

 

 
The “parent” property

-
  “parent”                   gchar *

+
  “parent”                   gchar *

 
If given, specifies the parent interface name or parent connection UUID.

 
Flags: Read / Write / Construct

 
Default value: NULL

@@ -989,7 +989,7 @@ the kernel will store unlimited entries.

 

 

 
The “proxy” property

-
  “proxy”                    gboolean

+
  “proxy”                    gboolean

 
Specifies whether ARP proxy is turned on.

 
Flags: Read / Write / Construct

 
Default value: FALSE

@@ -998,7 +998,7 @@ the kernel will store unlimited entries.

 

 

 
The “remote” property

-
  “remote”                   gchar *

+
  “remote”                   gchar *

 
Specifies the unicast destination IP address to use in outgoing packets
 when the destination link layer address is not known in the VXLAN device
 forwarding database, or the multicast IP address to join.

@@ -1009,7 +1009,7 @@ forwarding database, or the multicast IP address to join.

 

 

 
The “rsc” property

-
  “rsc”                      gboolean

+
  “rsc”                      gboolean

 
Specifies whether route short circuit is turned on.

 
Flags: Read / Write / Construct

 
Default value: FALSE

@@ -1018,7 +1018,7 @@ forwarding database, or the multicast IP address to join.

 

 

 
The “source-port-max” property

-
  “source-port-max”          guint

+
  “source-port-max”          guint

 
Specifies the maximum UDP source port to communicate to the remote VXLAN
 tunnel endpoint.

 
Flags: Read / Write / Construct

@@ -1029,7 +1029,7 @@ tunnel endpoint.

 

 

 
The “source-port-min” property

-
  “source-port-min”          guint

+
  “source-port-min”          guint

 
Specifies the minimum UDP source port to communicate to the remote VXLAN
 tunnel endpoint.

 
Flags: Read / Write / Construct

@@ -1040,7 +1040,7 @@ tunnel endpoint.

 

 

 
The “tos” property

-
  “tos”                      guint

+
  “tos”                      guint

 
Specifies the TOS value to use in outgoing packets.

 
Flags: Read / Write / Construct

 
Allowed values: <= 255

@@ -1050,7 +1050,7 @@ tunnel endpoint.

 

 

 
The “ttl” property

-
  “ttl”                      guint

+
  “ttl”                      guint

 
Specifies the time-to-live value to use in outgoing packets.

 
Flags: Read / Write / Construct

 
Allowed values: <= 255

diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html
index fb211b2a..d1ea1056 100644
--- a/docs/libnm/html/NMSettingWimax.html
+++ b/docs/libnm/html/NMSettingWimax.html
@@ -77,13 +77,13 @@
 

+gchar *
 
+gchar *
 
@@ -115,7 +115,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSetting
         ╰── NMSettingWimax
 

@@ -231,7 +231,7 @@ to.

 
Property Details

 

 
The “mac-address” property

-
  “mac-address”              gchar *

+
  “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).

@@ -245,7 +245,7 @@ device (known as MAC spoofing).

 

 

 
The “network-name” property

-
  “network-name”             gchar *

+
  “network-name”             gchar *

 
Network Service Provider (NSP) name of the WiMAX network this connection
 should use.

 

diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index 4f8c10b1..ea814585 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -58,7 +58,7 @@
 
 

-
+
+gchar *
 
+gchar *
 
+gchar *
 
-
+
-
+
+gchar *
 
+gchar *
 
+GHashTable *
 
-
+
-
+
-
+
+gchar *
 
@@ -390,9 +390,9 @@
 
 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingWiredWakeOnLan
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWired
 

@@ -443,7 +443,7 @@ nm_setting_wired_get_port (
 
nm_setting_wired_get_speed ()

-
guint32
+
guint32
 nm_setting_wired_get_speed (NMSettingWired *setting);

 

 
Parameters

@@ -493,7 +493,7 @@ nm_setting_wired_get_duplex (
 
nm_setting_wired_get_auto_negotiate ()

-
gboolean
+
gboolean
 nm_setting_wired_get_auto_negotiate (NMSettingWired *setting);

 

 
Parameters

@@ -595,7 +595,7 @@ nm_setting_wired_get_mac_address_blacklist
 

 

 
nm_setting_wired_get_num_mac_blacklist_items ()

-
guint32
+
guint32
 nm_setting_wired_get_num_mac_blacklist_items
                                (NMSettingWired *setting);

 

@@ -624,7 +624,7 @@ nm_setting_wired_get_num_mac_blacklist_items
 
const char *
 nm_setting_wired_get_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);

+                                guint32 idx);

 

 
Parameters

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_id ()
@@ -80,7 +80,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_source_port_min ()
@@ -88,7 +88,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_source_port_max ()
@@ -96,7 +96,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_destination_port ()
@@ -104,7 +104,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_tos ()
@@ -112,7 +112,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_ttl ()
@@ -120,7 +120,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_ageing ()
@@ -128,7 +128,7 @@
 

 

 
-guint
+guint
 
 
 nm_setting_vxlan_get_limit ()
@@ -136,7 +136,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_proxy ()
@@ -144,7 +144,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_learning ()
@@ -152,7 +152,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_rsc ()
@@ -160,7 +160,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_l2_miss ()
@@ -168,7 +168,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_vxlan_get_l3_miss ()
@@ -187,85 +187,85 @@
 
 

 
guintguint
 ageing
 Read / Write / Construct
 

 
guintguint
 destination-port
 Read / Write / Construct
 

 
guintguint
 id
 Read / Write / Construct
 

 
gbooleangboolean
 l2-miss
 Read / Write / Construct
 

 
gbooleangboolean
 l3-miss
 Read / Write / Construct
 

 
gbooleangboolean
 learning
 Read / Write / Construct
 

 
guintguint
 limit
 Read / Write / Construct
 

 

 
-gchar *local
 Read / Write / Construct
 

 

 
-gchar *parent
 Read / Write / Construct
 

 
gbooleangboolean
 proxy
 Read / Write / Construct
 

 

 
-gchar *remote
 Read / Write / Construct
 

 
gbooleangboolean
 rsc
 Read / Write / Construct
 

 
guintguint
 source-port-max
 Read / Write / Construct
 

 
guintguint
 source-port-min
 Read / Write / Construct
 

 
guintguint
 tos
 Read / Write / Construct
 

 
guintguint
 ttl
 Read / Write / Construct
 

 

 
-gchar *mac-address
 Read / Write
 

 

 
-gchar *network-name
 Read / Write
 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_speed ()
@@ -73,7 +73,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_auto_negotiate ()
@@ -102,7 +102,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_mac_blacklist_items ()
@@ -117,7 +117,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_mac_blacklist_item ()
@@ -133,7 +133,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_mac_blacklist_item_by_value ()
@@ -149,7 +149,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_mtu ()
@@ -171,7 +171,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wired_get_num_s390_options ()
@@ -179,7 +179,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_get_s390_option ()
@@ -194,7 +194,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_add_s390_option ()
@@ -202,7 +202,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wired_remove_s390_option ()
@@ -243,74 +243,74 @@
 
 

 
gbooleangboolean
 auto-negotiate
 Read / Write / Construct
 

 

 
-gchar *cloned-mac-address
 Read / Write
 

 

 
-gchar *duplex
 Read / Write
 

 

 
-gchar *mac-address
 Read / Write
 

 
GStrvGStrv
 mac-address-blacklist
 Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 

 
-gchar *port
 Read / Write
 

 

 
-gchar *s390-nettype
 Read / Write
 

 

 
-GHashTable *s390-options
 Read / Write
 

 
GStrvGStrv
 s390-subchannels
 Read / Write
 

 
guintguint
 speed
 Read / Write / Construct
 

 
guintguint
 wake-on-lan
 Read / Write / Construct
 

 

 
-gchar *wake-on-lan-password
 Read / Write
 

@@ -657,7 +657,7 @@ at index idx
 

 

 
nm_setting_wired_add_mac_blacklist_item ()

-
gboolean
+
gboolean
 nm_setting_wired_add_mac_blacklist_item
                                (NMSettingWired *setting,
                                 const char *mac);

@@ -686,7 +686,7 @@ nm_setting_wired_add_mac_blacklist_item
 

 

 
Returns

-
 TRUE if the MAC address was added; FALSE if the MAC address
+
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

 

 
@@ -696,7 +696,7 @@ is invalid or was already present

 
void
 nm_setting_wired_remove_mac_blacklist_item
                                (NMSettingWired *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the MAC address at index idx
  from the blacklist.

 

@@ -725,7 +725,7 @@ nm_setting_wired_remove_mac_blacklist_item
 

 

 
nm_setting_wired_remove_mac_blacklist_item_by_value ()

-
gboolean
+
gboolean
 nm_setting_wired_remove_mac_blacklist_item_by_value
                                (NMSettingWired *setting,
                                 const char *mac);

@@ -756,7 +756,7 @@ the blacklist

 

 

 
Returns

-
 TRUE if the MAC address was found and removed; FALSE if it was not.

+
 TRUE if the MAC address was found and removed; FALSE if it was not.

 

 

 

@@ -785,7 +785,7 @@ nm_setting_wired_clear_mac_blacklist_items
 

 

 
nm_setting_wired_get_mtu ()

-
guint32
+
guint32
 nm_setting_wired_get_mtu (NMSettingWired *setting);

 

 
Parameters

@@ -867,7 +867,7 @@ of 'qeth', 'lcs', or 'ctc'.

 

 

 
nm_setting_wired_get_num_s390_options ()

-
guint32
+
guint32
 nm_setting_wired_get_num_s390_options (NMSettingWired *setting);

 
Returns the number of s390-specific options that should be set for this
 device when it is activated.  This can be used to retrieve each s390
@@ -895,9 +895,9 @@ option individually using 
 
nm_setting_wired_get_s390_option ()

-
gboolean
+
gboolean
 nm_setting_wired_get_s390_option (NMSettingWired *setting,
-                                  guint32 idx,
+                                  guint32 idx,
                                   const char **out_key,
                                   const char **out_value);

 
Given an index, return the value of the s390 option at that index.  indexes
@@ -943,8 +943,8 @@ modified. 

 

 

 
Returns

-
 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
+
 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)

 

 

@@ -982,14 +982,14 @@ nm_setting_wired_get_s390_option_by_key
 

 

 
Returns

-
 the value, or NULL if the key/value pair was never added to the
+
 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

 

 
 

 

 
nm_setting_wired_add_s390_option ()

-
gboolean
+
gboolean
 nm_setting_wired_add_s390_option (NMSettingWired *setting,
                                   const char *key,
                                   const char *value);

@@ -1026,14 +1026,14 @@ may already exist.

 

 

 
Returns

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

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

 

 
 

 

 
nm_setting_wired_remove_s390_option ()

-
gboolean
+
gboolean
 nm_setting_wired_remove_s390_option (NMSettingWired *setting,
                                      const char *key);

 
Remove the s390-specific option referenced by key
@@ -1063,8 +1063,8 @@ list.

 

 

 
Returns

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

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

 

 
 

@@ -1091,7 +1091,7 @@ nm_setting_wired_get_valid_s390_options
 
 

 
Returns

-
 a NULL-terminated array of strings of valid s390 options. 

+
 a NULL-terminated array of strings of valid s390 options. 

 
[transfer none]

 

 
@@ -1147,7 +1147,7 @@ nm_setting_wired_get_wake_on_lan_password
 
 

 
Returns

-
 the Wake-on-LAN setting password, or NULL if there is no password.

+
 the Wake-on-LAN setting password, or NULL if there is no password.

 

 
Since: 1.2

 
@@ -1348,9 +1348,9 @@ are supported by all devices.

 
Property Details

 

 
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
+
  “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

@@ -1358,7 +1358,7 @@ are supported by all devices.

 

 

 
The “cloned-mac-address” property

-
  “cloned-mac-address”       gchar *

+
  “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

@@ -1367,7 +1367,7 @@ permanent MAC address.  This is known as MAC cloning or spoofing.

 

 

 
The “duplex” property

-
  “duplex”                   gchar *

+
  “duplex”                   gchar *

 
If specified, request that the device only use the specified duplex mode.
 Either "half" or "full".

 
Flags: Read / Write

@@ -1376,7 +1376,7 @@ Either "half" or "full".

 

 

 
The “mac-address” property

-
  “mac-address”              gchar *

+
  “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).

@@ -1386,7 +1386,7 @@ MAC address of the device (i.e. MAC spoofing).

 

 

 
The “mac-address-blacklist” property

-
  “mac-address-blacklist”    GStrv

+
  “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
@@ -1396,7 +1396,7 @@ address is in the standard hex-digits-and-colons notation
 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “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

@@ -1405,7 +1405,7 @@ breaking larger packets up into multiple Ethernet frames.

 

 

 
The “port” property

-
  “port”                     gchar *

+
  “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.
@@ -1416,7 +1416,7 @@ If the device supports only one port type, this setting is ignored.

 

 

 
The “s390-nettype” property

-
  “s390-nettype”             gchar *

+
  “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

@@ -1425,7 +1425,7 @@ the different types of virtual network devices available on s390 systems.

 

 

 
The “s390-options” property

-
  “s390-options”             GHashTable *

+
  “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
@@ -1436,7 +1436,7 @@ alphanumeric characters (ie, [a-zA-Z0-9]).

 

 

 
The “s390-subchannels” property

-
  “s390-subchannels”         GStrv

+
  “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
@@ -1449,7 +1449,7 @@ period (.) character.

 

 

 
The “speed” property

-
  “speed”                    guint

+
  “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

@@ -1458,7 +1458,7 @@ Mbit/s, ie 100 == 100Mbit/s.

 

 

 
The “wake-on-lan” property

-
  “wake-on-lan”              guint

+
  “wake-on-lan”              guint

 
The NMSettingWiredWakeOnLan options to enable. Not all devices support all options.
 May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY,
 NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST, NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST,
@@ -1474,9 +1474,9 @@ NetworkManager).

 

 

 
The “wake-on-lan-password” property

-
  “wake-on-lan-password”     gchar *

+
  “wake-on-lan-password”     gchar *

 
If specified, the password used with magic-packet-based
-Wake-on-LAN, represented as an Ethernet MAC address.  If NULL,
+Wake-on-LAN, represented as an Ethernet MAC address.  If NULL,
 no password will be required.

 
Flags: Read / Write

 
Default value: NULL

diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index 9106fec5..c75e3666 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -51,7 +51,7 @@
 
 

+gchar *
 
+gchar *
 
-
+
+gchar *
 
-
+
+gchar *
 
-
+
-
+
+gchar *
 
-
+
-
+
-
+
-
+
+GBytes *
 
-
+
@@ -422,9 +422,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessPowersave
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWireless
 

@@ -450,7 +450,7 @@ nm_setting_wireless_new (void
 

 
nm_setting_wireless_get_ssid ()

-
GBytes *
+
GBytes *
 nm_setting_wireless_get_ssid (NMSettingWireless *setting);

 

 
Parameters

@@ -526,7 +526,7 @@ nm_setting_wireless_get_band (
 
nm_setting_wireless_get_channel ()

-
guint32
+
guint32
 nm_setting_wireless_get_channel (NMSettingWireless *setting);

 

 
Parameters

@@ -576,7 +576,7 @@ nm_setting_wireless_get_bssid (
 

 
nm_setting_wireless_get_rate ()

-
guint32
+
guint32
 nm_setting_wireless_get_rate (NMSettingWireless *setting);

 

 
Parameters

@@ -601,7 +601,7 @@ nm_setting_wireless_get_rate (
 
nm_setting_wireless_get_tx_power ()

-
guint32
+
guint32
 nm_setting_wireless_get_tx_power (NMSettingWireless *setting);

 

 
Parameters

@@ -703,7 +703,7 @@ nm_setting_wireless_get_mac_address_blacklist
 

 

 
nm_setting_wireless_get_num_mac_blacklist_items ()

-
guint32
+
guint32
 nm_setting_wireless_get_num_mac_blacklist_items
                                (NMSettingWireless *setting);

 

@@ -732,7 +732,7 @@ nm_setting_wireless_get_num_mac_blacklist_items
 
const char *
 nm_setting_wireless_get_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);

+                                guint32 idx);

 

 
Parameters

 

 
-GBytes *
+GBytes *
 
 
 nm_setting_wireless_get_ssid ()
@@ -73,7 +73,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_channel ()
@@ -88,7 +88,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_rate ()
@@ -96,7 +96,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_tx_power ()
@@ -125,7 +125,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_mac_blacklist_items ()
@@ -140,7 +140,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_mac_blacklist_item ()
@@ -156,7 +156,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_remove_mac_blacklist_item_by_value ()
@@ -172,7 +172,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_mtu ()
@@ -180,7 +180,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_get_hidden ()
@@ -188,7 +188,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_powersave ()
@@ -204,7 +204,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_add_seen_bssid ()
@@ -212,7 +212,7 @@
 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_get_num_seen_bssids ()
@@ -227,7 +227,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_ap_security_compatible ()
@@ -247,82 +247,82 @@
 

 

 
-gchar *band
 Read / Write
 

 

 
-gchar *bssid
 Read / Write
 

 
guintguint
 channel
 Read / Write / Construct
 

 

 
-gchar *cloned-mac-address
 Read / Write
 

 
gbooleangboolean
 hidden
 Read / Write
 

 

 
-gchar *mac-address
 Read / Write
 

 
GStrvGStrv
 mac-address-blacklist
 Read / Write
 

 
guintguint
 mac-address-randomization
 Read / Write
 

 

 
-gchar *mode
 Read / Write
 

 
guintguint
 mtu
 Read / Write / Construct
 

 
guintguint
 powersave
 Read / Write
 

 
guintguint
 rate
 Read / Write / Construct
 

 
GStrvGStrv
 seen-bssids
 Read / Write
 

 

 
-GBytes *ssid
 Read / Write
 

 
guintguint
 tx-power
 Read / Write / Construct
 

@@ -765,7 +765,7 @@ at index idx
 

 

 
nm_setting_wireless_add_mac_blacklist_item ()

-
gboolean
+
gboolean
 nm_setting_wireless_add_mac_blacklist_item
                                (NMSettingWireless *setting,
                                 const char *mac);

@@ -794,7 +794,7 @@ nm_setting_wireless_add_mac_blacklist_item
 

 

 
Returns

-
 TRUE if the MAC address was added; FALSE if the MAC address
+
 TRUE if the MAC address was added; FALSE if the MAC address
 is invalid or was already present

 

 
@@ -804,7 +804,7 @@ is invalid or was already present

 
void
 nm_setting_wireless_remove_mac_blacklist_item
                                (NMSettingWireless *setting,
-                                guint32 idx);

+                                guint32 idx);
 
Removes the MAC address at index idx
  from the blacklist.

 

@@ -833,7 +833,7 @@ nm_setting_wireless_remove_mac_blacklist_item
 

 

 
nm_setting_wireless_remove_mac_blacklist_item_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_remove_mac_blacklist_item_by_value
                                (NMSettingWireless *setting,
                                 const char *mac);

@@ -864,7 +864,7 @@ the blacklist

 

 

 
Returns

-
 TRUE if the MAC address was found and removed; FALSE if it was not.

+
 TRUE if the MAC address was found and removed; FALSE if it was not.

 

 

 

@@ -893,7 +893,7 @@ nm_setting_wireless_clear_mac_blacklist_items
 

 

 
nm_setting_wireless_get_mtu ()

-
guint32
+
guint32
 nm_setting_wireless_get_mtu (NMSettingWireless *setting);

 

 
Parameters

@@ -918,7 +918,7 @@ nm_setting_wireless_get_mtu (
 
nm_setting_wireless_get_hidden ()

-
gboolean
+
gboolean
 nm_setting_wireless_get_hidden (NMSettingWireless *setting);

 

 
Parameters

@@ -943,7 +943,7 @@ nm_setting_wireless_get_hidden (
 

 
nm_setting_wireless_get_powersave ()

-
guint32
+
guint32
 nm_setting_wireless_get_powersave (NMSettingWireless *setting);

 

 
Parameters

@@ -997,7 +997,7 @@ setting

 

 

 
nm_setting_wireless_add_seen_bssid ()

-
gboolean
+
gboolean
 nm_setting_wireless_add_seen_bssid (NMSettingWireless *setting,
                                     const char *bssid);

 
Adds a new Wi-Fi AP's BSSID to the previously seen BSSID list of the setting.
@@ -1028,14 +1028,14 @@ not be preserved.

 

 

 
Returns

-
 TRUE if bssid
-was already known, FALSE if not

+
 TRUE if bssid
+was already known, FALSE if not

 

 

 

 

 
nm_setting_wireless_get_num_seen_bssids ()

-
guint32
+
guint32
 nm_setting_wireless_get_num_seen_bssids
                                (NMSettingWireless *setting);

 

@@ -1063,7 +1063,7 @@ nm_setting_wireless_get_num_seen_bssids
 
nm_setting_wireless_get_seen_bssid ()

 
const char *
 nm_setting_wireless_get_seen_bssid (NMSettingWireless *setting,
-                                    guint32 i);

+                                    guint32 i);

 

 
Parameters

 

@@ -1095,7 +1095,7 @@ nm_setting_wireless_get_seen_bssid (
 

 
nm_setting_wireless_ap_security_compatible ()

-
gboolean
+
gboolean
 nm_setting_wireless_ap_security_compatible
                                (NMSettingWireless *s_wireless,
                                 NMSettingWirelessSecurity *s_wireless_sec,
@@ -1125,7 +1125,7 @@ compatible with which access points.

 
 

-
+
@@ -1155,8 +1155,8 @@ capabilities

 
 

 
Returns

-
 TRUE if the given settings are compatible with the access point's
-security flags and mode, FALSE if they are not.

+
 TRUE if the given settings are compatible with the access point's
+security flags and mode, FALSE if they are not.

 

 
 
@@ -1340,7 +1340,7 @@ for this connection.

 
Property Details

 

 
The “band” property

-
  “band”                     gchar *

+
  “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
@@ -1353,7 +1353,7 @@ capability and may not work with all drivers.

 

 

 
The “bssid” property

-
  “bssid”                    gchar *

+
  “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
@@ -1364,7 +1364,7 @@ creating an Ad-Hoc network and is unlikely to in the future.

 

 

 
The “channel” property

-
  “channel”                  guint

+
  “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
@@ -1375,7 +1375,7 @@ also requires the "band" property to be set.

 

 

 
The “cloned-mac-address” property

-
  “cloned-mac-address”       gchar *

+
  “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

@@ -1384,8 +1384,8 @@ of its permanent MAC address.  This is known as MAC cloning or spoofing.

 

 

 
The “hidden” property

-
  “hidden”                   gboolean

-
If TRUE, indicates this network is a non-broadcasting network that hides
+
  “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,
@@ -1396,7 +1396,7 @@ and thus hidden SSID networks should be used with caution.

 

 

 
The “mac-address” property

-
  “mac-address”              gchar *

+
  “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).

@@ -1406,7 +1406,7 @@ address of the device (i.e. MAC spoofing).

 

 

 
The “mac-address-blacklist” property

-
  “mac-address-blacklist”    GStrv

+
  “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").

@@ -1415,7 +1415,7 @@ standard hex-digits-and-colons notation (eg "00:11:22:33:44:55").

 

 

 
The “mac-address-randomization” property

-
  “mac-address-randomization” guint

+
  “mac-address-randomization” guint

 
One of NM_SETTING_MAC_RANDOMIZATION_DEFAULT (never randomize unless
 the user has set a global default to randomize and the supplicant
 supports randomization),  NM_SETTING_MAC_RANDOMIZATION_NEVER (never
@@ -1428,7 +1428,7 @@ randomize the MAC address), or 
 
The “mode” property

-
  “mode”                     gchar *

+
  “mode”                     gchar *

 
Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap".  If blank,
 infrastructure is assumed.

 
Flags: Read / Write

@@ -1437,7 +1437,7 @@ infrastructure is assumed.

 

 

 
The “mtu” property

-
  “mtu”                      guint

+
  “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

@@ -1446,7 +1446,7 @@ breaking larger packets up into multiple Ethernet frames.

 

 

 
The “powersave” property

-
  “powersave”                guint

+
  “powersave”                guint

 
One of NM_SETTING_WIRELESS_POWERSAVE_DISABLE (disable Wi-Fi power
 saving), NM_SETTING_WIRELESS_POWERSAVE_ENABLE (enable Wi-Fi power
 saving), NM_SETTING_WIRELESS_POWERSAVE_IGNORE (don't touch currently
@@ -1459,7 +1459,7 @@ globally configured value). All other values are reserved.

 

 

 
The “rate” property

-
  “rate”                     guint

+
  “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
@@ -1470,7 +1470,7 @@ support setting a static bitrate.

 

 

 
The “seen-bssids” property

-
  “seen-bssids”              GStrv

+
  “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
@@ -1482,14 +1482,14 @@ preserved.

 

 

 
The “ssid” property

-
  “ssid”                     GBytes *

+
  “ssid”                     GBytes *

 
SSID of the Wi-Fi network. Must be specified.

 
Flags: Read / Write

 

 

 

 
The “tx-power” property

-
  “tx-power”                 guint

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

diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 4058b7dd..82446ce5 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -59,7 +59,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

+gchar *
 
-
+
+gchar *
 
+gchar *
 
@@ -323,23 +323,23 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 
+gchar *
 
-
+
-
+
+gchar *
 
@@ -360,30 +360,30 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 
+gchar *
 
+gchar *
 
+gchar *
 
+gchar *
 
-
+
@@ -479,9 +479,9 @@ use WEP, LEAP, WPA or WPA2/RSN security

 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMWepKeyType
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingWirelessSecurity
 

@@ -543,7 +543,7 @@ nm_setting_wireless_security_get_key_mgmt
 

 

 
nm_setting_wireless_security_get_num_protos ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_num_protos
                                (NMSettingWirelessSecurity *setting);

 

@@ -573,7 +573,7 @@ connecting to secure Wi-Fi networks

 
const char *
 nm_setting_wireless_security_get_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);

 

 
Parameters

 

 
s_wireless_sec
a NMSettingWirelessSecurity or NULL
a NMSettingWirelessSecurity or NULL

  
 

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_protos ()
@@ -74,7 +74,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_proto ()
@@ -90,7 +90,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_proto_by_value ()
@@ -106,7 +106,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_pairwise ()
@@ -121,7 +121,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_pairwise ()
@@ -137,7 +137,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_pairwise_by_value ()
@@ -153,7 +153,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_num_groups ()
@@ -168,7 +168,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_add_group ()
@@ -184,7 +184,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gboolean
+gboolean
 
 
 nm_setting_wireless_security_remove_group_by_value ()
@@ -252,7 +252,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-guint32
+guint32
 
 
 nm_setting_wireless_security_get_wep_tx_keyidx ()
@@ -295,24 +295,24 @@ use WEP, LEAP, WPA or WPA2/RSN security

 

 

 
-gchar *auth-alg
 Read / Write
 

 
GStrvGStrv
 group
 Read / Write
 

 

 
-gchar *key-mgmt
 Read / Write
 

 

 
-gchar *leap-password
 Read / Write
 

 
-gchar *leap-username
 Read / Write
 

 
GStrvGStrv
 pairwise
 Read / Write
 

 
GStrvGStrv
 proto
 Read / Write
 

 

 
-gchar *psk
 Read / Write
 

 
-gchar *wep-key0
 Read / Write
 

 

 
-gchar *wep-key1
 Read / Write
 

 

 
-gchar *wep-key2
 Read / Write
 

 

 
-gchar *wep-key3
 Read / Write
 

 
guintguint
 wep-tx-keyidx
 Read / Write / Construct
 

@@ -605,7 +605,7 @@ nm_setting_wireless_security_get_proto
 

 

 
nm_setting_wireless_security_add_proto ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_add_proto
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);

@@ -639,8 +639,8 @@ 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

+
 TRUE if the protocol was new and and was added to the allowed
+protocol list, or FALSE if it was already in the list

 

 
 

@@ -649,7 +649,7 @@ protocol list, or void
 nm_setting_wireless_security_remove_proto
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);
+                                guint32 i);
 
Removes a protocol from the allowed protocol list.

 

 
Parameters

@@ -677,7 +677,7 @@ nm_setting_wireless_security_remove_proto
 

 

 
nm_setting_wireless_security_remove_proto_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_remove_proto_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *proto);

@@ -706,7 +706,7 @@ nm_setting_wireless_security_remove_proto_by_value
 

 

 
Returns

-
 TRUE if the protocol was found and removed; FALSE it it was not.

+
 TRUE if the protocol was found and removed; FALSE it it was not.

 

 

 

@@ -736,7 +736,7 @@ specified then all protocols are allowed.

 

 

 
nm_setting_wireless_security_get_num_pairwise ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_num_pairwise
                                (NMSettingWirelessSecurity *setting);

 

@@ -765,7 +765,7 @@ nm_setting_wireless_security_get_num_pairwise
 
const char *
 nm_setting_wireless_security_get_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the allowed pairwise encryption algorithm from allowed algorithm
 list.

 

@@ -799,7 +799,7 @@ list.

 

 

 
nm_setting_wireless_security_add_pairwise ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_add_pairwise
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);

@@ -831,7 +831,7 @@ compatible with this connection.

 

 

 
Returns

-
 TRUE if the algorithm was added to the list, FALSE if it was
+
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

 

 

@@ -841,7 +841,7 @@ already in the list

 
void
 nm_setting_wireless_security_remove_pairwise
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);
 
Removes an encryption algorithm from the allowed pairwise encryption
 algorithm list.

 

@@ -870,7 +870,7 @@ algorithm list.

 

 

 
nm_setting_wireless_security_remove_pairwise_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_remove_pairwise_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *pairwise);

@@ -900,7 +900,7 @@ algorithm list.

 

 

 
Returns

-
 TRUE if the encryption algorith was found and removed; FALSE it it was not.

+
 TRUE if the encryption algorith was found and removed; FALSE it it was not.

 

 

 

@@ -930,7 +930,7 @@ specified then all pairwise encryption algorithms are allowed.

 

 

 
nm_setting_wireless_security_get_num_groups ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_num_groups
                                (NMSettingWirelessSecurity *setting);

 

@@ -959,7 +959,7 @@ nm_setting_wireless_security_get_num_groups
 
const char *
 nm_setting_wireless_security_get_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);

 
Returns the allowed groupwise encryption algorithm from allowed algorithm
 list.

 

@@ -993,7 +993,7 @@ list.

 

 

 
nm_setting_wireless_security_add_group ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_add_group
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);

@@ -1026,7 +1026,7 @@ compatible with this connection.

 

 

 
Returns

-
 TRUE if the algorithm was added to the list, FALSE if it was
+
 TRUE if the algorithm was added to the list, FALSE if it was
 already in the list

 

 

@@ -1036,7 +1036,7 @@ already in the list

 
void
 nm_setting_wireless_security_remove_group
                                (NMSettingWirelessSecurity *setting,
-                                guint32 i);

+                                guint32 i);
 
Removes an encryption algorithm from the allowed groupwise encryption
 algorithm list.

 

@@ -1065,7 +1065,7 @@ algorithm list.

 

 

 
nm_setting_wireless_security_remove_group_by_value ()

-
gboolean
+
gboolean
 nm_setting_wireless_security_remove_group_by_value
                                (NMSettingWirelessSecurity *setting,
                                 const char *group);

@@ -1096,7 +1096,7 @@ algorithm list.

 

 

 
Returns

-
 TRUE if the algorithm was found and removed; FALSE it it was not.

+
 TRUE if the algorithm was found and removed; FALSE it it was not.

 

 

 

@@ -1260,7 +1260,7 @@ nm_setting_wireless_security_get_leap_password_flags
 
const char *
 nm_setting_wireless_security_get_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx);

+                                guint32 idx);
 

 
Parameters

 

@@ -1294,7 +1294,7 @@ nm_setting_wireless_security_get_wep_key
 
void
 nm_setting_wireless_security_set_wep_key
                                (NMSettingWirelessSecurity *setting,
-                                guint32 idx,
+                                guint32 idx,
                                 const char *key);

 
Sets a WEP key in the given index.

 

@@ -1330,7 +1330,7 @@ property.

 

 

 
nm_setting_wireless_security_get_wep_tx_keyidx ()

-
guint32
+
guint32
 nm_setting_wireless_security_get_wep_tx_keyidx
                                (NMSettingWirelessSecurity *setting);

 

@@ -1605,7 +1605,7 @@ the actual WEP key using the MD5 hash algorithm.

 
Property Details

 

 
The “auth-alg” property

-
  “auth-alg”                 gchar *

+
  “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
@@ -1617,7 +1617,7 @@ using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the
 

 

 
The “group” property

-
  “group”                    GStrv

+
  “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
@@ -1627,7 +1627,7 @@ list element may be one of "wep40", "wep104", "tkip", or "ccmp".

 

 

 
The “key-mgmt” property

-
  “key-mgmt”                 gchar *

+
  “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
@@ -1638,7 +1638,7 @@ any Wi-Fi connection that uses security.

 

 

 
The “leap-password” property

-
  “leap-password”            gchar *

+
  “leap-password”            gchar *

 
The login password for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

@@ -1655,7 +1655,7 @@ any Wi-Fi connection that uses security.

 

 

 
The “leap-username” property

-
  “leap-username”            gchar *

+
  “leap-username”            gchar *

 
The login username for legacy LEAP connections (ie, key-mgmt =
 "ieee8021x" and auth-alg = "leap").

 
Flags: Read / Write

@@ -1664,7 +1664,7 @@ any Wi-Fi connection that uses security.

 

 

 
The “pairwise” property

-
  “pairwise”                 GStrv

+
  “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
@@ -1674,7 +1674,7 @@ may be one of "tkip" or "ccmp".

 

 

 
The “proto” property

-
  “proto”                    GStrv

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

@@ -1683,7 +1683,7 @@ not specified, both WPA and RSN connections are allowed.

 

 

 
The “psk” property

-
  “psk”                      gchar *

+
  “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
@@ -1726,7 +1726,7 @@ the actual WEP key.

 

 

 
The “wep-key0” property

-
  “wep-key0”                 gchar *

+
  “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

@@ -1735,7 +1735,7 @@ the actual WEP key.

 

 

 
The “wep-key1” property

-
  “wep-key1”                 gchar *

+
  “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

@@ -1744,7 +1744,7 @@ the actual WEP key.

 

 

 
The “wep-key2” property

-
  “wep-key2”                 gchar *

+
  “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

@@ -1753,7 +1753,7 @@ the actual WEP key.

 

 

 
The “wep-key3” property

-
  “wep-key3”                 gchar *

+
  “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

@@ -1762,7 +1762,7 @@ the actual WEP key.

 

 

 
The “wep-tx-keyidx” property

-
  “wep-tx-keyidx”            guint

+
  “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
diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html
index 2324c3a8..d596d39d 100644
--- a/docs/libnm/html/NMSimpleConnection.html
+++ b/docs/libnm/html/NMSimpleConnection.html
@@ -42,7 +42,7 @@
 

+gchar *
 
@@ -94,7 +94,7 @@
 
-
+

 

 
-NMConnection *
+NMConnection *
 
 
 nm_simple_connection_new ()
@@ -50,7 +50,7 @@
 

 

 
-NMConnection *
+NMConnection *
 
 
 nm_simple_connection_new_from_dbus ()
@@ -58,7 +58,7 @@
 

 

 
-NMConnection *
+NMConnection *
 
 
 nm_simple_connection_new_clone ()
@@ -69,7 +69,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMSimpleConnection
 

 

@@ -80,26 +80,26 @@
 
Functions

 

 
nm_simple_connection_new ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new (void);

 
Creates a new NMSimpleConnection object with no NMSetting objects. An
 NMSimpleConnection does not directly represent a D-Bus-exported connection,
 but might be used in the process of creating a new one.

 

 
Returns

-
 the new empty NMConnection object. 

+
 the new empty NMConnection object. 

 
[transfer full]

 

 

 

 

 
nm_simple_connection_new_from_dbus ()

-
NMConnection *
-nm_simple_connection_new_from_dbus (GVariant *dict,
-                                    GError **error);

+
NMConnection *
+nm_simple_connection_new_from_dbus (GVariant *dict,
+                                    GError **error);

 
Creates a new NMSimpleConnection from a hash table describing the
-connection.  See nm_connection_to_dbus() for a description of the expected
-hash table.

+connection and normalize the connection.  See nm_connection_to_dbus() for a
+description of the expected hash table.

 

 
Parameters

 

@@ -111,7 +111,7 @@ hash table.

-
+
@@ -125,17 +125,17 @@ hash table.

 
Returns

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

+settings created from the values in the hash table, or NULL if the
+connection failed to normalize. 

 
[transfer full]

 

 
nm_simple_connection_new_clone ()

-
NMConnection *
-nm_simple_connection_new_clone (NMConnection *connection);

-
Clones an NMConnection as an NMSimpleConnection.

+
NMConnection *
+nm_simple_connection_new_clone (NMConnection *connection);

+
Clones an NMConnection as an NMSimpleConnection.

 

 
Parameters

 

 
 

 
dict
a GVariant of type NM_VARIANT_TYPE_CONNECTION describing the connection
a GVariant of type NM_VARIANT_TYPE_CONNECTION describing the connection

  
 

 

 
 
 
 

@@ -146,15 +146,15 @@ nm_simple_connection_new_clone (N
 
 
-
+

 
connection
the NMConnection to clone
the NMConnection to clone

  
 

 

 

 

 
Returns

-
 a new NMConnection containing the same settings
-and properties as the source NMConnection. 

+
 a new NMConnection containing the same settings
+and properties as the source NMConnection. 

 
[transfer full]

 

 

diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html
index adbdab93..b8b766cf 100644
--- a/docs/libnm/html/NMVpnConnection.html
+++ b/docs/libnm/html/NMVpnConnection.html
@@ -71,7 +71,7 @@
 

 

 
-gchar *banner
 Read
 

 void
 vpn-state-changedRun FirstRun First
 

 

 

@@ -119,7 +119,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── NMObject
         ╰── NMActiveConnection
             ╰── NMVpnConnection
@@ -201,7 +201,7 @@ string used by the connection, and must not be modified.

 
Property Details

 

 
The “banner” property

-
  “banner”                   gchar *

+
  “banner”                   gchar *

 
The VPN login banner of the active VPN connection.

 
Flags: Read

 
Default value: NULL

@@ -221,10 +221,10 @@ string used by the connection, and must not be modified.

 
The “vpn-state-changed” signal

 
void
 user_function (NMVpnConnection *nmvpnconnection,
-               guint            arg1,
-               guint            arg2,
-               gpointer         user_data)

-
Flags: Run First

+               guint            arg1,
+               guint            arg2,
+               gpointer         user_data)

+
Flags: Run First

 

 

 

diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 126ddb6f..13cc3db2 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -77,7 +77,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_vpn_editor_plugin_import ()
@@ -85,7 +85,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_vpn_editor_plugin_export ()
@@ -121,19 +121,19 @@
 
 
 
-gchar *
+gchar *
 description
 Read
 
 
 
-gchar *
+gchar *
 name
 Read
 
 
 
-gchar *
+gchar *
 service
 Read
 
@@ -151,7 +151,7 @@
 
 void
 changed
-Run First
+Run First
 
 

 

@@ -192,9 +192,9 @@
 

 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMVpnEditorPluginCapability
-    GInterface
+    GInterface
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
 

@@ -203,7 +203,7 @@
 
Prerequisites

 

 NMVpnEditor requires
- GObject.

+ GObject.

 

 

 
Description

@@ -213,21 +213,21 @@ NMVpnEditor requires
 

 
NMVpnEditorPluginFactory ()

 
NMVpnEditorPlugin *
-(*NMVpnEditorPluginFactory) (GError **error);

+(*NMVpnEditorPluginFactory) (GError **error);

 

 

 

 
nm_vpn_editor_plugin_factory ()

 
NMVpnEditorPlugin *
-nm_vpn_editor_plugin_factory (GError **error);

+nm_vpn_editor_plugin_factory (GError **error);

 

 

 

 
nm_vpn_editor_plugin_get_editor ()

 
NMVpnEditor *
 nm_vpn_editor_plugin_get_editor (NMVpnEditorPlugin *plugin,
-                                 NMConnection *connection,
-                                 GError **error);

+                                 NMConnection *connection,
+                                 GError **error);

 

 
Parameters

 

@@ -244,12 +244,12 @@ nm_vpn_editor_plugin_get_editor (
 
-
+
-
+
@@ -257,7 +257,7 @@ nm_vpn_editor_plugin_get_editor (
 

 
Returns

-
 a new NMVpnEditor or NULL on error. 

+
 a new NMVpnEditor or NULL on error. 

 
[transfer full]

 

 
@@ -270,10 +270,10 @@ nm_vpn_editor_plugin_get_capabilities (
 
nm_vpn_editor_plugin_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             GError **error);

+                             GError **error);

 

 
Parameters

 

 
connection
the NMConnection to be edited
the NMConnection to be edited

  
 

 

 
error
on return, an error or NULL
on return, an error or NULL

  
 

 

@@ -290,12 +290,12 @@ nm_vpn_editor_plugin_import (
path

-
+
-
+
@@ -303,8 +303,8 @@ nm_vpn_editor_plugin_import (
 
Returns

-
 a new NMConnection imported from path
-, or NULL
+
 a new NMConnection imported from path
+, or NULL
 on error or if the file at path
 was not recognized by this plugin. 

 
[transfer full]

@@ -313,11 +313,11 @@ was not recognized by this plugin. 

 

 

 
nm_vpn_editor_plugin_export ()

-
gboolean
+
gboolean
 nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             NMConnection *connection,
-                             GError **error);

+                             NMConnection *connection,
+                             GError **error);

 

 

 

@@ -325,7 +325,7 @@ nm_vpn_editor_plugin_export (char *
 nm_vpn_editor_plugin_get_suggested_filename
                                (NMVpnEditorPlugin *plugin,
-                                NMConnection *connection);
+                                NMConnection *connection);
 

 

 

@@ -335,8 +335,8 @@ nm_vpn_editor_plugin_load_from_file (const const char *check_service,
                                      int check_owner,
                                      NMUtilsCheckFilePredicate check_file,
-                                     gpointer user_data,
-                                     GError **error);
+                                     gpointer user_data,
+                                     GError **error);
 
Load the shared libary plugin_filename
  and create a new
 NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory
@@ -397,7 +397,7 @@ loading the shared library. 

 

 

 
Returns

-
 a new plugin instance or NULL on error. 

+
 a new plugin instance or NULL on error. 

 
[transfer full]

 

 
Since: 1.2

@@ -502,14 +502,14 @@ loading the shared library. 

 
 
-
+
+if non-NULL.

 
@@ -520,27 +520,27 @@ if non-
import_from_file ()

 
@@ -558,7 +558,7 @@ the caller.

 
Property Details

 

 
The “description” property

-
  “description”              gchar *

+
  “description”              gchar *

 
Longer description of the VPN plugin.

 
Flags: Read

 
Default value: NULL

@@ -566,7 +566,7 @@ the caller.

 

 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

 
Short display name of the VPN plugin.

 
Flags: Read

 
Default value: NULL

@@ -574,7 +574,7 @@ the caller.

 

 

 
The “service” property

-
  “service”                  gchar *

+
  “service”                  gchar *

 
D-Bus service name of the plugin's VPN service.

 
Flags: Read

 
Default value: NULL

@@ -586,8 +586,8 @@ the caller.

 
The “changed” signal

 
void
 user_function (NMVpnEditor *nmvpneditor,
-               gpointer     user_data)

-
Flags: Run First

+               gpointer     user_data)
+
Flags: Run First

 

 

 

diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index aac8413a..8a73c9b9 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -50,7 +50,7 @@
 
 
+gchar *
 
@@ -104,7 +104,7 @@
 
-
+
@@ -140,9 +140,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMWimaxNspNetworkType
-    GObject
+    GObject
     ╰── NMObject
         ╰── NMWimaxNsp
 

@@ -180,7 +180,7 @@ nm_wimax_nsp_get_name (
 
nm_wimax_nsp_get_signal_quality ()

-
guint32
+
guint32
 nm_wimax_nsp_get_signal_quality (NMWimaxNsp *nsp);

 
Gets the WPA signal quality of the wimax NSP.

 

@@ -232,9 +232,9 @@ nm_wimax_nsp_get_network_type (
 

 
nm_wimax_nsp_filter_connections ()

-
GPtrArray *
+
GPtrArray *
 nm_wimax_nsp_filter_connections (NMWimaxNsp *nsp,
-                                 const GPtrArray *connections);

+                                 const GPtrArray *connections);

 
Filters a given array of connections for a given NMWimaxNsp object and
 return connections which may be activated with the NSP.  Any returned
 connections will match the nsp
@@ -255,7 +255,7 @@ connections will match the nsp
 
 

-
@@ -265,18 +265,18 @@ filter. 

 

 
Returns

 
 an array of
-NMConnections that could be activated with the given nsp
+NMConnections that could be activated with the given nsp
 .  The array should
-be freed with g_ptr_array_unref() when it is no longer required. 

+be freed with g_ptr_array_unref() when it is no longer required. 

 
[transfer container][element-type NMConnection]

 

 
 

 

 
nm_wimax_nsp_connection_valid ()

-
gboolean
+
gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);

+                               NMConnection *connection);

 
Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 nsp
@@ -298,7 +298,7 @@ against

 
 

-
@@ -307,8 +307,8 @@ against

 
 

 
Returns

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

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

 

 
 
@@ -381,7 +381,7 @@ against

 
Property Details

 

 
The “name” property

-
  “name”                     gchar *

+
  “name”                     gchar *

 
The name of the WiMAX NSP.

 
Flags: Read

 
Default value: NULL

@@ -397,7 +397,7 @@ against

 

 

 
The “signal-quality” property

-
  “signal-quality”           guint

+
  “signal-quality”           guint

 
The signal quality of the WiMAX NSP.

 
Flags: Read

 
Allowed values: <= 100

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index ea94245b..e4606198 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -3608,6 +3608,10 @@
 
 

 

+NMSetting8021x:domain-suffix-match, object property in NMSetting8021x
+

+

+

 NMSetting8021x:eap, object property in NMSetting8021x
 

 

@@ -3672,6 +3676,10 @@
 
 

 

+NMSetting8021x:phase2-domain-suffix-match, object property in NMSetting8021x
+

+

+

 NMSetting8021x:phase2-private-key, object property in NMSetting8021x
 

 

@@ -4748,6 +4756,10 @@
 
 

 

+NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_EAP, macro in NMSetting8021x
 

 

@@ -4788,6 +4800,10 @@
 
 

 

+nm_setting_802_1x_get_domain_suffix_match, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_eap_method, function in NMSetting8021x
 

 

@@ -4880,6 +4896,10 @@
 
 

 

+nm_setting_802_1x_get_phase2_domain_suffix_match, function in NMSetting8021x
+

+

+

 nm_setting_802_1x_get_phase2_private_key_blob, function in NMSetting8021x
 

 

@@ -5012,6 +5032,10 @@
 
 

 

+NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH, macro in NMSetting8021x
+

+

+

 NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, macro in NMSetting8021x
 

 

@@ -8126,7 +8150,7 @@
 
 

 

-NMVpnEditorInterface, struct in NMVpnEditor
+NMVpnEditorInterface, struct in NMVpnEditor
 

 

 

@@ -8194,7 +8218,7 @@ NMVpnEditorInterface, struct in NMVpnEditor
+nm_vpn_editor_get_widget, function in NMVpnEditor
 

 

 

@@ -8238,7 +8262,7 @@ nm_vpn_editor_get_widget, function in NMVpnEditor
+nm_vpn_editor_update_connection, function in NMVpnEditor
 

 

 

diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 8c2165f0..891025a0 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 

 
full path to the file to attempt to read into a new NMConnection
full path to the file to attempt to read into a new NMConnection

  
 

 

 
error
on return, an error or NULL
on return, an error or NULL

  
 

 
 
GTypeInterface g_iface;
GTypeInterface g_iface;

 
the parent interface

  
 

 

 
get_editor ()

 
returns an NMVpnEditor, pre-filled with values from connection
-if non-NULL.
 
 

 
Try to import a connection from the specified path.  On
-success, return a partial NMConnection object.  On error, return NULL and
+success, return a partial NMConnection object.  On error, return NULL and
 set error
 with additional information.  Note that error
-can be NULL, in
+can be NULL, in
 which case no additional error information should be provided.

  
 

 

 
export_to_file ()

 
Export the given connection to the specified path.  Return
-TRUE on success.  On error, return FALSE and set error
+TRUE on success.  On error, return FALSE and set error
 with additional
 error information.  Note that error
-can be NULL, in which case no
+can be NULL, in which case no
 additional error information should be provided.

  
 

 

 
get_suggested_filename ()

 
For a given connection, return a suggested file
-name.  Returned value will be NULL or a suggested file name to be freed by
+name.  Returned value will be NULL or a suggested file name to be freed by
 the caller.

  
 

 
-guint32
+guint32
 
 
 nm_wimax_nsp_get_signal_quality ()
@@ -66,7 +66,7 @@
 

 

 
-GPtrArray *
+GPtrArray *
 
 
 nm_wimax_nsp_filter_connections ()
@@ -74,7 +74,7 @@
 

 

 
-gboolean
+gboolean
 
 
 nm_wimax_nsp_connection_valid ()
@@ -94,7 +94,7 @@
 

 

 
-gchar *name
 Read
 
Read
 

 
guintguint
 signal-quality
 Read
 

 
connections
 an array of NMConnections to
+
 an array of NMConnections to
 filter. 

 [element-type NMConnection]
 

 
connection
an NMConnection to validate against nsp
+
an NMConnection to validate against nsp
 

  
 

 

-      for libnm 1.1.91
+      for libnm 1.1.92
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/1.0/.
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index e0c28972..b817d5b5 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -801,6 +801,7 @@
 
 
 
+
 
 
 
@@ -821,6 +822,7 @@
 
 
 
+
 
 
 
@@ -865,6 +867,7 @@
 
 
 
+
 
 
 
@@ -875,6 +878,7 @@
 
 
 
+
 
 
 
@@ -895,6 +899,7 @@
 
 
 
+
 
 
 
@@ -911,6 +916,7 @@
 
 
 
+
 
 
 
diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html
index 0eec1974..852c8876 100644
--- a/docs/libnm/html/libnm-NMConnection.html
+++ b/docs/libnm/html/libnm-NMConnection.html
@@ -74,7 +74,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_connection_to_dbus ()
@@ -82,7 +82,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_replace_settings ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_compare ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_diff ()
@@ -122,7 +122,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_verify ()
@@ -130,7 +130,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_verify_secrets ()
@@ -138,7 +138,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_normalize ()
@@ -169,7 +169,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_update_secrets ()
@@ -199,7 +199,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_is_type ()
@@ -244,7 +244,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_connection_is_virtual ()
@@ -542,18 +542,18 @@
 

 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMConnectionSerializationFlags
 

 

 

 
Description

-
An NMConnection describes all the settings and configuration values that
+
An NMConnection describes all the settings and configuration values that
 are necessary to configure network devices for operation on a specific
 network.  Connections are the fundamental operating object for
-NetworkManager; no device is connected without a NMConnection, or
-disconnected without having been connected with a NMConnection.

-
Each NMConnection contains a list of NMSetting objects usually referenced
+NetworkManager; no device is connected without a NMConnection, or
+disconnected without having been connected with a NMConnection.

+
Each NMConnection contains a list of NMSetting objects usually referenced
 by name (using nm_connection_get_setting_by_name()) or by type (with
 nm_connection_get_setting()).  The settings describe the actual parameters
 with which the network devices are configured, including device-specific
@@ -565,10 +565,10 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters
 

 
nm_connection_add_setting ()

 
void
-nm_connection_add_setting (NMConnection *connection,
+nm_connection_add_setting (NMConnection *connection,
                            NMSetting *setting);

 
Adds a NMSetting to the connection, replacing any previous NMSetting of the
-same name which has previously been added to the NMConnection.  The
+same name which has previously been added to the NMConnection.  The
 connection takes ownership of the NMSetting object and does not increase
 the setting object's reference count.

 

@@ -582,7 +582,7 @@ the setting object's reference count.

 
 
 
connection

-
a NMConnection

+
a NMConnection

  
 
 
@@ -598,9 +598,9 @@ the setting object's reference count.

 

 
nm_connection_remove_setting ()

 
void
-nm_connection_remove_setting (NMConnection *connection,
-                              GType setting_type);

-
Removes the NMSetting with the given GType from the NMConnection.  This
+nm_connection_remove_setting (NMConnection *connection,
+                              GType setting_type);

+
Removes the NMSetting with the given GType from the NMConnection.  This
 operation dereferences the NMSetting object.

 

 
Parameters

@@ -613,12 +613,12 @@ operation dereferences the 
connection

-
a NMConnection

+
a NMConnection

  
 
 
 
setting_type

-
the GType of the setting object to remove

+
the GType of the setting object to remove

  
 
 
@@ -629,10 +629,10 @@ operation dereferences the 
 
nm_connection_get_setting ()

 
NMSetting *
-nm_connection_get_setting (NMConnection *connection,
-                           GType setting_type);

-
Gets the NMSetting with the given GType, if one has been previously added
-to the NMConnection.

+nm_connection_get_setting (NMConnection *connection,
+                           GType setting_type);

+
Gets the NMSetting with the given GType, if one has been previously added
+to the NMConnection.

 

 
Parameters

 

@@ -644,12 +644,12 @@ to the NMConnection.

-
+
-
+
@@ -657,8 +657,8 @@ to the NMConnection.

 
Returns

-
 the NMSetting, or NULL if no setting of that type was previously
-added to the NMConnection. 

+
 the NMSetting, or NULL if no setting of that type was previously
+added to the NMConnection. 

 
[transfer none]

 

@@ -666,10 +666,10 @@ added to the NMConnection. 

 
nm_connection_get_setting_by_name ()

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

 
Gets the NMSetting with the given name, if one has been previously added
-the NMConnection.

+the NMConnection.

 

 
Parameters

 

 
 

 
connection
a NMConnection
a NMConnection

  
 

 

 
setting_type
the GType of the setting object to return
the GType of the setting object to return

  
 

 
 
 
 
 

@@ -681,7 +681,7 @@ the NMConnection.

-
+
@@ -694,18 +694,18 @@ the NMConnection.

 
Returns

-
 the NMSetting, or NULL if no setting with that name was previously
-added to the NMConnection. 

+
 the NMSetting, or NULL if no setting with that name was previously
+added to the NMConnection. 

 
[transfer none]

 

 
nm_connection_to_dbus ()

-
GVariant *
-nm_connection_to_dbus (NMConnection *connection,
+
GVariant *
+nm_connection_to_dbus (NMConnection *connection,
                        NMConnectionSerializationFlags flags);

-
Converts the NMConnection into a GVariant of type
+
Converts the NMConnection into a GVariant of type
 NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for
 marshalling over D-Bus or otherwise serializing.

 

@@ -719,7 +719,7 @@ marshalling over D-Bus or otherwise serializing.

 

-
+
@@ -732,7 +732,7 @@ marshalling over D-Bus or otherwise serializing.

 
Returns

-
 a new floating GVariant describing the connection,
+
 a new floating GVariant describing the connection,
 its settings, and each setting's properties. 

 
[transfer none]

 

@@ -740,10 +740,10 @@ its settings, and each setting's properties. 

 
nm_connection_replace_settings ()

-
gboolean
-nm_connection_replace_settings (NMConnection *connection,
-                                GVariant *new_settings,
-                                GError **error);

+
gboolean
+nm_connection_replace_settings (NMConnection *connection,
+                                GVariant *new_settings,
+                                GError **error);

 
Replaces connection
 's settings with new_settings
  (which must be
@@ -760,17 +760,17 @@ need to result in a connection that passes 
connection

-

+
-
+
-
+
@@ -778,7 +778,7 @@ need to result in a connection that passes 
 
Returns

-
 TRUE if connection was updated, FALSE if new_settings
+
 TRUE if connection was updated, FALSE if new_settings
 could not
 be deserialized (in which case connection
 will be unchanged).

@@ -789,8 +789,8 @@ will be unchanged).
nm_connection_replace_settings_from_connection ()
void
 nm_connection_replace_settings_from_connection
-                               (NMConnection *connection,
-                                NMConnection *new_connection);

+                               (NMConnection *connection,
+                                NMConnection *new_connection);
Deep-copies the settings of new_connection
  and replaces the settings of connection
 
@@ -806,12 +806,12 @@ with the copied settings.

-
+
-
@@ -823,7 +823,7 @@ with

 
nm_connection_clear_settings ()

 
void
-nm_connection_clear_settings (NMConnection *connection);

+nm_connection_clear_settings (NMConnection *connection);
 
Deletes all of connection
 's settings.

 

@@ -836,7 +836,7 @@ nm_connection_clear_settings (NMC
 
 

-
+

 
 

 
connection
a NMConnection
a NMConnection

  
 

 

 
 
 
 
 

 

 
connection
the NMConnection
the NMConnection

  
 

 

 
 
 
 
a NMConnection
a NMConnection

  
 

 

 
new_settings
a GVariant of type NM_VARIANT_TYPE_CONNECTION, with the new settings
a GVariant of type NM_VARIANT_TYPE_CONNECTION, with the new settings

  
 

 

 
error
location to store error, or NULL
location to store error, or NULL

  
 

 
 
 
 
 
 

 
connection
a NMConnection
a NMConnection

  
 

 

 
new_connection
a NMConnection to replace the settings of connection
+
a NMConnection to replace the settings of connection
 with

  
 

 

 
connection
a NMConnection
a NMConnection

  
 

 

@@ -845,11 +845,11 @@ nm_connection_clear_settings (NMC
 

 

 
nm_connection_compare ()

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

-
Compares two NMConnection objects for similarity, with comparison behavior
+
Compares two NMConnection objects for similarity, with comparison behavior
 modified by a set of flags.  See nm_setting_compare() for a description of
 each flag's behavior.

 

@@ -863,12 +863,12 @@ each flag's behavior.

 
 
 
a

-
a NMConnection

+
a NMConnection

  
 
 
 
b

-
a second NMConnection to compare with the first

+
a second NMConnection to compare with the first

  
 
 
@@ -881,18 +881,18 @@ each flag's behavior.

 

 

 
Returns

-
 TRUE if the comparison succeeds, FALSE if it does not

+
 TRUE if the comparison succeeds, FALSE if it does not

 

 

 

 

 
nm_connection_diff ()

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

-
Compares two NMConnection objects for similarity, with comparison behavior
+                    GHashTable **out_settings);

+
Compares two NMConnection objects for similarity, with comparison behavior
 modified by a set of flags.  See nm_setting_compare() for a description of
 each flag's behavior.  If the connections differ, settings and keys within
 each setting that differ are added to the returned out_settings
@@ -909,12 +909,12 @@ No values are returned, only key names.

 
 
 
a

-
a NMConnection

+
a NMConnection

  
 
 
 
b

-
a second NMConnection to compare with the first

+
a second NMConnection to compare with the first

  
 
 
@@ -935,16 +935,16 @@ differ mapped to one or more of 
 
Returns

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

 

 

 

 

 
nm_connection_verify ()

-
gboolean
-nm_connection_verify (NMConnection *connection,
-                      GError **error);

+
gboolean
+nm_connection_verify (NMConnection *connection,
+                      GError **error);

 
Validates the connection and all its settings.  Each setting's properties
 have allowed values, and some values are dependent on other values.  For
 example, if a Wi-Fi connection is security enabled, the NMSettingWireless
@@ -952,7 +952,7 @@ setting object's 'security' property must contain the setting name of the
 NMSettingWirelessSecurity object, which must also be present in the
 connection for the connection to be valid.  As another example, the
 NMSettingWired object's 'mac-address' property must be a validly formatted
-MAC address.  The returned GError contains information about which
+MAC address.  The returned GError contains information about which
 setting and which property failed validation, and how it failed validation.

 

 
Parameters

@@ -965,12 +965,12 @@ setting and which property failed validation, and how it failed validation.

 
 
 
connection

-
the NMConnection to verify

+
the NMConnection to verify

  
 
 
 
error

-
location to store error, or NULL

+
location to store error, or NULL

  
 
 
@@ -978,15 +978,15 @@ setting and which property failed validation, and how it failed validation.

 

 

 
Returns

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

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

 

 

 

 

 
nm_connection_verify_secrets ()

-
gboolean
-nm_connection_verify_secrets (NMConnection *connection,
-                              GError **error);

+
gboolean
+nm_connection_verify_secrets (NMConnection *connection,
+                              GError **error);

 
Verifies the secrets in the connection.

 

 
Parameters

@@ -999,12 +999,12 @@ nm_connection_verify_secrets (NMC
 
 
 
connection

-
the NMConnection to verify in

+
the NMConnection to verify in

  
 
 
 
error

-
location to store error, or NULL

+
location to store error, or NULL

  
 
 
@@ -1012,23 +1012,23 @@ nm_connection_verify_secrets (NMC
 

 

 
Returns

-
 TRUE if the secrets are valid, FALSE if they are not

+
 TRUE if the secrets are valid, FALSE if they are not

 

 
Since: 1.2

 

 

 

 
nm_connection_normalize ()

-
gboolean
-nm_connection_normalize (NMConnection *connection,
-                         GHashTable *parameters,
-                         gboolean *modified,
-                         GError **error);

+
gboolean
+nm_connection_normalize (NMConnection *connection,
+                         GHashTable *parameters,
+                         gboolean *modified,
+                         GError **error);

 
Does some basic normalization and fixup of well known inconsistencies
 and deprecated fields. If the connection was modified in any way,
 the output parameter modified
- is set TRUE.

-
Finally the connection will be verified and TRUE returns if the connection
+ is set TRUE.

+
Finally the connection will be verified and TRUE returns if the connection
 is valid. As this function only performs some specific normalization steps
 it cannot repair all connections. If the connection has errors that
 cannot be normalized, the connection will not be modified.

@@ -1043,15 +1043,15 @@ cannot be normalized, the connection will not be modified.

 
 
 
connection

-
the NMConnection to normalize

+
the NMConnection to normalize

  
 
 
 
parameters

-
 a GHashTable with
+
 a GHashTable with
 normalization parameters to allow customization of the normalization by providing
 specific arguments. Unknown arguments will be ignored and the default will be
-used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
+used. The keys must be strings, hashed by g_str_hash() and g_str_equal() functions.
 The values are opaque and depend on the parameter name. 

 [allow-none][element-type utf8 gpointer]
 
@@ -1062,7 +1062,7 @@ The values are opaque and depend on the parameter name. 

 
 
 
error

-
location to store error, or NULL. Contains the reason,
+
location to store error, or NULL. Contains the reason,
 why the connection is invalid, if the function returns an error.

  
 
@@ -1071,15 +1071,15 @@ why the connection is invalid, if the function returns an error.

 

 

 
Returns

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

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

 

 

 

 

 
nm_connection_need_secrets ()

 
const char *
-nm_connection_need_secrets (NMConnection *connection,
-                            GPtrArray **hints);

+nm_connection_need_secrets (NMConnection *connection,
+                            GPtrArray **hints);

 
Returns the name of the first setting object in the connection which would
 need secrets to make a successful connection.  The returned hints are only
 intended as a guide to what secrets may be required, because in some
@@ -1096,15 +1096,15 @@ secrets are needed.

 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
 
hints

-
  the address of a pointer to a GPtrArray, initialized to NULL, which on
-return points to an allocated GPtrArray containing the property names of
+
  the address of a pointer to a GPtrArray, initialized to NULL, which on
+return points to an allocated GPtrArray containing the property names of
 secrets of the NMSetting which may be required; the caller owns the array
-and must free the array itself with g_ptr_array_free(), but not free its
+and must free the array itself with g_ptr_array_free(), but not free its
 elements. 

 [out][element-type utf8][allow-none][transfer container]
 
@@ -1121,7 +1121,7 @@ missing secrets

 

 
nm_connection_clear_secrets ()

 
void
-nm_connection_clear_secrets (NMConnection *connection);

+nm_connection_clear_secrets (NMConnection *connection);

 
Clears and frees any secrets that may be stored in the connection, to avoid
 keeping secret data in memory when not needed.

 

@@ -1134,7 +1134,7 @@ keeping secret data in memory when not needed.

 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1145,9 +1145,9 @@ keeping secret data in memory when not needed.

 
nm_connection_clear_secrets_with_flags ()

 
void
 nm_connection_clear_secrets_with_flags
-                               (NMConnection *connection,
+                               (NMConnection *connection,
                                 NMSettingClearSecretsWithFlagsFn func,
-                                gpointer user_data);

+                                gpointer user_data);

 
Clears and frees secrets determined by func
 .

 

@@ -1161,7 +1161,7 @@ nm_connection_clear_secrets_with_flags
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -1183,16 +1183,16 @@ specific secret should be cleared or not. 

 

 

 
nm_connection_update_secrets ()

-
gboolean
-nm_connection_update_secrets (NMConnection *connection,
+
gboolean
+nm_connection_update_secrets (NMConnection *connection,
                               const char *setting_name,
-                              GVariant *secrets,
-                              GError **error);

+                              GVariant *secrets,
+                              GError **error);

 
Update the specified setting's secrets, given a dictionary of secrets
 intended for that setting (deserialized from D-Bus for example).  Will also
 extract the given setting's secrets hash if given a connection dictionary.
 If setting_name
- is NULL, expects a fully serialized NMConnection as
+ is NULL, expects a fully serialized NMConnection as
 returned by nm_connection_to_dbus() and will update all secrets from all
 settings contained in secrets
 .

@@ -1207,7 +1207,7 @@ settings contained in secrets
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -1217,13 +1217,13 @@ settings contained in secrets
 
 
 
secrets

-
a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION
+
a GVariant of secrets, of type NM_VARIANT_TYPE_CONNECTION
 or NM_VARIANT_TYPE_SETTING

  
 
 
 
error

-
location to store error, or NULL

+
location to store error, or NULL

  
 
 
@@ -1231,7 +1231,7 @@ or 
 

 
Returns

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

 

 

@@ -1239,10 +1239,10 @@ failed (tried to update secrets for a setting that doesn't exist, etc)

 

 
nm_connection_set_path ()

 
void
-nm_connection_set_path (NMConnection *connection,
+nm_connection_set_path (NMConnection *connection,
                         const char *path);

 
Sets the D-Bus path of the connection.  This property is not serialized, and
-is only for the reference of the caller.  Sets the “path”
+is only for the reference of the caller.  Sets the “path”
 property.

 

 
Parameters

@@ -1255,7 +1255,7 @@ property.

 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -1272,7 +1272,7 @@ which provides the connection

 

 
nm_connection_get_path ()

 
const char *
-nm_connection_get_path (NMConnection *connection);

+nm_connection_get_path (NMConnection *connection);

 
Returns the connection's D-Bus path.

 

 
Parameters

@@ -1284,7 +1284,7 @@ nm_connection_get_path (NMConnect
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1299,9 +1299,9 @@ nm_connection_get_path (NMConnect
 

 
nm_connection_get_interface_name ()

 
const char *
-nm_connection_get_interface_name (NMConnection *connection);

+nm_connection_get_interface_name (NMConnection *connection);

 
Returns the interface name as stored in NMSettingConnection:interface_name.
-If the connection contains no NMSettingConnection, it will return NULL.

+If the connection contains no NMSettingConnection, it will return NULL.

 
For hardware devices and software devices created outside of NetworkManager,
 this name is used to match the device. for software devices created by
 NetworkManager, this is the name of the created interface.

@@ -1315,21 +1315,21 @@ NetworkManager, this is the name of the created interface.

 
 
 
connection

-
The NMConnection

+
The NMConnection

  
 
 

 

 

 
Returns

-
 Name of the kernel interface or NULL

+
 Name of the kernel interface or NULL

 

 

 

 

 
nm_connection_is_type ()

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

 
A convenience function to check if the given connection
  is a particular
@@ -1347,7 +1347,7 @@ property of the connection and matches that against 
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -1361,18 +1361,18 @@ property of the connection and matches that against 
 

 

 
Returns

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

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

 

 

 

 

 
nm_connection_for_each_setting_value ()

 
void
-nm_connection_for_each_setting_value (NMConnection *connection,
+nm_connection_for_each_setting_value (NMConnection *connection,
                                       NMSettingValueIterFn func,
-                                      gpointer user_data);

-
Iterates over the properties of each NMSetting object in the NMConnection,
+                                      gpointer user_data);

+
Iterates over the properties of each NMSetting object in the NMConnection,
 calling the supplied user function for each property.

 

 
Parameters

@@ -1385,7 +1385,7 @@ calling the supplied user function for each property.

 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -1407,7 +1407,7 @@ at each invocation

 

 
nm_connection_dump ()

 
void
-nm_connection_dump (NMConnection *connection);

+nm_connection_dump (NMConnection *connection);

 
Print the connection to stdout.  For debugging purposes ONLY, should NOT
 be used for serialization of the connection or machine-parsed in any way. The
 output format is not guaranteed to be stable and may change at any time.

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

 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

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

 

 
nm_connection_get_uuid ()

 
const char *
-nm_connection_get_uuid (NMConnection *connection);

+nm_connection_get_uuid (NMConnection *connection);

 
A shortcut to return the UUID from the connection's NMSettingConnection.

 

 
Parameters

@@ -1443,7 +1443,7 @@ nm_connection_get_uuid (NMConnect
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1457,7 +1457,7 @@ nm_connection_get_uuid (NMConnect
 

 
nm_connection_get_id ()

 
const char *
-nm_connection_get_id (NMConnection *connection);

+nm_connection_get_id (NMConnection *connection);

 
A shortcut to return the ID from the connection's NMSettingConnection.

 

 
Parameters

@@ -1469,7 +1469,7 @@ nm_connection_get_id (NMConnectio
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1483,7 +1483,7 @@ nm_connection_get_id (NMConnectio
 

 
nm_connection_get_connection_type ()

 
const char *
-nm_connection_get_connection_type (NMConnection *connection);

+nm_connection_get_connection_type (NMConnection *connection);

 
A shortcut to return the type from the connection's NMSettingConnection.

 

 
Parameters

@@ -1495,7 +1495,7 @@ nm_connection_get_connection_type (
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1508,8 +1508,8 @@ nm_connection_get_connection_type (
 
nm_connection_is_virtual ()

-
gboolean
-nm_connection_is_virtual (NMConnection *connection);

+
gboolean
+nm_connection_is_virtual (NMConnection *connection);

 
Checks if connection
  refers to a virtual device (and thus can potentially be
 activated even if the device it refers to doesn't exist).

@@ -1523,7 +1523,7 @@ activated even if the device it refers to doesn't exist).

 
 
 
connection

-
an NMConnection

+
an NMConnection

  
 
 

@@ -1539,7 +1539,7 @@ refers to a virtual device

 
nm_connection_get_virtual_device_description ()

 
char *
 nm_connection_get_virtual_device_description
-                               (NMConnection *connection);

+                               (NMConnection *connection);

 
Returns the name that nm_device_disambiguate_names() would
 return for the virtual device that would be created for connection
 .
@@ -1554,7 +1554,7 @@ Eg, "VLAN (eth1.1)".

 
 
 
connection

-
an NMConnection for a virtual device type

+
an NMConnection for a virtual device type

  
 
 

@@ -1563,7 +1563,7 @@ Eg, "VLAN (eth1.1)".

 
Returns

 
 the name of connection
 's device,
-or NULL if connection
+or NULL if connection
 is not a virtual connection type. 

 
[transfer full]

 

@@ -1572,7 +1572,7 @@ is not a virtual connection type. 

 

 
nm_connection_get_setting_802_1x ()

 
NMSetting8021x *
-nm_connection_get_setting_802_1x (NMConnection *connection);

+nm_connection_get_setting_802_1x (NMConnection *connection);

 
A shortcut to return any NMSetting8021x the connection might contain.

 

 
Parameters

@@ -1584,14 +1584,14 @@ nm_connection_get_setting_802_1x (
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSetting8021x if the connection contains one, otherwise NULL. 

+
 an NMSetting8021x if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 

@@ -1599,7 +1599,7 @@ nm_connection_get_setting_802_1x (
 
nm_connection_get_setting_bluetooth ()

 
NMSettingBluetooth *
-nm_connection_get_setting_bluetooth (NMConnection *connection);

+nm_connection_get_setting_bluetooth (NMConnection *connection);

 
A shortcut to return any NMSettingBluetooth the connection might contain.

 

 
Parameters

@@ -1611,14 +1611,14 @@ nm_connection_get_setting_bluetooth (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingBluetooth if the connection contains one, otherwise NULL. 

+
 an NMSettingBluetooth if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 

@@ -1626,7 +1626,7 @@ nm_connection_get_setting_bluetooth (
 
nm_connection_get_setting_bond ()

 
NMSettingBond *
-nm_connection_get_setting_bond (NMConnection *connection);

+nm_connection_get_setting_bond (NMConnection *connection);

 
A shortcut to return any NMSettingBond the connection might contain.

 

 
Parameters

@@ -1638,14 +1638,14 @@ nm_connection_get_setting_bond (N
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingBond if the connection contains one, otherwise NULL. 

+
 an NMSettingBond if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 

@@ -1653,7 +1653,7 @@ nm_connection_get_setting_bond (N
 

 
nm_connection_get_setting_team ()

 
NMSettingTeam *
-nm_connection_get_setting_team (NMConnection *connection);

+nm_connection_get_setting_team (NMConnection *connection);

 
A shortcut to return any NMSettingTeam the connection might contain.

 

 
Parameters

@@ -1665,14 +1665,14 @@ nm_connection_get_setting_team (N
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingTeam if the connection contains one, otherwise NULL. 

+
 an NMSettingTeam if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 

@@ -1680,7 +1680,7 @@ nm_connection_get_setting_team (N
 

 
nm_connection_get_setting_team_port ()

 
NMSettingTeamPort *
-nm_connection_get_setting_team_port (NMConnection *connection);

+nm_connection_get_setting_team_port (NMConnection *connection);

 
A shortcut to return any NMSettingTeamPort the connection might contain.

 

 
Parameters

@@ -1692,14 +1692,14 @@ nm_connection_get_setting_team_port (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingTeamPort if the connection contains one, otherwise NULL. 

+
 an NMSettingTeamPort if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 

@@ -1707,7 +1707,7 @@ nm_connection_get_setting_team_port (
 
nm_connection_get_setting_bridge ()

 
NMSettingBridge *
-nm_connection_get_setting_bridge (NMConnection *connection);

+nm_connection_get_setting_bridge (NMConnection *connection);
 
A shortcut to return any NMSettingBridge the connection might contain.

 

 
Parameters

@@ -1719,14 +1719,14 @@ nm_connection_get_setting_bridge (
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingBridge if the connection contains one, otherwise NULL. 

+
 an NMSettingBridge if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1734,7 +1734,7 @@ nm_connection_get_setting_bridge (
 
nm_connection_get_setting_bridge_port ()

 
NMSettingBridgePort *
-nm_connection_get_setting_bridge_port (NMConnection *connection);

+nm_connection_get_setting_bridge_port (NMConnection *connection);
 
A shortcut to return any NMSettingBridgePort the connection might contain.

 

 
Parameters

@@ -1746,14 +1746,14 @@ nm_connection_get_setting_bridge_port (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingBridgePort if the connection contains one, otherwise NULL. 

+
 an NMSettingBridgePort if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1761,7 +1761,7 @@ nm_connection_get_setting_bridge_port (
 
nm_connection_get_setting_cdma ()

 
NMSettingCdma *
-nm_connection_get_setting_cdma (NMConnection *connection);

+nm_connection_get_setting_cdma (NMConnection *connection);
 
A shortcut to return any NMSettingCdma the connection might contain.

 

 
Parameters

@@ -1773,14 +1773,14 @@ nm_connection_get_setting_cdma (N
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingCdma if the connection contains one, otherwise NULL. 

+
 an NMSettingCdma if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1788,7 +1788,7 @@ nm_connection_get_setting_cdma (N
 

 
nm_connection_get_setting_connection ()

 
NMSettingConnection *
-nm_connection_get_setting_connection (NMConnection *connection);

+nm_connection_get_setting_connection (NMConnection *connection);
 
A shortcut to return any NMSettingConnection the connection might contain.

 

 
Parameters

@@ -1800,14 +1800,14 @@ nm_connection_get_setting_connection (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingConnection if the connection contains one, otherwise NULL. 

+
 an NMSettingConnection if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1815,7 +1815,7 @@ nm_connection_get_setting_connection (
 
nm_connection_get_setting_dcb ()

 
NMSettingDcb *
-nm_connection_get_setting_dcb (NMConnection *connection);

+nm_connection_get_setting_dcb (NMConnection *connection);
 
A shortcut to return any NMSettingDcb the connection might contain.

 

 
Parameters

@@ -1827,7 +1827,7 @@ nm_connection_get_setting_dcb (NM
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1842,7 +1842,7 @@ nm_connection_get_setting_dcb (NM
 

 
nm_connection_get_setting_generic ()

 
NMSettingGeneric *
-nm_connection_get_setting_generic (NMConnection *connection);

+nm_connection_get_setting_generic (NMConnection *connection);
 
A shortcut to return any NMSettingGeneric the connection might contain.

 

 
Parameters

@@ -1854,7 +1854,7 @@ nm_connection_get_setting_generic (
connection

-
the NMConnection

+
the NMConnection

  
 
 

@@ -1869,7 +1869,7 @@ nm_connection_get_setting_generic (
 
nm_connection_get_setting_gsm ()

 
NMSettingGsm *
-nm_connection_get_setting_gsm (NMConnection *connection);

+nm_connection_get_setting_gsm (NMConnection *connection);
 
A shortcut to return any NMSettingGsm the connection might contain.

 

 
Parameters

@@ -1881,14 +1881,14 @@ nm_connection_get_setting_gsm (NM
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingGsm if the connection contains one, otherwise NULL. 

+
 an NMSettingGsm if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1896,7 +1896,7 @@ nm_connection_get_setting_gsm (NM
 

 
nm_connection_get_setting_infiniband ()

 
NMSettingInfiniband *
-nm_connection_get_setting_infiniband (NMConnection *connection);

+nm_connection_get_setting_infiniband (NMConnection *connection);
 
A shortcut to return any NMSettingInfiniband the connection might contain.

 

 
Parameters

@@ -1908,14 +1908,14 @@ nm_connection_get_setting_infiniband (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingInfiniband if the connection contains one, otherwise NULL. 

+
 an NMSettingInfiniband if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -1923,7 +1923,7 @@ nm_connection_get_setting_infiniband (
 
nm_connection_get_setting_ip_tunnel ()

 
NMSettingIPTunnel *
-nm_connection_get_setting_ip_tunnel (NMConnection *connection);

+nm_connection_get_setting_ip_tunnel (NMConnection *connection);
 
A shortcut to return any NMSettingIPTunnel the connection might contain.

 

 
Parameters

@@ -1935,14 +1935,14 @@ nm_connection_get_setting_ip_tunnel (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingIPTunnel if the connection contains one, otherwise NULL. 

+
 an NMSettingIPTunnel if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
Since: 1.2

@@ -1951,7 +1951,7 @@ nm_connection_get_setting_ip_tunnel (
 
nm_connection_get_setting_ip4_config ()

 
NMSettingIPConfig *
-nm_connection_get_setting_ip4_config (NMConnection *connection);

+nm_connection_get_setting_ip4_config (NMConnection *connection);
 
A shortcut to return any NMSettingIP4Config the connection might contain.

 
Note that it returns the value as type NMSettingIPConfig, since the vast
 majority of IPv4-setting-related methods are on that type, not
@@ -1966,7 +1966,7 @@ majority of IPv4-setting-related methods are on that type, not
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -1974,7 +1974,7 @@ majority of IPv4-setting-related methods are on that type, not
 

 
Returns

 
 an NMSettingIP4Config if the
-connection contains one, otherwise NULL. 

+connection contains one, otherwise NULL. 

 
[type NMSettingIP4Config][transfer none]

 

 
@@ -1982,7 +1982,7 @@ connection contains one, otherwise 
 
nm_connection_get_setting_ip6_config ()

 
NMSettingIPConfig *
-nm_connection_get_setting_ip6_config (NMConnection *connection);

+nm_connection_get_setting_ip6_config (NMConnection *connection);
 
A shortcut to return any NMSettingIP6Config the connection might contain.

 
Note that it returns the value as type NMSettingIPConfig, since the vast
 majority of IPv6-setting-related methods are on that type, not
@@ -1997,7 +1997,7 @@ majority of IPv6-setting-related methods are on that type, not
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 
@@ -2005,7 +2005,7 @@ majority of IPv6-setting-related methods are on that type, not
 

 
Returns

 
 an NMSettingIP6Config if the
-connection contains one, otherwise NULL. 

+connection contains one, otherwise NULL. 

 
[type NMSettingIP6Config][transfer none]

 

 
@@ -2013,7 +2013,7 @@ connection contains one, otherwise 
 
nm_connection_get_setting_macvlan ()

 
NMSettingMacvlan *
-nm_connection_get_setting_macvlan (NMConnection *connection);

+nm_connection_get_setting_macvlan (NMConnection *connection);
 
A shortcut to return any NMSettingMacvlan the connection might contain.

 

 
Parameters

@@ -2025,14 +2025,14 @@ nm_connection_get_setting_macvlan (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingMacvlan if the connection contains one, otherwise NULL. 

+
 an NMSettingMacvlan if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
Since: 1.2

@@ -2041,7 +2041,7 @@ nm_connection_get_setting_macvlan (
 
nm_connection_get_setting_olpc_mesh ()

 
NMSettingOlpcMesh *
-nm_connection_get_setting_olpc_mesh (NMConnection *connection);

+nm_connection_get_setting_olpc_mesh (NMConnection *connection);
 
A shortcut to return any NMSettingOlpcMesh the connection might contain.

 

 
Parameters

@@ -2053,14 +2053,14 @@ nm_connection_get_setting_olpc_mesh (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 

+
 an NMSettingOlpcMesh if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2068,7 +2068,7 @@ nm_connection_get_setting_olpc_mesh (
 
nm_connection_get_setting_ppp ()

 
NMSettingPpp *
-nm_connection_get_setting_ppp (NMConnection *connection);

+nm_connection_get_setting_ppp (NMConnection *connection);
 
A shortcut to return any NMSettingPpp the connection might contain.

 

 
Parameters

@@ -2080,14 +2080,14 @@ nm_connection_get_setting_ppp (NM
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingPpp if the connection contains one, otherwise NULL. 

+
 an NMSettingPpp if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2095,7 +2095,7 @@ nm_connection_get_setting_ppp (NM
 

 
nm_connection_get_setting_pppoe ()

 
NMSettingPppoe *
-nm_connection_get_setting_pppoe (NMConnection *connection);

+nm_connection_get_setting_pppoe (NMConnection *connection);
 
A shortcut to return any NMSettingPppoe the connection might contain.

 

 
Parameters

@@ -2107,14 +2107,14 @@ nm_connection_get_setting_pppoe (
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingPppoe if the connection contains one, otherwise NULL. 

+
 an NMSettingPppoe if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2122,7 +2122,7 @@ nm_connection_get_setting_pppoe (
 

 
nm_connection_get_setting_serial ()

 
NMSettingSerial *
-nm_connection_get_setting_serial (NMConnection *connection);

+nm_connection_get_setting_serial (NMConnection *connection);
 
A shortcut to return any NMSettingSerial the connection might contain.

 

 
Parameters

@@ -2134,14 +2134,14 @@ nm_connection_get_setting_serial (
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingSerial if the connection contains one, otherwise NULL. 

+
 an NMSettingSerial if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2149,7 +2149,7 @@ nm_connection_get_setting_serial (
 
nm_connection_get_setting_tun ()

 
NMSettingTun *
-nm_connection_get_setting_tun (NMConnection *connection);

+nm_connection_get_setting_tun (NMConnection *connection);
 
A shortcut to return any NMSettingTun the connection might contain.

 

 
Parameters

@@ -2161,14 +2161,14 @@ nm_connection_get_setting_tun (NM
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingTun if the connection contains one, otherwise NULL. 

+
 an NMSettingTun if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
Since: 1.2

@@ -2177,7 +2177,7 @@ nm_connection_get_setting_tun (NM
 

 
nm_connection_get_setting_vpn ()

 
NMSettingVpn *
-nm_connection_get_setting_vpn (NMConnection *connection);

+nm_connection_get_setting_vpn (NMConnection *connection);
 
A shortcut to return any NMSettingVpn the connection might contain.

 

 
Parameters

@@ -2189,14 +2189,14 @@ nm_connection_get_setting_vpn (NM
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingVpn if the connection contains one, otherwise NULL. 

+
 an NMSettingVpn if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2204,7 +2204,7 @@ nm_connection_get_setting_vpn (NM
 

 
nm_connection_get_setting_wimax ()

 
NMSettingWimax *
-nm_connection_get_setting_wimax (NMConnection *connection);

+nm_connection_get_setting_wimax (NMConnection *connection);
 
A shortcut to return any NMSettingWimax the connection might contain.

 

 
Parameters

@@ -2216,14 +2216,14 @@ nm_connection_get_setting_wimax (
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingWimax if the connection contains one, otherwise NULL. 

+
 an NMSettingWimax if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2231,7 +2231,7 @@ nm_connection_get_setting_wimax (
 

 
nm_connection_get_setting_adsl ()

 
NMSettingAdsl *
-nm_connection_get_setting_adsl (NMConnection *connection);

+nm_connection_get_setting_adsl (NMConnection *connection);
 
A shortcut to return any NMSettingAdsl the connection might contain.

 

 
Parameters

@@ -2243,14 +2243,14 @@ nm_connection_get_setting_adsl (N
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingAdsl if the connection contains one, otherwise NULL. 

+
 an NMSettingAdsl if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2258,7 +2258,7 @@ nm_connection_get_setting_adsl (N
 

 
nm_connection_get_setting_wired ()

 
NMSettingWired *
-nm_connection_get_setting_wired (NMConnection *connection);

+nm_connection_get_setting_wired (NMConnection *connection);
 
A shortcut to return any NMSettingWired the connection might contain.

 

 
Parameters

@@ -2270,14 +2270,14 @@ nm_connection_get_setting_wired (
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingWired if the connection contains one, otherwise NULL. 

+
 an NMSettingWired if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2285,7 +2285,7 @@ nm_connection_get_setting_wired (
 

 
nm_connection_get_setting_wireless ()

 
NMSettingWireless *
-nm_connection_get_setting_wireless (NMConnection *connection);

+nm_connection_get_setting_wireless (NMConnection *connection);
 
A shortcut to return any NMSettingWireless the connection might contain.

 

 
Parameters

@@ -2297,14 +2297,14 @@ nm_connection_get_setting_wireless (
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingWireless if the connection contains one, otherwise NULL. 

+
 an NMSettingWireless if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2313,7 +2313,7 @@ nm_connection_get_setting_wireless (
nm_connection_get_setting_wireless_security ()

 
NMSettingWirelessSecurity *
 nm_connection_get_setting_wireless_security
-                               (NMConnection *connection);

+                               (NMConnection *connection);
 
A shortcut to return any NMSettingWirelessSecurity the connection might contain.

 

 
Parameters

@@ -2325,14 +2325,14 @@ nm_connection_get_setting_wireless_security
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 
 

 
Returns

-
 an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 

+
 an NMSettingWirelessSecurity if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2340,7 +2340,7 @@ nm_connection_get_setting_wireless_security
 

 
nm_connection_get_setting_vlan ()

 
NMSettingVlan *
-nm_connection_get_setting_vlan (NMConnection *connection);

+nm_connection_get_setting_vlan (NMConnection *connection);
 
A shortcut to return any NMSettingVlan the connection might contain.

 

 
Parameters

@@ -2352,14 +2352,14 @@ nm_connection_get_setting_vlan (N
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingVlan if the connection contains one, otherwise NULL. 

+
 an NMSettingVlan if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
@@ -2367,7 +2367,7 @@ nm_connection_get_setting_vlan (N
 

 
nm_connection_get_setting_vxlan ()

 
NMSettingVxlan *
-nm_connection_get_setting_vxlan (NMConnection *connection);

+nm_connection_get_setting_vxlan (NMConnection *connection);
 
A shortcut to return any NMSettingVxlan the connection might contain.

 

 
Parameters

@@ -2379,14 +2379,14 @@ nm_connection_get_setting_vxlan (
 
 
 
connection

-
the NMConnection

+
the NMConnection

  
 
 

 

 

 
Returns

-
 an NMSettingVxlan if the connection contains one, otherwise NULL. 

+
 an NMSettingVxlan if the connection contains one, otherwise NULL. 

 
[transfer none]

 

 
Since: 1.2

@@ -2440,7 +2440,7 @@ nm_connection_get_setting_vxlan (
 
 
 
-
GTypeInterface parent;

+
GTypeInterface parent;

 
the parent interace struct

  
 
@@ -2468,8 +2468,8 @@ nm_connection_get_setting_vxlan (
 
NM_VARIANT_TYPE_SETTING

 
#define NM_VARIANT_TYPE_SETTING G_VARIANT_TYPE_VARDICT
 

-
GVariantType for a dictionary mapping from property names to values. This is
-an alias for G_VARIANT_TYPE_VARDICT, and is the type of each element of
+
GVariantType for a dictionary mapping from property names to values. This is
+an alias for G_VARIANT_TYPE_VARDICT, and is the type of each element of
 an NM_VARIANT_TYPE_CONNECTION dictionary.

 
 

diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 0b751832..4322caee 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -349,7 +349,7 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NM80211Mode
     ├── NMActiveConnectionState
     ├── NMConnectivityState
@@ -359,7 +359,7 @@
     ├── NMIPTunnelMode
     ├── NMMetered
     ╰── NMState
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -2247,7 +2247,7 @@ VPN plugin authentication dialogs.

 

 

 
NM_LLDP_ATTR_IEEE_802_1_VID

-
#define NM_LLDP_ATTR_IEEE_802_1_VID "ieee-802-1-pvid"
+
#define NM_LLDP_ATTR_IEEE_802_1_VID "ieee-802-1-vid"
 

 

 

diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index 2df6ab71..595a766b 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -42,7 +42,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_agent_manager_error_quark ()
@@ -54,7 +54,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_connection_error_quark ()
@@ -62,7 +62,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_crypto_error_quark ()
@@ -70,7 +70,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_device_error_quark ()
@@ -78,7 +78,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_manager_error_quark ()
@@ -90,7 +90,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_secret_agent_error_quark ()
@@ -102,7 +102,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_settings_error_quark ()
@@ -118,7 +118,7 @@
 
 
 
-GQuark
+GQuark
 
 
 nm_vpn_plugin_error_quark ()
@@ -184,7 +184,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMCryptoError
@@ -202,7 +202,7 @@
 
Functions

 

 
nm_agent_manager_error_quark ()

-
GQuark
+
GQuark
 nm_agent_manager_error_quark (void);

 

 

@@ -214,25 +214,25 @@ nm_agent_manager_error_quark (voi
 

 

 
nm_connection_error_quark ()

-
GQuark
+
GQuark
 nm_connection_error_quark (void);

 

 

 

 
nm_crypto_error_quark ()

-
GQuark
+
GQuark
 nm_crypto_error_quark (void);

 

 

 

 
nm_device_error_quark ()

-
GQuark
+
GQuark
 nm_device_error_quark (void);

 

 

 

 
nm_manager_error_quark ()

-
GQuark
+
GQuark
 nm_manager_error_quark (void);

 

 

@@ -244,7 +244,7 @@ nm_manager_error_quark (void
 

 
nm_secret_agent_error_quark ()

-
GQuark
+
GQuark
 nm_secret_agent_error_quark (void);

 

 

@@ -256,7 +256,7 @@ nm_secret_agent_error_quark (void
 

 

 
nm_settings_error_quark ()

-
GQuark
+
GQuark
 nm_settings_error_quark (void);

 

 

@@ -274,7 +274,7 @@ nm_settings_error_quark (void
 

 
nm_vpn_plugin_error_quark ()

-
GQuark
+
GQuark
 nm_vpn_plugin_error_quark (void);

 

 

@@ -284,7 +284,7 @@ nm_vpn_plugin_error_quark (void
enum NMAgentManagerError

 
Errors returned from the secret-agent manager.

 
These errors may be returned from operations that could cause secrets to be
-requested (such as nm_client_activate_connection()), and correspond to D-Bus
+requested (such as nm_client_activate_connection()), and correspond to D-Bus
 errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

 

 
Members

@@ -349,9 +349,9 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

 

 

 
enum NMConnectionError

-
Describes errors that may result from operations involving a NMConnection
+
Describes errors that may result from operations involving a NMConnection
 or its NMSettings.

-
These errors may be returned directly from NMConnection and NMSetting
+
These errors may be returned directly from NMConnection and NMSetting
 methods, or may be returned from D-Bus operations (eg on NMClient or
 NMDevice), where they correspond to errors in the
 "org.freedesktop.NetworkManager.Settings.Connection" namespace.

@@ -374,7 +374,7 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR_SETTING_NOT_FOUND

 
-
the NMConnection object
+
the NMConnection object
   did not contain the specified NMSetting object

 
  
@@ -382,7 +382,7 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND

 
-
the NMConnection did not contain the
+
the NMConnection did not contain the
   requested NMSetting property

 
  
@@ -398,7 +398,7 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR_MISSING_SETTING

 
-
the NMConnection object is missing an
+
the NMConnection object is missing an
   NMSetting which is required for its configuration. The error message will
   always be prefixed with "<setting-name>: ", where "<setting-name>" is the
   name of the setting that is missing.

@@ -408,7 +408,7 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR_INVALID_SETTING

 
-
the NMConnection object contains an
+
the NMConnection object contains an
   invalid or inappropriate NMSetting. The error message will always be
   prefixed with "<setting-name>: ", where "<setting-name>" is the name of the
   setting that is invalid.

@@ -418,7 +418,7 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR_MISSING_PROPERTY

 
-
the NMConnection object is invalid
+
the NMConnection object is invalid
   because it is missing a required property. The error message will always be
   prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is
   the name of the setting with the missing property, and "<property-name>" is
@@ -429,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on 
NM_CONNECTION_ERROR_INVALID_PROPERTY

 
-
the NMConnection object is invalid
+
the NMConnection object is invalid
   because a property has an invalid value. The error message will always be
   prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is
   the name of the setting with the invalid property, and "<property-name>" is
@@ -725,7 +725,7 @@ errors in that namespace.

 when they encounter problems retrieving secrets on behalf of NM. They
 correspond to errors in the "org.freedesktop.NetworkManager.SecretManager"
 namespace.

-
Client APIs such as nm_client_activate_connection() will not see these error
+
Client APIs such as nm_client_activate_connection() will not see these error
 codes; instead, the secret agent manager will translate them to the
 corresponding NMAgentManagerError codes.

 

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 05e26b42..864e8463 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -42,7 +42,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_empty_ssid ()
@@ -57,7 +57,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_same_ssid ()
@@ -73,7 +73,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_security_valid ()
@@ -81,7 +81,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_ap_mode_security_valid ()
@@ -89,7 +89,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wep_key_valid ()
@@ -97,7 +97,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wpa_psk_valid ()
@@ -105,7 +105,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip4_dns_to_variant ()
@@ -121,7 +121,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip4_addresses_to_variant ()
@@ -129,7 +129,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip4_addresses_from_variant ()
@@ -137,7 +137,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip4_routes_to_variant ()
@@ -145,7 +145,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip4_routes_from_variant ()
@@ -153,7 +153,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_netmask_to_prefix ()
@@ -161,7 +161,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_prefix_to_netmask ()
@@ -169,7 +169,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_ip4_get_default_prefix ()
@@ -177,7 +177,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip6_dns_to_variant ()
@@ -193,7 +193,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip6_addresses_to_variant ()
@@ -201,7 +201,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip6_addresses_from_variant ()
@@ -209,7 +209,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip6_routes_to_variant ()
@@ -217,7 +217,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip6_routes_from_variant ()
@@ -225,7 +225,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip_addresses_to_variant ()
@@ -233,7 +233,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip_addresses_from_variant ()
@@ -241,7 +241,7 @@
 
 
 
-GVariant *
+GVariant *
 
 
 nm_utils_ip_routes_to_variant ()
@@ -249,7 +249,7 @@
 
 
 
-GPtrArray *
+GPtrArray *
 
 
 nm_utils_ip_routes_from_variant ()
@@ -265,7 +265,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_certificate ()
@@ -273,7 +273,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_private_key ()
@@ -281,7 +281,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_file_is_pkcs12 ()
@@ -289,7 +289,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMUtilsFileSearchInPathsPredicate) ()
@@ -297,7 +297,7 @@
 
 
 
-gboolean
+gboolean
 
 
 (*NMUtilsCheckFilePredicate) ()
@@ -312,7 +312,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_freq_to_channel ()
@@ -320,7 +320,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_channel_to_freq ()
@@ -328,7 +328,7 @@
 
 
 
-guint32
+guint32
 
 
 nm_utils_wifi_find_next_channel ()
@@ -336,21 +336,21 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_wifi_is_channel_valid ()
 
 
 
-const guint *
+const guint *
 
 
 nm_utils_wifi_2ghz_freqs ()
 
 
 
-const guint *
+const guint *
 
 
 nm_utils_wifi_5ghz_freqs ()
@@ -365,7 +365,7 @@
 
 
 
-gsize
+gsize
 
 
 nm_utils_hwaddr_len ()
@@ -381,7 +381,7 @@
 
 
 
-GByteArray *
+GByteArray *
 
 
 nm_utils_hwaddr_atoba ()
@@ -389,7 +389,7 @@
 
 
 
-guint8 *
+guint8 *
 
 
 nm_utils_hwaddr_aton ()
@@ -397,7 +397,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_hwaddr_valid ()
@@ -413,7 +413,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_hwaddr_matches ()
@@ -429,7 +429,7 @@
 
 
 
-GBytes *
+GBytes *
 
 
 nm_utils_hexstr2bin ()
@@ -437,7 +437,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_iface_valid_name ()
@@ -445,7 +445,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_is_uuid ()
@@ -467,7 +467,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_ipaddr_valid ()
@@ -475,7 +475,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_check_virtual_device_compatibility ()
@@ -506,7 +506,7 @@
 
 
 
-gboolean
+gboolean
 
 
 nm_utils_enum_from_str ()
@@ -551,7 +551,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
 

 

@@ -564,9 +564,9 @@ access points and devices, among other things.

 
Functions

 

 
nm_utils_is_empty_ssid ()

-
gboolean
-nm_utils_is_empty_ssid (const guint8 *ssid,
-                        gsize len);

+
gboolean
+nm_utils_is_empty_ssid (const guint8 *ssid,
+                        gsize len);

 
Different manufacturers use different mechanisms for not broadcasting the
 AP's SSID.  This function attempts to detect blank/empty SSIDs using a
 number of known SSID-cloaking methods.

@@ -595,15 +595,15 @@ number of known SSID-cloaking methods.

 

 

 
Returns

-
 TRUE if the SSID is "empty", FALSE if it is not

+
 TRUE if the SSID is "empty", FALSE if it is not

 

 

 

 

 
nm_utils_escape_ssid ()

 
const char *
-nm_utils_escape_ssid (const guint8 *ssid,
-                      gsize len);

+nm_utils_escape_ssid (const guint8 *ssid,
+                      gsize len);
 
This function does a quick printable character conversion of the SSID, simply
 replacing embedded NULLs and non-printable characters with the hexadecimal
 representation of that character.  Intended for debugging only, should not
@@ -640,12 +640,12 @@ and will be overwritten by subsequent calls to this function

 

 

 
nm_utils_same_ssid ()

-
gboolean
-nm_utils_same_ssid (const guint8 *ssid1,
-                    gsize len1,
-                    const guint8 *ssid2,
-                    gsize len2,
-                    gboolean ignore_trailing_null);

+
gboolean
+nm_utils_same_ssid (const guint8 *ssid1,
+                    gsize len1,
+                    const guint8 *ssid2,
+                    gsize len2,
+                    gboolean ignore_trailing_null);

 
Earlier versions of the Linux kernel added a NULL byte to the end of the
 SSID to enable easy printing of the SSID on the console or in a terminal,
 but this behavior was problematic (SSIDs are simply byte arrays, not strings)
@@ -685,7 +685,7 @@ NULLs, even though that is functionally pointless.

 
 
 
ignore_trailing_null

-
TRUE to ignore one trailing NULL byte

+
TRUE to ignore one trailing NULL byte

  
 
 
@@ -693,15 +693,15 @@ NULLs, even though that is functionally pointless.

 

 

 
Returns

-
 TRUE if the SSIDs are the same, FALSE if they are not

+
 TRUE if the SSIDs are the same, FALSE if they are not

 

 

 

 

 
nm_utils_ssid_to_utf8 ()

 
char *
-nm_utils_ssid_to_utf8 (const guint8 *ssid,
-                       gsize len);

+nm_utils_ssid_to_utf8 (const guint8 *ssid,
+                       gsize len);
 
Wi-Fi SSIDs are byte arrays, they are _not_ strings.  Thus, an SSID may
 contain embedded NULLs and other unprintable characters.  Often it is
 useful to print the SSID out for debugging purposes, but that should be the
@@ -747,19 +747,19 @@ _only_.

 

 
Returns

 
 an allocated string containing a UTF-8
-representation of the SSID, which must be freed by the caller using g_free().
-Returns NULL on errors. 

+representation of the SSID, which must be freed by the caller using g_free().
+Returns NULL on errors. 

 
[transfer full]

 

 

 

 

 
nm_utils_security_valid ()

-
gboolean
+
gboolean
 nm_utils_security_valid (NMUtilsSecurityType type,
                          NMDeviceWifiCapabilities wifi_caps,
-                         gboolean have_ap,
-                         gboolean adhoc,
+                         gboolean have_ap,
+                         gboolean adhoc,
                          NM80211ApFlags ap_flags,
                          NM80211ApSecurityFlags ap_wpa,
                          NM80211ApSecurityFlags ap_rsn);

@@ -824,15 +824,15 @@ e.g. (
 
Returns

-
 TRUE if the device capabilities and AP capabilties intersect and are
+
 TRUE if the device capabilities and AP capabilties intersect and are
 compatible with the desired type
-, FALSE if they are not

+, FALSE if they are not

 

 

 

 

 
nm_utils_ap_mode_security_valid ()

-
gboolean
+
gboolean
 nm_utils_ap_mode_security_valid (NMUtilsSecurityType type,
                                  NMDeviceWifiCapabilities wifi_caps);

 
Given a set of device capabilities, and a desired security type to check
@@ -864,15 +864,15 @@ e.g. 
 

 
Returns

-
 TRUE if the device capabilities are compatible with the desired
+
 TRUE if the device capabilities are compatible with the desired
 type
-, FALSE if they are not.

+, FALSE if they are not.

 

 

 

 

 
nm_utils_wep_key_valid ()

-
gboolean
+
gboolean
 nm_utils_wep_key_valid (const char *key,
                         NMWepKeyType wep_type);

 
Checks if key
@@ -901,14 +901,14 @@ nm_utils_wep_key_valid (const cha
 

 

 
Returns

-
 TRUE if key
-is a WEP key, FALSE if not

+
 TRUE if key
+is a WEP key, FALSE if not

 

 
 

 

 
nm_utils_wpa_psk_valid ()

-
gboolean
+
gboolean
 nm_utils_wpa_psk_valid (const char *psk);

 
Checks if psk
  is a valid WPA PSK

@@ -929,16 +929,16 @@ nm_utils_wpa_psk_valid (const cha
 

 

 
Returns

-
 TRUE if psk
-is a WPA PSK, FALSE if not

+
 TRUE if psk
+is a WPA PSK, FALSE if not

 

 
 

 

 
nm_utils_ip4_dns_to_variant ()

-
GVariant *
+
GVariant *
 nm_utils_ip4_dns_to_variant (char **dns);

-
Utility function to convert an array of IP address strings int a GVariant of
+
Utility function to convert an array of IP address strings int a GVariant of
 type 'au' representing an array of IPv4 addresses.

 

 
Parameters

@@ -957,7 +957,7 @@ type 'au' representing an array of IPv4 addresses.

 

 

 
Returns

-
 a new floating GVariant representing dns
+
 a new floating GVariant representing dns
 . 

 
[transfer none]

 

@@ -966,8 +966,8 @@ type 'au' representing an array of IPv4 addresses.

 

 
nm_utils_ip4_dns_from_variant ()

 
char **
-nm_utils_ip4_dns_from_variant (GVariant *value);

-
Utility function to convert a GVariant of type 'au' representing a list of
+nm_utils_ip4_dns_from_variant (GVariant *value);

+
Utility function to convert a GVariant of type 'au' representing a list of
 IPv4 addresses into an array of IP address strings.

 

 
Parameters

@@ -979,29 +979,29 @@ IPv4 addresses into an array of IP address strings.

 
 
 
value

-
a GVariant of type 'au'

+
a GVariant of type 'au'

  
 
 

 

 

 
Returns

-
 a NULL-terminated array of IP address strings. 

+
 a NULL-terminated array of IP address strings. 

 
[transfer full][type utf8]

 

 
 

 

 
nm_utils_ip4_addresses_to_variant ()

-
GVariant *
-nm_utils_ip4_addresses_to_variant (GPtrArray *addresses,
+
GVariant *
+nm_utils_ip4_addresses_to_variant (GPtrArray *addresses,
                                    const char *gateway);

-
Utility function to convert a GPtrArray of NMIPAddress objects representing
-IPv4 addresses into a GVariant of type 'aau' representing an array of
+
Utility function to convert a GPtrArray of NMIPAddress objects representing
+IPv4 addresses into a GVariant of type 'aau' representing an array of
 NetworkManager IPv4 addresses (which are tuples of address, prefix, and
 gateway). The "gateway" field of the first address will get the value of
 gateway
- (if non-NULL). In all of the other addresses, that field will be 0.

+ (if non-NULL). In all of the other addresses, that field will be 0.

 

 
Parameters

 

@@ -1026,7 +1026,7 @@ gateway). The "gateway" field of the first address will get the value of
 

 
Returns

-
 a new floating GVariant representing addresses
+
 a new floating GVariant representing addresses
 . 

 
[transfer none]

 

@@ -1034,12 +1034,12 @@ gateway). The "gateway" field of the first address will get the value of
 

 
nm_utils_ip4_addresses_from_variant ()

-
GPtrArray *
-nm_utils_ip4_addresses_from_variant (GVariant *value,
+
GPtrArray *
+nm_utils_ip4_addresses_from_variant (GVariant *value,
                                      char **out_gateway);

-
Utility function to convert a GVariant of type 'aau' representing a list of
+
Utility function to convert a GVariant of type 'aau' representing a list of
 NetworkManager IPv4 addresses (which are tuples of address, prefix, and
-gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of
+gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field of
 the first address (if set) will be returned in out_gateway
 ; the "gateway" fields
 of the other addresses are ignored.

@@ -1054,7 +1054,7 @@ of the other addresses are ignored.

 

-
+
@@ -1068,17 +1068,17 @@ of the other addresses are ignored.

 
Returns

 
 a newly allocated
-GPtrArray of NMIPAddress objects. 

+GPtrArray of NMIPAddress objects. 

 
[transfer full][element-type NMIPAddress]

 

 
nm_utils_ip4_routes_to_variant ()

-
GVariant *
-nm_utils_ip4_routes_to_variant (GPtrArray *routes);

-
Utility function to convert a GPtrArray of NMIPRoute objects representing
-IPv4 routes into a GVariant of type 'aau' representing an array of
+
GVariant *
+nm_utils_ip4_routes_to_variant (GPtrArray *routes);

+
Utility function to convert a GPtrArray of NMIPRoute objects representing
+IPv4 routes into a GVariant of type 'aau' representing an array of
 NetworkManager IPv4 routes (which are tuples of route, prefix, next hop, and
 metric).

 

@@ -1091,14 +1091,14 @@ metric).

 
 

-
+

 
 
 

 
value
a GVariant of type 'aau'
a GVariant of type 'aau'

  
 

 

 
 
 
 

 
routes
 an array of NMIP4Route objects. 
 an array of NMIP4Route objects. 

 [element-type NMIPRoute]
 

 

 

 

 
Returns

-
 a new floating GVariant representing routes
+
 a new floating GVariant representing routes
 . 

 
[transfer none]

 

@@ -1106,11 +1106,11 @@ metric).

 

 

 
nm_utils_ip4_routes_from_variant ()

-
GPtrArray *
-nm_utils_ip4_routes_from_variant (GVariant *value);

-
Utility function to convert a GVariant of type 'aau' representing an array
+
GPtrArray *
+nm_utils_ip4_routes_from_variant (GVariant *value);

+
Utility function to convert a GVariant of type 'aau' representing an array
 of NetworkManager IPv4 routes (which are tuples of route, prefix, next hop,
-and metric) into a GPtrArray of NMIPRoute objects.

+and metric) into a GPtrArray of NMIPRoute objects.

 

 
Parameters

 

@@ -1121,7 +1121,7 @@ and metric) into a 
value

-
+
GVariant of type 'aau'
GVariant of type 'aau'

  
 

 

@@ -1129,15 +1129,15 @@ and metric) into a 
 
Returns

 
 a newly allocated
-GPtrArray of NMIPRoute objects. 

+GPtrArray of NMIPRoute objects. 

 
[transfer full][element-type NMIPRoute]

 

 

 

 

 
nm_utils_ip4_netmask_to_prefix ()

-
guint32
-nm_utils_ip4_netmask_to_prefix (guint32 netmask);

+
guint32
+nm_utils_ip4_netmask_to_prefix (guint32 netmask);

 

 
Parameters

 

@@ -1161,8 +1161,8 @@ nm_utils_ip4_netmask_to_prefix (
 
nm_utils_ip4_prefix_to_netmask ()

-
guint32
-nm_utils_ip4_prefix_to_netmask (guint32 prefix);

+
guint32
+nm_utils_ip4_prefix_to_netmask (guint32 prefix);

 

 
Parameters

 

@@ -1186,8 +1186,8 @@ nm_utils_ip4_prefix_to_netmask (
 
nm_utils_ip4_get_default_prefix ()

-
guint32
-nm_utils_ip4_get_default_prefix (guint32 ip);

+
guint32
+nm_utils_ip4_get_default_prefix (guint32 ip);

 
When the Internet was originally set up, various ranges of IP addresses were
 segmented into three network classes: A, B, and C.  This function will return
 a prefix that is associated with the IP address specified defining where it
@@ -1215,9 +1215,9 @@ falls in the predefined classes.

 

 

 
nm_utils_ip6_dns_to_variant ()

-
GVariant *
+
GVariant *
 nm_utils_ip6_dns_to_variant (char **dns);

-
Utility function to convert an array of IP address strings int a GVariant of
+
Utility function to convert an array of IP address strings int a GVariant of
 type 'aay' representing an array of IPv6 addresses.

 

 
Parameters

@@ -1236,7 +1236,7 @@ type 'aay' representing an array of IPv6 addresses.

 

 

 
Returns

-
 a new floating GVariant representing dns
+
 a new floating GVariant representing dns
 . 

 
[transfer none]

 

@@ -1245,8 +1245,8 @@ type 'aay' representing an array of IPv6 addresses.

 

 
nm_utils_ip6_dns_from_variant ()

 
char **
-nm_utils_ip6_dns_from_variant (GVariant *value);

-
Utility function to convert a GVariant of type 'aay' representing a list of
+nm_utils_ip6_dns_from_variant (GVariant *value);

+
Utility function to convert a GVariant of type 'aay' representing a list of
 IPv6 addresses into an array of IP address strings.

 

 
Parameters

@@ -1258,29 +1258,29 @@ IPv6 addresses into an array of IP address strings.

 
 

-
+

 
value
a GVariant of type 'aay'
a GVariant of type 'aay'

  
 

 

 

 

 
Returns

-
 a NULL-terminated array of IP address strings. 

+
 a NULL-terminated array of IP address strings. 

 
[transfer full][type utf8]

 

 

 

 

 
nm_utils_ip6_addresses_to_variant ()

-
GVariant *
-nm_utils_ip6_addresses_to_variant (GPtrArray *addresses,
+
GVariant *
+nm_utils_ip6_addresses_to_variant (GPtrArray *addresses,
                                    const char *gateway);

-
Utility function to convert a GPtrArray of NMIPAddress objects representing
-IPv6 addresses into a GVariant of type 'a(ayuay)' representing an array of
+
Utility function to convert a GPtrArray of NMIPAddress objects representing
+IPv6 addresses into a GVariant of type 'a(ayuay)' representing an array of
 NetworkManager IPv6 addresses (which are tuples of address, prefix, and
 gateway).  The "gateway" field of the first address will get the value of
 gateway
- (if non-NULL). In all of the other addresses, that field will be
+ (if non-NULL). In all of the other addresses, that field will be
 all 0s.

 

 
Parameters

@@ -1306,7 +1306,7 @@ all 0s.

 

 

 
Returns

-
 a new floating GVariant representing addresses
+
 a new floating GVariant representing addresses
 . 

 
[transfer none]

 

@@ -1314,12 +1314,12 @@ all 0s.

 

 

 
nm_utils_ip6_addresses_from_variant ()

-
GPtrArray *
-nm_utils_ip6_addresses_from_variant (GVariant *value,
+
GPtrArray *
+nm_utils_ip6_addresses_from_variant (GVariant *value,
                                      char **out_gateway);

-
Utility function to convert a GVariant of type 'a(ayuay)' representing a
+
Utility function to convert a GVariant of type 'a(ayuay)' representing a
 list of NetworkManager IPv6 addresses (which are tuples of address, prefix,
-and gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field
+and gateway) into a GPtrArray of NMIPAddress objects. The "gateway" field
 of the first address (if set) will be returned in out_gateway
 ; the "gateway"
 fields of the other addresses are ignored.

@@ -1334,7 +1334,7 @@ fields of the other addresses are ignored.

 
 
 
value

-
a GVariant of type 'a(ayuay)'

+
a GVariant of type 'a(ayuay)'

  
 
 
@@ -1348,17 +1348,17 @@ fields of the other addresses are ignored.

 

 
Returns

 
 a newly allocated
-GPtrArray of NMIPAddress objects. 

+GPtrArray of NMIPAddress objects. 

 
[transfer full][element-type NMIPAddress]

 

 

 

 

 
nm_utils_ip6_routes_to_variant ()

-
GVariant *
-nm_utils_ip6_routes_to_variant (GPtrArray *routes);

-
Utility function to convert a GPtrArray of NMIPRoute objects representing
-IPv6 routes into a GVariant of type 'a(ayuayu)' representing an array of
+
GVariant *
+nm_utils_ip6_routes_to_variant (GPtrArray *routes);

+
Utility function to convert a GPtrArray of NMIPRoute objects representing
+IPv6 routes into a GVariant of type 'a(ayuayu)' representing an array of
 NetworkManager IPv6 routes (which are tuples of route, prefix, next hop, and
 metric).

 

@@ -1378,7 +1378,7 @@ metric).

 

 

 
Returns

-
 a new floating GVariant representing routes
+
 a new floating GVariant representing routes
 . 

 
[transfer none]

 

@@ -1386,11 +1386,11 @@ metric).

 

 

 
nm_utils_ip6_routes_from_variant ()

-
GPtrArray *
-nm_utils_ip6_routes_from_variant (GVariant *value);

-
Utility function to convert a GVariant of type 'a(ayuayu)' representing an
+
GPtrArray *
+nm_utils_ip6_routes_from_variant (GVariant *value);

+
Utility function to convert a GVariant of type 'a(ayuayu)' representing an
 array of NetworkManager IPv6 routes (which are tuples of route, prefix, next
-hop, and metric) into a GPtrArray of NMIPRoute objects.

+hop, and metric) into a GPtrArray of NMIPRoute objects.

 

 
Parameters

 

@@ -1401,7 +1401,7 @@ hop, and metric) into a 
value

-
+
GVariant of type 'a(ayuayu)'
GVariant of type 'a(ayuayu)'

  
 

 

@@ -1409,17 +1409,17 @@ hop, and metric) into a 
 
Returns

 
 a newly allocated
-GPtrArray of NMIPRoute objects. 

+GPtrArray of NMIPRoute objects. 

 
[transfer full][element-type NMIPRoute]

 

 

 

 

 
nm_utils_ip_addresses_to_variant ()

-
GVariant *
-nm_utils_ip_addresses_to_variant (GPtrArray *addresses);

-
Utility function to convert a GPtrArray of NMIPAddress objects representing
-IPv4 or IPv6 addresses into a GVariant of type 'aa{sv}' representing an
+
GVariant *
+nm_utils_ip_addresses_to_variant (GPtrArray *addresses);

+
Utility function to convert a GPtrArray of NMIPAddress objects representing
+IPv4 or IPv6 addresses into a GVariant of type 'aa{sv}' representing an
 array of new-style NetworkManager IP addresses. All addresses will include
 "address" (an IP address string), and "prefix" (a uint). Some addresses may
 include additional attributes.

@@ -1440,7 +1440,7 @@ include additional attributes.

 

 

 
Returns

-
 a new floating GVariant representing addresses
+
 a new floating GVariant representing addresses
 . 

 
[transfer none]

 

@@ -1448,12 +1448,12 @@ include additional attributes.

 

 

 
nm_utils_ip_addresses_from_variant ()

-
GPtrArray *
-nm_utils_ip_addresses_from_variant (GVariant *value,
+
GPtrArray *
+nm_utils_ip_addresses_from_variant (GVariant *value,
                                     int family);

-
Utility function to convert a GVariant representing a list of new-style
+
Utility function to convert a GVariant representing a list of new-style
 NetworkManager IPv4 or IPv6 addresses (as described in the documentation for
-nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress
+nm_utils_ip_addresses_to_variant()) into a GPtrArray of NMIPAddress
 objects.

 

 
Parameters

@@ -1466,7 +1466,7 @@ objects.

 
 
 
value

-
a GVariant of type 'aa{sv}'

+
a GVariant of type 'aa{sv}'

  
 
 
@@ -1480,17 +1480,17 @@ objects.

 

 
Returns

 
 a newly allocated
-GPtrArray of NMIPAddress objects. 

+GPtrArray of NMIPAddress objects. 

 
[transfer full][element-type NMIPAddress]

 

 

 

 

 
nm_utils_ip_routes_to_variant ()

-
GVariant *
-nm_utils_ip_routes_to_variant (GPtrArray *routes);

-
Utility function to convert a GPtrArray of NMIPRoute objects representing
-IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' representing an array
+
GVariant *
+nm_utils_ip_routes_to_variant (GPtrArray *routes);

+
Utility function to convert a GPtrArray of NMIPRoute objects representing
+IPv4 or IPv6 routes into a GVariant of type 'aa{sv}' representing an array
 of new-style NetworkManager IP routes (which are tuples of destination,
 prefix, next hop, metric, and additional attributes).

 

@@ -1510,7 +1510,7 @@ prefix, next hop, metric, and additional attributes).

 

 

 
Returns

-
 a new floating GVariant representing routes
+
 a new floating GVariant representing routes
 . 

 
[transfer none]

 

@@ -1518,12 +1518,12 @@ prefix, next hop, metric, and additional attributes).

 

 

 
nm_utils_ip_routes_from_variant ()

-
GPtrArray *
-nm_utils_ip_routes_from_variant (GVariant *value,
+
GPtrArray *
+nm_utils_ip_routes_from_variant (GVariant *value,
                                  int family);

-
Utility function to convert a GVariant representing a list of new-style
+
Utility function to convert a GVariant representing a list of new-style
 NetworkManager IPv4 or IPv6 addresses (which are tuples of destination,
-prefix, next hop, metric, and additional attributes) into a GPtrArray of
+prefix, next hop, metric, and additional attributes) into a GPtrArray of
 NMIPRoute objects.

 

 
Parameters

@@ -1536,7 +1536,7 @@ prefix, next hop, metric, and additional attributes) into a 
value

-
a GVariant of type 'aa{sv}'

+
a GVariant of type 'aa{sv}'

  
 
 
@@ -1550,7 +1550,7 @@ prefix, next hop, metric, and additional attributes) into a 
 
Returns

 
 a newly allocated
-GPtrArray of NMIPRoute objects. 

+GPtrArray of NMIPRoute objects. 

 
[transfer full][element-type NMIPRoute]

 

 

@@ -1562,13 +1562,13 @@ 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()

+object's “id”: property.  Should be freed with g_free()

 

 

 

 

 
nm_utils_file_is_certificate ()

-
gboolean
+
gboolean
 nm_utils_file_is_certificate (const char *filename);

 
Tests if filename
  has a valid extension for an X.509 certificate file
@@ -1591,15 +1591,15 @@ recognized by NetworkManager.

 

 

 
Returns

-
 TRUE if the file is a certificate, FALSE if it is not

+
 TRUE if the file is a certificate, FALSE if it is not

 

 

 

 

 
nm_utils_file_is_private_key ()

-
gboolean
+
gboolean
 nm_utils_file_is_private_key (const char *filename,
-                              gboolean *out_encrypted);

+                              gboolean *out_encrypted);

 
Tests if filename
  has a valid extension for an X.509 private key file
 (".der", ".key", ".pem", or ".p12"), and contains a private key in a format
@@ -1628,13 +1628,13 @@ recognized by NetworkManager.

 

 

 
Returns

-
 TRUE if the file is a private key, FALSE if it is not

+
 TRUE if the file is a private key, FALSE if it is not

 

 

 

 

 
nm_utils_file_is_pkcs12 ()

-
gboolean
+
gboolean
 nm_utils_file_is_pkcs12 (const char *filename);

 
Tests if filename
  is a PKCS#12 file.

@@ -1655,24 +1655,24 @@ nm_utils_file_is_pkcs12 (const ch
 

 

 
Returns

-
 TRUE if the file is PKCS#12, FALSE if it is not

+
 TRUE if the file is PKCS#12, FALSE if it is not

 

 

 

 

 
NMUtilsFileSearchInPathsPredicate ()

-
gboolean
+
gboolean
 (*NMUtilsFileSearchInPathsPredicate) (const char *filename,
-                                      gpointer user_data);

+                                      gpointer user_data);

 

 

 

 
NMUtilsCheckFilePredicate ()

-
gboolean
+
gboolean
 (*NMUtilsCheckFilePredicate) (const char *filename,
                               const struct stat *stat,
-                              gpointer user_data,
-                              GError **error);

+                              gpointer user_data,
+                              GError **error);

 

 

 

@@ -1681,10 +1681,10 @@ nm_utils_file_is_pkcs12 (const ch
 nm_utils_file_search_in_paths (const char *progname,
                                const char *try_first,
                                const char *const *paths,
-                               GFileTest file_test_flags,
+                               GFileTest file_test_flags,
                                NMUtilsFileSearchInPathsPredicate predicate,
-                               gpointer user_data,
-                               GError **error);
+                               gpointer user_data,
+                               GError **error);
 
Searches for a progname
  file in a list of search paths
 .

@@ -1711,16 +1711,16 @@ It is silently ignored if it is empty or not an absolute path. 

 
 
 
paths

-
 a NULL terminated list of search paths.
-Can be empty or NULL, in which case only try_first
+
 a NULL terminated list of search paths.
+Can be empty or NULL, in which case only try_first
 is checked. 

 [allow-none]
 
 
 
file_test_flags

-
the flags passed to g_file_test() when searching
+
the flags passed to g_file_test() when searching
 for progname
-. Set it to 0 to skip the g_file_test().

+. Set it to 0 to skip the g_file_test().

  
 
 
@@ -1741,7 +1741,7 @@ function. 

 
 
 
error

-
 on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 

+
 on failure, set a "not found" error G_IO_ERROR G_IO_ERROR_NOT_FOUND. 

 [allow-none]
 
 
@@ -1749,7 +1749,7 @@ function. 

 

 

 
Returns

-
 the full path to the helper, if found, or NULL if not found.
+
 the full path to the helper, if found, or NULL if not found.
 The returned string is not owned by the caller, but later
 invocations of the function might overwrite it. 

 
[transfer none]

@@ -1758,8 +1758,8 @@ invocations of the function might overwrite it. 

 

 

 
nm_utils_wifi_freq_to_channel ()

-
guint32
-nm_utils_wifi_freq_to_channel (guint32 freq);

+
guint32
+nm_utils_wifi_freq_to_channel (guint32 freq);

 
Utility function to translate a Wi-Fi frequency to its corresponding channel.

 

 
Parameters

@@ -1784,8 +1784,8 @@ nm_utils_wifi_freq_to_channel (
 
nm_utils_wifi_channel_to_freq ()

-
guint32
-nm_utils_wifi_channel_to_freq (guint32 channel,
+
guint32
+nm_utils_wifi_channel_to_freq (guint32 channel,
                                const char *band);

 
Utility function to translate a Wi-Fi channel to its corresponding frequency.

 

@@ -1820,8 +1820,8 @@ is invalid

 

 

 
nm_utils_wifi_find_next_channel ()

-
guint32
-nm_utils_wifi_find_next_channel (guint32 channel,
+
guint32
+nm_utils_wifi_find_next_channel (guint32 channel,
                                  int direction,
                                  char *band);

 
Utility function to find out next/previous Wi-Fi channel for a channel.

@@ -1860,8 +1860,8 @@ nm_utils_wifi_find_next_channel (
 
nm_utils_wifi_is_channel_valid ()

-
gboolean
-nm_utils_wifi_is_channel_valid (guint32 channel,
+
gboolean
+nm_utils_wifi_is_channel_valid (guint32 channel,
                                 const char *band);

 
Utility function to verify Wi-Fi channel validity.

 

@@ -1888,13 +1888,13 @@ nm_utils_wifi_is_channel_valid (
 
Returns

-
 TRUE or FALSE

+
 TRUE or FALSE

 

 

 

 

 
nm_utils_wifi_2ghz_freqs ()

-
const guint *
+
const guint *
 nm_utils_wifi_2ghz_freqs (void);

 
Utility function to return 2.4 GHz Wi-Fi frequencies (802.11bg band).

 

@@ -1906,7 +1906,7 @@ nm_utils_wifi_2ghz_freqs (void
 

 
nm_utils_wifi_5ghz_freqs ()

-
const guint *
+
const guint *
 nm_utils_wifi_5ghz_freqs (void);

 
Utility function to return 5 GHz Wi-Fi frequencies (802.11a band).

 

@@ -1919,7 +1919,7 @@ nm_utils_wifi_5ghz_freqs (void
 
nm_utils_wifi_strength_bars ()

 
const char *
-nm_utils_wifi_strength_bars (guint8 strength);

+nm_utils_wifi_strength_bars (guint8 strength);

 
Converts strength
  into a 4-character-wide graphical representation of
 strength suitable for printing to stdout. If the current locale and terminal
@@ -1948,7 +1948,7 @@ support it, this will use unicode graphics characters to represent
 

 

 
nm_utils_hwaddr_len ()

-
gsize
+
gsize
 nm_utils_hwaddr_len (int type);

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

@@ -1979,8 +1979,8 @@ nm_utils_hwaddr_len (int t
 

 
nm_utils_hwaddr_ntoa ()

 
char *
-nm_utils_hwaddr_ntoa (gconstpointer addr,
-                      gsize length);

+nm_utils_hwaddr_ntoa (gconstpointer addr,
+                      gsize length);

 
Converts addr
  to textual form.

 

@@ -2016,12 +2016,12 @@ nm_utils_hwaddr_ntoa (
 
nm_utils_hwaddr_atoba ()

-
GByteArray *
+
GByteArray *
 nm_utils_hwaddr_atoba (const char *asc,
-                       gsize length);

+                       gsize length);

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

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

 

 
Parameters

 

@@ -2046,7 +2046,7 @@ nm_utils_hwaddr_atoba (const char
 
 

 
Returns

-
 a new GByteArray, or NULL if asc
+
 a new GByteArray, or NULL if asc
 couldn't
 be parsed. 

 
[transfer full]

@@ -2055,10 +2055,10 @@ be parsed. 

 

 

 
nm_utils_hwaddr_aton ()

-
guint8 *
+
guint8 *
 nm_utils_hwaddr_aton (const char *asc,
-                      gpointer buffer,
-                      gsize length);

+                      gpointer buffer,
+                      gsize length);

 
Parses asc
  and converts it to binary form in buffer
 .
@@ -2095,7 +2095,7 @@ the size of the buffer in bytes.

 

 
Returns

 
 buffer
-, or NULL if asc
+, or NULL if asc
 couldn't be parsed
 or would be shorter or longer than length
 .

@@ -2104,9 +2104,9 @@ or would be shorter or longer than length
 

 
nm_utils_hwaddr_valid ()

-
gboolean
+
gboolean
 nm_utils_hwaddr_valid (const char *asc,
-                       gssize length);

+                       gssize length);

 
Parses asc
  to see if it is a valid hardware address of the given
 length.

@@ -2136,9 +2136,9 @@ is expected to convert to
 

 

 
Returns

-
 TRUE if asc
+
 TRUE if asc
 appears to be a valid hardware address
-of the indicated length, FALSE if not.

+of the indicated length, FALSE if not.

 

 

 

@@ -2146,7 +2146,7 @@ of the indicated length, 
nm_utils_hwaddr_canonical ()

 
char *
 nm_utils_hwaddr_canonical (const char *asc,
-                           gssize length);

+                           gssize length);
 
Parses asc
  to see if it is a valid hardware address of the given
 length, and if so, returns it in canonical form (uppercase, with
@@ -2179,18 +2179,18 @@ is expected to convert to
 
Returns

 
 the canonicalized address if asc
 appears to
-be a valid hardware address of the indicated length, NULL if not. 

+be a valid hardware address of the indicated length, NULL if not. 

 
[transfer full]

 

 

 

 

 
nm_utils_hwaddr_matches ()

-
gboolean
-nm_utils_hwaddr_matches (gconstpointer hwaddr1,
-                         gssize hwaddr1_len,
-                         gconstpointer hwaddr2,
-                         gssize hwaddr2_len);

+
gboolean
+nm_utils_hwaddr_matches (gconstpointer hwaddr1,
+                         gssize hwaddr1_len,
+                         gconstpointer hwaddr2,
+                         gssize hwaddr2_len);

 
Generalized hardware address comparison function. Tests if hwaddr1
  and
 hwaddr2
@@ -2204,7 +2204,7 @@ over a simple memcmp():

  before being compared.

 
  • If hwaddr1
  or hwaddr2
- is NULL, it is treated instead as though it was
+ is NULL, it is treated instead as though it was
  a zero-filled buffer hwaddr1_len
  or hwaddr2_len
  bytes long.
    • 
@@ -2233,7 +2233,7 @@ guaranteed to not match if they are invalid.)
    
 
    
-
+
@@ -2245,7 +2245,7 @@ is ASCII
    
     
-
+
@@ -2260,9 +2260,9 @@ is ASCII
    
 
 
    
 
    Returns
    
-
     TRUE if hwaddr1
+
     TRUE if hwaddr1
 and hwaddr2
-are equivalent, FALSE if they are
+are equivalent, FALSE if they are
 different (or either of them is invalid).
    
 
    
 
@@ -2270,8 +2270,8 @@ different (or either of them is invalid).
    
 
    
 
    nm_utils_bin2hexstr ()
    
 
    char *
-nm_utils_bin2hexstr (gconstpointer src,
-                     gsize len,
+nm_utils_bin2hexstr (gconstpointer src,
+                     gsize len,
                      int final_len);
    
 
    Converts the byte array src
  into a hexadecimal string. If final_len
@@ -2316,7 +2316,7 @@ array
    
 
    
 
    
 
    nm_utils_hexstr2bin ()
    
-
    GBytes *
+
    GBytes *
 nm_utils_hexstr2bin (const char *hex);
    
 
    Converts a hexadecimal string hex
  into an array of bytes.  The optional
@@ -2342,14 +2342,14 @@ may not start or end with ':'.
    
 
    
 
    
 
    Returns
    
-
     the converted bytes, or NULL on error. 
    
+
     the converted bytes, or NULL on error. 
    
 
    [transfer full]
    
 
    
 
    
 
    
 
    
 
    nm_utils_iface_valid_name ()
    
-
    gboolean
+
    gboolean
 nm_utils_iface_valid_name (const char *name);
    
 
    This function is a 1:1 copy of the kernel's interface validation
 function in net/core/dev.c.
    
@@ -2370,13 +2370,13 @@ function in net/core/dev.c.
    
 
    
 
    
 
    Returns
    
-
     TRUE if interface name is valid, otherwise FALSE is returned.
    
+
     TRUE if interface name is valid, otherwise FALSE is returned.
    
 
    
 
 
    
 
    
 
    nm_utils_is_uuid ()
    
-
    gboolean
+
    gboolean
 nm_utils_is_uuid (const char *str);
    
 
    Checks if str
  is a UUID
    
@@ -2397,8 +2397,8 @@ nm_utils_is_uuid (const char
 
    
 
    Returns
    
-
     TRUE if str
-is a UUID, FALSE if not
    
+
     TRUE if str
+is a UUID, FALSE if not
    
 
    
 
    
 
    
@@ -2427,7 +2427,7 @@ nm_utils_inet4_ntop (in_addr_t
    dst
    
 
    Returns
    
 
     the input buffer dst
 , or a pointer to an
-internal, static buffer. NULL is not allowed as in6addr
+internal, static buffer. NULL is not allowed as in6addr
 ,
 otherwise, this function cannot fail.
    
 
@@ -2498,7 +2498,7 @@ otherwise, this function cannot fail.
    
 
    
 
    
 
    nm_utils_ipaddr_valid ()
    
-
    gboolean
+
    gboolean
 nm_utils_ipaddr_valid (int family,
                        const char *ip);
    
 
    Checks if ip
@@ -2528,16 +2528,16 @@ nm_utils_ipaddr_valid (int
 
    
 
    
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
 
    
 
    
 
    nm_utils_check_virtual_device_compatibility ()
    
-
    gboolean
+
    gboolean
 nm_utils_check_virtual_device_compatibility
-                               (GType virtual_type,
-                                GType other_type);
    
+                               (GType virtual_type,
+                                GType other_type);
    
 
    Determines if a connection of type virtual_type
  can (in the
 general case) work with connections of type other_type
@@ -2551,7 +2551,7 @@ general case) work with connections of type other_ty
 then this checks if other_type
  is a valid type for a slave of that
 master.
    
-
    Note that even if this returns TRUE it is not guaranteed that
+
    Note that even if this returns TRUE it is not guaranteed that
 every connection of type other_type
  is
 compatible with virtual_type
@@ -2583,7 +2583,7 @@ underlying device driver.
    
 
    
 
    
 
    Returns
    
-
     TRUE or FALSE
    
+
     TRUE or FALSE
    
 
    
 
 
    
@@ -2650,12 +2650,12 @@ available modes.
    
 
    
 
    nm_utils_enum_to_str ()
    
 
    char *
-nm_utils_enum_to_str (GType type,
+nm_utils_enum_to_str (GType type,
                       int value);
    
 
    Converts an enum value to its string representation. If the enum is a
-G_TYPE_FLAGS the function returns a comma-separated list of matching values.
-If the enum is a G_TYPE_ENUM and the given value is not valid the
-function returns NULL.
    
+G_TYPE_FLAGS the function returns a comma-separated list of matching values.
+If the enum is a G_TYPE_ENUM and the given value is not valid the
+function returns NULL.
    
 
    
 
    Parameters
    
 
    
 
    
 
    hwaddr1
    pointer to a binary or ASCII hardware address, or NULL
    pointer to a binary or ASCII hardware address, or NULL
    		
  
 
    
 
    
 
    
 
    hwaddr2
    pointer to a binary or ASCII hardware address, or NULL
    pointer to a binary or ASCII hardware address, or NULL
    		
  
 
    
 
    the destination buffer, it must contain at least
 INET_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet6_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2473,7 +2473,7 @@ nm_utils_inet6_ntop (const struct
 
    dst
    		
 
    the destination buffer, it must contain at least
 INET6_ADDRSTRLEN or NM_UTILS_INET_ADDRSTRLEN
-characters. If set to NULL, it will return a pointer to an internal, static
+characters. If set to NULL, it will return a pointer to an internal, static
 buffer (shared with nm_utils_inet4_ntop()).  Beware, that the internal
 buffer will be overwritten with ever new call of nm_utils_inet4_ntop() or
 nm_utils_inet6_ntop() that does not provied it's own dst
@@ -2490,7 +2490,7 @@ buffer to avoid these issues.
    		
 
    
@@ -2667,7 +2667,7 @@ function returns 
    type
    
-    
+
@@ -2680,22 +2680,22 @@ function returns 
 
    Returns
    
-
     a newly allocated string or NULL
    
+
     a newly allocated string or NULL
    
 
 
    Since: 1.2
    
 
 
    
 
    
 
    nm_utils_enum_from_str ()
    
-
    gboolean
-nm_utils_enum_from_str (GType type,
+
    gboolean
+nm_utils_enum_from_str (GType type,
                         const char *str,
                         int *out_value,
                         char **err_token);
    
 
    Converts a string to the matching enum value.
    
-
    If the enum is a G_TYPE_FLAGS the function returns the logical OR of values
+
    If the enum is a G_TYPE_FLAGS the function returns the logical OR of values
 matching the comma-separated tokens in the string; if an unknown token is found
-the function returns FALSE and stores a pointer to a newly allocated string
+the function returns FALSE and stores a pointer to a newly allocated string
 containing the unrecognized token in err_token
 .
    
 
    
@@ -2709,7 +2709,7 @@ containing the unrecognized token in err_token
 
    
-
+
@@ -2732,7 +2732,7 @@ containing the unrecognized token in err_token
 
    
 
    Returns
    
-
     TRUE if the conversion was successful, FALSE otherwise
    
+
     TRUE if the conversion was successful, FALSE otherwise
    
 
    
 
    Since: 1.2
    
 
@@ -2740,9 +2740,9 @@ containing the unrecognized token in err_token
 
    nm_utils_enum_get_values ()
    
 
    const char **
-nm_utils_enum_get_values (GType type,
-                          gint from,
-                          gint to);
    
+nm_utils_enum_get_values (GType type,
+                          gint from,
+                          gint to);
 
    Returns the list of possible values for a given enum.
    
 
    
 
    Parameters
    
@@ -2755,7 +2755,7 @@ nm_utils_enum_get_values (
    type
    
-
    
+
@@ -2774,7 +2774,7 @@ nm_utils_enum_get_values (
 
    Returns
    
 
     a NULL-terminated dynamically-allocated array of static strings
-or NULL on error. 
    
+or NULL on error. 
    
 
    [transfer full]
    
 
 
    Since: 1.2
    
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index 820bf76d..b88d6dfc 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -293,7 +293,7 @@
 
 
    
 
    Object Hierarchy
    
-
        GEnum
+
        GEnum
     ├── NMVpnConnectionState
     ├── NMVpnConnectionStateReason
     ├── NMVpnPluginFailure
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 7be88f8f..dd719805 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -513,6 +513,7 @@
     
     
     
+    
     
     
     
@@ -533,6 +534,7 @@
     
     
     
+    
     
     
     
@@ -569,6 +571,7 @@
     
     
     
+    
     
     
     
@@ -579,6 +582,7 @@
     
     
     
+    
     
     
     
@@ -598,6 +602,7 @@
     
     
     
+    
     
     
     
@@ -614,6 +619,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index 0abbd4b7..e08e9893 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -23,7 +23,7 @@
 
    
 Object Hierarchy
    
 
    -    GObject
+    GObject
     ├── NMSetting
     │   ├── NMSetting8021x
     │   ├── NMSettingAdsl
@@ -85,10 +85,10 @@
     ├── NMClient
     ├── NMSecretAgentOld
     ╰── NMSimpleConnection
-    GInterface
+    GInterface
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -103,7 +103,7 @@
     ├── NMSettingWiredWakeOnLan
     ├── NMVlanFlags
     ╰── NMVpnEditorPluginCapability
-    GEnum
+    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMDeviceError
@@ -145,7 +145,7 @@
     ├── NMVpnServiceState
     ├── NMWepKeyType
     ╰── NMWimaxNspNetworkType
-    GBoxed
+    GBoxed
     ├── NMIPAddress
     ├── NMIPRoute
     ╰── NMLldpNeighbor
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 27ef87e0..e38f599e 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -1209,6 +1209,7 @@ NM_SETTING_802_1X_CA_CERT
 NM_SETTING_802_1X_CA_PATH
 NM_SETTING_802_1X_SUBJECT_MATCH
 NM_SETTING_802_1X_ALTSUBJECT_MATCHES
+NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH
 NM_SETTING_802_1X_CLIENT_CERT
 NM_SETTING_802_1X_PHASE1_PEAPVER
 NM_SETTING_802_1X_PHASE1_PEAPLABEL
@@ -1219,6 +1220,7 @@ NM_SETTING_802_1X_PHASE2_CA_CERT
 NM_SETTING_802_1X_PHASE2_CA_PATH
 NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH
 NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES
+NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH
 NM_SETTING_802_1X_PHASE2_CLIENT_CERT
 NM_SETTING_802_1X_PASSWORD
 NM_SETTING_802_1X_PASSWORD_FLAGS
@@ -1258,6 +1260,7 @@ nm_setting_802_1x_add_altsubject_match
 nm_setting_802_1x_remove_altsubject_match
 nm_setting_802_1x_remove_altsubject_match_by_value
 nm_setting_802_1x_clear_altsubject_matches
+nm_setting_802_1x_get_domain_suffix_match
 nm_setting_802_1x_get_client_cert_scheme
 nm_setting_802_1x_get_client_cert_blob
 nm_setting_802_1x_get_client_cert_path
@@ -1278,6 +1281,7 @@ nm_setting_802_1x_add_phase2_altsubject_match
 nm_setting_802_1x_remove_phase2_altsubject_match
 nm_setting_802_1x_remove_phase2_altsubject_match_by_value
 nm_setting_802_1x_clear_phase2_altsubject_matches
+nm_setting_802_1x_get_phase2_domain_suffix_match
 nm_setting_802_1x_get_phase2_client_cert_scheme
 nm_setting_802_1x_get_phase2_client_cert_blob
 nm_setting_802_1x_get_phase2_client_cert_path
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 069199b8..99f6a00b 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.1.91
+1.1.92
diff --git a/examples/python/dbus/create-bond.py b/examples/python/dbus/create-bond.py
index 41ffabe8..f36426ca 100755
--- a/examples/python/dbus/create-bond.py
+++ b/examples/python/dbus/create-bond.py
@@ -21,7 +21,7 @@
 # This example configures a Bond from ethernet devices and activates it
 #
 # NetworkManager D-Bus API:
-# https://developer.gnome.org/NetworkManager/1.0/spec.html
+# https://developer.gnome.org/NetworkManager/stable/spec.html
 #
 
 import dbus, sys, uuid
diff --git a/examples/python/dbus/list-devices.py b/examples/python/dbus/list-devices.py
index 8dd41f61..f35a8c8a 100755
--- a/examples/python/dbus/list-devices.py
+++ b/examples/python/dbus/list-devices.py
@@ -35,11 +35,11 @@ devtypes = { 1: "Ethernet",
              12: "ADSL",
              13: "Bridge",
              14: "Generic",
-             15: "Team"
-             16: "TUN"
-             17: "IPTunnel"
-             18: "MACVLAN"
-             19: "VXLAN"
+             15: "Team",
+             16: "TUN",
+             17: "IPTunnel",
+             18: "MACVLAN",
+             19: "VXLAN",
              20: "Veth"
            }
 
diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 735921d3..4d2e1298 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -78,21 +78,62 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-vpn-plugin.c \
 	nmdbus-vpn-plugin.h
 
+DBUS_INTERFACE_DOCS = \
+	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
+	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
+	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
+	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
+	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	nmdbus-manager-org.freedesktop.NetworkManager.xml \
+	nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
+	nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
+	nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
+	nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
+	nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
+	nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
+	nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
+	nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
+	nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
+	nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
+	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
+	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
+	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
+	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+
 define _make_nmdbus_rule
 $(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
 	$$(AM_V_GEN) gdbus-codegen \
 		--generate-c-code $$(basename $$@) \
+		--generate-docbook $$(basename $$@) \
 		--c-namespace NMDBus \
 		--interface-prefix org.freedesktop.NetworkManager \
 		$$<
 
+$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
+	@true
+
 $(basename $(1)).h: $(1)
 	@true
 endef
 
 $(foreach f,$(filter %.c,$(nodist_libnmdbus_la_SOURCES)),$(eval $(call _make_nmdbus_rule,$f)))
 
-CLEANFILES = $(nodist_libnmdbus_la_SOURCES)
+BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
+
+CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
 	all.xml.in \
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index ac18d9ae..ea43b442 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -540,7 +540,43 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-vpn-plugin.c \
 	nmdbus-vpn-plugin.h
 
-CLEANFILES = $(nodist_libnmdbus_la_SOURCES)
+DBUS_INTERFACE_DOCS = \
+	nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
+	nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
+	nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
+	nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
+	nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	nmdbus-manager-org.freedesktop.NetworkManager.xml \
+	nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
+	nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
+	nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
+	nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
+	nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
+	nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
+	nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
+	nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
+	nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
+	nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
+	nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
+	nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
+	nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
+	nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+
+BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS)
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
 	all.xml.in \
 	generic-types.xml \
@@ -581,7 +617,8 @@ EXTRA_DIST = \
 	nm-vpn-plugin.xml \
 	nm-wimax-nsp.xml
 
-all: all-am
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -781,10 +818,12 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -815,6 +854,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
@@ -886,7 +926,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
@@ -909,10 +949,14 @@ define _make_nmdbus_rule
 $(1): $(patsubst nmdbus-%.c,nm-%.xml,$(1))
 	$$(AM_V_GEN) gdbus-codegen \
 		--generate-c-code $$(basename $$@) \
+		--generate-docbook $$(basename $$@) \
 		--c-namespace NMDBus \
 		--interface-prefix org.freedesktop.NetworkManager \
 		$$<
 
+$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
+	@true
+
 $(basename $(1)).h: $(1)
 	@true
 endef
diff --git a/introspection/errors.xml b/introspection/errors.xml
index f2db8667..34a0a7b9 100644
--- a/introspection/errors.xml
+++ b/introspection/errors.xml
@@ -4,21 +4,21 @@
   Copyright (C) 2008 Novell, Inc.
 
   
-    
+    
   
 
   
-    
+    
   
 
   
-    
+    
   
 
 
diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml
index 681b6662..2fb680af 100644
--- a/introspection/generic-types.xml
+++ b/introspection/generic-types.xml
@@ -1,50 +1,50 @@
 
   
-    A mapping from strings to variants representing extra
-      key-value pairs.
+    
     
     
   
 
   
-    A mapping from strings to strings representing extra
-      key-value pairs.
+    
     
     
   
 
   
-      A mapping from strings to a map of string to variant.
+      
       
       
   
 
   
-    
+    
     
-      Mode is unknown.
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
   
 
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index 16eae044..603be713 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -3,99 +3,99 @@
 
   
     
-      Flags describing the capabilities of the access point.
+      
     
     
-      Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
+      
     
     
-      Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
+      
     
     
       
       
-      The Service Set Identifier identifying the access point.
+      
     
     
-      The radio channel frequency in use by the access point, in MHz.
+      
     
     
-      The hardware address (BSSID) of the access point.
+      
     
 
     
-      Describes the operating mode of the access point.
+      
     
     
-      The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
+      
     
     
-      The current signal quality of the access point, in percent.
+      
     
     
-      
+      
     
 
     
         
-            
+            
         
     
     
-      
+      
       
-        Null capability - says nothing about the access point.
+        
       
       
-        Access point supports privacy measures.
+        
       
     
     
-      
+      
       
-        Null flag.
+        
       
       
-        Access point supports pairwise 40-bit WEP encryption.
+        
       
       
-        Access point supports pairwise 104-bit WEP encryption.
+        
       
       
-        Access point supports pairwise TKIP encryption.
+        
       
       
-        Access point supports pairwise CCMP encryption.
+        
       
       
-        Access point supports a group 40-bit WEP cipher.
+        
       
       
-        Access point supports a group 104-bit WEP cipher.
+        
       
       
-        Access point supports a group TKIP cipher.
+        
       
       
-        Access point supports a group CCMP cipher.
+        
       
       
-        Access point supports PSK key management.
+        
       
       
-        Access point supports 802.1x key management.
+        
       
     
   
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 203437b7..59bf78f4 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -3,12 +3,12 @@
 
   
     
-    
+    
+    " />
 
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
 
     
         
-            
+            
         
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
   
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
index 4b53675c..52460eee 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/nm-agent-manager.xml
@@ -4,45 +4,45 @@
   
 
     
-      
+      
       
-        
+        
+        " />
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
     
 
   
diff --git a/introspection/nm-device-adsl.xml b/introspection/nm-device-adsl.xml
index ec50d110..68859d3b 100644
--- a/introspection/nm-device-adsl.xml
+++ b/introspection/nm-device-adsl.xml
@@ -5,16 +5,16 @@
 
     
         
-            
+            
         
     
 
     
-      
+      
     
 
   
diff --git a/introspection/nm-device-bond.xml b/introspection/nm-device-bond.xml
index a804ca0b..9bc21225 100644
--- a/introspection/nm-device-bond.xml
+++ b/introspection/nm-device-bond.xml
@@ -4,29 +4,29 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-bridge.xml b/introspection/nm-device-bridge.xml
index f3b25602..6cf99a10 100644
--- a/introspection/nm-device-bridge.xml
+++ b/introspection/nm-device-bridge.xml
@@ -4,29 +4,29 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-bt.xml b/introspection/nm-device-bt.xml
index cc4a9b54..3b487158 100644
--- a/introspection/nm-device-bt.xml
+++ b/introspection/nm-device-bt.xml
@@ -4,43 +4,43 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
     
-      
+      
       
-        The device has no recognized capabilities.
+        
       
       
-        The device supports Bluetooth Dial-Up Networking.
+        
       
       
-        The device supports Bluetooth Personal Area Networking.
+        
       
     
 
diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml
index 86d68a35..87b7f755 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/nm-device-ethernet.xml
@@ -5,40 +5,40 @@
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-generic.xml b/introspection/nm-device-generic.xml
index 79d19899..2f8fc7ee 100644
--- a/introspection/nm-device-generic.xml
+++ b/introspection/nm-device-generic.xml
@@ -4,22 +4,22 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-infiniband.xml b/introspection/nm-device-infiniband.xml
index 097714c6..169c2c66 100644
--- a/introspection/nm-device-infiniband.xml
+++ b/introspection/nm-device-infiniband.xml
@@ -4,22 +4,22 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/nm-device-ip-tunnel.xml
index fcb42ce2..3ca04ee6 100644
--- a/introspection/nm-device-ip-tunnel.xml
+++ b/introspection/nm-device-ip-tunnel.xml
@@ -4,81 +4,81 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml
index c4dcb4e6..d5d66068 100644
--- a/introspection/nm-device-macvlan.xml
+++ b/introspection/nm-device-macvlan.xml
@@ -4,34 +4,34 @@
   
 
     
-      
+      
     
 
     
-      
-        The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml
index 0ca101fd..67742c46 100644
--- a/introspection/nm-device-modem.xml
+++ b/introspection/nm-device-modem.xml
@@ -5,58 +5,58 @@
 
     
         
-            
+            
         
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
       
-        Modem has no capabilties.
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/nm-device-olpc-mesh.xml
index c30ecfc6..a92e7370 100644
--- a/introspection/nm-device-olpc-mesh.xml
+++ b/introspection/nm-device-olpc-mesh.xml
@@ -3,32 +3,32 @@
 
   
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
-        
+        
     
   
 
diff --git a/introspection/nm-device-team.xml b/introspection/nm-device-team.xml
index baf39fa8..982b7670 100644
--- a/introspection/nm-device-team.xml
+++ b/introspection/nm-device-team.xml
@@ -4,29 +4,29 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml
index 2b3ae2f5..0f74cf8c 100644
--- a/introspection/nm-device-tun.xml
+++ b/introspection/nm-device-tun.xml
@@ -4,56 +4,56 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
-        The tunnel mode, either "tun" or "tap".
-      
+      
     
 
     
-      
-        The tunnel's "TUN_NO_PI" flag; true if no protocol info is
+      
     
 
     
-      
-        The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
+      
     
 
     
-      
-        The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-veth.xml b/introspection/nm-device-veth.xml
index e06d0ceb..a3cff6da 100644
--- a/introspection/nm-device-veth.xml
+++ b/introspection/nm-device-veth.xml
@@ -4,16 +4,16 @@
   
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml
index 992340e0..bac220e8 100644
--- a/introspection/nm-device-vlan.xml
+++ b/introspection/nm-device-vlan.xml
@@ -4,34 +4,34 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml
index 97c517fb..de23020d 100644
--- a/introspection/nm-device-vxlan.xml
+++ b/introspection/nm-device-vxlan.xml
@@ -4,123 +4,123 @@
   
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index 27f3eb90..2ece0ef0 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -6,164 +6,164 @@
 
     
       
-        
+        
       
-      
+      
     
 
     
       
-        
+        
       
-      
+      
     
 
     
       
-        
+        
+          Currently 'ssids' option with value of "aay" type is supported.
+        " />
       
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
-        
+        
     
 
     
         
-            
+            
         
-        
+        
     
 
     
       
-            
+            
         
-        
+        
     
 
     
-      
+      
       
-        Null capability - syntactic sugar for no capabilities supported.  Do not AND this with other capabilities!
+        
       
       
-        The device supports the 40-bit WEP cipher.
+        
       
       
-        The device supports the 104-bit WEP cipher.
+        
       
       
-        The device supports the TKIP cipher.
+        
       
       
-        The device supports the CCMP cipher.
+        
       
       
-        The device supports the WPA encryption/authentication protocol.
+        
       
       
-        The device supports the RSN encryption/authentication protocol.
+        
       
       
-        The device supports Access Point mode.
+        
       
       
-        The device supports Ad-Hoc mode.
+        
       
       
-	
+	
       
       
-        
+        
       
       
-        
+        
       
     
   
diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml
index 3bad6245..e790e4fc 100644
--- a/introspection/nm-device-wimax.xml
+++ b/introspection/nm-device-wimax.xml
@@ -4,105 +4,105 @@
   
     
       
-        
+        
       
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
-        
+        
     
 
     
         
-            
+            
         
-        
+        
     
 
     
       
-            
+            
         
-        
+        
     
 
   
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index f1033c73..321cace1 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -3,7 +3,7 @@
 
   
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
-        Object path of an ActiveConnection object that "owns" this device during
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
     
-      
+      
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
-      
+      
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        Unused
+        
       
       
-        Unused
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        Null capability.
+        
       
       
-        The device is supported by NetworkManager.
+        
       
       
-        The device supports carrier detection.
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
     
   
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml
index 379c50f9..bca34fc5 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/nm-dhcp4-config.xml
@@ -3,18 +3,18 @@
 
     
         
-        
+        
         
-            Configuration options returned by a DHCP server, if any.
+            
         
 
         
             
-                
+                
             
         
     
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml
index df75660a..84e13b77 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/nm-dhcp6-config.xml
@@ -3,18 +3,18 @@
 
     
         
-        
+        
         
-            Configuration options returned by a DHCP server, if any.
+            
         
 
         
             
-                
+                
             
         
     
diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index 5a9e8ea1..111e1acf 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -3,26 +3,26 @@
 
   
     
-      
+      
     
     
-      
+      
+      " />
     
     
-      The gateway in use.
+      
     
     
-      
+      
     
     
-      
-	Array of IP route data objects. All routes will include "dest"
-	(an IP address string) and "prefix" (a uint). Some routes may
-	include "next-hop" (an IP address string), "metric" (a uint),
+      
     
     
-      The nameservers in use.
+      
     
     
-      A list of domains this address belongs to.
+      
     
     
-      A list of dns searches.
+      
     
     
-      
+      
     
     
-      The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.
+      
     
 
     
       
-        
+        
       
     
   
diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml
index 1a107bf2..0cca33c4 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/nm-ip6-config.xml
@@ -3,63 +3,63 @@
 
   
     
-      
+      
     
     
-      
+      
+      " />
     
     
-      The gateway in use.
+      
     
     
-      
+      
     
     
-      
-	Array of IP route data objects. All routes will include "dest"
-	(an IP address string) and "prefix" (a uint). Some routes may
-	include "next-hop" (an IP address string), "metric" (a uint),
+      
     
     
       
       
-      The nameservers in use.
+      
     
     
-      A list of domains this address belongs to.
+      
     
     
-      A list of dns searches.
+      
     
     
-      
+      
     
 
     
       
-        
+        
       
     
   
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index dd6fc4bd..8203020b 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -5,213 +5,213 @@
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
-          The connection to activate.  If "/" is given, a valid device path must
+        
       
       
-        
+        
       
       
-        
+        
+          "base" connection (to which the VPN connections lifetime will be tied),
+          or pass "/" and NM will automatically use the current default device.
+        " />
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
       
-        
+        
+        " />
       
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
+        " />
       
     
 
     
-      
+      
     
 
     
-      
+      
       
-        
+        
+        " />
       
       
-        
-          A combination of logging domains separated by commas (','), or "NONE"
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
-        The object path of the "primary" active connection being used
+      
     
 
     
-      
-        The connection type of the "primary" active connection being
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
     
 
     
-      
+      
+        third-level dictionary with the keys "servers" and
+        "options". "servers" is a string array of DNS servers,
+        "options" is a string array of domain-specific options.
+      " />
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index 337d0a7f..ec7ede09 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -3,20 +3,20 @@
 
 
     
-        
+        
+        " />
 
         
-            
+            
             
             
             
-                
+                
             
             
-                
+                
             
             
-                
+                
             
             
-                
+                
+                    "x-vpn-message:".
+                " />
             
             
-                
+                
             
 
             
-                
+                
             
 
             
               
-                  
+                  
               
               
-                  
+                  
               
               
-                  
+                  
               
               
-                  
+                  
               
               
-                  
+                  
               
               
-                  
+                  
               
             
         
 
         
-          
+          
           
-            
+            
           
           
-            
+            
           
           
-            
+            
           
           
-            
+            
           
         
 
         
-            
+            
             
             
             
-                
+                
             
             
-                
+                
             
         
 
         
-            
+            
             
             
             
-                
+                
             
             
-                
+                
             
         
 
         
-            
+            
             
             
             
-                
+                
             
             
-                
+                
             
         
 
         
             
-                No special capabilities.
+                
             
             
-                
+                
             
         
 
diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml
index 2d919619..fc62046c 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -3,27 +3,27 @@
 
 
     
-        
+        
 
         
-          
+          
           
-            
+            
           
         
 
         
-          
+          
           
-            
+            
           
         
 
         
-          
+          
         
 
         
-            
+            
             
-                
+                
             
         
 
         
-            
+            
             
-                
+                
             
 
             
-                
+                
             
         
 
         
-          
+          
         
 
         
-            
-                Saves a "dirty" connection (that had previously been
+            
         
 
         
-            
+            
         
 
         
-            
+            
         
 
         
-            
+            
         
 
         
             
-                
+                
             
         
 
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index b6ab8260..62892025 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -2,58 +2,58 @@
 
 
   
-    
+    
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
+      " />
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
-      
+      
+        "monitor-connection-files=false" in NetworkManager.conf.
+      " />
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
-      
+      
     
 
     
         
-            
+            
         
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
diff --git a/introspection/nm-vpn-connection.xml b/introspection/nm-vpn-connection.xml
index 03bbbe98..6a4fb37d 100644
--- a/introspection/nm-vpn-connection.xml
+++ b/introspection/nm-vpn-connection.xml
@@ -4,143 +4,143 @@
   
     
 
-    
+    
 
     
         
-            
+            
         
     
 
     
-      The VPN-specific state of the connection.
+      
     
     
-      The banner string of the VPN connection.
+      
     
 
     
-      
+      
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
   
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml
index adb6a085..ee8c69f8 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/nm-vpn-plugin.xml
@@ -4,20 +4,20 @@
   
     
 
-    
+    
 
     
-      
+      
       
       
-        
+        
       
       
         
@@ -30,22 +30,22 @@
     
 
     
-      
+      
       
       
-        
+        
       
       
-        
+        
       
       
         
@@ -59,19 +59,19 @@
     
 
     
-      
+      
       
       
-        
+        
       
       
-        
+        
       
       
         
@@ -79,9 +79,9 @@
     
 
     
-      
+      
       
       
         
@@ -90,105 +90,105 @@
     
 
     
-      
+      
       
       
-        
+        
       
     
 
     
-      
+      
       
       
-        
+        
       
     
 
     
-      
+      
       
       
-        
+        
       
     
 
     
-      
+      
       
       
-        
+        
       
     
 
     
-      
+      
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-          
+          
       
       
-          
+          
       
     
 
     
-      
+      
       
       
-        
+        
       
       
         
@@ -199,113 +199,113 @@
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
-      
+      
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
     
       
-        
+        
       
       
-        
+        
       
       
-        
+        
       
     
 
diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml
index 55ac4abc..6174ad67 100644
--- a/introspection/nm-wimax-nsp.xml
+++ b/introspection/nm-wimax-nsp.xml
@@ -4,38 +4,38 @@
   
 
     
-      The name of the NSP.
+      
     
     
-      The current signal quality of the NSP, in percent.
+      
     
     
-      The network type of the NSP.
+      
     
 
     
         
-            
+            
         
     
 
     
-      
+      
       
-        Unknown network.
+        
       
       
-        Home network.
+        
       
       
-        Partner network.
+        
       
       
-        Roaming partner network.
+        
       
 
     
diff --git a/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml b/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml
new file mode 100644
index 00000000..eae6fef6
--- /dev/null
+++ b/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml
@@ -0,0 +1,134 @@
+
+
+
+      org.freedesktop.NetworkManager.AccessPoint
+  org.freedesktop.NetworkManager.AccessPoint
+        org.freedesktop.NetworkManager.AccessPoint        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Flags       readable   u
+WpaFlags    readable   u
+RsnFlags    readable   u
+Ssid        readable   ay
+Frequency   readable   u
+HwAddress   readable   s
+Mode        readable   u
+MaxBitrate  readable   u
+Strength    readable   y
+LastSeen    readable   i
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Flags" property
+  org.freedesktop.NetworkManager.AccessPoint:Flags
+
+Flags  readable   u
+
+Flags describing the capabilities of the access point.
+
+
+  The "WpaFlags" property
+  org.freedesktop.NetworkManager.AccessPoint:WpaFlags
+
+WpaFlags  readable   u
+
+Flags describing the access point's capabilities according to WPA (Wifi Protected Access).
+
+
+  The "RsnFlags" property
+  org.freedesktop.NetworkManager.AccessPoint:RsnFlags
+
+RsnFlags  readable   u
+
+Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.
+
+
+  The "Ssid" property
+  org.freedesktop.NetworkManager.AccessPoint:Ssid
+
+Ssid  readable   ay
+
+The Service Set Identifier identifying the access point.
+
+
+  The "Frequency" property
+  org.freedesktop.NetworkManager.AccessPoint:Frequency
+
+Frequency  readable   u
+
+The radio channel frequency in use by the access point, in MHz.
+
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.AccessPoint:HwAddress
+
+HwAddress  readable   s
+
+The hardware address (BSSID) of the access point.
+
+
+  The "Mode" property
+  org.freedesktop.NetworkManager.AccessPoint:Mode
+
+Mode  readable   u
+
+Describes the operating mode of the access point.
+
+
+  The "MaxBitrate" property
+  org.freedesktop.NetworkManager.AccessPoint:MaxBitrate
+
+MaxBitrate  readable   u
+
+The maximum bitrate this access point is capable of, in kilobits/second (Kb/s).
+
+
+  The "Strength" property
+  org.freedesktop.NetworkManager.AccessPoint:Strength
+
+Strength  readable   y
+
+The current signal quality of the access point, in percent.
+
+
+  The "LastSeen" property
+  org.freedesktop.NetworkManager.AccessPoint:LastSeen
+
+LastSeen  readable   i
+
+The timestamp (in CLOCK_BOOTTIME seconds) for the last time the access         point was found in scan results.  A value of -1 means the access point         has never been found in scan results.
+
+
+
+
diff --git a/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml
new file mode 100644
index 00000000..a2a352f6
--- /dev/null
+++ b/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml
@@ -0,0 +1,179 @@
+
+
+
+      org.freedesktop.NetworkManager.Connection.Active
+  org.freedesktop.NetworkManager.Connection.Active
+        org.freedesktop.NetworkManager.Connection.Active        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Connection      readable   o
+SpecificObject  readable   o
+Id              readable   s
+Uuid            readable   s
+Type            readable   s
+Devices         readable   ao
+State           readable   u
+Default         readable   b
+Ip4Config       readable   o
+Dhcp4Config     readable   o
+Default6        readable   b
+Ip6Config       readable   o
+Dhcp6Config     readable   o
+Vpn             readable   b
+Master          readable   o
+
+  
+
+  Description
+  Objects that implement the Connection.Active interface represent an attempt       to connect to a network using the details provided by a Connection object.       The Connection.Active object tracks the life-cycle of the connection       attempt and if successful indicates whether the connected network is the       "default" or preferred network for access.       NetworkManager has the concept of connections, which can be thought of as       settings, a profile or a configuration that can be applied on a networking       device.       Such settings-connections are exposed as D-Bus object and the active-connection       expresses this relationship between device and settings-connection.       At any time a settings-connection can only be activated on one device and vice       versa. However, during activation and deactivation multiple active-connections       can reference the same device or settings-connection as they are waiting to       be activated or to be deactivated.
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Connection" property
+  org.freedesktop.NetworkManager.Connection.Active:Connection
+
+Connection  readable   o
+
+The path of the connection.
+
+
+  The "SpecificObject" property
+  org.freedesktop.NetworkManager.Connection.Active:SpecificObject
+
+SpecificObject  readable   o
+
+A specific object associated with the active connection.  This property         reflects the specific object used during connection activation, and will         not change over the lifetime of the ActiveConnection once set.
+
+
+  The "Id" property
+  org.freedesktop.NetworkManager.Connection.Active:Id
+
+Id  readable   s
+
+The ID of the connection, provided as a convenience so that clients         do not have to retrieve all connection details.
+
+
+  The "Uuid" property
+  org.freedesktop.NetworkManager.Connection.Active:Uuid
+
+Uuid  readable   s
+
+The UUID of the connection, provided as a convenience so that clients         do not have to retrieve all connection details.
+
+
+  The "Type" property
+  org.freedesktop.NetworkManager.Connection.Active:Type
+
+Type  readable   s
+
+The type of the connection, provided as a convenience so that clients         do not have to retrieve all connection details.
+
+
+  The "Devices" property
+  org.freedesktop.NetworkManager.Connection.Active:Devices
+
+Devices  readable   ao
+
+Array of object paths representing devices which are part of this active         connection.
+
+
+  The "State" property
+  org.freedesktop.NetworkManager.Connection.Active:State
+
+State  readable   u
+
+The state of this active connection.
+
+
+  The "Default" property
+  org.freedesktop.NetworkManager.Connection.Active:Default
+
+Default  readable   b
+
+Whether this active connection is the default IPv4 connection, i.e.         whether it currently owns the default IPv4 route.
+
+
+  The "Ip4Config" property
+  org.freedesktop.NetworkManager.Connection.Active:Ip4Config
+
+Ip4Config  readable   o
+
+Object path of the Ip4Config object describing the configuration of the         connection. Only valid when the connection is in the         NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+
+
+  The "Dhcp4Config" property
+  org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config
+
+Dhcp4Config  readable   o
+
+Object path of the Dhcp4Config object describing the DHCP options         returned by the DHCP server (assuming the connection used DHCP). Only         valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED         state.
+
+
+  The "Default6" property
+  org.freedesktop.NetworkManager.Connection.Active:Default6
+
+Default6  readable   b
+
+Whether this active connection is the default IPv6 connection, i.e.         whether it currently owns the default IPv6 route.
+
+
+  The "Ip6Config" property
+  org.freedesktop.NetworkManager.Connection.Active:Ip6Config
+
+Ip6Config  readable   o
+
+Object path of the Ip6Config object describing the configuration of the         connection. Only valid when the connection is in the         NM_ACTIVE_CONNECTION_STATE_ACTIVATED state.
+
+
+  The "Dhcp6Config" property
+  org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config
+
+Dhcp6Config  readable   o
+
+Object path of the Dhcp6Config object describing the DHCP options         returned by the DHCP server (assuming the connection used DHCP). Only         valid when the connection is in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED         state.
+
+
+  The "Vpn" property
+  org.freedesktop.NetworkManager.Connection.Active:Vpn
+
+Vpn  readable   b
+
+Whether this active connection is also a VPN connection.
+
+
+  The "Master" property
+  org.freedesktop.NetworkManager.Connection.Active:Master
+
+Master  readable   o
+
+The path to the master device if the connection is a slave.
+
+
+
+
diff --git a/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml b/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml
new file mode 100644
index 00000000..29bb71d7
--- /dev/null
+++ b/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml
@@ -0,0 +1,66 @@
+
+
+
+      org.freedesktop.NetworkManager.AgentManager
+  org.freedesktop.NetworkManager.AgentManager
+        org.freedesktop.NetworkManager.AgentManager        
+    Methods
+    
+Register                 (IN  s identifier);
+RegisterWithCapabilities (IN  s identifier,
+                          IN  u capabilities);
+Unregister               ();
+
+  
+
+  Description
+  
+
+
+  Method Details
+
+  The Register() method
+  org.freedesktop.NetworkManager.AgentManager.Register()
+
+Register (IN  s identifier);
+
+Called by secret Agents to register their ability to provide and save         network secrets.
+
+
+  IN s identifier:
+  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][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).
+
+
+
+
+  The RegisterWithCapabilities() method
+  org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities()
+
+RegisterWithCapabilities (IN  s identifier,
+                          IN  u capabilities);
+
+Like Register() but indicates agent capabilities to NetworkManager.
+
+
+  IN s identifier:
+  See the Register() method's identifier argument.
+
+
+  IN u capabilities:
+  Indicates various agent capabilities to NetworkManager.
+
+
+
+
+  The Unregister() method
+  org.freedesktop.NetworkManager.AgentManager.Unregister()
+
+Unregister ();
+
+Called by secret Agents to notify NetworkManager that they will no         longer handle requests for network secrets.  Agents are automatically         unregistered when they disconnect from D-Bus.
+
+
+
+
diff --git a/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml b/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml
new file mode 100644
index 00000000..ab85429d
--- /dev/null
+++ b/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml
@@ -0,0 +1,53 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Adsl
+  org.freedesktop.NetworkManager.Device.Adsl
+        org.freedesktop.NetworkManager.Device.Adsl        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Carrier  readable   b
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Adsl:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found.
+
+
+
+
diff --git a/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml
new file mode 100644
index 00000000..22bd4ccf
--- /dev/null
+++ b/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml
@@ -0,0 +1,71 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Bond
+  org.freedesktop.NetworkManager.Device.Bond
+        org.freedesktop.NetworkManager.Device.Bond        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress  readable   s
+Carrier    readable   b
+Slaves     readable   ao
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Bond:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Bond:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+
+
+  The "Slaves" property
+  org.freedesktop.NetworkManager.Device.Bond:Slaves
+
+Slaves  readable   ao
+
+Array of object paths representing devices which are currently  slaved to this device.
+
+
+
+
diff --git a/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml
new file mode 100644
index 00000000..20946e34
--- /dev/null
+++ b/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml
@@ -0,0 +1,71 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Bridge
+  org.freedesktop.NetworkManager.Device.Bridge
+        org.freedesktop.NetworkManager.Device.Bridge        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress  readable   s
+Carrier    readable   b
+Slaves     readable   ao
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Bridge:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Bridge:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+
+
+  The "Slaves" property
+  org.freedesktop.NetworkManager.Device.Bridge:Slaves
+
+Slaves  readable   ao
+
+Array of object paths representing devices which are currently  slaved to this device.
+
+
+
+
diff --git a/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml b/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml
new file mode 100644
index 00000000..7cca9d2c
--- /dev/null
+++ b/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml
@@ -0,0 +1,71 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Bluetooth
+  org.freedesktop.NetworkManager.Device.Bluetooth
+        org.freedesktop.NetworkManager.Device.Bluetooth        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress       readable   s
+Name            readable   s
+BtCapabilities  readable   u
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress
+
+HwAddress  readable   s
+
+Bluetooth hardware address of the device.
+
+
+  The "Name" property
+  org.freedesktop.NetworkManager.Device.Bluetooth:Name
+
+Name  readable   s
+
+Bluetooth name of the device.
+
+
+  The "BtCapabilities" property
+  org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities
+
+BtCapabilities  readable   u
+
+Bluetooth capabilities of the device (either DUN or NAP).
+
+
+
+
diff --git a/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml b/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml
new file mode 100644
index 00000000..ef6e7e8b
--- /dev/null
+++ b/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml
@@ -0,0 +1,89 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Wired
+  org.freedesktop.NetworkManager.Device.Wired
+        org.freedesktop.NetworkManager.Device.Wired        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress        readable   s
+PermHwAddress    readable   s
+Speed            readable   u
+S390Subchannels  readable   as
+Carrier          readable   b
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Wired:HwAddress
+
+HwAddress  readable   s
+
+Active hardware address of the device.
+
+
+  The "PermHwAddress" property
+  org.freedesktop.NetworkManager.Device.Wired:PermHwAddress
+
+PermHwAddress  readable   s
+
+Permanent hardware address of the device.
+
+
+  The "Speed" property
+  org.freedesktop.NetworkManager.Device.Wired:Speed
+
+Speed  readable   u
+
+Design speed of the device, in megabits/second (Mb/s).
+
+
+  The "S390Subchannels" property
+  org.freedesktop.NetworkManager.Device.Wired:S390Subchannels
+
+S390Subchannels  readable   as
+
+Array of S/390 subchannels for S/390 or z/Architecture devices.
+
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Wired:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+
+
+
+
diff --git a/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml b/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml
new file mode 100644
index 00000000..13d81172
--- /dev/null
+++ b/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml
@@ -0,0 +1,62 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Generic
+  org.freedesktop.NetworkManager.Device.Generic
+        org.freedesktop.NetworkManager.Device.Generic        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress        readable   s
+TypeDescription  readable   s
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Generic:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "TypeDescription" property
+  org.freedesktop.NetworkManager.Device.Generic:TypeDescription
+
+TypeDescription  readable   s
+
+A (non-localized) description of the interface type, if known.
+
+
+
+
diff --git a/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml b/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml
new file mode 100644
index 00000000..bbafdbfc
--- /dev/null
+++ b/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml
@@ -0,0 +1,62 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Infiniband
+  org.freedesktop.NetworkManager.Device.Infiniband
+        org.freedesktop.NetworkManager.Device.Infiniband        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress  readable   s
+Carrier    readable   b
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Infiniband:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Infiniband:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+
+
+
+
diff --git a/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml b/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml
new file mode 100644
index 00000000..f1a8bba7
--- /dev/null
+++ b/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml
@@ -0,0 +1,143 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.IPTunnel
+  org.freedesktop.NetworkManager.Device.IPTunnel
+        org.freedesktop.NetworkManager.Device.IPTunnel        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Mode                readable   u
+Parent              readable   o
+Local               readable   s
+Remote              readable   s
+Ttl                 readable   y
+Tos                 readable   y
+PathMtuDiscovery    readable   b
+InputKey            readable   s
+OutputKey           readable   s
+EncapsulationLimit  readable   y
+FlowLabel           readable   u
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Mode" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:Mode
+
+Mode  readable   u
+
+The tunneling mode.
+
+
+  The "Parent" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:Parent
+
+Parent  readable   o
+
+The object path of the parent device.
+
+
+  The "Local" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:Local
+
+Local  readable   s
+
+The local endpoint of the tunnel.
+
+
+  The "Remote" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:Remote
+
+Remote  readable   s
+
+The remote endpoint of the tunnel.
+
+
+  The "Ttl" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:Ttl
+
+Ttl  readable   y
+
+The TTL assigned to tunneled packets. 0 is a special value         meaning that packets inherit the TTL value
+
+
+  The "Tos" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:Tos
+
+Tos  readable   y
+
+The type of service (IPv4) or traffic class (IPv6) assigned to         tunneled packets.
+
+
+  The "PathMtuDiscovery" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery
+
+PathMtuDiscovery  readable   b
+
+Whether path MTU discovery is enabled on this tunnel.
+
+
+  The "InputKey" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:InputKey
+
+InputKey  readable   s
+
+The key used for incoming packets.
+
+
+  The "OutputKey" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey
+
+OutputKey  readable   s
+
+The key used for outgoing packets.
+
+
+  The "EncapsulationLimit" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit
+
+EncapsulationLimit  readable   y
+
+How many additional levels of encapsulation are permitted to         be prepended to packets. This property applies only to IPv6         tunnels.
+
+
+  The "FlowLabel" property
+  org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel
+
+FlowLabel  readable   u
+
+The flow label to assign to tunnel packets. This property         applies only to IPv6 tunnels.
+
+
+
+
diff --git a/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml b/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml
new file mode 100644
index 00000000..ca5d7367
--- /dev/null
+++ b/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml
@@ -0,0 +1,80 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Macvlan
+  org.freedesktop.NetworkManager.Device.Macvlan
+        org.freedesktop.NetworkManager.Device.Macvlan        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Parent     readable   o
+Mode       readable   s
+NoPromisc  readable   b
+Tap        readable   b
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Parent" property
+  org.freedesktop.NetworkManager.Device.Macvlan:Parent
+
+Parent  readable   o
+
+The object path of the parent device.
+
+
+  The "Mode" property
+  org.freedesktop.NetworkManager.Device.Macvlan:Mode
+
+Mode  readable   s
+
+The macvlan mode, one of "private", "vepa", "bridge", or "passthru".
+
+
+  The "NoPromisc" property
+  org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc
+
+NoPromisc  readable   b
+
+Whether the device is blocked from going into promiscuous mode.
+
+
+  The "Tap" property
+  org.freedesktop.NetworkManager.Device.Macvlan:Tap
+
+Tap  readable   b
+
+Whether the device is a macvtap.
+
+
+
+
diff --git a/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml
new file mode 100644
index 00000000..2143ef62
--- /dev/null
+++ b/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml
@@ -0,0 +1,62 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Modem
+  org.freedesktop.NetworkManager.Device.Modem
+        org.freedesktop.NetworkManager.Device.Modem        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+ModemCapabilities    readable   u
+CurrentCapabilities  readable   u
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "ModemCapabilities" property
+  org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities
+
+ModemCapabilities  readable   u
+
+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.
+
+
+  The "CurrentCapabilities" property
+  org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities
+
+CurrentCapabilities  readable   u
+
+The generic family of access technologies the modem currently supports         without a firmware reload or reinitialization.
+
+
+
+
diff --git a/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml b/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml
new file mode 100644
index 00000000..4a512547
--- /dev/null
+++ b/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml
@@ -0,0 +1,71 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.OlpcMesh
+  org.freedesktop.NetworkManager.Device.OlpcMesh
+        org.freedesktop.NetworkManager.Device.OlpcMesh        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress      readable   s
+Companion      readable   o
+ActiveChannel  readable   u
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+Emitted when the wireless device's properties changed.
+
+
+  a{sv} properties:
+  A dictionary containing the FIXME: check changed parameters.
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress
+
+HwAddress  readable   s
+
+The hardware address of the device.
+
+
+  The "Companion" property
+  org.freedesktop.NetworkManager.Device.OlpcMesh:Companion
+
+Companion  readable   o
+
+The object path of the companion device.
+
+
+  The "ActiveChannel" property
+  org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel
+
+ActiveChannel  readable   u
+
+The currently active channel.
+
+
+
+
diff --git a/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml b/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml
new file mode 100644
index 00000000..a5a0697b
--- /dev/null
+++ b/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml
@@ -0,0 +1,370 @@
+
+
+
+      org.freedesktop.NetworkManager.Device
+  org.freedesktop.NetworkManager.Device
+        org.freedesktop.NetworkManager.Device        
+    Methods
+    
+Reapply              (IN  a{sa{sv}} connection,
+                      IN  t         version_id,
+                      IN  u         flags);
+GetAppliedConnection (IN  u         flags,
+                      OUT a{sa{sv}} connection,
+                      OUT t         version_id);
+Disconnect           ();
+Delete               ();
+
+  
+  
+    Signals
+    
+StateChanged (u new_state,
+              u old_state,
+              u reason);
+
+  
+  
+    Properties
+    
+Udi                   readable   s
+Interface             readable   s
+IpInterface           readable   s
+Driver                readable   s
+DriverVersion         readable   s
+FirmwareVersion       readable   s
+Capabilities          readable   u
+Ip4Address            readable   u
+State                 readable   u
+StateReason           readable   (uu)
+ActiveConnection      readable   o
+Ip4Config             readable   o
+Dhcp4Config           readable   o
+Ip6Config             readable   o
+Dhcp6Config           readable   o
+Managed               readwrite  b
+Autoconnect           readwrite  b
+FirmwareMissing       readable   b
+NmPluginMissing       readable   b
+DeviceType            readable   u
+AvailableConnections  readable   ao
+PhysicalPortId        readable   s
+Mtu                   readable   u
+Metered               readable   u
+LldpNeighbors         readable   aa{sv}
+Real                  readable   b
+
+  
+
+  Description
+  
+
+
+  Method Details
+
+  The Reapply() method
+  org.freedesktop.NetworkManager.Device.Reapply()
+
+Reapply (IN  a{sa{sv}} connection,
+         IN  t         version_id,
+         IN  u         flags);
+
+Attempts to update the configuration of a device without deactivating it. NetworkManager         has the concept of connections, which are profiles that contain the configuration for         a networking device. Those connections are exposed via D-Bus as individual objects         that can be created, modified and deleted. When activating such a settings-connection         on a device, the settings-connection is cloned to become an applied-connection and used to         configure the device (see GetAppliedConnection). Subsequent modification of the         settings-connection don't propagate automatically to the device's applied-connection         (with exception of the firewall-zone and the metered property). For the changes to take         effect, you can either re-activate the settings-connection, or call Reapply.         The Reapply call allows you to directly update the applied-connection and reconfigure         the device.         Reapply can also be useful if the currently applied-connection is equal to the connection         that is about to be reapplied. This allows to reconfigure the device and revert external         changes like removing or adding an IP address (which NetworkManager doesn't revert         automatically because it is assumed that the user made these changes intentionally outside         of NetworkManager).         Reapply can make the applied-connection different from the settings-connection,         just like updating the settings-connection can make them different.
+
+
+  IN a{sa{sv}} connection:
+  The optional connection settings that will be reapplied on the device. If empty, the           currently active settings-connection will be used. The connection cannot arbitrarly           differ from the current applied-connection otherwise the call will fail.           Only certain changes are supported, like adding or removing IP addresses.
+
+
+  IN t version_id:
+  If non-zero, the current version id of the applied-connection must match.           The current version id can be retrieved via GetAppliedConnection.           This optional argument allows to catch concurrent modifications between           the GetAppliedConnection call and Reapply.
+
+
+  IN u flags:
+  Flags which would modify the behavior of the Reapply call.           There are no flags defined currently and the users should use the value of 0.
+
+
+
+
+  The GetAppliedConnection() method
+  org.freedesktop.NetworkManager.Device.GetAppliedConnection()
+
+GetAppliedConnection (IN  u         flags,
+                      OUT a{sa{sv}} connection,
+                      OUT t         version_id);
+
+Get the currently applied connection on the device. This is a snapshot of the last activated         connection on the device, that is the configuration that is currently applied on the device.         Usually this is the same as GetSettings of the referenced settings connection. However, it         can differ if the settings connection was subsequently modified or the applied connection was         modified by Reapply. The applied connection is set when activating a device or when calling         Reapply.
+
+
+  IN u flags:
+  Flags which would modify the behavior of the GetAppliedConnection call.           There are no flags defined currently and the users should use the value of 0.
+
+
+  OUT a{sa{sv}} connection:
+  The effective connection settings that the connection has currently applied.
+
+
+  OUT t version_id:
+  The version-id of the currently applied connection. This can be specified during             Reapply to avoid races where you first fetch the applied connection, modify it             and try to reapply it. If the applied connection is modified in the meantime, the             version_id gets incremented and Reapply will fail.
+
+
+
+
+  The Disconnect() method
+  org.freedesktop.NetworkManager.Device.Disconnect()
+
+Disconnect ();
+
+Disconnects a device and prevents the device from automatically activating further connections without user intervention.
+
+
+  The Delete() method
+  org.freedesktop.NetworkManager.Device.Delete()
+
+Delete ();
+
+Deletes a software device from NetworkManager and removes the interface from the system.         The method returns an error when called for a hardware device.
+
+
+
+  Signal Details
+
+  The "StateChanged" signal
+  org.freedesktop.NetworkManager.Device::StateChanged
+
+StateChanged (u new_state,
+              u old_state,
+              u reason);
+
+
+
+
+  u new_state:
+  The new state of the device.
+
+
+  u old_state:
+  The previous state of the device.
+
+
+  u reason:
+  A reason for the state transition.
+
+
+
+
+
+  Property Details
+
+  The "Udi" property
+  org.freedesktop.NetworkManager.Device:Udi
+
+Udi  readable   s
+
+Operating-system specific transient device hardware identifier.  This         is an opaque string representing the underlying hardware for the device,         and shouldn't be used to keep track of individual devices.  For some         device types (Bluetooth, Modems) it is an identifier used by the         hardware service (ie bluez or ModemManager) to refer to that device,         and client programs use it get additional information from those         services which NM does not provide.  The Udi is not guaranteed to be         consistent across reboots or hotplugs of the hardware. If you're looking         for a way to uniquely track each device in your application, use the         object path.  If you're looking for a way to track a specific piece of         hardware across reboot or hotplug, use a MAC address or USB serial         number.
+
+
+  The "Interface" property
+  org.freedesktop.NetworkManager.Device:Interface
+
+Interface  readable   s
+
+The name of the device's control (and often data) interface.
+
+
+  The "IpInterface" property
+  org.freedesktop.NetworkManager.Device:IpInterface
+
+IpInterface  readable   s
+
+The name of the device's data interface when available.  This property         may not refer to the actual data interface until the device has         successfully established a data connection, indicated by the device's         State becoming ACTIVATED.
+
+
+  The "Driver" property
+  org.freedesktop.NetworkManager.Device:Driver
+
+Driver  readable   s
+
+The driver handling the device.
+
+
+  The "DriverVersion" property
+  org.freedesktop.NetworkManager.Device:DriverVersion
+
+DriverVersion  readable   s
+
+The version of the driver handling the device.
+
+
+  The "FirmwareVersion" property
+  org.freedesktop.NetworkManager.Device:FirmwareVersion
+
+FirmwareVersion  readable   s
+
+The firmware version for the device.
+
+
+  The "Capabilities" property
+  org.freedesktop.NetworkManager.Device:Capabilities
+
+Capabilities  readable   u
+
+Flags describing the capabilities of the device.
+
+
+  The "Ip4Address" property
+  org.freedesktop.NetworkManager.Device:Ip4Address
+
+Ip4Address  readable   u
+
+DEPRECATED; use the 'Addresses' property of the 'Ip4Config' object instead.
+
+
+  The "State" property
+  org.freedesktop.NetworkManager.Device:State
+
+State  readable   u
+
+The current state of the device.
+
+
+  The "StateReason" property
+  org.freedesktop.NetworkManager.Device:StateReason
+
+StateReason  readable   (uu)
+
+The current state and reason for changing to that state.
+
+
+  The "ActiveConnection" property
+  org.freedesktop.NetworkManager.Device:ActiveConnection
+
+ActiveConnection  readable   o
+
+Object path of an ActiveConnection object that "owns" this device during         activation.  The ActiveConnection object tracks the life-cycle of a         connection to a specific network and implements the         org.freedesktop.NetworkManager.Connection.Active D-Bus interface.
+
+
+  The "Ip4Config" property
+  org.freedesktop.NetworkManager.Device:Ip4Config
+
+Ip4Config  readable   o
+
+Object path of the Ip4Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+
+
+  The "Dhcp4Config" property
+  org.freedesktop.NetworkManager.Device:Dhcp4Config
+
+Dhcp4Config  readable   o
+
+Object path of the Dhcp4Config object describing the DHCP options returned by the DHCP server.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+
+
+  The "Ip6Config" property
+  org.freedesktop.NetworkManager.Device:Ip6Config
+
+Ip6Config  readable   o
+
+Object path of the Ip6Config object describing the configuration of the device.  Only valid when the device is in the NM_DEVICE_STATE_ACTIVATED state.
+
+
+  The "Dhcp6Config" property
+  org.freedesktop.NetworkManager.Device:Dhcp6Config
+
+Dhcp6Config  readable   o
+
+Object path of the Dhcp6Config object describing the DHCP options         returned by the DHCP server.  Only valid when the device is in the         NM_DEVICE_STATE_ACTIVATED state.
+
+
+  The "Managed" property
+  org.freedesktop.NetworkManager.Device:Managed
+
+Managed  readwrite  b
+
+Whether or not this device is managed by NetworkManager. Setting this         property has a similar effect to configuring the device as unmanaged         via the keyfile.unmanaged-devices setting in NetworkManager.conf.         Changes to this value are not persistent and lost after NetworkManager         restart.
+
+
+  The "Autoconnect" property
+  org.freedesktop.NetworkManager.Device:Autoconnect
+
+Autoconnect  readwrite  b
+
+If TRUE, indicates the device is allowed to autoconnect.  If FALSE,         manual intervention is required before the device will automatically         connect to a known network, such as activating a connection using the         device, or setting this property to TRUE.  This property cannot be         set to TRUE for default-unmanaged devices, since they never autoconnect.
+
+
+  The "FirmwareMissing" property
+  org.freedesktop.NetworkManager.Device:FirmwareMissing
+
+FirmwareMissing  readable   b
+
+If TRUE, indicates the device is likely missing firmware necessary for         its operation.
+
+
+  The "NmPluginMissing" property
+  org.freedesktop.NetworkManager.Device:NmPluginMissing
+
+NmPluginMissing  readable   b
+
+If TRUE, indicates the NetworkManager plugin for the device is likely         missing or misconfigured.
+
+
+  The "DeviceType" property
+  org.freedesktop.NetworkManager.Device:DeviceType
+
+DeviceType  readable   u
+
+The general type of the network device; ie Ethernet, WiFi, etc.
+
+
+  The "AvailableConnections" property
+  org.freedesktop.NetworkManager.Device:AvailableConnections
+
+AvailableConnections  readable   ao
+
+An array of object paths of every configured connection that is currently 'available' through this device.
+
+
+  The "PhysicalPortId" property
+  org.freedesktop.NetworkManager.Device:PhysicalPortId
+
+PhysicalPortId  readable   s
+
+If non-empty, an (opaque) indicator of the physical network         port associated with the device. This can be used to recognize  when two seemingly-separate hardware devices are actually just  different virtual interfaces to the same physical port.
+
+
+  The "Mtu" property
+  org.freedesktop.NetworkManager.Device:Mtu
+
+Mtu  readable   u
+
+The device MTU (maximum transmission unit).
+
+
+  The "Metered" property
+  org.freedesktop.NetworkManager.Device:Metered
+
+Metered  readable   u
+
+Whether the amount of traffic flowing through the device is         subject to limitations, for example set by service providers.
+
+
+  The "LldpNeighbors" property
+  org.freedesktop.NetworkManager.Device:LldpNeighbors
+
+LldpNeighbors  readable   aa{sv}
+
+Array of LLDP neighbors; each element is a dictionary mapping         LLDP TLV names to variant boxed values.
+
+
+  The "Real" property
+  org.freedesktop.NetworkManager.Device:Real
+
+Real  readable   b
+
+True if the device exists, or False for placeholder devices that         do not yet exist but could be automatically created by NetworkManager         if one of their AvailableConnections was activated.
+
+
+
+
diff --git a/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml b/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml
new file mode 100644
index 00000000..6d6ae5aa
--- /dev/null
+++ b/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml
@@ -0,0 +1,71 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Team
+  org.freedesktop.NetworkManager.Device.Team
+        org.freedesktop.NetworkManager.Device.Team        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress  readable   s
+Carrier    readable   b
+Slaves     readable   ao
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Team::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Team:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Team:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+
+
+  The "Slaves" property
+  org.freedesktop.NetworkManager.Device.Team:Slaves
+
+Slaves  readable   ao
+
+Array of object paths representing devices which are currently  slaved to this device.
+
+
+
+
diff --git a/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml b/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml
new file mode 100644
index 00000000..c676e395
--- /dev/null
+++ b/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml
@@ -0,0 +1,107 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Tun
+  org.freedesktop.NetworkManager.Device.Tun
+        org.freedesktop.NetworkManager.Device.Tun        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Owner       readable   x
+Group       readable   x
+Mode        readable   s
+NoPi        readable   b
+VnetHdr     readable   b
+MultiQueue  readable   b
+HwAddress   readable   s
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Owner" property
+  org.freedesktop.NetworkManager.Device.Tun:Owner
+
+Owner  readable   x
+
+The uid of the tunnel owner, or -1 if it has no owner.
+
+
+  The "Group" property
+  org.freedesktop.NetworkManager.Device.Tun:Group
+
+Group  readable   x
+
+The gid of the tunnel group, or -1 if it has no owner.
+
+
+  The "Mode" property
+  org.freedesktop.NetworkManager.Device.Tun:Mode
+
+Mode  readable   s
+
+The tunnel mode, either "tun" or "tap".
+
+
+  The "NoPi" property
+  org.freedesktop.NetworkManager.Device.Tun:NoPi
+
+NoPi  readable   b
+
+The tunnel's "TUN_NO_PI" flag; true if no protocol info is  prepended to the tunnel packets.
+
+
+  The "VnetHdr" property
+  org.freedesktop.NetworkManager.Device.Tun:VnetHdr
+
+VnetHdr  readable   b
+
+The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets  include a virtio network header.
+
+
+  The "MultiQueue" property
+  org.freedesktop.NetworkManager.Device.Tun:MultiQueue
+
+MultiQueue  readable   b
+
+The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to         the tap device multiple times, for multiple send/receive         queues.
+
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Tun:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+
+
diff --git a/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml b/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml
new file mode 100644
index 00000000..f1e1d03a
--- /dev/null
+++ b/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml
@@ -0,0 +1,53 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Veth
+  org.freedesktop.NetworkManager.Device.Veth
+        org.freedesktop.NetworkManager.Device.Veth        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Peer  readable   o
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Peer" property
+  org.freedesktop.NetworkManager.Device.Veth:Peer
+
+Peer  readable   o
+
+The object path of the device's peer.
+
+
+
+
diff --git a/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml b/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml
new file mode 100644
index 00000000..fd07a398
--- /dev/null
+++ b/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml
@@ -0,0 +1,80 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Vlan
+  org.freedesktop.NetworkManager.Device.Vlan
+        org.freedesktop.NetworkManager.Device.Vlan        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+HwAddress  readable   s
+Carrier    readable   b
+Parent     readable   o
+VlanId     readable   u
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Vlan:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "Carrier" property
+  org.freedesktop.NetworkManager.Device.Vlan:Carrier
+
+Carrier  readable   b
+
+Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
+
+
+  The "Parent" property
+  org.freedesktop.NetworkManager.Device.Vlan:Parent
+
+Parent  readable   o
+
+Object path of the parent device of this VLAN device.
+
+
+  The "VlanId" property
+  org.freedesktop.NetworkManager.Device.Vlan:VlanId
+
+VlanId  readable   u
+
+The VLAN ID of this VLAN interface.
+
+
+
+
diff --git a/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml b/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml
new file mode 100644
index 00000000..b755dcb2
--- /dev/null
+++ b/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml
@@ -0,0 +1,197 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Vxlan
+  org.freedesktop.NetworkManager.Device.Vxlan
+        org.freedesktop.NetworkManager.Device.Vxlan        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Parent      readable   o
+HwAddress   readable   s
+Id          readable   u
+Group       readable   s
+Local       readable   s
+Tos         readable   y
+Ttl         readable   y
+Learning    readable   b
+Ageing      readable   u
+Limit       readable   u
+DstPort     readable   q
+SrcPortMin  readable   q
+SrcPortMax  readable   q
+Proxy       readable   b
+Rsc         readable   b
+L2miss      readable   b
+L3miss      readable   b
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Parent" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Parent
+
+Parent  readable   o
+
+The object path of the parent device (if the VXLAN is not  purely internal to this host).
+
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Vxlan:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "Id" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Id
+
+Id  readable   u
+
+The VXLAN Network Identifier (VNI).
+
+
+  The "Group" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Group
+
+Group  readable   s
+
+The IP (v4 or v6) multicast group used to communicate with other physical  hosts on this VXLAN.
+
+
+  The "Local" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Local
+
+Local  readable   s
+
+The local IPv4 or IPv6 address to use when sending VXLAN packets to other  physical hosts.
+
+
+  The "Tos" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Tos
+
+Tos  readable   y
+
+The value to use in the IP ToS field for VXLAN packets sent to  other physical hosts.
+
+
+  The "Ttl" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Ttl
+
+Ttl  readable   y
+
+The value to use in the IP TTL field for VXLAN packets sent to  other physical hosts.
+
+
+  The "Learning" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Learning
+
+Learning  readable   b
+
+True if the VXLAN dynamically learns remote IP addresses.
+
+
+  The "Ageing" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Ageing
+
+Ageing  readable   u
+
+The interval in seconds at which the kernel purges stale         cached addresses.
+
+
+  The "Limit" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Limit
+
+Limit  readable   u
+
+The maximum number of entries that can be added to the VXLAN's  forwarding table.
+
+
+  The "DstPort" property
+  org.freedesktop.NetworkManager.Device.Vxlan:DstPort
+
+DstPort  readable   q
+
+Destination port for outgoing VXLAN packets.
+
+
+  The "SrcPortMin" property
+  org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin
+
+SrcPortMin  readable   q
+
+The lowest source port number to use for outgoing VXLAN packets.
+
+
+  The "SrcPortMax" property
+  org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax
+
+SrcPortMax  readable   q
+
+The highest source port number to use for outgoing VXLAN packets.
+
+
+  The "Proxy" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Proxy
+
+Proxy  readable   b
+
+True if the VXLAN is implementing DOVE ARP proxying for remote         clients.
+
+
+  The "Rsc" property
+  org.freedesktop.NetworkManager.Device.Vxlan:Rsc
+
+Rsc  readable   b
+
+True if the VXLAN is implementing DOVE route short-circuiting  of known remote IP addresses.
+
+
+  The "L2miss" property
+  org.freedesktop.NetworkManager.Device.Vxlan:L2miss
+
+L2miss  readable   b
+
+True if the VXLAN will emit netlink notifications of L2 switch         misses.
+
+
+  The "L3miss" property
+  org.freedesktop.NetworkManager.Device.Vxlan:L3miss
+
+L3miss  readable   b
+
+True if the VXLAN will emit netlink notifications of L3 switch         misses.
+
+
+
+
diff --git a/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml
new file mode 100644
index 00000000..1951a6f5
--- /dev/null
+++ b/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -0,0 +1,190 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.Wireless
+  org.freedesktop.NetworkManager.Device.Wireless
+        org.freedesktop.NetworkManager.Device.Wireless        
+    Methods
+    
+GetAccessPoints    (OUT ao    access_points);
+GetAllAccessPoints (OUT ao    access_points);
+RequestScan        (IN  a{sv} options);
+
+  
+  
+    Signals
+    
+PropertiesChanged  (a{sv} properties);
+AccessPointAdded   (o     access_point);
+AccessPointRemoved (o     access_point);
+
+  
+  
+    Properties
+    
+HwAddress             readable   s
+PermHwAddress         readable   s
+Mode                  readable   u
+Bitrate               readable   u
+AccessPoints          readable   ao
+ActiveAccessPoint     readable   o
+WirelessCapabilities  readable   u
+
+  
+
+  Description
+  
+
+
+  Method Details
+
+  The GetAccessPoints() method
+  org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints()
+
+GetAccessPoints (OUT ao access_points);
+
+DEPRECATED.  Get the list of access points visible to this device.  Note         that this list does not include access points which hide their SSID.  To         retrieve a list of all access points (including hidden ones) use the         GetAllAccessPoints() method.
+
+
+  OUT ao access_points:
+  List of access point object paths.
+
+
+
+
+  The GetAllAccessPoints() method
+  org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints()
+
+GetAllAccessPoints (OUT ao access_points);
+
+Get the list of all access points visible to this device, including         hidden ones for which the SSID is not yet known.
+
+
+  OUT ao access_points:
+  List of access point object paths.
+
+
+
+
+  The RequestScan() method
+  org.freedesktop.NetworkManager.Device.Wireless.RequestScan()
+
+RequestScan (IN  a{sv} options);
+
+Request the device to scan
+
+
+  IN a{sv} options:
+  Options of scan.           Currently 'ssids' option with value of "aay" type is supported.
+
+
+
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+Emitted when the wireless device's properties changed.
+
+
+  a{sv} properties:
+  A dictionary containing the FIXME: check changed parameters.
+
+
+
+
+  The "AccessPointAdded" signal
+  org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded
+
+AccessPointAdded (o access_point);
+
+Emitted when a new access point is found by the device.
+
+
+  o access_point:
+  The object path of the newly found access point.
+
+
+
+
+  The "AccessPointRemoved" signal
+  org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved
+
+AccessPointRemoved (o access_point);
+
+Emitted when an access point disappears from view of the device.
+
+
+  o access_point:
+  The object path of the access point that has disappeared.
+
+
+
+
+
+  Property Details
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.Wireless:HwAddress
+
+HwAddress  readable   s
+
+The active hardware address of the device.
+
+
+  The "PermHwAddress" property
+  org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress
+
+PermHwAddress  readable   s
+
+The permanent hardware address of the device.
+
+
+  The "Mode" property
+  org.freedesktop.NetworkManager.Device.Wireless:Mode
+
+Mode  readable   u
+
+The operating mode of the wireless device.
+
+
+  The "Bitrate" property
+  org.freedesktop.NetworkManager.Device.Wireless:Bitrate
+
+Bitrate  readable   u
+
+The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
+
+
+  The "AccessPoints" property
+  org.freedesktop.NetworkManager.Device.Wireless:AccessPoints
+
+AccessPoints  readable   ao
+
+List of object paths of access point visible to this wireless device.
+
+
+  The "ActiveAccessPoint" property
+  org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint
+
+ActiveAccessPoint  readable   o
+
+Object path of the access point currently used by the wireless device.
+
+
+  The "WirelessCapabilities" property
+  org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities
+
+WirelessCapabilities  readable   u
+
+The capabilities of the wireless device.
+
+
+
+
diff --git a/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml b/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml
new file mode 100644
index 00000000..5ad7234a
--- /dev/null
+++ b/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml
@@ -0,0 +1,169 @@
+
+
+
+      org.freedesktop.NetworkManager.Device.WiMax
+  org.freedesktop.NetworkManager.Device.WiMax
+        org.freedesktop.NetworkManager.Device.WiMax        
+    Methods
+    
+GetNspList (OUT ao nsps);
+
+  
+  
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+NspAdded          (o     nsp);
+NspRemoved        (o     nsp);
+
+  
+  
+    Properties
+    
+Nsps             readable   ao
+HwAddress        readable   s
+CenterFrequency  readable   u
+Rssi             readable   i
+Cinr             readable   i
+TxPower          readable   i
+Bsid             readable   s
+ActiveNsp        readable   o
+
+  
+
+  Description
+  
+
+
+  Method Details
+
+  The GetNspList() method
+  org.freedesktop.NetworkManager.Device.WiMax.GetNspList()
+
+GetNspList (OUT ao nsps);
+
+Get the list of NSPs visible to this device.
+
+
+  OUT ao nsps:
+  List of NSP object paths
+
+
+
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Device.WiMax::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+Emitted when the WiMax device's properties changed.
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values.
+
+
+
+
+  The "NspAdded" signal
+  org.freedesktop.NetworkManager.Device.WiMax::NspAdded
+
+NspAdded (o nsp);
+
+Emitted when a new NSP is found by the device.
+
+
+  o nsp:
+  The object path of the newly found NSP.
+
+
+
+
+  The "NspRemoved" signal
+  org.freedesktop.NetworkManager.Device.WiMax::NspRemoved
+
+NspRemoved (o nsp);
+
+Emitted when an NSP disappears from view of the device.
+
+
+  o nsp:
+  The object path of the NSP that has disappeared.
+
+
+
+
+
+  Property Details
+
+  The "Nsps" property
+  org.freedesktop.NetworkManager.Device.WiMax:Nsps
+
+Nsps  readable   ao
+
+List of object paths of Network Service Providers (NSPs) visible to this         WiMAX device.
+
+
+  The "HwAddress" property
+  org.freedesktop.NetworkManager.Device.WiMax:HwAddress
+
+HwAddress  readable   s
+
+Hardware address of the device.
+
+
+  The "CenterFrequency" property
+  org.freedesktop.NetworkManager.Device.WiMax:CenterFrequency
+
+CenterFrequency  readable   u
+
+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.
+
+
+  The "Rssi" property
+  org.freedesktop.NetworkManager.Device.WiMax:Rssi
+
+Rssi  readable   i
+
+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.
+
+
+  The "Cinr" property
+  org.freedesktop.NetworkManager.Device.WiMax:Cinr
+
+Cinr  readable   i
+
+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.
+
+
+  The "TxPower" property
+  org.freedesktop.NetworkManager.Device.WiMax:TxPower
+
+TxPower  readable   i
+
+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.
+
+
+  The "Bsid" property
+  org.freedesktop.NetworkManager.Device.WiMax:Bsid
+
+Bsid  readable   s
+
+The ID of the serving base station as received from the network.  Has         no meaning when the device is not connected.
+
+
+  The "ActiveNsp" property
+  org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp
+
+ActiveNsp  readable   o
+
+Object path of the NSP currently used by the WiMax device.
+
+
+
+
diff --git a/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml b/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml
new file mode 100644
index 00000000..5c144868
--- /dev/null
+++ b/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml
@@ -0,0 +1,53 @@
+
+
+
+      org.freedesktop.NetworkManager.DHCP4Config
+  org.freedesktop.NetworkManager.DHCP4Config
+        org.freedesktop.NetworkManager.DHCP4Config        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Options  readable   a{sv}
+
+  
+
+  Description
+  Options and configuration returned by the IPv4 DHCP server.
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Options" property
+  org.freedesktop.NetworkManager.DHCP4Config:Options
+
+Options  readable   a{sv}
+
+Configuration options returned by a DHCP server, if any.
+
+
+
+
diff --git a/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml b/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml
new file mode 100644
index 00000000..65c12825
--- /dev/null
+++ b/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml
@@ -0,0 +1,53 @@
+
+
+
+      org.freedesktop.NetworkManager.DHCP6Config
+  org.freedesktop.NetworkManager.DHCP6Config
+        org.freedesktop.NetworkManager.DHCP6Config        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Options  readable   a{sv}
+
+  
+
+  Description
+  Options and configuration returned by the IPv6 DHCP server.
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Options" property
+  org.freedesktop.NetworkManager.DHCP6Config:Options
+
+Options  readable   a{sv}
+
+Configuration options returned by a DHCP server, if any.
+
+
+
+
diff --git a/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
new file mode 100644
index 00000000..08ddf98a
--- /dev/null
+++ b/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
@@ -0,0 +1,134 @@
+
+
+
+      org.freedesktop.NetworkManager.IP4Config
+  org.freedesktop.NetworkManager.IP4Config
+        org.freedesktop.NetworkManager.IP4Config        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Addresses    readable   aau
+AddressData  readable   aa{sv}
+Gateway      readable   s
+Routes       readable   aau
+RouteData    readable   aa{sv}
+Nameservers  readable   au
+Domains      readable   as
+Searches     readable   as
+DnsOptions   readable   as
+WinsServers  readable   au
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.IP4Config::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Addresses" property
+  org.freedesktop.NetworkManager.IP4Config:Addresses
+
+Addresses  readable   aau
+
+Array of arrays of IPv4 address/prefix/gateway.  All 3  elements of each array are in network byte order.  Essentially:  [(addr, prefix, gateway), (addr, prefix, gateway), ...]   Deprecated: use AddressData and Gateway
+
+
+  The "AddressData" property
+  org.freedesktop.NetworkManager.IP4Config:AddressData
+
+AddressData  readable   aa{sv}
+
+Array of IP address data objects. All addresses will include  "address" (an IP address string), and "prefix" (a uint). Some  addresses may include additional attributes.
+
+
+  The "Gateway" property
+  org.freedesktop.NetworkManager.IP4Config:Gateway
+
+Gateway  readable   s
+
+The gateway in use.
+
+
+  The "Routes" property
+  org.freedesktop.NetworkManager.IP4Config:Routes
+
+Routes  readable   aau
+
+Arrays of IPv4 route/prefix/next-hop/metric. All 4 elements of  each tuple are in network byte order. 'route' and 'next hop'  are IPv4 addresses, while prefix and metric are simple  unsigned integers. Essentially: [(route, prefix, next-hop,  metric), (route, prefix, next-hop, metric), ...]   Deprecated: use RouteData
+
+
+  The "RouteData" property
+  org.freedesktop.NetworkManager.IP4Config:RouteData
+
+RouteData  readable   aa{sv}
+
+Array of IP route data objects. All routes will include "dest"  (an IP address string) and "prefix" (a uint). Some routes may  include "next-hop" (an IP address string), "metric" (a uint),  and additional attributes.
+
+
+  The "Nameservers" property
+  org.freedesktop.NetworkManager.IP4Config:Nameservers
+
+Nameservers  readable   au
+
+The nameservers in use.
+
+
+  The "Domains" property
+  org.freedesktop.NetworkManager.IP4Config:Domains
+
+Domains  readable   as
+
+A list of domains this address belongs to.
+
+
+  The "Searches" property
+  org.freedesktop.NetworkManager.IP4Config:Searches
+
+Searches  readable   as
+
+A list of dns searches.
+
+
+  The "DnsOptions" property
+  org.freedesktop.NetworkManager.IP4Config:DnsOptions
+
+DnsOptions  readable   as
+
+A list of DNS options that modify the behavior of the DNS  resolver. See resolv.conf(5) manual page for the list of  supported options.
+
+
+  The "WinsServers" property
+  org.freedesktop.NetworkManager.IP4Config:WinsServers
+
+WinsServers  readable   au
+
+The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.
+
+
+
+
diff --git a/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
new file mode 100644
index 00000000..a0e327eb
--- /dev/null
+++ b/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml
@@ -0,0 +1,125 @@
+
+
+
+      org.freedesktop.NetworkManager.IP6Config
+  org.freedesktop.NetworkManager.IP6Config
+        org.freedesktop.NetworkManager.IP6Config        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Addresses    readable   a(ayuay)
+AddressData  readable   aa{sv}
+Gateway      readable   s
+Routes       readable   a(ayuayu)
+RouteData    readable   aa{sv}
+Nameservers  readable   aay
+Domains      readable   as
+Searches     readable   as
+DnsOptions   readable   as
+
+  
+
+  Description
+  
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.IP6Config::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+
+  Property Details
+
+  The "Addresses" property
+  org.freedesktop.NetworkManager.IP6Config:Addresses
+
+Addresses  readable   a(ayuay)
+
+Array of tuples of IPv6 address/prefix/gateway.   Deprecated: use AddressData and Gateway.
+
+
+  The "AddressData" property
+  org.freedesktop.NetworkManager.IP6Config:AddressData
+
+AddressData  readable   aa{sv}
+
+Array of IP address data objects. All addresses will include  "address" (an IP address string), and "prefix" (a uint). Some  addresses may include additional attributes.
+
+
+  The "Gateway" property
+  org.freedesktop.NetworkManager.IP6Config:Gateway
+
+Gateway  readable   s
+
+The gateway in use.
+
+
+  The "Routes" property
+  org.freedesktop.NetworkManager.IP6Config:Routes
+
+Routes  readable   a(ayuayu)
+
+Tuples of IPv6 route/prefix/next-hop/metric.   Deprecated: use RouteData
+
+
+  The "RouteData" property
+  org.freedesktop.NetworkManager.IP6Config:RouteData
+
+RouteData  readable   aa{sv}
+
+Array of IP route data objects. All routes will include "dest"  (an IP address string) and "prefix" (a uint). Some routes may  include "next-hop" (an IP address string), "metric" (a uint),  and additional attributes.
+
+
+  The "Nameservers" property
+  org.freedesktop.NetworkManager.IP6Config:Nameservers
+
+Nameservers  readable   aay
+
+The nameservers in use.
+
+
+  The "Domains" property
+  org.freedesktop.NetworkManager.IP6Config:Domains
+
+Domains  readable   as
+
+A list of domains this address belongs to.
+
+
+  The "Searches" property
+  org.freedesktop.NetworkManager.IP6Config:Searches
+
+Searches  readable   as
+
+A list of dns searches.
+
+
+  The "DnsOptions" property
+  org.freedesktop.NetworkManager.IP6Config:DnsOptions
+
+DnsOptions  readable   as
+
+A list of DNS options that modify the behavior of the DNS  resolver. See resolv.conf(5) manual page for the list of  supported options.
+
+
+
+
diff --git a/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
new file mode 100644
index 00000000..10cc472e
--- /dev/null
+++ b/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml
@@ -0,0 +1,532 @@
+
+
+
+      org.freedesktop.NetworkManager
+  org.freedesktop.NetworkManager
+        org.freedesktop.NetworkManager        
+    Methods
+    
+GetDevices               (OUT ao        devices);
+GetAllDevices            (OUT ao        devices);
+GetDeviceByIpIface       (IN  s         iface,
+                          OUT o         device);
+ActivateConnection       (IN  o         connection,
+                          IN  o         device,
+                          IN  o         specific_object,
+                          OUT o         active_connection);
+AddAndActivateConnection (IN  a{sa{sv}} connection,
+                          IN  o         device,
+                          IN  o         specific_object,
+                          OUT o         path,
+                          OUT o         active_connection);
+DeactivateConnection     (IN  o         active_connection);
+Sleep                    (IN  b         sleep);
+Enable                   (IN  b         enable);
+GetPermissions           (OUT a{ss}     permissions);
+SetLogging               (IN  s         level,
+                          IN  s         domains);
+GetLogging               (OUT s         level,
+                          OUT s         domains);
+CheckConnectivity        (OUT u         connectivity);
+state                    (OUT u         state);
+
+  
+  
+    Signals
+    
+CheckPermissions  ();
+StateChanged      (u     state);
+PropertiesChanged (a{sv} properties);
+DeviceAdded       (o     device_path);
+DeviceRemoved     (o     device_path);
+
+  
+  
+    Properties
+    
+Devices                  readable   ao
+AllDevices               readable   ao
+NetworkingEnabled        readable   b
+WirelessEnabled          readwrite  b
+WirelessHardwareEnabled  readable   b
+WwanEnabled              readwrite  b
+WwanHardwareEnabled      readable   b
+WimaxEnabled             readwrite  b
+WimaxHardwareEnabled     readable   b
+ActiveConnections        readable   ao
+PrimaryConnection        readable   o
+PrimaryConnectionType    readable   s
+Metered                  readable   u
+ActivatingConnection     readable   o
+Startup                  readable   b
+Version                  readable   s
+State                    readable   u
+Connectivity             readable   u
+GlobalDnsConfiguration   readwrite  a{sv}
+
+  
+
+  Description
+  
+
+
+  Method Details
+
+  The GetDevices() method
+  org.freedesktop.NetworkManager.GetDevices()
+
+GetDevices (OUT ao devices);
+
+Get the list of realized network devices.
+
+
+  OUT ao devices:
+  List of object paths of network devices known to the system.  This           list does not include device placeholders (see GetAllDevices()).
+
+
+
+
+  The GetAllDevices() method
+  org.freedesktop.NetworkManager.GetAllDevices()
+
+GetAllDevices (OUT ao devices);
+
+Get the list of all network devices.
+
+
+  OUT ao devices:
+  List of object paths of network devices and device placeholders           (eg, devices that do not yet exist but which can be automatically           created by NetworkManager if one of their AvailableConnections           was activated).
+
+
+
+
+  The GetDeviceByIpIface() method
+  org.freedesktop.NetworkManager.GetDeviceByIpIface()
+
+GetDeviceByIpIface (IN  s iface,
+                    OUT o device);
+
+Return the object path of the network device referenced by its IP         interface name.  Note that some devices (usually modems) only have an         IP interface name when they are connected.
+
+
+  IN s iface:
+  Interface name of the device to find.
+
+
+  OUT o device:
+  Object path of the network device.
+
+
+
+
+  The ActivateConnection() method
+  org.freedesktop.NetworkManager.ActivateConnection()
+
+ActivateConnection (IN  o connection,
+                    IN  o device,
+                    IN  o specific_object,
+                    OUT o active_connection);
+
+Activate a connection using the supplied device.
+
+
+  IN o connection:
+  The connection to activate.  If "/" is given, a valid device path must           be given, and NetworkManager picks the best connection to activate for           the given device.  VPN connections must always pass a valid connection           path.
+
+
+  IN o device:
+  The object path of device to be activated for physical connections.           This parameter is ignored for VPN connections, because the           specific_object (if provided) specifies the device to use.
+
+
+  IN o specific_object:
+  The path of a connection-type-specific object this activation should use.            This parameter is currently ignored for wired and mobile broadband connections,           and the value of "/" should be used (ie, no specific object).  For WiFi           connections, pass the object path of a specific AP from the card's scan           list, or "/" to pick an AP automatically.  For VPN connections, pass           the object path of an ActiveConnection object that should serve as the           "base" connection (to which the VPN connections lifetime will be tied),           or pass "/" and NM will automatically use the current default device.
+
+
+  OUT o active_connection:
+  The path of the active connection object representing this active connection.
+
+
+
+
+  The AddAndActivateConnection() method
+  org.freedesktop.NetworkManager.AddAndActivateConnection()
+
+AddAndActivateConnection (IN  a{sa{sv}} connection,
+                          IN  o         device,
+                          IN  o         specific_object,
+                          OUT o         path,
+                          OUT o         active_connection);
+
+Adds a new connection using the given details (if any) as a template         (automatically filling in missing settings with the capabilities of the         given device and specific object), then activate the new connection.         Cannot be used for VPN connections at this time.
+
+
+  IN a{sa{sv}} connection:
+  Connection settings and properties; if incomplete missing settings will           be automatically completed using the given device and specific object.
+
+
+  IN o device:
+  The object path of device to be activated using the given connection.
+
+
+  IN o specific_object:
+  The path of a connection-type-specific object this activation should use.            This parameter is currently ignored for wired and mobile broadband connections,           and the value of "/" should be used (ie, no specific object).  For WiFi           connections, pass the object path of a specific AP from the card's scan           list, which will be used to complete the details of the newly added           connection.
+
+
+  OUT o path:
+  Object path of the new connection that was just added.
+
+
+  OUT o active_connection:
+  The path of the active connection object representing this active connection.
+
+
+
+
+  The DeactivateConnection() method
+  org.freedesktop.NetworkManager.DeactivateConnection()
+
+DeactivateConnection (IN  o active_connection);
+
+Deactivate an active connection.
+
+
+  IN o active_connection:
+  The currently active connection to deactivate.
+
+
+
+
+  The Sleep() method
+  org.freedesktop.NetworkManager.Sleep()
+
+Sleep (IN  b sleep);
+
+Control the NetworkManager daemon's sleep state.  When asleep, all         interfaces that it manages are deactivated.  When awake, devices are         available to be activated.  This command should not be called directly         by users or clients; it is intended for system suspend/resume tracking.
+
+
+  IN b sleep:
+  Indicates whether the NetworkManager daemon should sleep or wake.
+
+
+
+
+  The Enable() method
+  org.freedesktop.NetworkManager.Enable()
+
+Enable (IN  b enable);
+
+Control whether overall networking is enabled or disabled.  When         disabled, all interfaces that NM manages are deactivated.  When enabled,         all managed interfaces are re-enabled and available to be activated.         This command should be used by clients that provide to users the ability         to enable/disable all networking.
+
+
+  IN b enable:
+  If FALSE, indicates that all networking should be disabled.  If TRUE,           indicates that NetworkManager should begin managing network devices.
+
+
+
+
+  The GetPermissions() method
+  org.freedesktop.NetworkManager.GetPermissions()
+
+GetPermissions (OUT a{ss} permissions);
+
+Returns the permissions a caller has for various authenticated operations         that NetworkManager provides, like Enable/Disable networking, changing         WiFi, WWAN, and WiMAX state, etc.
+
+
+  OUT a{ss} permissions:
+  Dictionary of available permissions and results.  Each permission           is represented by a name (ie "org.freedesktop.NetworkManager.Foobar")           and each result is one of the following values: "yes" (the permission           is available), "auth" (the permission is available after a successful           authentication), or "no" (the permission is denied).  Clients may use           these values in the UI to indicate the ability to perform certain           operations.
+
+
+
+
+  The SetLogging() method
+  org.freedesktop.NetworkManager.SetLogging()
+
+SetLogging (IN  s level,
+            IN  s domains);
+
+Set logging verbosity and which operations are logged.
+
+
+  IN s level:
+  One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP].           This level is applied to the domains as specified in the domains           argument. Except for the special level "KEEP", all unmentioned           domains are disabled entirely. "KEEP" is special and allows           not to change the current setting except for the specified           domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only           touch the platform domain.
+
+
+  IN s domains:
+  A combination of logging domains separated by commas (','), or "NONE"           to disable logging.  Each domain enables logging for operations           related to that domain.  Available domains are: [PLATFORM, RFKILL, ETHER,           WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS,           VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE,           OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,           TEAM, CONCHECK, DCB, DISPATCH, AUDIT].           In addition to these domains, the following special domains can be used:           [NONE, ALL, DEFAULT, DHCP, IP].  You can also specify that some domains           should log at a different level from the default by appending a colon (':')           and a log level (eg, 'WIFI:DEBUG').  If an empty string is given, the           log level is changed but the current set of log domains remains           unchanged.
+
+
+
+
+  The GetLogging() method
+  org.freedesktop.NetworkManager.GetLogging()
+
+GetLogging (OUT s level,
+            OUT s domains);
+
+Get current logging verbosity level and operations domains.
+
+
+  OUT s level:
+  One of [ERR, WARN, INFO, DEBUG, TRACE].
+
+
+  OUT s domains:
+  For available domains see SetLogging() call.
+
+
+
+
+  The CheckConnectivity() method
+  org.freedesktop.NetworkManager.CheckConnectivity()
+
+CheckConnectivity (OUT u connectivity);
+
+Re-check the network connectivity state.
+
+
+  OUT u connectivity:
+  The current connectivity state.
+
+
+
+
+  The state() method
+  org.freedesktop.NetworkManager.state()
+
+state (OUT u state);
+
+The overall networking state as determined by the NetworkManager daemon,         based on the state of network devices under it's management.
+
+
+  OUT u state:
+  
+
+
+
+
+
+  Signal Details
+
+  The "CheckPermissions" signal
+  org.freedesktop.NetworkManager::CheckPermissions
+
+CheckPermissions ();
+
+Emitted when system authorization details change, indicating that         clients may wish to recheck permissions with GetPermissions.
+
+
+  The "StateChanged" signal
+  org.freedesktop.NetworkManager::StateChanged
+
+StateChanged (u state);
+
+NetworkManager's state changed.
+
+
+  u state:
+  The new state of NetworkManager.
+
+
+
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+NetworkManager's properties changed.
+
+
+  a{sv} properties:
+  The changed properties.
+
+
+
+
+  The "DeviceAdded" signal
+  org.freedesktop.NetworkManager::DeviceAdded
+
+DeviceAdded (o device_path);
+
+A device was added to the system
+
+
+  o device_path:
+  The object path of the newly added device.
+
+
+
+
+  The "DeviceRemoved" signal
+  org.freedesktop.NetworkManager::DeviceRemoved
+
+DeviceRemoved (o device_path);
+
+A device was removed from the system, and is no longer available.
+
+
+  o device_path:
+  The object path of the device that was just removed.
+
+
+
+
+
+  Property Details
+
+  The "Devices" property
+  org.freedesktop.NetworkManager:Devices
+
+Devices  readable   ao
+
+The list of realized network devices. Realized devices are those which         have backing resources (eg from the kernel or a management daemon like         ModemManager, teamd, etc).
+
+
+  The "AllDevices" property
+  org.freedesktop.NetworkManager:AllDevices
+
+AllDevices  readable   ao
+
+The list of both realized and un-realized network devices. Un-realized         devices are software devices which do not yet have backing resources,         but for which backing resources can be created if the device is         activated.
+
+
+  The "NetworkingEnabled" property
+  org.freedesktop.NetworkManager:NetworkingEnabled
+
+NetworkingEnabled  readable   b
+
+Indicates if overall networking is currently enabled or not.  See the         Enable() method.
+
+
+  The "WirelessEnabled" property
+  org.freedesktop.NetworkManager:WirelessEnabled
+
+WirelessEnabled  readwrite  b
+
+Indicates if wireless is currently enabled or not.
+
+
+  The "WirelessHardwareEnabled" property
+  org.freedesktop.NetworkManager:WirelessHardwareEnabled
+
+WirelessHardwareEnabled  readable   b
+
+Indicates if the wireless hardware is currently enabled, i.e. the state of the RF kill switch.
+
+
+  The "WwanEnabled" property
+  org.freedesktop.NetworkManager:WwanEnabled
+
+WwanEnabled  readwrite  b
+
+Indicates if mobile broadband devices are currently enabled or not.
+
+
+  The "WwanHardwareEnabled" property
+  org.freedesktop.NetworkManager:WwanHardwareEnabled
+
+WwanHardwareEnabled  readable   b
+
+Indicates if the mobile broadband hardware is currently enabled, i.e. the state of the RF kill switch.
+
+
+  The "WimaxEnabled" property
+  org.freedesktop.NetworkManager:WimaxEnabled
+
+WimaxEnabled  readwrite  b
+
+Indicates if WiMAX devices are currently enabled or not.
+
+
+  The "WimaxHardwareEnabled" property
+  org.freedesktop.NetworkManager:WimaxHardwareEnabled
+
+WimaxHardwareEnabled  readable   b
+
+Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+
+
+  The "ActiveConnections" property
+  org.freedesktop.NetworkManager:ActiveConnections
+
+ActiveConnections  readable   ao
+
+List of active connection object paths.
+
+
+  The "PrimaryConnection" property
+  org.freedesktop.NetworkManager:PrimaryConnection
+
+PrimaryConnection  readable   o
+
+The object path of the "primary" active connection being used         to access the network. In particular, if there is no VPN         active, or the VPN does not have the default route, then this         indicates the connection that has the default route. If there         is a VPN active with the default route, then this indicates         the connection that contains the route to the VPN endpoint.
+
+
+  The "PrimaryConnectionType" property
+  org.freedesktop.NetworkManager:PrimaryConnectionType
+
+PrimaryConnectionType  readable   s
+
+The connection type of the "primary" active connection being         used to access the network. This is the same as the Type         property on the object indicated by PrimaryConnection.
+
+
+  The "Metered" property
+  org.freedesktop.NetworkManager:Metered
+
+Metered  readable   u
+
+Indicates whether the connectivity is metered. This is equivalent         to the metered property of the device associated with the primary         connection.
+
+
+  The "ActivatingConnection" property
+  org.freedesktop.NetworkManager:ActivatingConnection
+
+ActivatingConnection  readable   o
+
+The object path of an active connection that is currently         being activated and which is expected to become the new         PrimaryConnection when it finishes activating.
+
+
+  The "Startup" property
+  org.freedesktop.NetworkManager:Startup
+
+Startup  readable   b
+
+Indicates whether NM is still starting up; this becomes FALSE         when NM has finished attempting to activate every connection         that it might be able to activate at startup.
+
+
+  The "Version" property
+  org.freedesktop.NetworkManager:Version
+
+Version  readable   s
+
+NetworkManager version.
+
+
+  The "State" property
+  org.freedesktop.NetworkManager:State
+
+State  readable   u
+
+The overall state of the NetworkManager daemon.
+
+
+  The "Connectivity" property
+  org.freedesktop.NetworkManager:Connectivity
+
+Connectivity  readable   u
+
+The network connectivity state.
+
+
+  The "GlobalDnsConfiguration" property
+  org.freedesktop.NetworkManager:GlobalDnsConfiguration
+
+GlobalDnsConfiguration  readwrite  a{sv}
+
+Dictionary of global DNS settings where the key is one of         "searches", "options" and "domains".  The values for the         "searches" and "options" keys are string arrays describing the         list of search domains and resolver options, respectively.         The value of the "domains" key is a second-level dictionary,         where each key is a domain name, and each key's value is a         third-level dictionary with the keys "servers" and         "options". "servers" is a string array of DNS servers,         "options" is a string array of domain-specific options.
+
+
+
+
diff --git a/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml b/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml
new file mode 100644
index 00000000..79370cd3
--- /dev/null
+++ b/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml
@@ -0,0 +1,87 @@
+
+
+
+      org.freedesktop.NetworkManager.PPP
+  org.freedesktop.NetworkManager.PPP
+        org.freedesktop.NetworkManager.PPP        
+    Methods
+    
+NeedSecrets  (OUT s     username,
+              OUT s     password);
+SetIp4Config (IN  a{sv} config);
+SetIp6Config (IN  a{sv} config);
+SetState     (IN  u     state);
+
+  
+
+  Description
+  
+
+
+  Method Details
+
+  The NeedSecrets() method
+  org.freedesktop.NetworkManager.PPP.NeedSecrets()
+
+NeedSecrets (OUT s username,
+             OUT s password);
+
+
+
+
+  OUT s username:
+  
+
+
+  OUT s password:
+  
+
+
+
+
+  The SetIp4Config() method
+  org.freedesktop.NetworkManager.PPP.SetIp4Config()
+
+SetIp4Config (IN  a{sv} config);
+
+
+
+
+  IN a{sv} config:
+  
+
+
+
+
+  The SetIp6Config() method
+  org.freedesktop.NetworkManager.PPP.SetIp6Config()
+
+SetIp6Config (IN  a{sv} config);
+
+
+
+
+  IN a{sv} config:
+  
+
+
+
+
+  The SetState() method
+  org.freedesktop.NetworkManager.PPP.SetState()
+
+SetState (IN  u state);
+
+
+
+
+  IN u state:
+  
+
+
+
+
+
+
diff --git a/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml b/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml
new file mode 100644
index 00000000..36a683d6
--- /dev/null
+++ b/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml
@@ -0,0 +1,129 @@
+
+
+
+      org.freedesktop.NetworkManager.SecretAgent
+  org.freedesktop.NetworkManager.SecretAgent
+        org.freedesktop.NetworkManager.SecretAgent        
+    Methods
+    
+GetSecrets       (IN  a{sa{sv}} connection,
+                  IN  o         connection_path,
+                  IN  s         setting_name,
+                  IN  as        hints,
+                  IN  u         flags,
+                  OUT a{sa{sv}} secrets);
+CancelGetSecrets (IN  o         connection_path,
+                  IN  s         setting_name);
+SaveSecrets      (IN  a{sa{sv}} connection,
+                  IN  o         connection_path);
+DeleteSecrets    (IN  a{sa{sv}} connection,
+                  IN  o         connection_path);
+
+  
+
+  Description
+  Private D-Bus interface used by secret agents that store and provide             secrets to NetworkManager.  If an agent provides secrets to             NetworkManager as part of connection creation, and the some of those             secrets are "agent owned" the agent should store those secrets             itself and should not expect its SaveSecrets() method to be called.             SaveSecrets() will be called eg if some program other than the             agent itself (like a connection editor) changes the secrets out of             band.  The agent should implement this D-Bus interface on an object             with the path /org/freedesktop/NetworkManager/SecretAgent.
+
+
+  Method Details
+
+  The GetSecrets() method
+  org.freedesktop.NetworkManager.SecretAgent.GetSecrets()
+
+GetSecrets (IN  a{sa{sv}} connection,
+            IN  o         connection_path,
+            IN  s         setting_name,
+            IN  as        hints,
+            IN  u         flags,
+            OUT a{sa{sv}} secrets);
+
+Retrieve and return stored secrets, if any, or request new                 secrets from the agent's user.  If user interaction is allowed                 and the user enters new secrets, the agent is expected to save                 the new secrets to persistent storage (if the secret's flags                 include AGENT_OWNED) as NetworkManager will not send these                 secrets back to the same agent via a SaveSecrets() call.  If                 the user canceled any interaction, the agent should return the                 UserCanceled error (see below).
+
+
+  IN a{sa{sv}} connection:
+  Nested settings maps containing the connection for which                     secrets are being requested.  This may contain system-owned                     secrets if the agent has successfully authenticated to                     modify system network settings and the GetSecrets request                     flags allow user interaction.
+
+
+  IN o connection_path:
+  Object path of the connection for which secrets are being                     requested.
+
+
+  IN s setting_name:
+  Setting name for which secrets are being requested.
+
+
+  IN as hints:
+  Array of strings of key names in the requested setting for                     which NetworkManager thinks a secrets may be required,                     and/or well-known identifiers and data that may be useful                     to the client in processing the secrets request.  Note that                     it's not always possible to determine which secret is                     required, so in some cases no hints may be given.  The Agent                     should return any secrets it has, or that it thinks are                     required, regardless of what hints NetworkManager sends                     in this request.  Some hints have special prefixes that                     provide information to the agent; for example, VPN requests                     may send server-specific messages prefixed with                     "x-vpn-message:".
+
+
+  IN u flags:
+  Flags which modify the behavior of the secrets request.                     If true, new secrets are assumed to be invalid or incorrect,                     and the agent should ask the user for new secrets.  If false,                     existing secrets should be retrieved from storage and                      returned without interrupting the user.
+
+
+  OUT a{sa{sv}} secrets:
+  Nested settings maps containing secrets.  Each setting MUST                     contain at least the 'name' field, containing the name of                     the setting, and one or more secrets.
+
+
+
+
+  The CancelGetSecrets() method
+  org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets()
+
+CancelGetSecrets (IN  o connection_path,
+                  IN  s setting_name);
+
+Cancel a pending GetSecrets request for secrets of the given                 connection.  Any GetSecrets request with the same                 'connection_path' and 'setting_name' that are given in a                 CancelGetSecrets request should be canceled.
+
+
+  IN o connection_path:
+  Object path of the connection for which, if secrets for                     the given 'setting_name' are being requested, the request                     should be canceled.
+
+
+  IN s setting_name:
+  Setting name for which secrets for this connection were                     originally being requested.
+
+
+
+
+  The SaveSecrets() method
+  org.freedesktop.NetworkManager.SecretAgent.SaveSecrets()
+
+SaveSecrets (IN  a{sa{sv}} connection,
+             IN  o         connection_path);
+
+Save given secrets to backing storage.
+
+
+  IN a{sa{sv}} connection:
+  Nested settings maps containing the entire connection                     (including secrets), for which the agent should save the                     secrets to backing storage.  This method will not be called                     when the agent itself is the process creating or updating                     a connection; in that case the agent is assumed to have                     already saved those secrets since it had them already.
+
+
+  IN o connection_path:
+  Object path of the connection for which the agent should                     save secrets to backing storage.
+
+
+
+
+  The DeleteSecrets() method
+  org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets()
+
+DeleteSecrets (IN  a{sa{sv}} connection,
+               IN  o         connection_path);
+
+Delete secrets from backing storage.
+
+
+  IN a{sa{sv}} connection:
+  Nested settings maps containing the connection properties                     (sans secrets), for which the agent should delete the                     secrets from backing storage.
+
+
+  IN o connection_path:
+  Object path of the connection for which the agent should                     delete secrets from backing storage.
+
+
+
+
+
+
diff --git a/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml
new file mode 100644
index 00000000..f5dd15ff
--- /dev/null
+++ b/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml
@@ -0,0 +1,172 @@
+
+
+
+      org.freedesktop.NetworkManager.Settings.Connection
+  org.freedesktop.NetworkManager.Settings.Connection
+        org.freedesktop.NetworkManager.Settings.Connection        
+    Methods
+    
+Update        (IN  a{sa{sv}} properties);
+UpdateUnsaved (IN  a{sa{sv}} properties);
+Delete        ();
+GetSettings   (OUT a{sa{sv}} settings);
+GetSecrets    (IN  s         setting_name,
+               OUT a{sa{sv}} secrets);
+ClearSecrets  ();
+Save          ();
+
+  
+  
+    Signals
+    
+Updated           ();
+Removed           ();
+PropertiesChanged (a{sv} properties);
+
+  
+  
+    Properties
+    
+Unsaved  readable   b
+
+  
+
+  Description
+  Represents a single network connection configuration.
+
+
+  Method Details
+
+  The Update() method
+  org.freedesktop.NetworkManager.Settings.Connection.Update()
+
+Update (IN  a{sa{sv}} properties);
+
+Update the connection with new settings and properties (replacing             all previous settings and properties) and save the connection to             disk.  Secrets may be part of the update request, and will be either             stored in persistent storage or sent to a Secret Agent for storage,             depending on the flags associated with each secret.
+
+
+  IN a{sa{sv}} properties:
+  New connection settings, properties, and (optionally) secrets.
+
+
+
+
+  The UpdateUnsaved() method
+  org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved()
+
+UpdateUnsaved (IN  a{sa{sv}} properties);
+
+Update the connection with new settings and properties (replacing             all previous settings and properties) but do not immediately save             the connection to disk.  Secrets may be part of the update request             and may sent to a Secret Agent for storage, depending on the             flags associated with each secret.              Use the 'Save' method to save these changes to disk. Note             that unsaved changes will be lost if the connection is             reloaded from disk (either automatically on file change or             due to an explicit ReloadConnections call).
+
+
+  IN a{sa{sv}} properties:
+  New connection settings, properties, and (optionally) secrets.
+
+
+
+
+  The Delete() method
+  org.freedesktop.NetworkManager.Settings.Connection.Delete()
+
+Delete ();
+
+Delete the connection.
+
+
+  The GetSettings() method
+  org.freedesktop.NetworkManager.Settings.Connection.GetSettings()
+
+GetSettings (OUT a{sa{sv}} settings);
+
+Get the settings maps describing this network configuration.                 This will never include any secrets required for connection                 to the network, as those are often protected.  Secrets must                 be requested separately using the GetSecrets() call.
+
+
+  OUT a{sa{sv}} settings:
+  The nested settings maps describing this object.
+
+
+
+
+  The GetSecrets() method
+  org.freedesktop.NetworkManager.Settings.Connection.GetSecrets()
+
+GetSecrets (IN  s         setting_name,
+            OUT a{sa{sv}} secrets);
+
+Get the secrets belonging to this network configuration.  Only                 secrets from persistent storage or a Secret Agent running in                 the requestor's session will be returned.  The user will never                 be prompted for secrets as a result of this request.
+
+
+  IN s setting_name:
+  Name of the setting to return secrets for.  If empty, all                     all secrets will be returned.
+
+
+  OUT a{sa{sv}} secrets:
+  Nested settings maps containing secrets.
+
+
+
+
+  The ClearSecrets() method
+  org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets()
+
+ClearSecrets ();
+
+Clear the secrets belonging to this network connection profile.
+
+
+  The Save() method
+  org.freedesktop.NetworkManager.Settings.Connection.Save()
+
+Save ();
+
+Saves a "dirty" connection (that had previously been                 updated with UpdateUnsaved) to persistent storage.
+
+
+
+  Signal Details
+
+  The "Updated" signal
+  org.freedesktop.NetworkManager.Settings.Connection::Updated
+
+Updated ();
+
+Emitted when any settings or permissions change.  When handling                 this signal, clients should re-read the connection using the                 GetSettings method to get the changes and to ensure the client                 still has permission to access the connection.
+
+
+  The "Removed" signal
+  org.freedesktop.NetworkManager.Settings.Connection::Removed
+
+Removed ();
+
+Emitted when this connection is no longer available.  This                 happens when the connection is deleted or if it is no longer                 accessible by any of the system's logged-in users.  After                 receipt of this signal, the object no longer exists.  Also                 see the Settings.ConnectionRemoved signal.
+
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values.
+
+
+
+
+
+  Property Details
+
+  The "Unsaved" property
+  org.freedesktop.NetworkManager.Settings.Connection:Unsaved
+
+Unsaved  readable   b
+
+If set, indicates that the in-memory state of the                 connection does not match the on-disk state. This flag                 will be set when UpdateUnsaved() is called or when any                 connection details change, and cleared when the connection                 is saved to disk via Save() or from internal operations.
+
+
+
+
diff --git a/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml b/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml
new file mode 100644
index 00000000..0481b710
--- /dev/null
+++ b/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml
@@ -0,0 +1,244 @@
+
+
+
+      org.freedesktop.NetworkManager.Settings
+  org.freedesktop.NetworkManager.Settings
+        org.freedesktop.NetworkManager.Settings        
+    Methods
+    
+ListConnections      (OUT ao        connections);
+GetConnectionByUuid  (IN  s         uuid,
+                      OUT o         connection);
+AddConnection        (IN  a{sa{sv}} connection,
+                      OUT o         path);
+AddConnectionUnsaved (IN  a{sa{sv}} connection,
+                      OUT o         path);
+LoadConnections      (IN  as        filenames,
+                      OUT b         status,
+                      OUT as        failures);
+ReloadConnections    (OUT b         status);
+SaveHostname         (IN  s         hostname);
+
+  
+  
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+NewConnection     (o     connection);
+ConnectionRemoved (o     connection);
+
+  
+  
+    Properties
+    
+Connections  readable   ao
+Hostname     readable   s
+CanModify    readable   b
+
+  
+
+  Description
+  The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
+
+
+  Method Details
+
+  The ListConnections() method
+  org.freedesktop.NetworkManager.Settings.ListConnections()
+
+ListConnections (OUT ao connections);
+
+List the saved network connections known to NetworkManager.
+
+
+  OUT ao connections:
+  List of connections.
+
+
+
+
+  The GetConnectionByUuid() method
+  org.freedesktop.NetworkManager.Settings.GetConnectionByUuid()
+
+GetConnectionByUuid (IN  s uuid,
+                     OUT o connection);
+
+Retrieve the object path of a connection, given that connection's UUID.
+
+
+  IN s uuid:
+  The UUID to find the connection object path for.
+
+
+  OUT o connection:
+  The connection's object path.
+
+
+
+
+  The AddConnection() method
+  org.freedesktop.NetworkManager.Settings.AddConnection()
+
+AddConnection (IN  a{sa{sv}} connection,
+               OUT o         path);
+
+Add new connection and save it to disk.  This operation does not start         the network connection unless (1) device is idle and able to connect to         the network described by the new connection, and (2) the connection         is allowed to be started automatically.
+
+
+  IN a{sa{sv}} connection:
+  Connection settings and properties.
+
+
+  OUT o path:
+  Object path of the new connection that was just added.
+
+
+
+
+  The AddConnectionUnsaved() method
+  org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved()
+
+AddConnectionUnsaved (IN  a{sa{sv}} connection,
+                      OUT o         path);
+
+Add new connection but do not save it to disk immediately.  This         operation does not start the network connection unless (1) device is         idle and able to connect to the network described by the new connection,         and (2) the connection is allowed to be started automatically.          Use the 'Save' method on the connection to save these changes         to disk. Note that unsaved changes will be lost if the         connection is reloaded from disk (either automatically on file         change or due to an explicit ReloadConnections call).
+
+
+  IN a{sa{sv}} connection:
+  Connection settings and properties.
+
+
+  OUT o path:
+  Object path of the new connection that was just added.
+
+
+
+
+  The LoadConnections() method
+  org.freedesktop.NetworkManager.Settings.LoadConnections()
+
+LoadConnections (IN  as filenames,
+                 OUT b  status,
+                 OUT as failures);
+
+Loads or reloads the indicated connections from disk. You         should call this after making changes directly to an on-disk         connection file to make sure that NetworkManager sees the         changes. (If "monitor-connection-files" in NetworkManager.conf         is "true", then this will have no real effect, but is         harmless.) As with AddConnection(), this operation does not         necessarily start the network connection.
+
+
+  IN as filenames:
+  Array of paths to on-disk connection profiles in directories           monitored by NetworkManager.
+
+
+  OUT b status:
+  Success or failure of the operation as a whole. True if           NetworkManager at least tried to load the indicated           connections, even if it did not succeed. False if an error           occurred before trying to load the connections (eg,           permission denied).
+
+
+  OUT as failures:
+  Paths of connection files that could not be loaded.
+
+
+
+
+  The ReloadConnections() method
+  org.freedesktop.NetworkManager.Settings.ReloadConnections()
+
+ReloadConnections (OUT b status);
+
+Tells NetworkManager to reload all connection files from disk,         including noticing any added or deleted connection files. By         default, connections are re-read automatically any time they         change, so you only need to use this command if you have set         "monitor-connection-files=false" in NetworkManager.conf.
+
+
+  OUT b status:
+  Success or failure.
+
+
+
+
+  The SaveHostname() method
+  org.freedesktop.NetworkManager.Settings.SaveHostname()
+
+SaveHostname (IN  s hostname);
+
+Save the hostname to persistent configuration.
+
+
+  IN s hostname:
+  The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.
+
+
+
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.Settings::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+  The "NewConnection" signal
+  org.freedesktop.NetworkManager.Settings::NewConnection
+
+NewConnection (o connection);
+
+Emitted when a new connection has been added after NetworkManager has         started up and initialized.  This signal is not emitted for connections         read while starting up, because NetworkManager's D-Bus service is only         available after all connections have been read, and to prevent spamming         listeners with too many signals at one time.  To retrieve the initial         connection list, call the ListConnections() method once, and then listen         for individual Settings.NewConnection and Settings.Connection.Deleted         signals for further updates.
+
+
+  o connection:
+  Object path of the new connection.
+
+
+
+
+  The "ConnectionRemoved" signal
+  org.freedesktop.NetworkManager.Settings::ConnectionRemoved
+
+ConnectionRemoved (o connection);
+
+Emitted when a connection is no longer available.  This happens when         the connection is deleted or if it is no longer accessible by any of         the system's logged-in users.  After receipt of this signal, the         connection no longer exists and cannot be used.  Also see the         Settings.Connection.Removed signal.
+
+
+  o connection:
+  Object path of the removed connection.
+
+
+
+
+
+  Property Details
+
+  The "Connections" property
+  org.freedesktop.NetworkManager.Settings:Connections
+
+Connections  readable   ao
+
+List of object paths of available network connection profiles.
+
+
+  The "Hostname" property
+  org.freedesktop.NetworkManager.Settings:Hostname
+
+Hostname  readable   s
+
+The machine hostname stored in persistent configuration.
+
+
+  The "CanModify" property
+  org.freedesktop.NetworkManager.Settings:CanModify
+
+CanModify  readable   b
+
+If true, adding and modifying connections is supported.
+
+
+
+
diff --git a/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml b/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml
new file mode 100644
index 00000000..b52c7409
--- /dev/null
+++ b/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml
@@ -0,0 +1,83 @@
+
+
+
+      org.freedesktop.NetworkManager.VPN.Connection
+  org.freedesktop.NetworkManager.VPN.Connection
+        org.freedesktop.NetworkManager.VPN.Connection        
+    Signals
+    
+PropertiesChanged (a{sv} properties);
+VpnStateChanged   (u     state,
+                   u     reason);
+
+  
+  
+    Properties
+    
+VpnState  readable   u
+Banner    readable   s
+
+  
+
+  Description
+  Represents an active connection to a Virtual Private Network.
+
+
+  Signal Details
+
+  The "PropertiesChanged" signal
+  org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged
+
+PropertiesChanged (a{sv} properties);
+
+
+
+
+  a{sv} properties:
+  A dictionary mapping property names to variant boxed values
+
+
+
+
+  The "VpnStateChanged" signal
+  org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged
+
+VpnStateChanged (u state,
+                 u reason);
+
+Emitted when the state of the VPN connection has changed.
+
+
+  u state:
+  The new state of the VPN connection.
+
+
+  u reason:
+  Reason code describing the change to the new state.
+
+
+
+
+
+  Property Details
+
+  The "VpnState" property
+  org.freedesktop.NetworkManager.VPN.Connection:VpnState
+
+VpnState  readable   u
+
+The VPN-specific state of the connection.
+
+
+  The "Banner" property
+  org.freedesktop.NetworkManager.VPN.Connection:Banner
+
+Banner  readable   s
+
+The banner string of the VPN connection.
+
+
+
+
diff --git a/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml b/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml
new file mode 100644
index 00000000..a3c249b0
--- /dev/null
+++ b/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml
@@ -0,0 +1,298 @@
+
+
+
+      org.freedesktop.NetworkManager.VPN.Plugin
+  org.freedesktop.NetworkManager.VPN.Plugin
+        org.freedesktop.NetworkManager.VPN.Plugin        
+    Methods
+    
+Connect            (IN  a{sa{sv}} connection);
+ConnectInteractive (IN  a{sa{sv}} connection,
+                    IN  a{sv}     details);
+NeedSecrets        (IN  a{sa{sv}} settings,
+                    OUT s         setting_name);
+Disconnect         ();
+SetConfig          (IN  a{sv}     config);
+SetIp4Config       (IN  a{sv}     config);
+SetIp6Config       (IN  a{sv}     config);
+SetFailure         (IN  s         reason);
+NewSecrets         (IN  a{sa{sv}} connection);
+
+  
+  
+    Signals
+    
+StateChanged    (u     state);
+SecretsRequired (s     message,
+                 as    secrets);
+Config          (a{sv} config);
+Ip4Config       (a{sv} ip4config);
+Ip6Config       (a{sv} ip6config);
+LoginBanner     (s     banner);
+Failure         (u     reason);
+
+  
+  
+    Properties
+    
+State  readable   u
+
+  
+
+  Description
+  This interface is provided by plugins providing VPN services to the NetworkManager daemon.
+
+
+  Method Details
+
+  The Connect() method
+  org.freedesktop.NetworkManager.VPN.Plugin.Connect()
+
+Connect (IN  a{sa{sv}} connection);
+
+Tells the plugin to connect.  Interactive secrets requests (eg, emitting         the SecretsRequired signal) are not allowed.
+
+
+  IN a{sa{sv}} connection:
+  Describes the connection to be established.
+
+
+
+
+  The ConnectInteractive() method
+  org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive()
+
+ConnectInteractive (IN  a{sa{sv}} connection,
+                    IN  a{sv}     details);
+
+Tells the plugin to connect, allowing interactive secrets requests (eg         the plugin is allowed to emit the SecretsRequired signal if the VPN         service indicates that it needs additional secrets during the connect         process).
+
+
+  IN a{sa{sv}} connection:
+  Describes the connection to be established.
+
+
+  IN a{sv} details:
+  Additional details about the Connect process.
+
+
+
+
+  The NeedSecrets() method
+  org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets()
+
+NeedSecrets (IN  a{sa{sv}} settings,
+             OUT s         setting_name);
+
+Asks the plugin whether the provided connection will require secrets to connect successfully.
+
+
+  IN a{sa{sv}} settings:
+  Describes the connection that may need secrets.
+
+
+  OUT s setting_name:
+  The setting name within the provided connection that requires secrets, if any.
+
+
+
+
+  The Disconnect() method
+  org.freedesktop.NetworkManager.VPN.Plugin.Disconnect()
+
+Disconnect ();
+
+Disconnect the plugin.
+
+
+  The SetConfig() method
+  org.freedesktop.NetworkManager.VPN.Plugin.SetConfig()
+
+SetConfig (IN  a{sv} config);
+
+Set generic connection details on the connection.
+
+
+  IN a{sv} config:
+  Generic configuration details for the connection.
+
+
+
+
+  The SetIp4Config() method
+  org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config()
+
+SetIp4Config (IN  a{sv} config);
+
+Set IPv4 details on the connection.
+
+
+  IN a{sv} config:
+  Ip4Config details for the connection. You must call    SetConfig() before calling this.
+
+
+
+
+  The SetIp6Config() method
+  org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config()
+
+SetIp6Config (IN  a{sv} config);
+
+Set IPv6 details on the connection.
+
+
+  IN a{sv} config:
+  Ip6Config details for the connection. You must call    SetConfig() before calling this.
+
+
+
+
+  The SetFailure() method
+  org.freedesktop.NetworkManager.VPN.Plugin.SetFailure()
+
+SetFailure (IN  s reason);
+
+Indicate a failure to the plugin.
+
+
+  IN s reason:
+  The reason for the failure.
+
+
+
+
+  The NewSecrets() method
+  org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets()
+
+NewSecrets (IN  a{sa{sv}} connection);
+
+Called in response to a SecretsRequired signal to deliver updated secrets         or other information to the plugin.
+
+
+  IN a{sa{sv}} connection:
+  Describes the connection including the new secrets.
+
+
+
+
+
+  Signal Details
+
+  The "StateChanged" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::StateChanged
+
+StateChanged (u state);
+
+Emitted when the plugin state changes.
+
+
+  u state:
+  The new state of the plugin.
+
+
+
+
+  The "SecretsRequired" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired
+
+SecretsRequired (s  message,
+                 as secrets);
+
+Emitted during an ongoing ConnectInteractive() request when the plugin         has determined that new secrets are required.  NetworkManager will then         call the NewSecrets() method with a connection hash including the new         secrets.
+
+
+  s message:
+  Informational message, if any, about the request.  For example, if               a second PIN is required, could indicate to the user to wait for               the token code to change until entering the next PIN.
+
+
+  as secrets:
+  Array of strings of VPN secret names which the plugin thinks               secrets may be required for, or other VPN-specific data to be               processed by the VPN's front-end.
+
+
+
+
+  The "Config" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::Config
+
+Config (a{sv} config);
+
+The plugin obtained generic configuration information.
+
+
+  a{sv} config:
+  The configuration information.
+
+
+
+
+  The "Ip4Config" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config
+
+Ip4Config (a{sv} ip4config);
+
+The plugin obtained an IPv4 configuration.
+
+
+  a{sv} ip4config:
+  The IPv4 configuration.
+
+
+
+
+  The "Ip6Config" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config
+
+Ip6Config (a{sv} ip6config);
+
+The plugin obtained an IPv6 configuration.
+
+
+  a{sv} ip6config:
+  The IPv6 configuration.
+
+
+
+
+  The "LoginBanner" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner
+
+LoginBanner (s banner);
+
+Emitted when the plugin receives a login banner from the VPN service.
+
+
+  s banner:
+  The login banner string.
+
+
+
+
+  The "Failure" signal
+  org.freedesktop.NetworkManager.VPN.Plugin::Failure
+
+Failure (u reason);
+
+Emitted when a failure in the VPN plugin occurs.
+
+
+  u reason:
+  Reason code for the failure.
+
+
+
+
+
+  Property Details
+
+  The "State" property
+  org.freedesktop.NetworkManager.VPN.Plugin:State
+
+State  readable   u
+
+The state of the plugin.
+
+
+
+
diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml
index 7b92d073..c1e02aac 100644
--- a/introspection/vpn-errors.xml
+++ b/introspection/vpn-errors.xml
@@ -2,59 +2,59 @@
 
   
-    General failure without further details.
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
   
-    
+    
   
 
 
diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in
index 7ca647e2..0661fc1e 100644
--- a/libnm-core/Makefile.in
+++ b/libnm-core/Makefile.in
@@ -129,19 +129,20 @@ am__DEPENDENCIES_1 =
 libnm_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(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-dbus-utils.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 \
-	$(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-ip-tunnel.c \
-	$(core)/nm-setting-ip4-config.c \
+am__libnm_core_la_SOURCES_DIST =  \
+	$(top_builddir)/shared/nm-shared-utils.c \
+	$(core_build)/nm-core-enum-types.c $(core)/crypto.c \
+	$(core)/nm-connection.c $(core)/nm-dbus-utils.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 $(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-ip-tunnel.c $(core)/nm-setting-ip4-config.c \
 	$(core)/nm-setting-ip6-config.c $(core)/nm-setting-macvlan.c \
 	$(core)/nm-setting-olpc-mesh.c $(core)/nm-setting-ppp.c \
 	$(core)/nm-setting-pppoe.c $(core)/nm-setting-serial.c \
@@ -153,14 +154,15 @@ 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)/nm-vpn-editor-plugin.c $(core)/nm-vpn-plugin-info.c \
-	$(core)/crypto.h $(core)/nm-connection-private.h \
-	$(core)/nm-core-internal.h $(core)/nm-core-types-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-dbus-utils.lo nm-errors.lo nm-keyfile-reader.lo \
-	nm-keyfile-utils.lo nm-keyfile-writer.lo \
+	$(top_builddir)/shared/nm-shared-utils.h $(core)/crypto.h \
+	$(core)/nm-connection-private.h $(core)/nm-core-internal.h \
+	$(core)/nm-core-types-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-shared-utils.lo nm-core-enum-types.lo crypto.lo \
+	nm-connection.lo nm-dbus-utils.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 \
@@ -640,6 +642,7 @@ libnm_core_headers = \
 	$(core)/nm-vpn-plugin-info.h
 
 libnm_core_private_headers = \
+	$(top_builddir)/shared/nm-shared-utils.h \
 	$(core)/crypto.h			\
 	$(core)/nm-connection-private.h		\
 	$(core)/nm-core-internal.h		\
@@ -651,6 +654,7 @@ libnm_core_private_headers = \
 	$(core)/nm-utils-private.h
 
 libnm_core_sources = \
+	$(top_builddir)/shared/nm-shared-utils.c \
 	$(core_build)/nm-core-enum-types.c	\
 	$(core)/crypto.c			\
 	$(core)/nm-connection.c			\
@@ -811,6 +815,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting-wireless-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting-wireless.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-simple-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-vpn-editor-plugin.Plo@am__quote@
@@ -837,6 +842,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+nm-shared-utils.lo: $(top_builddir)/shared/nm-shared-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-shared-utils.lo -MD -MP -MF $(DEPDIR)/nm-shared-utils.Tpo -c -o nm-shared-utils.lo `test -f '$(top_builddir)/shared/nm-shared-utils.c' || echo '$(srcdir)/'`$(top_builddir)/shared/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-shared-utils.Tpo $(DEPDIR)/nm-shared-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/shared/nm-shared-utils.c' object='nm-shared-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-shared-utils.lo `test -f '$(top_builddir)/shared/nm-shared-utils.c' || echo '$(srcdir)/'`$(top_builddir)/shared/nm-shared-utils.c
+
 nm-core-enum-types.lo: $(core_build)/nm-core-enum-types.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-core-enum-types.lo -MD -MP -MF $(DEPDIR)/nm-core-enum-types.Tpo -c -o nm-core-enum-types.lo `test -f '$(core_build)/nm-core-enum-types.c' || echo '$(srcdir)/'`$(core_build)/nm-core-enum-types.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-core-enum-types.Tpo $(DEPDIR)/nm-core-enum-types.Plo
diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
index fe8cc8a6..0038ce23 100644
--- a/libnm-core/Makefile.libnm-core
+++ b/libnm-core/Makefile.libnm-core
@@ -52,6 +52,7 @@ libnm_core_headers =				\
 	$(core)/nm-vpn-plugin-info.h
 
 libnm_core_private_headers =			\
+	$(top_builddir)/shared/nm-shared-utils.h \
 	$(core)/crypto.h			\
 	$(core)/nm-connection-private.h		\
 	$(core)/nm-core-internal.h		\
@@ -63,6 +64,7 @@ libnm_core_private_headers =			\
 	$(core)/nm-utils-private.h
 
 libnm_core_sources =				\
+	$(top_builddir)/shared/nm-shared-utils.c \
 	$(core_build)/nm-core-enum-types.c	\
 	$(core)/crypto.c			\
 	$(core)/nm-connection.c			\
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 04e601ce..c03e6265 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -233,9 +233,10 @@ validate_permissions_type (GVariant *variant, GError **error)
 }
 
 /**
- * nm_connection_replace_settings:
+ * _nm_connection_replace_settings:
  * @connection: a #NMConnection
  * @new_settings: a #GVariant of type %NM_VARIANT_TYPE_CONNECTION, with the new settings
+ * @parse_flags: flags.
  * @error: location to store error, or %NULL
  *
  * Replaces @connection's settings with @new_settings (which must be
@@ -244,49 +245,82 @@ validate_permissions_type (GVariant *variant, GError **error)
  *
  * Returns: %TRUE if connection was updated, %FALSE if @new_settings could not
  *   be deserialized (in which case @connection will be unchanged).
+ *   Only exception is the NM_SETTING_PARSE_FLAGS_NORMALIZE flag: if normalization
+ *   fails, the input @connection is already modified and the original settings
+ *   are lost.
  **/
 gboolean
-nm_connection_replace_settings (NMConnection *connection,
-                                GVariant *new_settings,
-                                GError **error)
+_nm_connection_replace_settings (NMConnection *connection,
+                                 GVariant *new_settings,
+                                 NMSettingParseFlags parse_flags,
+                                 GError **error)
 {
 	NMConnectionPrivate *priv;
 	GVariantIter iter;
 	const char *setting_name;
 	GVariant *setting_dict;
 	GSList *settings = NULL, *s;
-	gboolean changed;
+	gboolean changed, success;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
 	g_return_val_if_fail (g_variant_is_of_type (new_settings, NM_VARIANT_TYPE_CONNECTION), FALSE);
 	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
+	nm_assert (!NM_FLAGS_ANY (parse_flags, ~NM_SETTING_PARSE_FLAGS_ALL));
+	nm_assert (!NM_FLAGS_ALL (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT | NM_SETTING_PARSE_FLAGS_BEST_EFFORT));
+
 	priv = NM_CONNECTION_GET_PRIVATE (connection);
 
-	if (!validate_permissions_type (new_settings, error))
+	if (   !NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT)
+	    && !validate_permissions_type (new_settings, error))
 		return FALSE;
 
 	g_variant_iter_init (&iter, new_settings);
 	while (g_variant_iter_next (&iter, "{&s@a{sv}}", &setting_name, &setting_dict)) {
+		gs_unref_variant GVariant *setting_dict_free = NULL;
+		GError *local = NULL;
 		NMSetting *setting;
 		GType type;
 
+		setting_dict_free = setting_dict;
+
 		type = nm_setting_lookup_type (setting_name);
 		if (type == G_TYPE_INVALID) {
+			if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT))
+				continue;
 			g_set_error_literal (error,
 			                     NM_CONNECTION_ERROR,
 			                     NM_CONNECTION_ERROR_INVALID_SETTING,
 			                     _("unknown setting name"));
 			g_prefix_error (error, "%s: ", setting_name);
-			g_variant_unref (setting_dict);
 			g_slist_free_full (settings, g_object_unref);
 			return FALSE;
 		}
 
-		setting = _nm_setting_new_from_dbus (type, setting_dict, new_settings, error);
-		g_variant_unref (setting_dict);
+		for (s = settings; s; s = s->next) {
+			if (G_OBJECT_TYPE (s->data) == type) {
+				if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+					g_set_error_literal (error,
+					                     NM_CONNECTION_ERROR,
+					                     NM_CONNECTION_ERROR_INVALID_SETTING,
+					                     _("duplicate setting name"));
+					g_prefix_error (error, "%s: ", setting_name);
+					g_slist_free_full (settings, g_object_unref);
+					return FALSE;
+				}
+				/* last wins. */
+				g_object_unref (s->data);
+				settings = g_slist_delete_link (settings, s);
+				break;
+			}
+		}
+
+		setting = _nm_setting_new_from_dbus (type, setting_dict, new_settings, parse_flags, &local);
 
 		if (!setting) {
+			if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT))
+				continue;
+			g_propagate_error (error, local);
 			g_slist_free_full (settings, g_object_unref);
 			return FALSE;
 		}
@@ -300,14 +334,50 @@ nm_connection_replace_settings (NMConnection *connection,
 	} else
 		changed = (settings != NULL);
 
+	/* Note: @settings might be empty in which case the connection
+	 * has no NMSetting instances... which is fine, just something
+	 * to be aware of. */
 	for (s = settings; s; s = s->next)
 		_nm_connection_add_setting (connection, s->data);
 
 	g_slist_free (settings);
 
+	/* If verification/normalization fails, the original connection
+	 * is already lost. From an API point of view, it would be nicer
+	 * not to touch the input argument if we fail at the end.
+	 * However, that would require creating a temporary connection
+	 * to validate it first. As none of the caller cares about the
+	 * state of the @connection when normalization fails, just do it
+	 * this way. */
+	if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_NORMALIZE))
+		success = nm_connection_normalize (connection, NULL, NULL, error);
+	else
+		success = TRUE;
+
 	if (changed)
 		g_signal_emit (connection, signals[CHANGED], 0);
-	return TRUE;
+	return success;
+}
+
+/**
+ * nm_connection_replace_settings:
+ * @connection: a #NMConnection
+ * @new_settings: a #GVariant of type %NM_VARIANT_TYPE_CONNECTION, with the new settings
+ * @error: location to store error, or %NULL
+ *
+ * Replaces @connection's settings with @new_settings (which must be
+ * syntactically valid, and describe a known type of connection, but does not
+ * need to result in a connection that passes nm_connection_verify()).
+ *
+ * Returns: %TRUE if connection was updated, %FALSE if @new_settings could not
+ *   be deserialized (in which case @connection will be unchanged).
+ **/
+gboolean
+nm_connection_replace_settings (NMConnection *connection,
+                                GVariant *new_settings,
+                                GError **error)
+{
+	return _nm_connection_replace_settings (connection, new_settings, NM_SETTING_PARSE_FLAGS_NONE, error);
 }
 
 /**
diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 3e1236b9..9512ee56 100644
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -100,6 +100,25 @@
 	 NM_SETTING_SECRET_FLAG_NOT_SAVED | \
 	 NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
 
+typedef enum { /*< skip >*/
+	NM_SETTING_PARSE_FLAGS_NONE                     = 0,
+	NM_SETTING_PARSE_FLAGS_STRICT                   = 1LL << 0,
+	NM_SETTING_PARSE_FLAGS_BEST_EFFORT              = 1LL << 1,
+	NM_SETTING_PARSE_FLAGS_NORMALIZE                = 1LL << 2,
+
+	_NM_SETTING_PARSE_FLAGS_LAST,
+	NM_SETTING_PARSE_FLAGS_ALL                      = ((_NM_SETTING_PARSE_FLAGS_LAST - 1) << 1) - 1,
+} NMSettingParseFlags;
+
+gboolean _nm_connection_replace_settings (NMConnection *connection,
+                                          GVariant *new_settings,
+                                          NMSettingParseFlags parse_flags,
+                                          GError **error);
+
+NMConnection *_nm_simple_connection_new_from_dbus (GVariant      *dict,
+                                                   NMSettingParseFlags parse_flags,
+                                                   GError       **error);
+
 guint32 _nm_setting_get_setting_priority (NMSetting *setting);
 
 gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
@@ -179,8 +198,6 @@ GByteArray *nm_utils_rsa_key_encrypt (const guint8 *data,
                                       char **out_password,
                                       GError **error);
 
-gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback);
-
 gulong _nm_dbus_signal_connect_data (GDBusProxy *proxy,
                                      const char *signal_name,
                                      const GVariantType *signature,
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 1b16cce5..d76c5640 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -669,7 +669,7 @@ typedef enum /*< flags >*/ {
 #define NM_LLDP_ATTR_IEEE_802_1_PVID "ieee-802-1-pvid"
 #define NM_LLDP_ATTR_IEEE_802_1_PPVID "ieee-802-1-ppvid"
 #define NM_LLDP_ATTR_IEEE_802_1_PPVID_FLAGS "ieee-802-1-ppvid-flags"
-#define NM_LLDP_ATTR_IEEE_802_1_VID "ieee-802-1-pvid"
+#define NM_LLDP_ATTR_IEEE_802_1_VID "ieee-802-1-vid"
 #define NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME "ieee-802-1-vlan-name"
 
 #define NM_LLDP_DEST_NEAREST_BRIDGE "nearest-bridge"
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 0ecb988a..4db420de 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -80,6 +80,7 @@ typedef struct {
 	char *ca_path;
 	char *subject_match;
 	GSList *altsubject_matches;
+	char *domain_suffix_match;
 	GBytes *client_cert;
 	char *phase1_peapver;
 	char *phase1_peaplabel;
@@ -90,6 +91,7 @@ typedef struct {
 	char *phase2_ca_path;
 	char *phase2_subject_match;
 	GSList *phase2_altsubject_matches;
+	char *phase2_domain_suffix_match;
 	GBytes *phase2_client_cert;
 	char *password;
 	NMSettingSecretFlags password_flags;
@@ -116,6 +118,7 @@ enum {
 	PROP_CA_PATH,
 	PROP_SUBJECT_MATCH,
 	PROP_ALTSUBJECT_MATCHES,
+	PROP_DOMAIN_SUFFIX_MATCH,
 	PROP_CLIENT_CERT,
 	PROP_PHASE1_PEAPVER,
 	PROP_PHASE1_PEAPLABEL,
@@ -126,6 +129,7 @@ enum {
 	PROP_PHASE2_CA_PATH,
 	PROP_PHASE2_SUBJECT_MATCH,
 	PROP_PHASE2_ALTSUBJECT_MATCHES,
+	PROP_PHASE2_DOMAIN_SUFFIX_MATCH,
 	PROP_PHASE2_CLIENT_CERT,
 	PROP_PASSWORD,
 	PROP_PASSWORD_FLAGS,
@@ -849,6 +853,22 @@ nm_setting_802_1x_clear_altsubject_matches (NMSetting8021x *setting)
 	g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_ALTSUBJECT_MATCHES);
 }
 
+/**
+ * nm_setting_802_1x_get_domain_suffix_match:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the #NMSetting8021x:domain-suffix-match property.
+ *
+ * Since: 1.2
+ **/
+const char *
+nm_setting_802_1x_get_domain_suffix_match (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->domain_suffix_match;
+}
+
 /**
  * nm_setting_802_1x_get_client_cert_scheme:
  * @setting: the #NMSetting8021x
@@ -1298,6 +1318,22 @@ nm_setting_802_1x_get_num_phase2_altsubject_matches (NMSetting8021x *setting)
 	return g_slist_length (NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_altsubject_matches);
 }
 
+/**
+ * nm_setting_802_1x_get_phase2_domain_suffix_match:
+ * @setting: the #NMSetting8021x
+ *
+ * Returns: the #NMSetting8021x:phase2-domain-suffix-match property.
+ *
+ * Since: 1.2
+ **/
+const char *
+nm_setting_802_1x_get_phase2_domain_suffix_match (NMSetting8021x *setting)
+{
+	g_return_val_if_fail (NM_IS_SETTING_802_1X (setting), NULL);
+
+	return NM_SETTING_802_1X_GET_PRIVATE (setting)->phase2_domain_suffix_match;
+}
+
 /**
  * nm_setting_802_1x_get_phase2_altsubject_match:
  * @setting: the #NMSettingConnection
@@ -2827,6 +2863,7 @@ finalize (GObject *object)
 	g_free (priv->anonymous_identity);
 	g_free (priv->ca_path);
 	g_free (priv->subject_match);
+	g_free (priv->domain_suffix_match);
 	g_free (priv->phase1_peapver);
 	g_free (priv->phase1_peaplabel);
 	g_free (priv->phase1_fast_provisioning);
@@ -2834,6 +2871,7 @@ finalize (GObject *object)
 	g_free (priv->phase2_autheap);
 	g_free (priv->phase2_ca_path);
 	g_free (priv->phase2_subject_match);
+	g_free (priv->phase2_domain_suffix_match);
 	g_free (priv->password);
 	if (priv->password_raw)
 		g_bytes_unref (priv->password_raw);
@@ -2877,6 +2915,15 @@ set_cert_prop_helper (const GValue *value, const char *prop_name, GError **error
 	return bytes;
 }
 
+static char *
+_g_value_dup_string_not_empty (const GValue *value)
+{
+	const gchar *str;
+
+	str = g_value_get_string (value);
+	return str && str[0] ? g_strdup (str) : NULL;
+}
+
 static void
 set_property (GObject *object, guint prop_id,
               const GValue *value, GParamSpec *pspec)
@@ -2907,8 +2954,7 @@ set_property (GObject *object, guint prop_id,
 			g_bytes_unref (priv->ca_cert);
 		priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s", error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2918,19 +2964,22 @@ set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_SUBJECT_MATCH:
 		g_free (priv->subject_match);
-		priv->subject_match = g_value_dup_string (value);
+		priv->subject_match = _g_value_dup_string_not_empty (value);
 		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), TRUE);
 		break;
+	case PROP_DOMAIN_SUFFIX_MATCH:
+		g_free (priv->domain_suffix_match);
+		priv->domain_suffix_match = _g_value_dup_string_not_empty (value);
+		break;
 	case PROP_CLIENT_CERT:
 		if (priv->client_cert)
 			g_bytes_unref (priv->client_cert);
 		priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s", error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2959,8 +3008,7 @@ set_property (GObject *object, guint prop_id,
 			g_bytes_unref (priv->phase2_ca_cert);
 		priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s", error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2970,19 +3018,22 @@ set_property (GObject *object, guint prop_id,
 		break;
 	case PROP_PHASE2_SUBJECT_MATCH:
 		g_free (priv->phase2_subject_match);
-		priv->phase2_subject_match = g_value_dup_string (value);
+		priv->phase2_subject_match = _g_value_dup_string_not_empty (value);
 		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), TRUE);
 		break;
+	case PROP_PHASE2_DOMAIN_SUFFIX_MATCH:
+		g_free (priv->phase2_domain_suffix_match);
+		priv->phase2_domain_suffix_match = _g_value_dup_string_not_empty (value);
+		break;
 	case PROP_PHASE2_CLIENT_CERT:
 		if (priv->phase2_client_cert)
 			g_bytes_unref (priv->phase2_client_cert);
 		priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s", error->message);
 			g_error_free (error);
 		}
 		break;
@@ -3006,8 +3057,7 @@ set_property (GObject *object, guint prop_id,
 			g_bytes_unref (priv->private_key);
 		priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error);
 		if (error) {
-			g_warning ("Error setting private key (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting private key (invalid data): %s", error->message);
 			g_error_free (error);
 		}
 		break;
@@ -3023,8 +3073,7 @@ set_property (GObject *object, guint prop_id,
 			g_bytes_unref (priv->phase2_private_key);
 		priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error);
 		if (error) {
-			g_warning ("Error setting private key (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting private key (invalid data): %s", error->message);
 			g_error_free (error);
 		}
 		break;
@@ -3083,6 +3132,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_ALTSUBJECT_MATCHES:
 		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->altsubject_matches, TRUE));
 		break;
+	case PROP_DOMAIN_SUFFIX_MATCH:
+		g_value_set_string (value, priv->domain_suffix_match);
+		break;
 	case PROP_CLIENT_CERT:
 		g_value_set_boxed (value, priv->client_cert);
 		break;
@@ -3113,6 +3165,9 @@ get_property (GObject *object, guint prop_id,
 	case PROP_PHASE2_ALTSUBJECT_MATCHES:
 		g_value_take_boxed (value, _nm_utils_slist_to_strv (priv->phase2_altsubject_matches, TRUE));
 		break;
+	case PROP_PHASE2_DOMAIN_SUFFIX_MATCH:
+		g_value_set_string (value, priv->phase2_domain_suffix_match);
+		break;
 	case PROP_PHASE2_CLIENT_CERT:
 		g_value_set_boxed (value, priv->phase2_client_cert);
 		break;
@@ -3319,7 +3374,9 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 *
 	 * 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.
+	 * authentication server certificate's subject is performed.  This property
+	 * provides little security, if any, and its use is deprecated in favor of
+	 * NMSetting8021x:domain-suffix-match.
 	 **/
 	/* ---ifcfg-rh---
 	 * property: subject-match
@@ -3356,6 +3413,30 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSetting8021x:domain-suffix-match:
+	 *
+	 * Constraint for server domain name. If set, this FQDN is used as a suffix
+	 * match requirement for dNSName element(s) of the certificate presented by
+	 * the authentication server.  If a matching dNSName is found, this
+	 * constraint is met.  If no dNSName values are present, this constraint is
+	 * matched against SubjectName CN using same suffix match comparison.
+	 *
+	 * Since: 1.2
+	 **/
+	/* ---ifcfg-rh---
+	 * property: domain-suffix-match
+	 * description: Suffix to match domain of server certificate against.
+	 * variable: IEEE_8021X_DOMAIN_SUFFIX_MATCH(+)
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_DOMAIN_SUFFIX_MATCH,
+		 g_param_spec_string (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:client-cert:
 	 *
@@ -3556,7 +3637,9 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	 * 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.
+	 * certificate's subject is performed.  This property provides little security,
+	 * if any, and its use is deprecated in favor of
+	 * NMSetting8021x:phase2-domain-suffix-match.
 	 **/
 	/* ---ifcfg-rh---
 	 * property: phase2-subject-match
@@ -3592,6 +3675,31 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 		                     G_PARAM_READWRITE |
 		                     G_PARAM_STATIC_STRINGS));
 
+	/**
+	 * NMSetting8021x:phase2-domain-suffix-match:
+	 *
+	 * Constraint for server domain name. If set, this FQDN is used as a suffix
+	 * match requirement for dNSName element(s) of the certificate presented by
+	 * the authentication server during the inner "phase 2" authentication.  If
+	 * a matching dNSName is found, this constraint is met.  If no dNSName
+	 * values are present, this constraint is matched against SubjectName CN
+	 * using same suffix match comparison.
+	 *
+	 * Since: 1.2
+	 **/
+	/* ---ifcfg-rh---
+	 * property: phase2-domain-suffix-match
+	 * description: Suffix to match domain of server certificate for phase 2 against.
+	 * variable: IEEE_8021X_PHASE2_DOMAIN_SUFFIX_MATCH(+)
+	 * ---end---
+	 */
+	g_object_class_install_property
+		(object_class, PROP_PHASE2_DOMAIN_SUFFIX_MATCH,
+		 g_param_spec_string (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH, "", "",
+		                      NULL,
+		                      G_PARAM_READWRITE |
+		                      G_PARAM_STATIC_STRINGS));
+
 	/**
 	 * NMSetting8021x:phase2-client-cert:
 	 *
diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index da86071a..d8867b92 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/libnm-core/nm-setting-8021x.h
@@ -89,6 +89,7 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 #define NM_SETTING_802_1X_CA_PATH "ca-path"
 #define NM_SETTING_802_1X_SUBJECT_MATCH "subject-match"
 #define NM_SETTING_802_1X_ALTSUBJECT_MATCHES "altsubject-matches"
+#define NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH "domain-suffix-match"
 #define NM_SETTING_802_1X_CLIENT_CERT "client-cert"
 #define NM_SETTING_802_1X_PHASE1_PEAPVER "phase1-peapver"
 #define NM_SETTING_802_1X_PHASE1_PEAPLABEL "phase1-peaplabel"
@@ -99,6 +100,7 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 #define NM_SETTING_802_1X_PHASE2_CA_PATH "phase2-ca-path"
 #define NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH "phase2-subject-match"
 #define NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES "phase2-altsubject-matches"
+#define NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH "phase2-domain-suffix-match"
 #define NM_SETTING_802_1X_PHASE2_CLIENT_CERT "phase2-client-cert"
 #define NM_SETTING_802_1X_PASSWORD "password"
 #define NM_SETTING_802_1X_PASSWORD_FLAGS "password-flags"
@@ -190,6 +192,8 @@ void              nm_setting_802_1x_remove_altsubject_match          (NMSetting8
 gboolean          nm_setting_802_1x_remove_altsubject_match_by_value (NMSetting8021x *setting,
                                                                       const char *altsubject_match);
 void              nm_setting_802_1x_clear_altsubject_matches         (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_2
+const char *      nm_setting_802_1x_get_domain_suffix_match          (NMSetting8021x *setting);
 
 NMSetting8021xCKScheme nm_setting_802_1x_get_client_cert_scheme      (NMSetting8021x *setting);
 GBytes *               nm_setting_802_1x_get_client_cert_blob        (NMSetting8021x *setting);
@@ -231,6 +235,8 @@ void              nm_setting_802_1x_remove_phase2_altsubject_match          (NMS
 gboolean          nm_setting_802_1x_remove_phase2_altsubject_match_by_value (NMSetting8021x *setting,
                                                                              const char *phase2_altsubject_match);
 void              nm_setting_802_1x_clear_phase2_altsubject_matches         (NMSetting8021x *setting);
+NM_AVAILABLE_IN_1_2
+const char *      nm_setting_802_1x_get_phase2_domain_suffix_match          (NMSetting8021x *setting);
 
 NMSetting8021xCKScheme nm_setting_802_1x_get_phase2_client_cert_scheme   (NMSetting8021x *setting);
 GBytes *               nm_setting_802_1x_get_phase2_client_cert_blob     (NMSetting8021x *setting);
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 44237d98..e1cd913a 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -1055,11 +1055,13 @@ find_virtual_interface_name (GVariant *connection_dict)
 	return interface_name;
 }
 
-static void
+static gboolean
 nm_setting_connection_set_interface_name (NMSetting *setting,
                                           GVariant *connection_dict,
                                           const char *property,
-                                          GVariant *value)
+                                          GVariant *value,
+                                          NMSettingParseFlags parse_flags,
+                                          GError **error)
 {
 	const char *interface_name;
 
@@ -1074,12 +1076,16 @@ nm_setting_connection_set_interface_name (NMSetting *setting,
 	g_object_set (G_OBJECT (setting),
 	              NM_SETTING_CONNECTION_INTERFACE_NAME, interface_name,
 	              NULL);
+
+	return TRUE;
 }
 
-static void
+static gboolean
 nm_setting_connection_no_interface_name (NMSetting *setting,
                                          GVariant *connection_dict,
-                                         const char *property)
+                                         const char *property,
+                                         NMSettingParseFlags parse_flags,
+                                         GError **error)
 {
 	const char *virtual_interface_name;
 
@@ -1087,6 +1093,7 @@ nm_setting_connection_no_interface_name (NMSetting *setting,
 	g_object_set (G_OBJECT (setting),
 	              NM_SETTING_CONNECTION_INTERFACE_NAME, virtual_interface_name,
 	              NULL);
+	return TRUE;
 }
 
 static gboolean
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index bbdb19ff..a69045b3 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -2464,17 +2464,22 @@ get_property (GObject *object, guint prop_id,
 	}
 }
 
-static void
+static gboolean
 ip_gateway_set (NMSetting  *setting,
                 GVariant   *connection_dict,
                 const char *property,
-                GVariant   *value)
+                GVariant   *value,
+                NMSettingParseFlags parse_flags,
+                GError    **error)
 {
+	/* FIXME: properly handle errors */
+
 	/* Don't set from 'gateway' if we're going to use the gateway in 'addresses' */
 	if (_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "gateway"))
-		return;
+		return TRUE;
 
 	g_object_set (setting, property, g_variant_get_string (value, NULL), NULL);
+	return TRUE;
 }
 
 static void
@@ -2510,6 +2515,9 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *setting_class)
 	 *
 	 * For methods that imply no upstream network, such as "shared" or
 	 * "link-local", these properties must be empty.
+	 *
+	 * For IPv4 method "shared", the IP subnet can be configured by adding one
+	 * manual IPv4 address or otherwise 10.42.x.0/24 is chosen.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_METHOD,
diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c
index fa193d75..f75a51b6 100644
--- a/libnm-core/nm-setting-ip-tunnel.c
+++ b/libnm-core/nm-setting-ip-tunnel.c
@@ -544,6 +544,7 @@ finalize (GObject *object)
 	NMSettingIPTunnel *setting = NM_SETTING_IP_TUNNEL (object);
 	NMSettingIPTunnelPrivate *priv = NM_SETTING_IP_TUNNEL_GET_PRIVATE (setting);
 
+	g_free (priv->parent);
 	g_free (priv->local);
 	g_free (priv->remote);
 	g_free (priv->input_key);
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index b0308e71..9b479a08 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -313,19 +313,23 @@ ip4_addresses_get (NMSetting  *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip4_addresses_set (NMSetting  *setting,
                    GVariant   *connection_dict,
                    const char *property,
-                   GVariant   *value)
+                   GVariant   *value,
+                   NMSettingParseFlags parse_flags,
+                   GError    **error)
 {
 	GPtrArray *addrs;
 	GVariant *s_ip4;
 	char **labels, *gateway = NULL;
 	int i;
 
+	/* FIXME: properly handle errors */
+
 	if (!_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "address-data"))
-		return;
+		return TRUE;
 
 	addrs = nm_utils_ip4_addresses_from_variant (value, &gateway);
 
@@ -344,6 +348,7 @@ ip4_addresses_set (NMSetting  *setting,
 	              NULL);
 	g_ptr_array_unref (addrs);
 	g_free (gateway);
+	return TRUE;
 }
 
 static GVariant *
@@ -399,21 +404,26 @@ ip4_address_data_get (NMSetting    *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip4_address_data_set (NMSetting  *setting,
                       GVariant   *connection_dict,
                       const char *property,
-                      GVariant   *value)
+                      GVariant   *value,
+                      NMSettingParseFlags parse_flags,
+                      GError    **error)
 {
 	GPtrArray *addrs;
 
+	/* FIXME: properly handle errors */
+
 	/* Ignore 'address-data' if we're going to process 'addresses' */
 	if (_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "address-data"))
-		return;
+		return TRUE;
 
 	addrs = nm_utils_ip_addresses_from_variant (value, AF_INET);
 	g_object_set (setting, NM_SETTING_IP_CONFIG_ADDRESSES, addrs, NULL);
 	g_ptr_array_unref (addrs);
+	return TRUE;
 }
 
 static GVariant *
@@ -430,20 +440,25 @@ ip4_routes_get (NMSetting  *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip4_routes_set (NMSetting  *setting,
                 GVariant   *connection_dict,
                 const char *property,
-                GVariant   *value)
+                GVariant   *value,
+                NMSettingParseFlags parse_flags,
+                GError    **error)
 {
 	GPtrArray *routes;
 
+	/* FIXME: properly handle errors */
+
 	if (!_nm_setting_use_legacy_property (setting, connection_dict, "routes", "route-data"))
-		return;
+		return TRUE;
 
 	routes = nm_utils_ip4_routes_from_variant (value);
 	g_object_set (setting, property, routes, NULL);
 	g_ptr_array_unref (routes);
+	return TRUE;
 }
 
 static GVariant *
@@ -461,21 +476,26 @@ ip4_route_data_get (NMSetting    *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip4_route_data_set (NMSetting  *setting,
                     GVariant   *connection_dict,
                     const char *property,
-                    GVariant   *value)
+                    GVariant   *value,
+                    NMSettingParseFlags parse_flags,
+                    GError    **error)
 {
 	GPtrArray *routes;
 
+	/* FIXME: properly handle errors */
+
 	/* Ignore 'route-data' if we're going to process 'routes' */
 	if (_nm_setting_use_legacy_property (setting, connection_dict, "routes", "route-data"))
-		return;
+		return TRUE;
 
 	routes = nm_utils_ip_routes_from_variant (value, AF_INET);
 	g_object_set (setting, NM_SETTING_IP_CONFIG_ROUTES, routes, NULL);
 	g_ptr_array_unref (routes);
+	return TRUE;
 }
 
 
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index f2d85084..bab8c535 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -239,17 +239,21 @@ ip6_addresses_get (NMSetting  *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip6_addresses_set (NMSetting  *setting,
                    GVariant   *connection_dict,
                    const char *property,
-                   GVariant   *value)
+                   GVariant   *value,
+                   NMSettingParseFlags parse_flags,
+                   GError    **error)
 {
 	GPtrArray *addrs;
 	char *gateway = NULL;
 
+	/* FIXME: properly handle errors */
+
 	if (!_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "address-data"))
-		return;
+		return TRUE;
 
 	addrs = nm_utils_ip6_addresses_from_variant (value, &gateway);
 
@@ -259,6 +263,7 @@ ip6_addresses_set (NMSetting  *setting,
 	              NULL);
 	g_ptr_array_unref (addrs);
 	g_free (gateway);
+	return TRUE;
 }
 
 static GVariant *
@@ -276,21 +281,26 @@ ip6_address_data_get (NMSetting    *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip6_address_data_set (NMSetting  *setting,
                       GVariant   *connection_dict,
                       const char *property,
-                      GVariant   *value)
+                      GVariant   *value,
+                      NMSettingParseFlags parse_flags,
+                      GError    **error)
 {
 	GPtrArray *addrs;
 
+	/* FIXME: properly handle errors */
+
 	/* Ignore 'address-data' if we're going to process 'addresses' */
 	if (_nm_setting_use_legacy_property (setting, connection_dict, "addresses", "address-data"))
-		return;
+		return TRUE;
 
 	addrs = nm_utils_ip_addresses_from_variant (value, AF_INET6);
 	g_object_set (setting, NM_SETTING_IP_CONFIG_ADDRESSES, addrs, NULL);
 	g_ptr_array_unref (addrs);
+	return TRUE;
 }
 
 static GVariant *
@@ -307,20 +317,25 @@ ip6_routes_get (NMSetting  *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip6_routes_set (NMSetting  *setting,
                 GVariant   *connection_dict,
                 const char *property,
-                GVariant   *value)
+                GVariant   *value,
+                NMSettingParseFlags parse_flags,
+                GError    **error)
 {
 	GPtrArray *routes;
 
+	/* FIXME: properly handle errors */
+
 	if (!_nm_setting_use_legacy_property (setting, connection_dict, "routes", "route-data"))
-		return;
+		return TRUE;
 
 	routes = nm_utils_ip6_routes_from_variant (value);
 	g_object_set (setting, property, routes, NULL);
 	g_ptr_array_unref (routes);
+	return TRUE;
 }
 
 static GVariant *
@@ -338,21 +353,26 @@ ip6_route_data_get (NMSetting    *setting,
 	return ret;
 }
 
-static void
+static gboolean
 ip6_route_data_set (NMSetting  *setting,
                     GVariant   *connection_dict,
                     const char *property,
-                    GVariant   *value)
+                    GVariant   *value,
+                    NMSettingParseFlags parse_flags,
+                    GError    **error)
 {
 	GPtrArray *routes;
 
+	/* FIXME: properly handle errors */
+
 	/* Ignore 'route-data' if we're going to process 'routes' */
 	if (_nm_setting_use_legacy_property (setting, connection_dict, "routes", "route-data"))
-		return;
+		return TRUE;
 
 	routes = nm_utils_ip_routes_from_variant (value, AF_INET6);
 	g_object_set (setting, NM_SETTING_IP_CONFIG_ROUTES, routes, NULL);
 	g_ptr_array_unref (routes);
+	return TRUE;
 }
 
 static void
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index cb7ca52e..6560c4a2 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -126,6 +126,7 @@ GVariant   *_nm_setting_to_dbus       (NMSetting *setting,
 NMSetting  *_nm_setting_new_from_dbus (GType setting_type,
                                        GVariant *setting_dict,
                                        GVariant *connection_dict,
+                                       NMSettingParseFlags parse_flags,
                                        GError **error);
 
 typedef GVariant * (*NMSettingPropertyGetFunc)    (NMSetting     *setting,
@@ -133,13 +134,17 @@ typedef GVariant * (*NMSettingPropertyGetFunc)    (NMSetting     *setting,
 typedef GVariant * (*NMSettingPropertySynthFunc)  (NMSetting     *setting,
                                                    NMConnection  *connection,
                                                    const char    *property);
-typedef void       (*NMSettingPropertySetFunc)    (NMSetting     *setting,
+typedef gboolean   (*NMSettingPropertySetFunc)    (NMSetting     *setting,
                                                    GVariant      *connection_dict,
                                                    const char    *property,
-                                                   GVariant      *value);
-typedef void       (*NMSettingPropertyNotSetFunc) (NMSetting     *setting,
+                                                   GVariant      *value,
+                                                   NMSettingParseFlags parse_flags,
+                                                   GError       **error);
+typedef gboolean   (*NMSettingPropertyNotSetFunc) (NMSetting     *setting,
                                                    GVariant      *connection_dict,
-                                                   const char    *property);
+                                                   const char    *property,
+                                                   NMSettingParseFlags parse_flags,
+                                                   GError       **error);
 
 void _nm_setting_class_add_dbus_only_property (NMSettingClass *setting_class,
                                                const char *property_name,
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 39587d59..827a47af 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -692,16 +692,19 @@ _override_flags_get (NMSetting *setting, const char *property)
 	return g_variant_new_uint32 (nm_setting_vlan_get_flags ((NMSettingVlan *) setting));
 }
 
-static void
+static gboolean
 _override_flags_not_set (NMSetting *setting,
-                          GVariant *connection_dict,
-                          const char *property)
+                         GVariant *connection_dict,
+                         const char *property,
+                         NMSettingParseFlags parse_flags,
+                         GError **error)
 {
 	/* we changed the default value for FLAGS. When an older client
 	 * doesn't serialize the property, we assume it is the old default. */
 	g_object_set (G_OBJECT (setting),
 	              NM_SETTING_VLAN_FLAGS, (NMVlanFlags) 0,
 	              NULL);
+	return TRUE;
 }
 
 static GSList *
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index fec645b2..0c41bd84 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -774,6 +774,7 @@ _nm_setting_to_dbus (NMSetting *setting, NMConnection *connection, NMConnectionS
  *   mapping property names to values
  * @connection_dict: the #GVariant containing an %NM_VARIANT_TYPE_CONNECTION
  *   dictionary mapping setting names to dictionaries.
+ * @parse_flags: flags to determine behavior during parsing.
  * @error: location to store error, or %NULL
  *
  * Creates a new #NMSetting object and populates that object with the properties
@@ -790,16 +791,20 @@ NMSetting *
 _nm_setting_new_from_dbus (GType setting_type,
                            GVariant *setting_dict,
                            GVariant *connection_dict,
+                           NMSettingParseFlags parse_flags,
                            GError **error)
 {
-	NMSetting *setting;
+	gs_unref_object NMSetting *setting = NULL;
+	gs_unref_hashtable GHashTable *keys = NULL;
 	const NMSettingProperty *properties;
-	guint n_properties;
-	guint i;
+	guint i, n_properties;
 
 	g_return_val_if_fail (G_TYPE_IS_INSTANTIATABLE (setting_type), NULL);
 	g_return_val_if_fail (g_variant_is_of_type (setting_dict, NM_VARIANT_TYPE_SETTING), NULL);
 
+	nm_assert (!NM_FLAGS_ANY (parse_flags, ~NM_SETTING_PARSE_FLAGS_ALL));
+	nm_assert (!NM_FLAGS_ALL (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT | NM_SETTING_PARSE_FLAGS_BEST_EFFORT));
+
 	/* connection_dict is not technically optional, but some tests in test-general
 	 * don't bother with it in cases where they know it's not needed.
 	 */
@@ -813,19 +818,49 @@ _nm_setting_new_from_dbus (GType setting_type,
 	 */
 	setting = (NMSetting *) g_object_new (setting_type, NULL);
 
+	if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)) {
+		GVariantIter iter;
+		GVariant *entry, *entry_key;
+		char *key;
+
+		keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+		g_variant_iter_init (&iter, setting_dict);
+		while ((entry = g_variant_iter_next_value (&iter))) {
+			entry_key = g_variant_get_child_value (entry, 0);
+			key = g_strdup (g_variant_get_string (entry_key, NULL));
+			g_variant_unref (entry_key);
+			g_variant_unref (entry);
+
+			if (!nm_g_hash_table_add (keys, key)) {
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_SETTING,
+				             _("duplicate property"));
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), key);
+				return NULL;
+			}
+		}
+	}
+
 	properties = nm_setting_class_get_properties (NM_SETTING_GET_CLASS (setting), &n_properties);
 	for (i = 0; i < n_properties; i++) {
 		const NMSettingProperty *property = &properties[i];
-		GVariant *value;
+		gs_unref_variant GVariant *value = NULL;
+		gs_free_error GError *local = NULL;
 
 		if (property->param_spec && !(property->param_spec->flags & G_PARAM_WRITABLE))
 			continue;
 
 		value = g_variant_lookup_value (setting_dict, property->name, NULL);
 
+		if (value && keys)
+			g_hash_table_remove (keys, property->name);
+
 		if (value && property->set_func) {
+
 			if (!g_variant_type_equal (g_variant_get_type (value), property->dbus_type)) {
-			property_type_error:
+				/* for backward behavior, fail unless best-effort is chosen. */
+				if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT))
+					continue;
 				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
 				             _("can't set property of type '%s' from value of type '%s'"),
 				             property->dbus_type ?
@@ -834,36 +869,83 @@ _nm_setting_new_from_dbus (GType setting_type,
 				                     g_type_name (property->param_spec->value_type) : "(unknown)",
 				             g_variant_get_type_string (value));
 				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
-
-				g_variant_unref (value);
-				g_object_unref (setting);
 				return NULL;
 			}
 
-			property->set_func (setting,
-			                    connection_dict,
-			                    property->name,
-			                    value);
+			if (!property->set_func (setting,
+			                         connection_dict,
+			                         property->name,
+			                         value,
+			                         parse_flags,
+			                         &local)) {
+				if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
+					continue;
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("failed to set property: %s"),
+				             local->message);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				return NULL;
+			}
 		} else if (!value && property->not_set_func) {
-			property->not_set_func (setting,
-			                        connection_dict,
-			                        property->name);
+			if (!property->not_set_func (setting,
+			                             connection_dict,
+			                             property->name,
+			                             parse_flags,
+			                             &local)) {
+				if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
+					continue;
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("failed to set property: %s"),
+				             local->message);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				return NULL;
+			}
 		} else if (value && property->param_spec) {
-			GValue object_value = { 0, };
+			nm_auto_unset_gvalue GValue object_value = G_VALUE_INIT;
 
 			g_value_init (&object_value, property->param_spec->value_type);
-			if (!set_property_from_dbus (property, value, &object_value))
-				goto property_type_error;
+			if (!set_property_from_dbus (property, value, &object_value)) {
+				/* for backward behavior, fail unless best-effort is chosen. */
+				if (NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_BEST_EFFORT))
+					continue;
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("can't set property of type '%s' from value of type '%s'"),
+				             property->dbus_type ?
+				                 g_variant_type_peek_string (property->dbus_type) :
+				                 property->param_spec ?
+				                     g_type_name (property->param_spec->value_type) : "(unknown)",
+				             g_variant_get_type_string (value));
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				return NULL;
+			}
 
-			g_object_set_property (G_OBJECT (setting), property->param_spec->name, &object_value);
-			g_value_unset (&object_value);
+			if (!nm_g_object_set_property (G_OBJECT (setting), property->param_spec->name, &object_value, &local)) {
+				if (!NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT))
+					continue;
+				g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+				             _("can not set property: %s"),
+				             local->message);
+				g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), property->name);
+				return NULL;
+			}
 		}
+	}
 
-		if (value)
-			g_variant_unref (value);
+	if (   NM_FLAGS_HAS (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT)
+	    && g_hash_table_size (keys) > 0) {
+		GHashTableIter iter;
+		const char *key;
+
+		g_hash_table_iter_init (&iter, keys);
+		if (g_hash_table_iter_next (&iter, (gpointer *) &key, NULL)) {
+			g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY,
+			             _("unknown property"));
+			g_prefix_error (error, "%s.%s: ", nm_setting_get_name (setting), key);
+			return NULL;
+		}
 	}
 
-	return setting;
+	return nm_unauto (&setting);
 }
 
 /**
diff --git a/libnm-core/nm-simple-connection.c b/libnm-core/nm-simple-connection.c
index 1036c8ec..11700666 100644
--- a/libnm-core/nm-simple-connection.c
+++ b/libnm-core/nm-simple-connection.c
@@ -51,7 +51,7 @@ nm_simple_connection_new (void)
 }
 
 /**
- * nm_simple_connection_new_from_dbus:
+ * _nm_simple_connection_new_from_dbus:
  * @dict: a #GVariant of type %NM_VARIANT_TYPE_CONNECTION describing the connection
  * @error: on unsuccessful return, an error
  *
@@ -60,24 +60,46 @@ nm_simple_connection_new (void)
  * hash table.
  *
  * Returns: (transfer full): the new #NMSimpleConnection object, populated with
- * settings created from the values in the hash table, or %NULL if the
- * connection failed to validate
+ * settings created from the values in the hash table, or %NULL if there was
+ * an error.
  **/
 NMConnection *
-nm_simple_connection_new_from_dbus (GVariant *dict, GError **error)
+_nm_simple_connection_new_from_dbus (GVariant *dict, NMSettingParseFlags parse_flags, GError **error)
 {
 	NMConnection *connection;
 
 	g_return_val_if_fail (dict != NULL, NULL);
 	g_return_val_if_fail (g_variant_is_of_type (dict, NM_VARIANT_TYPE_CONNECTION), NULL);
+	g_return_val_if_fail (!NM_FLAGS_ANY (parse_flags, ~NM_SETTING_PARSE_FLAGS_ALL), NULL);
+	g_return_val_if_fail (!NM_FLAGS_ALL (parse_flags, NM_SETTING_PARSE_FLAGS_STRICT | NM_SETTING_PARSE_FLAGS_BEST_EFFORT), NULL);
 
 	connection = nm_simple_connection_new ();
-	if (   !nm_connection_replace_settings (connection, dict, error)
-	    || !nm_connection_normalize (connection, NULL, NULL, error))
+	if (!_nm_connection_replace_settings (connection, dict, parse_flags, error))
 		g_clear_object (&connection);
 	return connection;
 }
 
+/**
+ * nm_simple_connection_new_from_dbus:
+ * @dict: a #GVariant of type %NM_VARIANT_TYPE_CONNECTION describing the connection
+ * @error: on unsuccessful return, an error
+ *
+ * Creates a new #NMSimpleConnection from a hash table describing the
+ * connection and normalize the connection.  See nm_connection_to_dbus() for a
+ * description of the expected hash table.
+ *
+ * Returns: (transfer full): the new #NMSimpleConnection object, populated with
+ * settings created from the values in the hash table, or %NULL if the
+ * connection failed to normalize.
+ **/
+NMConnection *
+nm_simple_connection_new_from_dbus (GVariant *dict, GError **error)
+{
+	return _nm_simple_connection_new_from_dbus (dict,
+	                                            NM_SETTING_PARSE_FLAGS_NORMALIZE,
+	                                            error);
+}
+
 /**
  * nm_simple_connection_new_clone:
  * @connection: the #NMConnection to clone
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 52d4e8b8..a8467081 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -2084,8 +2084,7 @@ nm_utils_ip_routes_from_variant (GVariant *value,
 		if (   !g_variant_lookup (route_var, "dest", "&s", &dest)
 		    || !g_variant_lookup (route_var, "prefix", "u", &prefix)) {
 			g_warning ("Ignoring invalid address");
-			g_variant_unref (route_var);
-			continue;
+			goto next;
 		}
 		if (!g_variant_lookup (route_var, "next-hop", "&s", &next_hop))
 			next_hop = NULL;
@@ -2098,8 +2097,7 @@ nm_utils_ip_routes_from_variant (GVariant *value,
 		if (!route) {
 			g_warning ("Ignoring invalid route: %s", error->message);
 			g_clear_error (&error);
-			g_variant_unref (route_var);
-			continue;
+			goto next;
 		}
 
 		g_variant_iter_init (&attrs_iter, route_var);
@@ -2113,6 +2111,8 @@ nm_utils_ip_routes_from_variant (GVariant *value,
 		}
 
 		g_ptr_array_add (routes, route);
+next:
+		g_variant_unref (route_var);
 	}
 
 	return routes;
@@ -3789,81 +3789,6 @@ _nm_utils_strstrdictkey_create (const char *v1, const char *v2)
 	return k;
 }
 
-/**********************************************************************************************/
-
-/* _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;
-}
-
 static gboolean
 validate_dns_option (const char *name, gboolean numeric, gboolean ipv6,
                      const NMUtilsDNSOptionDesc *option_descs)
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 82af4140..dcbcb880 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -74,6 +74,12 @@ G_STATIC_ASSERT (sizeof (bool) <= sizeof (int));
 
 /*****************************************************************************/
 
+static NMConnection *
+_connection_new_from_dbus (GVariant *dict, GError **error)
+{
+	return _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_NORMALIZE, error);
+}
+
 static void
 vpn_check_func (const char *key, const char *value, gpointer user_data)
 {
@@ -450,7 +456,7 @@ test_setting_ip4_config_labels (void)
 	                      NMTST_VARIANT_DROP_PROPERTY (NM_SETTING_IP4_CONFIG_SETTING_NAME,
 	                                                   "address-data");
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_no_error (error);
 	g_variant_unref (dict);
 
@@ -473,7 +479,7 @@ test_setting_ip4_config_labels (void)
 	                      NMTST_VARIANT_DROP_PROPERTY (NM_SETTING_IP4_CONFIG_SETTING_NAME,
 	                                                   "address-labels");
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict2, &error);
+	conn = _connection_new_from_dbus (dict2, &error);
 	g_assert_no_error (error);
 	g_variant_unref (dict2);
 
@@ -603,7 +609,7 @@ test_setting_ip4_config_address_data (void)
 	g_object_unref (conn);
 
 	/* When we reserialize that dictionary as a client, 'address-data' will be preferred. */
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_no_error (error);
 
 	s_ip4 = nm_connection_get_setting_ip4_config (conn);
@@ -619,7 +625,7 @@ test_setting_ip4_config_address_data (void)
 
 	/* But on the server side, 'addresses' will have precedence. */
 	_nm_utils_is_manager_process = TRUE;
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	_nm_utils_is_manager_process = FALSE;
 	g_assert_no_error (error);
 	g_variant_unref (dict);
@@ -1025,7 +1031,7 @@ test_setting_new_from_dbus (void)
 	dict = _nm_setting_to_dbus (NM_SETTING (s_wsec), NULL, NM_CONNECTION_SERIALIZE_ALL);
 	g_object_unref (s_wsec);
 
-	s_wsec = (NMSettingWirelessSecurity *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_WIRELESS_SECURITY, dict, NULL, NULL);
+	s_wsec = (NMSettingWirelessSecurity *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_WIRELESS_SECURITY, dict, NULL, NM_SETTING_PARSE_FLAGS_NONE, NULL);
 	g_variant_unref (dict);
 
 	g_assert (s_wsec);
@@ -1054,7 +1060,7 @@ test_setting_new_from_dbus_transform (void)
 	                                                  dbus_mac_address, ETH_ALEN, 1));
 	dict = g_variant_builder_end (&builder);
 
-	s_wired = _nm_setting_new_from_dbus (NM_TYPE_SETTING_WIRED, dict, NULL, &error);
+	s_wired = _nm_setting_new_from_dbus (NM_TYPE_SETTING_WIRED, dict, NULL, NM_SETTING_PARSE_FLAGS_NONE, &error);
 	g_assert_no_error (error);
 
 	g_assert_cmpstr (nm_setting_wired_get_mac_address (NM_SETTING_WIRED (s_wired)), ==, test_mac_address);
@@ -1080,7 +1086,7 @@ test_setting_new_from_dbus_enum (void)
 	                       g_variant_new_int32 (NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR));
 	dict = g_variant_builder_end (&builder);
 
-	s_ip6 = (NMSettingIP6Config *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_IP6_CONFIG, dict, NULL, &error);
+	s_ip6 = (NMSettingIP6Config *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_IP6_CONFIG, dict, NULL, NM_SETTING_PARSE_FLAGS_NONE, &error);
 	g_assert_no_error (error);
 
 	g_assert_cmpint (nm_setting_ip6_config_get_ip6_privacy (s_ip6), ==, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR);
@@ -1099,7 +1105,7 @@ test_setting_new_from_dbus_enum (void)
 	                                             NM_SETTING_SECRET_FLAG_NOT_SAVED));
 	dict = g_variant_builder_end (&builder);
 
-	s_wsec = (NMSettingWirelessSecurity *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_WIRELESS_SECURITY, dict, NULL, &error);
+	s_wsec = (NMSettingWirelessSecurity *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_WIRELESS_SECURITY, dict, NULL, NM_SETTING_PARSE_FLAGS_NONE, &error);
 	g_assert_no_error (error);
 
 	g_assert_cmpint (nm_setting_wireless_security_get_wep_key_type (s_wsec), ==, NM_WEP_KEY_TYPE_KEY);
@@ -1116,7 +1122,7 @@ test_setting_new_from_dbus_enum (void)
 	                       g_variant_new_byte ('E'));
 	dict = g_variant_builder_end (&builder);
 
-	s_serial = (NMSettingSerial *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_SERIAL, dict, NULL, &error);
+	s_serial = (NMSettingSerial *) _nm_setting_new_from_dbus (NM_TYPE_SETTING_SERIAL, dict, NULL, NM_SETTING_PARSE_FLAGS_NONE, &error);
 	g_assert_no_error (error);
 
 	g_assert_cmpint (nm_setting_serial_get_parity (s_serial), ==, NM_SETTING_SERIAL_PARITY_EVEN);
@@ -1188,7 +1194,7 @@ test_setting_new_from_dbus_bad (void)
 	g_object_unref (conn);
 
 	/* sanity-check */
-	conn = nm_simple_connection_new_from_dbus (orig_dict, &error);
+	conn = _connection_new_from_dbus (orig_dict, &error);
 	g_assert_no_error (error);
 	g_assert (conn);
 	g_object_unref (conn);
@@ -1201,7 +1207,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_WIRELESS_RATE,
 	                                                     "i", 10);
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert (conn);
 	g_assert_no_error (error);
 	setting = nm_connection_get_setting (conn, NM_TYPE_SETTING_WIRELESS);
@@ -1216,7 +1222,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_IP6_CONFIG_IP6_PRIVACY,
 	                                                     "i", NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR);
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert (conn);
 	g_assert_no_error (error);
 	setting = nm_connection_get_setting (conn, NM_TYPE_SETTING_IP6_CONFIG);
@@ -1233,7 +1239,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_WIRELESS_RATE,
 	                                                     "s", "ten");
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_assert (g_str_has_prefix (error->message, "802-11-wireless.rate:"));
 	g_clear_error (&error);
@@ -1245,7 +1251,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_WIRELESS_MODE,
 	                                                     "b", FALSE);
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_assert (g_str_has_prefix (error->message, "802-11-wireless.mode:"));
 	g_clear_error (&error);
@@ -1257,7 +1263,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_WIRELESS_SSID,
 	                                                     "s", "fred");
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_assert (g_str_has_prefix (error->message, "802-11-wireless.ssid:"));
 	g_clear_error (&error);
@@ -1269,7 +1275,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_WIRELESS_BSSID,
 	                                                     "i", 42);
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_assert (g_str_has_prefix (error->message, "802-11-wireless.bssid:"));
 	g_clear_error (&error);
@@ -1281,7 +1287,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_IP6_CONFIG_IP6_PRIVACY,
 	                                                     "s", "private");
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_assert (g_str_has_prefix (error->message, "ipv6.ip6-privacy:"));
 	g_clear_error (&error);
@@ -1293,7 +1299,7 @@ test_setting_new_from_dbus_bad (void)
 	                                                     NM_SETTING_IP_CONFIG_ADDRESSES,
 	                                                     "s", "1234::5678");
 	                      );
-	conn = nm_simple_connection_new_from_dbus (dict, &error);
+	conn = _connection_new_from_dbus (dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_assert (g_str_has_prefix (error->message, "ipv6.addresses:"));
 	g_clear_error (&error);
@@ -1561,7 +1567,7 @@ test_connection_new_from_dbus (void)
 	g_assert (new_settings);
 
 	/* Replace settings and test */
-	connection = nm_simple_connection_new_from_dbus (new_settings, &error);
+	connection = _connection_new_from_dbus (new_settings, &error);
 	g_assert_no_error (error);
 	g_assert (connection);
 
@@ -3241,7 +3247,7 @@ test_connection_normalize_virtual_iface_name (void)
 	                                                     ":::this-is-not-a-valid-interface-name:::");
 	                      );
 
-	con = nm_simple_connection_new_from_dbus (connection_dict, &error);
+	con = _connection_new_from_dbus (connection_dict, &error);
 	g_assert_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY);
 	g_clear_error (&error);
 
@@ -3253,7 +3259,7 @@ test_connection_normalize_virtual_iface_name (void)
 	                                                     IFACE_VIRT);
 	                      );
 
-	con = nm_simple_connection_new_from_dbus (connection_dict, &error);
+	con = _connection_new_from_dbus (connection_dict, &error);
 	g_assert_no_error (error);
 
 	g_assert_cmpstr (nm_connection_get_interface_name (con), ==, IFACE_NAME);
@@ -3269,7 +3275,7 @@ test_connection_normalize_virtual_iface_name (void)
 	                                                   NM_SETTING_CONNECTION_INTERFACE_NAME);
 	                      );
 
-	con = nm_simple_connection_new_from_dbus (connection_dict, &error);
+	con = _connection_new_from_dbus (connection_dict, &error);
 	g_assert_no_error (error);
 
 	g_assert_cmpstr (nm_connection_get_interface_name (con), ==, IFACE_VIRT);
@@ -3783,7 +3789,7 @@ test_setting_ip4_gateway (void)
 	                                                   "address-data");
 	                      );
 
-	conn = nm_simple_connection_new_from_dbus (conn_dict, &error);
+	conn = _connection_new_from_dbus (conn_dict, &error);
 	g_assert_no_error (error);
 
 	s_ip4 = (NMSettingIPConfig *) nm_connection_get_setting_ip4_config (conn);
@@ -3805,7 +3811,7 @@ test_setting_ip4_gateway (void)
 	                                                     "addresses", "aau", &addrs_builder);
 	                      );
 
-	conn = nm_simple_connection_new_from_dbus (conn_dict, &error);
+	conn = _connection_new_from_dbus (conn_dict, &error);
 	g_assert_no_error (error);
 	g_variant_unref (conn_dict);
 
@@ -3890,7 +3896,7 @@ test_setting_ip6_gateway (void)
 	                                                   "address-data");
 	                      );
 
-	conn = nm_simple_connection_new_from_dbus (conn_dict, &error);
+	conn = _connection_new_from_dbus (conn_dict, &error);
 	g_assert_no_error (error);
 
 	s_ip6 = (NMSettingIPConfig *) nm_connection_get_setting_ip6_config (conn);
@@ -3918,7 +3924,7 @@ test_setting_ip6_gateway (void)
 	                                                     "addresses", "a(ayuay)", &addrs_builder);
 	                      );
 
-	conn = nm_simple_connection_new_from_dbus (conn_dict, &error);
+	conn = _connection_new_from_dbus (conn_dict, &error);
 	g_assert_no_error (error);
 	g_variant_unref (conn_dict);
 
diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c
index db6e7ab7..aa79e1ac 100644
--- a/libnm-glib/nm-active-connection.c
+++ b/libnm-glib/nm-active-connection.c
@@ -139,8 +139,8 @@ _nm_active_connection_type_for_path (DBusGConnection *connection,
 		else
 			type = NM_TYPE_ACTIVE_CONNECTION;
 	} else {
-		g_warning ("Error in getting active connection 'Vpn' property: (%d) %s",
-		           error->code, error->message);
+		g_warning ("Error in getting active connection 'Vpn' property: %s",
+		           error->message);
 		g_error_free (error);
 		type = G_TYPE_INVALID;
 	}
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index fc105e53..20112d69 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -513,7 +513,7 @@ activate_info_complete (ActivateInfo *info,
 		                  error,
 		                  info->user_data);
 	} else if (error)
-		g_warning ("Device activation failed: (%d) %s", error->code, error->message);
+		g_warning ("Device activation failed: %s", error->message);
 
 	priv->pending_activations = g_slist_remove (priv->pending_activations, info);
 }
@@ -812,8 +812,8 @@ 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 ? error->message : "(unknown)");
+		g_warning ("Could not deactivate connection '%s': %s",
+		           path, NM_G_ERROR_MSG (error));
 		g_clear_error (&error);
 	}
 }
@@ -1342,7 +1342,7 @@ free_devices (NMClient *client, gboolean in_dispose)
 
 	if (all_devices && all_devices->len > 0)
 		devices = all_devices;
-	else if (devices && devices->len > 0)
+	else if (real_devices && real_devices->len > 0)
 		devices = real_devices;
 
 	if (real_devices && devices != real_devices) {
@@ -1839,8 +1839,8 @@ constructed (GObject *object)
 	GError *error = NULL;
 
 	if (!nm_utils_init (&error)) {
-		g_warning ("Couldn't initilize nm-utils/crypto system: %d %s",
-		           error->code, error->message);
+		g_warning ("Couldn't initilize nm-utils/crypto system: %s",
+		           error->message);
 		g_clear_error (&error);
 	}
 
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 312f9700..3392d230 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -2198,12 +2198,11 @@ device_operation_cb (DBusGProxy *proxy,
 	if (info->fn)
 		info->fn (info->device, error, info->user_data);
 	else if (error) {
-		g_warning ("%s: device %s %s failed: (%d) %s",
+		g_warning ("%s: device %s %s failed: %s",
 		           __func__,
 		           nm_object_get_path (NM_OBJECT (info->device)),
 		           info->method,
-		           error ? error->code : -1,
-		           error && error->message ? error->message : "(unknown)");
+		           NM_G_ERROR_MSG (error));
 	}
 	g_clear_error (&error);
 
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index b252dc7a..c7201cda 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -1402,11 +1402,10 @@ _nm_object_reload_property (NMObject *object,
 	                                     G_TYPE_INVALID,
 	                                     G_TYPE_VALUE, &value,
 	                                     G_TYPE_INVALID)) {
-		dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n",
+		dbgmsg ("%s: Error getting '%s' for %s: %s\n",
 		        __func__,
 		        prop_name,
 		        nm_object_get_path (object),
-		        err->code,
 		        err->message);
 		g_clear_error (&err);
 		return;
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index 2031b27f..a4dc638a 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -31,6 +31,7 @@
 #include "nm-object-private.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-dbus-helpers-private.h"
+#include "nm-setting-private.h"
 
 #define NM_REMOTE_CONNECTION_BUS "bus"
 #define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection"
@@ -446,25 +447,6 @@ nm_remote_connection_get_unsaved (NMRemoteConnection *connection)
 
 /****************************************************************/
 
-static void
-replace_settings (NMRemoteConnection *self, GHashTable *new_settings)
-{
-	GError *error = NULL;
-
-	if (nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error))
-		g_signal_emit (self, signals[UPDATED], 0, new_settings);
-	else {
-		g_warning ("%s: error updating connection %s settings: (%d) %s",
-		           __func__,
-		           nm_connection_get_path (NM_CONNECTION (self)),
-		           error ? error->code : -1,
-		           (error && error->message) ? error->message : "(unknown)");
-		g_clear_error (&error);
-
-		g_signal_emit (self, signals[REMOVED], 0);
-	}
-}
-
 static void
 updated_get_settings_cb (DBusGProxy *proxy,
                          DBusGProxyCall *call,
@@ -489,7 +471,7 @@ updated_get_settings_cb (DBusGProxy *proxy,
 		 * object.
 		 */
 		hash = g_hash_table_new (g_str_hash, g_str_equal);
-		nm_connection_replace_settings (NM_CONNECTION (self), hash, NULL);
+		_nm_connection_replace_settings (NM_CONNECTION (self), hash);
 		g_hash_table_destroy (hash);
 
 		priv->visible = FALSE;
@@ -498,7 +480,8 @@ updated_get_settings_cb (DBusGProxy *proxy,
 		gs_unref_object NMConnection *self_alive = NULL;
 
 		self_alive = g_object_ref (self);
-		replace_settings (self, new_settings);
+		_nm_connection_replace_settings (NM_CONNECTION (self), new_settings);
+		g_signal_emit (self, signals[UPDATED], 0, new_settings);
 		g_hash_table_destroy (new_settings);
 
 		/* Settings service will handle announcing the connection to clients */
@@ -629,7 +612,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error)
 		return FALSE;
 	priv->visible = TRUE;
 	self_alive = g_object_ref (initable);
-	replace_settings (NM_REMOTE_CONNECTION (initable), hash);
+	_nm_connection_replace_settings (NM_CONNECTION (initable), hash);
+	g_signal_emit (initable, signals[UPDATED], 0, hash);
 	g_hash_table_destroy (hash);
 
 	/* Get properties */
@@ -704,7 +688,8 @@ init_get_settings_cb (DBusGProxy *proxy,
 
 	priv->visible = TRUE;
 	self_alive = g_object_ref (init_data->connection);
-	replace_settings (init_data->connection, settings);
+	_nm_connection_replace_settings (NM_CONNECTION (init_data->connection), settings);
+	g_signal_emit (init_data->connection, signals[UPDATED], 0, settings);
 	g_hash_table_destroy (settings);
 
 	/* Grab properties */
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index fa2b325f..b64743a9 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -503,7 +503,7 @@ 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) {
+		if (print_once && g_error_matches (error, DBUS_GERROR, 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",
@@ -574,9 +574,8 @@ fetch_connections_done (DBusGProxy *proxy,
 		if (   !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SERVICE_UNKNOWN)
 		    && !g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NAME_HAS_NO_OWNER)
 		    && priv->service_running) {
-			g_warning ("%s: error fetching connections: (%d) %s.",
+			g_warning ("%s: error fetching connections: %s.",
 			           __func__,
-			           error->code,
 			           error->message ? error->message : "(unknown)");
 		}
 		g_clear_error (&error);
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index a0966f9f..03290469 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -27,6 +27,7 @@
 #include "nm-secret-agent.h"
 #include "nm-glib-enum-types.h"
 #include "nm-dbus-helpers-private.h"
+#include "nm-setting-private.h"
 
 static void impl_secret_agent_get_secrets (NMSecretAgent *self,
                                            GHashTable *connection_hash,
@@ -302,7 +303,8 @@ verify_request (NMSecretAgent *self,
                 GError **error)
 {
 	NMConnection *connection = NULL;
-	GError *local = NULL;
+
+	g_return_val_if_fail (out_connection, FALSE);
 
 	if (!verify_sender (self, context, error))
 		return FALSE;
@@ -321,22 +323,11 @@ verify_request (NMSecretAgent *self,
 	}
 
 	/* Make sure the given connection is valid */
-	g_assert (out_connection);
-	connection = nm_connection_new_from_hash (connection_hash, &local);
-	if (connection) {
-		nm_connection_set_path (connection, connection_path);
-		*out_connection = connection;
-	} else {
-		g_set_error (error,
-		             NM_SECRET_AGENT_ERROR,
-		             NM_SECRET_AGENT_ERROR_INVALID_CONNECTION,
-		             "Invalid connection: (%d) %s",
-		             local ? local->code : -1,
-		             (local && local->message) ? local->message : "(unknown)");
-		g_clear_error (&local);
-	}
+	connection = _nm_connection_new_from_hash (connection_hash);
+	nm_connection_set_path (connection, connection_path);
+	*out_connection = connection;
 
-	return !!connection;
+	return TRUE;
 }
 
 static void
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index 67ddd83b..2af9deb4 100644
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -29,6 +29,7 @@
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-glib-types.h"
+#include "nm-setting-private.h"
 
 static gboolean impl_vpn_plugin_connect    (NMVPNPlugin *plugin,
                                             GHashTable *connection,
@@ -301,12 +302,15 @@ fail_stop (gpointer data)
 }
 
 static void
-schedule_fail_stop (NMVPNPlugin *plugin)
+schedule_fail_stop (NMVPNPlugin *plugin, guint timeout_secs)
 {
 	NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
 
 	nm_clear_g_source (&priv->fail_stop_id);
-	priv->fail_stop_id = g_idle_add (fail_stop, plugin);
+	if (timeout_secs)
+		priv->fail_stop_id = g_timeout_add_seconds (timeout_secs, fail_stop, plugin);
+	else
+		priv->fail_stop_id = g_idle_add (fail_stop, plugin);
 }
 
 static void
@@ -439,6 +443,7 @@ _connect_generic (NMVPNPlugin *plugin,
 	NMConnection *connection;
 	gboolean success = FALSE;
 	GError *local = NULL;
+	guint fail_stop_timeout = 0;
 
 	if (priv->state != NM_VPN_SERVICE_STATE_STOPPED &&
 	    priv->state != NM_VPN_SERVICE_STATE_INIT) {
@@ -448,15 +453,7 @@ _connect_generic (NMVPNPlugin *plugin,
 		return FALSE;
 	}
 
-	connection = nm_connection_new_from_hash (properties, &local);
-	if (!connection) {
-		g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-		             "Invalid connection: (%d) %s",
-		             local->code, local->message);
-		g_clear_error (&local);
-		return FALSE;
-	}
-
+	connection = _nm_connection_new_from_hash (properties);
 
 	priv->interactive = FALSE;
 	if (details && !vpn_class->connect_interactive) {
@@ -465,22 +462,29 @@ _connect_generic (NMVPNPlugin *plugin,
 		return FALSE;
 	}
 
-	nm_vpn_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STARTING);
+	nm_clear_g_source (&priv->fail_stop_id);
 
 	if (details) {
 		priv->interactive = TRUE;
-		success = vpn_class->connect_interactive (plugin, connection, details, error);
+		success = vpn_class->connect_interactive (plugin, connection, details, &local);
+		if (g_error_matches (local, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED)) {
+			/* Give NetworkManager a bit of time to fall back to Connect() */
+			fail_stop_timeout = 5;
+		}
+		g_propagate_error (error, local);
 	} else
 		success = vpn_class->connect (plugin, connection, error);
 
 	if (success) {
+		nm_vpn_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STARTING);
+
 		/* Add a timer to make sure we do not wait indefinitely for the successful connect. */
 		connect_timer_start (plugin);
 	} else {
 		/* Stop the plugin from an idle handler so that the Connect
 		 * method return gets sent before the STOP StateChanged signal.
 		 */
-		schedule_fail_stop (plugin);
+		schedule_fail_stop (plugin, fail_stop_timeout);
 	}
 
 	g_object_unref (connection);
@@ -517,22 +521,11 @@ impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin,
 	char *sn = NULL;
 	GError *ns_err = NULL;
 	gboolean needed = FALSE;
-	GError *cnfh_err = NULL;
 
 	g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE);
 	g_return_val_if_fail (properties != NULL, FALSE);
 
-	connection = nm_connection_new_from_hash (properties, &cnfh_err);
-	if (!connection) {
-		g_set_error (err,
-		             NM_VPN_PLUGIN_ERROR,
-		             NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID,
-		             "The connection was invalid: '%s' / '%s' invalid: %d.",
-		             g_type_name (nm_connection_lookup_setting_type_by_quark (cnfh_err->domain)),
-		             cnfh_err->message, cnfh_err->code);
-		g_error_free (cnfh_err);
-		return FALSE;
-	}
+	connection = _nm_connection_new_from_hash (properties);
 
 	if (!NM_VPN_PLUGIN_GET_CLASS (plugin)->need_secrets) {
 		*setting_name = "";
@@ -572,7 +565,6 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin,
 {
 	NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin);
 	NMConnection *connection;
-	GError *local = NULL;
 	gboolean success;
 
 	if (priv->state != NM_VPN_SERVICE_STATE_STARTING) {
@@ -582,14 +574,7 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin,
 		return FALSE;
 	}
 
-	connection = nm_connection_new_from_hash (properties, &local);
-	if (!connection) {
-		g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-		             "Invalid connection: (%d) %s",
-		             local->code, local->message);
-		g_clear_error (&local);
-		return FALSE;
-	}
+	connection = _nm_connection_new_from_hash (properties);
 
 	if (!NM_VPN_PLUGIN_GET_CLASS (plugin)->new_secrets) {
 		g_set_error_literal (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED,
@@ -606,7 +591,7 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin,
 		/* Stop the plugin from and idle handler so that the NewSecrets
 		 * method return gets sent before the STOP StateChanged signal.
 		 */
-		schedule_fail_stop (plugin);
+		schedule_fail_stop (plugin, 0);
 	}
 
 	g_object_unref (connection);
diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
index da2e39e0..0da93c3f 100644
--- a/libnm-glib/tests/test-nm-client.c
+++ b/libnm-glib/tests/test-nm-client.c
@@ -955,12 +955,8 @@ test_connection_invalid (void)
 
 	settings = nmtstc_nm_remote_settings_new ();
 
-	g_test_expect_message ("libnm-glib", G_LOG_LEVEL_WARNING, "*replace_settings: error updating connection*");
-
 	nmtst_main_loop_run (loop, 100);
 
-	g_test_assert_expected_messages ();
-
 	_slist_to_array (&connections, nm_remote_settings_list_connections (settings));
 
 	g_assert_cmpint (connections->len, ==, 2);
@@ -991,12 +987,8 @@ test_connection_invalid (void)
 	                               FALSE,
 	                               &path2);
 
-	g_test_expect_message ("libnm-glib", G_LOG_LEVEL_WARNING, "*replace_settings: error updating connection*");
-
 	nmtst_main_loop_run (loop, 100);
 
-	g_test_assert_expected_messages ();
-
 	_slist_to_array (&connections, nm_remote_settings_list_connections (settings));
 
 	g_assert_cmpint (connections->len, ==, 3);
@@ -1027,15 +1019,11 @@ test_connection_invalid (void)
 	                                  connection,
 	                                  FALSE);
 
-	g_test_expect_message ("libnm-glib", G_LOG_LEVEL_WARNING, "*replace_settings: error updating connection*");
-
 	nmtst_main_loop_run (loop, 100);
 
-	g_test_assert_expected_messages ();
-
 	_slist_to_array (&connections, nm_remote_settings_list_connections (settings));
 
-	g_assert_cmpint (connections->len, ==, 2);
+	g_assert_cmpint (connections->len, ==, 3);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
 	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
@@ -1043,12 +1031,13 @@ test_connection_invalid (void)
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 2);
+	g_assert_cmpint (n_found, ==, 3);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
-	g_assert_cmpint (idx[2], ==, -1);
+	ASSERT_IDX (2);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[2]], 0, 0);
 
 	/**************************************************************************
 	 * Modify the invalid connection again. Note that the connection stays
@@ -1073,7 +1062,7 @@ test_connection_invalid (void)
 
 	_slist_to_array (&connections, nm_remote_settings_list_connections (settings));
 
-	g_assert_cmpint (connections->len, ==, 2);
+	g_assert_cmpint (connections->len, ==, 3);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
 	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
@@ -1081,12 +1070,13 @@ test_connection_invalid (void)
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 2);
+	g_assert_cmpint (n_found, ==, 3);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
-	g_assert_cmpint (idx[2], ==, -1);
+	ASSERT_IDX (2);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
+	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]);
 
 
 	/**************************************************************************
@@ -1111,7 +1101,7 @@ test_connection_invalid (void)
 
 	_slist_to_array (&connections, nm_remote_settings_list_connections (settings));
 
-	g_assert_cmpint (connections->len, ==, 2);
+	g_assert_cmpint (connections->len, ==, 3);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
 	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
@@ -1119,12 +1109,13 @@ test_connection_invalid (void)
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 2);
+	g_assert_cmpint (n_found, ==, 3);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
-	g_assert_cmpint (idx[2], ==, -1);
+	ASSERT_IDX (2);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[1]]);
+	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]);
 	g_assert_cmpstr ("test-connection-invalid-1x", ==, nm_connection_get_id (connections->pdata[idx[1]]));
 
 #undef ASSERT_IDX
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 6e637908..e9ccdae7 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -63,6 +63,7 @@ nodist_libnm_util_include_HEADERS = \
 	nm-utils-enum-types.h
 
 libnm_util_la_private_headers = \
+	$(top_builddir)/shared/nm-shared-utils.h \
 	crypto.h			\
 	nm-dbus-glib-types.h		\
 	nm-gvaluearray-compat.h		\
@@ -71,6 +72,7 @@ libnm_util_la_private_headers = \
 	nm-utils-private.h
 
 libnm_util_la_csources = \
+	$(top_builddir)/shared/nm-shared-utils.c \
 	crypto.c			\
 	nm-connection.c			\
 	nm-param-spec-specialized.c	\
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index d6085cca..9de83a6c 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -162,23 +162,25 @@ am__DEPENDENCIES_1 =
 libnm_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3)
-am__libnm_util_la_SOURCES_DIST = crypto.c nm-connection.c \
-	nm-param-spec-specialized.c nm-setting.c nm-setting-8021x.c \
-	nm-setting-adsl.c nm-setting-bluetooth.c nm-setting-bond.c \
-	nm-setting-team.c nm-setting-team-port.c nm-setting-bridge.c \
-	nm-setting-bridge-port.c nm-setting-connection.c \
-	nm-setting-dcb.c nm-setting-infiniband.c \
-	nm-setting-ip4-config.c nm-setting-vlan.c \
-	nm-setting-ip6-config.c nm-setting-ppp.c nm-setting-pppoe.c \
-	nm-setting-serial.c nm-setting-generic.c nm-setting-gsm.c \
-	nm-setting-cdma.c nm-setting-olpc-mesh.c nm-setting-wimax.c \
-	nm-setting-wired.c nm-setting-wireless.c \
+am__libnm_util_la_SOURCES_DIST =  \
+	$(top_builddir)/shared/nm-shared-utils.c crypto.c \
+	nm-connection.c nm-param-spec-specialized.c nm-setting.c \
+	nm-setting-8021x.c nm-setting-adsl.c nm-setting-bluetooth.c \
+	nm-setting-bond.c nm-setting-team.c nm-setting-team-port.c \
+	nm-setting-bridge.c nm-setting-bridge-port.c \
+	nm-setting-connection.c nm-setting-dcb.c \
+	nm-setting-infiniband.c nm-setting-ip4-config.c \
+	nm-setting-vlan.c nm-setting-ip6-config.c nm-setting-ppp.c \
+	nm-setting-pppoe.c nm-setting-serial.c nm-setting-generic.c \
+	nm-setting-gsm.c nm-setting-cdma.c nm-setting-olpc-mesh.c \
+	nm-setting-wimax.c nm-setting-wired.c nm-setting-wireless.c \
 	nm-setting-wireless-security.c nm-setting-vpn.c \
 	nm-utils-enum-types.c nm-utils.c nm-value-transforms.c \
-	crypto.h nm-dbus-glib-types.h nm-gvaluearray-compat.h \
+	$(top_builddir)/shared/nm-shared-utils.h crypto.h \
+	nm-dbus-glib-types.h nm-gvaluearray-compat.h \
 	nm-param-spec-specialized.h nm-setting-private.h \
 	nm-utils-private.h crypto_gnutls.c crypto_nss.c
-am__objects_1 = crypto.lo nm-connection.lo \
+am__objects_1 = nm-shared-utils.lo crypto.lo nm-connection.lo \
 	nm-param-spec-specialized.lo nm-setting.lo nm-setting-8021x.lo \
 	nm-setting-adsl.lo nm-setting-bluetooth.lo nm-setting-bond.lo \
 	nm-setting-team.lo nm-setting-team-port.lo \
@@ -630,6 +632,7 @@ nodist_libnm_util_include_HEADERS = \
 	nm-utils-enum-types.h
 
 libnm_util_la_private_headers = \
+	$(top_builddir)/shared/nm-shared-utils.h \
 	crypto.h			\
 	nm-dbus-glib-types.h		\
 	nm-gvaluearray-compat.h		\
@@ -638,6 +641,7 @@ libnm_util_la_private_headers = \
 	nm-utils-private.h
 
 libnm_util_la_csources = \
+	$(top_builddir)/shared/nm-shared-utils.c \
 	crypto.c			\
 	nm-connection.c			\
 	nm-param-spec-specialized.c	\
@@ -842,6 +846,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting-wireless-security.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting-wireless.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-setting.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-shared-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-utils-enum-types.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-value-transforms.Plo@am__quote@
@@ -867,6 +872,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+nm-shared-utils.lo: $(top_builddir)/shared/nm-shared-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-shared-utils.lo -MD -MP -MF $(DEPDIR)/nm-shared-utils.Tpo -c -o nm-shared-utils.lo `test -f '$(top_builddir)/shared/nm-shared-utils.c' || echo '$(srcdir)/'`$(top_builddir)/shared/nm-shared-utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/nm-shared-utils.Tpo $(DEPDIR)/nm-shared-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/shared/nm-shared-utils.c' object='nm-shared-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-shared-utils.lo `test -f '$(top_builddir)/shared/nm-shared-utils.c' || echo '$(srcdir)/'`$(top_builddir)/shared/nm-shared-utils.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
index 1ad853f5..385cdb8e 100644
--- a/libnm-util/libnm-util.ver
+++ b/libnm-util/libnm-util.ver
@@ -1,5 +1,7 @@
 {
 global:
+	_nm_connection_new_from_hash;
+	_nm_connection_replace_settings;
 	nm_connection_add_setting;
 	nm_connection_clear_secrets;
 	nm_connection_clear_secrets_with_flags;
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index ea791c51..51c48028 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -327,19 +327,30 @@ validate_permissions_type (GHashTable *hash, GError **error)
 	return TRUE;
 }
 
-static gboolean
-hash_to_connection (NMConnection *connection, GHashTable *new, GError **error)
+/**
+ * _nm_connection_replace_settings:
+ * @connection: a #NMConnection
+ * @new_settings: (element-type utf8 GLib.HashTable): a #GHashTable of settings
+ **/
+void
+_nm_connection_replace_settings (NMConnection *connection,
+                                 GHashTable *new_settings)
 {
+	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
 	GHashTableIter iter;
 	const char *setting_name;
 	GHashTable *setting_hash;
-	gboolean changed, valid;
-	NMConnectionPrivate *priv = NM_CONNECTION_GET_PRIVATE (connection);
+	gboolean changed;
+
+	g_return_if_fail (NM_IS_CONNECTION (connection));
+	g_return_if_fail (new_settings != NULL);
+
+	priv = NM_CONNECTION_GET_PRIVATE (connection);
 
 	if ((changed = g_hash_table_size (priv->settings) > 0))
 		g_hash_table_foreach_remove (priv->settings, _setting_release, connection);
 
-	g_hash_table_iter_init (&iter, new);
+	g_hash_table_iter_init (&iter, new_settings);
 	while (g_hash_table_iter_next (&iter, (gpointer) &setting_name, (gpointer) &setting_hash)) {
 		GType type = nm_connection_lookup_setting_type (setting_name);
 
@@ -353,10 +364,8 @@ hash_to_connection (NMConnection *connection, GHashTable *new, GError **error)
 		}
 	}
 
-	valid = nm_connection_verify (connection, error);
 	if (changed)
 		g_signal_emit (connection, signals[CHANGED], 0);
-	return valid;
 }
 
 /**
@@ -373,16 +382,15 @@ nm_connection_replace_settings (NMConnection *connection,
                                 GHashTable *new_settings,
                                 GError **error)
 {
-	gboolean valid = FALSE;
-
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
 	g_return_val_if_fail (new_settings != NULL, FALSE);
-	if (error)
-		g_return_val_if_fail (*error == NULL, FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
 
-	if (validate_permissions_type (new_settings, error))
-		valid = hash_to_connection (connection, new_settings, error);
-	return valid;
+	if (!validate_permissions_type (new_settings, error))
+		return FALSE;
+
+	_nm_connection_replace_settings (connection, new_settings);
+	return nm_connection_verify (connection, error);
 }
 
 /**
@@ -394,8 +402,10 @@ nm_connection_replace_settings (NMConnection *connection,
  * Deep-copies the settings of @new_conenction and replaces the settings of @connection
  * with the copied settings.
  *
- * Returns: %TRUE if the settings were valid and added to the connection, %FALSE
- * if they were not
+ * Returns: %TRUE if the settings were valid after replacing the connection, %FALSE
+ * if they were not. Regardless of whether %TRUE or %FALSE is returned, the connection
+ * is successfully replaced. %FALSE only means, that the connection does not verify
+ * at the end of the operation.
  *
  * Since: 0.9.10
  **/
@@ -407,17 +417,17 @@ nm_connection_replace_settings_from_connection (NMConnection *connection,
 	NMConnectionPrivate *priv;
 	GHashTableIter iter;
 	NMSetting *setting;
-	gboolean changed, valid;
+	gboolean changed = FALSE;
+	gboolean valid;
 
 	g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
 	g_return_val_if_fail (NM_IS_CONNECTION (new_connection), FALSE);
-	if (error)
-		g_return_val_if_fail (*error == NULL, FALSE);
+	g_return_val_if_fail (!error || !*error, FALSE);
 
 	/* When 'connection' and 'new_connection' are the same object simply return
 	 * in order not to destroy 'connection' */
 	if (connection == new_connection)
-		return TRUE;
+		goto out;
 
 	/* No need to validate permissions like nm_connection_replace_settings()
 	 * since we're dealing with an NMConnection which has already done that.
@@ -434,6 +444,7 @@ nm_connection_replace_settings_from_connection (NMConnection *connection,
 		changed = TRUE;
 	}
 
+out:
 	valid =  nm_connection_verify (connection, error);
 	if (changed)
 		g_signal_emit (connection, signals[CHANGED], 0);
@@ -1439,6 +1450,29 @@ nm_connection_new (void)
 	return (NMConnection *) g_object_new (NM_TYPE_CONNECTION, NULL);
 }
 
+/**
+ * _nm_connection_new_from_hash:
+ * @hash: (element-type utf8 GLib.HashTable): the #GHashTable describing
+ * the connection
+ *
+ * Creates a new #NMConnection from a hash table describing the connection.  See
+ * nm_connection_to_hash() for a description of the expected hash table.
+ *
+ * Returns: the new #NMConnection object, populated with settings created
+ * from the values in the hash table.
+ **/
+NMConnection *
+_nm_connection_new_from_hash (GHashTable *hash)
+{
+	NMConnection *connection;
+
+	g_return_val_if_fail (hash != NULL, NULL);
+
+	connection = nm_connection_new ();
+	_nm_connection_replace_settings (connection, hash);
+	return connection;
+}
+
 /**
  * nm_connection_new_from_hash:
  * @hash: (element-type utf8 GLib.HashTable): the #GHashTable describing
@@ -1462,11 +1496,9 @@ nm_connection_new_from_hash (GHashTable *hash, GError **error)
 	if (!validate_permissions_type (hash, error))
 		return NULL;
 
-	connection = nm_connection_new ();
-	if (!hash_to_connection (connection, hash, error)) {
-		g_object_unref (connection);
-		return NULL;
-	}
+	connection = _nm_connection_new_from_hash (hash);
+	if (!nm_connection_verify (connection, error))
+		g_clear_object (&connection);
 	return connection;
 }
 
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index f476b248..4f974a41 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -2878,8 +2878,8 @@ set_property (GObject *object, guint prop_id,
 		}
 		priv->ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CA_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s",
+			           error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2902,8 +2902,8 @@ set_property (GObject *object, guint prop_id,
 		}
 		priv->client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_CLIENT_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s",
+			           error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2934,8 +2934,8 @@ set_property (GObject *object, guint prop_id,
 		}
 		priv->phase2_ca_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CA_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s",
+			           error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2958,8 +2958,8 @@ set_property (GObject *object, guint prop_id,
 		}
 		priv->phase2_client_cert = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &error);
 		if (error) {
-			g_warning ("Error setting certificate (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting certificate (invalid data): %s",
+			           error->message);
 			g_error_free (error);
 		}
 		break;
@@ -2985,8 +2985,8 @@ set_property (GObject *object, guint prop_id,
 		}
 		priv->private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PRIVATE_KEY, &error);
 		if (error) {
-			g_warning ("Error setting private key (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting private key (invalid data): %s",
+			           error->message);
 			g_error_free (error);
 		}
 		break;
@@ -3004,8 +3004,8 @@ set_property (GObject *object, guint prop_id,
 		}
 		priv->phase2_private_key = set_cert_prop_helper (value, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &error);
 		if (error) {
-			g_warning ("Error setting private key (invalid data): (%d) %s",
-			           error->code, error->message);
+			g_warning ("Error setting private key (invalid data): %s",
+			           error->message);
 			g_error_free (error);
 		}
 		break;
@@ -3726,8 +3726,8 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	/* Initialize crypto lbrary. */
 	if (!nm_utils_init (&error)) {
-		g_warning ("Couldn't initilize nm-utils/crypto system: %d %s",
-		           error->code, error->message);
+		g_warning ("Couldn't initilize nm-utils/crypto system: %s",
+		           error->message);
 		g_error_free (error);
 	}
 }
diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index 6956463c..beb87484 100644
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/nm-setting-private.h
@@ -23,6 +23,8 @@
 
 #include "nm-default.h"
 
+#include "nm-connection.h"
+
 #define NM_SETTING_SECRET_FLAGS_ALL \
 	(NM_SETTING_SECRET_FLAG_NONE | \
 	 NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
@@ -62,6 +64,10 @@ gint _nm_setting_compare_priority (gconstpointer a, gconstpointer b);
 
 gboolean _nm_setting_get_property (NMSetting *setting, const char *name, GValue *value);
 
+NMConnection *_nm_connection_new_from_hash (GHashTable *hash);
+void          _nm_connection_replace_settings (NMConnection *connection,
+                                               GHashTable *new_settings);
+
 typedef enum NMSettingUpdateSecretResult {
 	NM_SETTING_UPDATE_SECRET_ERROR              = FALSE,
 	NM_SETTING_UPDATE_SECRET_SUCCESS_MODIFIED   = TRUE,
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index add3ad97..990d6fe7 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -379,9 +379,6 @@ nm_setting_new_from_hash (GType setting_type, GHashTable *hash)
 	const char *prop_name;
 	GValue *src_value;
 	GObjectClass *class;
-	guint n_params = 0;
-	GParameter *params;
-	int i;
 
 	g_return_val_if_fail (G_TYPE_IS_INSTANTIATABLE (setting_type), NULL);
 	g_return_val_if_fail (hash != NULL, NULL);
@@ -390,11 +387,11 @@ nm_setting_new_from_hash (GType setting_type, GHashTable *hash)
 	 * already been used.
 	 */
 	class = g_type_class_ref (setting_type);
-	params = g_new0 (GParameter, g_hash_table_size (hash));
+
+	setting = (NMSetting *) g_object_new (setting_type, NULL);
 
 	g_hash_table_iter_init (&iter, hash);
 	while (g_hash_table_iter_next (&iter, (gpointer) &prop_name, (gpointer) &src_value)) {
-		GValue *dst_value = ¶ms[n_params].value;
 		GParamSpec *param_spec;
 
 		param_spec = g_object_class_find_property (class, prop_name);
@@ -402,21 +399,12 @@ nm_setting_new_from_hash (GType setting_type, GHashTable *hash)
 			/* Assume that any unrecognized property either can be ignored, or
 			 * else has a backward-compatibility equivalent.
 			 */
-			g_debug ("Ignoring unrecognized property '%s'", prop_name);
 			continue;
 		}
 
-		g_value_init (dst_value, G_VALUE_TYPE (src_value));
-		g_value_copy (src_value, dst_value);
-		params[n_params++].name = prop_name;
+		nm_g_object_set_property ((GObject *) setting, prop_name, src_value, NULL);
 	}
 
-	setting = (NMSetting *) g_object_newv (setting_type, n_params, params);
-
-	for (i = 0; i < n_params; i++)
-		g_value_unset (¶ms[i].value);
-
-	g_free (params);
 	g_type_class_unref (class);
 
 	return setting;
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 7c9def1d..084f0f54 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -1514,20 +1514,14 @@ nm_utils_uuid_generate_from_string (const char *s)
 	g_return_val_if_fail (s && *s, NULL);
 
 	if (!nm_utils_init (&error)) {
-		g_warning ("error initializing crypto: (%d) %s",
-		           error ? error->code : 0,
-		           error ? error->message : "unknown");
-		if (error)
-			g_error_free (error);
+		g_warning ("error initializing crypto: %s", error->message);
+		g_error_free (error);
 		return NULL;
 	}
 
 	if (!crypto_md5_hash (NULL, 0, s, strlen (s), (char *) uuid, sizeof (uuid), &error)) {
-		g_warning ("error generating UUID: (%d) %s",
-		           error ? error->code : 0,
-		           error ? error->message : "unknown");
-		if (error)
-			g_error_free (error);
+		g_warning ("error generating UUID: %s", error->message);
+		g_error_free (error);
 		return NULL;
 	}
 
diff --git a/libnm/Makefile.in b/libnm/Makefile.in
index 6e7fcd42..81d1aa4a 100644
--- a/libnm/Makefile.in
+++ b/libnm/Makefile.in
@@ -618,6 +618,7 @@ libnm_core_headers = \
 	$(core)/nm-vpn-plugin-info.h
 
 libnm_core_private_headers = \
+	$(top_builddir)/shared/nm-shared-utils.h \
 	$(core)/crypto.h			\
 	$(core)/nm-connection-private.h		\
 	$(core)/nm-core-internal.h		\
@@ -629,6 +630,7 @@ libnm_core_private_headers = \
 	$(core)/nm-utils-private.h
 
 libnm_core_sources = \
+	$(top_builddir)/shared/nm-shared-utils.c \
 	$(core_build)/nm-core-enum-types.c	\
 	$(core)/crypto.c			\
 	$(core)/nm-connection.c			\
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index e3ede1d2..7ece1b2f 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -942,6 +942,8 @@ global:
 	nm_lldp_neighbor_unref;
 	nm_metered_get_type;
 	nm_setting_802_1x_check_cert_scheme;
+	nm_setting_802_1x_get_domain_suffix_match;
+	nm_setting_802_1x_get_phase2_domain_suffix_match;
 	nm_setting_bridge_get_multicast_snooping;
 	nm_setting_connection_autoconnect_slaves_get_type;
 	nm_setting_connection_get_autoconnect_slaves;
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 57a43ca8..a7ecdb55 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -1189,6 +1189,9 @@ nm_client_deactivate_connection_finish (NMClient *client,
  * Returns: (transfer none) (element-type NMRemoteConnection): an array
  * containing all connections provided by the remote settings service.  The
  * returned array is owned by the #NMClient object and should not be modified.
+ *
+ * The connections are as received from D-Bus and might not validate according
+ * to nm_connection_verify().
  **/
 const GPtrArray *
 nm_client_get_connections (NMClient *client)
@@ -1207,6 +1210,9 @@ nm_client_get_connections (NMClient *client)
  *
  * Returns: (transfer none): the remote connection object on success, or %NULL if no
  *  matching object was found.
+ *
+ * The connection is as received from D-Bus and might not validate according
+ * to nm_connection_verify().
  **/
 NMRemoteConnection *
 nm_client_get_connection_by_id (NMClient *client, const char *id)
@@ -1226,6 +1232,9 @@ nm_client_get_connection_by_id (NMClient *client, const char *id)
  *
  * Returns: (transfer none): the remote connection object on success, or %NULL if the object was
  *  not known
+ *
+ * The connection is as received from D-Bus and might not validate according
+ * to nm_connection_verify().
  **/
 NMRemoteConnection *
 nm_client_get_connection_by_path (NMClient *client, const char *path)
@@ -1245,6 +1254,9 @@ nm_client_get_connection_by_path (NMClient *client, const char *path)
  *
  * Returns: (transfer none): the remote connection object on success, or %NULL if the object was
  *  not known
+ *
+ * The connection is as received from D-Bus and might not validate according
+ * to nm_connection_verify().
  **/
 NMRemoteConnection *
 nm_client_get_connection_by_uuid (NMClient *client, const char *uuid)
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index fa32b4c7..496dd87a 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -61,7 +61,7 @@
 #include "nmdbus-device.h"
 
 static GType _nm_device_decide_type (GVariant *value);
-gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error);
+static gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error);
 static NMLldpNeighbor *nm_lldp_neighbor_dup (NMLldpNeighbor *neighbor);
 
 G_DEFINE_TYPE_WITH_CODE (NMDevice, nm_device, NM_TYPE_OBJECT,
@@ -2329,6 +2329,9 @@ nm_device_reapply_finish (NMDevice *device,
  * Returns: (transfer full): a %NMConnection with the currently applied settings
  *   or %NULL on error.
  *
+ * The connection is as received from D-Bus and might not validate according
+ * to nm_connection_verify().
+ *
  * Since: 1.2
  **/
 NMConnection *
@@ -2355,7 +2358,7 @@ nm_device_get_applied_connection (NMDevice *device,
 		return NULL;
 	}
 
-	connection = nm_simple_connection_new_from_dbus (dict, error);
+	connection = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, error);
 	if (!connection)
 		return NULL;
 
@@ -2397,7 +2400,7 @@ device_get_applied_connection_cb (GObject *proxy,
 		goto out;
 	}
 
-	connection = nm_simple_connection_new_from_dbus (dict, &error);
+	connection = _nm_simple_connection_new_from_dbus (dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_simple_async_result_take_error (simple, error);
 		goto out;
@@ -2457,6 +2460,9 @@ nm_device_get_applied_connection_async  (NMDevice *device,
  * Returns: (transfer full): a currently applied %NMConnection or %NULL in case
  *   of error.
  *
+ * The connection is as received from D-Bus and might not validate according
+ * to nm_connection_verify().
+ *
  * Since: 1.2
  **/
 NMConnection *
@@ -2712,7 +2718,7 @@ nm_device_connection_valid (NMDevice *device, NMConnection *connection)
 	return nm_device_connection_compatible (device, connection, NULL);
 }
 
-gboolean
+static gboolean
 connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
 {
 	const char *config_iface, *device_iface;
diff --git a/libnm/nm-ifcfg-rh-docs.xml b/libnm/nm-ifcfg-rh-docs.xml
index 9bb7b401..ef01a16a 100644
--- a/libnm/nm-ifcfg-rh-docs.xml
+++ b/libnm/nm-ifcfg-rh-docs.xml
@@ -12,6 +12,7 @@
 
 
 
+
 
 
 
@@ -22,6 +23,7 @@ can contain values both for 'phase2-auth' and 'phase2-autheap&apo
 IEEE_8021X_INNER_AUTH_METHODS is also used for 'phase2-auth' values."/>
 
 
+
 
 
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 17a51f24..a6c1f3f9 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -1212,7 +1212,7 @@ free_devices (NMManager *manager, gboolean in_dispose)
 
 	if (all_devices && all_devices->len > 0)
 		devices = all_devices;
-	else if (devices && devices->len > 0)
+	else if (real_devices && real_devices->len > 0)
 		devices = real_devices;
 
 	if (real_devices && devices != real_devices) {
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index b35f6822..3b41041e 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -205,24 +205,6 @@ deferred_notify_cb (gpointer data)
 	if (priv->reload_remaining)
 		return G_SOURCE_REMOVE;
 
-	/* If not all added object are finished yet, then defer the deferred
-	 * notification. */
-	for (iter = priv->notify_items; iter; iter = g_slist_next (iter)) {
-		NotifyItem *item = iter->data;
-		NMObjectPrivate *item_priv;
-
-		if (!item->changed)
-			continue;
-
-		item_priv = NM_OBJECT_GET_PRIVATE (item->changed);
-		if (!item_priv->inited) {
-			if (!g_slist_find (item_priv->waiters, object))
-				item_priv->waiters = g_slist_prepend (item_priv->waiters,
-				                                      g_object_ref (object));
-			return G_SOURCE_REMOVE;
-		}
-	}
-
 	/* Clear priv->notify_items early so that an NMObject subclass that
 	 * listens to property changes can queue up other property changes
 	 * during the g_object_notify() call separately from the property
@@ -458,6 +440,32 @@ _nm_object_create (GType type, GDBusConnection *connection, const char *path)
 	return object;
 }
 
+typedef struct {
+	NMObject *self;
+	PropertyInfo *pi;
+
+	GObject **objects;
+	int length, remaining;
+
+	GPtrArray *array;
+	const char *property_name;
+} ObjectCreatedData;
+
+static void
+odata_free (gpointer data)
+{
+	ObjectCreatedData *odata = data;
+
+	g_object_unref (odata->self);
+	g_free (odata->objects);
+	if (odata->array)
+		g_ptr_array_unref (odata->array);
+	g_slice_free (ObjectCreatedData, odata);
+}
+
+static void object_property_maybe_complete (ObjectCreatedData *odata);
+
+
 typedef void (*NMObjectCreateCallbackFunc) (GObject *, const char *, gpointer);
 typedef struct {
 	char *path;
@@ -497,13 +505,13 @@ create_async_inited (GObject *object, GAsyncResult *result, gpointer user_data)
 	if (object) {
 		NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
 
-		/* Re-queue notification checks for whoever was waiting for
-		 * this object to initialize. */
+		/* There are some object properties whose creation couldn't proceed
+		 * because it depended on this object. */
 		while (priv->waiters) {
-			NMObject *item = priv->waiters->data;
-			priv->waiters = g_slist_remove (priv->waiters, item);
-			_nm_object_defer_notify (item);
-			g_object_unref (item);
+			ObjectCreatedData *odata = priv->waiters->data;
+
+			priv->waiters = g_slist_remove (priv->waiters, odata);
+			object_property_maybe_complete (odata);
 		}
 	}
 }
@@ -656,17 +664,6 @@ add_to_object_array_unique (GPtrArray *array, GObject *obj)
 	}
 }
 
-typedef struct {
-	NMObject *self;
-	PropertyInfo *pi;
-
-	GObject **objects;
-	int length, remaining;
-
-	GPtrArray *array;
-	const char *property_name;
-} ObjectCreatedData;
-
 /* Places items from 'needles' that are not in 'haystack' into 'diff' */
 static void
 array_diff (GPtrArray *needles, GPtrArray *haystack, GPtrArray *diff)
@@ -700,19 +697,59 @@ queue_added_removed_signal (NMObject *self,
 	_nm_object_queue_notify_full (self, NULL, signal_prefix, added, changed);
 }
 
+static gboolean
+already_awaits (ObjectCreatedData *odata, GObject *object)
+{
+	NMObject *self = odata->self;
+	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self);
+	GSList *iter;
+
+	if ((GObject *)odata->self == object)
+		return TRUE;
+
+	for (iter = priv->waiters; iter; iter = g_slist_next (iter)) {
+		if (already_awaits (iter->data, object))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void
-object_property_complete (ObjectCreatedData *odata)
+object_property_maybe_complete (ObjectCreatedData *odata)
 {
 	NMObject *self = odata->self;
 	NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self);
 	PropertyInfo *pi = odata->pi;
 	gboolean different = TRUE;
+	int i;
+
+	/* Only complete the array property load when all the objects are initialized. */
+	for (i = 0; i < odata->length; i++) {
+		GObject *obj = odata->objects[i];
+		NMObjectPrivate *obj_priv;
+
+		/* Could not load the object. Perhaps it was removed. */
+		if (!obj)
+			continue;
+
+		obj_priv = NM_OBJECT_GET_PRIVATE (obj);
+		if (!obj_priv->inited) {
+
+			/* The object is not finished because we block its creation. */
+			if (already_awaits (odata, obj))
+				continue;
+
+			if (!g_slist_find (obj_priv->waiters, odata))
+				obj_priv->waiters = g_slist_prepend (obj_priv->waiters, odata);
+			return;
+		}
+	}
 
 	if (odata->array) {
 		GPtrArray *pi_old = *((GPtrArray **) pi->field);
 		GPtrArray *old = odata->array;
 		GPtrArray *new;
-		int i;
 
 		/* Build up new array */
 		new = g_ptr_array_new_full (odata->length, g_object_unref);
@@ -776,11 +813,7 @@ object_property_complete (ObjectCreatedData *odata)
 	if (--priv->reload_remaining == 0)
 		reload_complete (self, FALSE);
 
-	g_object_unref (self);
-	g_free (odata->objects);
-	if (odata->array)
-		g_ptr_array_unref (odata->array);
-	g_slice_free (ObjectCreatedData, odata);
+	odata_free (odata);
 }
 
 static void
@@ -799,7 +832,7 @@ object_created (GObject *obj, const char *path, gpointer user_data)
 
 	odata->objects[--odata->remaining] = obj;
 	if (!odata->remaining)
-		object_property_complete (odata);
+		object_property_maybe_complete (odata);
 }
 
 static gboolean
@@ -874,7 +907,7 @@ handle_object_array_property (NMObject *self, const char *property_name, GVarian
 	priv->reload_remaining++;
 
 	if (npaths == 0) {
-		object_property_complete (odata);
+		object_property_maybe_complete (odata);
 		return TRUE;
 	}
 
@@ -994,8 +1027,10 @@ process_properties_changed (NMObject *self, GVariant *properties, gboolean synch
 		return;
 
 	g_variant_iter_init (&iter, properties);
-	while (g_variant_iter_next (&iter, "{&sv}", &name, &value))
+	while (g_variant_iter_next (&iter, "{&sv}", &name, &value)) {
 		handle_property_changed (self, name, value, synchronously);
+		g_variant_unref (value);
+	}
 }
 
 static void
@@ -1280,11 +1315,10 @@ _nm_object_reload_property (NMObject *object,
 	                                G_DBUS_CALL_FLAGS_NONE, 15000,
 	                                NULL, &err);
 	if (!ret) {
-		dbgmsg ("%s: Error getting '%s' for %s: (%d) %s\n",
+		dbgmsg ("%s: Error getting '%s' for %s: %s\n",
 		        __func__,
 		        prop_name,
 		        nm_object_get_path (object),
-		        err->code,
 		        err->message);
 		g_clear_error (&err);
 		return;
@@ -1753,7 +1787,7 @@ dispose (GObject *object)
 	g_slist_free_full (priv->notify_items, (GDestroyNotify) notify_item_free);
 	priv->notify_items = NULL;
 
-	g_slist_free_full (priv->waiters, g_object_unref);
+	g_slist_free_full (priv->waiters, odata_free);
 	g_clear_pointer (&priv->proxies, g_hash_table_unref);
 	g_clear_object (&priv->properties_proxy);
 
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index eacbddea..c4a6685e 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -9,6 +9,7 @@
     
     
     
+    
     
     
     
@@ -26,16 +27,17 @@
     
     
     
+    
     
     
     
-    
+    
     
     
     
     
     
-    
+    
     
   
   
@@ -160,7 +162,7 @@
     
     
     
-    
+    
     
     
     
@@ -181,7 +183,7 @@
     
     
     
-    
+    
     
     
     
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index d2b55bd8..eb2874a0 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -26,6 +26,7 @@
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
+#include "nm-core-internal.h"
 
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
@@ -563,14 +564,11 @@ replace_settings (NMRemoteConnection *self, GVariant *new_settings)
 {
 	GError *error = NULL;
 
-	if (!nm_connection_replace_settings (NM_CONNECTION (self), new_settings, &error)) {
-		g_warning ("%s: error updating connection %s settings: (%d) %s",
-		           __func__,
-		           nm_connection_get_path (NM_CONNECTION (self)),
-		           error ? error->code : -1,
-		           (error && error->message) ? error->message : "(unknown)");
+	if (!_nm_connection_replace_settings ((NMConnection *) self,
+	                                      new_settings,
+	                                      NM_SETTING_PARSE_FLAGS_BEST_EFFORT,
+	                                      &error))
 		g_clear_error (&error);
-	}
 }
 
 static void
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 8edb224c..02a3f685 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -27,6 +27,7 @@
 #include "nm-enum-types.h"
 #include "nm-dbus-helpers.h"
 #include "nm-simple-connection.h"
+#include "nm-core-internal.h"
 
 #include "nmdbus-secret-agent.h"
 #include "nmdbus-agent-manager.h"
@@ -273,7 +274,7 @@ verify_request (NMSecretAgentOld *self,
 
 	/* Make sure the given connection is valid */
 	g_assert (out_connection);
-	connection = nm_simple_connection_new_from_dbus (connection_dict, &local);
+	connection = _nm_simple_connection_new_from_dbus (connection_dict, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &local);
 	if (connection) {
 		nm_connection_set_path (connection, connection_path);
 		*out_connection = connection;
@@ -745,9 +746,6 @@ nm_secret_agent_old_register_finish (NMSecretAgentOld *self,
  * indicating to NetworkManager that the agent will no longer provide or
  * store secrets on behalf of this user.
  *
- * It is a programmer error to attempt to unregister an agent that is not
- * registered.
- *
  * Returns: %TRUE if unregistration was successful, %FALSE on error
  **/
 gboolean
@@ -762,7 +760,6 @@ nm_secret_agent_old_unregister (NMSecretAgentOld *self,
 
 	priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
 
-	g_return_val_if_fail (priv->registered == TRUE, FALSE);
 	g_return_val_if_fail (priv->bus != NULL, FALSE);
 	g_return_val_if_fail (priv->manager_proxy != NULL, FALSE);
 
@@ -810,9 +807,6 @@ unregister_cb (GObject *proxy, GAsyncResult *result, gpointer user_data)
  * Asynchronously unregisters the #NMSecretAgentOld with the NetworkManager secret
  * manager, indicating to NetworkManager that the agent will no longer provide
  * or store secrets on behalf of this user.
- *
- * It is a programmer error to attempt to unregister an agent that is not
- * registered.
  **/
 void
 nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
@@ -828,7 +822,6 @@ nm_secret_agent_old_unregister_async (NMSecretAgentOld *self,
 
 	priv = NM_SECRET_AGENT_OLD_GET_PRIVATE (self);
 
-	g_return_if_fail (priv->registered == TRUE);
 	g_return_if_fail (priv->bus != NULL);
 	g_return_if_fail (priv->manager_proxy != NULL);
 
diff --git a/libnm/nm-setting-docs.xml b/libnm/nm-setting-docs.xml
index 7e08b114..323709b0 100644
--- a/libnm/nm-setting-docs.xml
+++ b/libnm/nm-setting-docs.xml
@@ -9,6 +9,7 @@
     
     
     
+    
     
     
     
@@ -26,16 +27,17 @@
     
     
     
+    
     
     
     
-    
+    
     
     
     
     
     
-    
+    
     
   
   
@@ -163,7 +165,7 @@
     
     
     
-    
+    
     
     
     
@@ -186,7 +188,7 @@
     
     
     
-    
+    
     
     
     
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index 9bbac414..634e61a2 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -293,12 +293,15 @@ fail_stop (gpointer data)
 }
 
 static void
-schedule_fail_stop (NMVpnPluginOld *plugin)
+schedule_fail_stop (NMVpnPluginOld *plugin, guint timeout_secs)
 {
 	NMVpnPluginOldPrivate *priv = NM_VPN_PLUGIN_OLD_GET_PRIVATE (plugin);
 
 	nm_clear_g_source (&priv->fail_stop_id);
-	priv->fail_stop_id = g_idle_add (fail_stop, plugin);
+	if (timeout_secs)
+		priv->fail_stop_id = g_timeout_add_seconds (timeout_secs, fail_stop, plugin);
+	else
+		priv->fail_stop_id = g_idle_add (fail_stop, plugin);
 }
 
 /**
@@ -450,6 +453,7 @@ _connect_generic (NMVpnPluginOld *plugin,
 	NMConnection *connection;
 	gboolean success = FALSE;
 	GError *error = NULL;
+	guint fail_stop_timeout = 0;
 
 	if (priv->state != NM_VPN_SERVICE_STATE_STOPPED &&
 	    priv->state != NM_VPN_SERVICE_STATE_INIT) {
@@ -461,13 +465,13 @@ _connect_generic (NMVpnPluginOld *plugin,
 		return;
 	}
 
-	connection = nm_simple_connection_new_from_dbus (properties, &error);
+	connection = _nm_simple_connection_new_from_dbus (properties, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_VPN_PLUGIN_ERROR,
 		                                       NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-		                                       "Invalid connection: (%d) %s",
-		                                       error->code, error->message);
+		                                       "Invalid connection: %s",
+		                                       error->message);
 		g_clear_error (&error);
 	}
 
@@ -480,15 +484,21 @@ _connect_generic (NMVpnPluginOld *plugin,
 		return;
 	}
 
-	nm_vpn_plugin_old_set_state (plugin, NM_VPN_SERVICE_STATE_STARTING);
+	nm_clear_g_source (&priv->fail_stop_id);
 
 	if (details) {
 		priv->interactive = TRUE;
 		success = vpn_class->connect_interactive (plugin, connection, details, &error);
+		if (g_error_matches (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED)) {
+			/* Give NetworkManager a bit of time to fall back to Connect() */
+			fail_stop_timeout = 5;
+		}
 	} else
 		success = vpn_class->connect (plugin, connection, &error);
 
 	if (success) {
+		nm_vpn_plugin_old_set_state (plugin, NM_VPN_SERVICE_STATE_STARTING);
+
 		g_dbus_method_invocation_return_value (context, NULL);
 
 		/* Add a timer to make sure we do not wait indefinitely for the successful connect. */
@@ -499,7 +509,7 @@ _connect_generic (NMVpnPluginOld *plugin,
 		/* Stop the plugin from an idle handler so that the Connect
 		 * method return gets sent before the STOP StateChanged signal.
 		 */
-		schedule_fail_stop (plugin);
+		schedule_fail_stop (plugin, fail_stop_timeout);
 	}
 
 	g_object_unref (connection);
@@ -537,7 +547,7 @@ impl_vpn_plugin_old_need_secrets (NMVpnPluginOld *plugin,
 	gboolean needed;
 	GError *error = NULL;
 
-	connection = nm_simple_connection_new_from_dbus (properties, &error);
+	connection = _nm_simple_connection_new_from_dbus (properties, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_VPN_PLUGIN_ERROR,
@@ -596,13 +606,13 @@ impl_vpn_plugin_old_new_secrets (NMVpnPluginOld *plugin,
 		return;
 	}
 
-	connection = nm_simple_connection_new_from_dbus (properties, &error);
+	connection = _nm_simple_connection_new_from_dbus (properties, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_VPN_PLUGIN_ERROR,
 		                                       NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-		                                       "Invalid connection: (%d) %s",
-		                                       error->code, error->message);
+		                                       "Invalid connection: %s",
+		                                       error->message);
 		g_clear_error (&error);
 		return;
 	}
@@ -628,7 +638,7 @@ impl_vpn_plugin_old_new_secrets (NMVpnPluginOld *plugin,
 		/* Stop the plugin from and idle handler so that the NewSecrets
 		 * method return gets sent before the STOP StateChanged signal.
 		 */
-		schedule_fail_stop (plugin);
+		schedule_fail_stop (plugin, 0);
 	}
 
 	g_object_unref (connection);
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 4e301e91..82e29ee8 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -291,12 +291,15 @@ fail_stop (gpointer data)
 }
 
 static void
-schedule_fail_stop (NMVpnServicePlugin *plugin)
+schedule_fail_stop (NMVpnServicePlugin *plugin, guint timeout_secs)
 {
 	NMVpnServicePluginPrivate *priv = NM_VPN_SERVICE_PLUGIN_GET_PRIVATE (plugin);
 
 	nm_clear_g_source (&priv->fail_stop_id);
-	priv->fail_stop_id = g_idle_add (fail_stop, plugin);
+	if (timeout_secs)
+		priv->fail_stop_id = g_timeout_add_seconds (timeout_secs, fail_stop, plugin);
+	else
+		priv->fail_stop_id = g_idle_add (fail_stop, plugin);
 }
 
 void
@@ -466,6 +469,7 @@ _connect_generic (NMVpnServicePlugin *plugin,
 	NMConnection *connection;
 	gboolean success = FALSE;
 	GError *error = NULL;
+	guint fail_stop_timeout = 0;
 
 	if (priv->state != NM_VPN_SERVICE_STATE_STOPPED &&
 	    priv->state != NM_VPN_SERVICE_STATE_INIT) {
@@ -477,13 +481,13 @@ _connect_generic (NMVpnServicePlugin *plugin,
 		return;
 	}
 
-	connection = nm_simple_connection_new_from_dbus (properties, &error);
+	connection = _nm_simple_connection_new_from_dbus (properties, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_VPN_PLUGIN_ERROR,
 		                                       NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-		                                       "Invalid connection: (%d) %s",
-		                                       error->code, error->message);
+		                                       "Invalid connection: %s",
+		                                       error->message);
 		g_clear_error (&error);
 		return;
 	}
@@ -497,7 +501,7 @@ _connect_generic (NMVpnServicePlugin *plugin,
 		return;
 	}
 
-	nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STARTING);
+	nm_clear_g_source (&priv->fail_stop_id);
 
 	if (priv->dbus_watch_peer)
 		priv->peer_watch_id = watch_peer (plugin, context);
@@ -505,10 +509,16 @@ _connect_generic (NMVpnServicePlugin *plugin,
 	if (details) {
 		priv->interactive = TRUE;
 		success = vpn_class->connect_interactive (plugin, connection, details, &error);
+		if (g_error_matches (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED)) {
+			/* Give NetworkManager a bit of time to fall back to Connect() */
+			fail_stop_timeout = 5;
+		}
 	} else
 		success = vpn_class->connect (plugin, connection, &error);
 
 	if (success) {
+		nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STARTING);
+
 		g_dbus_method_invocation_return_value (context, NULL);
 
 		/* Add a timer to make sure we do not wait indefinitely for the successful connect. */
@@ -519,7 +529,7 @@ _connect_generic (NMVpnServicePlugin *plugin,
 		/* Stop the plugin from an idle handler so that the Connect
 		 * method return gets sent before the STOP StateChanged signal.
 		 */
-		schedule_fail_stop (plugin);
+		schedule_fail_stop (plugin, fail_stop_timeout);
 	}
 
 	g_object_unref (connection);
@@ -557,7 +567,7 @@ impl_vpn_service_plugin_need_secrets (NMVpnServicePlugin *plugin,
 	gboolean needed;
 	GError *error = NULL;
 
-	connection = nm_simple_connection_new_from_dbus (properties, &error);
+	connection = _nm_simple_connection_new_from_dbus (properties, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_VPN_PLUGIN_ERROR,
@@ -616,13 +626,13 @@ impl_vpn_service_plugin_new_secrets (NMVpnServicePlugin *plugin,
 		return;
 	}
 
-	connection = nm_simple_connection_new_from_dbus (properties, &error);
+	connection = _nm_simple_connection_new_from_dbus (properties, NM_SETTING_PARSE_FLAGS_BEST_EFFORT, &error);
 	if (!connection) {
 		g_dbus_method_invocation_return_error (context,
 		                                       NM_VPN_PLUGIN_ERROR,
 		                                       NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
-		                                       "Invalid connection: (%d) %s",
-		                                       error->code, error->message);
+		                                       "Invalid connection: %s",
+		                                       error->message);
 		g_clear_error (&error);
 		return;
 	}
@@ -648,7 +658,7 @@ impl_vpn_service_plugin_new_secrets (NMVpnServicePlugin *plugin,
 		/* Stop the plugin from and idle handler so that the NewSecrets
 		 * method return gets sent before the STOP StateChanged signal.
 		 */
-		schedule_fail_stop (plugin);
+		schedule_fail_stop (plugin, 0);
 	}
 
 	g_object_unref (connection);
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 9e9d480e..3a7c4d5d 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -1002,9 +1002,8 @@ client_devices_changed_cb (GObject *client,
 
 	g_assert_cmpstr (nm_device_get_iface (device), ==, "eth0.1");
 
-	if (nm_device_get_active_connection (device))
-		info->remaining--;
-	else {
+	if (!nm_device_get_active_connection (device)) {
+		info->remaining++;
 		g_signal_connect (device, "notify::" NM_DEVICE_ACTIVE_CONNECTION,
 		                  G_CALLBACK (device_ac_changed_cb), info);
 	}
@@ -1094,8 +1093,10 @@ test_activate_virtual (void)
 	g_signal_connect (client, "notify::" NM_CLIENT_DEVICES,
 	                  G_CALLBACK (client_devices_changed_cb), &info);
 
-	/* As with test_active_connections() above, except that now we're waiting
-	 * for NMClient:devices to change rather than NMDevice:active-connections.
+	/* We're expecting a client::devices change, client::activate callback,
+	 * and a device::active-connection change.
+	 * The client::devices callback can hook a client::active-connections
+	 * change and bump this if the property is not yet loaded.
 	 */
 	info.remaining = 3;
 
@@ -1242,10 +1243,12 @@ _test_connection_invalid_find_connections (gpointer element, gpointer needle, gp
 }
 
 #define ASSERT_IDX(i) \
-	g_assert_cmpint (idx[i], >=, 0); \
-	g_assert (path##i && *path##i); \
-	g_assert (NM_IS_REMOTE_CONNECTION (connections->pdata[idx[i]])); \
-	g_assert_cmpstr (nm_connection_get_path (connections->pdata[idx[i]]), ==, path##i);
+	G_STMT_START { \
+		g_assert_cmpint (idx[i], >=, 0); \
+		g_assert (path##i && *path##i); \
+		g_assert (NM_IS_REMOTE_CONNECTION (connections->pdata[idx[i]])); \
+		g_assert_cmpstr (nm_connection_get_path (connections->pdata[idx[i]]), ==, path##i); \
+	} G_STMT_END
 
 static void
 test_connection_invalid (void)
@@ -1259,12 +1262,14 @@ test_connection_invalid (void)
 	gs_free char *path0 = NULL;
 	gs_free char *path1 = NULL;
 	gs_free char *path2 = NULL;
+	gs_free char *path3 = NULL;
 	gs_free char *uuid2 = NULL;
 	gsize n_found;
-	gssize idx[3];
+	gssize idx[4];
+	gs_unref_variant GVariant *variant = NULL;
 
 	/**************************************************************************
-	 * Add two connection before starting libnm. One valid, one invalid.
+	 * Add three connections before starting libnm. One valid, two invalid.
 	 *************************************************************************/
 
 	connection = nmtst_create_minimal_connection ("test-connection-invalid-0", NULL, NM_SETTING_WIRED_SETTING_NAME, &s_con);
@@ -1288,6 +1293,21 @@ test_connection_invalid (void)
 	                               FALSE,
 	                               &path1);
 
+	g_object_set (s_con,
+	              NM_SETTING_CONNECTION_ID, "test-connection-invalid-2",
+	              NM_SETTING_CONNECTION_TYPE, "invalid-type-2",
+	              NM_SETTING_CONNECTION_UUID, nmtst_uuid_generate (),
+	              NULL);
+	variant = nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL);
+	NMTST_VARIANT_EDITOR (variant,
+	                      NMTST_VARIANT_ADD_SETTING ("invalid-type-2",
+	                                                 nmtst_variant_new_vardict ("some-key1", g_variant_new_string ("some-value1"),
+	                                                                            "some-key2", g_variant_new_uint32 (4722))));
+	g_variant_ref_sink (variant);
+	nmtstc_service_add_connection_variant (my_sinfo,
+	                                       variant,
+	                                       FALSE,
+	                                       &path2);
 
 	client = nm_client_new (NULL, &error);
 	g_assert_no_error (error);
@@ -1295,19 +1315,21 @@ test_connection_invalid (void)
 	connections = nm_client_get_connections (client);
 	g_assert (connections);
 
-	g_assert_cmpint (connections->len, ==, 2);
+	g_assert_cmpint (connections->len, ==, 3);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
-	                                  (gpointer *) ((const char *[]) { path0, path1 }),
-	                                  2,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
+	                                  3,
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 2);
+	g_assert_cmpint (n_found, ==, 3);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
+	ASSERT_IDX (2);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[2]], 0, 0);
 
 	/**************************************************************************
 	 * After having the client up and running, add another invalid connection
@@ -1321,7 +1343,7 @@ test_connection_invalid (void)
 	nmtstc_service_add_connection (my_sinfo,
 	                               connection,
 	                               FALSE,
-	                               &path2);
+	                               &path3);
 
 
 	nmtst_main_loop_run (loop, 100);
@@ -1330,21 +1352,97 @@ test_connection_invalid (void)
 	connections = nm_client_get_connections (client);
 	g_assert (connections);
 
-	g_assert_cmpint (connections->len, ==, 3);
+	g_assert_cmpint (connections->len, ==, 4);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
-	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
-	                                  3,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2, path3 }),
+	                                  4,
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 3);
+	g_assert_cmpint (n_found, ==, 4);
+	ASSERT_IDX (0);
+	ASSERT_IDX (1);
+	ASSERT_IDX (2);
+	ASSERT_IDX (3);
+	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[2]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[3]], 0, 0);
+
+	/**************************************************************************
+	 * Modify the invalid connection (still invalid)
+	 *************************************************************************/
+
+	NMTST_VARIANT_EDITOR (variant,
+	                      NMTST_VARIANT_CHANGE_PROPERTY ("invalid-type-2",
+	                                                     "some-key2", "u", 4721));
+	g_variant_ref_sink (variant);
+	nmtstc_service_update_connection_variant (my_sinfo,
+	                                          path2,
+	                                          variant,
+	                                          FALSE);
+
+	nmtst_main_loop_run (loop, 100);
+
+	connections = nm_client_get_connections (client);
+	g_assert (connections);
+
+	g_assert_cmpint (connections->len, ==, 4);
+	n_found = nmtst_find_all_indexes (connections->pdata,
+	                                  connections->len,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2, path3 }),
+	                                  4,
+	                                  _test_connection_invalid_find_connections,
+	                                  NULL,
+	                                  idx);
+	g_assert_cmpint (n_found, ==, 4);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
 	ASSERT_IDX (2);
+	ASSERT_IDX (3);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[2]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[3]], 0, 0);
+
+	/**************************************************************************
+	 * Modify the invalid connection (becomes valid)
+	 *************************************************************************/
+
+	NMTST_VARIANT_EDITOR (variant,
+	                      NMTST_VARIANT_DROP_SETTING ("invalid-type-2"));
+	NMTST_VARIANT_EDITOR (variant,
+	                      NMTST_VARIANT_CHANGE_PROPERTY (NM_SETTING_CONNECTION_SETTING_NAME,
+	                                                     NM_SETTING_CONNECTION_TYPE, "s", NM_SETTING_WIRED_SETTING_NAME));
+	g_variant_ref_sink (variant);
+	nmtstc_service_update_connection_variant (my_sinfo,
+	                                          path2,
+	                                          variant,
+	                                          FALSE);
+
+	nmtst_main_loop_run (loop, 100);
+
+	connections = nm_client_get_connections (client);
+	g_assert (connections);
+
+	g_assert_cmpint (connections->len, ==, 4);
+	n_found = nmtst_find_all_indexes (connections->pdata,
+	                                  connections->len,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2, path3 }),
+	                                  4,
+	                                  _test_connection_invalid_find_connections,
+	                                  NULL,
+	                                  idx);
+	g_assert_cmpint (n_found, ==, 4);
+	ASSERT_IDX (0);
+	ASSERT_IDX (1);
+	ASSERT_IDX (2);
+	ASSERT_IDX (3);
+	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
+	nmtst_assert_connection_verifies_after_normalization (connections->pdata[idx[2]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[3]], 0, 0);
 
 	/**************************************************************************
 	 * Modify the invalid connection (still invalid)
@@ -1354,7 +1452,7 @@ test_connection_invalid (void)
 	              NM_SETTING_CONNECTION_ID, "test-connection-invalid-2x",
 	              NULL);
 	nmtstc_service_update_connection (my_sinfo,
-	                                  path2,
+	                                  path3,
 	                                  connection,
 	                                  FALSE);
 
@@ -1363,22 +1461,24 @@ test_connection_invalid (void)
 	connections = nm_client_get_connections (client);
 	g_assert (connections);
 
-	g_assert_cmpint (connections->len, ==, 3);
+	g_assert_cmpint (connections->len, ==, 4);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
-	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
-	                                  3,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2, path3 }),
+	                                  4,
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 3);
+	g_assert_cmpint (n_found, ==, 4);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
 	ASSERT_IDX (2);
+	ASSERT_IDX (3);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
-	nmtst_assert_connection_unnormalizable (connections->pdata[idx[2]], 0, 0);
-	g_assert_cmpstr ("test-connection-invalid-2x", ==, nm_connection_get_id (connections->pdata[idx[2]]));
+	nmtst_assert_connection_verifies_after_normalization (connections->pdata[idx[2]], 0, 0);
+	nmtst_assert_connection_unnormalizable (connections->pdata[idx[3]], 0, 0);
+	g_assert_cmpstr ("test-connection-invalid-2x", ==, nm_connection_get_id (connections->pdata[idx[3]]));
 
 	/**************************************************************************
 	 * Modify the invalid connection (now becomes valid)
@@ -1394,7 +1494,7 @@ test_connection_invalid (void)
 	              NULL);
 
 	nmtstc_service_update_connection (my_sinfo,
-	                                  path2,
+	                                  path3,
 	                                  connection,
 	                                  FALSE);
 
@@ -1403,22 +1503,24 @@ test_connection_invalid (void)
 	connections = nm_client_get_connections (client);
 	g_assert (connections);
 
-	g_assert_cmpint (connections->len, ==, 3);
+	g_assert_cmpint (connections->len, ==, 4);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
-	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
-	                                  3,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2, path3 }),
+	                                  4,
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 3);
+	g_assert_cmpint (n_found, ==, 4);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
 	ASSERT_IDX (2);
+	ASSERT_IDX (3);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_unnormalizable (connections->pdata[idx[1]], 0, 0);
-	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]);
-	g_assert_cmpstr ("test-connection-invalid-2z", ==, nm_connection_get_id (connections->pdata[idx[2]]));
+	nmtst_assert_connection_verifies_after_normalization (connections->pdata[idx[2]], 0, 0);
+	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[3]]);
+	g_assert_cmpstr ("test-connection-invalid-2z", ==, nm_connection_get_id (connections->pdata[idx[3]]));
 
 	/**************************************************************************
 	 * Modify the invalid connection and make it valid
@@ -1443,23 +1545,25 @@ test_connection_invalid (void)
 	connections = nm_client_get_connections (client);
 	g_assert (connections);
 
-	g_assert_cmpint (connections->len, ==, 3);
+	g_assert_cmpint (connections->len, ==, 4);
 	n_found = nmtst_find_all_indexes (connections->pdata,
 	                                  connections->len,
-	                                  (gpointer *) ((const char *[]) { path0, path1, path2 }),
-	                                  3,
+	                                  (gpointer *) ((const char *[]) { path0, path1, path2, path3 }),
+	                                  4,
 	                                  _test_connection_invalid_find_connections,
 	                                  NULL,
 	                                  idx);
-	g_assert_cmpint (n_found, ==, 3);
+	g_assert_cmpint (n_found, ==, 4);
 	ASSERT_IDX (0);
 	ASSERT_IDX (1);
 	ASSERT_IDX (2);
+	ASSERT_IDX (3);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[0]]);
 	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[1]]);
-	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[2]]);
+	nmtst_assert_connection_verifies_after_normalization (connections->pdata[idx[2]], 0, 0);
+	nmtst_assert_connection_verifies_without_normalization (connections->pdata[idx[3]]);
 	g_assert_cmpstr ("test-connection-invalid-1x", ==, nm_connection_get_id (connections->pdata[idx[1]]));
-	g_assert_cmpstr ("test-connection-invalid-2z", ==, nm_connection_get_id (connections->pdata[idx[2]]));
+	g_assert_cmpstr ("test-connection-invalid-2z", ==, nm_connection_get_id (connections->pdata[idx[3]]));
 
 #undef ASSERT_IDX
 }
diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4
index a7d6669d..77dcc7a5 100644
--- a/m4/compiler_warnings.m4
+++ b/m4/compiler_warnings.m4
@@ -50,6 +50,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
 		      -Wdeclaration-after-statement -Wformat-security \
 		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
+		      -Wno-duplicate-decl-specifier \
 		      -Wstrict-prototypes \
 		      -fno-strict-aliasing -Wno-unused-but-set-variable \
 		      -Wundef -Wimplicit-function-declaration \
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index efe0e9ac..1dc1556d 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -41,6 +41,8 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
     ],dnl
     [auto],[dnl
         PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
     ],dnl
     [dnl	
         AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
diff --git a/man/Makefile.am b/man/Makefile.am
index be33eeb2..65d8d007 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -94,6 +94,7 @@ EXTRA_DIST +=								\
 	nm-settings-ifcfg-rh.xml					\
 	nm-settings-ifcfg-rh.xsl					\
 	$(addsuffix .xml,$(basename $(docbook_generated_man_pages)))	\
+	$(docbook_generated_man_pages) \
 	$(docbook_autogenerated_man_pages)
 
 man_MANS += $(configure_generated_man_pages)
diff --git a/man/Makefile.in b/man/Makefile.in
index edf86ef5..07c8d369 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -455,6 +455,7 @@ EXTRA_DIST = NetworkManager.conf.xml.in $(am__append_3) \
 	nm-settings-keyfile.xsl nm-settings-ifcfg-rh.xml \
 	nm-settings-ifcfg-rh.xsl $(addsuffix .xml,$(basename \
 	$(docbook_generated_man_pages))) \
+	$(docbook_generated_man_pages) \
 	$(docbook_autogenerated_man_pages)
 XSLTPROC = xsltproc
 XSLTPROC_FLAGS = --xinclude --nonet
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
new file mode 100644
index 00000000..42768d74
--- /dev/null
+++ b/man/NetworkManager.8
@@ -0,0 +1,308 @@
+'\" t
+.\"     Title: NetworkManager
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 
+.\"      Date: 03/29/2016
+.\"    Manual: Network management daemons
+.\"    Source: NetworkManager 1.2
+.\"  Language: English
+.\"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2" "Network management daemons"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+NetworkManager \- network management daemon
+.SH "SYNOPSIS"
+.HP \w'\fBNetworkManager\ \fR\fB[OPTIONS...]\fR\ 'u
+\fBNetworkManager \fR\fB[OPTIONS...]\fR
+.SH "DESCRIPTION"
+.PP
+The NetworkManager daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network connection and other network interfaces, like Ethernet, WiFi, and Mobile Broadband devices\&. NetworkManager will connect any network device when a connection for that device becomes available, unless that behavior is disabled\&. Information about networking is exported via a D\-Bus interface to any interested application, providing a rich API with which to inspect and control network settings and operation\&.
+.SH "DISPATCHER SCRIPTS"
+.PP
+NetworkManager will execute scripts in the /etc/NetworkManager/dispatcher\&.d directory or subdirectories in alphabetical order in response to network events\&. Each script should be a regular executable file owned by root\&. Furthermore, it must not be writable by group or other, and not setuid\&.
+.PP
+Each script receives two arguments, the first being the interface name of the device an operation just happened on, and second the action\&. For device actions, the interface is the name of the kernel interface suitable for IP configuration\&. Thus it is either VPN_IP_IFACE, DEVICE_IP_IFACE, or DEVICE_IFACE, as applicable\&. For the
+\fIhostname\fR
+action it is always "none"\&.
+.PP
+The actions are:
+.PP
+\fIpre\-up\fR
+.RS 4
+The interface is connected to the network but is not yet fully activated\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-up\&.d directory, and NetworkManager will wait for script execution to complete before indicating to applications that the interface is fully activated\&.
+.RE
+.PP
+\fIup\fR
+.RS 4
+The interface has been activated\&.
+.RE
+.PP
+\fIpre\-down\fR
+.RS 4
+The interface will be deactivated but has not yet been disconnected from the network\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-down\&.d directory, and NetworkManager will wait for script execution to complete before disconnecting the interface from its network\&. Note that this event is not emitted for forced disconnections, like when carrier is lost or a wireless signal fades\&. It is only emitted when there is an opportunity to cleanly handle a network disconnection event\&.
+.RE
+.PP
+\fIdown\fR
+.RS 4
+The interface has been deactivated\&.
+.RE
+.PP
+\fIvpn\-pre\-up\fR
+.RS 4
+The VPN is connected to the network but is not yet fully activated\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-up\&.d directory, and NetworkManager will wait for script execution to complete before indicating to applications that the VPN is fully activated\&.
+.RE
+.PP
+\fIvpn\-up\fR
+.RS 4
+A VPN connection has been activated\&.
+.RE
+.PP
+\fIvpn\-pre\-down\fR
+.RS 4
+The VPN will be deactivated but has not yet been disconnected from the network\&. Scripts acting on this event must be placed or symlinked into the /etc/NetworkManager/dispatcher\&.d/pre\-down\&.d directory, and NetworkManager will wait for script execution to complete before disconnecting the VPN from its network\&. Note that this event is not emitted for forced disconnections, like when the VPN terminates unexpectedly or general connectivity is lost\&. It is only emitted when there is an opportunity to cleanly handle a VPN disconnection event\&.
+.RE
+.PP
+\fIvpn\-down\fR
+.RS 4
+A VPN connection has been deactivated\&.
+.RE
+.PP
+\fIhostname\fR
+.RS 4
+The system hostname has been updated\&. Use gethostname(2) to retrieve it\&. The interface name (first argument) is empty and no environment variable is set for this action\&.
+.RE
+.PP
+\fIdhcp4\-change\fR
+.RS 4
+The DHCPv4 lease has changed (renewed, rebound, etc)\&.
+.RE
+.PP
+\fIdhcp6\-change\fR
+.RS 4
+The DHCPv6 lease has changed (renewed, rebound, etc)\&.
+.RE
+.PP
+The environment contains more information about the interface and the connection\&. The following variables are available for the use in the dispatcher scripts:
+.PP
+\fICONNECTION_UUID\fR
+.RS 4
+The UUID of the connection profile\&.
+.RE
+.PP
+\fICONNECTION_ID\fR
+.RS 4
+The name (ID) of the connection profile\&.
+.RE
+.PP
+\fICONNECTION_DBUS_PATH\fR
+.RS 4
+The NetworkManager D\-Bus path of the connection\&.
+.RE
+.PP
+\fICONNECTION_FILENAME\fR
+.RS 4
+The backing file name of the connection profile (if any)\&.
+.RE
+.PP
+\fICONNECTION_EXTERNAL\fR
+.RS 4
+If "1", this indicates that the connection describes a network configuration created outside of NetworkManager\&.
+.RE
+.PP
+\fIDEVICE_IFACE\fR
+.RS 4
+The interface name of the control interface of the device\&. Depending on the device type, this differs from
+\fIDEVICE_IP_IFACE\fR\&. For example for ADSL devices, this could be \*(Aqatm0\*(Aq or for WWAN devices it might be \*(AqttyUSB0\*(Aq\&.
+.RE
+.PP
+\fIDEVICE_IP_IFACE\fR
+.RS 4
+The IP interface name of the device\&. This is the network interface on which IP addresses and routes will be configured\&.
+.RE
+.PP
+\fIIP4_ADDRESS_N\fR
+.RS 4
+The IPv4 address in the format "address/prefix gateway", where N is a number from 0 to (# IPv4 addresses \- 1)\&. gateway item in this variable is deprecated, use IP4_GATEWAY instead\&.
+.RE
+.PP
+\fIIP4_NUM_ADDRESSES\fR
+.RS 4
+The variable contains the number of IPv4 addresses the script may expect\&.
+.RE
+.PP
+\fIIP4_GATEWAY\fR
+.RS 4
+The gateway IPv4 address in traditional numbers\-and\-dots notation\&.
+.RE
+.PP
+\fIIP4_ROUTE_N\fR
+.RS 4
+The IPv4 route in the format "address/prefix next\-hop metric", where N is a number from 0 to (# IPv4 routes \- 1)\&.
+.RE
+.PP
+\fIIP4_NUM_ROUTES\fR
+.RS 4
+The variable contains the number of IPv4 routes the script may expect\&.
+.RE
+.PP
+\fIIP4_NAMESERVERS\fR
+.RS 4
+The variable contains a space\-separated list of the DNS servers\&.
+.RE
+.PP
+\fIIP4_DOMAINS\fR
+.RS 4
+The variable contains a space\-separated list of the search domains\&.
+.RE
+.PP
+\fIDHCP4_\fR
+.RS 4
+If the connection used DHCP for address configuration, the received DHCP configuration is passed in the environment using standard DHCP option names, prefixed with "DHCP4_", like "DHCP4_HOST_NAME=foobar"\&.
+.RE
+.PP
+\fIIP6_ and DHCP6_\fR
+.RS 4
+The same variables as for IPv4 are available for IPv6, but the prefixes are IP6_ and DHCP6_ instead\&.
+.RE
+.PP
+In case of VPN, VPN_IP_IFACE is set, and IP4_*, IP6_* variables with VPN prefix are exported too, like VPN_IP4_ADDRESS_0, VPN_IP4_NUM_ADDRESSES\&.
+.PP
+Dispatcher scripts are run one at a time, but asynchronously from the main NetworkManager process, and will be killed if they run for too long\&. If your script might take arbitrarily long to complete, you should spawn a child process and have the parent return immediately\&. Scripts that are symbolic links pointing inside the /etc/NetworkManager/dispatcher\&.d/no\-wait\&.d/ directory are run immediately, without waiting for the termination of previous scripts, and in parallel\&. Also beware that once a script is queued, it will always be run, even if a later event renders it obsolete\&. (Eg, if an interface goes up, and then back down again quickly, it is possible that one or more "up" scripts will be run after the interface has gone down\&.)
+.SH "OPTIONS"
+.PP
+The following options are understood:
+.PP
+\fB\-\-version\fR | \fB\-V\fR
+.RS 4
+Print the NetworkManager software version and exit\&.
+.RE
+.PP
+\fB\-\-help\fR | \fB\-h\fR
+.RS 4
+Print NetworkManager\*(Aqs available options and exit\&.
+.RE
+.PP
+\fB\-\-no\-daemon\fR | \fB\-n\fR
+.RS 4
+Do not daemonize\&.
+.RE
+.PP
+\fB\-\-debug\fR | \fB\-d\fR
+.RS 4
+Do not daemonize, and direct log output to the controlling terminal in addition to syslog\&.
+.RE
+.PP
+\fB\-\-pid\-file\fR | \fB\-p\fR
+.RS 4
+Specify location of a PID file\&. The PID file is used for storing PID of the running process and prevents running multiple instances\&.
+.RE
+.PP
+\fB\-\-state\-file\fR
+.RS 4
+Specify file for storing state of the NetworkManager persistently\&. If not specified, the default value of /var/lib/NetworkManager/NetworkManager\&.state is used\&.
+.RE
+.PP
+\fB\-\-config\fR
+.RS 4
+Specify configuration file to set up various settings for NetworkManager\&. If not specified, the default value of /etc/NetworkManager/NetworkManager\&.conf is used with a fallback to the older \*(Aqnm\-system\-settings\&.conf\*(Aq if located in the same directory\&. See
+\fBNetworkManager.conf\fR(5)
+for more information on configuration file\&.
+.RE
+.PP
+\fB\-\-plugins\fR
+.RS 4
+List plugins used to manage system\-wide connection settings\&. This list has preference over plugins specified in the configuration file\&. Currently supported plugins are: keyfile,
+\fBifcfg\-rh\fR,
+\fBifcfg\-suse\fR,
+\fBifupdown\fR\&.
+.RE
+.PP
+\fB\-\-log\-level\fR
+.RS 4
+Sets how much information NetworkManager sends to the log destination (usually syslog\*(Aqs "daemon" facility)\&. By default, only informational, warning, and error messages are logged\&. See the section on
+logging
+in
+\fBNetworkManager.conf\fR(5)
+for more information\&.
+.RE
+.PP
+\fB\-\-log\-domains\fR
+.RS 4
+A comma\-separated list specifying which operations are logged to the log destination (usually syslog)\&. By default, most domains are logging\-enabled\&. See the section on
+logging
+in
+\fBNetworkManager.conf\fR(5)
+for more information\&.
+.RE
+.PP
+\fB\-\-print\-config\fR
+.RS 4
+Print the NetworkManager configuration to stdout and exit\&.
+.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 "SIGNALS"
+.PP
+NetworkManager process handles the following signals:
+.PP
+\fISIGHUP\fR
+.RS 4
+The signal causes a reload of NetworkManager\*(Aqs configuration\&. Note that not all configuration parameters can be changed at runtime and therefore some changes may be applied only after the next restart of the daemon\&. The signal also forces a rewrite of DNS configuration\&.
+.RE
+.PP
+\fISIGUSR1\fR
+.RS 4
+The signal forces a rewrite of DNS configuration\&.
+.RE
+.PP
+\fISIGUSR2\fR
+.RS 4
+The signal has no effect at the moment\&.
+.RE
+.SH "DEBUGGING"
+.PP
+The following environment variables are supported to help debugging\&. When used in conjunction with the
+\fB\-\-no\-daemon\fR
+option (thus echoing PPP and DHCP helper output to stdout) these can quickly help pinpoint the source of connection issues\&. Also see the
+\fB\-\-log\-level\fR
+and
+\fB\-\-log\-domains\fR
+to enable debug logging inside NetworkManager itself\&.
+.PP
+\fBNM_PPP_DEBUG\fR: When set to anything, causes NetworkManager to turn on PPP debugging in pppd, which logs all PPP and PPTP frames and client/server exchanges\&.
+.SH "SEE ALSO"
+.PP
+\fBNetworkManager.conf\fR(5),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(5),
+\fBnm-online\fR(1),
+\fBnm-settings\fR(5),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)\fBudev\fR(7)
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
new file mode 100644
index 00000000..d0f9acbb
--- /dev/null
+++ b/man/NetworkManager.conf.5
@@ -0,0 +1,905 @@
+'\" t
+.\"     Title: NetworkManager.conf
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 
+.\"      Date: 03/29/2016
+.\"    Manual: Configuration
+.\"    Source: NetworkManager 1.2
+.\"  Language: English
+.\"
+.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2" "Configuration"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+NetworkManager.conf \- NetworkManager configuration file
+.SH "SYNOPSIS"
+.PP
+/etc/NetworkManager/NetworkManager\&.conf,
+/etc/NetworkManager/conf\&.d/\fIname\fR\&.conf,
+/usr/lib/NetworkManager/conf\&.d/\fIname\fR\&.conf,
+/var/lib/NetworkManager/NetworkManager\-intern\&.conf
+.SH "DESCRIPTION"
+.PP
+NetworkManager\&.conf
+is the configuration file for NetworkManager\&. It is used to set up various aspects of NetworkManager\*(Aqs behavior\&. The location of the main file and configuration directories may be changed through use of the
+\fB\-\-config\fR,
+\fB\-\-config\-dir\fR,
+\fB\-\-system\-config\-dir\fR, and
+\fB\-\-intern\-config\fR
+argument for NetworkManager, respectively\&.
+.PP
+If a default
+NetworkManager\&.conf
+is provided by your distribution\*(Aqs packages, you should not modify it, since your changes may get overwritten by package updates\&. Instead, you can add additional
+\&.conf
+files to the
+/etc/NetworkManager/conf\&.d
+directory\&. These will be read in order, with later files overriding earlier ones\&. Packages might install further configuration snippets to
+/usr/lib/NetworkManager/conf\&.d\&. This directory is parsed first, even before
+NetworkManager\&.conf\&. The loading of a file
+/usr/lib/NetworkManager/conf\&.d/\fIname\fR\&.conf
+can be prevented by adding a file
+/etc/NetworkManager/conf\&.d/\fIname\fR\&.conf\&. In this case, the file from the etc configuration shadows the file from the system configuration directory\&.
+.PP
+NetworkManager can overwrite certain user configuration options via D\-Bus or other internal operations\&. In this case it writes those changes to
+/var/lib/NetworkManager/NetworkManager\-intern\&.conf\&. This file is not intended to be modified by the user, but it is read last and can shadow user configuration from
+NetworkManager\&.conf\&.
+.SH "FILE FORMAT"
+.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\&. See
+the section called \(lqDevice List Format\(rq
+below\&.
+.PP
+Minimal system settings configuration file looks like this:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+[main]
+plugins=keyfile
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+As an extension to the normal keyfile format, you can also append a value to a previously\-set list\-valued key by doing:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+plugins+=another\-plugin
+plugins\-=remove\-me
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SH "MAIN SECTION"
+.PP
+\fIplugins\fR
+.RS 4
+Lists system settings plugin names separated by \*(Aq,\*(Aq\&. These plugins are used to read and write system\-wide connections\&. When multiple plugins are specified, the connections are read from all listed plugins\&. When writing connections, the plugins will be asked to save the connection in the order listed here; if the first plugin cannot write out that connection type (or can\*(Aqt write out any connections) the next plugin is tried, etc\&. If none of the plugins can save the connection, an error is returned to the user\&.
+.sp
+If NetworkManager defines a distro\-specific network\-configuration plugin for your system, then that will normally be listed here\&. (See below for the available plugins\&.) Note that the
+keyfile
+plugin is always appended to the end of this list (if it doesn\*(Aqt already appear earlier in the list), so if there is no distro\-specific plugin for your system then you can leave this key unset and NetworkManager will fall back to using
+keyfile\&.
+.RE
+.PP
+\fImonitor\-connection\-files\fR
+.RS 4
+Whether the configured settings plugin(s) should set up file monitors and immediately pick up changes made to connection files while NetworkManager is running\&. This is disabled by default; NetworkManager will only read the connection files at startup, and when explicitly requested via the ReloadConnections D\-Bus call\&. If this key is set to \*(Aqtrue\*(Aq, then NetworkManager will reload connection files any time they changed\&.
+.RE
+.PP
+\fIauth\-polkit\fR
+.RS 4
+Whether the system uses PolicyKit for authorization\&. If
+false, all requests will be allowed\&. If
+true, non\-root requests are authorized using PolicyKit\&. The default value is
+true\&.
+.RE
+.PP
+\fIdhcp\fR
+.RS 4
+This key sets up what DHCP client NetworkManager will use\&. Allowed values are
+dhclient,
+dhcpcd, and
+internal\&. The
+dhclient
+and
+dhcpcd
+options require the indicated clients to be installed\&. The
+internal
+option uses a built\-in DHCP client which is not currently as featureful as the external clients\&.
+.sp
+If this key is missing, available DHCP clients are looked for in this order:
+dhclient,
+dhcpcd,
+internal\&.
+.RE
+.PP
+\fIno\-auto\-default\fR
+.RS 4
+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
+When the default wired connection is deleted or saved to a new persistent connection by a plugin, the device is added to a list in the file
+/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=*
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.RE
+.PP
+\fIignore\-carrier\fR
+.RS 4
+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
+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
+.RS 4
+When set to \*(Aqtrue\*(Aq, NetworkManager quits after performing initial network configuration but spawns small helpers to preserve DHCP leases and IPv6 addresses\&. This is useful in environments where network setup is more or less static or it is desirable to save process time but still handle some dynamic configurations\&. When this option is
+true, network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE interfaces cannot be preserved due to their use of external services, and these devices will be deconfigured when NetworkManager quits even though other interface\*(Aqs configuration may be preserved\&. Also, to preserve DHCP addresses the \*(Aqdhcp\*(Aq option must be set to \*(Aqinternal\*(Aq\&. The default value of the \*(Aqconfigure\-and\-quit\*(Aq option is \*(Aqfalse\*(Aq, meaning that NetworkManager will continue running after initial network configuration and continue responding to system and hardware events, D\-Bus requests, and user commands\&.
+.RE
+.PP
+\fIdns\fR
+.RS 4
+Set the DNS (resolv\&.conf) processing mode\&.
+.sp
+default: The default if the key is not specified\&. NetworkManager will update
+resolv\&.conf
+to reflect the nameservers provided by currently active connections\&.
+.sp
+dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using a "split DNS" configuration if you are connected to a VPN, and then update
+resolv\&.conf
+to point to the local nameserver\&.
+.sp
+unbound: NetworkManager will talk to unbound and dnssec\-triggerd, providing a "split DNS" configuration with DNSSEC support\&. The /etc/resolv\&.conf will be managed by dnssec\-trigger daemon\&.
+.sp
+none: NetworkManager will not modify resolv\&.conf\&.
+.RE
+.PP
+\fIrc\-manager\fR
+.RS 4
+Set the
+resolv\&.conf
+management mode\&. The default value depends on how NetworkManager was built\&. Regardless of this setting, NetworkManager will always write resolv\&.conf to its runtime state directory\&.
+.sp
+none: NetworkManager will symlink
+/etc/resolv\&.conf
+to its private resolv\&.conf file in the runtime state directory\&.
+.sp
+file: NetworkManager will write
+/etc/resolv\&.conf
+as file\&.
+.sp
+resolvconf: NetworkManager will run resolvconf to update the DNS configuration\&.
+.sp
+netconfig: NetworkManager will run netconfig to update the DNS configuration\&.
+.RE
+.PP
+\fIdebug\fR
+.RS 4
+Comma separated list of options to aid debugging\&. This value will be combined with the environment variable
+NM_DEBUG\&. Currently the following values are supported:
+.sp
+RLIMIT_CORE: set ulimit \-c unlimited to write out core dumps\&. Beware, that a core dump can contain sensitive information such as passwords or configuration settings\&.
+.sp
+fatal\-warnings: set g_log_set_always_fatal() to core dump on warning messages from glib\&. This is equivalent to the \-\-g\-fatal\-warnings command line option\&.
+.RE
+.SH "KEYFILE SECTION"
+.PP
+This section contains keyfile\-plugin\-specific options, and is normally only used when you are not using any other distro\-specific plugin\&.
+.PP
+.PP
+\fIhostname\fR
+.RS 4
+This key is deprecated and has no effect since the hostname is now stored in /etc/hostname or other system configuration files according to build options\&.
+.RE
+.PP
+\fIpath\fR
+.RS 4
+The location where keyfiles are read and stored\&. This defaults to "/usr/local/etc/NetworkManager/conf\&.d"\&.
+.RE
+.PP
+\fIunmanaged\-devices\fR
+.RS 4
+Set devices that should be ignored by NetworkManager\&.
+.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
+unmanaged\-devices=interface\-name:em4
+unmanaged\-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface\-name:eth2
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.RE
+.SH "IFUPDOWN SECTION"
+.PP
+This section contains ifupdown\-specific options and thus only has effect when using the
+ifupdown
+plugin\&.
+.PP
+.PP
+\fImanaged\fR
+.RS 4
+If set to
+true, then interfaces listed in
+/etc/network/interfaces
+are managed by NetworkManager\&. If set to
+false, then any interface listed in
+/etc/network/interfaces
+will be ignored by NetworkManager\&. Remember that NetworkManager controls the default route, so because the interface is ignored, NetworkManager may assign the default route to some other interface\&.
+.sp
+The default value is
+false\&.
+.RE
+.SH "LOGGING SECTION"
+.PP
+This section controls NetworkManager\*(Aqs logging\&. Any settings here are overridden by the
+\fB\-\-log\-level\fR
+and
+\fB\-\-log\-domains\fR
+command\-line options\&.
+.PP
+.PP
+\fIlevel\fR
+.RS 4
+The default logging verbosity level\&. One of
+OFF,
+ERR,
+WARN,
+INFO,
+DEBUG,
+TRACE\&. The ERR level logs only critical errors\&. WARN logs warnings that may reflect operation\&. INFO logs various informational messages that are useful for tracking state and operations\&. DEBUG enables verbose logging for debugging purposes\&. TRACE enables even more verbose logging then DEBUG level\&. Subsequent levels also log all messages from earlier levels; thus setting the log level to INFO also logs error and warning messages\&.
+.RE
+.PP
+\fIdomains\fR
+.RS 4
+The following log domains are available: PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, TEAM, CONCHECK, DCB, DISPATCH, AUDIT\&.
+.sp
+In addition, these special domains can be used: NONE, ALL, DEFAULT, DHCP, IP\&.
+.sp
+You can specify per\-domain log level overrides by adding a colon and a log level to any domain\&. E\&.g\&., "WIFI:DEBUG,WIFI_SCAN:OFF"\&.
+.RE
+.PP
+.RS 4
+.PP
+Domain descriptions:
+.RS 4
+PLATFORM    : OS (platform) operations
+.RE
+.RS 4
+RFKILL      : RFKill subsystem operations
+.RE
+.RS 4
+ETHER       : Ethernet device operations
+.RE
+.RS 4
+WIFI        : Wi\-Fi device operations
+.RE
+.RS 4
+BT          : Bluetooth operations
+.RE
+.RS 4
+MB          : Mobile broadband operations
+.RE
+.RS 4
+DHCP4       : DHCP for IPv4
+.RE
+.RS 4
+DHCP6       : DHCP for IPv6
+.RE
+.RS 4
+PPP         : Point\-to\-point protocol operations
+.RE
+.RS 4
+WIFI_SCAN   : Wi\-Fi scanning operations
+.RE
+.RS 4
+IP4         : IPv4\-related operations
+.RE
+.RS 4
+IP6         : IPv6\-related operations
+.RE
+.RS 4
+AUTOIP4     : AutoIP operations
+.RE
+.RS 4
+DNS         : Domain Name System related operations
+.RE
+.RS 4
+VPN         : Virtual Private Network connections and operations
+.RE
+.RS 4
+SHARING     : Connection sharing
+.RE
+.RS 4
+SUPPLICANT  : WPA supplicant related operations
+.RE
+.RS 4
+AGENTS      : Secret agents operations and communication
+.RE
+.RS 4
+SETTINGS    : Settings/config service operations
+.RE
+.RS 4
+SUSPEND     : Suspend/resume
+.RE
+.RS 4
+CORE        : Core daemon and policy operations
+.RE
+.RS 4
+DEVICE      : Activation and general interface operations
+.RE
+.RS 4
+OLPC        : OLPC Mesh device operations
+.RE
+.RS 4
+WIMAX       : WiMAX device operations
+.RE
+.RS 4
+INFINIBAND  : InfiniBand device operations
+.RE
+.RS 4
+FIREWALL    : FirewallD related operations
+.RE
+.RS 4
+ADSL        : ADSL device operations
+.RE
+.RS 4
+BOND        : Bonding operations
+.RE
+.RS 4
+VLAN        : VLAN operations
+.RE
+.RS 4
+BRIDGE      : Bridging operations
+.RE
+.RS 4
+DBUS_PROPS  : D\-Bus property changes
+.RE
+.RS 4
+TEAM        : Teaming operations
+.RE
+.RS 4
+CONCHECK    : Connectivity check
+.RE
+.RS 4
+DCB         : Data Center Bridging (DCB) operations
+.RE
+.RS 4
+DISPATCH    : Dispatcher scripts
+.RE
+.RS 4
+AUDIT       : Audit records
+.RE
+.RS 4
+ 
+.RE
+.RS 4
+NONE        : when given by itself logging is disabled
+.RE
+.RS 4
+ALL         : all log domains
+.RE
+.RS 4
+DEFAULT     : default log domains
+.RE
+.RS 4
+DHCP        : shortcut for "DHCP4,DHCP6"
+.RE
+.RS 4
+IP          : shortcut for "IP4,IP6"
+.RE
+.RS 4
+ 
+.RE
+.RS 4
+HW          : deprecated alias for "PLATFORM"
+.RE
+.RE
+.PP
+\fIbackend\fR
+.RS 4
+The logging backend\&. Supported values are "debug", "syslog", "journal"\&. "debug" uses syslog and logs to standard error\&. If NetworkManager is started in debug mode (\-\-debug) this option is ignored and "debug" is always used\&. Otherwise, the default is "journal"\&.
+.RE
+.PP
+\fIaudit\fR
+.RS 4
+Whether the audit records are delivered to auditd, the audit daemon\&. If
+false, audit records will be sent only to the NetworkManager logging system\&. If set to
+true, they will be also sent to auditd\&. The default value is
+true\&.
+.RE
+.SH "CONNECTION SECTION"
+.PP
+Specify default values for connections\&.
+.PP
+Example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+[connection]
+ipv6\&.ip6\-privacy=0
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.SS "Supported Properties"
+.PP
+Not all properties can be overwritten, only the following properties are supported to have their default values configured (see
+\fBnm-settings\fR(5)
+for details)\&. A default value is only consulted if the corresponding per\-connection value explicitly allows for that\&.
+.PP
+\fIconnection\&.autoconnect\-slaves\fR
+.RS 4
+.RE
+.PP
+\fIconnection\&.lldp\fR
+.RS 4
+.RE
+.PP
+\fIethernet\&.wake\-on\-lan\fR
+.RS 4
+.RE
+.PP
+\fIipv4\&.dad\-timeout\fR
+.RS 4
+.RE
+.PP
+\fIipv4\&.dhcp\-timeout\fR
+.RS 4
+If left unspecified, the default value for the interface type is used\&.
+.RE
+.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
+\fIvpn\&.timeout\fR
+.RS 4
+If left unspecified, default value of 60 seconds is used\&.
+.RE
+.PP
+\fIwifi\&.mac\-address\-randomization\fR
+.RS 4
+If left unspecified, MAC address randomization is disabled\&.
+.RE
+.PP
+\fIwifi\&.powersave\fR
+.RS 4
+If left unspecified, the default value "ignore" will be used\&.
+.RE
+.SS "Sections"
+.PP
+You can configure multiple
+connection
+sections, by having different sections with a name that all start with "connection"\&. Example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+[connection]
+ipv6\&.ip6\-privacy=0
+connection\&.autoconnect\-slaves=1
+vpn\&.timeout=120
+
+[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 sections 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
+The following properties further control how a connection section applies\&.
+.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
+.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\&.
+.PP
+.PP
+\fIuri\fR
+.RS 4
+The URI of a web page to periodically request when connectivity is being checked\&. This page should return the header "X\-NetworkManager\-Status" with a value of "online"\&. Alternatively, it\*(Aqs body content should be set to "NetworkManager is online"\&. The body content check can be controlled by the
+response
+option\&. If this option is blank or missing, connectivity checking is disabled\&.
+.RE
+.PP
+\fIinterval\fR
+.RS 4
+Specified in seconds; controls how often connectivity is checked when a network connection exists\&. If set to 0 connectivity checking is disabled\&. If missing, the default is 300 seconds\&.
+.RE
+.PP
+\fIresponse\fR
+.RS 4
+If set controls what body content NetworkManager checks for when requesting the URI for connectivity checking\&. If missing, defaults to "NetworkManager is online"
+.RE
+.SH "GLOBAL\-DNS SECTION"
+.PP
+This section specifies global DNS settings that override connection\-specific configuration\&.
+.PP
+.PP
+\fIsearches\fR
+.RS 4
+A list of search domains to be used during hostname lookup\&.
+.RE
+.PP
+\fIoptions\fR
+.RS 4
+A list of of options to be passed to the hostname resolver\&.
+.RE
+.SH "GLOBAL\-DNS\-DOMAIN SECTIONS"
+.PP
+Sections with a name starting with the "global\-dns\-domain\-" prefix allow to define global DNS configuration for specific domains\&. The part of section name after "global\-dns\-domain\-" specifies the domain name a section applies to\&. More specific domains have the precedence over less specific ones and the default domain is represented by the wildcard "*"\&. A default domain section is mandatory\&.
+.PP
+.PP
+\fIservers\fR
+.RS 4
+A list of addresses of DNS servers to be used for the given domain\&.
+.RE
+.PP
+\fIoptions\fR
+.RS 4
+A list of domain\-specific DNS options\&. Not used at the moment\&.
+.RE
+.SH "\&.CONFIG SECTIONS"
+.PP
+This is a special section that contains options which apply to the configuration file that contains the option\&.
+.PP
+.PP
+\fIenable\fR
+.RS 4
+Defaults to "true"\&. If "false", the configuration file will be skipped during loading\&. Note that the main configuration file
+NetworkManager\&.conf
+cannot be disabled\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+# always skip loading the config file
+[\&.config]
+enable=false
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+You can also match against the version of NetworkManager\&. For example the following are valid configurations:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+# only load on version 1\&.0\&.6
+[\&.config]
+enable=nm\-version:1\&.0\&.6
+
+# load on all versions 1\&.0\&.x, but not 1\&.2\&.x
+[\&.config]
+enable=nm\-version:1\&.0
+
+# only load on versions >= 1\&.1\&.6\&. This does not match
+# with version 1\&.2\&.0 or 1\&.4\&.4\&. Only the last digit is considered\&.
+[\&.config]
+enable=nm\-version\-min:1\&.1\&.6
+
+# only load on versions >= 1\&.2\&. Contrary to the previous
+# example, this also matches with 1\&.2\&.0, 1\&.2\&.10, 1\&.4\&.4, etc\&.
+[\&.config]
+enable=nm\-version\-min:1\&.2
+
+# Match against the maximum allowed version\&. The example matches
+# versions 1\&.2\&.0, 1\&.2\&.2, 1\&.2\&.4\&. Again, only the last version digit
+# is allowed to be smaller\&. So this would not match match on 1\&.1\&.10\&.
+[\&.config]
+enable=nm\-version\-max:1\&.2\&.6
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+You can also match against the value of the environment variable
+NM_CONFIG_ENABLE_TAG, like:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+# always skip loading the file when running NetworkManager with
+# environment variable "NM_CONFIG_ENABLE_TAG=TAG1"
+[\&.config]
+enable=env:TAG1
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+More then one match can be specified\&. The configuration will be enabled if one of the predicates matches ("or")\&. The special prefix "except:" can be used to negate the match\&. Note that if one except\-predicate matches, the entire configuration will be disabled\&. In other words, a except predicate always wins over other predicates\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+# enable the configuration either when the environment variable
+# is present or the version is at least 1\&.2\&.0\&.
+[\&.config]
+enable=env:TAG2,nm\-version\-min:1\&.2
+
+# enable the configuration for version >= 1\&.2\&.0, but disable
+# it when the environment variable is set to "TAG3"
+[\&.config]
+enable=except:env:TAG3,nm\-version\-min:1\&.2
+
+# enable the configuration on >= 1\&.3, >= 1\&.2\&.6, and >= 1\&.0\&.16\&.
+# Useful if a certain feature is only present since those releases\&.
+[\&.config]
+enable=nm\-version\-min:1\&.3,nm\-version\-min:1\&.2\&.6,nm\-version\-min:1\&.0\&.16
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.RE
+.SH "PLUGINS"
+.PP
+\fIkeyfile\fR
+.RS 4
+The
+keyfile
+plugin is the generic plugin that supports all the connection types and capabilities that NetworkManager has\&. It writes files out in an \&.ini\-style format in /etc/NetworkManager/system\-connections\&.
+.sp
+The stored connection file may contain passwords and private keys, so it will be made readable only to root, and the plugin will ignore files that are readable or writable by any user or group other than root\&.
+.sp
+This plugin is always active, and will automatically be used to store any connections that aren\*(Aqt supported by any other active plugin\&.
+.RE
+.PP
+\fIifcfg\-rh\fR
+.RS 4
+This plugin is used on the Fedora and Red Hat Enterprise Linux distributions to read and write configuration from the standard
+/etc/sysconfig/network\-scripts/ifcfg\-*
+files\&. It currently supports reading Ethernet, Wi\-Fi, InfiniBand, VLAN, Bond, Bridge, and Team connections\&. Enabling
+ifcfg\-rh
+implicitly enables
+ibft
+plugin, if it is available\&. This can be disabled by adding
+no\-ibft\&.
+.RE
+.PP
+\fIifcfg\-suse\fR
+.RS 4
+This plugin is deprecated and its selection has no effect\&. The
+keyfile
+plugin should be used instead\&.
+.RE
+.PP
+\fIifupdown\fR
+.RS 4
+This plugin is used on the Debian and Ubuntu distributions, and reads Ethernet and Wi\-Fi connections from
+/etc/network/interfaces\&.
+.sp
+This plugin is read\-only; any connections (of any type) added from within NetworkManager when you are using this plugin will be saved using the
+keyfile
+plugin instead\&.
+.RE
+.PP
+\fIibft\fR, \fIno\-ibft\fR
+.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\&. If ibft support is available, it is automatically enabled after
+ifcfg\-rh\&. This can be disabled by
+no\-ibft\&. You can also explicitly specify
+ibft
+to load the plugin without
+ifcfg\-rh
+or to change the plugin order\&.
+.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 commas or semicolons\&. The order does not matter as matches are either inclusive or negative (except:), 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 not a separator but will be trimmed between two specs (unless escaped as \*(Aq\es\*(Aq)\&.
+.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),
+\fBnmcli\fR(1),
+\fBnmcli-examples\fR(5),
+\fBnm-online\fR(1),
+\fBnm-settings\fR(5),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 3e8b1e80..597f373f 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -17,7 +17,7 @@ Copyright 2010 - 2014 Red Hat, Inc.
     5
     NetworkManager
     Configuration
-    1.0
+    1.2
   
 
   
@@ -157,8 +157,7 @@ plugins-=remove-me
         and dhcpcd options require the indicated
         clients to be installed. The internal
         option uses a built-in DHCP client which is not currently as
-        featureful as the external clients (and in particular, does
-        not yet support DHCPv6).
+        featureful as the external clients.
         If this key is missing, available DHCP clients are
         looked for in this order: dhclient,
         dhcpcd,
@@ -289,9 +288,13 @@ no-auto-default=*
         rc-manager
         Set the resolv.conf
         management mode. The default value depends on how NetworkManager
-        was built.
-        none: NetworkManager will directly
-        write changes to resolv.conf.
+        was built. Regardless of this setting, NetworkManager will
+        always write resolv.conf to its runtime state directory.
+        none: NetworkManager will symlink
+        /etc/resolv.conf to its private
+        resolv.conf file in the runtime state directory.
+        file: NetworkManager will write
+        /etc/resolv.conf as file.
         resolvconf: NetworkManager will run
         resolvconf to update the DNS configuration.
         netconfig: NetworkManager will run
@@ -483,14 +486,11 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
           backend
           The logging backend. Supported values
           are "debug", "syslog",
-          "journal" and "journal-syslog-style.
+          "journal".
           "debug" uses syslog and logs to standard error.
-          "journal-syslog-style" prints the same message to journal
-          as it would print for "syslog", containing redundant
-          fields in the text.
           If NetworkManager is started in debug mode (--debug)
           this option is ignored and "debug" is always used.
-          Otherwise, the default is "journal-syslog-style".
+          Otherwise, the default is "journal".
           
         
         
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index 75e1d938..2a847f8f 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -17,7 +17,7 @@ Copyright 2010 - 2014 Red Hat, Inc.
     5
     NetworkManager
     Configuration
-    1.0
+    1.2
   
 
   
@@ -157,8 +157,7 @@ plugins-=remove-me
         and dhcpcd options require the indicated
         clients to be installed. The internal
         option uses a built-in DHCP client which is not currently as
-        featureful as the external clients (and in particular, does
-        not yet support DHCPv6).
+        featureful as the external clients.
         If this key is missing, available DHCP clients are
         looked for in this order: dhclient,
         dhcpcd,
@@ -289,9 +288,13 @@ no-auto-default=*
         rc-manager
         Set the resolv.conf
         management mode. The default value depends on how NetworkManager
-        was built.
-        none: NetworkManager will directly
-        write changes to resolv.conf.
+        was built. Regardless of this setting, NetworkManager will
+        always write resolv.conf to its runtime state directory.
+        none: NetworkManager will symlink
+        /etc/resolv.conf to its private
+        resolv.conf file in the runtime state directory.
+        file: NetworkManager will write
+        /etc/resolv.conf as file.
         resolvconf: NetworkManager will run
         resolvconf to update the DNS configuration.
         netconfig: NetworkManager will run
@@ -483,11 +486,8 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
           backend
           The logging backend. Supported values
           are "debug", "syslog",
-          "journal" and "journal-syslog-style.
+          "journal".
           "debug" uses syslog and logs to standard error.
-          "journal-syslog-style" prints the same message to journal
-          as it would print for "syslog", containing redundant
-          fields in the text.
           If NetworkManager is started in debug mode (--debug)
           this option is ignored and "debug" is always used.
           Otherwise, the default is "@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@".
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index e674943e..39dfe484 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -19,7 +19,7 @@
     8
     NetworkManager
     Network management daemons
-    1.0
+    1.2
   
 
   
diff --git a/man/nm-online.1.in b/man/nm-online.1.in
index f56f5daf..fbec3716 100644
--- a/man/nm-online.1.in
+++ b/man/nm-online.1.in
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright (C) 2010 - 2014 Red Hat, Inc.
 .\"
-.TH NM-ONLINE "1" "25 March 2014"
+.TH NM-ONLINE "1" "2014-03-25" "NetworkManager 1.2"
 
 .SH NAME
 nm-online \- ask NetworkManager whether the network is connected
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 58daaba0..7b848128 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: 01 March 2016
+.\"      Date: 29 March 2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.91
+.\"    Source: NetworkManager 1.1.92
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.91" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.92" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -367,6 +367,8 @@ l l l l
 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{
 eap
@@ -455,6 +457,15 @@ List of strings to be matched against the altSubjectName\&.\fB
 Example: \fRIEEE_8021X_ALTSUBJECT_MATCHES="s1\&.domain\&.cc"
 T}
 T{
+domain\-suffix\-match
+T}:T{
+IEEE_8021X_DOMAIN_SUFFIX_MATCH\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+Suffix to match domain of server certificate against\&.
+T}
+T{
 client\-cert
 T}:T{
 IEEE_8021X_CLIENT_CERT\fI(+)\fR
@@ -547,6 +558,15 @@ T}:T{
 \ \&
 T}
 T{
+phase2\-domain\-suffix\-match
+T}:T{
+IEEE_8021X_PHASE2_DOMAIN_SUFFIX_MATCH\fI(+)\fR
+T}:T{
+\ \&
+T}:T{
+Suffix to match domain of server certificate for phase 2 against\&.
+T}
+T{
 phase2\-client\-cert
 T}:T{
 IEEE_8021X_INNER_CLIENT_CERT\fI(+)\fR
diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml
index b161f5aa..ef8e1df9 100644
--- a/man/nm-settings-ifcfg-rh.xml
+++ b/man/nm-settings-ifcfg-rh.xml
@@ -1,6 +1,6 @@
 
 
-01 March 2016nm-settings-ifcfg-rh5NetworkManagerConfiguration1.1.91nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION
+29 March 2016nm-settings-ifcfg-rh5NetworkManagerConfiguration1.1.92nm-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
@@ -181,7 +181,7 @@ Example: IEEE_8021X_CA_CERT=/home/joe/cacert.crtIEEE_8021X_SUBJECT_MATCH="Red Hat"altsubject-matchesIEEE_8021X_ALTSUBJECT_MATCHES(+)List of strings to be matched against the altSubjectName.
 
-Example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc"client-certIEEE_8021X_CLIENT_CERT(+)Client certificate for EAP.
+Example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc"domain-suffix-matchIEEE_8021X_DOMAIN_SUFFIX_MATCH(+)Suffix to match domain of server certificate against.client-certIEEE_8021X_CLIENT_CERT(+)Client certificate for EAP.
 
 Example: IEEE_8021X_CLIENT_CERT=/home/joe/mycert.crtphase1-peapverIEEE_8021X_PEAP_VERSION(+)Use to force a specific PEAP version.
 
@@ -201,7 +201,7 @@ Example: IEEE_8021X_INNER_AUTH_METHODS="MSCHAPV2 EAP-TLS""EAP-MD5", "EAP-MSCHAPV2", "EAP-GTC", "EAP-OTP" and "EAP-TLS"phase2-subject-matchIEEE_8021X_PHASE2_SUBJECT_MATCH(+)Substring to match subject of server certificate against.
 
-Example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat"phase2-altsubject-matchesIEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+)phase2-client-certIEEE_8021X_INNER_CLIENT_CERT(+)Client certificate for inner EAP method.
+Example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat"phase2-altsubject-matchesIEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+)phase2-domain-suffix-matchIEEE_8021X_PHASE2_DOMAIN_SUFFIX_MATCH(+)Suffix to match domain of server certificate for phase 2 against.phase2-client-certIEEE_8021X_INNER_CLIENT_CERT(+)Client certificate for inner EAP method.
 
 Example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crtpasswordIEEE_8021X_PASSWORD(+)UTF-8 encoded password used for EAP. It can also go to "key-" lookaside file, or it can be owned by a secret agent.password-flagsIEEE_8021X_PASSWORD_FLAGS(+)Password flags for IEEE_8021X_PASSWORD password. (see  for _FLAGS values)password-raw(none)The property is not handled by ifcfg-rh plugin.password-raw-flags(none)The property is not handled by ifcfg-rh plugin.private-keyIEEE_8021X_PRIVATE_KEY(+)Private key for EAP-TLS.
 
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index eddeec0d..ef5069ff 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: 01 March 2016
+.\"      Date: 29 March 2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.91
+.\"    Source: NetworkManager 1.1.92
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.91" "Configuration"
+.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.92" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml
index 7e210548..d8cdfe21 100644
--- a/man/nm-settings-keyfile.xml
+++ b/man/nm-settings-keyfile.xml
@@ -1,6 +1,6 @@
 
 
-01 March 2016nm-settings-keyfile5NetworkManagerConfiguration1.1.91nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION
+29 March 2016nm-settings-keyfile5NetworkManagerConfiguration1.1.92nm-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 d1e15a07..d24d2fbe 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: 01 March 2016
+.\"      Date: 29 March 2016
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.1.91
+.\"    Source: NetworkManager 1.1.92
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.91" "Configuration"
+.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.92" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -109,6 +109,8 @@ l l l l
 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{
 altsubject\-matches
@@ -156,6 +158,15 @@ T}:T{
 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\*(Aqs 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\&.
 T}
 T{
+domain\-suffix\-match
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Constraint for server domain name\&. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server\&.  If a matching dNSName is found, this constraint is met\&.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison\&.
+T}
+T{
 eap
 T}:T{
 array of string
@@ -309,6 +320,15 @@ T}:T{
 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\*(Aqs 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\&.
 T}
 T{
+phase2\-domain\-suffix\-match
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+Constraint for server domain name\&. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication\&.  If a matching dNSName is found, this constraint is met\&.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison\&.
+T}
+T{
 phase2\-private\-key
 T}:T{
 byte array
@@ -342,7 +362,7 @@ string
 T}:T{
 \ \&
 T}:T{
-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\*(Aqs subject is performed\&.
+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\*(Aqs subject is performed\&.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2\-domain\-suffix\-match\&.
 T}
 T{
 pin
@@ -396,7 +416,7 @@ string
 T}:T{
 \ \&
 T}:T{
-Substring to be matched against the subject of the certificate presented by the authentication server\&. When unset, no verification of the authentication server certificate\*(Aqs subject is performed\&.
+Substring to be matched against the subject of the certificate presented by the authentication server\&. When unset, no verification of the authentication server certificate\*(Aqs subject is performed\&.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain\-suffix\-match\&.
 T}
 T{
 system\-ca\-certs
@@ -1692,7 +1712,7 @@ string
 T}:T{
 \ \&
 T}:T{
-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\&.
+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\&. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10\&.42\&.x\&.0/24 is chosen\&.
 T}
 T{
 name
@@ -1923,7 +1943,7 @@ string
 T}:T{
 \ \&
 T}:T{
-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\&.
+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\&. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10\&.42\&.x\&.0/24 is chosen\&.
 T}
 T{
 name
diff --git a/man/nm-settings.xml b/man/nm-settings.xml
index d38b24a6..9b709621 100644
--- a/man/nm-settings.xml
+++ b/man/nm-settings.xml
@@ -1,6 +1,6 @@
 
 
-01 March 2016nm-settings5NetworkManagerConfiguration1.1.91nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION
+29 March 2016nm-settings5NetworkManagerConfiguration1.1.92nm-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
@@ -39,6 +39,7 @@
     ca-certbyte arrayContains 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.
     ca-pathstringUTF-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.
     client-certbyte arrayContains 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.
+    domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
     eaparray of string[]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.
     identitystringIdentity string for EAP authentication methods.  Often the user's user or login name.
     namestring802-1xThe 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".
@@ -56,16 +57,17 @@
     phase2-ca-certbyte arrayContains 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.
     phase2-ca-pathstringUTF-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.
     phase2-client-certbyte arrayContains 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.
+    phase2-domain-suffix-matchstringConstraint for server domain name. If set, this FQDN is used as a suffix match requirement for dNSName element(s) of the certificate presented by the authentication server during the inner "phase 2" authentication.  If a matching dNSName is found, this constraint is met.  If no dNSName values are present, this constraint is matched against SubjectName CN using same suffix match comparison.
     phase2-private-keybyte arrayContains 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.
     phase2-private-key-passwordstringThe 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.
     phase2-private-key-password-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "phase2-private-key-password" property. (see  for flag values)
-    phase2-subject-matchstringSubstring 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.
+    phase2-subject-matchstringSubstring 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.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:phase2-domain-suffix-match.
     pinstringPIN used for EAP authentication methods.
     pin-flagsNMSettingSecretFlags (uint32)Flags indicating how to handle the "pin" property. (see  for flag values)
     private-keybyte arrayContains 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. 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.
     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.
+    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.  This property provides little security, if any, and its use is deprecated in favor of NMSetting8021x:domain-suffix-match.
     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).
   
    the GType of the enum
    the GType of the enum
    		
  
 
    
 
    
 
    type
    the GType of the enum
    the GType of the enum
    		
  
 
    
 
    the GType of the enum
    the GType of the enum
    		
  
 
    
 
    
   adsl settingKey NameValue TypeDefault ValueValue Description
@@ -193,7 +195,7 @@
     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.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.
+    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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.namestringipv4The 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".never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.route-dataarray of vardictArray of IPv4 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'gateway' entry, containing the gateway IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
@@ -216,7 +218,7 @@
     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: -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". Note that this setting is distinct from the Stable Privacy addresses that can be enabled with the "addr-gen-mode" property's "stable-privacy" setting as another way of avoiding host tracking with IPv6 addresses.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.
+    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. For IPv4 method "shared", the IP subnet can be configured by adding one manual IPv4 address or otherwise 10.42.x.0/24 is chosen.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".never-defaultbooleanFALSEIf TRUE, this connection will never be the default connection for this IP type, meaning it will never be assigned the default route by NetworkManager.route-dataarray of vardictArray of IPv6 routes. Each route dictionary contains at least 'dest' and 'prefix' entries, containing the destination IP address as a string, and the prefix length as a uint32. Most routes will also have a 'next-hop' entry, containing the next hop IP address as a string. If the route has a 'metric' entry (containing a uint32), that will be used as the metric for the route (otherwise NM will pick a default value appropriate to the device). Additional attributes may also exist on some routes.
diff --git a/man/nmcli-examples.5 b/man/nmcli-examples.5
new file mode 100644
index 00000000..e25f8717
--- /dev/null
+++ b/man/nmcli-examples.5
@@ -0,0 +1,693 @@
+'\" t
+.\"     Title: nmcli-examples
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.78.1 
+.\"      Date: 19 November 2014
+.\"    Manual: Examples
+.\"    Source: NetworkManager 1.2
+.\"  Language: English
+.\"
+.TH "NMCLI\-EXAMPLES" "5" "" "NetworkManager 1\&.2" "Examples"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+nmcli-examples \- usage examples of nmcli
+.SH "SYNOPSIS"
+.HP \w'\fBnmcli\ \fR\fB[OPTIONS...]\fR\ 'u
+\fBnmcli \fR\fB[OPTIONS...]\fR
+.SH "DESCRIPTION"
+.PP
+\fInmcli\fR
+is a command\-line client for NetworkManager\&. It allows controlling NetworkManager and reporting its status\&. For more information please refer to
+\fBnmcli\fR(1)
+manual page\&.
+.PP
+The purpose of this manual page is to provide you with various examples and usage scenarios of
+\fInmcli\fR\&.
+.PP
+Note: this page has "work\-in\-progress" status\&.
+.SH "EXAMPLES"
+.PP
+\fBExample\ \&1.\ \&Listing available Wi-Fi APs\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli device wifi list
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+*  SSID               MODE    CHAN  RATE       SIGNAL  BARS  SECURITY
+   netdatacomm_local  Infra   6     54 Mbit/s  37      ▂▄__  WEP
+*  F1                 Infra   11    54 Mbit/s  98      ▂▄▆█  WPA1
+   LoremCorp          Infra   1     54 Mbit/s  62      ▂▄▆_  WPA2 802\&.1X
+   Internet           Infra   6     54 Mbit/s  29      ▂___  WPA1
+   HPB110a\&.F2672A     Ad\-Hoc  6     54 Mbit/s  22      ▂___  \-\-
+   Jozinet            Infra   1     54 Mbit/s  19      ▂___  WEP
+   VOIP               Infra   1     54 Mbit/s  20      ▂___  WEP
+   MARTINA            Infra   4     54 Mbit/s  32      ▂▄__  WPA2
+   N24PU1             Infra   7     11 Mbit/s  22      ▂___  \-\-
+   alfa               Infra   1     54 Mbit/s  67      ▂▄▆_  WPA2
+   bertnet            Infra   5     54 Mbit/s  20      ▂___  WPA1 WPA2
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows how to list available Wi\-Fi networks (APs)\&. You can also use
+\fI\-\-fields\fR
+option for displaying different columns\&.
+\fBnmcli \-f all dev wifi list\fR
+will show all of them\&.
+.PP
+\fBExample\ \&2.\ \&Showing general information and properties for a Wi-Fi interface\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli \-p \-f general,wifi\-properties device show wlan0
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+GENERAL\&.DEVICE:                         wlan0
+GENERAL\&.TYPE:                           wifi
+GENERAL\&.VENDOR:                         Intel Corporation
+GENERAL\&.PRODUCT:                        PRO/Wireless 5100 AGN [Shiloh] Network Connection
+GENERAL\&.DRIVER:                         iwlwifi
+GENERAL\&.DRIVER\-VERSION:                 3\&.8\&.13\-100\&.fc17\&.x86_64
+GENERAL\&.FIRMWARE\-VERSION:               8\&.83\&.5\&.1 build 33692
+GENERAL\&.HWADDR:                         00:1E:65:37:A1:D3
+GENERAL\&.MTU:                            1500
+GENERAL\&.STATE:                          100 (connected)
+GENERAL\&.REASON:                         0 (No reason given)
+GENERAL\&.UDI:                            /sys/devices/pci0000:00/0000:00:1c\&.1/0000:03:00\&.0/net/wlan0
+GENERAL\&.IP\-IFACE:                       wlan0
+GENERAL\&.IS\-SOFTWARE:                    no
+GENERAL\&.NM\-MANAGED:                     yes
+GENERAL\&.AUTOCONNECT:                    yes
+GENERAL\&.FIRMWARE\-MISSING:               no
+GENERAL\&.CONNECTION:                     My Alfa WiFi
+GENERAL\&.CON\-UUID:                       85194f4c\-d496\-4eec\-bae0\-d880b4cbcf26
+GENERAL\&.CON\-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/10
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+WIFI\-PROPERTIES\&.WEP:                    yes
+WIFI\-PROPERTIES\&.WPA:                    yes
+WIFI\-PROPERTIES\&.WPA2:                   yes
+WIFI\-PROPERTIES\&.TKIP:                   yes
+WIFI\-PROPERTIES\&.CCMP:                   yes
+WIFI\-PROPERTIES\&.AP:                     no
+WIFI\-PROPERTIES\&.ADHOC:                  yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows information about a Wi\-Fi device\&.
+.PP
+\fBExample\ \&3.\ \&Listing NetworkManager polkit permissions\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli general permissions
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+PERMISSION                                                VALUE
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-network     yes
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wifi        yes
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wwan        yes
+org\&.freedesktop\&.NetworkManager\&.enable\-disable\-wimax       yes
+org\&.freedesktop\&.NetworkManager\&.sleep\-wake                 no
+org\&.freedesktop\&.NetworkManager\&.network\-control            yes
+org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.protected       yes
+org\&.freedesktop\&.NetworkManager\&.wifi\&.share\&.open            yes
+org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.system     yes
+org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.own        yes
+org\&.freedesktop\&.NetworkManager\&.settings\&.modify\&.hostname   auth
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows configured polkit permissions for various NetworkManager operations\&. These permissions or actions (using polkit language) are configured by a system administrator and are not meant to be changed by users\&. The usual place for the polkit configuration is /usr/share/polkit\-1/actions/org\&.freedesktop\&.NetworkManager\&.policy\&.
+\fIpkaction\fR
+command can display description for polkit actions\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+pkaction \-\-action\-id org\&.freedesktop\&.NetworkManager\&.network\-control \-\-verbose
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+More information about polkit can be found at http://www\&.freedesktop\&.org/wiki/Software/polkit\&.
+.PP
+\fBExample\ \&4.\ \&Listing NetworkManager log level and domains\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli general logging
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+LEVEL  DOMAINS
+INFO   PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This command shows current NetworkManager logging status\&.
+.PP
+\fBExample\ \&5.\ \&Changing NetworkManager logging\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli g log level DEBUG domains CORE,ETHER,IP
+$ nmcli g log level INFO domains DEFAULT
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+The first command makes NetworkManager log in DEBUG level, and only for CORE, ETHER and IP domains\&. The second command restores the default logging state\&. Please refer to the
+\fBNetworkManager.conf\fR(5)
+manual page for available logging levels and domains\&.
+.PP
+\fBExample\ \&6.\ \&Adding a bonding master and two slave connection profiles\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con add type bond ifname mybond0 mode active\-backup
+$ nmcli con add type ethernet ifname eth1 master mybond0
+$ nmcli con add type ethernet ifname eth2 master mybond0
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding a bond master connection and two slaves\&. The first command adds a master bond connection, naming the bonding interface
+\fImybond0\fR
+and using
+\fIactive\-backup\fR
+mode\&. The next two commands add slaves connections, both enslaved to
+\fImybond0\fR\&. The first slave will be bound to
+\fIeth1\fR
+interface, the second to
+\fIeth2\fR\&.
+.PP
+\fBExample\ \&7.\ \&Adding a team master and two slave connection profiles\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf
+$ nmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1
+$ nmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding a team master connection profile and two slaves\&. It is very similar to the bonding example\&. The first command adds a master team profile, naming the team interface and the profile
+\fITeam1\fR\&. The team configuration for the master is read from
+\fIteam1\-master\-json\&.conf\fR
+file\&. Later, you can change the configuration with
+\fImodify\fR
+command (\fBnmcli con modify Team1 team\&.config team1\-master\-another\-json\&.conf\fR)\&. The last two commands add slaves profiles, both enslaved to
+\fITeam1\fR\&. The first slave will be bound to
+\fIem1\fR
+interface, the second to
+\fIem2\fR\&. The slaves don\*(Aqt specify
+\fIconfig\fR
+and thus
+\fIteamd\fR
+will use its default configuration\&. You will activate the whole setup by activating both slaves:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con up Team1\-slave1
+$ nmcli con up Team1\-slave2
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&.
+.PP
+\fBExample\ \&8.\ \&Adding a bridge and two slave profiles\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\fB
+$ nmcli con add type bridge con\-name TowerBridge ifname TowerBridge
+$ nmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge
+$ nmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge
+$ nmcli con modify TowerBridge bridge\&.stp no
+      \fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example demonstrates adding a bridge master connection and two slaves\&. The first command adds a master bridge connection, naming the bridge interface and the profile as
+\fITowerBridge\fR\&. The next two commands add slaves profiles, both will be enslaved to
+\fITowerBridge\fR\&. The first slave will be tied to
+\fIens3\fR
+interface, the second to
+\fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&.
+.PP
+\fBExample\ \&9.\ \&Adding an ethernet connection profile with manual IP configuration\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fB
+$ nmcli con add con\-name my\-con\-em1 ifname em1 type ethernet ip4 192\&.168\&.100\&.100/24 gw4 192\&.168\&.100\&.1 ip4 1\&.2\&.3\&.4 ip6 abbe::cafe
+$ nmcli con mod my\-con\-em1 ipv4\&.dns "8\&.8\&.8\&.8 8\&.8\&.4\&.4"
+$ nmcli con mod my\-con\-em1 +ipv4\&.dns 1\&.2\&.3\&.4
+$ nmcli con mod my\-con\-em1 ipv6\&.dns "2001:4860:4860::8888 2001:4860:4860::8844"
+$ nmcli \-p con show my\-con\-em1
+        \fR
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+The first command adds an Ethernet connection profile named
+\fImy\-con\-em1\fR
+that is bound to interface name
+\fIem1\fR\&. The profile is configured with static IP addresses\&. Three addresses are added, two IPv4 addresses and one IPv6\&. The first IP 192\&.168\&.100\&.100 has a prefix of 24 (netmask equivalent of 255\&.255\&.255\&.0)\&. Gateway entry will become the default route if this profile is activated on em1 interface (and there is no connection with higher priority)\&. The next two addresses do not specify a prefix, so a default prefix will be used, i\&.e\&. 32 for IPv4 and 128 for IPv6\&. The second, third and fourth commands modify DNS parameters of the new connection profile\&. The last
+\fIcon show\fR
+command displays the profile so that all parameters can be reviewed\&.
+.PP
+\fBExample\ \&10.\ \&Escaping colon characters in tabular mode\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fB
+$ nmcli \-t \-f general \-e yes \-m tab dev show eth0
+        \fR
+      
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2\&.1\&.4\-k:1\&.8\-3:00\e:22\e:68\e:15\e:29\e:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\e:00/0000\e:00\e:19\&.0/net/eth0:eth0:yes:yes:no:ethernet\-13:89cbcbc6\-dc85\-456c\-9c8b\-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This example shows escaping colon characters in tabular mode\&. It may be useful for script processing, because \*(Aq:\*(Aq is used as a field separator\&.
+.PP
+\fBExample\ \&11.\ \&nmcli usage in a NetworkManager dispatcher script to make Ethernet and Wi-Fi mutually exclusive\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+#!/bin/bash
+export LC_ALL=C
+
+enable_disable_wifi ()
+{
+    result=$(nmcli dev | grep "ethernet" | grep \-w "connected")
+    if [ \-n "$result" ]; then
+        nmcli radio wifi off
+    else
+        nmcli radio wifi on
+    fi
+}
+
+if [ "$2" = "up" ]; then
+    enable_disable_wifi
+fi
+
+if [ "$2" = "down" ]; then
+    enable_disable_wifi
+fi
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This dispatcher script makes Wi\-Fi mutually exclusive with wired networking\&. When a wired interface is connected, Wi\-Fi will be set to airplane mode (rfkilled)\&. When the wired interface is disconnected, Wi\-Fi will be turned back on\&. Name this script e\&.g\&. 70\-wifi\-wired\-exclusive\&.sh and put it into /etc/NetworkManager/dispatcher\&.d/ directory\&. See
+\fBNetworkManager\fR(8)
+manual page for more information about NetworkManager dispatcher scripts\&.
+.PP
+\fBExample sessions of interactive connection editor\fR
+.PP
+\fBExample\ \&12.\ \&Adding an ethernet connection profile in interactive editor (a)\fR
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fB
+$ nmcli connection edit type ethernet
+        \fR
+      
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+
+===| nmcli interactive connection editor |===
+
+Adding a new \*(Aq802\-3\-ethernet\*(Aq connection
+
+Type \*(Aqhelp\*(Aq or \*(Aq?\*(Aq for available commands\&.
+Type \*(Aqdescribe [\&.]\*(Aq for detailed property description\&.
+
+You may edit the following settings: connection, 802\-3\-ethernet (ethernet), 802\-1x, ipv4, ipv6, dcb
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection\&.id:                          ethernet\-4
+connection\&.uuid:                        de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4
+connection\&.interface\-name:              \-\-
+connection\&.type:                        802\-3\-ethernet
+connection\&.autoconnect:                 yes
+connection\&.autoconnect\-priority:        0
+connection\&.timestamp:                   0
+connection\&.read\-only:                   no
+connection\&.permissions:                 
+connection\&.zone:                        \-\-
+connection\&.master:                      \-\-
+connection\&.slave\-type:                  \-\-
+connection\&.secondaries:                 
+connection\&.gateway\-ping\-timeout:        0
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+802\-3\-ethernet\&.port:                    \-\-
+802\-3\-ethernet\&.speed:                   0
+802\-3\-ethernet\&.duplex:                  \-\-
+802\-3\-ethernet\&.auto\-negotiate:          yes
+802\-3\-ethernet\&.mac\-address:             \-\-
+802\-3\-ethernet\&.cloned\-mac\-address:      \-\-
+802\-3\-ethernet\&.mac\-address\-blacklist:   
+802\-3\-ethernet\&.mtu:                     auto
+802\-3\-ethernet\&.s390\-subchannels:        
+802\-3\-ethernet\&.s390\-nettype:            \-\-
+802\-3\-ethernet\&.s390\-options:            
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv4\&.method:                            auto
+ipv4\&.dns:                               
+ipv4\&.dns\-search:                        
+ipv4\&.addresses:                         
+ipv4\&.gateway:                           \-\-
+ipv4\&.routes:                            
+ipv4\&.route\-metric:                      \-1
+ipv4\&.ignore\-auto\-routes:                no
+ipv4\&.ignore\-auto\-dns:                   no
+ipv4\&.dhcp\-client\-id:                    \-\-
+ipv4\&.dhcp\-send\-hostname:                yes
+ipv4\&.dhcp\-hostname:                     \-\-
+ipv4\&.never\-default:                     no
+ipv4\&.may\-fail:                          yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv6\&.method:                            auto
+ipv6\&.dns:                               
+ipv6\&.dns\-search:                        
+ipv6\&.addresses:                         
+ipv6\&.gateway:                           \-\-
+ipv6\&.routes:                            
+ipv6\&.route\-metric:                      \-1
+ipv6\&.ignore\-auto\-routes:                no
+ipv6\&.ignore\-auto\-dns:                   no
+ipv6\&.never\-default:                     no
+ipv6\&.may\-fail:                          yes
+ipv6\&.ip6\-privacy:                       \-1 (unknown)
+ipv6\&.dhcp\-hostname:                     \-\-
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+nmcli> goto ethernet
+You may edit the following properties: port, speed, duplex, auto\-negotiate, mac\-address, cloned\-mac\-address, mac\-address\-blacklist, mtu, s390\-subchannels, s390\-nettype, s390\-options
+nmcli 802\-3\-ethernet> set mtu 1492
+nmcli 802\-3\-ethernet> b
+nmcli> goto ipv4\&.addresses
+nmcli ipv4\&.addresses> desc
+
+=== [addresses] ===
+[NM property description]
+Array of IP addresses\&.
+
+[nmcli specific description]
+Enter a list of IPv4 addresses formatted as:
+  ip[/prefix], ip[/prefix],\&.\&.\&.
+Missing prefix is regarded as prefix of 32\&.
+
+Example: 192\&.168\&.1\&.5/24, 10\&.0\&.0\&.11/24
+
+nmcli ipv4\&.addresses> set 192\&.168\&.1\&.100/24
+Do you also want to set \*(Aqipv4\&.method\*(Aq to \*(Aqmanual\*(Aq? [yes]: yes
+nmcli ipv4\&.addresses>
+nmcli ipv4\&.addresses> print
+addresses: 192\&.168\&.1\&.100/24
+nmcli ipv4\&.addresses> back
+nmcli ipv4> b
+nmcli> set ipv4\&.gateway 192\&.168\&.1\&.1
+nmcli> verify
+Verify connection: OK
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection\&.id:                          ethernet\-4
+connection\&.uuid:                        de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4
+connection\&.interface\-name:              \-\-
+connection\&.type:                        802\-3\-ethernet
+connection\&.autoconnect:                 yes
+connection\&.autoconnect\-priority:        0
+connection\&.timestamp:                   0
+connection\&.read\-only:                   no
+connection\&.permissions:                 
+connection\&.zone:                        \-\-
+connection\&.master:                      \-\-
+connection\&.slave\-type:                  \-\-
+connection\&.secondaries:                 
+connection\&.gateway\-ping\-timeout:        0
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+802\-3\-ethernet\&.port:                    \-\-
+802\-3\-ethernet\&.speed:                   0
+802\-3\-ethernet\&.duplex:                  \-\-
+802\-3\-ethernet\&.auto\-negotiate:          yes
+802\-3\-ethernet\&.mac\-address:             \-\-
+802\-3\-ethernet\&.cloned\-mac\-address:      \-\-
+802\-3\-ethernet\&.mac\-address\-blacklist:   
+802\-3\-ethernet\&.mtu:                     1492
+802\-3\-ethernet\&.s390\-subchannels:        
+802\-3\-ethernet\&.s390\-nettype:            \-\-
+802\-3\-ethernet\&.s390\-options:            
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv4\&.method:                            manual
+ipv4\&.dns:                               
+ipv4\&.dns\-search:                        
+ipv4\&.addresses:                         192\&.168\&.1\&.100/24
+ipv4\&.gateway:                           192\&.168\&.1\&.1
+ipv4\&.routes:                            
+ipv4\&.route\-metric:                      \-1
+ipv4\&.ignore\-auto\-routes:                no
+ipv4\&.ignore\-auto\-dns:                   no
+ipv4\&.dhcp\-client\-id:                    \-\-
+ipv4\&.dhcp\-send\-hostname:                yes
+ipv4\&.dhcp\-hostname:                     \-\-
+ipv4\&.never\-default:                     no
+ipv4\&.may\-fail:                          yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv6\&.method:                            auto
+ipv6\&.dns:                               
+ipv6\&.dns\-search:                        
+ipv6\&.addresses:                         
+ipv6\&.routes:                            
+ipv6\&.route\-metric:                      \-1
+ipv6\&.ignore\-auto\-routes:                no
+ipv6\&.ignore\-auto\-dns:                   no
+ipv6\&.never\-default:                     no
+ipv6\&.may\-fail:                          yes
+ipv6\&.ip6\-privacy:                       \-1 (unknown)
+ipv6\&.dhcp\-hostname:                     \-\-
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+nmcli> set ipv4\&.dns 8\&.8\&.8\&.8 8\&.8\&.4\&.4
+nmcli> print
+===============================================================================
+                              Connection details
+===============================================================================
+connection\&.id:                          ethernet\-4
+connection\&.uuid:                        de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4
+connection\&.interface\-name:              \-\-
+connection\&.type:                        802\-3\-ethernet
+connection\&.autoconnect:                 yes
+connection\&.autoconnect\-priority:        0
+connection\&.timestamp:                   0
+connection\&.read\-only:                   no
+connection\&.permissions:                 
+connection\&.zone:                        \-\-
+connection\&.master:                      \-\-
+connection\&.slave\-type:                  \-\-
+connection\&.secondaries:                 
+connection\&.gateway\-ping\-timeout:        0
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+802\-3\-ethernet\&.port:                    \-\-
+802\-3\-ethernet\&.speed:                   0
+802\-3\-ethernet\&.duplex:                  \-\-
+802\-3\-ethernet\&.auto\-negotiate:          yes
+802\-3\-ethernet\&.mac\-address:             \-\-
+802\-3\-ethernet\&.cloned\-mac\-address:      \-\-
+802\-3\-ethernet\&.mac\-address\-blacklist:   
+802\-3\-ethernet\&.mtu:                     1492
+802\-3\-ethernet\&.s390\-subchannels:        
+802\-3\-ethernet\&.s390\-nettype:            \-\-
+802\-3\-ethernet\&.s390\-options:            
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv4\&.method:                            manual
+ipv4\&.dns:                               8\&.8\&.8\&.8,8\&.8\&.4\&.4
+ipv4\&.dns\-search:                        
+ipv4\&.addresses:                         192\&.168\&.1\&.100/24
+ipv4\&.gateway:                           192\&.168\&.1\&.1
+ipv4\&.routes:                            
+ipv4\&.route\-metric:                      \-1
+ipv4\&.ignore\-auto\-routes:                no
+ipv4\&.ignore\-auto\-dns:                   no
+ipv4\&.dhcp\-client\-id:                    \-\-
+ipv4\&.dhcp\-send\-hostname:                yes
+ipv4\&.dhcp\-hostname:                     \-\-
+ipv4\&.never\-default:                     no
+ipv4\&.may\-fail:                          yes
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+ipv6\&.method:                            auto
+ipv6\&.dns:                               
+ipv6\&.dns\-search:                        
+ipv6\&.addresses:                         
+ipv6\&.gateway:                           \-\-
+ipv6\&.routes:                            
+ipv6\&.route\-metric:                      \-1
+ipv6\&.ignore\-auto\-routes:                no
+ipv6\&.ignore\-auto\-dns:                   no
+ipv6\&.never\-default:                     no
+ipv6\&.may\-fail:                          yes
+ipv6\&.ip6\-privacy:                       \-1 (unknown)
+ipv6\&.dhcp\-hostname:                     \-\-
+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
+nmcli> verify
+Verify connection: OK
+nmcli> save
+Connection \*(Aqethernet\-4\*(Aq (de89cdeb\-a3e1\-4d53\-8fa0\-c22546c775f4) successfully saved\&.
+nmcli> quit
+      
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Example session in the nmcli interactive connection editor\&. The scenario creates an Ethernet connection profile with static addressing (IPs and DNS)\&.
+.SH "SEE ALSO"
+.PP
+\fBnmcli\fR(1),
+\fBNetworkManager\fR(8),
+\fBNetworkManager.conf\fR(5),
+\fBnm-settings\fR(5),
+\fBnm-online\fR(1),
+\fBnm-applet\fR(1),
+\fBnm-connection-editor\fR(1)
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index d4ba7172..0ce7dc72 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -18,7 +18,7 @@ Copyright 2013 - 2014 Red Hat, Inc.
     5
     NetworkManager
     Examples
-    1.0
+    1.2
   
 
   
@@ -143,9 +143,9 @@ org.freedesktop.NetworkManager.settings.modify.hostname   auth
       by a system administrator and are not meant to be changed by users. The usual
       place for the polkit configuration is /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy.
       pkaction command can display description for polkit actions.
-      
-      pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
-      
+      
+pkaction --action-id org.freedesktop.NetworkManager.network-control --verbose
+      
       More information about polkit can be found at http://www.freedesktop.org/wiki/Software/polkit.
     
 
@@ -176,11 +176,11 @@ $ nmcli g log level INFO domains DEFAULT
     
 
     Adding a bonding master and two slave connection profiles
-      
+      
 $ nmcli con add type bond ifname mybond0 mode active-backup
 $ nmcli con add type ethernet ifname eth1 master mybond0
 $ nmcli con add type ethernet ifname eth2 master mybond0
-      
+      
     
     
       This example demonstrates adding a bond master connection and two slaves. The
@@ -192,11 +192,11 @@ $ nmcli con add type ethernet ifname eth2 master mybond0
     
 
     Adding a team master and two slave connection profiles
-      
+      
 $ nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf
 $ nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1
 $ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
-      
+      
     
     
       This example demonstrates adding a team master connection profile and two slaves. It is
@@ -210,22 +210,22 @@ $ nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1
       em2. The slaves don't specify config and thus
       teamd will use its default configuration. You will activate the whole setup
       by activating both slaves:
-      
+      
 $ nmcli con up Team1-slave1
 $ nmcli con up Team1-slave2
-      
+      
       By default, the created profiles are marked for auto-activation. But if another
       connection has been activated on the device, the new profile won't activate
       automatically and you need to activate it manually.
     
 
     Adding a bridge and two slave profiles
-      
+      
 $ nmcli con add type bridge con-name TowerBridge ifname TowerBridge
 $ nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge
 $ nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge
 $ nmcli con modify TowerBridge bridge.stp no
-      
+      
     
     
       This example demonstrates adding a bridge master connection and two slaves. The
@@ -239,7 +239,7 @@ $ nmcli con modify TowerBridge bridge.stp no
     
 
     Adding an ethernet connection profile with manual IP configuration
-      
+      
         
 $ nmcli con add con-name my-con-em1 ifname em1 type ethernet ip4 192.168.100.100/24 gw4 192.168.100.1 ip4 1.2.3.4 ip6 abbe::cafe
 $ nmcli con mod my-con-em1 ipv4.dns "8.8.8.8 8.8.4.4"
@@ -247,7 +247,7 @@ $ nmcli con mod my-con-em1 +ipv4.dns 1.2.3.4
 $ nmcli con mod my-con-em1 ipv6.dns "2001:4860:4860::8888 2001:4860:4860::8844"
 $ nmcli -p con show my-con-em1
         
-      
+      
     
     
       The first command adds an Ethernet connection profile named my-con-em1
@@ -263,11 +263,11 @@ $ nmcli -p con show my-con-em1
     
 
     Escaping colon characters in tabular mode
-      
+      
         
 $ nmcli -t -f general -e yes -m tab dev show eth0
         
-      
+      
       
 GENERAL:eth0:ethernet:Intel Corporation:82567LM Gigabit Network Connection:e1000e:2.1.4-k:1.8-3:00\:22\:68\:15\:29\:21:1500:100 (connected):0 (No reason given):/sys/devices/pci0000\:00/0000\:00\:19.0/net/eth0:eth0:yes:yes:no:ethernet-13:89cbcbc6-dc85-456c-9c8b-bd828fee3917:/org/freedesktop/NetworkManager/ActiveConnection/9
       
@@ -316,11 +316,11 @@ fi
     Example sessions of interactive connection editor
 
     Adding an ethernet connection profile in interactive editor (a)
-      
+      
         
 $ nmcli connection edit type ethernet
         
-      
+      
       
 
 ===| nmcli interactive connection editor |===
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index fbd53c49..3c76348f 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright 2010 - 2015 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "12 August 2015"
+.TH NMCLI "1" "2016-03-09" "NetworkManager 1.2"
 
 .SH NAME
 nmcli \- command\(hyline tool for controlling NetworkManager
@@ -435,7 +435,7 @@ See \fBconnection show\fP above for the description of the -specifying keywo
 .br
 If '--wait' option is not specified, the default timeout will be 10 seconds.
 .TP
-.B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- [+|-].  ...]
+.B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS [-- [+|-].  ...]
 .br
 Add a connection for NetworkManager. Arguments differ according to connection types, see below.
 .RS
@@ -460,7 +460,6 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
 .IP "\fI[master ]\fP" 42
 \(en master interface name, or connection UUID or ID of master connection profile.
 The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disambiguate it.
-See below \fBSLAVE_OPTIONS\fP for additional options for slave connection to masters of various types.
 .IP "\fI[slave-type ]\fP" 42
 \(en type of master connection. Only required when it can not be inferred (i.e. the master connection does
 not exist yet).
@@ -610,6 +609,11 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
+.IP "\fI[config |]\fP" 42
+\(en JSON configuration for team
+.RE
+.RS
+.TP
 .B bridge:
 .IP "\fI[stp yes|no]\fP" 42
 \(en controls whether Spanning Tree Protocol (STP) is enabled for this bridge (default: yes)
@@ -638,6 +642,16 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
+.IP "\fI[priority <0-63>]\fP" 42
+\(en STP priority of this slave (default: 32)
+.IP "\fI[path-cost <1-65535>]\fP" 42
+\(en STP port cost for destinations via this slave (default: 100)
+.IP "\fI[hairpin yes|no]\fP" 42
+\(en 'hairpin mode' for the slave, which allows frames
+to be sent back out through the slave the frame was received on (default: yes)
+.RE
+.RS
+.TP
 .B vpn:
 .IP "\fIvpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|strongswan|ssh|l2tp|iodine|fortisslvpn|...\fP" 42
 \(en VPN type
@@ -724,27 +738,6 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
-.B SLAVE_OPTIONS:
-.RE
-.RS
-.TP
-.B bridge:
-.IP "\fI[priority <0-63>]\fP" 42
-\(en STP priority of this slave (default: 32)
-.IP "\fI[path-cost <1-65535>]\fP" 42
-\(en STP port cost for destinations via this slave (default: 100)
-.IP "\fI[hairpin yes|no]\fP" 42
-\(en 'hairpin mode' for the slave, which allows frames
-to be sent back out through the slave the frame was received on (default: yes)
-.RE
-.RS
-.TP
-.B team:
-.IP "\fI[config |]\fP" 42
-\(en JSON configuration for team
-.RE
-.RS
-.TP
 .B IP_OPTIONS:
 .IP "\fI[ip4 ] [gw4 ]\fP" 42
 \(en IPv4 addresses
diff --git a/man/nmtui.1.in b/man/nmtui.1.in
index 32b76954..977339db 100644
--- a/man/nmtui.1.in
+++ b/man/nmtui.1.in
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright 2014 Red Hat, Inc.
 .\"
-.TH NMTUI "1" "6 November 2014"
+.TH NMTUI "1" "2014-11-06" "NetworkManager 1.2"
 
 .SH NAME
 nmtui \- Text User Interface for controlling NetworkManager
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9c37b7ed..b247e548 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -140,6 +140,7 @@ libnm/nm-remote-settings.c
 libnm/nm-vpn-plugin-old.c
 libnm/nm-vpn-service-plugin.c
 policy/org.freedesktop.NetworkManager.policy.in.in
+shared/nm-shared-utils.c
 src/NetworkManagerUtils.c
 src/main.c
 src/main-utils.c
diff --git a/po/de.po b/po/de.po
index b3eb90ce..d1e95692 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,8 +20,8 @@ msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=NetworkManager&keywords=I18N+L10N&component=Translations\n"
-"POT-Creation-Date: 2016-01-18 14:02+0000\n"
-"PO-Revision-Date: 2015-12-30 22:39+0100\n"
+"POT-Creation-Date: 2016-03-24 14:20+0000\n"
+"PO-Revision-Date: 2016-03-01 16:13+0100\n"
 "Last-Translator: Christian Kirbach \n"
 "Language-Team: Deutsch \n"
 "Language: de\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: ../clients/cli/agent.c:41
+#: ../clients/cli/agent.c:39
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -44,7 +44,7 @@ msgstr ""
 "BEFEHL := { secret | polkit | all }\n"
 "\n"
 
-#: ../clients/cli/agent.c:49
+#: ../clients/cli/agent.c:47
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -64,7 +64,7 @@ msgstr ""
 "gefragt.\n"
 "\n"
 
-#: ../clients/cli/agent.c:59
+#: ../clients/cli/agent.c:57
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -82,7 +82,7 @@ msgstr ""
 "an und gibt die Antwort zurück an polkit.\n"
 "\n"
 
-#: ../clients/cli/agent.c:69
+#: ../clients/cli/agent.c:67
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
@@ -95,93 +95,93 @@ msgstr ""
 "nmcli auführen als NetworkManager-Passwort und polkit-Agent.\n"
 "\n"
 
-#: ../clients/cli/agent.c:151
+#: ../clients/cli/agent.c:149
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr ""
 "nmcli wurde erfolgreich als Passwort-Agent von NetworkManager angemeldet.\n"
 
-#: ../clients/cli/agent.c:153
+#: ../clients/cli/agent.c:151
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "Fehler: Initialisierung des Passwort-Agenten fehlgeschlagen"
 
-#: ../clients/cli/agent.c:168
+#: ../clients/cli/agent.c:166
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "Fehler: Initialisierung des Passwort-Agenten fehlgeschlagen: %s"
 
-#: ../clients/cli/agent.c:176
+#: ../clients/cli/agent.c:174
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli wurde erfolgreich als polkit-Agent angemeldet.\n"
 
-#: ../clients/cli/agent.c:208 ../clients/cli/connections.c:10953
-#: ../clients/cli/devices.c:3674 ../clients/cli/general.c:344
-#: ../clients/cli/general.c:485
+#: ../clients/cli/agent.c:206 ../clients/cli/connections.c:11059
+#: ../clients/cli/devices.c:3669 ../clients/cli/general.c:343
+#: ../clients/cli/general.c:484
 #, c-format
 msgid "Error: NetworkManager is not running."
 msgstr "Fehler: NetworkManager wird nicht ausgeführt"
 
-#: ../clients/cli/agent.c:244
+#: ../clients/cli/agent.c:242
 #, c-format
 msgid "Error: 'agent' command '%s' is not valid."
 msgstr "Fehler: Der »agent«-Befehl »%s« ist ungültig."
 
-#: ../clients/cli/common.c:40 ../clients/cli/common.c:53
-#: ../clients/cli/common.c:61 ../clients/cli/common.c:73
-#: ../clients/cli/connections.c:193 ../clients/cli/connections.c:215
+#: ../clients/cli/common.c:38 ../clients/cli/common.c:51
+#: ../clients/cli/common.c:59 ../clients/cli/common.c:71
+#: ../clients/cli/connections.c:192 ../clients/cli/connections.c:214
 msgid "GROUP"
 msgstr "GRUPPE"
 
 #. 0
-#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
+#: ../clients/cli/common.c:39 ../clients/cli/common.c:60
 msgid "ADDRESS"
 msgstr "ADRESSE"
 
 #. 1
 #. 2
-#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
-#: ../clients/cli/connections.c:218
+#: ../clients/cli/common.c:40 ../clients/cli/common.c:61
+#: ../clients/cli/connections.c:217
 msgid "GATEWAY"
 msgstr "GATEWAY"
 
 #. 2
-#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
+#: ../clients/cli/common.c:41 ../clients/cli/common.c:62
 msgid "ROUTE"
 msgstr "ROUTE"
 
 #. 3
-#: ../clients/cli/common.c:44 ../clients/cli/common.c:65
+#: ../clients/cli/common.c:42 ../clients/cli/common.c:63
 msgid "DNS"
 msgstr "DNS"
 
 #. 4
-#: ../clients/cli/common.c:45 ../clients/cli/common.c:66
+#: ../clients/cli/common.c:43 ../clients/cli/common.c:64
 msgid "DOMAIN"
 msgstr "DOMAIN"
 
 #. 5
-#: ../clients/cli/common.c:46
+#: ../clients/cli/common.c:44
 msgid "WINS"
 msgstr "WINS"
 
 #. 0
-#: ../clients/cli/common.c:54 ../clients/cli/common.c:74
+#: ../clients/cli/common.c:52 ../clients/cli/common.c:72
 msgid "OPTION"
 msgstr "OPTION"
 
-#: ../clients/cli/common.c:378 ../clients/cli/common.c:438
+#: ../clients/cli/common.c:376 ../clients/cli/common.c:436
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "ungültiger Präfix »%s«. <1-%d> ist erlaubt"
 
-#: ../clients/cli/common.c:386
+#: ../clients/cli/common.c:384
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "Ungültige IP-Adresse: %s"
 
-#: ../clients/cli/common.c:450
+#: ../clients/cli/common.c:448
 #, c-format
 msgid ""
 "the second component of route ('%s') is neither a next hop address nor a "
@@ -190,434 +190,433 @@ msgstr ""
 "Die zweite Komponente der Route (»%s«) ist weder eine Router-Adresse noch "
 "eine Metrik"
 
-#: ../clients/cli/common.c:459
+#: ../clients/cli/common.c:457
 #, c-format
 msgid "invalid metric '%s'"
 msgstr "Ungültige Metrik »%s«"
 
-#: ../clients/cli/common.c:467
+#: ../clients/cli/common.c:465
 #, c-format
 msgid "invalid route: %s"
 msgstr "Ungültige Route: %s"
 
-#: ../clients/cli/common.c:479
+#: ../clients/cli/common.c:477
 msgid "default route cannot be added (NetworkManager handles it by itself)"
 msgstr ""
 "Die Standard-Route kann nicht hinzugefügt werden (NetworkManager kümmert "
 "sich selbst darum)"
 
-#: ../clients/cli/common.c:496
+#: ../clients/cli/common.c:494
 msgid "unmanaged"
 msgstr "nicht verwaltet"
 
-#: ../clients/cli/common.c:498
+#: ../clients/cli/common.c:496
 msgid "unavailable"
 msgstr "nicht verfügbar"
 
-#: ../clients/cli/common.c:500 ../clients/cli/general.c:246
+#: ../clients/cli/common.c:498 ../clients/cli/general.c:245
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../clients/cli/common.c:502
+#: ../clients/cli/common.c:500
 msgid "connecting (prepare)"
 msgstr "wird verbunden (wird vorbereitet)"
 
-#: ../clients/cli/common.c:504
+#: ../clients/cli/common.c:502
 msgid "connecting (configuring)"
 msgstr "wird verbunden (wird eingerichtet)"
 
-#: ../clients/cli/common.c:506
+#: ../clients/cli/common.c:504
 msgid "connecting (need authentication)"
 msgstr "wird verbunden (Legitimierung wird benötigt)"
 
-#: ../clients/cli/common.c:508
+#: ../clients/cli/common.c:506
 msgid "connecting (getting IP configuration)"
 msgstr "wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../clients/cli/common.c:510
+#: ../clients/cli/common.c:508
 msgid "connecting (checking IP connectivity)"
 msgstr "wird verbunden (IP-Funktionalität wird geprüft)"
 
-#: ../clients/cli/common.c:512
+#: ../clients/cli/common.c:510
 msgid "connecting (starting secondary connections)"
 msgstr "wird verbunden (Zweitverbindungen werden gestartet)"
 
-#: ../clients/cli/common.c:514 ../clients/cli/general.c:242
+#: ../clients/cli/common.c:512 ../clients/cli/general.c:241
 msgid "connected"
 msgstr "verbunden"
 
-#: ../clients/cli/common.c:516 ../clients/cli/connections.c:649
+#: ../clients/cli/common.c:514 ../clients/cli/connections.c:648
 msgid "deactivating"
 msgstr "wird deaktiviert"
 
-#: ../clients/cli/common.c:518
+#: ../clients/cli/common.c:516
 msgid "connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../clients/cli/common.c:520 ../clients/cli/common.c:537
-#: ../clients/cli/connections.c:654 ../clients/cli/connections.c:677
-#: ../clients/cli/connections.c:1947 ../clients/cli/devices.c:1023
-#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
-#: ../clients/cli/general.c:249 ../clients/cli/general.c:287
-#: ../clients/cli/general.c:433 ../clients/cli/general.c:449
-#: ../clients/cli/settings.c:864 ../clients/cli/settings.c:950
-#: ../clients/cli/settings.c:1277 ../clients/cli/settings.c:1888
-#: ../clients/cli/settings.c:3192 ../clients/cli/utils.c:1396 ../src/main.c:227
-#: ../src/main.c:371 ../src/main.c:426
+#: ../clients/cli/common.c:518 ../clients/cli/common.c:535
+#: ../clients/cli/connections.c:653 ../clients/cli/connections.c:676
+#: ../clients/cli/connections.c:1949 ../clients/cli/devices.c:1024
+#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
+#: ../clients/cli/general.c:248 ../clients/cli/general.c:286
+#: ../clients/cli/general.c:432 ../clients/cli/general.c:448
+#: ../clients/cli/settings.c:839 ../clients/cli/settings.c:925
+#: ../clients/cli/settings.c:1254 ../clients/cli/settings.c:1890
+#: ../clients/cli/settings.c:3194 ../clients/cli/utils.c:1400
 #, c-format
 msgid "unknown"
 msgstr "unbekannt"
 
 #. "CAPABILITIES"
-#: ../clients/cli/common.c:529 ../clients/cli/connections.c:934
-#: ../clients/cli/connections.c:936 ../clients/cli/connections.c:938
-#: ../clients/cli/connections.c:972 ../clients/cli/connections.c:1041
-#: ../clients/cli/connections.c:1042 ../clients/cli/connections.c:1044
-#: ../clients/cli/connections.c:3464 ../clients/cli/connections.c:8509
-#: ../clients/cli/connections.c:8510 ../clients/cli/devices.c:771
-#: ../clients/cli/devices.c:988 ../clients/cli/devices.c:989
-#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
-#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:1027
-#: ../clients/cli/devices.c:1029 ../clients/cli/devices.c:1057
-#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
-#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
-#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
-#: ../clients/cli/devices.c:1065 ../clients/cli/devices.c:1067
-#: ../clients/cli/general.c:443 ../clients/cli/settings.c:1870
-#: ../clients/cli/settings.c:3187
-msgid "yes"
-msgstr "ja"
-
-#: ../clients/cli/common.c:531 ../clients/cli/connections.c:934
-#: ../clients/cli/connections.c:936 ../clients/cli/connections.c:938
-#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1042
-#: ../clients/cli/connections.c:1044 ../clients/cli/connections.c:3465
-#: ../clients/cli/connections.c:8509 ../clients/cli/connections.c:8510
-#: ../clients/cli/devices.c:771 ../clients/cli/devices.c:988
+#: ../clients/cli/common.c:527 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:971 ../clients/cli/connections.c:1040
+#: ../clients/cli/connections.c:1041 ../clients/cli/connections.c:1043
+#: ../clients/cli/connections.c:3450 ../clients/cli/connections.c:8572
+#: ../clients/cli/connections.c:8573 ../clients/cli/devices.c:772
 #: ../clients/cli/devices.c:989 ../clients/cli/devices.c:990
 #: ../clients/cli/devices.c:991 ../clients/cli/devices.c:992
-#: ../clients/cli/devices.c:1027 ../clients/cli/devices.c:1029
-#: ../clients/cli/devices.c:1057 ../clients/cli/devices.c:1058
+#: ../clients/cli/devices.c:993 ../clients/cli/devices.c:1028
+#: ../clients/cli/devices.c:1030 ../clients/cli/devices.c:1058
 #: ../clients/cli/devices.c:1059 ../clients/cli/devices.c:1060
 #: ../clients/cli/devices.c:1061 ../clients/cli/devices.c:1062
-#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1065
-#: ../clients/cli/devices.c:1067 ../clients/cli/general.c:445
-#: ../clients/cli/settings.c:1868 ../clients/cli/settings.c:3189
+#: ../clients/cli/devices.c:1063 ../clients/cli/devices.c:1064
+#: ../clients/cli/devices.c:1066 ../clients/cli/devices.c:1068
+#: ../clients/cli/general.c:442 ../clients/cli/settings.c:3189
+msgid "yes"
+msgstr "ja"
+
+#: ../clients/cli/common.c:529 ../clients/cli/connections.c:933
+#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:937
+#: ../clients/cli/connections.c:1040 ../clients/cli/connections.c:1041
+#: ../clients/cli/connections.c:1043 ../clients/cli/connections.c:3451
+#: ../clients/cli/connections.c:8572 ../clients/cli/connections.c:8573
+#: ../clients/cli/devices.c:772 ../clients/cli/devices.c:989
+#: ../clients/cli/devices.c:990 ../clients/cli/devices.c:991
+#: ../clients/cli/devices.c:992 ../clients/cli/devices.c:993
+#: ../clients/cli/devices.c:1028 ../clients/cli/devices.c:1030
+#: ../clients/cli/devices.c:1058 ../clients/cli/devices.c:1059
+#: ../clients/cli/devices.c:1060 ../clients/cli/devices.c:1061
+#: ../clients/cli/devices.c:1062 ../clients/cli/devices.c:1063
+#: ../clients/cli/devices.c:1064 ../clients/cli/devices.c:1066
+#: ../clients/cli/devices.c:1068 ../clients/cli/general.c:444
+#: ../clients/cli/settings.c:3191
 msgid "no"
 msgstr "nein"
 
-#: ../clients/cli/common.c:533
+#: ../clients/cli/common.c:531
 msgid "yes (guessed)"
 msgstr "ja (geraten)"
 
-#: ../clients/cli/common.c:535
+#: ../clients/cli/common.c:533
 msgid "no (guessed)"
 msgstr "nein (geraten)"
 
-#: ../clients/cli/common.c:546
+#: ../clients/cli/common.c:544
 msgid "No reason given"
 msgstr "Kein Grund angegeben"
 
-#: ../clients/cli/common.c:549 ../clients/cli/connections.c:2988
+#. We should not really come here
+#: ../clients/cli/common.c:547 ../clients/cli/connections.c:2976
 #, c-format
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../clients/cli/common.c:552
+#: ../clients/cli/common.c:550
 msgid "Device is now managed"
 msgstr "Gerät wird nun verwaltet"
 
-#: ../clients/cli/common.c:555
+#: ../clients/cli/common.c:553
 msgid "Device is now unmanaged"
 msgstr "Gerät wird nun nicht mehr verwaltet"
 
-#: ../clients/cli/common.c:558
+#: ../clients/cli/common.c:556
 msgid "The device could not be readied for configuration"
 msgstr "Das Gerät konnte nicht für die Konfiguration vorbereitet werden"
 
-#: ../clients/cli/common.c:561
+#: ../clients/cli/common.c:559
 msgid ""
 "IP configuration could not be reserved (no available address, timeout, etc.)"
 msgstr ""
 "IP-Konfiguration konnte nicht reserviert werden (keine verfügbare Adresse, "
 "Zeitüberschreitung usw.)"
 
-#: ../clients/cli/common.c:564
+#: ../clients/cli/common.c:562
 msgid "The IP configuration is no longer valid"
 msgstr "Die IP-Konfiguration ist nicht mehr gültig"
 
-#: ../clients/cli/common.c:567
+#: ../clients/cli/common.c:565
 msgid "Secrets were required, but not provided"
 msgstr "Geheimdaten waren erforderlich, wurden aber nicht angegeben"
 
-#: ../clients/cli/common.c:570
+#: ../clients/cli/common.c:568
 msgid "802.1X supplicant disconnected"
 msgstr "802.1X-Supplicant getrennt"
 
-#: ../clients/cli/common.c:573
+#: ../clients/cli/common.c:571
 msgid "802.1X supplicant configuration failed"
 msgstr "Einrichtung des 802.1X-Supplicant fehlgeschlagen"
 
-#: ../clients/cli/common.c:576
+#: ../clients/cli/common.c:574
 msgid "802.1X supplicant failed"
 msgstr "802.1X-Supplicant fehlgeschlagen"
 
-#: ../clients/cli/common.c:579
+#: ../clients/cli/common.c:577
 msgid "802.1X supplicant took too long to authenticate"
 msgstr "802.1X-Supplicant brauchte zu lange für die Legitimierung"
 
-#: ../clients/cli/common.c:582
+#: ../clients/cli/common.c:580
 msgid "PPP service failed to start"
 msgstr "PPP-Dienst konnte nicht gestartet werden"
 
-#: ../clients/cli/common.c:585
+#: ../clients/cli/common.c:583
 msgid "PPP service disconnected"
 msgstr "PPP-Dienst getrennt"
 
-#: ../clients/cli/common.c:588
+#: ../clients/cli/common.c:586
 msgid "PPP failed"
 msgstr "PPP fehlgeschlagen"
 
-#: ../clients/cli/common.c:591
+#: ../clients/cli/common.c:589
 msgid "DHCP client failed to start"
 msgstr "DHCP-Client konnte nicht gestartet werden"
 
-#: ../clients/cli/common.c:594
+#: ../clients/cli/common.c:592
 msgid "DHCP client error"
 msgstr "DHCP-Client-Fehler"
 
-#: ../clients/cli/common.c:597
+#: ../clients/cli/common.c:595
 msgid "DHCP client failed"
 msgstr "DHCP-Client fehlgeschlagen"
 
-#: ../clients/cli/common.c:600
+#: ../clients/cli/common.c:598
 msgid "Shared connection service failed to start"
 msgstr ""
 "Dienst für gemeinsam verwendete Verbindung konnte nicht gestartet werden"
 
-#: ../clients/cli/common.c:603
+#: ../clients/cli/common.c:601
 msgid "Shared connection service failed"
 msgstr "Dienst für gemeinsam verwendete Verbindung fehlgeschlagen"
 
-#: ../clients/cli/common.c:606
+#: ../clients/cli/common.c:604
 msgid "AutoIP service failed to start"
 msgstr "Start des AutoIP-Diensts fehlgeschlagen"
 
-#: ../clients/cli/common.c:609
+#: ../clients/cli/common.c:607
 msgid "AutoIP service error"
 msgstr "Fehler des AutoIP-Diensts"
 
-#: ../clients/cli/common.c:612
+#: ../clients/cli/common.c:610
 msgid "AutoIP service failed"
 msgstr "AutoIP-Dienst fehlgeschlagen"
 
-#: ../clients/cli/common.c:615
+#: ../clients/cli/common.c:613
 msgid "The line is busy"
 msgstr "Die Leitung ist besetzt"
 
-#: ../clients/cli/common.c:618
+#: ../clients/cli/common.c:616
 msgid "No dial tone"
 msgstr "Kein Freizeichen"
 
-#: ../clients/cli/common.c:621
+#: ../clients/cli/common.c:619
 msgid "No carrier could be established"
 msgstr "Es konnte kein Trägersignal aufgebaut werden"
 
-#: ../clients/cli/common.c:624
+#: ../clients/cli/common.c:622
 msgid "The dialing request timed out"
 msgstr "Der Einwahlvorgang benötigte zu viel Zeit"
 
-#: ../clients/cli/common.c:627
+#: ../clients/cli/common.c:625
 msgid "The dialing attempt failed"
 msgstr "Der Einwahlversuch ist fehlgeschlagen"
 
-#: ../clients/cli/common.c:630
+#: ../clients/cli/common.c:628
 msgid "Modem initialization failed"
 msgstr "Modeminitialisierung fehlgeschlagen"
 
-#: ../clients/cli/common.c:633
+#: ../clients/cli/common.c:631
 msgid "Failed to select the specified APN"
 msgstr "Angegebener APN konnte nicht ausgewählt werden"
 
-#: ../clients/cli/common.c:636
+#: ../clients/cli/common.c:634
 msgid "Not searching for networks"
 msgstr "Es wird nicht nach Netzwerken gesucht"
 
-#: ../clients/cli/common.c:639
+#: ../clients/cli/common.c:637
 msgid "Network registration denied"
 msgstr "Netzwerkanmeldung abgelehnt"
 
-#: ../clients/cli/common.c:642
+#: ../clients/cli/common.c:640
 msgid "Network registration timed out"
 msgstr "Netzwerkanmeldung benötigte zu viel Zeit"
 
-#: ../clients/cli/common.c:645
+#: ../clients/cli/common.c:643
 msgid "Failed to register with the requested network"
 msgstr "Anmeldung an dem angeforderten Netzwerk fehlgeschlagen"
 
-#: ../clients/cli/common.c:648
+#: ../clients/cli/common.c:646
 msgid "PIN check failed"
 msgstr "PIN-Überprüfung fehlgeschlagen"
 
-#: ../clients/cli/common.c:651
+#: ../clients/cli/common.c:649
 msgid "Necessary firmware for the device may be missing"
 msgstr "Notwendige Firmware des Geräts fehlt möglicherweise"
 
-#: ../clients/cli/common.c:654
+#: ../clients/cli/common.c:652
 msgid "The device was removed"
 msgstr "Das Gerät wurde entfernt"
 
-#: ../clients/cli/common.c:657
+#: ../clients/cli/common.c:655
 msgid "NetworkManager went to sleep"
 msgstr "NetworkManager ging in den Schlafmodus"
 
-#: ../clients/cli/common.c:660
+#: ../clients/cli/common.c:658
 msgid "The device's active connection disappeared"
 msgstr "Die aktive Verbindung des Geräts verschwand"
 
-#: ../clients/cli/common.c:663
+#: ../clients/cli/common.c:661
 msgid "Device disconnected by user or client"
 msgstr "Das Gerät wurde durch den Benutzer oder Client getrennt"
 
-#: ../clients/cli/common.c:666
+#: ../clients/cli/common.c:664
 msgid "Carrier/link changed"
 msgstr "Trägersignal/Verbindung geändert"
 
-#: ../clients/cli/common.c:669
+#: ../clients/cli/common.c:667
 msgid "The device's existing connection was assumed"
 msgstr "Die bestehende Verbindung des Geräts wurde angenommen"
 
-#: ../clients/cli/common.c:672
+#: ../clients/cli/common.c:670
 msgid "The supplicant is now available"
 msgstr "Der Supplicant ist nun verfügbar"
 
-#: ../clients/cli/common.c:675
+#: ../clients/cli/common.c:673
 msgid "The modem could not be found"
 msgstr "Das Modem wurde nicht gefunden"
 
-#: ../clients/cli/common.c:678
+#: ../clients/cli/common.c:676
 msgid "The Bluetooth connection failed or timed out"
 msgstr ""
 "Die Bluetooth-Verbindung ist fehlgeschlagen oder benötigte zu viel Zeit"
 
-#: ../clients/cli/common.c:681
+#: ../clients/cli/common.c:679
 msgid "GSM Modem's SIM card not inserted"
 msgstr "SIM-Karte des GSM-Modems ist nicht eingesteckt"
 
-#: ../clients/cli/common.c:684
+#: ../clients/cli/common.c:682
 msgid "GSM Modem's SIM PIN required"
 msgstr "PIN der SIM-Karte des GSM-Modems erforderlich"
 
-#: ../clients/cli/common.c:687
+#: ../clients/cli/common.c:685
 msgid "GSM Modem's SIM PUK required"
 msgstr "PUK der SIM-Karte des GSM-Modems erforderlich"
 
-#: ../clients/cli/common.c:690
+#: ../clients/cli/common.c:688
 msgid "GSM Modem's SIM wrong"
 msgstr "SIM-Karte des GSM-Modems ist falsch"
 
-#: ../clients/cli/common.c:693
+#: ../clients/cli/common.c:691
 msgid "InfiniBand device does not support connected mode"
 msgstr "Das InfiniBand-Gerät unterstützt keinen »Connected«-Modus"
 
-#: ../clients/cli/common.c:696
+#: ../clients/cli/common.c:694
 msgid "A dependency of the connection failed"
 msgstr "Eine Abhängigkeit der Verbindung ist gescheitert"
 
-#: ../clients/cli/common.c:699
+#: ../clients/cli/common.c:697
 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge"
 msgstr "Ein Problem mit RFC 2684-Überbrückung (Ethernet über ADSL)"
 
-#: ../clients/cli/common.c:702
+#: ../clients/cli/common.c:700
 msgid "ModemManager is unavailable"
 msgstr "ModemManager ist nicht verfügbar"
 
-#: ../clients/cli/common.c:705
+#: ../clients/cli/common.c:703
 msgid "The Wi-Fi network could not be found"
 msgstr "Das WLAN konnte nicht gefunden werden"
 
-#: ../clients/cli/common.c:708
+#: ../clients/cli/common.c:706
 msgid "A secondary connection of the base connection failed"
 msgstr "Eine Zweitverbindung der Basisverbindung schlug fehl"
 
-#: ../clients/cli/common.c:711
+#: ../clients/cli/common.c:709
 msgid "DCB or FCoE setup failed"
 msgstr ""
 "Einrichtung für DCB (»Data Center Bridging«) oder FCoE (»Fibre Channel over "
 "Ethernet«) fehlgeschlagen"
 
-#: ../clients/cli/common.c:714
+#: ../clients/cli/common.c:712
 msgid "teamd control failed"
 msgstr "teamd-Bedienung fehlgeschlagen"
 
-#: ../clients/cli/common.c:717
+#: ../clients/cli/common.c:715
 msgid "Modem failed or no longer available"
 msgstr "Modem ausgefallen oder es ist nicht mehr verfügbar"
 
-#: ../clients/cli/common.c:720
+#: ../clients/cli/common.c:718
 msgid "Modem now ready and available"
 msgstr "Modem ist nun bereit und verfügbar"
 
-#: ../clients/cli/common.c:723
+#: ../clients/cli/common.c:721
 msgid "SIM PIN was incorrect"
 msgstr "PIN der SIM-Karte war falsch"
 
-#: ../clients/cli/common.c:726
+#: ../clients/cli/common.c:724
 msgid "New connection activation was enqueued"
 msgstr "Aktivierung der Verbindung wurde eingereiht"
 
-#: ../clients/cli/common.c:729
+#: ../clients/cli/common.c:727
 #, fuzzy
 #| msgid "The device was removed"
 msgid "The device's parent changed"
 msgstr "Das Gerät wurde entfernt"
 
-#: ../clients/cli/common.c:732
+#: ../clients/cli/common.c:730
 #, fuzzy
 #| msgid "The device was removed"
 msgid "The device parent's management changed"
 msgstr "Das Gerät wurde entfernt"
 
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
-#: ../clients/cli/common.c:736 ../libnm-glib/nm-device.c:1874
-#: ../libnm/nm-device.c:1825
+#: ../clients/cli/common.c:734 ../libnm-glib/nm-device.c:1888
+#: ../libnm/nm-device.c:1839
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../clients/cli/common.c:778
+#: ../clients/cli/common.c:776
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "ungültige Prioritätsabbildung »%s«"
 
-#: ../clients/cli/common.c:785 ../clients/cli/common.c:791
+#: ../clients/cli/common.c:783 ../clients/cli/common.c:789
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
 msgstr "Priorität »%s« ist ungültig (<0-%ld>)"
 
-#: ../clients/cli/common.c:858
+#: ../clients/cli/common.c:856
 #, c-format
 msgid "'%s' is not a valid team configuration or file name."
 msgstr "»%s« ist keine gültige Bündelungskonfiguration oder Dateiname."
 
-#: ../clients/cli/common.c:960
+#: ../clients/cli/common.c:958
 #, fuzzy, c-format
 #| msgid "Error: connection verification failed: %s\n"
 msgid "Error: openconnect failed: %s\n"
 msgstr "Fehler: Prüfung der Verbindung ist fehlgeschlagen: %s\n"
 
-#: ../clients/cli/common.c:967
+#: ../clients/cli/common.c:965
 #, fuzzy, c-format
 #| msgid "Editor failed with status %d"
 msgid "Error: openconnect failed with status %d\n"
 msgstr "Editor fehlgeschlagen mit Status %d"
 
-#: ../clients/cli/common.c:969
+#: ../clients/cli/common.c:967
 #, fuzzy, c-format
 #| msgid "Editor failed with signal %d"
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "Editor fehlgeschlagen mit Signal %d"
 
-#: ../clients/cli/common.c:1047
+#: ../clients/cli/common.c:1045
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -627,73 +626,69 @@ msgstr ""
 "darf nicht ohne die Option »--ask« fragen.\n"
 
 #. define some prompts for connection editor
-#: ../clients/cli/connections.c:42
+#: ../clients/cli/connections.c:41
 msgid "Setting name? "
 msgstr "Einstellungsname?"
 
-#: ../clients/cli/connections.c:43
+#: ../clients/cli/connections.c:42
 msgid "Property name? "
 msgstr "Eigenschaftenname?"
 
-#: ../clients/cli/connections.c:44
+#: ../clients/cli/connections.c:43
 msgid "Enter connection type: "
 msgstr "Geben Sie den Verbindungstyp an: "
 
 #. define some other prompts
-#: ../clients/cli/connections.c:47
+#: ../clients/cli/connections.c:46
 msgid "Connection type: "
 msgstr "Verbindungstyp: "
 
-#: ../clients/cli/connections.c:48
+#: ../clients/cli/connections.c:47
 msgid "VPN type: "
 msgstr "VPN-Typ: "
 
-#: ../clients/cli/connections.c:49
-#, fuzzy
-#| msgid "Bond master: "
+#: ../clients/cli/connections.c:48
 msgid "Master: "
 msgstr "Master: "
 
-#: ../clients/cli/connections.c:50
+#: ../clients/cli/connections.c:49
 msgid "Connection (name, UUID, or path): "
 msgstr "Verbindung (Name, UUID oder Pfad): "
 
-#: ../clients/cli/connections.c:51
-#, fuzzy
-#| msgid "Connection (name, UUID, or path): "
+#: ../clients/cli/connections.c:50
 msgid "VPN connection (name, UUID, or path): "
-msgstr "Verbindung (Name, UUID oder Pfad): "
+msgstr "VPN-Verbindung (Name, UUID oder Pfad): "
 
-#: ../clients/cli/connections.c:52
+#: ../clients/cli/connections.c:51
 msgid "Connection(s) (name, UUID, or path): "
 msgstr "Verbindung(en) (Name, UUID oder Pfad): "
 
-#: ../clients/cli/connections.c:53
+#: ../clients/cli/connections.c:52
 msgid "Connection(s) (name, UUID, path or apath): "
 msgstr "Verbindung(en) (Name, UUID oder a-Pfad): "
 
-#: ../clients/cli/connections.c:54
+#: ../clients/cli/connections.c:53
 msgid "Tunnel mode: "
 msgstr "Tunnelmodus: "
 
-#: ../clients/cli/connections.c:55
+#: ../clients/cli/connections.c:54
 msgid "MACVLAN mode: "
-msgstr ""
+msgstr "MACVLAN-Modus: "
 
 #. 0
-#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
-#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:90
-#: ../clients/cli/devices.c:100 ../clients/cli/devices.c:111
-#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138
-#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177
-#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201
-#: ../clients/cli/devices.c:211 ../clients/cli/devices.c:252
+#: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193
+#: ../clients/cli/devices.c:55 ../clients/cli/devices.c:89
+#: ../clients/cli/devices.c:99 ../clients/cli/devices.c:110
+#: ../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 ../clients/cli/devices.c:251
 msgid "NAME"
 msgstr "NAME"
 
 #. 0
 #. 1
-#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:195
+#: ../clients/cli/connections.c:74 ../clients/cli/connections.c:194
 msgid "UUID"
 msgstr "UUID"
 
@@ -701,35 +696,35 @@ msgstr "UUID"
 #. 0
 #. 1
 #. 2
-#: ../clients/cli/connections.c:76 ../clients/cli/connections.c:216
-#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:58
-#: ../clients/cli/devices.c:180
+#: ../clients/cli/connections.c:75 ../clients/cli/connections.c:215
+#: ../clients/cli/devices.c:41 ../clients/cli/devices.c:57
+#: ../clients/cli/devices.c:179
 msgid "TYPE"
 msgstr "TYP"
 
 #. 2
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:76
 msgid "TIMESTAMP"
 msgstr "ZEITSTEMPEL"
 
 #. 3
-#: ../clients/cli/connections.c:78
+#: ../clients/cli/connections.c:77
 msgid "TIMESTAMP-REAL"
 msgstr "ZEITSTEMPEL-ECHT"
 
 #. 4
 #. 16
-#: ../clients/cli/connections.c:79 ../clients/cli/devices.c:73
+#: ../clients/cli/connections.c:78 ../clients/cli/devices.c:72
 msgid "AUTOCONNECT"
 msgstr "AUTO-VERBINDEN"
 
 #. 5
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:79
 msgid "AUTOCONNECT-PRIORITY"
 msgstr "AUTOVERBINDEN-PRIORITÄT"
 
 #. 6
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:80
 msgid "READONLY"
 msgstr "NUR-LESEN"
 
@@ -738,17 +733,17 @@ msgstr "NUR-LESEN"
 #. 2
 #. 15
 #. 5
-#: ../clients/cli/connections.c:82 ../clients/cli/connections.c:202
-#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:167
-#: ../clients/cli/devices.c:183
+#: ../clients/cli/connections.c:81 ../clients/cli/connections.c:201
+#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:166
+#: ../clients/cli/devices.c:182
 msgid "DBUS-PATH"
 msgstr "DBUS-PFAD"
 
 #. 8
 #. 13
 #. 4
-#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:165
-#: ../clients/cli/devices.c:182
+#: ../clients/cli/connections.c:82 ../clients/cli/devices.c:164
+#: ../clients/cli/devices.c:181
 msgid "ACTIVE"
 msgstr "AKTIV"
 
@@ -757,9 +752,9 @@ msgstr "AKTIV"
 #. 12
 #. 3
 #. 0
-#: ../clients/cli/connections.c:84 ../clients/cli/devices.c:41
-#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:164
-#: ../clients/cli/devices.c:181 ../clients/cli/devices.c:253
+#: ../clients/cli/connections.c:83 ../clients/cli/devices.c:40
+#: ../clients/cli/devices.c:56 ../clients/cli/devices.c:163
+#: ../clients/cli/devices.c:180 ../clients/cli/devices.c:252
 msgid "DEVICE"
 msgstr "GERÄT"
 
@@ -768,42 +763,42 @@ msgstr "GERÄT"
 #. 1
 #. 10
 #. 1
-#: ../clients/cli/connections.c:85 ../clients/cli/connections.c:197
-#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:67
-#: ../clients/cli/general.c:37
+#: ../clients/cli/connections.c:84 ../clients/cli/connections.c:196
+#: ../clients/cli/devices.c:42 ../clients/cli/devices.c:66
+#: ../clients/cli/general.c:36
 msgid "STATE"
 msgstr "STATUS"
 
 #. 11
-#: ../clients/cli/connections.c:86
+#: ../clients/cli/connections.c:85
 msgid "ACTIVE-PATH"
 msgstr "AKTIV-PFAD"
 
 #. 2
-#: ../clients/cli/connections.c:196
+#: ../clients/cli/connections.c:195
 msgid "DEVICES"
 msgstr "GERÄTE"
 
 #. 4
-#: ../clients/cli/connections.c:198
+#: ../clients/cli/connections.c:197
 msgid "DEFAULT"
 msgstr "VORGABE"
 
 #. 5
-#: ../clients/cli/connections.c:199
+#: ../clients/cli/connections.c:198
 msgid "DEFAULT6"
 msgstr "STANDARD6"
 
 #. 6
-#: ../clients/cli/connections.c:200
+#: ../clients/cli/connections.c:199
 msgid "SPEC-OBJECT"
 msgstr "SPEC-OBJECT"
 
 #. 7
 #. 4
 #. Ask for optional 'vpn' arguments.
-#: ../clients/cli/connections.c:201 ../clients/cli/connections.c:239
-#: ../clients/cli/connections.c:4183 ../clients/tui/nm-editor-utils.c:234
+#: ../clients/cli/connections.c:200 ../clients/cli/connections.c:238
+#: ../clients/cli/connections.c:4169 ../clients/tui/nm-editor-utils.c:233
 #: ../clients/tui/nmt-connect-connection-list.c:405
 msgid "VPN"
 msgstr "VPN"
@@ -811,100 +806,71 @@ msgstr "VPN"
 #. 9
 #. 5
 #. 22
-#: ../clients/cli/connections.c:203 ../clients/cli/devices.c:47
-#: ../clients/cli/devices.c:79
+#: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46
+#: ../clients/cli/devices.c:78
 msgid "CON-PATH"
 msgstr "CON-PFAD"
 
 #. 10
-#: ../clients/cli/connections.c:204
+#: ../clients/cli/connections.c:203
 msgid "ZONE"
 msgstr "ZONE"
 
 #. 11
-#: ../clients/cli/connections.c:205
+#: ../clients/cli/connections.c:204
 msgid "MASTER-PATH"
 msgstr "MASTER-PFAD"
 
 #. 1
-#: ../clients/cli/connections.c:217
+#: ../clients/cli/connections.c:216
 msgid "USERNAME"
 msgstr "BENUTZERNAME"
 
 #. 3
-#: ../clients/cli/connections.c:219
+#: ../clients/cli/connections.c:218
 msgid "BANNER"
 msgstr "BANNER"
 
 #. 4
-#: ../clients/cli/connections.c:220
+#: ../clients/cli/connections.c:219
 msgid "VPN-STATE"
 msgstr "VPN-STATUS"
 
 #. 5
-#: ../clients/cli/connections.c:221
+#: ../clients/cli/connections.c:220
 msgid "CFG"
 msgstr "CFG"
 
-#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:226
+#: ../clients/cli/connections.c:233 ../clients/cli/devices.c:225
 msgid "GENERAL"
 msgstr "ALLGEMEIN"
 
 #. 0
 #. 6
-#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
+#: ../clients/cli/connections.c:234 ../clients/cli/devices.c:232
 msgid "IP4"
 msgstr "IP4"
 
 #. 1
 #. 7
-#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
+#: ../clients/cli/connections.c:235 ../clients/cli/devices.c:233
 msgid "DHCP4"
 msgstr "DHCP4"
 
 #. 2
 #. 8
-#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
+#: ../clients/cli/connections.c:236 ../clients/cli/devices.c:234
 msgid "IP6"
 msgstr "IP6"
 
 #. 3
 #. 9
-#: ../clients/cli/connections.c:238 ../clients/cli/devices.c:236
+#: ../clients/cli/connections.c:237 ../clients/cli/devices.c:235
 msgid "DHCP6"
 msgstr "DHCP6"
 
-#: ../clients/cli/connections.c:273
-#, fuzzy, c-format
-#| msgid ""
-#| "Usage: nmcli connection { COMMAND | help }\n"
-#| "\n"
-#| "COMMAND := { show | up | down | add | modify | edit | delete | reload | "
-#| "load }\n"
-#| "\n"
-#| "  show [--active] [--order ]\n"
-#| "  show [--active] [--show-secrets] [id | uuid | path | apath]  ...\n"
-#| "\n"
-#| "  up [[id | uuid | path] ] [ifname ] [ap ] [passwd-"
-#| "file ]\n"
-#| "\n"
-#| "  down [id | uuid | path | apath]  ...\n"
-#| "\n"
-#| "  add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- "
-#| "([+|-]. )+]\n"
-#| "\n"
-#| "  modify [--temporary] [id | uuid | path]  ([+|-]. "
-#| ")+\n"
-#| "\n"
-#| "  edit [id | uuid | path] \n"
-#| "  edit [type ] [con-name ]\n"
-#| "\n"
-#| "  delete [id | uuid | path] \n"
-#| "\n"
-#| "  reload\n"
-#| "\n"
-#| "  load  [ ... ]\n"
-#| "\n"
+#: ../clients/cli/connections.c:272
+#, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
 "\n"
@@ -945,35 +911,41 @@ msgid ""
 msgstr ""
 "Aufruf: nmcli connection { BEFEHL | help }\n"
 "\n"
-"BEFEHL := { show | up | down | add | modify | edit | delete | reload | "
-"load }\n"
+"BEFEHL := { show | up | down | add | modify | edit | delete | monitor | "
+"reload | load }\n"
 "\n"
 "  show [--active] [--order ]\n"
-"  show [--active] [[--show-secrets] [id | uuid | path | apath] "
-"] ...\n"
+"  show [--active] [id | uuid | path | apath]  ...\n"
 "\n"
-"  up [[id | uuid | path] ] [ifname ] [ap "
+"  up [[id | uuid | path] ] [ifname ] [ap "
 "] [passwd-file ]\n"
 "\n"
-"  down [id | uuid | path | apath]  …\n"
+"  down [id | uuid | path | apath]  …\n"
 "\n"
 "  add NORMALE_OPTIONEN TYP_SPEZIFISCHE_OPTIONEN SLAVE_OPTIONEN IP_OPTIONEN  "
 "[-- ([+|-]. )+]\n"
 "\n"
-"  modify [--temporary] [id | uuid | path]  ([+|-]."
+"  modify [--temporary] [id | uuid | path]  ([+|-]."
 " )+\n"
 "\n"
-"  edit [id | uuid | path] \n"
-"  edit [type ] [con-name ]\n"
+"  edit [id | uuid | path] \n"
+"  edit [type ] [con-name ]\n"
 "\n"
-"  delete [id | uuid | path] \n"
+"  delete [id | uuid | path] \n"
+"\n"
+"  monitor [id | uuid | path]  …\n"
 "\n"
 "  reload\n"
 "\n"
-"  load  [ ... ]\n"
+"  load  [  …]\n"
+"\n"
+"\n"
+"  import [--temporary] type  file \n"
+"\n"
+"  export [id | uuid | path]  []\n"
 "\n"
 
-#: ../clients/cli/connections.c:295
+#: ../clients/cli/connections.c:294
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -1049,7 +1021,7 @@ msgstr ""
 "angezeigt.\n"
 "Die Option »--show-secrets« zeigt zusätzlich zugehörige Passwörter an.\n"
 
-#: ../clients/cli/connections.c:316
+#: ../clients/cli/connections.c:315
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -1096,7 +1068,7 @@ msgstr ""
 "passwd-file - Datei mit Passwörtern zum Aktivieren der Verbindung\n"
 "\n"
 
-#: ../clients/cli/connections.c:337
+#: ../clients/cli/connections.c:336
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -1119,7 +1091,7 @@ msgstr ""
 "anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:349
+#: ../clients/cli/connections.c:348
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: nmcli connection add { ARGUMENTS | help }\n"
@@ -1498,7 +1470,7 @@ msgstr ""
 "                  [ip6 ] [gw6 ]\n"
 "\n"
 
-#: ../clients/cli/connections.c:461
+#: ../clients/cli/connections.c:460
 #, c-format
 msgid ""
 "Usage: nmcli connection modify { ARGUMENTS | help }\n"
@@ -1547,7 +1519,7 @@ msgstr ""
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:484
+#: ../clients/cli/connections.c:483
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -1560,8 +1532,17 @@ msgid ""
 "id (provided as  argument).\n"
 "\n"
 msgstr ""
+"Aufruf: nmcli connection clone { PARAMETER | help }\n"
+"\n"
+"PARAMETER := [--temporary] [id | uuid | path]  \n"
+"\n"
+"Dupliziert ein bestehendes Verbindungsprofil. Die neue Verbindung wird eine\n"
+"exacte Kopie von , mit Ausnahme der Eigenschaft uuid (wird neu "
+"erzeugt)\n"
+"und der id (wird als Parameter  angegeben).\n"
+"\n"
 
-#: ../clients/cli/connections.c:496
+#: ../clients/cli/connections.c:495
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1589,7 +1570,7 @@ msgstr ""
 "Fügt ein neues Verbindungsprofil in einem interaktiven Editor hinzu.\n"
 "\n"
 
-#: ../clients/cli/connections.c:511
+#: ../clients/cli/connections.c:510
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1608,7 +1589,7 @@ msgstr ""
 "Das Profil wird anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:522
+#: ../clients/cli/connections.c:521
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -1646,7 +1627,7 @@ msgstr ""
 "Fügt ein neues Verbindungsprofil in einem interaktiven Editor hinzu.\n"
 "\n"
 
-#: ../clients/cli/connections.c:534
+#: ../clients/cli/connections.c:533
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -1659,7 +1640,7 @@ msgstr ""
 "Lädt alle Verbindungsdateien neu von der Festplatte.\n"
 "\n"
 
-#: ../clients/cli/connections.c:542
+#: ../clients/cli/connections.c:541
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -1682,7 +1663,7 @@ msgstr ""
 "um sicherzustellen, dass der NetworkManager die Änderungen übernimmt.\n"
 "\n"
 
-#: ../clients/cli/connections.c:554
+#: ../clients/cli/connections.c:553
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -1696,8 +1677,19 @@ msgid ""
 "is imported by NetworkManager VPN plugins.\n"
 "\n"
 msgstr ""
+"Aufruf: nmcli connection import { PARAMETER | help }\n"
+"\n"
+"PARAMETER := [--temporary] type  file \n"
+"\n"
+"Import eine externe/fremde Konfiguration als NetworkManager-"
+"Verbindungsprofil.\n"
+"Der Typ der Eingabedatei wird durch die Option »type« angegeben.\n"
+"Es werden derzeit nur VPN-Konfigurationen unterstützt. Die Konfiguration\n"
+"wird durch die  VPN-Plugins von NetworkManager importiert.\n"
+"\n"
+"\n"
 
-#: ../clients/cli/connections.c:567
+#: ../clients/cli/connections.c:566
 #, fuzzy, c-format
 #| msgid ""
 #| "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -1724,411 +1716,404 @@ msgstr ""
 "Das Profil wird anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n"
 "\n"
 
-#: ../clients/cli/connections.c:645
+#: ../clients/cli/connections.c:644
 msgid "activating"
 msgstr "wird aktiviert"
 
-#: ../clients/cli/connections.c:647
+#: ../clients/cli/connections.c:646
 msgid "activated"
 msgstr "aktiviert"
 
-#: ../clients/cli/connections.c:651
+#: ../clients/cli/connections.c:650
 msgid "deactivated"
 msgstr "deaktiviert"
 
-#: ../clients/cli/connections.c:663
+#: ../clients/cli/connections.c:662
 msgid "VPN connecting (prepare)"
 msgstr "VPN wird verbunden (wird vorbereitet)"
 
-#: ../clients/cli/connections.c:665
+#: ../clients/cli/connections.c:664
 msgid "VPN connecting (need authentication)"
 msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
 
-#: ../clients/cli/connections.c:667
+#: ../clients/cli/connections.c:666
 msgid "VPN connecting"
 msgstr "VPN wird verbunden"
 
-#: ../clients/cli/connections.c:669
+#: ../clients/cli/connections.c:668
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
 
-#: ../clients/cli/connections.c:671
+#: ../clients/cli/connections.c:670
 msgid "VPN connected"
 msgstr "VPN verbunden"
 
-#: ../clients/cli/connections.c:673
+#: ../clients/cli/connections.c:672
 msgid "VPN connection failed"
 msgstr "VPN-Verbindung gescheitert"
 
-#: ../clients/cli/connections.c:675
+#: ../clients/cli/connections.c:674
 msgid "VPN disconnected"
 msgstr "VPN getrennt"
 
-#: ../clients/cli/connections.c:745
+#: ../clients/cli/connections.c:744
 #, fuzzy, c-format
 #| msgid "Error saving connection: %s"
 msgid "Error updating secrets for %s: %s\n"
 msgstr "Fehler beim Speichern der Verbindung: %s"
 
-#: ../clients/cli/connections.c:765
+#: ../clients/cli/connections.c:764
 msgid "Connection profile details"
 msgstr "Details des Verbindungsprofils"
 
-#: ../clients/cli/connections.c:777 ../clients/cli/connections.c:1170
+#: ../clients/cli/connections.c:776 ../clients/cli/connections.c:1169
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "Fehler: »connection show«: %s"
 
-#: ../clients/cli/connections.c:933 ../clients/cli/settings.c:1884
+#: ../clients/cli/connections.c:932 ../clients/cli/settings.c:1886
 msgid "never"
 msgstr "nie"
 
-#: ../clients/cli/connections.c:1158
+#: ../clients/cli/connections.c:1157
 msgid "Activate connection details"
 msgstr "Verbindungsdetails aktivieren"
 
-#: ../clients/cli/connections.c:1394
+#: ../clients/cli/connections.c:1393
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "Ungültiges Feld »%s«; erlaubte Felder: %s und %s oder %s,%s"
 
-#: ../clients/cli/connections.c:1409 ../clients/cli/connections.c:1417
+#: ../clients/cli/connections.c:1408 ../clients/cli/connections.c:1416
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "»%s« muss allein stehen"
 
 #. Add headers
-#: ../clients/cli/connections.c:1632
+#: ../clients/cli/connections.c:1634
 msgid "NetworkManager active profiles"
 msgstr "NetworkManager aktive Profile"
 
-#: ../clients/cli/connections.c:1633
+#: ../clients/cli/connections.c:1635
 msgid "NetworkManager connection profiles"
 msgstr "NetworkManager Verbindungsprofile"
 
-#: ../clients/cli/connections.c:1679 ../clients/cli/connections.c:2387
-#: ../clients/cli/connections.c:2409 ../clients/cli/connections.c:2418
-#: ../clients/cli/connections.c:2427 ../clients/cli/connections.c:2586
-#: ../clients/cli/connections.c:10059 ../clients/cli/connections.c:10176
-#: ../clients/cli/connections.c:10308 ../clients/cli/connections.c:10441
-#: ../clients/cli/connections.c:10551 ../clients/cli/connections.c:10562
-#: ../clients/cli/connections.c:10661 ../clients/cli/devices.c:2343
-#: ../clients/cli/devices.c:2351 ../clients/cli/devices.c:2674
-#: ../clients/cli/devices.c:2681 ../clients/cli/devices.c:2695
-#: ../clients/cli/devices.c:2702 ../clients/cli/devices.c:2719
-#: ../clients/cli/devices.c:2727 ../clients/cli/devices.c:2740
-#: ../clients/cli/devices.c:3104 ../clients/cli/devices.c:3111
-#: ../clients/cli/devices.c:3118 ../clients/cli/devices.c:3130
-#: ../clients/cli/devices.c:3143 ../clients/cli/devices.c:3150
-#: ../clients/cli/devices.c:3322 ../clients/cli/devices.c:3329
-#: ../clients/cli/devices.c:3502
+#: ../clients/cli/connections.c:1681 ../clients/cli/connections.c:2389
+#: ../clients/cli/connections.c:2411 ../clients/cli/connections.c:2420
+#: ../clients/cli/connections.c:2429 ../clients/cli/connections.c:2588
+#: ../clients/cli/connections.c:10165 ../clients/cli/connections.c:10282
+#: ../clients/cli/connections.c:10414 ../clients/cli/connections.c:10547
+#: ../clients/cli/connections.c:10657 ../clients/cli/connections.c:10668
+#: ../clients/cli/connections.c:10767 ../clients/cli/devices.c:2344
+#: ../clients/cli/devices.c:2352 ../clients/cli/devices.c:2675
+#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2696
+#: ../clients/cli/devices.c:2703 ../clients/cli/devices.c:2720
+#: ../clients/cli/devices.c:2728 ../clients/cli/devices.c:2741
+#: ../clients/cli/devices.c:3105 ../clients/cli/devices.c:3112
+#: ../clients/cli/devices.c:3119 ../clients/cli/devices.c:3131
+#: ../clients/cli/devices.c:3144 ../clients/cli/devices.c:3151
+#: ../clients/cli/devices.c:3323 ../clients/cli/devices.c:3330
+#: ../clients/cli/devices.c:3503
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "Fehler: Argument %s fehlt."
 
-#: ../clients/cli/connections.c:1694
+#: ../clients/cli/connections.c:1696
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "Fehler: Verbindungsprofil %s existiert nicht."
 
-#: ../clients/cli/connections.c:1753 ../clients/cli/connections.c:2450
-#: ../clients/cli/connections.c:11065 ../clients/cli/devices.c:3291
-#: ../clients/cli/devices.c:3784 ../clients/cli/general.c:540
-#: ../clients/cli/general.c:589 ../clients/cli/general.c:606
-#: ../clients/cli/general.c:645 ../clients/cli/general.c:659
-#: ../clients/cli/general.c:777 ../clients/cli/general.c:824
-#: ../clients/cli/general.c:844
+#: ../clients/cli/connections.c:1755 ../clients/cli/connections.c:2452
+#: ../clients/cli/connections.c:11171 ../clients/cli/devices.c:3292
+#: ../clients/cli/devices.c:3779 ../clients/cli/general.c:539
+#: ../clients/cli/general.c:588 ../clients/cli/general.c:605
+#: ../clients/cli/general.c:644 ../clients/cli/general.c:658
+#: ../clients/cli/general.c:776 ../clients/cli/general.c:823
+#: ../clients/cli/general.c:843
 #, c-format
 msgid "Error: %s."
 msgstr "Fehler: %s."
 
-#: ../clients/cli/connections.c:1849
+#: ../clients/cli/connections.c:1851
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "Keine aktive Verbindung auf Gerät »%s«"
 
-#: ../clients/cli/connections.c:1857
+#: ../clients/cli/connections.c:1859
 msgid "no active connection or device"
 msgstr "Keine aktive Verbindung oder Gerät"
 
-#: ../clients/cli/connections.c:1908
+#: ../clients/cli/connections.c:1910
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel"
 
-#: ../clients/cli/connections.c:1911
+#: ../clients/cli/connections.c:1913
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden"
 
-#: ../clients/cli/connections.c:1923
+#: ../clients/cli/connections.c:1925
 msgid "unknown reason"
 msgstr "unbekannter Grund"
 
-#: ../clients/cli/connections.c:1925 ../clients/cli/general.c:278
+#: ../clients/cli/connections.c:1927 ../clients/cli/general.c:277
 msgid "none"
 msgstr "kein"
 
-#: ../clients/cli/connections.c:1927
+#: ../clients/cli/connections.c:1929
 msgid "the user was disconnected"
 msgstr "Der Benutzer wurde getrennt"
 
-#: ../clients/cli/connections.c:1929
+#: ../clients/cli/connections.c:1931
 msgid "the base network connection was interrupted"
 msgstr "Die Basisverbindung wurde unterbrochen"
 
-#: ../clients/cli/connections.c:1931
+#: ../clients/cli/connections.c:1933
 msgid "the VPN service stopped unexpectedly"
 msgstr "Der VPN-Dienst wurde unerwartet gestoppt"
 
-#: ../clients/cli/connections.c:1933
+#: ../clients/cli/connections.c:1935
 msgid "the VPN service returned invalid configuration"
 msgstr "Der VPN-Dienst gab ungültige Einstellungen zurück"
 
-#: ../clients/cli/connections.c:1935
+#: ../clients/cli/connections.c:1937
 msgid "the connection attempt timed out"
 msgstr "Der Verbindungsversuch benötigte zu viel Zeit"
 
-#: ../clients/cli/connections.c:1937
+#: ../clients/cli/connections.c:1939
 msgid "the VPN service did not start in time"
 msgstr "Der VPN-Dienst wurde nicht rechtzeitig gestartet"
 
-#: ../clients/cli/connections.c:1939
+#: ../clients/cli/connections.c:1941
 msgid "the VPN service failed to start"
 msgstr "Der VPN-Dienst konnte nicht gestartet werden"
 
-#: ../clients/cli/connections.c:1941
+#: ../clients/cli/connections.c:1943
 msgid "no valid VPN secrets"
 msgstr "Keine gültigen VPN-Schlüssel"
 
-#: ../clients/cli/connections.c:1943
+#: ../clients/cli/connections.c:1945
 msgid "invalid VPN secrets"
 msgstr "Ungültige VPN-Schlüssel"
 
-#: ../clients/cli/connections.c:1945
+#: ../clients/cli/connections.c:1947
 msgid "the connection was removed"
 msgstr "Die Verbindung wurde entfernt"
 
-#: ../clients/cli/connections.c:1967 ../clients/cli/connections.c:1995
-#: ../clients/cli/connections.c:2156 ../clients/cli/connections.c:8400
+#: ../clients/cli/connections.c:1969 ../clients/cli/connections.c:1997
+#: ../clients/cli/connections.c:2158 ../clients/cli/connections.c:8463
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:1974
-#, fuzzy, c-format
-#| msgid "Connection successfully activated (D-Bus active path: %s)\n"
+#: ../clients/cli/connections.c:1976
+#, c-format
 msgid ""
 "Connection successfully activated (master waiting for slaves) (D-Bus active "
 "path: %s)\n"
-msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
+msgstr ""
+"Verbindung wurde erfolgreich aktiviert (master wartet auf slaves) (aktiver D-"
+"Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:1978 ../clients/cli/connections.c:2000
+#: ../clients/cli/connections.c:1980 ../clients/cli/connections.c:2002
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert."
 
-#: ../clients/cli/connections.c:2051
+#: ../clients/cli/connections.c:2053
 #, c-format
 msgid "VPN connection successfully activated (D-Bus active path: %s)\n"
 msgstr "VPN-Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:2059
+#: ../clients/cli/connections.c:2061
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s."
 
-#: ../clients/cli/connections.c:2078 ../clients/cli/devices.c:1425
+#: ../clients/cli/connections.c:2080 ../clients/cli/devices.c:1426
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "Fehler: Zeitbeschränkung von %d Sekunden ist abgelaufen."
 
-#: ../clients/cli/connections.c:2138
+#: ../clients/cli/connections.c:2140
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s"
 
-#: ../clients/cli/connections.c:2223
-#, fuzzy, c-format
-#| msgid "Error: failed to remove value of '%s': %s\n"
+#: ../clients/cli/connections.c:2225
+#, c-format
 msgid "failed to read passwd-file '%s': %s"
-msgstr "Fehler: Entfernen des Wertes »%s« ist fehlgeschlagen: %s\n"
+msgstr "Fehler: Lesen der passwd-Datei »%s« ist fehlgeschlagen: %s"
 
-#: ../clients/cli/connections.c:2235
+#: ../clients/cli/connections.c:2237
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "Fehlender Doppelpunkt im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2243
+#: ../clients/cli/connections.c:2245
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "Fehlender Punkt im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2256
+#: ../clients/cli/connections.c:2258
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "Ungültiger Einstellungsname im Passwort-Eintrag »%s«"
 
-#: ../clients/cli/connections.c:2303 ../clients/cli/connections.c:2451
-msgid "unknown error"
-msgstr "unbekannter Fehler"
-
-#: ../clients/cli/connections.c:2312
+#: ../clients/cli/connections.c:2314
 #, c-format
 msgid "unknown device '%s'."
 msgstr "Unbekanntes Gerät »%s«,"
 
-#: ../clients/cli/connections.c:2317
+#: ../clients/cli/connections.c:2319
 msgid "neither a valid connection nor device given"
 msgstr "weder eine gültige Verbindung noch ein Gerät angegeben"
 
-#: ../clients/cli/connections.c:2400
+#: ../clients/cli/connections.c:2402
 #, c-format
 msgid "Error: Connection '%s' does not exist."
 msgstr "Fehler: Verbindung »%s« ist nicht vorhanden."
 
-#: ../clients/cli/connections.c:2435 ../clients/cli/devices.c:1324
-#: ../clients/cli/devices.c:2357 ../clients/cli/devices.c:2751
-#: ../clients/cli/devices.c:3335
+#: ../clients/cli/connections.c:2437 ../clients/cli/devices.c:1325
+#: ../clients/cli/devices.c:2358 ../clients/cli/devices.c:2752
+#: ../clients/cli/devices.c:3336
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr "Unbekannter Parameter: %s\n"
 
-#: ../clients/cli/connections.c:2460
+#: ../clients/cli/connections.c:2462
 msgid "preparing"
 msgstr "Vorbereitung läuft"
 
-#: ../clients/cli/connections.c:2481
+#: ../clients/cli/connections.c:2483
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich gelöscht.\n"
 
-#: ../clients/cli/connections.c:2497
+#: ../clients/cli/connections.c:2499
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr ""
 "Verbindung »%s« wurde erfolgreich deaktiviert (aktiver D-Bus-Pfad: %s)\n"
 
-#: ../clients/cli/connections.c:2568 ../clients/cli/connections.c:10294
-#: ../clients/cli/connections.c:10493
+#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:10400
+#: ../clients/cli/connections.c:10599
 #, c-format
 msgid "Error: No connection specified."
 msgstr "Fehler: Keine Verbindung angegeben."
 
-#: ../clients/cli/connections.c:2600
+#: ../clients/cli/connections.c:2602
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "Fehler: »%s« ist keine aktive Verbindung.\n"
 
-#: ../clients/cli/connections.c:2601 ../clients/cli/connections.c:10323
+#: ../clients/cli/connections.c:2603 ../clients/cli/connections.c:10429
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gefunden."
 
-#: ../clients/cli/connections.c:2610
+#: ../clients/cli/connections.c:2612
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "Fehler: Keine aktive Verbindung angegeben."
 
-#: ../clients/cli/connections.c:2967 ../clients/cli/utils.c:698
+#: ../clients/cli/connections.c:2955 ../clients/cli/utils.c:702
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "»%s« ist nicht unter [%s]"
 
-#: ../clients/cli/connections.c:3046
+#: ../clients/cli/connections.c:3032
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3047 ../clients/cli/connections.c:3579
-#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1646
-#: ../libnm-glib/nm-device.c:1862 ../libnm/nm-device.c:1813
+#: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565
+#: ../clients/tui/nm-editor-utils.c:163 ../libnm-core/nm-connection.c:1646
+#: ../libnm-glib/nm-device.c:1861 ../libnm/nm-device.c:1812
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/cli/connections.c:3047 ../clients/tui/nm-editor-utils.c:147
-#: ../libnm-glib/nm-device.c:1850 ../libnm/nm-device.c:1801
+#: ../clients/cli/connections.c:3033 ../clients/tui/nm-editor-utils.c:146
+#: ../libnm-glib/nm-device.c:1849 ../libnm/nm-device.c:1800
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3067
+#: ../clients/cli/connections.c:3053
 #, c-format
 msgid "Error: 'mtu': '%s' is not a valid MTU."
 msgstr "Fehler: »mtu«: »%s« ist keine gültige MTU."
 
-#: ../clients/cli/connections.c:3083
+#: ../clients/cli/connections.c:3069
 #, c-format
 msgid "Error: 'parent': '%s' is not a valid interface name."
 msgstr "Fehler: »parent«: »%s« ist kein gültiger Name einer Schnittstelle."
 
-#: ../clients/cli/connections.c:3104
+#: ../clients/cli/connections.c:3090
 #, c-format
 msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY."
 msgstr "Fehler: »p-key«: »%s« ist kein gültiger InfiniBand »P_KEY«."
 
-#: ../clients/cli/connections.c:3119
-#, fuzzy, c-format
-#| msgid "Error: 'mtu': '%s' is not a valid MTU."
+#: ../clients/cli/connections.c:3105
+#, c-format
 msgid "Error: '%s' is not a valid UID/GID."
-msgstr "Fehler: »mtu«: »%s« ist keine gültige MTU."
+msgstr "Fehler: »%s« ist keine gültige UID/GID."
 
-#: ../clients/cli/connections.c:3163
+#: ../clients/cli/connections.c:3149
 #, c-format
 msgid "Error: '%s': '%s' is not a valid %s %s."
 msgstr "Fehler: »%s«: »%s« ist kein gültiges %s %s."
 
-#: ../clients/cli/connections.c:3176
+#: ../clients/cli/connections.c:3162
 msgid "Wi-Fi mode"
 msgstr "WLAN-Modus"
 
-#: ../clients/cli/connections.c:3185
+#: ../clients/cli/connections.c:3171
 msgid "InfiniBand transport mode"
 msgstr "InfiniBand Transportmodus"
 
-#: ../clients/cli/connections.c:3197
+#: ../clients/cli/connections.c:3183
 msgid "ADSL protocol"
 msgstr "ADSL-Protokoll"
 
-#: ../clients/cli/connections.c:3208
+#: ../clients/cli/connections.c:3194
 msgid "ADSL encapsulation"
 msgstr "ADSL-Einkapselung"
 
-#: ../clients/cli/connections.c:3217
-#, fuzzy
-#| msgid "The device was removed"
+#: ../clients/cli/connections.c:3203
 msgid "TUN device mode"
-msgstr "Das Gerät wurde entfernt"
+msgstr "TUN-Gerätemodus"
 
-#: ../clients/cli/connections.c:3230
+#: ../clients/cli/connections.c:3216
 #, c-format
 msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgstr "Fehler: »flags«: »%s« ist ungültig. Verwenden Sie <0-7>."
 
-#: ../clients/cli/connections.c:3252
+#: ../clients/cli/connections.c:3238
 #, c-format
 msgid "Error: '%s': '%s' is not valid; %s "
 msgstr "Fehler: »%s«: »%s« ist ungültig; %s "
 
-#: ../clients/cli/connections.c:3430
+#: ../clients/cli/connections.c:3416
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "Warnung: master=»%s« bezieht sich auf kein vorhandenes Profil.\n"
 
-#: ../clients/cli/connections.c:3455
+#: ../clients/cli/connections.c:3441
 #, c-format
 msgid "Error: '%s': '%s' is not valid; use <%u-%u>."
 msgstr "Fehler: »%s«: »%s« ist ungültig; verwenden Sie <%u-%u>."
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:3511
+#: ../clients/cli/connections.c:3497
 #, 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"
 msgstr[0] "Es gibt %d optionales Argument für den Verbindungstyp »%s«.\n"
 msgstr[1] "Es gibt %d optionale Argumente für den Verbindungstyp »%s«.\n"
 
-#: ../clients/cli/connections.c:3514
+#: ../clients/cli/connections.c:3500
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
@@ -2136,463 +2121,453 @@ msgstr[0] "Möchten Sie es zur Verfügung stellen? »%s«"
 msgstr[1] "Möchten Sie diese zur Verfügung stellen? »%s«"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3531
+#: ../clients/cli/connections.c:3517
 msgid "ethernet"
 msgstr "Ethernet"
 
-#: ../clients/cli/connections.c:3536 ../clients/cli/connections.c:3584
-#: ../clients/cli/connections.c:3718 ../clients/cli/connections.c:3797
+#: ../clients/cli/connections.c:3522 ../clients/cli/connections.c:3570
+#: ../clients/cli/connections.c:3704 ../clients/cli/connections.c:3783
 msgid "MTU [auto]: "
 msgstr "MTU [automatisch]: "
 
-#: ../clients/cli/connections.c:3547 ../clients/cli/connections.c:3595
-#: ../clients/cli/connections.c:3690 ../clients/cli/connections.c:3729
-#: ../clients/cli/connections.c:4115
+#: ../clients/cli/connections.c:3533 ../clients/cli/connections.c:3581
+#: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715
+#: ../clients/cli/connections.c:4101
 msgid "MAC [none]: "
 msgstr "MAC [keine]: "
 
-#: ../clients/cli/connections.c:3558
+#: ../clients/cli/connections.c:3544
 msgid "Cloned MAC [none]: "
 msgstr "Geklonte MAC [keine]: "
 
-#: ../clients/cli/connections.c:3606
+#: ../clients/cli/connections.c:3592
 #, c-format
 msgid "Transport mode %s"
 msgstr "Übertragungsmodus %s"
 
-#: ../clients/cli/connections.c:3619
+#: ../clients/cli/connections.c:3605
 msgid "Parent interface [none]: "
 msgstr "Übergeordnete Schnittstelle [keine]: "
 
-#: ../clients/cli/connections.c:3630
+#: ../clients/cli/connections.c:3616
 msgid "P_KEY [none]: "
 msgstr "P_KEY [keiner]: "
 
-#: ../clients/cli/connections.c:3640
+#: ../clients/cli/connections.c:3626
 #, c-format
 msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n"
 msgstr "Fehler: »p-key« wird benötigt wenn »parent« angegeben ist.\n"
 
 #. Ask for optional arguments
-#: ../clients/cli/connections.c:3657 ../clients/tui/nm-editor-utils.c:155
-#: ../libnm-glib/nm-device.c:1852 ../libnm/nm-device.c:1803
+#: ../clients/cli/connections.c:3643 ../clients/tui/nm-editor-utils.c:154
+#: ../libnm-glib/nm-device.c:1851 ../libnm/nm-device.c:1802
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/cli/connections.c:3665 ../clients/cli/connections.c:6069
+#: ../clients/cli/connections.c:3651 ../clients/cli/connections.c:6070
 #, c-format
 msgid "Mode %s"
 msgstr "Modus %s"
 
 #. Ask for optional 'wimax' arguments.
-#: ../clients/cli/connections.c:3685 ../libnm-glib/nm-device.c:1858
-#: ../libnm/nm-device.c:1809
+#: ../clients/cli/connections.c:3671 ../libnm-glib/nm-device.c:1857
+#: ../libnm/nm-device.c:1808
 msgid "WiMAX"
 msgstr "WiMAX"
 
 #. Ask for optional 'pppoe' arguments.
-#: ../clients/cli/connections.c:3708
+#: ../clients/cli/connections.c:3694
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/cli/connections.c:3712 ../clients/cli/connections.c:3750
-#: ../clients/cli/connections.c:4237
+#: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736
+#: ../clients/cli/connections.c:4223
 msgid "Password [none]: "
 msgstr "Passwort [keines]: "
 
-#: ../clients/cli/connections.c:3714
+#: ../clients/cli/connections.c:3700
 msgid "Service [none]: "
 msgstr "Dienst [keiner]: "
 
 #. Ask for optional 'gsm' or 'cdma' arguments.
-#: ../clients/cli/connections.c:3744
+#: ../clients/cli/connections.c:3730
 msgid "mobile broadband"
 msgstr "Mobiles Breitband"
 
-#: ../clients/cli/connections.c:3748 ../clients/cli/connections.c:4187
+#: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173
 msgid "Username [none]: "
 msgstr "Benutzername [keiner]: "
 
 #. Ask for optional 'bluetooth' arguments.
-#: ../clients/cli/connections.c:3763
+#: ../clients/cli/connections.c:3749
 msgid "bluetooth"
 msgstr "bluetooth"
 
-#: ../clients/cli/connections.c:3770
+#: ../clients/cli/connections.c:3756
 #, c-format
 msgid "Bluetooth type %s"
 msgstr "Bluetooth-Typ %s"
 
-#: ../clients/cli/connections.c:3776
+#: ../clients/cli/connections.c:3762
 #, c-format
 msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n"
 msgstr "Fehler: »bt-type«: »%s« ist kein gültiger Bluetooth-Typ.\n"
 
 #. Ask for optional 'vlan' arguments.
 #. 13
-#: ../clients/cli/connections.c:3792 ../clients/cli/devices.c:240
-#: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:95
-#: ../libnm-core/nm-connection.c:1644 ../libnm-glib/nm-device.c:1870
-#: ../libnm-util/nm-connection.c:1600 ../libnm/nm-device.c:1821
+#: ../clients/cli/connections.c:3778 ../clients/cli/devices.c:239
+#: ../clients/tui/nm-editor-utils.c:217 ../clients/tui/nmt-page-vlan.c:94
+#: ../libnm-core/nm-connection.c:1644 ../libnm-glib/nm-device.c:1869
+#: ../libnm-util/nm-connection.c:1601 ../libnm/nm-device.c:1820
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/cli/connections.c:3808
+#: ../clients/cli/connections.c:3794
 msgid "VLAN flags (<0-7>) [none]: "
 msgstr "VLAN-Flags (<0-7>) [keine]: "
 
-#: ../clients/cli/connections.c:3819
+#: ../clients/cli/connections.c:3805
 msgid "Ingress priority maps [none]: "
 msgstr "Eingehende Prioritätsumschlüsselungen [keine]:"
 
-#: ../clients/cli/connections.c:3830
+#: ../clients/cli/connections.c:3816
 msgid "Egress priority maps [none]: "
 msgstr "Ausgehende Prioritätsumschlüsselungen [keine]:"
 
-#: ../clients/cli/connections.c:3841
+#: ../clients/cli/connections.c:3827
 msgid "Bonding mode [balance-rr]: "
 msgstr "Bündelungsmodus [balance-rr]: "
 
 #. Ask for optional 'bond' arguments.
-#: ../clients/cli/connections.c:3857
+#: ../clients/cli/connections.c:3843
 msgid "bond"
 msgstr "Bündelung"
 
-#: ../clients/cli/connections.c:3879
+#: ../clients/cli/connections.c:3865
 msgid "Bonding primary interface [none]: "
 msgstr "Primäre Schnittstelle der Bündelung [keine]: "
 
-#: ../clients/cli/connections.c:3882
+#: ../clients/cli/connections.c:3868
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name.\n"
 msgstr "Fehler: »primary«: »%s« ist kein gültiger Name einer Schnittstelle.\n"
 
-#: ../clients/cli/connections.c:3890
+#: ../clients/cli/connections.c:3876
 #, c-format
 msgid "Bonding monitoring mode %s"
 msgstr "Überwachungsmodus %s der Bündelung"
 
-#: ../clients/cli/connections.c:3896
+#: ../clients/cli/connections.c:3882
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr ""
 "Fehler: »%s« ist kein gültiger Überwachungsmodus; verwenden Sie »%s« oder "
 "»%s«.\n"
 
-#: ../clients/cli/connections.c:3905
+#: ../clients/cli/connections.c:3891
 msgid "Bonding miimon [100]: "
 msgstr "Bündelung »miimon« [100]: "
 
-#: ../clients/cli/connections.c:3908
+#: ../clients/cli/connections.c:3894
 #, c-format
 msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »miimon«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3916
+#: ../clients/cli/connections.c:3902
 msgid "Bonding downdelay [0]: "
 msgstr "Bündelung »downdelay« [0]: "
 
-#: ../clients/cli/connections.c:3919
+#: ../clients/cli/connections.c:3905
 #, c-format
 msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »downdelay«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3927
+#: ../clients/cli/connections.c:3913
 msgid "Bonding updelay [0]: "
 msgstr "Bündelung »updelay« [0]: "
 
-#: ../clients/cli/connections.c:3930
+#: ../clients/cli/connections.c:3916
 #, c-format
 msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »updelay«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:3939
+#: ../clients/cli/connections.c:3925
 msgid "Bonding arp-interval [0]: "
 msgstr "Bündelung »arp-interval« [0]: "
 
-#: ../clients/cli/connections.c:3942
+#: ../clients/cli/connections.c:3928
 #, c-format
 msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n"
 msgstr "Fehler: »arp-interval«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
 #. FIXME: verify the string
-#: ../clients/cli/connections.c:3950
+#: ../clients/cli/connections.c:3936
 msgid "Bonding arp-ip-target [none]: "
 msgstr "Bündelung »arp-ip-target« [keines]: "
 
-#: ../clients/cli/connections.c:3957
+#: ../clients/cli/connections.c:3943
 msgid "LACP rate ('slow' or 'fast') [slow]: "
 msgstr "LACP-Rate (»slow« oder »fast«) [slow]: "
 
-#: ../clients/cli/connections.c:3963
+#: ../clients/cli/connections.c:3949
 #, c-format
 msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n"
 msgstr "Fehler: »lacp_rate«: »%s« ist ungültig (»slow« oder »fast«).\n"
 
-#: ../clients/cli/connections.c:3986
+#: ../clients/cli/connections.c:3972
 msgid "Team JSON configuration [none]: "
 msgstr "JSON-Konfiguration der Bündelung [keine]: "
 
-#: ../clients/cli/connections.c:4003
+#: ../clients/cli/connections.c:3989
 msgid "team"
 msgstr "Bündelung"
 
-#: ../clients/cli/connections.c:4009
+#: ../clients/cli/connections.c:3995
 msgid "team-slave"
 msgstr "Bündelungs-Slave"
 
 #. Ask for optional 'bridge' arguments.
-#: ../clients/cli/connections.c:4021
+#: ../clients/cli/connections.c:4007
 msgid "bridge"
 msgstr "Brücke"
 
-#: ../clients/cli/connections.c:4027
+#: ../clients/cli/connections.c:4013
 #, c-format
 msgid "Enable STP %s"
 msgstr "STP %s aktivieren"
 
-#: ../clients/cli/connections.c:4032
+#: ../clients/cli/connections.c:4018
 #, c-format
 msgid "Error: 'stp': %s.\n"
 msgstr "Fehler: »STP«: %s \n"
 
-#: ../clients/cli/connections.c:4040
+#: ../clients/cli/connections.c:4026
 msgid "STP priority [32768]: "
 msgstr "STP-Priorität [32768]: "
 
-#: ../clients/cli/connections.c:4044
+#: ../clients/cli/connections.c:4030
 #, c-format
 msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgstr "Fehler: »priority«: »%s« ist keine gültige Zahl <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4052
+#: ../clients/cli/connections.c:4038
 msgid "Forward delay [15]: "
 msgstr "Weiterleitungsverzögerung [15]: "
 
-#: ../clients/cli/connections.c:4056
+#: ../clients/cli/connections.c:4042
 #, c-format
 msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n"
 msgstr "Fehler: »forward-delay«: »%s« ist keine gültige Zahl <2-30>.\n"
 
-#: ../clients/cli/connections.c:4065
+#: ../clients/cli/connections.c:4051
 msgid "Hello time [2]: "
 msgstr "Hello-Zeit [2]: "
 
-#: ../clients/cli/connections.c:4069
+#: ../clients/cli/connections.c:4055
 #, c-format
 msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n"
 msgstr "Fehler: »hello-time«: »%s« ist keine gültige Zahl <1-10>.\n"
 
-#: ../clients/cli/connections.c:4077
+#: ../clients/cli/connections.c:4063
 msgid "Max age [20]: "
 msgstr "Maximales Alter [20]: "
 
-#: ../clients/cli/connections.c:4081
+#: ../clients/cli/connections.c:4067
 #, c-format
 msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n"
 msgstr "Fehler: »max.age«: »%s« ist keine gültige Zahl <6-40>.\n"
 
-#: ../clients/cli/connections.c:4089
+#: ../clients/cli/connections.c:4075
 msgid "MAC address ageing time [300]: "
 msgstr "Verfallszeit für MAC-Adressen [300]: "
 
-#: ../clients/cli/connections.c:4093
+#: ../clients/cli/connections.c:4079
 #, c-format
 msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n"
 msgstr "Fehler: 'ageing-time': »%s« ist keine gültige Zahl <0-1000000>.\n"
 
-#: ../clients/cli/connections.c:4102
+#: ../clients/cli/connections.c:4088
 #, c-format
 msgid "Enable IGMP snooping %s"
 msgstr "IGMP-Snooping %s aktivieren"
 
-#: ../clients/cli/connections.c:4107
+#: ../clients/cli/connections.c:4093
 #, c-format
 msgid "Error: 'multicast-snooping': %s.\n"
 msgstr "Fehler: »multicast-snooping«: %s \n"
 
 #. Ask for optional 'bridge-slave' arguments.
-#: ../clients/cli/connections.c:4134
+#: ../clients/cli/connections.c:4120
 msgid "bridge-slave"
 msgstr "Sklave der Netzwerkbrücke"
 
-#: ../clients/cli/connections.c:4139
+#: ../clients/cli/connections.c:4125
 msgid "Bridge port priority [32]: "
 msgstr "Bridge-Port-Priorität [32]: "
 
-#: ../clients/cli/connections.c:4152
+#: ../clients/cli/connections.c:4138
 msgid "Bridge port STP path cost [100]: "
 msgstr "Bridge-Port-STP-Pfadkosten [100]: "
 
-#: ../clients/cli/connections.c:4166
+#: ../clients/cli/connections.c:4152
 #, c-format
 msgid "Hairpin %s"
 msgstr "Hairpin %s"
 
-#: ../clients/cli/connections.c:4171
+#: ../clients/cli/connections.c:4157
 #, c-format
 msgid "Error: 'hairpin': %s.\n"
 msgstr "Fehler: »hairpin«: %s \n"
 
 #. Ask for optional 'olpc' arguments.
-#: ../clients/cli/connections.c:4198 ../libnm-glib/nm-device.c:1856
-#: ../libnm/nm-device.c:1807
+#: ../clients/cli/connections.c:4184 ../libnm-glib/nm-device.c:1855
+#: ../libnm/nm-device.c:1806
 msgid "OLPC Mesh"
 msgstr "OLPC-Mesh"
 
-#: ../clients/cli/connections.c:4203
+#: ../clients/cli/connections.c:4189
 msgid "OLPC Mesh channel [1]: "
 msgstr "»OLPC Mesh« Kanal [1]: "
 
-#: ../clients/cli/connections.c:4206
+#: ../clients/cli/connections.c:4192
 #, c-format
 msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n"
 msgstr "Fehler: »channel«: »%s« ist keine gültige Zahl <1-13>.\n"
 
-#: ../clients/cli/connections.c:4214
+#: ../clients/cli/connections.c:4200
 msgid "DHCP anycast MAC address [none]: "
 msgstr "DHCP anycast MAC-Adresse [keine]: "
 
 #. Ask for optional 'adsl' arguments.
-#: ../clients/cli/connections.c:4233 ../libnm-glib/nm-device.c:1872
-#: ../libnm/nm-device.c:1823
+#: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871
+#: ../libnm/nm-device.c:1822
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../clients/cli/connections.c:4241
+#: ../clients/cli/connections.c:4227
 #, c-format
 msgid "ADSL encapsulation %s"
 msgstr "ADSL-Einkapselung %s"
 
 #. Ask for optional 'macvlan' arguments.
-#: ../clients/cli/connections.c:4259
+#: ../clients/cli/connections.c:4245
 msgid "macvlan"
-msgstr ""
+msgstr "macvlan"
 
-#: ../clients/cli/connections.c:4265
+#: ../clients/cli/connections.c:4251
 #, c-format
 msgid "Tap %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4270
-#, fuzzy, c-format
-#| msgid "Error: 'stp': %s.\n"
+#: ../clients/cli/connections.c:4256
+#, c-format
 msgid "Error: 'tap': %s.\n"
-msgstr "Fehler: »STP«: %s \n"
+msgstr "Fehler: »tap«: %s \n"
 
 # virtuelles LAN, z.B. in virtualisierten Umgebungen
 #. Ask for optional 'vxlan' arguments.
-#: ../clients/cli/connections.c:4286
+#: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875
+#: ../libnm/nm-device.c:1826
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../clients/cli/connections.c:4291 ../clients/cli/connections.c:4615
-#, fuzzy
-#| msgid "Parent interface [none]: "
+#: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601
 msgid "Parent device [none]: "
-msgstr "Übergeordnete Schnittstelle [keine]: "
+msgstr "Übergeordnetes Gerät [keines]: "
 
-#: ../clients/cli/connections.c:4296 ../clients/cli/connections.c:4620
-#, fuzzy, c-format
-#| msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
+#: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606
+#, c-format
 msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n"
-msgstr ""
-"Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname oder "
-"eine MAC-Adresse."
+msgstr "Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname.\n"
 
-#: ../clients/cli/connections.c:4305
-#, fuzzy
-#| msgid "DHCP anycast MAC address [none]: "
+#: ../clients/cli/connections.c:4291
 msgid "Local address [none]: "
-msgstr "DHCP anycast MAC-Adresse [keine]: "
+msgstr "Lokale Adresse [keine]: "
 
-#: ../clients/cli/connections.c:4310
-#, fuzzy, c-format
-#| msgid "Error: '%s': '%s' is not a valid %s MAC address."
+#: ../clients/cli/connections.c:4296
+#, c-format
 msgid "Error: 'local': '%s' is not a valid IP address.\n"
-msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
+msgstr "Fehler: »local«: »%s« ist keine gültige IP-Adresse.\n"
 
-#: ../clients/cli/connections.c:4319
+#: ../clients/cli/connections.c:4305
 msgid "Minimum source port [0]: "
-msgstr ""
+msgstr "Kleinster Quellport [0]: "
 
-#: ../clients/cli/connections.c:4323
+#: ../clients/cli/connections.c:4309
 #, fuzzy, c-format
 #| msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n"
 msgstr "Fehler: »priority«: »%s« ist keine gültige Zahl <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4332
+#: ../clients/cli/connections.c:4318
 msgid "Maximum source port [0]: "
-msgstr ""
+msgstr "Größter Quellport [0]: "
 
-#: ../clients/cli/connections.c:4336
+#: ../clients/cli/connections.c:4322
 #, fuzzy, c-format
 #| msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n"
 msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n"
 msgstr "Fehler: »priority«: »%s« ist keine gültige Zahl <0-%d>.\n"
 
-#: ../clients/cli/connections.c:4345
-#, fuzzy
-#| msgid "Destination"
+#: ../clients/cli/connections.c:4331
 msgid "Destination port [8472]: "
-msgstr "Ziel"
+msgstr "Zielport [8472]: "
 
-#: ../clients/cli/connections.c:4349
+#: ../clients/cli/connections.c:4335
 #, fuzzy, c-format
 #| msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n"
 msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n"
 msgstr "Fehler: »miimon«: »%s« ist keine gültige Zahl <0-%u>.\n"
 
-#: ../clients/cli/connections.c:4388
+#: ../clients/cli/connections.c:4374
 msgid "IPv4 address (IP[/plen]) [none]: "
 msgstr "IPv4-Adresse (IP[/plen]) [keine]: "
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4376
 msgid "IPv6 address (IP[/plen]) [none]: "
 msgstr "IPv6-Adresse (IP[/plen]) [keine]: "
 
-#: ../clients/cli/connections.c:4404
+#: ../clients/cli/connections.c:4390
 #, c-format
 msgid "  Address successfully added: %s\n"
 msgstr "  Adresse erfolgreich hinzugefügt: %s\n"
 
-#: ../clients/cli/connections.c:4406
+#: ../clients/cli/connections.c:4392
 #, c-format
 msgid "  Warning: address already present: %s\n"
 msgstr "  Warnung: Adresse ist bereits vorhanden: %s\n"
 
-#: ../clients/cli/connections.c:4408
+#: ../clients/cli/connections.c:4394
 #, c-format
 msgid "  Warning: ignoring garbage at the end: '%s'\n"
 msgstr "  Warnung: der Unsinn am Ende wird ignoriert: »%s«\n"
 
-#: ../clients/cli/connections.c:4410 ../clients/cli/connections.c:5591
-#: ../clients/cli/connections.c:6451 ../clients/cli/connections.c:6577
-#: ../clients/cli/connections.c:6610
+#: ../clients/cli/connections.c:4396 ../clients/cli/connections.c:5590
+#: ../clients/cli/connections.c:6452 ../clients/cli/connections.c:6578
+#: ../clients/cli/connections.c:6611
 msgid "Error: "
 msgstr "Fehler: "
 
-#: ../clients/cli/connections.c:4430
+#: ../clients/cli/connections.c:4416
 msgid "IPv4 gateway [none]: "
 msgstr "IPv4-Gateway [keines]: "
 
-#: ../clients/cli/connections.c:4433
+#: ../clients/cli/connections.c:4419
 msgid "IPv6 gateway [none]: "
 msgstr "IPv6-Gateway [keines]: "
 
-#: ../clients/cli/connections.c:4453
+#: ../clients/cli/connections.c:4439
 #, c-format
 msgid "Error: invalid gateway address '%s'\n"
 msgstr "Fehler: Ungültige Gateway-Adresse »%s«\n"
 
 #. Ask for IP addresses
-#: ../clients/cli/connections.c:4466
+#: ../clients/cli/connections.c:4452
 #, c-format
 msgid "Do you want to add IP addresses? %s"
 msgstr "Möchten Sie die IP-Adresse hinzufügen? %s"
 
-#: ../clients/cli/connections.c:4474
+#: ../clients/cli/connections.c:4460
 #, c-format
 msgid "Press  to finish adding addresses.\n"
 msgstr ""
@@ -2600,116 +2575,110 @@ msgstr ""
 "abzuschließen.\n"
 
 #. Ask for optional 'tun' arguments.
-#: ../clients/cli/connections.c:4518
+#: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879
+#: ../libnm/nm-device.c:1830
 msgid "Tun"
-msgstr ""
+msgstr "Tun"
 
-#: ../clients/cli/connections.c:4523
-#, fuzzy
-#| msgid "Username [none]: "
+#: ../clients/cli/connections.c:4509
 msgid "User ID [none]: "
-msgstr "Benutzername [keiner]: "
+msgstr "Benutzerkennung [keine]: "
 
-#: ../clients/cli/connections.c:4536
-#, fuzzy
-#| msgid "MAC [none]: "
+#: ../clients/cli/connections.c:4522
 msgid "Group ID [none]: "
-msgstr "MAC [keine]: "
+msgstr "Gruppenkennung [keine]: "
 
-#: ../clients/cli/connections.c:4550
+#: ../clients/cli/connections.c:4536
 #, fuzzy, c-format
 #| msgid "Enable STP %s"
 msgid "Enable PI %s"
 msgstr "STP %s aktivieren"
 
-#: ../clients/cli/connections.c:4555
+#: ../clients/cli/connections.c:4541
 #, fuzzy, c-format
 #| msgid "Error: 'stp': %s.\n"
 msgid "Error: 'pi': %s.\n"
 msgstr "Fehler: »STP«: %s \n"
 
-#: ../clients/cli/connections.c:4563
+#: ../clients/cli/connections.c:4549
 #, fuzzy, c-format
 #| msgid "Enable STP %s"
 msgid "Enable VNET header %s"
 msgstr "STP %s aktivieren"
 
-#: ../clients/cli/connections.c:4568
+#: ../clients/cli/connections.c:4554
 #, fuzzy, c-format
 #| msgid "Error: 'stp': %s.\n"
 msgid "Error: 'vnet-hdr': %s.\n"
 msgstr "Fehler: »STP«: %s \n"
 
-#: ../clients/cli/connections.c:4576
+#: ../clients/cli/connections.c:4562
 #, c-format
 msgid "Enable multi queue %s"
 msgstr ""
 
-#: ../clients/cli/connections.c:4581
-#, fuzzy, c-format
-#| msgid "Error: 'mode': %s."
+#: ../clients/cli/connections.c:4567
+#, c-format
 msgid "Error: 'multi-queue': %s.\n"
-msgstr "Fehler: »mode«: %s."
+msgstr "Fehler: »multi-queue«: %s.\n"
 
 #. Ask for optional 'ip-tunnel' arguments.
-#: ../clients/cli/connections.c:4595
+#: ../clients/cli/connections.c:4581
 msgid "IP Tunnel"
 msgstr "IP-Tunnel"
 
-#: ../clients/cli/connections.c:4600
-#, fuzzy
-#| msgid "Parent interface [none]: "
+#: ../clients/cli/connections.c:4586
 msgid "Local endpoint [none]: "
-msgstr "Übergeordnete Schnittstelle [keine]: "
+msgstr "Lokaler Endpunkt [keiner]: "
 
-#: ../clients/cli/connections.c:4606
+#: ../clients/cli/connections.c:4592
 #, fuzzy, c-format
 #| msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgid "Error: 'local': '%s' is not valid; must be an IP address\n"
 msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
 
-#: ../clients/cli/connections.c:4661 ../clients/cli/connections.c:10087
+#: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10193
 #, c-format
 msgid "Error: . argument is missing."
 msgstr "Fehler: Argument für Einstellung fehlt."
 
-#: ../clients/cli/connections.c:4666
+#: ../clients/cli/connections.c:4663
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "Fehler: Wert für »%s« fehlt."
 
-#: ../clients/cli/connections.c:4684
+#: ../clients/cli/connections.c:4681
 #, c-format
 msgid "Error: invalid . '%s'."
 msgstr "Fehler: Ungültiger Einstellungsname: »%s«."
 
-#: ../clients/cli/connections.c:4691
+#: ../clients/cli/connections.c:4689
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "Fehler: Ungültige oder nicht zulässige Einstellung »%s«: %s."
 
-#: ../clients/cli/connections.c:4702
+#: ../clients/cli/connections.c:4700
 #, c-format
 msgid "Error: don't know how to create '%s' setting."
 msgstr ""
 "Fehler: Es ist unbekannt, wie die Einstellung »%s« erstellt werden kann."
 
-#: ../clients/cli/connections.c:4712
+#: ../clients/cli/connections.c:4710
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "Fehler: Ungültige Eigenschaft »%s«: %s."
 
-#: ../clients/cli/connections.c:4724
+#: ../clients/cli/connections.c:4722
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "Fehler: Ändern ist fehlgeschlagen %s.%s: %s."
 
-#: ../clients/cli/connections.c:4743
+#: ../clients/cli/connections.c:4741
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "Fehler: Entfernen eines Wertes von %s.%s: %s ist fehlgeschlagen."
 
-#: ../clients/cli/connections.c:4776
+#: ../clients/cli/connections.c:4775
 #, c-format
 msgid ""
 "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead."
@@ -2717,212 +2686,202 @@ msgstr ""
 "Warning: »type« wird ignored. Verwenden Sie stattdessen »nmcli connection "
 "add %s …« ."
 
-#: ../clients/cli/connections.c:4784
+#: ../clients/cli/connections.c:4783
 msgid "Error: redundant 'master' option."
 msgstr "Fehler: Redundante Option »master«."
 
-#: ../clients/cli/connections.c:4794
+#: ../clients/cli/connections.c:4793
 msgid "Error: 'master' is required."
 msgstr "Fehler: »master« ist notwendig."
 
-#: ../clients/cli/connections.c:4948
+#: ../clients/cli/connections.c:4947
 #, c-format
 msgid "Error: 'parent': not valid without 'p-key'."
 msgstr "Fehler: »parent«: nicht gültig ohne »p-key«."
 
-#: ../clients/cli/connections.c:5003 ../clients/cli/connections.c:5839
+#: ../clients/cli/connections.c:5002 ../clients/cli/connections.c:5838
 msgid "SSID: "
 msgstr "SSID: "
 
-#: ../clients/cli/connections.c:5006 ../clients/cli/connections.c:5842
+#: ../clients/cli/connections.c:5005 ../clients/cli/connections.c:5841
 msgid "Error: 'ssid' is required."
 msgstr "Fehler: »SSID« ist notwendig."
 
-#: ../clients/cli/connections.c:5070
+#: ../clients/cli/connections.c:5069
 msgid "WiMAX NSP name: "
 msgstr "WiMAX NSP-Name: "
 
-#: ../clients/cli/connections.c:5073
+#: ../clients/cli/connections.c:5072
 msgid "Error: 'nsp' is required."
 msgstr "Fehler: »nsp« ist notwendig."
 
-#: ../clients/cli/connections.c:5125
+#: ../clients/cli/connections.c:5124
 msgid "PPPoE username: "
 msgstr "PPPoE Benutzername: "
 
-#: ../clients/cli/connections.c:5128 ../clients/cli/connections.c:5909
+#: ../clients/cli/connections.c:5127 ../clients/cli/connections.c:5908
 msgid "Error: 'username' is required."
 msgstr "Fehler: »username« ist notwendig."
 
-#: ../clients/cli/connections.c:5197
+#: ../clients/cli/connections.c:5196
 msgid "APN: "
 msgstr "APN: "
 
-#: ../clients/cli/connections.c:5200
+#: ../clients/cli/connections.c:5199
 msgid "Error: 'apn' is required."
 msgstr "Fehler: »apn« ist notwendig."
 
-#: ../clients/cli/connections.c:5258
+#: ../clients/cli/connections.c:5257
 msgid "Bluetooth device address: "
 msgstr "Bluetooth Geräteadresse: "
 
-#: ../clients/cli/connections.c:5261
+#: ../clients/cli/connections.c:5260
 msgid "Error: 'addr' is required."
 msgstr "Fehler: »addr« ist notwendig."
 
-#: ../clients/cli/connections.c:5302
+#: ../clients/cli/connections.c:5301
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]."
 msgstr ""
 "Fehler: »bt-type«: »%s« ist nicht gültig. Verwenden Sie [%s, %s (%s), %s]."
 
-#: ../clients/cli/connections.c:5346
+#: ../clients/cli/connections.c:5345
 msgid "VLAN parent device or connection UUID: "
 msgstr "Übergeordnetes VLAN-Gerät oder UUID der Verbindung: "
 
-#: ../clients/cli/connections.c:5349 ../clients/cli/connections.c:5978
+#: ../clients/cli/connections.c:5348 ../clients/cli/connections.c:5979
 msgid "Error: 'dev' is required."
 msgstr "Fehler: »dev« ist notwendig."
 
-#: ../clients/cli/connections.c:5353
-msgid "VLAN ID <0-4095>: "
-msgstr "VLAN-Kennung <0-4095>: "
+#: ../clients/cli/connections.c:5352
+msgid "VLAN ID <0-4094>: "
+msgstr "VLAN-Kennung <0-4094>: "
 
-#: ../clients/cli/connections.c:5356 ../clients/cli/connections.c:6294
+#: ../clients/cli/connections.c:5355 ../clients/cli/connections.c:6295
 msgid "Error: 'id' is required."
 msgstr "Fehler: »id« ist notwendig."
 
-#: ../clients/cli/connections.c:5362
-#, c-format
-msgid "Error: 'id': '%s' is not valid; use <0-4095>."
+#: ../clients/cli/connections.c:5361
+#, fuzzy, c-format
+#| msgid "Error: 'id': '%s' is not valid; use <0-4095>."
+msgid "Error: 'id': '%s' is not valid; use <0-4094>."
 msgstr "Fehler: »id«: »%s« ist ungültig; verwenden Sie <0-4095>."
 
-#: ../clients/cli/connections.c:5372 ../clients/cli/connections.c:5986
+#: ../clients/cli/connections.c:5371 ../clients/cli/connections.c:5987
 #, c-format
 msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgstr ""
 "Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname oder "
 "eine MAC-Adresse."
 
-#: ../clients/cli/connections.c:5504
+#: ../clients/cli/connections.c:5503
 #, c-format
 msgid "Error: 'mode': %s."
 msgstr "Fehler: »mode«: %s."
 
-#: ../clients/cli/connections.c:5513
+#: ../clients/cli/connections.c:5512
 #, c-format
 msgid "Error: 'primary': '%s' is not a valid interface name."
 msgstr "Fehler: »primary«: »%s« ist kein gültiger Name einer Schnittstelle."
 
-#: ../clients/cli/connections.c:5681
+#: ../clients/cli/connections.c:5680
 #, c-format
 msgid "Error: 'stp': %s."
 msgstr "Fehler: »stp«: %s."
 
-#: ../clients/cli/connections.c:5690
+#: ../clients/cli/connections.c:5689
 #, c-format
 msgid "Error: 'multicast-snooping': %s."
 msgstr "Fehler: »multicast-snooping«: %s."
 
-#: ../clients/cli/connections.c:5787
+#: ../clients/cli/connections.c:5786
 msgid "Error: 'vpn-type' is required."
 msgstr "Fehler: »vpn-type« ist notwendig."
 
-#: ../clients/cli/connections.c:5794
+#: ../clients/cli/connections.c:5793
 #, c-format
 msgid "Warning: 'vpn-type': %s not known.\n"
 msgstr "Warnung: »vpn-type«: %s ist unbekannt. \n"
 
-#: ../clients/cli/connections.c:5855
+#: ../clients/cli/connections.c:5854
 #, c-format
 msgid "Error: 'channel': '%s' is not valid; use <1-13>."
 msgstr "Fehler: »channel«: »%s« ist ungültig. Verwenden Sie <1-13>."
 
-#: ../clients/cli/connections.c:5906
+#: ../clients/cli/connections.c:5905
 msgid "Username: "
 msgstr "Benutzername: "
 
-#: ../clients/cli/connections.c:5915
+#: ../clients/cli/connections.c:5914
 #, c-format
 msgid "Protocol %s"
 msgstr "Protokoll: %s"
 
-#: ../clients/cli/connections.c:5918
+#: ../clients/cli/connections.c:5917
 msgid "Error: 'protocol' is required."
 msgstr "Fehler: »protocol« ist notwendig."
 
-#: ../clients/cli/connections.c:5975
+#: ../clients/cli/connections.c:5976
 #, fuzzy
 #| msgid "VLAN parent device or connection UUID: "
 msgid "MACVLAN parent device or connection UUID: "
 msgstr "Übergeordnetes VLAN-Gerät oder UUID der Verbindung: "
 
-#: ../clients/cli/connections.c:5995 ../clients/cli/connections.c:6075
-#: ../clients/cli/connections.c:6177
+#: ../clients/cli/connections.c:5996 ../clients/cli/connections.c:6076
+#: ../clients/cli/connections.c:6178
 #, fuzzy
 #| msgid "Error: 'dev' is required."
 msgid "Error: 'mode' is required."
 msgstr "Fehler: »dev« ist notwendig."
 
-#: ../clients/cli/connections.c:6001
-#, fuzzy
-#| msgid "Error: 'dev' command '%s' is not valid."
+#: ../clients/cli/connections.c:6002
 msgid "Error: 'mode' is not valid."
-msgstr "Fehler: Der Befehl »%s« für »dev« ist ungültig."
+msgstr "Fehler: »modus« ist ungültig."
 
-#: ../clients/cli/connections.c:6014
-#, fuzzy, c-format
-#| msgid "Error: 'stp': %s."
+#: ../clients/cli/connections.c:6015
+#, c-format
 msgid "Error: 'tap': %s."
-msgstr "Fehler: »stp«: %s."
+msgstr "Fehler: »tap«: %s."
 
-#: ../clients/cli/connections.c:6100
-#, fuzzy, c-format
-#| msgid "Error: 'stp': %s."
+#: ../clients/cli/connections.c:6101
+#, c-format
 msgid "Error: 'pi': %s."
-msgstr "Fehler: »stp«: %s."
+msgstr "Fehler: »pi«: %s."
 
-#: ../clients/cli/connections.c:6111
-#, fuzzy, c-format
-#| msgid "Error: 'save': %s."
+#: ../clients/cli/connections.c:6112
+#, c-format
 msgid "Error: 'vnet-hdr': %s."
-msgstr "Fehler: »save«: %s."
+msgstr "Fehler: »vnet-hdr«: %s."
 
-#: ../clients/cli/connections.c:6122
-#, fuzzy, c-format
-#| msgid "Error: 'mode': %s."
+#: ../clients/cli/connections.c:6123
+#, c-format
 msgid "Error: 'multi-queue': %s."
-msgstr "Fehler: »mode«: %s."
+msgstr "Fehler: »multi-queue«: %s."
 
-#: ../clients/cli/connections.c:6191
-#, fuzzy, c-format
-#| msgid "Error: '%s': '%s' is not a valid %s %s."
+#: ../clients/cli/connections.c:6192
+#, c-format
 msgid "Error: 'mode': '%s' is not valid, use one of %s"
-msgstr "Fehler: »%s«: »%s« ist kein gültiges %s %s."
+msgstr "Fehler: »mode«: »%s« ist ungültig. Verwenden Sie eines von %s"
 
-#: ../clients/cli/connections.c:6197
+#: ../clients/cli/connections.c:6198
 msgid "Remote endpoint: "
 msgstr "Entfernter Endpunkt: "
 
-#: ../clients/cli/connections.c:6200 ../clients/cli/connections.c:6302
-#, fuzzy
-#| msgid "Error: 'master' is required."
+#: ../clients/cli/connections.c:6201 ../clients/cli/connections.c:6303
 msgid "Error: 'remote' is required."
-msgstr "Fehler: »master« ist notwendig."
+msgstr "Fehler: »remote« ist notwendig."
 
-#: ../clients/cli/connections.c:6207
-#, fuzzy, c-format
-#| msgid "Error: '%s': '%s' is not a valid %s MAC address."
+#: ../clients/cli/connections.c:6208
+#, c-format
 msgid "Error: 'remote': '%s' is not valid; must be an IP address"
-msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
+msgstr "Fehler: »remote«: »%s« ist ungültig. Es muss eine IP-Adresse sein"
 
-#: ../clients/cli/connections.c:6221
-#, fuzzy, c-format
-#| msgid "Error: '%s': '%s' is not a valid %s MAC address."
+#: ../clients/cli/connections.c:6222
+#, c-format
 msgid "Error: 'local': '%s' is not valid; must be an IP address"
-msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
+msgstr "Fehler: »local«: »%s« ist ungültig. Es muss eine IP-Adresse sein"
 
-#: ../clients/cli/connections.c:6230 ../clients/cli/connections.c:6325
+#: ../clients/cli/connections.c:6231 ../clients/cli/connections.c:6326
 #, fuzzy, c-format
 #| msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC."
 msgid "Error: 'dev': '%s' is neither UUID nor interface name."
@@ -2930,144 +2889,140 @@ msgstr ""
 "Fehler: »dev«: »%s« ist weder eine UUID noch ein Schnittstellenname oder "
 "eine MAC-Adresse."
 
-#: ../clients/cli/connections.c:6291
-#, fuzzy
-#| msgid "VLAN ID <0-4095>: "
+#: ../clients/cli/connections.c:6292
 msgid "VXLAN ID: "
-msgstr "VLAN-Kennung <0-4095>: "
+msgstr "VXLAN-Kennung: "
 
-#: ../clients/cli/connections.c:6299
-#, fuzzy
-#| msgid "Remove"
+#: ../clients/cli/connections.c:6300
 msgid "Remote: "
-msgstr "Entfernen"
+msgstr "Gegenstelle: "
 
-#: ../clients/cli/connections.c:6308
+#: ../clients/cli/connections.c:6309
 #, fuzzy, c-format
 #| msgid "Error: 'id': '%s' is not valid; use <0-4095>."
 msgid "Error: 'id': '%s' is not valid; use <0-16777215>."
 msgstr "Fehler: »id«: »%s« ist ungültig; verwenden Sie <0-4095>."
 
-#: ../clients/cli/connections.c:6334
+#: ../clients/cli/connections.c:6335
 #, fuzzy, c-format
 #| msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgid "Error: 'remote': '%s' is not a valid IP address"
 msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
 
-#: ../clients/cli/connections.c:6343
+#: ../clients/cli/connections.c:6344
 #, fuzzy, c-format
 #| msgid "Error: '%s': '%s' is not a valid %s MAC address."
 msgid "Error: 'local': '%s' is not a valid IP address"
 msgstr "Fehler: »%s«: »%s« ist keine gültige %s MAC-Adresse."
 
-#: ../clients/cli/connections.c:6352
+#: ../clients/cli/connections.c:6353
 #, fuzzy, c-format
 #| msgid "Error: 'id': '%s' is not valid; use <0-4095>."
 msgid "Error: 'source-port-min': %s is not valid; use <0-65535>."
 msgstr "Fehler: »id«: »%s« ist ungültig; verwenden Sie <0-4095>."
 
-#: ../clients/cli/connections.c:6361
+#: ../clients/cli/connections.c:6362
 #, fuzzy, c-format
 #| msgid "Error: 'flags': '%s' is not valid; use <0-7>."
 msgid "Error: 'source-port-max': %s is not valid; use <0-65535>."
 msgstr "Fehler: »flags«: »%s« ist ungültig. Verwenden Sie <0-7>."
 
-#: ../clients/cli/connections.c:6370
+#: ../clients/cli/connections.c:6371
 #, fuzzy, c-format
 #| msgid "Error: 'id': '%s' is not valid; use <0-4095>."
 msgid "Error: 'destination-port': %s is not valid; use <0-65535>."
 msgstr "Fehler: »id«: »%s« ist ungültig; verwenden Sie <0-4095>."
 
-#: ../clients/cli/connections.c:6410
+#: ../clients/cli/connections.c:6411
 #, c-format
 msgid "Error: '%s' is not a valid connection type."
 msgstr "Fehler: »%s« ist kein gültiger Verbindungstyp."
 
-#: ../clients/cli/connections.c:6517
+#: ../clients/cli/connections.c:6518
 #, c-format
 msgid "Error: 'hairpin': %s."
 msgstr "Fehler: »hairpin«: %s."
 
-#: ../clients/cli/connections.c:6589
+#: ../clients/cli/connections.c:6590
 #, c-format
 msgid "Error: IPv4 gateway specified without IPv4 addresses"
 msgstr "Fehler: IPv4-Gateway wurde ohne IPv4-Adresse angegeben"
 
-#: ../clients/cli/connections.c:6593
+#: ../clients/cli/connections.c:6594
 #, c-format
 msgid "Error: multiple IPv4 gateways specified"
 msgstr "Fehler: Es wurden mehrere IPv4-Gateways angegeben"
 
-#: ../clients/cli/connections.c:6597
+#: ../clients/cli/connections.c:6598
 #, c-format
 msgid "Error: Invalid IPv4 gateway '%s'"
 msgstr "Fehler: Ungültiges IPv4-Gateway »%s«"
 
-#: ../clients/cli/connections.c:6622
+#: ../clients/cli/connections.c:6623
 #, c-format
 msgid "Error: IPv6 gateway specified without IPv6 addresses"
 msgstr "Fehler: IPv6-Gateway wurde ohne IPv6-Adresse angegeben"
 
-#: ../clients/cli/connections.c:6626
+#: ../clients/cli/connections.c:6627
 #, c-format
 msgid "Error: multiple IPv6 gateways specified"
 msgstr "Fehler: Es wurden mehrere IPv6-Gateways angegeben"
 
-#: ../clients/cli/connections.c:6630
+#: ../clients/cli/connections.c:6631
 #, c-format
 msgid "Error: Invalid IPv6 gateway '%s'"
 msgstr "Fehler: Ungültiges IPv6-Gateway »%s«"
 
-#: ../clients/cli/connections.c:6678 ../clients/cli/connections.c:10126
+#: ../clients/cli/connections.c:6679 ../clients/cli/connections.c:10232
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "Fehler: Verbindung »%s« konnte nicht hinzugefügt werden: %s"
 
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:6684
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "Verbindung »%s« (%s) erfolgreich hinzugefügt.\n"
 
-#: ../clients/cli/connections.c:6959 ../clients/cli/connections.c:10581
+#: ../clients/cli/connections.c:6960 ../clients/cli/connections.c:10687
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "Fehler: Das Argument »type« ist notwendig."
 
-#: ../clients/cli/connections.c:6967
+#: ../clients/cli/connections.c:6968
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "Fehler: Unbekannter Verbindungstyp: %s."
 
-#: ../clients/cli/connections.c:6976 ../clients/cli/devices.c:2163
+#: ../clients/cli/connections.c:6977 ../clients/cli/devices.c:2164
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "Fehler: »autoconnect«: %s."
 
-#: ../clients/cli/connections.c:6986
+#: ../clients/cli/connections.c:6987
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "Fehler: »save«: %s."
 
-#: ../clients/cli/connections.c:7003
+#: ../clients/cli/connections.c:7004
 msgid "Interface name [*]: "
 msgstr "Schnittstellenname [*]: "
 
-#: ../clients/cli/connections.c:7008
+#: ../clients/cli/connections.c:7009
 #, c-format
 msgid "Error: 'ifname' argument is required."
 msgstr "Fehler: Das Argument »ifname« ist notwendig."
 
-#: ../clients/cli/connections.c:7010
+#: ../clients/cli/connections.c:7011
 #, c-format
 msgid "Error: mandatory 'ifname' not seen before '%s'."
 msgstr "Fehler: Erforderliches »ifconfig« nicht vor »%s« vorhanden."
 
-#: ../clients/cli/connections.c:7019
+#: ../clients/cli/connections.c:7020
 #, c-format
 msgid "Error: 'ifname': '%s' is not a valid interface nor '*'."
 msgstr "Fehler: »ifname«: »%s« ist weder eine gültige Schnittstelle noch »*«."
 
-#: ../clients/cli/connections.c:7981
+#: ../clients/cli/connections.c:8044
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "['%s' Werte werden gesetzt]\n"
@@ -3076,7 +3031,7 @@ msgstr "['%s' Werte werden gesetzt]\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8063
+#: ../clients/cli/connections.c:8126
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -3112,7 +3067,7 @@ msgstr ""
 "nmcli                       :: nmcli-Konfiguration\n"
 "quit                                           :: nmcli beenden\n"
 
-#: ../clients/cli/connections.c:8090
+#: ../clients/cli/connections.c:8153
 #, c-format
 msgid ""
 "goto [.] |   :: enter setting/property for editing\n"
@@ -3132,7 +3087,7 @@ msgstr ""
 "           nmcli connection> goto secondaries\n"
 "           nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:8097
+#: ../clients/cli/connections.c:8160
 #, c-format
 msgid ""
 "remove [.]  :: remove setting or reset property value\n"
@@ -3154,7 +3109,7 @@ msgstr ""
 "Beispiele: nmcli> remove wifi-sec\n"
 "           nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:8104
+#: ../clients/cli/connections.c:8167
 #, c-format
 msgid ""
 "set [. ]  :: set property value\n"
@@ -3169,7 +3124,7 @@ msgstr ""
 "\n"
 "Beispiel: nmcli> s con.id Meine Verbindung\n"
 
-#: ../clients/cli/connections.c:8109
+#: ../clients/cli/connections.c:8172
 #, c-format
 msgid ""
 "describe [.]  :: describe property\n"
@@ -3182,7 +3137,7 @@ msgstr ""
 "Zeigt die Eigenschaftsbeschreibung. Sie können die Hilfeseite nm-settings(5) "
 "zu Rate ziehen, um alle Einstellungen und Eigenschaften nachzulesen.\n"
 
-#: ../clients/cli/connections.c:8114
+#: ../clients/cli/connections.c:8177
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -3197,7 +3152,7 @@ msgstr ""
 "\n"
 "Beispiel: nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:8119
+#: ../clients/cli/connections.c:8182
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -3223,7 +3178,7 @@ msgstr ""
 "           nmcli> verify fix\n"
 "           nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:8128
+#: ../clients/cli/connections.c:8191
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -3250,7 +3205,7 @@ msgstr ""
 "Verbindung volständig löschen möchten, so muss das Verbindungsprofil\n"
 "gelöscht werden.\n"
 
-#: ../clients/cli/connections.c:8139
+#: ../clients/cli/connections.c:8202
 #, c-format
 msgid ""
 "activate [] [/|]  :: activate the connection\n"
@@ -3272,7 +3227,7 @@ msgstr ""
 "/| - Zugriffspunkt (WLAN) oder NSP (WiMAX) (stellen Sie "
 "»/« voraus wenn  nicht angegeben wird)\n"
 
-#: ../clients/cli/connections.c:8146 ../clients/cli/connections.c:8305
+#: ../clients/cli/connections.c:8209 ../clients/cli/connections.c:8368
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -3281,7 +3236,7 @@ msgstr ""
 "back :: Eine Menüebene nach oben gehen\n"
 "\n"
 
-#: ../clients/cli/connections.c:8149
+#: ../clients/cli/connections.c:8212
 #, c-format
 msgid ""
 "help/? []  :: help for the nmcli commands\n"
@@ -3290,7 +3245,7 @@ msgstr ""
 "help/? []  :: Hilfe zu den nmcli-Befehlen\n"
 "\n"
 
-#: ../clients/cli/connections.c:8152
+#: ../clients/cli/connections.c:8215
 #, c-format
 msgid ""
 "nmcli [ ]  :: nmcli configuration\n"
@@ -3317,7 +3272,7 @@ msgstr ""
 "           nmcli> nmcli save-confirmation no\n"
 "           nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:8174 ../clients/cli/connections.c:8311
+#: ../clients/cli/connections.c:8237 ../clients/cli/connections.c:8374
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -3330,8 +3285,8 @@ msgstr ""
 "Dieser Befehl beendet nmcli. Wenn die Verbindung in Bearbeitung nicht "
 "gespeichert ist wird der Benutzer gefragt, die Aktion zu bestätigen.\n"
 
-#: ../clients/cli/connections.c:8179 ../clients/cli/connections.c:8316
-#: ../clients/cli/connections.c:8740 ../clients/cli/connections.c:9645
+#: ../clients/cli/connections.c:8242 ../clients/cli/connections.c:8379
+#: ../clients/cli/connections.c:8803 ../clients/cli/connections.c:9751
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "Unbekannter Befehl: »%s«\n"
@@ -3339,7 +3294,7 @@ msgstr "Unbekannter Befehl: »%s«\n"
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #.
-#: ../clients/cli/connections.c:8245
+#: ../clients/cli/connections.c:8308
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -3368,7 +3323,7 @@ msgstr ""
 "ausgeben\n"
 "quit                             :: nmcli beenden\n"
 
-#: ../clients/cli/connections.c:8270
+#: ../clients/cli/connections.c:8333
 #, c-format
 msgid ""
 "set []  :: set new value\n"
@@ -3379,7 +3334,7 @@ msgstr ""
 "\n"
 "Dieser Befehl setzt den  für die Eigenschaft\n"
 
-#: ../clients/cli/connections.c:8274
+#: ../clients/cli/connections.c:8337
 #, c-format
 msgid ""
 "add []  :: append new value to the property\n"
@@ -3394,7 +3349,7 @@ msgstr ""
 "die Eigenschaft ein Container-Typ ist. Für einwertige Eigenschaften wird der "
 "Wert ersetzt (genau wie »set«).\n"
 
-#: ../clients/cli/connections.c:8280
+#: ../clients/cli/connections.c:8343
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -3405,7 +3360,7 @@ msgstr ""
 "\n"
 "Zeigt den aktuellen Wert an und lässt ihn bearbeiten.\n"
 
-#: ../clients/cli/connections.c:8284
+#: ../clients/cli/connections.c:8347
 #, c-format
 msgid ""
 "remove [||