From d6201f5d8daada3d64a0a3e0038e14eebec683ce Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 3 Aug 2016 22:59:23 +0200 Subject: Imported Upstream version 1.2.4 --- docs/Makefile.in | 1 + docs/api/Makefile.in | 1 + docs/api/html/NetworkManager.conf.html | 29 +++- docs/api/html/NetworkManager.devhelp2 | 3 + docs/api/html/NetworkManager.html | 29 +++- ...s-org.freedesktop.NetworkManager.IP4Config.html | 10 ++ ...s-org.freedesktop.NetworkManager.IP6Config.html | 10 ++ .../html/gdbus-org.freedesktop.NetworkManager.html | 38 ++++++ docs/api/html/index.html | 2 +- docs/api/html/index.sgml | 3 + docs/api/html/ix01.html | 6 + docs/api/html/nm-settings.html | 12 ++ docs/api/html/nmcli-examples.html | 3 +- docs/api/html/ref-settings.html | 12 ++ docs/api/settings-spec.xml | 2 + docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 1 + docs/libnm-glib/html/NMClient.html | 16 +++ docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/html/index.sgml | 2 + docs/libnm-glib/html/libnm-glib.devhelp2 | 2 + docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 1 + docs/libnm-util/html/NMConnection.html | 2 +- docs/libnm-util/html/NMSetting.html | 2 +- docs/libnm-util/html/NMSetting8021x.html | 2 +- docs/libnm-util/html/NMSettingAdsl.html | 2 +- docs/libnm-util/html/NMSettingBluetooth.html | 2 +- docs/libnm-util/html/NMSettingBond.html | 2 +- docs/libnm-util/html/NMSettingBridge.html | 2 +- docs/libnm-util/html/NMSettingBridgePort.html | 2 +- docs/libnm-util/html/NMSettingCdma.html | 2 +- docs/libnm-util/html/NMSettingConnection.html | 2 +- docs/libnm-util/html/NMSettingDcb.html | 2 +- docs/libnm-util/html/NMSettingGeneric.html | 2 +- docs/libnm-util/html/NMSettingGsm.html | 2 +- docs/libnm-util/html/NMSettingIP4Config.html | 4 +- docs/libnm-util/html/NMSettingIP6Config.html | 4 +- docs/libnm-util/html/NMSettingInfiniband.html | 2 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 2 +- docs/libnm-util/html/NMSettingPPP.html | 2 +- docs/libnm-util/html/NMSettingPPPOE.html | 2 +- docs/libnm-util/html/NMSettingSerial.html | 2 +- docs/libnm-util/html/NMSettingTeam.html | 2 +- docs/libnm-util/html/NMSettingTeamPort.html | 2 +- docs/libnm-util/html/NMSettingVPN.html | 2 +- docs/libnm-util/html/NMSettingVlan.html | 2 +- docs/libnm-util/html/NMSettingWimax.html | 2 +- docs/libnm-util/html/NMSettingWired.html | 2 +- docs/libnm-util/html/NMSettingWireless.html | 2 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 2 +- docs/libnm-util/html/index.html | 2 +- docs/libnm-util/html/libnm-util-nm-utils.html | 2 +- docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.in | 1 + docs/libnm/html/NMClient.html | 17 ++- docs/libnm/html/NMConnection.html | 2 +- docs/libnm/html/NMDevice.html | 2 +- docs/libnm/html/NMSetting.html | 4 +- docs/libnm/html/NMSetting8021x.html | 2 +- docs/libnm/html/NMSettingConnection.html | 2 +- docs/libnm/html/NMSettingDcb.html | 2 +- docs/libnm/html/NMSettingIP6Config.html | 2 +- docs/libnm/html/NMSettingIPConfig.html | 151 +++++++++++++++------ docs/libnm/html/NMSettingMacvlan.html | 2 +- docs/libnm/html/NMSettingSerial.html | 2 +- docs/libnm/html/NMSettingTun.html | 2 +- docs/libnm/html/NMSettingVlan.html | 4 +- docs/libnm/html/NMSettingWired.html | 2 +- docs/libnm/html/NMSettingWireless.html | 2 +- docs/libnm/html/NMSettingWirelessSecurity.html | 2 +- docs/libnm/html/NMVpnEditorPlugin.html | 4 +- docs/libnm/html/api-index-full.html | 22 +-- docs/libnm/html/index.html | 2 +- docs/libnm/html/index.sgml | 10 +- docs/libnm/html/libnm-nm-dbus-interface.html | 4 +- docs/libnm/html/libnm-nm-errors.html | 9 +- docs/libnm/html/libnm-nm-utils.html | 2 +- docs/libnm/html/libnm-nm-version.html | 28 +--- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 2 +- docs/libnm/html/libnm.devhelp2 | 10 +- docs/libnm/html/object-tree.html | 8 +- docs/libnm/libnm-sections.txt | 6 +- docs/libnm/version.xml | 2 +- 85 files changed, 404 insertions(+), 165 deletions(-) (limited to 'docs') diff --git a/docs/Makefile.in b/docs/Makefile.in index 46116645..a91f4190 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -328,6 +328,7 @@ NEWT_LIBS = @NEWT_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@ +NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@ NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@ NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 7407f4fa..bc388a41 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -274,6 +274,7 @@ NEWT_LIBS = @NEWT_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@ +NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@ NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@ NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 0c05211a..828776ff 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -64,6 +64,10 @@ This file is not intended to be modified by the user, but it is read last and can shadow user configuration from NetworkManager.conf.

