New upstream version 1.16.0 upstream/1.16.0

6 files changed, 10 insertions, 9 deletions

diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in
index b0121290..5416d811 100644
--- a/docs/libnm-glib/Makefile.in
+++ b/docs/libnm-glib/Makefile.in
@@ -160,6 +160,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_TESTS_FD_REDIRECT = @AM_TESTS_FD_REDIRECT@
 AR = @AR@
diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html
index 3d9be2b9..7feea85e 100644
--- a/docs/libnm-glib/html/NMObject.html
+++ b/docs/libnm-glib/html/NMObject.html
@@ -294,7 +294,7 @@ user_function (<a class="link" href="NMObject.html" title="NMObject"><span class
                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  error,
                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  failed_path,
                <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>  user_data)</pre>
-<p>Indicates that an error occured while creating an <a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> object
+<p>Indicates that an error occurred while creating an <a class="link" href="NMObject.html" title="NMObject"><span class="type">NMObject</span></a> object
 during property handling of <em class="parameter"><code>master_object</code></em>
 .</p>
 <p>Note: Be aware that the signal is private for libnm-glib's internal
@@ -315,7 +315,7 @@ during property handling of <em class="parameter"><code>master_object</code></em
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>the error that occured while creating object</p></td>
+<td class="parameter_description"><p>the error that occurred while creating object</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 0c2bc341..b8acf986 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -823,7 +823,7 @@ request was successful.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>the error, if any, that occured while registering</p></td>
+<td class="parameter_description"><p>the error, if any, that occurred while registering</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 2d5f53a4..aa85345e 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm-glib Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-glib 1.14.6
+      for libnm-glib 1.16.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-glib/stable/" target="_top">https://developer.gnome.org/libnm-glib/stable/</a>.
diff --git a/docs/libnm-glib/meson.build b/docs/libnm-glib/meson.build
index b760ce00..622669ee 100644
--- a/docs/libnm-glib/meson.build
+++ b/docs/libnm-glib/meson.build
@@ -9,13 +9,13 @@ private_headers = [
   'nm-remote-connection-private.h',
   'nm-types-private.h',
   'nm-secret-agent-glue.h',
-  'nm-vpn-plugin-glue.h'
+  'nm-vpn-plugin-glue.h',
 ]
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 gnome.gtkdoc(
@@ -24,7 +24,7 @@ gnome.gtkdoc(
   src_dir: join_paths(meson.source_root(), 'libnm-glib'),
   dependencies: [
     libnm_glib_dep,
-    libnm_glib_vpn_dep
+    libnm_glib_vpn_dep,
    ],
   scan_args: [
     '--rebuild-types',
@@ -35,5 +35,5 @@ gnome.gtkdoc(
   fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
   gobject_typesfile: doc_module + '.types',
   html_assets: doc_module + '.png',
-  install: true
+  install: true,
 )
diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml
index c6ba3bc1..15b989e3 100644
--- a/docs/libnm-glib/version.xml
+++ b/docs/libnm-glib/version.xml
@@ -1 +1 @@
-1.14.6
+1.16.0