about summary refs log tree commit diff
path: root/docs/api/html/nm-settings-dbus.html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api/html/nm-settings-dbus.html')
-rw-r--r--docs/api/html/nm-settings-dbus.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index 33867169..14a4fd9a 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -160,7 +160,7 @@ Depending on "connection.multi-connect", a profile can (auto)connect only once a
 <a name="nm-settings-dbus.property.connection.autoconnect-slaves"></a>autoconnect-slaves</td>
 <td align="left">NMSettingConnectionAutoconnectSlaves (int32)</td>
 <td align="left"> </td>
-<td>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.
+<td>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.
 
 Deprecated 1.46. Use "autoconnect-ports" instead, this is just an alias.</td>
 </tr>
@@ -237,7 +237,7 @@ This feature requires a plugin which supports LLMNR. Otherwise, the setting has
 <a name="nm-settings-dbus.property.connection.master"></a>master</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>Interface name of the master device or UUID of the master connection.
+<td>Interface name of the controller device or UUID of the controller connection.
 
 Deprecated 1.46. Use "controller" instead, this is just an alias.</td>
 </tr>
@@ -339,7 +339,7 @@ This property is deprecated since version 1.44.This property is deprecated and h
 <a name="nm-settings-dbus.property.connection.slave-type"></a>slave-type</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td>Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.
+<td>Setting name of the device type of this port's controller connection (eg, "bond"), or NULL if this connection is not a port.
 
 Deprecated 1.46. Use "port-type" instead, this is just an alias.</td>
 </tr>
@@ -3841,7 +3841,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre
 <a name="nm-settings-dbus.property.vlan.flags"></a>flags</td>
 <td align="left">NMVlanFlags (uint32)</td>
 <td align="left"> </td>
-<td>One or more flags which control the behavior and features of the VLAN interface.  Flags include 0x1 (reorder-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose-binding) (loose binding of the interface to its master device's operating state). 0x8 (mvrp) (use of the MVRP protocol).
+<td>One or more flags which control the behavior and features of the VLAN interface.  Flags include 0x1 (reorder-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose-binding) (loose binding of the interface to its controller device's operating state). 0x8 (mvrp) (use of the MVRP protocol).
 
 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.</td>
 </tr>