+

+ Certain settings from the configuration can be reloaded at runtime either by sending SIGHUP signal or via + D-Bus' Reload call. +

File Format

@@ -296,7 +300,8 @@ no-auto-default=* configuration with DNSSEC support. The /etc/resolv.conf will be managed by dnssec-trigger daemon.

none: NetworkManager will not - modify resolv.conf.

+ modify resolv.conf. This implies rc-manager + unmanaged

@@ -304,17 +309,25 @@ no-auto-default=*

Set the resolv.conf management mode. The default value depends on how NetworkManager - was built. Regardless of this setting, NetworkManager will + was built, whereas this version of NetworkManager was build with + a default of "symlink". + Regardless of this setting, NetworkManager will always write resolv.conf to its runtime state directory.

-

none: NetworkManager will symlink +

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

+ /etc/resolv.conf as file. If it finds + a symlink, it will follow the symlink and update the target + instead.

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

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

+

unmanaged: don't touch + resolv.conf.

+

none: deprecated alias for + symlink.

@@ -363,7 +376,7 @@ no-auto-default=*

path

The location where keyfiles are read and stored. - This defaults to "/etc/NetworkManager/conf.d". + This defaults to "${prefix}/etc/NetworkManager/conf.d".

@@ -649,8 +662,10 @@ ipv6.ip6-privacy=1 considered even if the property in question is not present. In the example above, if [connection-wifi-wlan0] would have stop-match set to yes, - its ipv6.ip6-privacy value would be - unspecified. + the device wlan0 would have ipv6.ip6-privacy + property unspecified. That is, the search for the property would not continue + in the connection sections [connection-wifi-other] + or [connection].

diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 850ff2e2..c0e6a7af 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -61,6 +61,7 @@ + @@ -317,6 +318,7 @@ + @@ -328,6 +330,7 @@ + diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html index 835a7e66..5467a3a8 100644 --- a/docs/api/html/NetworkManager.html +++ b/docs/api/html/NetworkManager.html @@ -436,26 +436,47 @@ 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. + the next restart of the daemon. + A SIGHUP also involves further reloading actions, like doing + a DNS update and restarting the DNS plugin. The latter can be + useful for example when using the dnsmasq plugin and changing + its configuration in /etc/NetworkManager/dnsmasq.d. However, + it also means this will shortly interrupt name resolution. + In the future, there may be further actions added. + A SIGHUP means to update NetworkManager configuration and reload + everything that is supported. Note that this does not reload + connections from disk. For that there is a D-Bus API and + nmcli's reload action

SIGUSR1

- The signal forces a rewrite of DNS configuration. + The signal forces a rewrite of DNS configuration. Contrary to + SIGHUP, this does not restart the DNS plugin and will not interrupt + name resolution. + In the future, further actions may be added. A SIGUSR1 + means to write out data like resolv.conf, or refresh a cache. + It is a subset of what is done for SIGHUP without reloading + configuration from disk.

SIGUSR2

- The signal has no effect at the moment. + The signal has no effect at the moment but is reserved for future + use.

+

+ An alternative to a signal to reload configuration is the Reload D-Bus call. + It allows for more fine-grained selection of what to reload, it only returns + after the reload is complete, and it is guarded by PolicyKit. +

DEBUGGING

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html index fd291730..5f2615cf 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html @@ -51,6 +51,7 @@ Domains readable as Searches readable as DnsOptions readable as +DnsPriority readable i WinsServers readable au
@@ -173,6 +174,15 @@ DnsOptions readable as
+

The "DnsPriority" property

+
+DnsPriority  readable   i
+
+

The relative priority of DNS servers. +

+
+
+

The "WinsServers" property

 WinsServers  readable   au
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
index 9bd4562a..65995603 100644
--- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
+++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html
@@ -51,6 +51,7 @@
 Domains      readable   as
 Searches     readable   as
 DnsOptions   readable   as
+DnsPriority  readable   i
@@ -165,6 +166,15 @@ DnsOptions readable as resolv.conf(5) manual page for the list of supported options.

+
+
+

The "DnsPriority" property

+
+DnsPriority  readable   i
+
+

The relative priority of DNS servers. +

+
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index c72f1e26..f97d5301 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -36,6 +36,7 @@

Methods

