From 73e152af6e3fb4f5848bfb8394484026ff119003 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 11 May 2016 17:08:25 +0200
Subject: Imported Upstream version 1.2.2

---
 libnm/nm-access-point.h       | 4 +++-
 libnm/nm-active-connection.h  | 3 +++
 libnm/nm-client.h             | 3 +++
 libnm/nm-device-adsl.h        | 3 +++
 libnm/nm-device-bond.h        | 3 +++
 libnm/nm-device-bridge.h      | 3 +++
 libnm/nm-device-bt.h          | 3 +++
 libnm/nm-device-ethernet.h    | 3 +++
 libnm/nm-device-generic.h     | 3 +++
 libnm/nm-device-infiniband.h  | 3 +++
 libnm/nm-device-ip-tunnel.h   | 3 +++
 libnm/nm-device-macvlan.h     | 3 +++
 libnm/nm-device-modem.h       | 3 +++
 libnm/nm-device-olpc-mesh.h   | 3 +++
 libnm/nm-device-team.h        | 3 +++
 libnm/nm-device-tun.h         | 3 +++
 libnm/nm-device-vlan.h        | 3 +++
 libnm/nm-device-vxlan.h       | 3 +++
 libnm/nm-device-wifi.h        | 3 +++
 libnm/nm-device-wimax.h       | 3 +++
 libnm/nm-device.h             | 3 +++
 libnm/nm-dhcp-config.h        | 3 +++
 libnm/nm-dhcp4-config.h       | 3 +++
 libnm/nm-dhcp6-config.h       | 3 +++
 libnm/nm-ip-config.h          | 3 +++
 libnm/nm-ip4-config.h         | 3 +++
 libnm/nm-ip6-config.h         | 3 +++
 libnm/nm-manager.h            | 3 +++
 libnm/nm-object.h             | 3 +++
 libnm/nm-property-docs.xml    | 2 +-
 libnm/nm-remote-connection.h  | 3 +++
 libnm/nm-remote-settings.h    | 3 +++
 libnm/nm-secret-agent-old.h   | 3 +++
 libnm/nm-setting-docs.xml     | 2 +-
 libnm/nm-vpn-connection.h     | 3 +++
 libnm/nm-vpn-plugin-old.h     | 3 +++
 libnm/nm-vpn-service-plugin.h | 3 +++
 libnm/nm-wimax-nsp.h          | 3 +++
 38 files changed, 110 insertions(+), 3 deletions(-)

(limited to 'libnm')

diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index f1e26548..142ab295 100644
--- a/libnm/nm-access-point.h
+++ b/libnm/nm-access-point.h
@@ -51,7 +51,9 @@ G_BEGIN_DECLS
 /* DEPRECATED */
 #define NM_ACCESS_POINT_HW_ADDRESS  "hw-address"
 
-
+/**
+ * NMAccessPoint:
+ */
 struct _NMAccessPoint {
 	NMObject parent;
 };
diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 4bc84148..13e50a06 100644
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_ACTIVE_CONNECTION_VPN                  "vpn"
 #define NM_ACTIVE_CONNECTION_MASTER               "master"
 
