9 files changed, 23 insertions, 22 deletions
diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in
index 8638fc0c..075de38a 100644
--- a/docs/libnm-util/Makefile.in
+++ b/docs/libnm-util/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-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html
index 04965325..1d8f1402 100644
--- a/docs/libnm-util/html/NMSetting.html
+++ b/docs/libnm-util/html/NMSetting.html
@@ -1173,7 +1173,7 @@ should be requested from the user each time it is needed</p>
 <td class="enum_member_description">
 <p>in situations where it cannot be
 automatically determined that the secret is required (some VPNs and PPP
-providers dont require all secrets) this flag indicates that the specific
+providers don't require all secrets) this flag indicates that the specific
 secret is not required</p>
 </td>
 <td class="enum_member_annotations"> </td>
diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html
index 544189d9..12635583 100644
--- a/docs/libnm-util/html/NMSettingConnection.html
+++ b/docs/libnm-util/html/NMSettingConnection.html
@@ -695,7 +695,7 @@ of this setting.</p>
 </tr>
 <tr>
 <td class="parameter_name"><p>out_pitem</p></td>
-<td class="parameter_description"><p>on return, the permission item (formatted accoring to <em class="parameter"><code>ptype</code></em>
+<td class="parameter_description"><p>on return, the permission item (formatted according to <em class="parameter"><code>ptype</code></em>
 , see
 <a class="link" href="NMSettingConnection.html#NMSettingConnection--permissions" title="The “permissions” property"><span class="type">“permissions”</span></a> for more detail</p></td>
 <td class="parameter_annotations"> </td>
@@ -1071,7 +1071,7 @@ nm_setting_connection_get_secondary (<em class="parameter"><code><a class="link"
 <pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
 nm_setting_connection_add_secondary (<em class="parameter"><code><a class="link" href="NMSettingConnection.html" title="NMSettingConnection"><span class="type">NMSettingConnection</span></a> *setting</code></em>,
                                      <em class="parameter"><code>const <span class="type">char</span> *sec_uuid</code></em>);</pre>
-<p>Adds a new secondary connetion UUID to the setting.</p>
+<p>Adds a new secondary connection UUID to the setting.</p>
 <div class="refsect3">
 <a name="nm-setting-connection-add-secondary.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html
index 83a4be08..76b0781b 100644
--- a/docs/libnm-util/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html
@@ -938,7 +938,7 @@ algorithm list.</p>
 </div>
 <div class="refsect3">
 <a name="nm-setting-wireless-security-remove-pairwise-by-value.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the encryption algorith was found and removed; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it was not.</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the encryption algorithm was found and removed; <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if it was not.</p>
 </div>
 <p class="since">Since: 0.9.10</p>
 </div>
@@ -1560,9 +1560,9 @@ encryption protocol</p>
 <div class="refsect2">
 <a name="NMWepKeyType"></a><h3>enum NMWepKeyType</h3>
 <p>The <a class="link" href="NMSettingWirelessSecurity.html#NMWepKeyType" title="enum NMWepKeyType"><span class="type">NMWepKeyType</span></a> values specify how any WEP keys present in the setting
-are intepreted.  There are no standards governing how to hash the various WEP
+are interpreted.  There are no standards governing how to hash the various WEP
 key/passphrase formats into the actual WEP key.  Unfortunately some WEP keys
-can be interpreted in multiple ways, requring the setting to specify how to
+can be interpreted in multiple ways, requiring the setting to specify how to
 interpret the any WEP keys.  For example, the key "732f2d712e4a394a375d366931"
 is both a valid Hexadecimal WEP key and a WEP passphrase.  Further, many
 ASCII keys are also valid WEP passphrases, but since passphrases and ASCII
diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html
index 77d7c18e..90af150c 100644
--- a/docs/libnm-util/html/index.html
+++ b/docs/libnm-util/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-util Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm-util 1.14.6
+      for libnm-util 1.16.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm-util/stable/" target="_top">https://developer.gnome.org/libnm-util/stable/</a>.
diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html
index aa7bd3a2..c5ab858e 100644
--- a/docs/libnm-util/html/libnm-util-NetworkManager.html
+++ b/docs/libnm-util/html/libnm-util-NetworkManager.html
@@ -671,7 +671,7 @@ an <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#NMDevice-struct"><span c
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-WIFI:CAPS"></a>NM_DEVICE_TYPE_WIFI</p></td>
 <td class="enum_member_description">
-<p>an 802.11 WiFi device</p>
+<p>an 802.11 Wi-Fi device</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -1294,7 +1294,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <td class="enum_member_name"><p><a name="NM-DEVICE-STATE-CONFIG:CAPS"></a>NM_DEVICE_STATE_CONFIG</p></td>
 <td class="enum_member_description">
 <p>the device is connecting to the requested network.
-  This may include operations like associating with the WiFi AP, dialing
+  This may include operations like associating with the Wi-Fi AP, dialing
   the modem, connecting to the remote Bluetooth device, etc.</p>
 </td>
 <td class="enum_member_annotations"> </td>
@@ -1751,7 +1751,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-STATE-REASON-SSID-NOT-FOUND:CAPS"></a>NM_DEVICE_STATE_REASON_SSID_NOT_FOUND</p></td>
 <td class="enum_member_description">
-<p>The WiFi network could not be found</p>
+<p>The Wi-Fi network could not be found</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html
index 106d1c8f..c1b0ce0c 100644
--- a/docs/libnm-util/html/libnm-util-nm-utils.html
+++ b/docs/libnm-util/html/libnm-util-nm-utils.html
@@ -789,7 +789,7 @@ use <a class="link" href="libnm-util-nm-utils.html#nm-utils-ap-mode-security-val
 <tbody>
 <tr>
 <td class="parameter_name"><p>type</p></td>
-<td class="parameter_description"><p>the security type to check AP flags and device capabilties against,
+<td class="parameter_description"><p>the security type to check AP flags and device capabilities against,
 e.g. <a class="link" href="libnm-util-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><span class="type">NMU_SEC_STATIC_WEP</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -819,13 +819,13 @@ arguments are valid</p></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>ap_wpa</p></td>
-<td class="parameter_description"><p>bitfield of AP capabilties derived from the AP's WPA beacon,
+<td class="parameter_description"><p>bitfield of AP capabilities derived from the AP's WPA beacon,
 e.g. (<a class="link" href="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS"><span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span></a> | <a class="link" href="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-KEY-MGMT-PSK:CAPS"><span class="type">NM_802_11_AP_SEC_KEY_MGMT_PSK</span></a>)</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>ap_rsn</p></td>
-<td class="parameter_description"><p>bitfield of AP capabilties derived from the AP's RSN/WPA2 beacon,
+<td class="parameter_description"><p>bitfield of AP capabilities derived from the AP's RSN/WPA2 beacon,
 e.g. (<a class="link" href="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-CCMP:CAPS"><span class="type">NM_802_11_AP_SEC_PAIR_CCMP</span></a> | <a class="link" href="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR-TKIP:CAPS"><span class="type">NM_802_11_AP_SEC_PAIR_TKIP</span></a>)</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -834,7 +834,7 @@ e.g. (<a class="link" href="libnm-util-NetworkManager.html#NM-802-11-AP-SEC-PAIR
 </div>
 <div class="refsect3">
 <a name="nm-utils-security-valid.returns"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device capabilities and AP capabilties intersect and are
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the device capabilities and AP capabilities intersect and are
 compatible with the desired <em class="parameter"><code>type</code></em>
 , <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if they are not</p>
 </div>
@@ -859,7 +859,7 @@ desired security type are valid for AP/Hotspot connections.</p>
 <tbody>
 <tr>
 <td class="parameter_name"><p>type</p></td>
-<td class="parameter_description"><p>the security type to check device capabilties against,
+<td class="parameter_description"><p>the security type to check device capabilities against,
 e.g. <a class="link" href="libnm-util-nm-utils.html#NMU-SEC-STATIC-WEP:CAPS"><span class="type">NMU_SEC_STATIC_WEP</span></a></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
@@ -1597,9 +1597,9 @@ and <em class="parameter"><code>predicate</code></em>
 </tr>
 <tr>
 <td class="parameter_name"><p>user_data</p></td>
-<td class="parameter_description"><p>(allow-none): user data for <em class="parameter"><code>predicate</code></em>
+<td class="parameter_description"><p>user data for <em class="parameter"><code>predicate</code></em>
 function. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build
index 7b06baf3..1492103d 100644
--- a/docs/libnm-util/meson.build
+++ b/docs/libnm-util/meson.build
@@ -6,13 +6,13 @@ private_headers = [
   'nm-setting-private.h',
   'nm-param-spec-specialized.h',
   'nm-test-utils.h',
-  'nm-version.h'
+  'nm-version.h',
 ]
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf
+  configuration: version_conf,
 )
 
 gnome.gtkdoc(
@@ -23,10 +23,10 @@ gnome.gtkdoc(
   scan_args: [
     '--rebuild-types',
     '--rebuild-sections',
-    '--ignore-headers=' + ' '.join(private_headers)
+    '--ignore-headers=' + ' '.join(private_headers),
   ],
   scanobjs_args: '--type-init-func="g_type_init();"',
   fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)),
   gobject_typesfile: doc_module + '.types',
-  install: true
+  install: true,
 )
diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml
index c6ba3bc1..15b989e3 100644
--- a/docs/libnm-util/version.xml
+++ b/docs/libnm-util/version.xml
@@ -1 +1 @@
-1.14.6
+1.16.0