+Reload                   (IN  u         flags);
 GetDevices               (OUT ao        devices);
 GetAllDevices            (OUT ao        devices);
 GetDeviceByIpIface       (IN  s         iface,
@@ -102,6 +103,43 @@
 

 
Method Details

 

+
The Reload() method

+
+Reload (IN  u flags);
+

+
        Reload NetworkManager's configuration and perform certain updates, like flushing a cache or
+        rewriting external state to disk. This is similar to sending SIGHUP to NetworkManager but it
+        allows for more fine-grained control over what to reload (see flags). It also allows
+        non-root access via PolicyKit and contrary to signals it is synchronous.
+

+
        No flags (0x00) means to reload everything that is supported which is identical to
+        sending a SIGHUP.
+        (0x01) means to reload the NetworkManager.conf configuration from disk. Note that this
+        does not include connections, which can be reloaded via Setting's ReloadConnections.
+        (0x02) means to update DNS configuration, which usually involves writing /etc/resolv.conf
+        anew.
+        (0x04) means to restart the DNS plugin. This is for example useful when using
+        dnsmasq plugin, which uses additional configuration in /etc/NetworkManager/dnsmasq.d.
+        If you edit those files, you can restart the DNS plugin. This action shortly interrupts
+        rename resolution.
+        Note that flags may affect each other. For example, restarting the DNS plugin (0x04)
+        implicitly updates DNS too (0x02). Or when reloading the configuration (0x01), changes
+        to DNS setting also cause a DNS update (0x02). However, (0x01) does not involve restarting
+        the DNS plugin (0x02), unless an entirely different plugin is selected.
+

+

++++
+
+
+
+
+




IN u flags:
optional flags to specify which parts shall be reloaded.

+

+

+

 
The GetDevices() method

 
 GetDevices (OUT ao devices);
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 15870791..59c5412e 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -14,7 +14,7 @@
 

 

 

-
Version 1.2.2
+
Version 1.2.4
 

 
Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors

 

diff --git a/docs/api/html/index.sgml b/docs/api/html/index.sgml
index 49e4a4c1..3ffc813b 100644
--- a/docs/api/html/index.sgml
+++ b/docs/api/html/index.sgml
@@ -53,6 +53,7 @@
 
 
 
+
 
 
 
@@ -430,6 +431,7 @@
 
 
 
+
 
 
 
@@ -445,6 +447,7 @@
 
 
 
+
 
 
 
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html
index c74a0c5f..9b0fe805 100644
--- a/docs/api/html/ix01.html
+++ b/docs/api/html/ix01.html
@@ -350,6 +350,8 @@
 
 
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
 

+
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
+

 
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
 

 
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
@@ -374,6 +376,8 @@
 

 
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
 

+
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
+

 
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
 

 
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
@@ -573,6 +577,8 @@
 

 
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
 

+
org.freedesktop.NetworkManager.Reload(), The Reload() method
+

 
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
 

 
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html
index b677ece9..4b300bc7 100644
--- a/docs/api/html/nm-settings.html
+++ b/docs/api/html/nm-settings.html
@@ -1128,6 +1128,12 @@
 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-priority
+int32
+0
+DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.
+
+
 dns-search
 array of string
 []
@@ -1267,6 +1273,12 @@
 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-priority
+int32
+0
+DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf.  A lower value means that servers will be on top of the file.  Zero selects the default value, which is 50 for VPNs and 100 for other connections.  When multiple devices have configurations with the same priority, the one with an active default route will be preferred.  Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used.
+
+
 dns-search
 array of string
 []
diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html
index 3e9d0b52..41c3cac7 100644
--- a/docs/api/html/nmcli-examples.html
+++ b/docs/api/html/nmcli-examples.html
@@ -127,7 +127,8 @@ 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

+org.freedesktop.NetworkManager.settings.modify.hostname   auth
+org.freedesktop.NetworkManager.reload                     no

This command shows configured polkit permissions for various NetworkManager operations. These permissions or actions (using polkit language) are configured diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index ab610728..fe268fe0 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -1083,6 +1083,12 @@ 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-priority
+
int32
+
0
+DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf. A lower value means that servers will be on top of the file. Zero selects the default value, which is 50 for VPNs and 100 for other connections. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used. + + 
dns-search
array of string
[]
@@ -1223,6 +1229,12 @@ 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-priority
+
int32
+
0
+DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf. A lower value means that servers will be on top of the file. Zero selects the default value, which is 50 for VPNs and 100 for other connections. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used. + + 
dns-search
array of string
[]
diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index 8bcbf25e..22398ad1 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -158,6 +158,7 @@ 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-priorityint320DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf. A lower value means that servers will be on top of the file. Zero selects the default value, which is 50 for VPNs and 100 for other connections. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used. dns-searcharray of string[]Array of DNS search domains. gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set. ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used. @@ -180,6 +181,7 @@ 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-priorityint320DNS priority. The relative priority to be used when determining the order of DNS servers in resolv.conf. A lower value means that servers will be on top of the file. Zero selects the default value, which is 50 for VPNs and 100 for other connections. When multiple devices have configurations with the same priority, the one with an active default route will be preferred. Note that when using dns=dnsmasq the order is meaningless since dnsmasq forwards queries to all known servers at the same time. Negative values have the special effect of excluding other configurations with a greater priority value; so in presence of at least a negative priority, only DNS servers from configurations with the lowest priority value will be used. dns-searcharray of string[]Array of DNS search domains. gatewaystringThe gateway associated with this configuration. This is only meaningful if "addresses" is also set. ignore-auto-dnsbooleanFALSEWhen "method" is set to "auto" and this property to TRUE, automatically configured nameservers and search domains are ignored and only nameservers and search domains specified in the "dns" and "dns-search" properties, if any, are used. diff --git a/docs/api/version.xml b/docs/api/version.xml index 23aa8390..e8ea05db 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.2.2 +1.2.4 diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 89ce2b2c..3d57fc8e 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -271,6 +271,7 @@ NEWT_LIBS = @NEWT_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@ +NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@ NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@ NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 3d92860f..141c56ba 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -2093,6 +2093,22 @@ clients can obtain to perform certain tasks on behalf of the current user.

  +

NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS

+ +

modify persistent global + DNS configuration

+ +  + + +

NM_CLIENT_PERMISSION_RELOAD

+ +

controls access to Reload. + persistent hostname can be changed

+ +  + +

NM_CLIENT_PERMISSION_LAST

a reserved boundary value

diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index f1594682..bd1af8ee 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,7 +15,7 @@

- for libnm-glib 1.2.2 + for libnm-glib 1.2.4 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-glib/stable/. diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml index 984704d5..dbe88019 100644 --- a/docs/libnm-glib/html/index.sgml +++ b/docs/libnm-glib/html/index.sgml @@ -76,6 +76,8 @@ + + diff --git a/docs/libnm-glib/html/libnm-glib.devhelp2 b/docs/libnm-glib/html/libnm-glib.devhelp2 index 26341249..47a930bd 100644 --- a/docs/libnm-glib/html/libnm-glib.devhelp2 +++ b/docs/libnm-glib/html/libnm-glib.devhelp2 @@ -715,6 +715,8 @@ + + diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index 23aa8390..e8ea05db 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.2.2 +1.2.4 diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index a4d85d86..3c0cecd9 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -271,6 +271,7 @@ NEWT_LIBS = @NEWT_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@ +NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@ NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@ NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 6fbcc515..7572c017 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -598,7 +598,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMConnectionError
     GObject
     ╰── NMConnection
diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 83dc3b25..3ce89683 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -271,7 +271,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ├── NMSettingError
diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html
index c36eaff5..05d9516c 100644
--- a/docs/libnm-util/html/NMSetting8021x.html
+++ b/docs/libnm-util/html/NMSetting8021x.html
@@ -923,7 +923,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ├── NMSetting8021xCKScheme
     ╰── NMSetting8021xError
diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html
index a1ecee9b..165177b5 100644
--- a/docs/libnm-util/html/NMSettingAdsl.html
+++ b/docs/libnm-util/html/NMSettingAdsl.html
@@ -236,7 +236,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingAdslError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html
index 885a378b..b011f98f 100644
--- a/docs/libnm-util/html/NMSettingBluetooth.html
+++ b/docs/libnm-util/html/NMSettingBluetooth.html
@@ -139,7 +139,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBluetoothError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html
index ac2fdc8e..8d0e4d48 100644
--- a/docs/libnm-util/html/NMSettingBond.html
+++ b/docs/libnm-util/html/NMSettingBond.html
@@ -244,7 +244,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBondError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html
index 6eb6900c..71cdd58f 100644
--- a/docs/libnm-util/html/NMSettingBridge.html
+++ b/docs/libnm-util/html/NMSettingBridge.html
@@ -233,7 +233,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBridgeError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html
index 53126856..bc204181 100644
--- a/docs/libnm-util/html/NMSettingBridgePort.html
+++ b/docs/libnm-util/html/NMSettingBridgePort.html
@@ -148,7 +148,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingBridgePortError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html
index c96324ad..43980d9d 100644
--- a/docs/libnm-util/html/NMSettingCdma.html
+++ b/docs/libnm-util/html/NMSettingCdma.html
@@ -165,7 +165,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingCdmaError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index db0dc6ed..ba73eb00 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -403,7 +403,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingConnectionError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html
index fd94edf0..5cd1cd53 100644
--- a/docs/libnm-util/html/NMSettingDcb.html
+++ b/docs/libnm-util/html/NMSettingDcb.html
@@ -418,7 +418,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingDcbError
     ╰── NMSettingDcbFlags
     GObject
diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html
index 18fbdb85..b6cc9066 100644
--- a/docs/libnm-util/html/NMSettingGeneric.html
+++ b/docs/libnm-util/html/NMSettingGeneric.html
@@ -84,7 +84,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingGenericError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html
index 4a1d9629..1e725b02 100644
--- a/docs/libnm-util/html/NMSettingGsm.html
+++ b/docs/libnm-util/html/NMSettingGsm.html
@@ -296,7 +296,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingGsmError
     ├── NMSettingGsmNetworkBand
     ╰── NMSettingGsmNetworkType
diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html
index d48a7338..b14b4721 100644
--- a/docs/libnm-util/html/NMSettingIP4Config.html
+++ b/docs/libnm-util/html/NMSettingIP4Config.html
@@ -710,10 +710,10 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIP4Address
     ╰── NMIP4Route
-    GEnum
+    GEnum
     ╰── NMSettingIP4ConfigError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html
index 76fd5ef4..eb42de11 100644
--- a/docs/libnm-util/html/NMSettingIP6Config.html
+++ b/docs/libnm-util/html/NMSettingIP6Config.html
@@ -677,10 +677,10 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIP6Address
     ╰── NMIP6Route
-    GEnum
+    GEnum
     ├── NMSettingIP6ConfigError
     ╰── NMSettingIP6ConfigPrivacy
     GObject
diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html
index de8975e2..82db623e 100644
--- a/docs/libnm-util/html/NMSettingInfiniband.html
+++ b/docs/libnm-util/html/NMSettingInfiniband.html
@@ -182,7 +182,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingInfinibandError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html
index fbcb946d..d9a5d1d0 100644
--- a/docs/libnm-util/html/NMSettingOlpcMesh.html
+++ b/docs/libnm-util/html/NMSettingOlpcMesh.html
@@ -148,7 +148,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingOlpcMeshError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html
index 543868a4..c66bd595 100644
--- a/docs/libnm-util/html/NMSettingPPP.html
+++ b/docs/libnm-util/html/NMSettingPPP.html
@@ -404,7 +404,7 @@ that require PPP to deliver IP capability

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingPPPError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html
index 0d2355a7..c7abaffe 100644
--- a/docs/libnm-util/html/NMSettingPPPOE.html
+++ b/docs/libnm-util/html/NMSettingPPPOE.html
@@ -165,7 +165,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingPPPOEError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html
index b371e910..43c21e9e 100644
--- a/docs/libnm-util/html/NMSettingSerial.html
+++ b/docs/libnm-util/html/NMSettingSerial.html
@@ -183,7 +183,7 @@ serial communications

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html
index 846f6179..2e40a312 100644
--- a/docs/libnm-util/html/NMSettingTeam.html
+++ b/docs/libnm-util/html/NMSettingTeam.html
@@ -131,7 +131,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTeamError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html
index 37a4495b..c08a4eb0 100644
--- a/docs/libnm-util/html/NMSettingTeamPort.html
+++ b/docs/libnm-util/html/NMSettingTeamPort.html
@@ -112,7 +112,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTeamPortError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html
index 884fbf32..e3243206 100644
--- a/docs/libnm-util/html/NMSettingVPN.html
+++ b/docs/libnm-util/html/NMSettingVPN.html
@@ -256,7 +256,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingVpnError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html
index 9f003de2..df603abd 100644
--- a/docs/libnm-util/html/NMSettingVlan.html
+++ b/docs/libnm-util/html/NMSettingVlan.html
@@ -261,7 +261,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingVlanError
     ├── NMVlanFlags
     ╰── NMVlanPriorityMap
diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html
index 242b8222..26544076 100644
--- a/docs/libnm-util/html/NMSettingWimax.html
+++ b/docs/libnm-util/html/NMSettingWimax.html
@@ -131,7 +131,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWimaxError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html
index 9a6619aa..75184b1b 100644
--- a/docs/libnm-util/html/NMSettingWired.html
+++ b/docs/libnm-util/html/NMSettingWired.html
@@ -369,7 +369,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWiredError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html
index 9aab30bc..1db2d508 100644
--- a/docs/libnm-util/html/NMSettingWireless.html
+++ b/docs/libnm-util/html/NMSettingWireless.html
@@ -435,7 +435,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessError
     GObject
     ╰── NMSetting
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 36b60f5f..d091dda2 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -498,7 +498,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingWirelessSecurityError
     ╰── NMWepKeyType
     GObject
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index d7a5b342..103f41a3 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm-util 1.2.2
+      for libnm-util 1.2.4
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm-util/stable/.
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 350ba973..9507d0ab 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -480,7 +480,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
 

 

diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html
index 4c668702..9c2eaa40 100644
--- a/docs/libnm-util/html/object-tree.html
+++ b/docs/libnm-util/html/object-tree.html
@@ -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 23aa8390..e8ea05db 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.2.2
+1.2.4
diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in
index 74eaa53f..d5f367ea 100644
--- a/docs/libnm/Makefile.in
+++ b/docs/libnm/Makefile.in
@@ -271,6 +271,7 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@
 NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
 NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html
index e5449080..06167333 100644
--- a/docs/libnm/html/NMClient.html
+++ b/docs/libnm/html/NMClient.html
@@ -798,7 +798,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMClientError
     ├── NMClientPermission
     ╰── NMClientPermissionResult
@@ -3251,6 +3251,21 @@ clients can obtain to perform certain tasks on behalf of the current user.

  
 
 
+
NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS

+
+
modify persistent global
+ DNS configuration

+
+ 
+
+
+
NM_CLIENT_PERMISSION_RELOAD

+
+
controls access to Reload.

+
+ 
+
+
 
NM_CLIENT_PERMISSION_LAST

 
 
a reserved boundary value

diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index b5b09562..bf8587db 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -542,7 +542,7 @@
 

 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMConnectionSerializationFlags
 

 

diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index 016bad3d..e6e7bbec 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -791,7 +791,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── NMLldpNeighbor
     GObject
     ╰── NMObject
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index c392ec1f..09859dd6 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -219,11 +219,11 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ╰── NMSettingMacRandomization
-    GFlags
+    GFlags
     ╰── NMSettingSecretFlags
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 16c019d5..3596bce3 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -961,7 +961,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ╰── NMSetting8021xCKScheme
     GObject
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 89b3f606..e69e8221 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -473,7 +473,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingConnectionAutoconnectSlaves
     ╰── NMSettingConnectionLldp
     GObject
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 78829261..cfc5515a 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -406,7 +406,7 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingDcbFlags
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 0fa2bb56..285780a6 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -151,7 +151,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingIP6ConfigAddrGenMode
     ╰── NMSettingIP6ConfigPrivacy
     GObject
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 61034747..98cd3a82 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -509,6 +509,14 @@
 
 
 
+gint
+
+
+nm_setting_ip_config_get_dns_priority ()
+
+
+
+
 guint
 
 
@@ -731,6 +739,11 @@
 Read / Write
 
 
+gint
+dns-priority
+Read / Write / Construct
+
+
 GStrv
 dns-search
 Read / Write
@@ -811,6 +824,10 @@
 
 
 #define
+NM_SETTING_IP_CONFIG_DNS_PRIORITY
+
+
+#define
 NM_SETTING_IP_CONFIG_ADDRESSES
 
 
@@ -926,7 +943,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIPAddress
     ╰── NMIPRoute
     GObject
@@ -2888,12 +2905,38 @@ Specify how to clear the options.
+

nm_setting_ip_config_get_dns_priority ()

+
gint
+nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting);
+
+

