From 227c401a10a930af6fd5f123aef345fcd130d6aa Mon Sep 17 00:00:00 2001
From: Sebastien Bacher
Date: Mon, 10 Dec 2018 21:58:18 +0100
Subject: Import Upstream version 1.12.6
---
docs/libnm-util/Makefile.in | 14 ++++--
docs/libnm-util/html/NMConnection.html | 6 +--
docs/libnm-util/html/NMSetting.html | 8 ++--
docs/libnm-util/html/NMSetting8021x.html | 4 +-
docs/libnm-util/html/NMSettingAdsl.html | 4 +-
docs/libnm-util/html/NMSettingBluetooth.html | 4 +-
docs/libnm-util/html/NMSettingBond.html | 4 +-
docs/libnm-util/html/NMSettingBridge.html | 4 +-
docs/libnm-util/html/NMSettingBridgePort.html | 4 +-
docs/libnm-util/html/NMSettingCdma.html | 4 +-
docs/libnm-util/html/NMSettingConnection.html | 4 +-
docs/libnm-util/html/NMSettingDcb.html | 4 +-
docs/libnm-util/html/NMSettingGeneric.html | 4 +-
docs/libnm-util/html/NMSettingGsm.html | 4 +-
docs/libnm-util/html/NMSettingIP4Config.html | 4 +-
docs/libnm-util/html/NMSettingIP6Config.html | 4 +-
docs/libnm-util/html/NMSettingInfiniband.html | 4 +-
docs/libnm-util/html/NMSettingOlpcMesh.html | 4 +-
docs/libnm-util/html/NMSettingPPP.html | 4 +-
docs/libnm-util/html/NMSettingPPPOE.html | 4 +-
docs/libnm-util/html/NMSettingSerial.html | 4 +-
docs/libnm-util/html/NMSettingTeam.html | 4 +-
docs/libnm-util/html/NMSettingTeamPort.html | 4 +-
docs/libnm-util/html/NMSettingVPN.html | 4 +-
docs/libnm-util/html/NMSettingVlan.html | 4 +-
docs/libnm-util/html/NMSettingWimax.html | 4 +-
docs/libnm-util/html/NMSettingWired.html | 4 +-
docs/libnm-util/html/NMSettingWireless.html | 4 +-
.../libnm-util/html/NMSettingWirelessSecurity.html | 4 +-
docs/libnm-util/html/annotation-glossary.html | 4 +-
docs/libnm-util/html/api-index-full.html | 4 +-
docs/libnm-util/html/ch01.html | 4 +-
docs/libnm-util/html/index.html | 6 +--
.../libnm-util/html/libnm-util-NetworkManager.html | 4 +-
.../html/libnm-util-NetworkManagerVPN.html | 4 +-
docs/libnm-util/html/libnm-util-nm-utils.html | 56 +++++++++++-----------
docs/libnm-util/html/object-tree.html | 4 +-
docs/libnm-util/version.xml | 2 +-
38 files changed, 112 insertions(+), 108 deletions(-)
(limited to 'docs/libnm-util')
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index c24f6c68..7474aead 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -607,8 +607,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_srcdir)/gtk-doc.make $(am__empty):
@@ -635,7 +635,10 @@ ctags CTAGS:
cscope cscopelist:
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -887,6 +890,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
for file in $(HTML_IMAGES) ; do \
test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+ test -f $$file && cp $$file $(abs_builddir)/html; \
done;
$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
$(AM_V_at)touch html-build.stamp
diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html
index c325c248..6bb4a151 100644
--- a/docs/libnm-util/html/NMConnection.html
+++ b/docs/libnm-util/html/NMConnection.html
@@ -8,7 +8,7 @@
-
+
@@ -1308,7 +1308,7 @@ will update all secrets from all settings contained in
secrets
a GHashTable mapping
-string:GValue of setting property names and secrets of the given setting_name
+string:GValue of setting property names and secrets of the given setting_name
.
[element-type utf8 GObject.Value]
@@ -2691,6 +2691,6 @@ updated
+ Generated by GTK-Doc V1.29