about summary refs log tree commit diff
path: root/introspection/nm-manager.xml
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-10-01 00:34:40 +0200
committerMichael Biebl <biebl@debian.org>2016-10-01 00:34:40 +0200
commit636b831a0f663aa53b0e186d5dc44a623150d376 (patch)
tree48ef86c0ff45c7c2c7fcddf910a9102d768c957c /introspection/nm-manager.xml
parentc8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff)
parent270c4830551c9810ad4e83f9a1db2b1cb946208c (diff)
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'introspection/nm-manager.xml')
-rw-r--r--introspection/nm-manager.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index 95cc16ca..cf178c39 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -21,11 +21,12 @@
         (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.
+        name 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.
+        the DNS plugin (0x04) or update resolv.conf (0x02), unless the DNS related configuration
+        changes in NetworkManager.conf.
     -->
     <method name="Reload">
       <arg name="flags" type="u" direction="in"/>
@@ -425,7 +426,7 @@
         PropertiesChanged:
         @properties: The changed properties.
 
-        NetworkManager's properties changed.
+        DEPRECATED. Use the standard "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" instead which exists since version NetworkManager 1.2.0.
     -->
     <signal name="PropertiesChanged">
       <arg name="properties" type="a{sv}"/>