Parameters

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

setting

the NMSettingIPConfig

 
+
+
+

Returns

+

the priority of DNS servers

+
+

Since: 1.2.4

+
+
+

nm_setting_ip_config_get_num_addresses ()

guint
 nm_setting_ip_config_get_num_addresses
                                (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -2908,7 +2951,7 @@ nm_setting_ip_config_get_num_addresses
-

Returns

+

Returns

the number of configured addresses

@@ -2919,7 +2962,7 @@ nm_setting_ip_config_get_num_addresses nm_setting_ip_config_get_address (NMSettingIPConfig *setting, int idx);
-

Parameters

+

Parameters

@@ -2941,7 +2984,7 @@ nm_setting_ip_config_get_address (
-

Returns

+

Returns

the address at index idx .

[transfer none]

@@ -2956,7 +2999,7 @@ nm_setting_ip_config_add_address (Adds a new IP address and associated information to the setting. The given address is duplicated internally and is not changed by this function.

-

Parameters

+

Parameters

@@ -2978,7 +3021,7 @@ given address is duplicated internally and is not changed by this function.

-

Returns

+

Returns

TRUE if the address was added; FALSE if the address was already known.

@@ -2992,7 +3035,7 @@ nm_setting_ip_config_remove_address (Removes the address at index idx .

-

Parameters

+

Parameters

@@ -3024,7 +3067,7 @@ nm_setting_ip_config_remove_address_by_value

Removes the address address .

-

Parameters

+

Parameters

@@ -3046,7 +3089,7 @@ nm_setting_ip_config_remove_address_by_value
-

Returns

+

Returns

TRUE if the address was found and removed; FALSE if it was not.

@@ -3057,7 +3100,7 @@ nm_setting_ip_config_remove_address_by_value nm_setting_ip_config_clear_addresses (NMSettingIPConfig *setting);

Removes all configured addresses.

-

Parameters

+

Parameters

@@ -3078,7 +3121,7 @@ nm_setting_ip_config_clear_addresses (const char * nm_setting_ip_config_get_gateway (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -3093,7 +3136,7 @@ nm_setting_ip_config_get_gateway (
-

Returns

+

Returns

the IP address of the gateway associated with this configuration, or NULL.

@@ -3104,7 +3147,7 @@ nm_setting_ip_config_get_gateway (guint nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -3119,7 +3162,7 @@ nm_setting_ip_config_get_num_routes (
-

Returns

+

Returns

the number of configured routes

@@ -3130,7 +3173,7 @@ nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting, int idx);
-

Parameters

+

Parameters

@@ -3152,7 +3195,7 @@ nm_setting_ip_config_get_route (
-

Returns

+

Returns

the route at index idx .

[transfer none]

@@ -3167,7 +3210,7 @@ nm_setting_ip_config_add_route (Adds a new route and associated information to the setting. The given route is duplicated internally and is not changed by this function.

-

Parameters

+

Parameters

@@ -3189,7 +3232,7 @@ given route is duplicated internally and is not changed by this function.

-

Returns

+

Returns

TRUE if the route was added; FALSE if the route was already known.

@@ -3202,7 +3245,7 @@ nm_setting_ip_config_remove_route (Removes the route at index idx .

-

Parameters

+

Parameters

@@ -3234,7 +3277,7 @@ nm_setting_ip_config_remove_route_by_value

Removes the route route .

-

Parameters

+

Parameters

@@ -3256,7 +3299,7 @@ nm_setting_ip_config_remove_route_by_value
-

Returns

+

Returns

TRUE if the route was found and removed; FALSE if it was not.

@@ -3267,7 +3310,7 @@ nm_setting_ip_config_remove_route_by_value nm_setting_ip_config_clear_routes (NMSettingIPConfig *setting);

Removes all configured routes.

-

Parameters

+

Parameters

@@ -3290,7 +3333,7 @@ nm_setting_ip_config_get_route_metric (“route-metric” property.

-

Parameters

+

Parameters

@@ -3305,7 +3348,7 @@ property.

-

Returns

+

Returns

the route metric that is used for routes that don't explicitly specify a metric. See “route-metric” for more details.

@@ -3319,7 +3362,7 @@ nm_setting_ip_config_get_ignore_auto_routes

Returns the value contained in the “ignore-auto-routes” property.

-

Parameters

+

Parameters

@@ -3334,7 +3377,7 @@ property.

-

Returns

+

Returns

TRUE if automatically configured (ie via DHCP) routes should be ignored.

@@ -3348,7 +3391,7 @@ nm_setting_ip_config_get_ignore_auto_dns

Returns the value contained in the “ignore-auto-dns” property.

-

Parameters

+

Parameters

@@ -3363,7 +3406,7 @@ property.

-

Returns

+

Returns

TRUE if automatically configured (ie via DHCP) DNS information should be ignored.

@@ -3377,7 +3420,7 @@ nm_setting_ip_config_get_dhcp_hostname

Returns the value contained in the “dhcp-hostname” property.

-

Parameters

+

Parameters

@@ -3392,7 +3435,7 @@ property.

-

Returns

+

Returns

the configured hostname to send to the DHCP server

@@ -3405,7 +3448,7 @@ nm_setting_ip_config_get_dhcp_send_hostname

Returns the value contained in the “dhcp-send-hostname” property.

-

Parameters

+

Parameters

@@ -3420,7 +3463,7 @@ property.

-

Returns

+

Returns

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.

@@ -3435,7 +3478,7 @@ nm_setting_ip_config_get_never_default

Returns the value contained in the “never-default” property.

-

Parameters

+

Parameters

@@ -3450,7 +3493,7 @@ property.

-

Returns

+

Returns

TRUE if this connection should never be the default connection

@@ -3463,7 +3506,7 @@ nm_setting_ip_config_get_may_fail (Returns the value contained in the “may-fail” property.

-

Parameters

+

Parameters

@@ -3478,7 +3521,7 @@ property.

-

Returns

+

Returns

TRUE if this connection doesn't require this type of IP addressing to complete for the connection to succeed.

@@ -3489,7 +3532,7 @@ addressing to complete for the connection to succeed.

gint
 nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -3504,7 +3547,7 @@ nm_setting_ip_config_get_dad_timeout ( -

Returns

+

Returns

the “dad-timeout” property.

Since: 1.2

@@ -3517,7 +3560,7 @@ nm_setting_ip_config_get_dhcp_timeout (“dhcp-timeout” property.

-

Parameters

+

Parameters

@@ -3532,7 +3575,7 @@ property.

-

Returns

+

Returns

the configured DHCP timeout in seconds. 0 = default for the particular kind of device.

@@ -3572,6 +3615,12 @@ the particular kind of device.

+

NM_SETTING_IP_CONFIG_DNS_PRIORITY

+
#define NM_SETTING_IP_CONFIG_DNS_PRIORITY       "dns-priority"
+
+
+
+

NM_SETTING_IP_CONFIG_ADDRESSES

#define NM_SETTING_IP_CONFIG_ADDRESSES          "addresses"
@@ -3814,6 +3863,26 @@ distinct from an empty list of properties.

+

The “dns-priority” property

+
  “dns-priority”             gint
+

DNS priority.

+

The relative priority to be used when determining the order of DNS +servers in resolv.conf. A lower value means that servers will be on top +of the file. Zero selects the default value, which is 50 for VPNs and +100 for other connections. When multiple devices have configurations +with the same priority, the one with an active default route will be +preferred. Note that when using dns=dnsmasq the order is meaningless +since dnsmasq forwards queries to all known servers at the same time.

+

Negative values have the special effect of excluding other configurations +with a greater priority value; so in presence of at least a negative +priority, only DNS servers from configurations with the lowest priority +value will be used.

+

Flags: Read / Write / Construct

+

Default value: 0

+

Since: 1.2.4

+
+
+

The “dns-search” property

  “dns-search”               GStrv

Array of DNS search domains.

diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html index d5d1a207..d924b0f9 100644 --- a/docs/libnm/html/NMSettingMacvlan.html +++ b/docs/libnm/html/NMSettingMacvlan.html @@ -157,7 +157,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingMacvlanMode
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index 07f82316..b31f0715 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -175,7 +175,7 @@ serial communications

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialParity
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index 9a7a9fc5..41837ea7 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -191,7 +191,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTunMode
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index 61e4bf45..25807d63 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -230,9 +230,9 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMVlanPriorityMap
-    GFlags
+    GFlags
     ╰── NMVlanFlags
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index cdb857f4..568b9d5e 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -394,7 +394,7 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingWiredWakeOnLan
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index b9cb002e..a58e847c 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -426,7 +426,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessPowersave
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 9e5098f2..b8e8f37f 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -483,7 +483,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMWepKeyType
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 1e807951..d49d5fea 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -192,9 +192,9 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMVpnEditorPluginCapability
-    GInterface
+    GInterface
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
 

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 277b9132..5450ce1f 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -415,7 +415,7 @@
 
 

 

-NM_AVAILABLE_IN_1_4, macro in nm-version
+NM_AVAILABLE_IN_1_2_4, macro in nm-version
 

 

 
B

@@ -1470,14 +1470,6 @@
 
 

 

-NM_DEPRECATED_IN_1_4, macro in nm-version
-

-

-

-NM_DEPRECATED_IN_1_4_FOR, macro in nm-version
-

-

-

 NMDevice, struct in nm-types
 

 

@@ -4300,6 +4292,10 @@
 
 

 

+NMSettingIPConfig:dns-priority, object property in NMSettingIPConfig
+

+

+

 NMSettingIPConfig:dns-search, object property in NMSettingIPConfig
 

 

@@ -6568,6 +6564,10 @@
 
 

 

+NM_SETTING_IP_CONFIG_DNS_PRIORITY, macro in NMSettingIPConfig
+

+

+

 NM_SETTING_IP_CONFIG_DNS_SEARCH, macro in NMSettingIPConfig
 

 

@@ -6604,6 +6604,10 @@
 
 

 

+nm_setting_ip_config_get_dns_priority, function in NMSettingIPConfig
+

+

+

 nm_setting_ip_config_get_dns_search, function in NMSettingIPConfig
 

 

diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index eea02301..8794d373 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm 1.2.2
+      for libnm 1.2.4
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/stable/.
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index e2a6f09d..82b34062 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -104,6 +104,8 @@
 
 
 
+
+
 
 
 
@@ -264,6 +266,7 @@
 
 
 
+
 
 
 
@@ -1410,6 +1413,7 @@
 
 
 
+
 
 
 
@@ -1438,6 +1442,7 @@
 
 
 
+
 
 
 
@@ -1474,6 +1479,7 @@
 
 
 
+
 
 
 
@@ -3068,7 +3074,6 @@
 
 
 
-
 
 
 
@@ -3076,8 +3081,7 @@
 
 
 
-
-
+
 
 
 
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 2dcd7309..cafcbd4b 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -353,7 +353,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NM80211Mode
     ├── NMActiveConnectionState
     ├── NMConnectivityState
@@ -364,7 +364,7 @@
     ├── NMMetered
     ├── NMState
     ╰── NMWimaxNspNetworkType
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index f2720bfe..13444902 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -184,7 +184,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMCryptoError
@@ -714,6 +714,13 @@ errors in that namespace.

 
  
 
+
+
NM_MANAGER_ERROR_INVALID_ARGUMENTS

+
+
Invalid arguments for D-Bus request

+
+ 
+
 
 

 

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 65300023..1ae50f34 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -551,7 +551,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index 5e1c3977..4af37c3c 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -65,12 +65,6 @@ NM_DEPRECATED_IN_1_2_FOR() - -#define - -NM_DEPRECATED_IN_1_4_FOR() - - @@ -108,11 +102,7 @@ #define -NM_DEPRECATED_IN_1_4 - - -#define -NM_AVAILABLE_IN_1_4 +NM_AVAILABLE_IN_1_2_4 @@ -151,12 +141,6 @@ 
# define NM_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
-
-
-

NM_DEPRECATED_IN_1_4_FOR()

-
# define NM_DEPRECATED_IN_1_4_FOR(f)    G_DEPRECATED_FOR(f)
-
-

Types and Values

@@ -196,14 +180,8 @@
-

NM_DEPRECATED_IN_1_4

-
# define NM_DEPRECATED_IN_1_4           G_DEPRECATED
-
-
-
-
-

NM_AVAILABLE_IN_1_4

-
# define NM_AVAILABLE_IN_1_4            G_UNAVAILABLE(1,4)
+
NM_AVAILABLE_IN_1_2_4

+
# define NM_AVAILABLE_IN_1_2_4          G_UNAVAILABLE(1.2,4)
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html index d5be4bee..299f1d09 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 e4b37f3c..5358ef52 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -979,6 +979,7 @@
     
     
     
+    
     
     
     
@@ -1006,6 +1007,7 @@
     
     
     
+    
     
     
     
@@ -1041,6 +1043,7 @@
     
     
     
+    
     
     
     
@@ -2168,15 +2171,13 @@
     
     
     
-    
     
     
     
     
     
     
-    
-    
+    
     
     
     
@@ -2269,6 +2270,8 @@
     
     
     
+    
+    
     
     
     
@@ -2318,6 +2321,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index ea853287..147fbcc2 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -85,11 +85,11 @@
     ├── NMClient
     ├── NMSecretAgentOld
     ╰── NMSimpleConnection
-    GInterface
+    GInterface
     ├── NMConnection
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -104,7 +104,7 @@
     ├── NMSettingWiredWakeOnLan
     ├── NMVlanFlags
     ╰── NMVpnEditorPluginCapability
-    GEnum
+    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMDeviceError
@@ -146,7 +146,7 @@
     ├── NMVpnServiceState
     ├── NMWepKeyType
     ╰── NMWimaxNspNetworkType
-    GBoxed
+    GBoxed
     ├── NMIPAddress
     ├── NMIPRoute
     ╰── NMLldpNeighbor
diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt
index 4d7b5f25..adb1dc9f 100644
--- a/docs/libnm/libnm-sections.txt
+++ b/docs/libnm/libnm-sections.txt
@@ -1804,6 +1804,7 @@ NM_SETTING_IP_CONFIG_METHOD
 NM_SETTING_IP_CONFIG_DNS
 NM_SETTING_IP_CONFIG_DNS_SEARCH
 NM_SETTING_IP_CONFIG_DNS_OPTIONS
+NM_SETTING_IP_CONFIG_DNS_PRIORITY
 NM_SETTING_IP_CONFIG_ADDRESSES
 NM_SETTING_IP_CONFIG_GATEWAY
 NM_SETTING_IP_CONFIG_ROUTES
@@ -1853,6 +1854,7 @@ nm_setting_ip_config_add_dns_option
 nm_setting_ip_config_remove_dns_option
 nm_setting_ip_config_remove_dns_option_by_value
 nm_setting_ip_config_clear_dns_options
+nm_setting_ip_config_get_dns_priority
 nm_setting_ip_config_get_num_addresses
 nm_setting_ip_config_get_address
 nm_setting_ip_config_add_address
@@ -2664,9 +2666,7 @@ NM_AVAILABLE_IN_1_0
 NM_DEPRECATED_IN_1_2
 NM_DEPRECATED_IN_1_2_FOR
 NM_AVAILABLE_IN_1_2
-NM_DEPRECATED_IN_1_4
-NM_DEPRECATED_IN_1_4_FOR
-NM_AVAILABLE_IN_1_4
+NM_AVAILABLE_IN_1_2_4
 
 
 

diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index 23aa8390..e8ea05db 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.2.2
+1.2.4
-- 
cgit 1.3.0-6-gf8a5