New upstream version 1.8.0 upstream/1.8.0

39 files changed, 207 insertions, 2 deletions

diff --git a/introspection/org.freedesktop.NetworkManager.AccessPoint.xml b/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
index 617c8671..769ab7a9 100644
--- a/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
+++ b/introspection/org.freedesktop.NetworkManager.AccessPoint.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.AccessPoint:
+      @short_description: Wi-Fi Access Point
+
+  -->
   <interface name="org.freedesktop.NetworkManager.AccessPoint">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.AgentManager.xml b/introspection/org.freedesktop.NetworkManager.AgentManager.xml
index 86b4404a..e8df4872 100644
--- a/introspection/org.freedesktop.NetworkManager.AgentManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.AgentManager.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/org/freedesktop/NetworkManager/AgentManager">
+  <!--
+      org.freedesktop.NetworkManager.AgentManager:
+      @short_description: Secret Agent Manager
+
+  -->
   <interface name="org.freedesktop.NetworkManager.AgentManager">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Checkpoint.xml b/introspection/org.freedesktop.NetworkManager.Checkpoint.xml
index 1c5050f2..daab0c90 100644
--- a/introspection/org.freedesktop.NetworkManager.Checkpoint.xml
+++ b/introspection/org.freedesktop.NetworkManager.Checkpoint.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.Checkpoint:
+      @short_description: Configuration and State Snapshot
 
       A snapshot of NetworkManager state for a given device list
   -->
diff --git a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
index 383ede34..31a485c9 100644
--- a/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
+++ b/introspection/org.freedesktop.NetworkManager.Connection.Active.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.Connection.Active:
+      @short_description: Active Connection
 
       Objects that implement the Connection.Active interface represent an
       attempt to connect to a network using the details provided by a Connection
@@ -80,6 +81,20 @@
     <property name="State" type="u" access="read"/>
 
     <!--
+        StateChanged:
+        @state: (<link linkend="NMActiveConnectionState">NMActiveConnectionState</link>) The new state of the active connection.
+        @reason: (<link linkend="NMActiveConnectionStateReason">NMActiveConnectionStateReason</link>) Reason code describing the change to the new state.
+
+        Emitted when the state of the active connection has changed.
+
+        Since: 1.8
+    -->
+    <signal name="StateChanged">
+      <arg name="state" type="u"/>
+      <arg name="reason" type="u"/>
+    </signal>
+
+    <!--
         Default:
 
         Whether this active connection is the default IPv4 connection, i.e.
diff --git a/introspection/org.freedesktop.NetworkManager.DHCP4Config.xml b/introspection/org.freedesktop.NetworkManager.DHCP4Config.xml
index 5244bcaa..2e0ae82e 100644
--- a/introspection/org.freedesktop.NetworkManager.DHCP4Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.DHCP4Config.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.DHCP4Config:
+      @short_description: IPv4 DHCP Client State
 
       Options and configuration returned by the IPv4 DHCP server.
   -->
