Update upstream source from tag 'upstream/1.48.8'

Update to upstream version '1.48.8'
with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee

1 files changed, 4 insertions, 4 deletions

diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
index 435a4a69..e3551a8c 100644
--- a/docs/api/html/nm-settings-nmcli.html
+++ b/docs/api/html/nm-settings-nmcli.html
@@ -140,7 +140,7 @@
 <tr>
 <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.connection.autoconnect-slaves"></a>connection.autoconnect-slaves</code></span></p></td>
 <td>
-<p>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</p>
+<p>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</p>
 <p>Deprecated 1.46. Use "autoconnect-ports" instead, this is just an alias.</p>
 <p>
             Format: choice (NMSettingConnectionAutoconnectSlaves)</p>
@@ -239,7 +239,7 @@
 <td>
 <p>
             Alias: master</p>
-<p>Interface name of the master device or UUID of the master connection.</p>
+<p>Interface name of the controller device or UUID of the controller connection.</p>
 <p>Deprecated 1.46. Use "controller" instead, this is just an alias.</p>
 <p>
             Format: string</p>
@@ -340,7 +340,7 @@
 <td>
 <p>
             Alias: slave-type</p>
-<p>Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.</p>
+<p>Setting name of the device type of this port's controller connection (eg, "bond"), or NULL if this connection is not a port.</p>
 <p>Deprecated 1.46. Use "port-type" instead, this is just an alias.</p>
 <p>
             Format: string</p>
@@ -5601,7 +5601,7 @@ Linux traffic control subsystem
 <td>
 <p>
             Alias: flags</p>
-<p>One or more flags which control the behavior and features of the VLAN interface.  Flags include "reorder-headers" (0x1) (reordering of output packet headers), "gvrp" (0x2) (use of the GVRP protocol), and "loose-binding" (0x4) (loose binding of the interface to its master device's operating state). "mvrp" (0x8) (use of the MVRP protocol).</p>
+<p>One or more flags which control the behavior and features of the VLAN interface.  Flags include "reorder-headers" (0x1) (reordering of output packet headers), "gvrp" (0x2) (use of the GVRP protocol), and "loose-binding" (0x4) (loose binding of the interface to its controller device's operating state). "mvrp" (0x8) (use of the MVRP protocol).</p>
 <p>The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.</p>
 <p>
             Format: flags (NMVlanFlags)</p>