+/**
+ * NMActiveConnection:
+ */
 struct _NMActiveConnection {
 	NMObject parent;
 };
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 54d6deee..66ec9ea5 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -157,6 +157,9 @@ typedef enum {
 #define NM_CLIENT_ERROR nm_client_error_quark ()
 GQuark nm_client_error_quark (void);
 
+/**
+ * NMClient:
+ */
 struct _NMClient {
 	GObject parent;
 };
diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h
index d0174514..113d25b1 100644
--- a/libnm/nm-device-adsl.h
+++ b/libnm/nm-device-adsl.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 
 #define NM_DEVICE_ADSL_CARRIER "carrier"
 
+/**
+ * NMDeviceAdsl:
+ */
 struct _NMDeviceAdsl {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h
index b7a0b113..67f64280 100644
--- a/libnm/nm-device-bond.h
+++ b/libnm/nm-device-bond.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BOND_CARRIER     "carrier"
 #define NM_DEVICE_BOND_SLAVES      "slaves"
 
+/**
+ * NMDeviceBond:
+ */
 struct _NMDeviceBond {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h
index 42a0b3a5..df0cb303 100644
--- a/libnm/nm-device-bridge.h
+++ b/libnm/nm-device-bridge.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BRIDGE_CARRIER     "carrier"
 #define NM_DEVICE_BRIDGE_SLAVES      "slaves"
 
+/**
+ * NMDeviceBridge:
+ */
 struct _NMDeviceBridge {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h
index e066cbcd..773cb148 100644
--- a/libnm/nm-device-bt.h
+++ b/libnm/nm-device-bt.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_BT_NAME         "name"
 #define NM_DEVICE_BT_CAPABILITIES "bt-capabilities"
 
+/**
+ * NMDeviceBt:
+ */
 struct _NMDeviceBt {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h
index 07cf4c4d..76f4fde1 100644
--- a/libnm/nm-device-ethernet.h
+++ b/libnm/nm-device-ethernet.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_ETHERNET_CARRIER     "carrier"
 #define NM_DEVICE_ETHERNET_S390_SUBCHANNELS "s390-subchannels"
 
+/**
+ * NMDeviceEthernet:
+ */
 struct _NMDeviceEthernet {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h
index 457a8840..2a4a1160 100644
--- a/libnm/nm-device-generic.h
+++ b/libnm/nm-device-generic.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_GENERIC_HW_ADDRESS       "hw-address"
 #define NM_DEVICE_GENERIC_TYPE_DESCRIPTION "type-description"
 
+/**
+ * NMDeviceGeneric:
+ */
 struct _NMDeviceGeneric {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h
index c1f9be07..1f4ea217 100644
--- a/libnm/nm-device-infiniband.h
+++ b/libnm/nm-device-infiniband.h
@@ -39,6 +39,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_INFINIBAND_HW_ADDRESS  "hw-address"
 #define NM_DEVICE_INFINIBAND_CARRIER     "carrier"
 
+/**
+ * NMDeviceInfiniband:
+ */
 struct _NMDeviceInfiniband {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-ip-tunnel.h b/libnm/nm-device-ip-tunnel.h
index 820eab16..14251849 100644
--- a/libnm/nm-device-ip-tunnel.h
+++ b/libnm/nm-device-ip-tunnel.h
@@ -48,6 +48,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT "encapsulation-limit"
 #define NM_DEVICE_IP_TUNNEL_FLOW_LABEL          "flow-label"
 
+/**
+ * NMDeviceIPTunnel:
+ */
 struct _NMDeviceIPTunnel {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
index 7ffb80c1..aec280bd 100644
--- a/libnm/nm-device-macvlan.h
+++ b/libnm/nm-device-macvlan.h
@@ -42,6 +42,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MACVLAN_TAP         "tap"
 #define NM_DEVICE_MACVLAN_HW_ADDRESS  "hw-address"
 
+/**
+ * NMDeviceMacvlan:
+ */
 struct _NMDeviceMacvlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index 38a4ddbb..fdf5c41f 100644
--- a/libnm/nm-device-modem.h
+++ b/libnm/nm-device-modem.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_MODEM_MODEM_CAPABILITIES   "modem-capabilities"
 #define NM_DEVICE_MODEM_CURRENT_CAPABILITIES "current-capabilities"
 
+/**
+ * NMDeviceModem:
+ */
 struct _NMDeviceModem {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h
index b5899445..fc88beb9 100644
--- a/libnm/nm-device-olpc-mesh.h
+++ b/libnm/nm-device-olpc-mesh.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_OLPC_MESH_COMPANION      "companion"
 #define NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL "active-channel"
 
+/**
+ * NMDeviceOlpcMesh:
+ */
 struct _NMDeviceOlpcMesh {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h
index a7185795..a9b71c6a 100644
--- a/libnm/nm-device-team.h
+++ b/libnm/nm-device-team.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_TEAM_CARRIER     "carrier"
 #define NM_DEVICE_TEAM_SLAVES      "slaves"
 
+/**
+ * NMDeviceTeam:
+ */
 struct _NMDeviceTeam {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-tun.h b/libnm/nm-device-tun.h
index b83e2b3f..71649f8f 100644
--- a/libnm/nm-device-tun.h
+++ b/libnm/nm-device-tun.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_TUN_VNET_HDR     "vnet-hdr"
 #define NM_DEVICE_TUN_MULTI_QUEUE  "multi-queue"
 
+/**
+ * NMDeviceTun:
+ */
 struct _NMDeviceTun {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h
index 6ab24202..1ee03bd5 100644
--- a/libnm/nm-device-vlan.h
+++ b/libnm/nm-device-vlan.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_VLAN_PARENT      "parent"
 #define NM_DEVICE_VLAN_VLAN_ID     "vlan-id"
 
+/**
+ * NMDeviceVlan:
+ */
 struct _NMDeviceVlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-vxlan.h b/libnm/nm-device-vxlan.h
index 1fb63597..70c7ed51 100644
--- a/libnm/nm-device-vxlan.h
+++ b/libnm/nm-device-vxlan.h
@@ -55,6 +55,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_VXLAN_L3MISS        "l3miss"
 #define NM_DEVICE_VXLAN_DST_PORT      "dst-port"
 
+/**
+ * NMDeviceVxlan:
+ */
 struct _NMDeviceVxlan {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index b5974ba2..ee0238df 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.h
@@ -45,6 +45,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIFI_CAPABILITIES        "wireless-capabilities"
 #define NM_DEVICE_WIFI_ACCESS_POINTS       "access-points"
 
+/**
+ * NMDeviceWifi:
+ */
 struct _NMDeviceWifi {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h
index cdd6ba56..424779bd 100644
--- a/libnm/nm-device-wimax.h
+++ b/libnm/nm-device-wimax.h
@@ -46,6 +46,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_WIMAX_BSID             "bsid"
 #define NM_DEVICE_WIMAX_NSPS             "nsps"
 
+/**
+ * NMDeviceWimax:
+ */
 struct _NMDeviceWimax {
 	NMDevice parent;
 };
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index c16ead9e..5ffeb42e 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -65,6 +65,9 @@ G_BEGIN_DECLS
 #define NM_DEVICE_METERED "metered"
 #define NM_DEVICE_LLDP_NEIGHBORS "lldp-neighbors"
 
+/**
+ * NMDevice:
+ */
 struct _NMDevice {
 	NMObject parent;
 };
diff --git a/libnm/nm-dhcp-config.h b/libnm/nm-dhcp-config.h
index 85aa3bd2..be32992f 100644
--- a/libnm/nm-dhcp-config.h
+++ b/libnm/nm-dhcp-config.h
@@ -36,6 +36,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CONFIG))
 #define NM_IS_DHCP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CONFIG))
 
+/**
+ * NMDhcpConfig:
+ */
 struct _NMDhcpConfig {
 	NMObject parent;
 };
diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h
index 3423740d..4978f848 100644
--- a/libnm/nm-dhcp4-config.h
+++ b/libnm/nm-dhcp4-config.h
@@ -31,6 +31,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP4_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG))
 #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG))
 
+/**
+ * NMDhcp4Config:
+ */
 typedef struct {
 	NMDhcpConfig parent;
 } NMDhcp4Config;
diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h
index abb24adf..b7c7c822 100644
--- a/libnm/nm-dhcp6-config.h
+++ b/libnm/nm-dhcp6-config.h
@@ -31,6 +31,9 @@ G_BEGIN_DECLS
 #define NM_IS_DHCP6_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG))
 #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG))
 
+/**
+ * NMDhcp6Config:
+ */
 typedef struct {
 	NMDhcpConfig parent;
 } NMDhcp6Config;
diff --git a/libnm/nm-ip-config.h b/libnm/nm-ip-config.h
index 815135a0..38d5b454 100644
--- a/libnm/nm-ip-config.h
+++ b/libnm/nm-ip-config.h
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP_CONFIG))
 #define NM_IP_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP_CONFIG, NMIPConfigClass))
 
+/**
+ * NMIPConfig:
+ */
 struct _NMIPConfig {
 	NMObject parent;
 };
diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h
index e2a18e0f..196fe09a 100644
--- a/libnm/nm-ip4-config.h
+++ b/libnm/nm-ip4-config.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP4_CONFIG))
 #define NM_IP4_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP4_CONFIG, NMIP4ConfigClass))
 
+/**
+ * NMIP4Config:
+ */
 typedef struct {
 	NMIPConfig parent;
 } NMIP4Config;
diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h
index 1953476d..fa67517c 100644
--- a/libnm/nm-ip6-config.h
+++ b/libnm/nm-ip6-config.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 #define NM_IS_IP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_IP6_CONFIG))
 #define NM_IP6_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_IP6_CONFIG, NMIP6ConfigClass))
 
+/**
+ * NMIP6Config:
+ */
 typedef struct {
 	NMIPConfig parent;
 } NMIP6Config;
diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index f9e4cd0e..7b6dd675 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -53,6 +53,9 @@ G_BEGIN_DECLS
 #define NM_MANAGER_METERED "metered"
 #define NM_MANAGER_ALL_DEVICES "all-devices"
 
+/**
+ * NMManager:
+ */
 typedef struct {
 	NMObject parent;
 } NMManager;
diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index b42f160d..fcfc718c 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.h
@@ -40,6 +40,9 @@ G_BEGIN_DECLS
 #define NM_OBJECT_PATH "path"
 #define NM_OBJECT_DBUS_CONNECTION "dbus-connection"
 
+/**
+ * NMObject:
+ */
 struct _NMObject {
 	GObject parent;
 };
diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml
index c4a6685e..f75e233d 100644
--- a/libnm/nm-property-docs.xml
+++ b/libnm/nm-property-docs.xml
@@ -169,7 +169,7 @@
     <property name="routes" type="array of array of uint32" default="[]" description="Array of IP routes." />
   </setting>
   <setting name="ipv6">
-    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, &quot;stable-privacy&quot; or unset. If the property is set to &quot;eui64&quot;, 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 &quot;stable-privacy&quot; 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 &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
+    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, or &quot;stable-privacy&quot;. If the property is set to &quot;eui64&quot;, 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 &quot;stable-privacy&quot; 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. On D-Bus, the absence of an addr-gen-mode setting equals enabling &quot;stable-privacy&quot;. For keyfile plugin, the absence of the setting on disk means &quot;eui64&quot; so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
     <property name="addresses" type="array of legacy IPv6 address struct" default="[]" description="Array of IP addresses." />
     <property name="dad-timeout" type="int32" default="-1" description="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 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." />
     <property name="dhcp-hostname" type="string" description="If the &quot;dhcp-send-hostname&quot; property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and &quot;dhcp-fqdn&quot; are mutually exclusive and cannot be set at the same time." />
diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h
index 3ea8037f..a7235755 100644
--- a/libnm/nm-remote-connection.h
+++ b/libnm/nm-remote-connection.h
@@ -44,6 +44,9 @@ G_BEGIN_DECLS
 #define NM_REMOTE_CONNECTION_UNSAVED         "unsaved"
 #define NM_REMOTE_CONNECTION_VISIBLE         "visible"
 
+/**
+ * NMRemoteConnection:
+ */
 struct _NMRemoteConnection {
 	NMObject parent;
 };
diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h
index 1ffc0bf2..f8eddc5b 100644
--- a/libnm/nm-remote-settings.h
+++ b/libnm/nm-remote-settings.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 typedef struct _NMRemoteSettings NMRemoteSettings;
 typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass;
 
+/**
+ * NMRemoteSettings:
+ */
 struct _NMRemoteSettings {
 	NMObject parent;
 };
diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h
index 6198e2c0..476cc2a2 100644
--- a/libnm/nm-secret-agent-old.h
+++ b/libnm/nm-secret-agent-old.h
@@ -37,6 +37,9 @@ G_BEGIN_DECLS
 #define NM_SECRET_AGENT_OLD_REGISTERED          "registered"
 #define NM_SECRET_AGENT_OLD_CAPABILITIES        "capabilities"
 
+/**
+ * NMSecretAgentOld:
+ */
 typedef struct {
 	GObject parent;
 } NMSecretAgentOld;
diff --git a/libnm/nm-setting-docs.xml b/libnm/nm-setting-docs.xml
index 323709b0..d3ede916 100644
--- a/libnm/nm-setting-docs.xml
+++ b/libnm/nm-setting-docs.xml
@@ -173,7 +173,7 @@
     <property name="routes" type="array of array of uint32" default="[]" description="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.)" />
   </setting>
   <setting name="ipv6">
-    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, &quot;stable-privacy&quot; or unset. If the property is set to &quot;eui64&quot;, 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 &quot;stable-privacy&quot; 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 &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
+    <property name="addr-gen-mode" type="int32" default="1" description="Configure method for creating the address for use with RFC4862 IPv6 Stateless Address Autoconfiguration. The permitted values are: &quot;eui64&quot;, or &quot;stable-privacy&quot;. If the property is set to &quot;eui64&quot;, 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 &quot;stable-privacy&quot; 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. On D-Bus, the absence of an addr-gen-mode setting equals enabling &quot;stable-privacy&quot;. For keyfile plugin, the absence of the setting on disk means &quot;eui64&quot; so that the property doesn't change on upgrade from older versions. Note that this setting is distinct from the Privacy Extensions as configured by &quot;ip6-privacy&quot; property and it does not affect the temporary addresses configured with this option." />
     <property name="address-data" type="array of vardict" description="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." />
     <property name="addresses" type="array of legacy IPv6 address struct (a(ayuay))" default="[]" description="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." />
     <property name="dad-timeout" type="int32" default="-1" description="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 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." />
diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 349de41e..79ec90a0 100644
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_VPN_CONNECTION_VPN_STATE "vpn-state"
 #define NM_VPN_CONNECTION_BANNER "banner"
 
+/**
+ * NMVpnConnection:
+ */
 struct _NMVpnConnection {
 	NMActiveConnection parent;
 };
diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h
index 59cf4600..50e34450 100644
--- a/libnm/nm-vpn-plugin-old.h
+++ b/libnm/nm-vpn-plugin-old.h
@@ -38,6 +38,9 @@ G_BEGIN_DECLS
 #define NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME "service-name"
 #define NM_VPN_PLUGIN_OLD_STATE             "state"
 
+/**
+ * NMVpnPluginOld:
+ */
 typedef struct {
 	NM_DEPRECATED_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-vpn-service-plugin.h b/libnm/nm-vpn-service-plugin.h
index 29319189..0b655296 100644
--- a/libnm/nm-vpn-service-plugin.h
+++ b/libnm/nm-vpn-service-plugin.h
@@ -43,6 +43,9 @@ G_BEGIN_DECLS
 #define NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER   "watch-peer"
 #define NM_VPN_SERVICE_PLUGIN_STATE             "state"
 
+/**
+ * NMVpnServicePlugin:
+ */
 typedef struct {
 	NM_AVAILABLE_IN_1_2
 	GObject parent;
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index 5dd982ef..e1f63400 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -41,6 +41,9 @@ G_BEGIN_DECLS
 #define NM_WIMAX_NSP_SIGNAL_QUALITY "signal-quality"
 #define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 
+/**
+ * NMWimaxNsp:
+ */
 struct _NMWimaxNsp {
 	NMObject parent;
 };
-- 
cgit 1.3.0-6-gf8a5