From 2bfb3eb7d0323e69affca154395f51d8b577414d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 6 Apr 2016 00:46:19 +0200 Subject: Imported Upstream version 1.1.93 --- docs/libnm/html/NMSettingBond.html | 150 ++++++++++++++++++++--- docs/libnm/html/NMSettingIPConfig.html | 10 ++ docs/libnm/html/NMWimaxNsp.html | 61 +-------- docs/libnm/html/api-index-full.html | 66 +++++++++- docs/libnm/html/index.html | 2 +- docs/libnm/html/index.sgml | 26 +++- docs/libnm/html/libnm-nm-dbus-interface.html | 102 ++++++++++----- docs/libnm/html/libnm-nm-version.html | 32 +++++ docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 12 +- docs/libnm/html/libnm.devhelp2 | 26 +++- docs/libnm/html/object-tree.html | 2 +- 11 files changed, 363 insertions(+), 126 deletions(-) (limited to 'docs/libnm/html') diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html index edf00c34..94a98924 100644 --- a/docs/libnm/html/NMSettingBond.html +++ b/docs/libnm/html/NMSettingBond.html @@ -205,6 +205,54 @@ #define NM_SETTING_BOND_OPTION_LACP_RATE + +#define +NM_SETTING_BOND_OPTION_ACTIVE_SLAVE + + +#define +NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO + + +#define +NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM + + +#define +NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY + + +#define +NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE + + +#define +NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS + + +#define +NM_SETTING_BOND_OPTION_MIN_LINKS + + +#define +NM_SETTING_BOND_OPTION_NUM_GRAT_ARP + + +#define +NM_SETTING_BOND_OPTION_NUM_UNSOL_NA + + +#define +NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE + + +#define +NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB + + +#define +NM_SETTING_BOND_OPTION_LP_INTERVAL + @@ -557,91 +605,163 @@ the

NM_SETTING_BOND_OPTION_MODE

-
#define NM_SETTING_BOND_OPTION_MODE             "mode"
+
#define NM_SETTING_BOND_OPTION_MODE              "mode"
 

 
 

 

 
NM_SETTING_BOND_OPTION_MIIMON

-
#define NM_SETTING_BOND_OPTION_MIIMON           "miimon"
+
#define NM_SETTING_BOND_OPTION_MIIMON            "miimon"
 

 

 

 

 
NM_SETTING_BOND_OPTION_DOWNDELAY

-
#define NM_SETTING_BOND_OPTION_DOWNDELAY        "downdelay"
+
#define NM_SETTING_BOND_OPTION_DOWNDELAY         "downdelay"
 

 

 

 

 
NM_SETTING_BOND_OPTION_UPDELAY

-
#define NM_SETTING_BOND_OPTION_UPDELAY          "updelay"
+
#define NM_SETTING_BOND_OPTION_UPDELAY           "updelay"
 

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_INTERVAL

-
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL     "arp_interval"
+
#define NM_SETTING_BOND_OPTION_ARP_INTERVAL      "arp_interval"
 

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_IP_TARGET

-
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET    "arp_ip_target"
+
#define NM_SETTING_BOND_OPTION_ARP_IP_TARGET     "arp_ip_target"
 

 

 

 

 
NM_SETTING_BOND_OPTION_ARP_VALIDATE

-
#define NM_SETTING_BOND_OPTION_ARP_VALIDATE     "arp_validate"
+
#define NM_SETTING_BOND_OPTION_ARP_VALIDATE      "arp_validate"
 

 

 

 

 
NM_SETTING_BOND_OPTION_PRIMARY

-
#define NM_SETTING_BOND_OPTION_PRIMARY          "primary"
+
#define NM_SETTING_BOND_OPTION_PRIMARY           "primary"
 

 

 

 

 
NM_SETTING_BOND_OPTION_PRIMARY_RESELECT

-
#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT "primary_reselect"
+
#define NM_SETTING_BOND_OPTION_PRIMARY_RESELECT  "primary_reselect"
 

 

 

 

 
NM_SETTING_BOND_OPTION_FAIL_OVER_MAC

