From 36cb2f364a821e1be50b23e03a18891ec55adb06 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Oct 2012 21:32:57 +0200 Subject: Imported Upstream version 0.9.6.4 --- docs/libnm-util/Makefile.in | 24 +++++++++++++++++++++++- docs/libnm-util/html/ch01.html | 2 +- docs/libnm-util/html/index.html | 4 ++-- docs/libnm-util/html/libnm-util-nm-utils.html | 2 +- docs/libnm-util/libnm-util-sections.txt | 5 +++++ docs/libnm-util/tmpl/nm-connection-private.sgml | 24 ++++++++++++++++++++++++ docs/libnm-util/version.xml | 2 +- 7 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 docs/libnm-util/tmpl/nm-connection-private.sgml (limited to 'docs/libnm-util') diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 5890524e..a8edfffc 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -21,6 +21,23 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index 6f1e37fe..c3f6cd8e 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -21,7 +21,7 @@

-libnm-util API Reference

+libnm-util API Reference
NMConnection — Describes a connection to specific network or provider diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index a97eb48a..9273a726 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,14 +15,14 @@

- for libnm-util 0.9.6.0 + for libnm-util 0.9.6.4 The latest version of this documentation can be found on-line at http://projects.gnome.org/NetworkManager/developers/libnm-util/09/.

Copyright © 2012 The NetworkManager Authors

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index 92edd6e8..694287db 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -566,7 +566,7 @@ falls in the predefined classes.

Returns :

-the netmask represented by the prefix +the netmask represented by the prefix, in network byte order
diff --git a/docs/libnm-util/libnm-util-sections.txt b/docs/libnm-util/libnm-util-sections.txt index dceb61b7..1218f8d3 100644 --- a/docs/libnm-util/libnm-util-sections.txt +++ b/docs/libnm-util/libnm-util-sections.txt @@ -64,6 +64,11 @@ NM_TYPE_CONNECTION nm_connection_get_type +
+nm-connection-private + +
+
nm-setting NMSetting diff --git a/docs/libnm-util/tmpl/nm-connection-private.sgml b/docs/libnm-util/tmpl/nm-connection-private.sgml new file mode 100644 index 00000000..0ceaa403 --- /dev/null +++ b/docs/libnm-util/tmpl/nm-connection-private.sgml @@ -0,0 +1,24 @@ + +nm-connection-private + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index c318497f..f6c687fe 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -0.9.6.0 +0.9.6.4 -- cgit 1.3.0-6-gf8a5