Merge remote-tracking branch 'salsa/master'

1 files changed, 106 insertions, 20 deletions

diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 17617b95..2e649502 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -470,6 +470,10 @@
 </tr>
 <tr>
 <td class="datatype_keyword">enum</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMSettingsAddConnection2Flags" title="enum NMSettingsAddConnection2Flags">NMSettingsAddConnection2Flags</a></td>
+</tr>
+<tr>
+<td class="datatype_keyword">enum</td>
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMSettingsUpdate2Flags" title="enum NMSettingsUpdate2Flags">NMSettingsUpdate2Flags</a></td>
 </tr>
 <tr>
@@ -507,6 +511,7 @@
     <span class="lineart">├──</span> NMDeviceWifiCapabilities
     <span class="lineart">├──</span> NMSecretAgentCapabilities
     <span class="lineart">├──</span> NMSecretAgentGetSecretsFlags
+    <span class="lineart">├──</span> NMSettingsAddConnection2Flags
     <span class="lineart">├──</span> NMSettingsConnectionFlags
     <span class="lineart">╰──</span> NMSettingsUpdate2Flags
 </pre>
@@ -1439,6 +1444,13 @@ GSM/UMTS, or LTE network access protocols</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<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. Since: 1.20.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -1654,6 +1666,13 @@ supported</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<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. Since: 1.20.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -2491,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>
@@ -3330,6 +3348,55 @@ VPN plugin authentication dialogs.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NMSettingsAddConnection2Flags"></a><h3>enum NMSettingsAddConnection2Flags</h3>
+<p>Numeric flags for the "flags" argument of <code class="function">AddConnection2()</code> D-Bus API.</p>
+<div class="refsect3">
+<a name="NMSettingsAddConnection2Flags.members"></a><h4>Members</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="300px" class="enum_members_name">
+<col class="enum_members_description">
+<col width="200px" class="enum_members_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTINGS-ADD-CONNECTION2-FLAG-NONE:CAPS"></a>NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE</p></td>
+<td class="enum_member_description">
+<p>an alias for numeric zero, no flags set.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTINGS-ADD-CONNECTION2-FLAG-TO-DISK:CAPS"></a>NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK</p></td>
+<td class="enum_member_description">
+<p>to persist the connection to disk.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTINGS-ADD-CONNECTION2-FLAG-IN-MEMORY:CAPS"></a>NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY</p></td>
+<td class="enum_member_description">
+<p>to make the connection in-memory only.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTINGS-ADD-CONNECTION2-FLAG-BLOCK-AUTOCONNECT:CAPS"></a>NM_SETTINGS_ADD_CONNECTION2_FLAG_BLOCK_AUTOCONNECT</p></td>
+<td class="enum_member_description">
+<p>usually, when the connection
+  has autoconnect enabled and gets added, it becomes eligible to autoconnect
+  right away. Setting this flag, disables autoconnect until the connection
+  is manually activated.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<p class="since">Since: 1.20</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="NMSettingsUpdate2Flags"></a><h3>enum NMSettingsUpdate2Flags</h3>
 <div class="refsect3">
 <a name="NMSettingsUpdate2Flags.members"></a><h4>Members</h4>
@@ -3357,35 +3424,40 @@ VPN plugin authentication dialogs.</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY:CAPS"></a>NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY</p></td>
 <td class="enum_member_description">
-<p>to make the connection in-memory only.
-  If the connection was previously persistent, the corresponding file on disk
-  is not deleted but merely the connection is decoupled from the file
-  on disk. If you later delete an in-memory connection, the connection
-  on disk will be deleted as well.</p>
+<p>makes the profile in-memory.
+  Note that such profiles are stored in keyfile format under /run.
+  If the file is already in-memory, the file in /run is updated in-place.
+  Otherwise, the previous storage for the profile is left unchanged
+  on disk, and the in-memory copy shadows it.
+  Note that the original filename of the previous persistent storage (if any)
+  is remembered. That means, when later persisting the profile again to disk,
+  the file on disk will be overwritten again.
+  Likewise, when finally deleting the profile, both the storage from /run
+  and persistent storage are deleted (or if the persistent storage does not
+  allow deletion, and nmmeta file is written to mark the UUID as deleted).</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <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 like <em class="parameter"><code>NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY</code></em>
-,
-  but if the connection has a corresponding file on disk, the association between
-  the connection and the file is forgotten but the file is not modified.
-  The difference to <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> is if you later
-  save the connection again to disk, a new file name will be chosen without
-  overwriting the remaining file on disk. Also, if you delete the connection
-  later, the file on disk will not be deleted.</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>
-,
-  but if the connection has a corresponding file on disk, the file on
-  disk will be deleted.</p>
+<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>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -3393,7 +3465,8 @@ VPN plugin authentication dialogs.</p>
 <td class="enum_member_name"><p><a name="NM-SETTINGS-UPDATE2-FLAG-VOLATILE:CAPS"></a>NM_SETTINGS_UPDATE2_FLAG_VOLATILE</p></td>
 <td class="enum_member_description">
 <p>This can be specified with either
-  <a class="link" href="libnm-nm-dbus-interface.html#NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY-DETACHED:CAPS"><code class="literal">NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED</code></a> or <a class="link" href="libnm-nm-dbus-interface.html#NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY-ONLY:CAPS"><code class="literal">NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY</code></a>.
+  <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>, <a class="link" href="libnm-nm-dbus-interface.html#NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY-DETACHED:CAPS"><code class="literal">NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED</code></a>
+  or <a class="link" href="libnm-nm-dbus-interface.html#NM-SETTINGS-UPDATE2-FLAG-IN-MEMORY-ONLY:CAPS"><code class="literal">NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY</code></a>.
   After making the connection in-memory only, the connection is marked
   as volatile. That means, if the connection is currently not active
   it will be deleted right away. Otherwise, it is marked to for deletion
@@ -3413,6 +3486,19 @@ VPN plugin authentication dialogs.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
+<tr>
+<td class="enum_member_name"><p><a name="NM-SETTINGS-UPDATE2-FLAG-NO-REAPPLY:CAPS"></a>NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY</p></td>
+<td class="enum_member_description">
+<p>when a profile gets modified that is
+  currently active, then these changes don't take effect for the active
+  device unless the profile gets reactivated or the configuration reapplied.
+  There are two exceptions: by default "connection.zone" and "connection.metered"
+  properties take effect immediately. Specify this flag to prevent these
+  properties to take effect, so that the change is restricted to modify
+  the profile. Since: 1.20.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
 </tbody>
 </table></div>
 </div>