16 files changed, 62 insertions, 47 deletions
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 2c9c5215..4e49ea67 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -663,7 +663,7 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 <p><code class="literal">nm_active_connection_get_master</code> has been deprecated since version 1.44 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMActiveConnection.html#nm-active-connection-get-controller" title="nm_active_connection_get_controller ()"><code class="function">nm_active_connection_get_controller()</code></a> instead.</p>
 </div>
-<p>Gets the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection.</p>
+<p>Gets the controller <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-master.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -681,7 +681,7 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-master.returns"></a><h4>Returns</h4>
-<p>the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>. </p>
+<p>the controller <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="The data is owned by the callee, which is responsible of freeing it."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -1111,7 +1111,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--master"></a><h3>The <code class="literal">“master”</code> property</h3>
 <pre class="programlisting">  “master”                   <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
-<p>The master device if one exists. Replaced by the "controller" property.</p>
+<p>The controller device if one exists. Replaced by the "controller" property.</p>
 <div class="warning"><p><code class="literal">NMActiveConnection:master</code> has been deprecated since version 1.44 and should not be used in newly-written code.</p></div>
 <p>Owner: NMActiveConnection</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html
index c7cbf68c..7d8b88a5 100644
--- a/docs/libnm/html/NMDevice.html
+++ b/docs/libnm/html/NMDevice.html
@@ -1283,7 +1283,7 @@ nm_device_get_ports (<em class="parameter"><code><a class="link" href="NMDevice.
 <div class="refsect3">
 <a name="nm-device-get-ports.returns"></a><h4>Returns</h4>
 <p>the <span class="type">GPtrArray</span> containing <span class="type">NMDevices</span> that
-are slaves of <em class="parameter"><code>device</code></em>
+are ports of <em class="parameter"><code>device</code></em>
 . This is the internal copy used by the device and
 must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html
index 50f4fbfa..3b6e1faa 100644
--- a/docs/libnm/html/NMDeviceBond.html
+++ b/docs/libnm/html/NMDeviceBond.html
@@ -195,7 +195,7 @@ nm_device_bond_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <p><code class="literal">nm_device_bond_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p>
 </div>
-<p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em>
+<p>Gets the devices currently attached as port to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
 <a name="nm-device-bond-get-slaves.parameters"></a><h4>Parameters</h4>
@@ -261,7 +261,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBond--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p>The devices enslaved to the bond device.</p>
+<p>The devices attached as port to the bond device.</p>
 <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
 <p>Owner: NMDeviceBond</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html
index 83ea42bc..f0be9f43 100644
--- a/docs/libnm/html/NMDeviceBridge.html
+++ b/docs/libnm/html/NMDeviceBridge.html
@@ -195,7 +195,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 <p><code class="literal">nm_device_bridge_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p>
 </div>
-<p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em>
+<p>Gets the devices currently attached as port to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
 <a name="nm-device-bridge-get-slaves.parameters"></a><h4>Parameters</h4>
@@ -215,7 +215,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N
 <div class="refsect3">
 <a name="nm-device-bridge-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <span class="type">GPtrArray</span> containing
-<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
@@ -261,7 +261,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p>The devices enslaved to the bridge device.</p>
+<p>The devices attached as port to the bridge device.</p>
 <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
 <p>Owner: NMDeviceBridge</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html
index cf296576..80f54539 100644
--- a/docs/libnm/html/NMDeviceOvsBridge.html
+++ b/docs/libnm/html/NMDeviceOvsBridge.html
@@ -105,7 +105,7 @@ nm_device_ovs_bridge_get_slaves (<em class="parameter"><code><a class="link" hre
 <p><code class="literal">nm_device_ovs_bridge_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p>
 </div>
-<p>Gets the ports currently enslaved to <em class="parameter"><code>device</code></em>
+<p>Gets the ports currently attached as port to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
 <a name="nm-device-ovs-bridge-get-slaves.parameters"></a><h4>Parameters</h4>
@@ -125,7 +125,7 @@ nm_device_ovs_bridge_get_slaves (<em class="parameter"><code><a class="link" hre
 <div class="refsect3">
 <a name="nm-device-ovs-bridge-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <span class="type">GPtrArray</span> containing
-<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
@@ -152,7 +152,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceOvsBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p>Gets the ports currently enslaved to the device.</p>
+<p>Gets the ports currently attached as port to the device.</p>
 <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
 <p>Owner: NMDeviceOvsBridge</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html
index dcd25db2..e664afb7 100644
--- a/docs/libnm/html/NMDeviceOvsPort.html
+++ b/docs/libnm/html/NMDeviceOvsPort.html
@@ -105,7 +105,7 @@ nm_device_ovs_port_get_slaves (<em class="parameter"><code><a class="link" href=
 <p><code class="literal">nm_device_ovs_port_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p>
 </div>
-<p>Gets the interfaces currently enslaved to <em class="parameter"><code>device</code></em>
+<p>Gets the interfaces currently attached as port to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
 <a name="nm-device-ovs-port-get-slaves.parameters"></a><h4>Parameters</h4>
@@ -125,7 +125,7 @@ nm_device_ovs_port_get_slaves (<em class="parameter"><code><a class="link" href=
 <div class="refsect3">
 <a name="nm-device-ovs-port-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <span class="type">GPtrArray</span> containing
-<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
@@ -152,7 +152,7 @@ copy used by the device, and must not be modified. </p>
 <div class="refsect2">
 <a name="NMDeviceOvsPort--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p>Gets the interfaces currently enslaved to the device.</p>
+<p>Gets the interfaces currently attached as port to the device.</p>
 <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
 <p>Owner: NMDeviceOvsPort</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html
index 84bae898..593166dc 100644
--- a/docs/libnm/html/NMDeviceTeam.html
+++ b/docs/libnm/html/NMDeviceTeam.html
@@ -212,7 +212,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <p><code class="literal">nm_device_team_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p>
 </div>
-<p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em>
+<p>Gets the devices currently attach as port to <em class="parameter"><code>device</code></em>
 .</p>
 <div class="refsect3">
 <a name="nm-device-team-get-slaves.parameters"></a><h4>Parameters</h4>
@@ -232,7 +232,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD
 <div class="refsect3">
 <a name="nm-device-team-get-slaves.returns"></a><h4>Returns</h4>
 <p>the <span class="type">GPtrArray</span> containing
-<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em>
+<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em>
 . This is the internal
 copy used by the device, and must not be modified. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p>
@@ -322,7 +322,7 @@ device, and must not be modified.</p>
 <div class="refsect2">
 <a name="NMDeviceTeam--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3>
 <pre class="programlisting">  “slaves”                   <span class="type">GPtrArray</span> *</pre>
-<p>The devices enslaved to the team device.</p>
+<p>The devices attached as port to the team device.</p>
 <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p>
 <p>Owner: NMDeviceTeam</p>
 <p>Flags: Read</p>
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 2620fe0f..8d79934b 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -1197,7 +1197,7 @@ is just an alias.</p>
 </div>
 <div class="refsect3">
 <a name="nm-setting-connection-get-master.returns"></a><h4>Returns</h4>
-<p> interface name of the master device or UUID of the master
+<p> interface name of the controller device or UUID of the controller
 connection.</p>
 </div>
 </div>
@@ -1254,7 +1254,7 @@ nm_setting_connection_is_slave_type (<em class="parameter"><code><a class="link"
 <td class="parameter_name"><p>type</p></td>
 <td class="parameter_description"><p>the setting name (ie <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-SETTING-NAME:CAPS" title="NM_SETTING_BOND_SETTING_NAME"><span class="type">NM_SETTING_BOND_SETTING_NAME</span></a>) to be matched
 against <em class="parameter"><code>setting</code></em>
-'s slave type</p></td>
+'s port type</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -1262,7 +1262,7 @@ against <em class="parameter"><code>setting</code></em>
 </div>
 <div class="refsect3">
 <a name="nm-setting-connection-is-slave-type.returns"></a><h4>Returns</h4>
-<p> <code class="literal">TRUE</code> if connection is of the given slave <em class="parameter"><code>type</code></em>
+<p> <code class="literal">TRUE</code> if connection is of the given port <em class="parameter"><code>type</code></em>
 </p>
 </div>
 </div>
@@ -1294,7 +1294,7 @@ is just an alias.</p>
 </div>
 <div class="refsect3">
 <a name="nm-setting-connection-get-slave-type.returns"></a><h4>Returns</h4>
-<p> the type of slave this connection is, if any</p>
+<p> the type of port this connection is, if any</p>
 </div>
 </div>
 <hr>
@@ -1353,7 +1353,7 @@ is just an alias.</p>
 </div>
 <div class="refsect3">
 <a name="nm-setting-connection-get-autoconnect-slaves.returns"></a><h4>Returns</h4>
-<p> whether slaves of the connection should be activated together
+<p> whether ports of the connection should be activated together
 with the connection.</p>
 </div>
 <p class="since">Since: 1.2</p>
@@ -2101,7 +2101,7 @@ property.</p>
 <a name="NMSettingConnectionAutoconnectSlaves"></a><h3>enum NMSettingConnectionAutoconnectSlaves</h3>
 <div class="warning"><p><code class="literal">NMSettingConnectionAutoconnectSlaves</code> has been deprecated since version 1.46 and should not be used in newly-written code.</p></div>
 <p><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a> values indicate whether slave connections
-should be activated when master is activated.</p>
+should be activated when controller is activated.</p>
 <div class="refsect3">
 <a name="NMSettingConnectionAutoconnectSlaves.members"></a><h4>Members</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -2122,7 +2122,7 @@ should be activated when master is activated.</p>
 <td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-NO:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO</p></td>
 <td class="enum_member_description">
 <p>slaves are not brought up when
-master is activated</p>
+controller is activated</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -2130,7 +2130,7 @@ master is activated</p>
 <td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-YES:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES</p></td>
 <td class="enum_member_description">
 <p>slaves are brought up when
-master is activated</p>
+controller is activated</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html
index eaa62d32..82d73897 100644
--- a/docs/libnm/html/NMSettingTeam.html
+++ b/docs/libnm/html/NMSettingTeam.html
@@ -1011,7 +1011,7 @@ going down and the runner being notified about it.</p>
 <a name="nm-team-link-watcher-get-init-wait"></a><h3>nm_team_link_watcher_get_init_wait ()</h3>
 <pre class="programlisting"><span class="returnvalue">int</span>
 nm_team_link_watcher_get_init_wait (<em class="parameter"><code>const <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre>
-<p>Gets the init_wait interval (in milliseconds) that the team slave should
+<p>Gets the init_wait interval (in milliseconds) that the team port should
 wait before sending the first packet to the target host.</p>
 <div class="refsect3">
 <a name="nm-team-link-watcher-get-init-wait.parameters"></a><h4>Parameters</h4>
@@ -1035,7 +1035,7 @@ wait before sending the first packet to the target host.</p>
 <a name="nm-team-link-watcher-get-interval"></a><h3>nm_team_link_watcher_get_interval ()</h3>
 <pre class="programlisting"><span class="returnvalue">int</span>
 nm_team_link_watcher_get_interval (<em class="parameter"><code>const <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre>
-<p>Gets the interval (in milliseconds) that the team slave should wait between
+<p>Gets the interval (in milliseconds) that the team port should wait between
 sending two check packets to the target host.</p>
 <div class="refsect3">
 <a name="nm-team-link-watcher-get-interval.parameters"></a><h4>Parameters</h4>
diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index dd29e8a6..39fa0e7b 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -225,6 +225,10 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS" title="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES">NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="NMActiveConnection.html#NMActiveConnection-struct" title="NMActiveConnection">NMActiveConnection</a>, struct in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a>
 </dt>
 <dd></dd>
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index ad68de63..db1ea997 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.48.6
+      for libnm 1.48.8
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://networkmanager.dev/docs/libnm/latest/" target="_top">https://networkmanager.dev/docs/libnm/latest/</a>.
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 0e1ca808..0a3867ad 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -493,6 +493,10 @@
 <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMActivationStateFlags" title="enum NMActivationStateFlags">NMActivationStateFlags</a></td>
 </tr>
 <tr>
+<td class="define_keyword">#define</td>
+<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS" title="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES">NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</a></td>
+</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>
@@ -1270,7 +1274,7 @@ GSM/UMTS, or LTE network access protocols</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-BOND:CAPS"></a>NM_DEVICE_TYPE_BOND</p></td>
 <td class="enum_member_description">
-<p>a bond master interface</p>
+<p>a bond controller interface</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -1291,7 +1295,7 @@ GSM/UMTS, or LTE network access protocols</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-BRIDGE:CAPS"></a>NM_DEVICE_TYPE_BRIDGE</p></td>
 <td class="enum_member_description">
-<p>a bridge master interface</p>
+<p>a bridge controller interface</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -1305,7 +1309,7 @@ GSM/UMTS, or LTE network access protocols</p>
 <tr>
 <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-TEAM:CAPS"></a>NM_DEVICE_TYPE_TEAM</p></td>
 <td class="enum_member_description">
-<p>a team master interface</p>
+<p>a team controller interface</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -3622,16 +3626,16 @@ an external configuration of a networking device. Since: 1.26.</p>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-MASTER:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_MASTER</p></td>
+<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-CONTROLLER:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER</p></td>
 <td class="enum_member_description">
-<p>the device is a master.</p>
+<p>the device is a controller.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-SLAVE:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_SLAVE</p></td>
+<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-PORT:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_PORT</p></td>
 <td class="enum_member_description">
-<p>the device is a slave.</p>
+<p>the device is a port.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -3657,10 +3661,10 @@ an external configuration of a networking device. Since: 1.26.</p>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
-<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"></a>NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</p></td>
+<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-CONTROLLER-HAS-PORTS:CAPS"></a>NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS</p></td>
 <td class="enum_member_description">
-<p>The master has any slave devices attached.
-This only makes sense if the device is a master.</p>
+<p>The controller has any port devices attached.
+This only makes sense if the device is a controller.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -3689,6 +3693,12 @@ represent an external configuration of a networking device. Since: 1.26.</p>
 </div>
 <hr>
 <div class="refsect2">
+<a name="NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"></a><h3>NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</h3>
+<pre class="programlisting">#define NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES NM_ACTIVATION_FLAG_CONTROLLER_HAS_PORTS
+</pre>
+</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">
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index bf01858f..f14b001d 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -2706,10 +2706,10 @@ general case) work with connections of type <em class="parameter"><code>other_ty
 <em class="parameter"><code>other_type</code></em>
  is a valid type for the parent of a VLAN.</p>
 <p>If <em class="parameter"><code>virtual_type</code></em>
- is a "master" type (eg, <code class="literal">NM_TYPE_SETTING_BRIDGE</code>),
+ is a "controller" type (eg, <code class="literal">NM_TYPE_SETTING_BRIDGE</code>),
 then this checks if <em class="parameter"><code>other_type</code></em>
- is a valid type for a slave of that
-master.</p>
+ is a valid type for a port of that
+controller.</p>
 <p>Note that even if this returns <code class="literal">TRUE</code> it is not guaranteed that
 <span class="emphasis"><em>every</em></span> connection of type <em class="parameter"><code>other_type</code></em>
  is
diff --git a/docs/libnm/html/libnm-nm-version-macros.html b/docs/libnm/html/libnm-nm-version-macros.html
index aa3f6e90..4ea9a41e 100644
--- a/docs/libnm/html/libnm-nm-version-macros.html
+++ b/docs/libnm/html/libnm-nm-version-macros.html
@@ -269,7 +269,7 @@ is compiled against.</p>
 <hr>
 <div class="refsect2">
 <a name="NM-MICRO-VERSION:CAPS"></a><h3>NM_MICRO_VERSION</h3>
-<pre class="programlisting">#define NM_MICRO_VERSION (6)
+<pre class="programlisting">#define NM_MICRO_VERSION (8)
 </pre>
 <p>Evaluates to the micro version number of NetworkManager which this source
 compiled against.</p>
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index 71a1a7e9..070c0df1 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -510,6 +510,7 @@
     <keyword type="enum" name="enum NMRollbackResult" link="libnm-nm-dbus-interface.html#NMRollbackResult" since="1.4"/>
     <keyword type="enum" name="enum NMSettingsConnectionFlags" link="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" since="1.12"/>
     <keyword type="enum" name="enum NMActivationStateFlags" link="libnm-nm-dbus-interface.html#NMActivationStateFlags" since="1.10"/>
+    <keyword type="macro" name="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"/>
     <keyword type="enum" name="enum NMSettingsAddConnection2Flags" link="libnm-nm-dbus-interface.html#NMSettingsAddConnection2Flags" since="1.20"/>
     <keyword type="enum" name="enum NMSettingsUpdate2Flags" link="libnm-nm-dbus-interface.html#NMSettingsUpdate2Flags" since="1.12"/>
     <keyword type="enum" name="enum NMDeviceReapplyFlags" link="libnm-nm-dbus-interface.html#NMDeviceReapplyFlags" since="1.42"/>
@@ -3867,12 +3868,12 @@
     <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_VOLATILE" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-VOLATILE:CAPS"/>
     <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_EXTERNAL" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-EXTERNAL:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-NONE:CAPS"/>
-    <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_MASTER" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-MASTER:CAPS"/>
-    <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_SLAVE" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-SLAVE:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-CONTROLLER:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_PORT" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-PORT:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_LAYER2_READY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-LAYER2-READY:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IP4_READY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IP4-READY:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IP6_READY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IP6-READY:CAPS"/>
-    <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"/>
+    <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-CONTROLLER-HAS-PORTS:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-LIFETIME-BOUND-TO-PROFILE-VISIBILITY:CAPS"/>
     <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_EXTERNAL" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-EXTERNAL:CAPS"/>
     <keyword type="constant" name="NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-SETTINGS-ADD-CONNECTION2-FLAG-NONE:CAPS"/>
diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 2f493595..47743c6e 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.48.6
+  NetworkManager version: 1.48.8
 
   <code class="prompt">$ </code></pre>
 <p>