-
#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC    "fail_over_mac"
+
#define NM_SETTING_BOND_OPTION_FAIL_OVER_MAC     "fail_over_mac"
 

 

 

 

 
NM_SETTING_BOND_OPTION_USE_CARRIER

-
#define NM_SETTING_BOND_OPTION_USE_CARRIER      "use_carrier"
+
#define NM_SETTING_BOND_OPTION_USE_CARRIER       "use_carrier"
 

 

 

 

 
NM_SETTING_BOND_OPTION_AD_SELECT

-
#define NM_SETTING_BOND_OPTION_AD_SELECT        "ad_select"
+
#define NM_SETTING_BOND_OPTION_AD_SELECT         "ad_select"
 

 

 

 

 
NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY

-
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY "xmit_hash_policy"
+
#define NM_SETTING_BOND_OPTION_XMIT_HASH_POLICY  "xmit_hash_policy"
 

 

 

 

 
NM_SETTING_BOND_OPTION_RESEND_IGMP

-
#define NM_SETTING_BOND_OPTION_RESEND_IGMP      "resend_igmp"
+
#define NM_SETTING_BOND_OPTION_RESEND_IGMP       "resend_igmp"
 

 

 

 

 
NM_SETTING_BOND_OPTION_LACP_RATE

-
#define NM_SETTING_BOND_OPTION_LACP_RATE        "lacp_rate"
+
#define NM_SETTING_BOND_OPTION_LACP_RATE         "lacp_rate"
+

+

+

+

+
NM_SETTING_BOND_OPTION_ACTIVE_SLAVE

+
#define NM_SETTING_BOND_OPTION_ACTIVE_SLAVE      "active_slave"
+

+

+

+

+
NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO

+
#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO "ad_actor_sys_prio"
+

+

+

+

+
NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM

+
#define NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM   "ad_actor_system"
+

+

+

+

+
NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY

+
#define NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY  "ad_user_port_key"
+

+

+

+

+
NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE

+
#define NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE "all_slaves_active"
+

+

+

+

+
NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS

+
#define NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS   "arp_all_targets"
+

+

+

+

+
NM_SETTING_BOND_OPTION_MIN_LINKS

+
#define NM_SETTING_BOND_OPTION_MIN_LINKS         "min_links"
+

+

+

+

+
NM_SETTING_BOND_OPTION_NUM_GRAT_ARP

+
#define NM_SETTING_BOND_OPTION_NUM_GRAT_ARP      "num_grat_arp"
+

+

+

+

+
NM_SETTING_BOND_OPTION_NUM_UNSOL_NA

+
#define NM_SETTING_BOND_OPTION_NUM_UNSOL_NA      "num_unsol_na"
+

+

+

+

+
NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE

+
#define NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE "packets_per_slave"
+

+

+

+

+
NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB

+
#define NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB    "tlb_dynamic_lb"
+

+

+

+

+
NM_SETTING_BOND_OPTION_LP_INTERVAL

+
#define NM_SETTING_BOND_OPTION_LP_INTERVAL       "lp_interval"
 

 

 
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index cfa53456..f2a9fafc 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -913,6 +913,10 @@
 #define
 NM_SETTING_DNS_OPTION_NO_TLD_QUERY
 
+
+#define
+NM_SETTING_DNS_OPTION_USE_VC
+
 
 
 
@@ -3718,6 +3722,12 @@ the particular kind of device.

 
#define NM_SETTING_DNS_OPTION_NO_TLD_QUERY              "no-tld-query"
 

 
+

+

+
NM_SETTING_DNS_OPTION_USE_VC

+
#define NM_SETTING_DNS_OPTION_USE_VC                    "use-vc"
+

+

 
 

 
Property Details

diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html
index 8a73c9b9..ecaae0aa 100644
--- a/docs/libnm/html/NMWimaxNsp.html
+++ b/docs/libnm/html/NMWimaxNsp.html
@@ -58,7 +58,7 @@
 
 
 
-NMWimaxNspNetworkType
+NMWimaxNspNetworkType
 
 
 nm_wimax_nsp_get_network_type ()
