From caf1db9d6fbc056cc6c76a24574890f6c7895f3d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Jul 2018 13:12:18 +0200 Subject: New upstream version 1.12.2 --- docs/libnm/html/NMDevice.html | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'docs/libnm/html/NMDevice.html') diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 9f941422..490a54f2 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -809,10 +809,10 @@ ├── NMDeviceMacvlan ├── NMDeviceModem ├── NMDeviceOlpcMesh - ├── NMDeviceOvsBridge - ├── NMDeviceOvsInterface - ├── NMDeviceOvsPort - ├── NMDevicePpp + ├── NMDeviceOvsBridge + ├── NMDeviceOvsInterface + ├── NMDeviceOvsPort + ├── NMDevicePpp ├── NMDeviceTeam ├── NMDeviceTun ├── NMDeviceVlan @@ -1825,14 +1825,15 @@ made since it was last applied.

connection

-

the NMConnection to replace the applied settings with or NULL to reuse existing

-  +

the NMConnection to replace the applied +settings with or NULL to reuse existing.

+[allow-none]

version_id

-

zero or the expected version id of the applied connection. If specified -and the version id mismatches, the call fails without modification. This allows to -catch concurrent accesses.

+

zero or the expected version id of the applied connection. +If specified and the version id mismatches, the call fails without +modification. This allows to catch concurrent accesses.

  @@ -1889,14 +1890,16 @@ currently active connection made since it was last applied.

connection

-

the NMConnection to replace the applied settings with or NULL to reuse existing

-  +

the NMConnection to replace the applied +settings with or NULL to reuse existing.

+[allow-none]

version_id

-

zero or the expected version id of the applied connection. If specified -and the version id mismatches, the call fails without modification. This allows to -catch concurrent accesses.

+

zero or the expected version id of the applied +connection. If specified and the version id mismatches, the call +fails without modification. This allows to catch concurrent +accesses.

  @@ -2416,7 +2419,7 @@ incompatible with the device. To get the full list of connections see

connections

-

an array of NMConnections to filter.

+

an array of NMConnections to filter.

[element-type NMConnection] @@ -2425,7 +2428,7 @@ incompatible with the device. To get the full list of connections see

Returns

an array of -NMConnections that could be activated with the given device +NMConnections that could be activated with the given device . The array should be freed with g_ptr_array_unref() when it is no longer required.

[transfer container][element-type NMConnection]

-- cgit 1.3.0-6-gf8a5