diff --git a/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml b/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
index 09e2ca86..0f064c4c 100644
--- a/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.DHCP6Config.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.DHCP6Config:
+      @short_description: IPv6 DHCP Client State
 
       Options and configuration returned by the IPv6 DHCP server.
   -->
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
index 0986f069..ef1f580f 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Adsl.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Adsl:
+      @short_description: ADSL Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Adsl">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml b/introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml
index f891220d..43a3047c 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Bluetooth:
+      @short_description: Bluetooth Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Bluetooth">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
index e6288a15..9ee24e81 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bond.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Bond:
+      @short_description: Bonding Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Bond">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
index a6c5710d..e64e4006 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Bridge.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Bridge:
+      @short_description: Bridging Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Bridge">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Dummy.xml b/introspection/org.freedesktop.NetworkManager.Device.Dummy.xml
new file mode 100644
index 00000000..0b5237f8
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.Dummy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Dummy:
+      @short_description: Dummy Device
+
+  -->
+  <interface name="org.freedesktop.NetworkManager.Device.Dummy">
+
+    <!--
+        PropertiesChanged:
+        @properties: A dictionary mapping property names to variant boxed values
+
+        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}"/>
+    </signal>
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Generic.xml b/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
index 39aafc2c..ecbfed68 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Generic.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Generic:
+      @short_description: Unrecognized Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Generic">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
index dda71e3e..ef92f3a9 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.IPTunnel:
+      @short_description: IP Tunneling Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.IPTunnel">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml b/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
index 34b5fadd..26e2694b 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Infiniband:
+      @short_description: Infiniband Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Infiniband">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml b/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml
index e67f937c..0f109c1d 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Macsec.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Macsec:
+      @short_description: MACSec Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Macsec">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml
index e0b58ba4..3370ab04 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Macvlan:
+      @short_description: MAC VLAN Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Macvlan">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
index 29eff682..d3cbd557 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Modem.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Modem:
+      @short_description: Modem Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Modem">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml b/introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml
index 3d6162f3..0e54403d 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.OlpcMesh:
+      @short_description: OLPC Wireless Mesh Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.OlpcMesh">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Statistics.xml b/introspection/org.freedesktop.NetworkManager.Device.Statistics.xml
index 84c3b6fe..39230b7f 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Statistics.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Statistics.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Statistics:
+      @short_description: Device Statistic Counters
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Statistics">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Team.xml b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
index c7b50a38..c187b511 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Team.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Team.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Team:
+      @short_description: Teaming Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Team">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Tun.xml b/introspection/org.freedesktop.NetworkManager.Device.Tun.xml
index 68167cc5..9dc4661a 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Tun.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Tun.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Tun:
+      @short_description: Userspace Tunneling Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Tun">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Veth.xml b/introspection/org.freedesktop.NetworkManager.Device.Veth.xml
index 93c7c870..a5265e07 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Veth.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Veth.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Veth:
+      @short_description: Virtual Ethernet Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Veth">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
index e5bf7c44..75d6ba43 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Vlan.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Vlan:
+      @short_description: Virtual LAN Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Vlan">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml b/introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml
index 8eae63c6..52b59cc5 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Vxlan:
+      @short_description: VXLAN Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Vxlan">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml b/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
index 844856cc..ac2a393a 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.WiMax.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.WiMax:
+      @short_description: WiMax Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.WiMax">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wired.xml b/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
index 3aa4540f..ae709031 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wired.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Wired:
+      @short_description: Wired Ethernet Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Wired">
     <annotation name="org.gtk.GDBus.C.Name" value="DeviceEthernet"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index 1973b417..bff89120 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device.Wireless:
+      @short_description: Wi-Fi Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device.Wireless">
     <annotation name="org.gtk.GDBus.C.Name" value="DeviceWifi"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.xml b/introspection/org.freedesktop.NetworkManager.Device.xml
index d4535a84..ee424101 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.Device:
+      @short_description: Device
+
+  -->
   <interface name="org.freedesktop.NetworkManager.Device">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.DnsManager.xml b/introspection/org.freedesktop.NetworkManager.DnsManager.xml
index 3a0c757b..dd96e0f6 100644
--- a/introspection/org.freedesktop.NetworkManager.DnsManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.DnsManager.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.DnsManager:
+      @short_description: DNS Configuration State
 
       The interface contains DNS-related information.
   -->
diff --git a/introspection/org.freedesktop.NetworkManager.IP4Config.xml b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
index 17f57bc6..0b04af94 100644
--- a/introspection/org.freedesktop.NetworkManager.IP4Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.IP4Config:
+      @short_description: IPv4 Configuration Set
+
+  -->
   <interface name="org.freedesktop.NetworkManager.IP4Config">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.IP6Config.xml b/introspection/org.freedesktop.NetworkManager.IP6Config.xml
index e5cab713..d2859b5a 100644
--- a/introspection/org.freedesktop.NetworkManager.IP6Config.xml
+++ b/introspection/org.freedesktop.NetworkManager.IP6Config.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.IP6Config:
+      @short_description: IPv6 Configuration Set
+
+  -->
   <interface name="org.freedesktop.NetworkManager.IP6Config">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.PPP.xml b/introspection/org.freedesktop.NetworkManager.PPP.xml
index e4c6a2c8..401ee949 100644
--- a/introspection/org.freedesktop.NetworkManager.PPP.xml
+++ b/introspection/org.freedesktop.NetworkManager.PPP.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.PPP:
+      @short_description: Helper interface for a PPP plugin
+
+  -->
   <interface name="org.freedesktop.NetworkManager.PPP">
     <annotation name="org.gtk.GDBus.C.Name" value="PPP_Manager"/>
 
