New upstream version 1.20.0 upstream/1.20.0

9 files changed, 27 insertions, 20 deletions

diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index 1606deec..5c566d5b 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -2851,7 +2851,7 @@ calling <a class="link" href="NMConnection.html#nm-connection-to-dbus" title="nm
 <td class="enum_member_name"><p><a name="NM-CONNECTION-SERIALIZE-WITH-SECRETS-AGENT-OWNED:CAPS"></a>NM_CONNECTION_SERIALIZE_WITH_SECRETS_AGENT_OWNED</p></td>
 <td class="enum_member_description">
 <p>if set, only secrets that
-  are agent owned will be serialized.</p>
+  are agent owned will be serialized. Since: 1.20</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 30ee1129..2cdd15c6 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -434,6 +434,7 @@ supported for IPv6)</p>
 <pre class="programlisting">#define NM_SETTING_IP6_CONFIG_METHOD_DISABLED   "disabled"
 </pre>
 <p>IPv6 is disabled for the connection.</p>
+<p class="since">Since: 1.20</p>
 </div>
 <hr>
 <div class="refsect2">
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index 7ec017c7..eb1675ce 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -365,7 +365,7 @@ properties of this setting.</p>
 </div>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-num-priorities.returns"></a><h4>Returns</h4>
-<p> return the number of ingress/egress priority entries, -1 if error</p>
+<p> return the number of ingress/egress priority entries.</p>
 </div>
 </div>
 <hr>
@@ -406,19 +406,20 @@ or <a class="link" href="NMSettingVlan.html#NMSettingVlan--egress-priority-map"
 <tr>
 <td class="parameter_name"><p>out_from</p></td>
 <td class="parameter_description"><p>on return the value of the priority map's 'from' item. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</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>out_to</p></td>
 <td class="parameter_description"><p>on return the value of priority map's 'to' item. </p></td>
-<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span></td>
+<td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <div class="refsect3">
 <a name="nm-setting-vlan-get-priority.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 a priority map was returned, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if error</p>
+<p> returns <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>idx</code></em>
+is in range. Otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>.</p>
 </div>
 </div>
 <hr>
@@ -481,8 +482,7 @@ to</p></td>
 </div>
 <div class="refsect3">
 <a name="nm-setting-vlan-add-priority.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 new priority mapping was successfully added to the
-list, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if error</p>
+<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.</p>
 </div>
 </div>
 <hr>
@@ -694,7 +694,8 @@ the Linux SKB priorities to 802.1p priorities.</p>
 <div class="refsect3">
 <a name="nm-setting-vlan-add-priority-str.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 entry was successfully added to the list, or it
-overwrote the old value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if error</p>
+overwrote the old value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if <em class="parameter"><code>str</code></em>
+is not a valid mapping.</p>
 </div>
 </div>
 </div>
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index a792daa0..425fc25a 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -1513,6 +1513,7 @@ for this connection.</p>
 <pre class="programlisting">#define NM_SETTING_WIRELESS_MODE_MESH   "mesh"
 </pre>
 <p>Indicates that the connection should create a mesh point.</p>
+<p class="since">Since: 1.20</p>
 </div>
 <hr>
 <div class="refsect2">
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index 7465863d..517e5e60 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/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 Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libnm 1.19.90
+      for libnm 1.20.0
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://developer.gnome.org/libnm/stable/" target="_top">https://developer.gnome.org/libnm/stable/</a>.
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 541a5a56..2e649502 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -1447,7 +1447,7 @@ GSM/UMTS, or LTE network access protocols</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-WIFI-DEVICE-CAP-MESH:CAPS"></a>NM_WIFI_DEVICE_CAP_MESH</p></td>
 <td class="enum_member_description">
-<p>device supports acting as a mesh point</p>
+<p>device supports acting as a mesh point. Since: 1.20.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -1669,7 +1669,7 @@ supported</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-802-11-MODE-MESH:CAPS"></a>NM_802_11_MODE_MESH</p></td>
 <td class="enum_member_description">
