From 78c3b8801ecf4975e5da1af3b10ae20dd2d876de Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Apr 2016 21:11:10 +0200 Subject: Imported Upstream version 1.2.0 --- docs/libnm-util/html/NMConnection.html | 2 +- docs/libnm-util/html/index.html | 4 ++-- docs/libnm-util/html/index.sgml | 1 - docs/libnm-util/html/libnm-util-NetworkManager.html | 2 +- docs/libnm-util/libnm-util-docs.sgml | 2 +- docs/libnm-util/version.xml | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 85c39759..7572c017 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (char * nm_connection_get_virtual_device_description (NMConnection *connection); -

Returns the name that nm_device_disambiguate_names() would +

Returns the name that nm_device_disambiguate_names() would return for the virtual device that would be created for connection . Eg, "VLAN (eth1.1)".

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index b50fbdbd..974ce75b 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,10 +15,10 @@

- for libnm-util 1.1.94 + for libnm-util 1.2.0 The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-util/0.9/. + https://developer.gnome.org/libnm-util/stable/.

Copyright © 2012 The NetworkManager Authors

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index d1e0be2d..c95acf87 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -1,4 +1,3 @@ - diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index b525e187..aaaadc84 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -644,7 +644,7 @@

enum NMDeviceType

NMDeviceType values indicate the type of hardware represented by -an NMDevice.

+an NMDevice.

Members

diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml index 14139181..9ec760eb 100644 --- a/docs/libnm-util/libnm-util-docs.sgml +++ b/docs/libnm-util/libnm-util-docs.sgml @@ -11,7 +11,7 @@ for libnm-util &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-util/0.9/. + https://developer.gnome.org/libnm-util/stable/. diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 -- cgit 1.3.0-6-gf8a5