diff --git a/introspection/org.freedesktop.NetworkManager.SecretAgent.xml b/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
index 33296fb0..654b3f2f 100644
--- a/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
+++ b/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.SecretAgent:
+      @short_description: User Secret Agent
 
       Private D-Bus interface used by secret agents that store and provide
       secrets to NetworkManager. If an agent provides secrets to NetworkManager
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
index cf33120c..61bd26dd 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.Settings.Connection:
+      @short_description: Connection Settings Profile
 
       Represents a single network connection configuration.
   -->
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index 32675e02..61940f91 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.Settings:
+      @short_description: Connection Settings Profile Manager
 
       The Settings interface allows clients to view and administrate the
       connections stored and used by NetworkManager.
diff --git a/introspection/org.freedesktop.NetworkManager.VPN.Connection.xml b/introspection/org.freedesktop.NetworkManager.VPN.Connection.xml
index 897cea0b..1dc1cc43 100644
--- a/introspection/org.freedesktop.NetworkManager.VPN.Connection.xml
+++ b/introspection/org.freedesktop.NetworkManager.VPN.Connection.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.VPN.Connection:
+      @short_description: Active VPN Connection
 
       Represents an active connection to a Virtual Private Network.
   -->
@@ -38,7 +39,7 @@
     <!--
         VpnStateChanged:
         @state: (<link linkend="NMVpnConnectionState">NMVpnConnectionState</link>) The new state of the VPN connection.
-        @reason: (<link linkend="NMVpnConnectionStateReason">NMVpnConnectionStateReason</link>) Reason code describing the change to the new state.
+        @reason: (<link linkend="NMActiveConnectionStateReason">NMActiveConnectionStateReason</link>) Reason code describing the change to the new state.
 
         Emitted when the state of the VPN connection has changed.
     -->
diff --git a/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml b/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
index 7eed9721..0c68f76e 100644
--- a/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
+++ b/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
@@ -3,6 +3,7 @@
 
   <!--
       org.freedesktop.NetworkManager.VPN.Plugin:
+      @short_description: VPN Service
 
       This interface is provided by plugins providing VPN services to the
       NetworkManager daemon.
diff --git a/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml b/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
index a7669279..1028afc0 100644
--- a/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
+++ b/introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
+  <!--
+      org.freedesktop.NetworkManager.WiMax.Nsp:
+      @short_description: WiMax Network Service Provider
+
+  -->
   <interface name="org.freedesktop.NetworkManager.WiMax.Nsp">
 
     <!--
diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml
index 1c299362..ebd04a89 100644
--- a/introspection/org.freedesktop.NetworkManager.xml
+++ b/introspection/org.freedesktop.NetworkManager.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/org/freedesktop/NetworkManager">
+  <!--
+      org.freedesktop.NetworkManager:
+      @short_description: Connection Manager
+
+  -->
   <interface name="org.freedesktop.NetworkManager">
     <annotation name="org.gtk.GDBus.C.Name" value="Manager"/>
 
@@ -395,6 +400,15 @@
 
         The overall state of the NetworkManager daemon.
 
+        This takes state of all active connections and the connectivity state into account
+        to produce a single indicator of the network accessibility status.
+
+        The graphical shells may use this property to provide network connection status
+        indication and applications may use this to check if Internet connection is
+        accessible. Shell that is able to cope with captive portals should use the
+        "Connectivity" property to decide whether to present a captive portal authentication
+        dialog.
+
         Returns: <link linkend="NMState">NMState</link>
     -->
     <property name="State" type="u" access="read"/>
@@ -412,7 +426,19 @@
     <!--
         Connectivity:
 
-        The network connectivity state.
+        The result of the last connectivity check. The connectivity check is triggered
+        automatically when a default connection becomes available, periodically and by
+        calling a CheckConnectivity() method.
+
+        This property is in general useful for the graphical shell to determine whether
+        the Internet access is being hijacked by an authentication gateway (a "captive
+        portal"). In such case it would typically present a web browser window to give
+        the user a chance to authenticate and call CheckConnectivity() when the user
+        submits a form or dismisses the window.
+
+        To determine the whether the user is able to access the Internet without dealing
+        with captive portals (e.g. to provide a network connection indicator or disable
+        controls that require Internet access), the "State" property is more suitable.
 
         Returns: <link linkend="NMConnectivityState">NMConnectivityState</link>
     -->