-<p>the device is a 802.11s mesh point.</p>
+<p>the device is a 802.11s mesh point. Since: 1.20.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -2510,8 +2510,7 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability</p>
 <td class="enum_member_description">
 <p>indicates that the per-connection
   setting is unspecified. In this case, it will fallback to the default
-  value, which is <em class="parameter"><code>NM_CONNECTION_MULTI_CONNECT_SINGLE</code></em>
-.</p>
+  value, which is <a class="link" href="libnm-nm-dbus-interface.html#NM-CONNECTION-MULTI-CONNECT-SINGLE:CAPS"><code class="literal">NM_CONNECTION_MULTI_CONNECT_SINGLE</code></a>.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -3442,15 +3441,20 @@ VPN plugin authentication dialogs.</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY-DETACHED:CAPS"></a>NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED</p></td>
 <td class="enum_member_description">
-<p>this is almost the same as</p>
+<p>this is almost the same
+  as <a class="link" href="libnm-nm-dbus-interface.html#NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY:CAPS"><code class="literal">NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY</code></a>, with one difference: when later deleting
+  the profile, the original profile will not be deleted. Instead a nmmeta
+  file is written to /run to indicate that the profile is gone.
+  Note that if such a nmmeta tombstone file exists and hides a file in persistant
+  storage, then when re-adding the profile with the same UUID, then the original
+  storage is taken over again.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY-ONLY:CAPS"></a>NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY</p></td>
 <td class="enum_member_description">
-<p>this is like <em class="parameter"><code>NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY</code></em>
-,
+<p>this is like <a class="link" href="libnm-nm-dbus-interface.html#NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY:CAPS"><code class="literal">NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY</code></a>,
   but if the connection has a corresponding file on persistent storage, the file
   will be deleted right away. If the profile is later again persisted to disk,
   a new, unused filename will be chosen.</p>
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 5450b0ba..986abe77 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -1244,7 +1244,7 @@
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-LINK-LOCAL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_MANUAL" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-MANUAL:CAPS"/>
     <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_SHARED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-SHARED:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_DISABLED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-DISABLED:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_IP6_CONFIG_METHOD_DISABLED" link="NMSettingIP6Config.html#NM-SETTING-IP6-CONFIG-METHOD-DISABLED:CAPS" since="1.20"/>
     <keyword type="enum" name="enum NMSettingIP6ConfigPrivacy" link="NMSettingIP6Config.html#NMSettingIP6ConfigPrivacy"/>
     <keyword type="enum" name="enum NMSettingIP6ConfigAddrGenMode" link="NMSettingIP6Config.html#NMSettingIP6ConfigAddrGenMode" since="1.2"/>
     <keyword type="struct" name="NMSettingIP6Config" link="NMSettingIP6Config.html#NMSettingIP6Config-struct"/>
@@ -2339,7 +2339,7 @@
     <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_ADHOC" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-ADHOC:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_AP" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-AP:CAPS"/>
     <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_INFRA" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-INFRA:CAPS"/>
-    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_MESH" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-MESH:CAPS"/>
+    <keyword type="macro" name="NM_SETTING_WIRELESS_MODE_MESH" link="NMSettingWireless.html#NM-SETTING-WIRELESS-MODE-MESH:CAPS" since="1.20"/>
     <keyword type="enum" name="enum NMSettingWirelessPowersave" link="NMSettingWireless.html#NMSettingWirelessPowersave"/>
     <keyword type="struct" name="NMSettingWireless" link="NMSettingWireless.html#NMSettingWireless-struct"/>
     <keyword type="property" name="The “band” property" link="NMSettingWireless.html#NMSettingWireless--band"/>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 42148311..70cb895a 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         </p>
 <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong>
   <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong>
-  NetworkManager version: 1.19.90
+  NetworkManager version: 1.20.0
 
   <code class="prompt">$ </code></pre>
 <p>
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml
index ff2b1bb4..39893559 100644
--- a/docs/libnm/version.xml
+++ b/docs/libnm/version.xml
@@ -1 +1 @@
-1.19.90
+1.20.0