New upstream version 1.48.8 upstream/1.48.8

1 files changed, 34 insertions, 34 deletions

diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index 5249d6ba..71ea5dc8 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -187,56 +187,56 @@ B,DISPATCH</screen>
       </para>
     </example>
 
-    <example><title>Adding a bonding master and two slave connection profiles</title>
+    <example><title>Adding a bonding controller and two port connection profiles</title>
 <screen><prompt>$ </prompt><userinput>nmcli con add type bond ifname mybond0 mode active-backup</userinput>
-<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth1 master mybond0</userinput>
-<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth2 master mybond0</userinput></screen>
+<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth1 controller mybond0</userinput>
+<prompt>$ </prompt><userinput>nmcli con add type ethernet ifname eth2 controller mybond0</userinput></screen>
       <para>
-        This example demonstrates adding a bond master connection and two slaves. The
-        first command adds a master bond connection, naming the bonding interface
+        This example demonstrates adding a bond controller connection and two ports. The
+        first command adds a controller bond connection, naming the bonding interface
         <emphasis>mybond0</emphasis> and using <emphasis>active-backup</emphasis> mode.
-        The next two commands add slaves connections, both enslaved to <emphasis>mybond0</emphasis>.
-        The first slave will be bound to <emphasis>eth1</emphasis> interface, the second to
+        The next two commands add port connections, both attached as port to <emphasis>mybond0</emphasis>.
+        The first port will be bound to <emphasis>eth1</emphasis> interface, the second to
         <emphasis>eth2</emphasis>.
       </para>
     </example>
 
-    <example><title>Adding a team master and two slave connection profiles</title>
-<screen><prompt>$ </prompt><userinput>nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf</userinput>
-<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1</userinput>
-<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1</userinput></screen>
+    <example><title>Adding a team controller and two port connection profiles</title>
+<screen><prompt>$ </prompt><userinput>nmcli con add type team con-name Team1 ifname Team1 config team1-controller-json.conf</userinput>
+<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-port1 ifname em1 controller Team1</userinput>
+<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name Team1-port2 ifname em2 controller Team1</userinput></screen>
       <para>
-        This example demonstrates adding a team master connection profile and two slaves. It is
-        very similar to the bonding example. The first command adds a master team profile, naming
+        This example demonstrates adding a team controller connection profile and two ports. It is
+        very similar to the bonding example. The first command adds a controller team profile, naming
         the team interface and the profile <emphasis>Team1</emphasis>. The team configuration
-        for the master is read from <emphasis>team1-master-json.conf</emphasis> file. Later, you can
+        for the controller is read from <emphasis>team1-controller-json.conf</emphasis> file. Later, you can
         change the configuration with <emphasis>modify</emphasis> command
-        (<emphasis role="bold">nmcli con modify Team1 team.config team1-master-another-json.conf</emphasis>).
-        The last two commands add slaves profiles, both enslaved to <emphasis>Team1</emphasis>.
-        The first slave will be bound to the <emphasis>em1</emphasis> interface, the second to
-        <emphasis>em2</emphasis>. The slaves don't specify <emphasis>config</emphasis> and thus
+        (<emphasis role="bold">nmcli con modify Team1 team.config team1-controller-another-json.conf</emphasis>).
+        The last two commands add port profiles, both attached as port to <emphasis>Team1</emphasis>.
+        The first port will be bound to the <emphasis>em1</emphasis> interface, the second to
+        <emphasis>em2</emphasis>. The ports don't specify <emphasis>config</emphasis> and thus
         <emphasis>teamd</emphasis> will use its default configuration. You will activate the whole setup
-        by activating both slaves:
-<screen>  <prompt>$ </prompt><userinput>nmcli con up Team1-slave1</userinput>
-  <prompt>$ </prompt><userinput>nmcli con up Team1-slave2</userinput></screen>
+        by activating both ports:
+<screen>  <prompt>$ </prompt><userinput>nmcli con up Team1-port1</userinput>
+  <prompt>$ </prompt><userinput>nmcli con up Team1-port2</userinput></screen>
         By default, the created profiles are marked for auto-activation. But if another
         connection has been activated on the device, the new profile won't activate
         automatically and you need to activate it manually.
       </para>
     </example>
 
-    <example><title>Adding a bridge and two slave profiles</title>
+    <example><title>Adding a bridge and two port profiles</title>
 <screen><prompt>$ </prompt><userinput>nmcli con add type bridge con-name TowerBridge ifname TowerBridge</userinput>
-<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge</userinput>
-<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge</userinput>
+<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-port-1 ifname ens3 controller TowerBridge</userinput>
+<prompt>$ </prompt><userinput>nmcli con add type ethernet con-name br-port-2 ifname ens4 controller TowerBridge</userinput>
 <prompt>$ </prompt><userinput>nmcli con modify TowerBridge bridge.stp no</userinput></screen>
       <para>
-        This example demonstrates adding a bridge master connection and two slaves. The
-        first command adds a master bridge connection, naming the bridge interface and
+        This example demonstrates adding a bridge controller connection and two ports. The
+        first command adds a controller bridge connection, naming the bridge interface and
         the profile as <emphasis>TowerBridge</emphasis>.
-        The next two commands add slaves profiles, both will be enslaved to
+        The next two commands add ports profiles, both will be attached as port to
         <emphasis>TowerBridge</emphasis>.
-        The first slave will be tied to <emphasis>ens3</emphasis> interface, the second to
+        The first port will be tied to <emphasis>ens3</emphasis> interface, the second to
         <emphasis>ens4</emphasis>.
         The last command will disable 802.1D STP for the TowerBridge profile.
       </para>
@@ -375,8 +375,8 @@ connection.timestamp:               0
 connection.read-only:               no
 connection.permissions:
 connection.zone:                    --
-connection.master:                  --
-connection.slave-type:              --
+connection.controller:              --
+connection.port-type:               --
 connection.secondaries:
 connection.gateway-ping-timeout:    0
 ---------------------------------------------------------------------------
@@ -465,8 +465,8 @@ connection.timestamp:               0
 connection.read-only:               no
 connection.permissions:
 connection.zone:                    --
-connection.master:                  --
-connection.slave-type:              --
+connection.controller:              --
+connection.port-type:               --
 connection.secondaries:
 connection.gateway-ping-timeout:    0
 ---------------------------------------------------------------------------
@@ -525,8 +525,8 @@ connection.timestamp:               0
 connection.read-only:               no
 connection.permissions:
 connection.zone:                    --
-connection.master:                  --
-connection.slave-type:              --
+connection.controller:              --
+connection.port-type:               --
 connection.secondaries:
 connection.gateway-ping-timeout:    0
 ---------------------------------------------------------------------------