@@ -99,7 +99,7 @@
 Read
 
 
-NMWimaxNspNetworkType
+NMWimaxNspNetworkType
 network-type
 Read
 
@@ -131,18 +131,12 @@
 #define
 NM_WIMAX_NSP_NETWORK_TYPE
 
-
-enum
-NMWimaxNspNetworkType
-
 
 

 
 

 
Object Hierarchy

-
    GEnum
-    ╰── NMWimaxNspNetworkType
-    GObject
+
    GObject
     ╰── NMObject
         ╰── NMWimaxNsp
 

@@ -206,7 +200,7 @@ nm_wimax_nsp_get_signal_quality (
 

 
nm_wimax_nsp_get_network_type ()

-
NMWimaxNspNetworkType
+
NMWimaxNspNetworkType
 nm_wimax_nsp_get_network_type (NMWimaxNsp *nsp);

 
Gets the network type of the wimax NSP.

 

@@ -331,51 +325,6 @@ against

 
#define NM_WIMAX_NSP_NETWORK_TYPE   "network-type"
 

 

-

-

-
enum NMWimaxNspNetworkType

-
WiMAX network type.

-

-
Members

-

-----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-





NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

-
unknown network type

-		 
NM_WIMAX_NSP_NETWORK_TYPE_HOME

-
home network

-		 
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

-
partner network

-		 
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

-
roaming partner network

-		 

-

-

 

 

 
Property Details

@@ -389,7 +338,7 @@ against

 

 

 
The “network-type” property

-
  “network-type”             NMWimaxNspNetworkType

+
  “network-type”             NMWimaxNspNetworkType

 
The network type of the WiMAX NSP.

 
Flags: Read

 
Default value: NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index e4606198..fe6ccbeb 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -406,6 +406,10 @@
 NM_AVAILABLE_IN_1_2, macro in nm-version
 
 

+

+NM_AVAILABLE_IN_1_4, macro in nm-version
+

+

 
B

 

 NMBluetoothCapabilities, enum in nm-dbus-interface
@@ -1438,6 +1442,14 @@
 

 

 

+NM_DEPRECATED_IN_1_4, macro in nm-version
+

+

+

+NM_DEPRECATED_IN_1_4_FOR, macro in nm-version
+

+

+

 NMDevice::state-changed, object signal in NMDevice
 

 

@@ -5280,10 +5292,34 @@
 
 

 

+NM_SETTING_BOND_OPTION_ACTIVE_SLAVE, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_AD_ACTOR_SYSTEM, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_AD_ACTOR_SYS_PRIO, macro in NMSettingBond
+

+

+

 NM_SETTING_BOND_OPTION_AD_SELECT, macro in NMSettingBond
 

 

 

+NM_SETTING_BOND_OPTION_AD_USER_PORT_KEY, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_ALL_SLAVES_ACTIVE, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_ARP_ALL_TARGETS, macro in NMSettingBond
+

+

+

 NM_SETTING_BOND_OPTION_ARP_INTERVAL, macro in NMSettingBond
 

 

@@ -5308,14 +5344,34 @@
 
 

 

+NM_SETTING_BOND_OPTION_LP_INTERVAL, macro in NMSettingBond
+

+

+

 NM_SETTING_BOND_OPTION_MIIMON, macro in NMSettingBond
 

 

 

+NM_SETTING_BOND_OPTION_MIN_LINKS, macro in NMSettingBond
+

+

+

 NM_SETTING_BOND_OPTION_MODE, macro in NMSettingBond
 

 

 

+NM_SETTING_BOND_OPTION_NUM_GRAT_ARP, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_NUM_UNSOL_NA, macro in NMSettingBond
+

+

+

+NM_SETTING_BOND_OPTION_PACKETS_PER_SLAVE, macro in NMSettingBond
+

+

+

 NM_SETTING_BOND_OPTION_PRIMARY, macro in NMSettingBond
 

 

@@ -5328,6 +5384,10 @@
 
 

 

+NM_SETTING_BOND_OPTION_TLB_DYNAMIC_LB, macro in NMSettingBond
+

+

+

 NM_SETTING_BOND_OPTION_UPDELAY, macro in NMSettingBond
 

 

@@ -5916,6 +5976,10 @@
 
 

 

+NM_SETTING_DNS_OPTION_USE_VC, macro in NMSettingIPConfig
+

+

+

 nm_setting_duplicate, function in NMSetting
 

 

@@ -8467,7 +8531,7 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
 
 

 

-NMWimaxNspNetworkType, enum in NMWimaxNsp
+NMWimaxNspNetworkType, enum in nm-dbus-interface
 

 

 

diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 891025a0..e004f345 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm 1.1.92
+      for libnm 1.1.93
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/1.0/.
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index b817d5b5..f0c50d66 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -418,6 +418,11 @@
 
 
 
+
+
+
+
+
 
 
 
@@ -1018,6 +1023,18 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -1426,6 +1443,7 @@
 
 
 
+
 
 
 
@@ -2818,11 +2836,6 @@
 
 
 
-
-
-
-
-
 
 
 
@@ -2967,6 +2980,7 @@
 
 
 
+
 
 
 
@@ -2974,6 +2988,8 @@
 
 
 
+
+
 
 
 
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 4322caee..0dae564f 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -250,6 +250,10 @@
 
 
 enum
+NMWimaxNspNetworkType
+
+
+enum
 NMDeviceState
 
 
@@ -358,7 +362,8 @@
     ├── NMDeviceType
     ├── NMIPTunnelMode
     ├── NMMetered
-    ╰── NMState
+    ├── NMState
+    ╰── NMWimaxNspNetworkType
     GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
@@ -633,9 +638,8 @@
 

 
enum NMState

 
NMState values indicate the current overall networking state.

-
(Corresponds to the NM_STATE type in nm-manager.xml.)

 

-
Members

+
Members

 
@@ -706,9 +710,8 @@
 

 
enum NMConnectivityState

-
(Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -763,9 +766,8 @@
 
enum NMDeviceType
NMDeviceType values indicate the type of hardware represented by
 an NMDevice.

-
(Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.)

-
Members

+
Members

 

 
 

 
 
@@ -929,9 +931,8 @@ GSM/UMTS, or LTE network access protocols

 
enum NMDeviceCapabilities

 
General device capability flags.

-
(Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -975,9 +976,8 @@ GSM/UMTS, or LTE network access protocols

 
enum NMDeviceWifiCapabilities

 
802.11 specific device encryption and authentication capabilities.

-
(Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -1077,9 +1077,8 @@ GSM/UMTS, or LTE network access protocols

 
enum NM80211ApFlags

 
802.11 access point flags.

-
(Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -1112,9 +1111,8 @@ encryption (usually means WEP)
802.11 access point security and authentication flags.  These flags describe
 the current security requirements of an access point as determined from the
 access point's beacon.

-
(Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)

-
Members

+
Members

 

 
 

 
 
@@ -1214,9 +1212,8 @@ is supported

 
enum NM80211Mode

 
Indicates the 802.11 mode an access point or device is currently in.

-
(Corresponds to the NM_802_11_MODE type in generic-types.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -1267,9 +1264,8 @@ is supported
enum NMBluetoothCapabilities
NMBluetoothCapabilities values indicate the usable capabilities of a
 Bluetooth device.

-
(Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)

-
Members

+
Members

 

 
 

 
 
 
@@ -1309,9 +1305,8 @@ Bluetooth device.

 technology families a modem device supports.  For more information on the
 specific access technologies the device supports use the ModemManager D-Bus
 API.

-
(Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)

-
Members

+
Members

 

 
 

 
@@ -1363,8 +1358,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

-
enum NMDeviceState

-
(Corresponds to the NM_DEVICE_STATE type in nm-device.xml.)

+
enum NMWimaxNspNetworkType

+
WiMAX network type.

 

 
Members

 

 
 

 
 
 

@@ -1375,6 +1370,50 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

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

 
 
 
NM_WIMAX_NSP_NETWORK_TYPE_UNKNOWN

+
unknown network type

+		 
NM_WIMAX_NSP_NETWORK_TYPE_HOME

+
home network

+		 
NM_WIMAX_NSP_NETWORK_TYPE_PARTNER

+
partner network

+		 
NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER

+
roaming partner network

+		 

+

+

+

+

+
enum NMDeviceState

+

+
Members

+

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






 
NM_DEVICE_STATE_UNKNOWN

 
 
the device's state is unknown

@@ -1495,9 +1534,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 

 
enum NMDeviceStateReason

 
Device state change reason codes

-
(Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.)

 

-
Members

+
Members

 
@@ -1953,9 +1991,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

 
enum NMMetered

-
(Corresponds to the NM_METERED type in nm-device.xml.)

 

-
Members

+
Members

 

 
 

 
 
@@ -2009,9 +2046,8 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability
NMActiveConnectionState values indicate the state of a connection to a
 specific network while it is starting, connected, or disconnecting from that
 network.

-
(Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.)

-
Members

+
Members

 

 
 

 
 
@@ -2064,9 +2100,8 @@ network.

 
enum NMSecretAgentGetSecretsFlags

 
NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.

-
(Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -2136,9 +2171,8 @@ network.

 
enum NMSecretAgentCapabilities

 
NMSecretAgentCapabilities indicate various capabilities of the agent.

-
(Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.)

 

-
Members

+
Members

 

 
 

 
@@ -2279,7 +2313,7 @@ VPN plugin authentication dialogs.
enum NMIPTunnelMode
The tunneling mode.

-
Members

+
Members

 

 
 

 
 
 
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html
index 2cf12f47..5e1c3977 100644
--- a/docs/libnm/html/libnm-nm-version.html
+++ b/docs/libnm/html/libnm-nm-version.html
@@ -65,6 +65,12 @@
 NM_DEPRECATED_IN_1_2_FOR()
+
+
+
+

 
 

 
 
#define
+NM_DEPRECATED_IN_1_4_FOR()
+

 
 

 

@@ -100,6 +106,14 @@
 
#define
 NM_AVAILABLE_IN_1_2
 
#defineNM_DEPRECATED_IN_1_4
#defineNM_AVAILABLE_IN_1_4

 
 

 

@@ -137,6 +151,12 @@
 
# 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

@@ -174,6 +194,18 @@
 
NM_AVAILABLE_IN_1_2

 
#define             NM_AVAILABLE_IN_1_2

 

+

+

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

+

 

 

 

diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
index b88d6dfc..299f1d09 100644
--- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html
@@ -462,9 +462,8 @@
 

 
enum NMVpnServiceState

 
VPN daemon states

-
(Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)

 

-
Members

+
Members

 
@@ -529,9 +528,8 @@
 

 
enum NMVpnConnectionState

 
VPN connection states

-
(Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)

 

-
Members

+
Members

 

 
 

@@ -607,9 +605,8 @@
 

 
enum NMVpnConnectionStateReason

 
VPN connection state reasons

-
(Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)

 

-
Members

+
Members

 

 
 

@@ -721,9 +718,8 @@
 

 
enum NMVpnPluginFailure

 
VPN plugin failure reasons

-
(Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.)

 

-
Members

+
Members

 

 
 

diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index dd719805..6dd470c9 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -303,6 +303,7 @@
     
     
     
+    
     
     
     
@@ -695,6 +696,18 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -1002,6 +1015,7 @@
     
     
     
+    
     
     
     
@@ -1991,7 +2005,6 @@
     
     
     
-    
     
     
     
@@ -2096,12 +2109,15 @@
     
     
     
+    
     
     
     
     
     
     
+    
+    
     
     
     
@@ -2341,6 +2357,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -2535,10 +2555,6 @@
     
     
     
-    
-    
-    
-    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index e08e9893..66f19502 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -144,7 +144,7 @@
     ├── NMVpnPluginFailure
     ├── NMVpnServiceState
     ├── NMWepKeyType
-    ╰── NMWimaxNspNetworkType
+    ╰── NMWimaxNspNetworkType
     GBoxed
     ├── NMIPAddress
     ├── NMIPRoute
-- 
cgit 1.3.0-6-gf8a5