New upstream version 1.48.8 upstream/1.48.8

1 files changed, 34 insertions, 34 deletions

diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index b5e184bc..69d07716 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 07/25/2024
+.\"      Date: 08/09/2024
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.48.6
+.\"    Source: NetworkManager 1.48.8
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.48\&.6" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.48\&.8" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -240,65 +240,65 @@ are set to \*(Aq0x02\*(Aq (\*(Aqalways ask\*(Aq, see
 \fBnm-settings-nmcli\fR(5)
 )\&. This is particularly useful for OTP based VPNs, as the user needs to be prompted for the password each time the connection is activated\&.
 .PP
-\fBExample\ \&8.\ \&Adding a bonding master and two slave connection profiles\fR
+\fBExample\ \&8.\ \&Adding a bonding controller and two port connection profiles\fR
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 $ \fBnmcli con add type bond ifname mybond0 mode active\-backup\fR
-$ \fBnmcli con add type ethernet ifname eth1 master mybond0\fR
-$ \fBnmcli con add type ethernet ifname eth2 master mybond0\fR
+$ \fBnmcli con add type ethernet ifname eth1 controller mybond0\fR
+$ \fBnmcli con add type ethernet ifname eth2 controller mybond0\fR
 .fi
 .if n \{\
 .RE
 .\}
 .PP
-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
 \fImybond0\fR
 and using
 \fIactive\-backup\fR
-mode\&. The next two commands add slaves connections, both enslaved to
-\fImybond0\fR\&. The first slave will be bound to
+mode\&. The next two commands add port connections, both attached as port to
+\fImybond0\fR\&. The first port will be bound to
 \fIeth1\fR
 interface, the second to
 \fIeth2\fR\&.
 .PP
-\fBExample\ \&9.\ \&Adding a team master and two slave connection profiles\fR
+\fBExample\ \&9.\ \&Adding a team controller and two port connection profiles\fR
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-$ \fBnmcli con add type team con\-name Team1 ifname Team1 config team1\-master\-json\&.conf\fR
-$ \fBnmcli con add type ethernet con\-name Team1\-slave1 ifname em1 master Team1\fR
-$ \fBnmcli con add type ethernet con\-name Team1\-slave2 ifname em2 master Team1\fR
+$ \fBnmcli con add type team con\-name Team1 ifname Team1 config team1\-controller\-json\&.conf\fR
+$ \fBnmcli con add type ethernet con\-name Team1\-port1 ifname em1 controller Team1\fR
+$ \fBnmcli con add type ethernet con\-name Team1\-port2 ifname em2 controller Team1\fR
 .fi
 .if n \{\
 .RE
 .\}
 .PP
-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 the team interface and the profile
-\fITeam1\fR\&. The team configuration for the master is read from
-\fIteam1\-master\-json\&.conf\fR
+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
+\fITeam1\fR\&. The team configuration for the controller is read from
+\fIteam1\-controller\-json\&.conf\fR
 file\&. Later, you can change the configuration with
 \fImodify\fR
-command (\fBnmcli con modify Team1 team\&.config team1\-master\-another\-json\&.conf\fR)\&. The last two commands add slaves profiles, both enslaved to
-\fITeam1\fR\&. The first slave will be bound to the
+command (\fBnmcli con modify Team1 team\&.config team1\-controller\-another\-json\&.conf\fR)\&. The last two commands add port profiles, both attached as port to
+\fITeam1\fR\&. The first port will be bound to the
 \fIem1\fR
 interface, the second to
-\fIem2\fR\&. The slaves don\*(Aqt specify
+\fIem2\fR\&. The ports don\*(Aqt specify
 \fIconfig\fR
 and thus
 \fIteamd\fR
-will use its default configuration\&. You will activate the whole setup by activating both slaves:
+will use its default configuration\&. You will activate the whole setup by activating both ports:
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-  $ \fBnmcli con up Team1\-slave1\fR
-  $ \fBnmcli con up Team1\-slave2\fR
+  $ \fBnmcli con up Team1\-port1\fR
+  $ \fBnmcli con up Team1\-port2\fR
 .fi
 .if n \{\
 .RE
@@ -306,24 +306,24 @@ will use its default configuration\&. You will activate the whole setup by activ
 .sp
 By default, the created profiles are marked for auto\-activation\&. But if another connection has been activated on the device, the new profile won\*(Aqt activate automatically and you need to activate it manually\&.
 .PP
-\fBExample\ \&10.\ \&Adding a bridge and two slave profiles\fR
+\fBExample\ \&10.\ \&Adding a bridge and two port profiles\fR
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 $ \fBnmcli con add type bridge con\-name TowerBridge ifname TowerBridge\fR
-$ \fBnmcli con add type ethernet con\-name br\-slave\-1 ifname ens3 master TowerBridge\fR
-$ \fBnmcli con add type ethernet con\-name br\-slave\-2 ifname ens4 master TowerBridge\fR
+$ \fBnmcli con add type ethernet con\-name br\-port\-1 ifname ens3 controller TowerBridge\fR
+$ \fBnmcli con add type ethernet con\-name br\-port\-2 ifname ens4 controller TowerBridge\fR
 $ \fBnmcli con modify TowerBridge bridge\&.stp no\fR
 .fi
 .if n \{\
 .RE
 .\}
 .PP
-This example demonstrates adding a bridge master connection and two slaves\&. The first command adds a master bridge connection, naming the bridge interface and the profile as
-\fITowerBridge\fR\&. The next two commands add slaves profiles, both will be enslaved to
-\fITowerBridge\fR\&. The first slave will be tied to
+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
+\fITowerBridge\fR\&. The next two commands add ports profiles, both will be attached as port to
+\fITowerBridge\fR\&. The first port will be tied to
 \fIens3\fR
 interface, the second to
 \fIens4\fR\&. The last command will disable 802\&.1D STP for the TowerBridge profile\&.
@@ -503,8 +503,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
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
@@ -593,8 +593,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
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
@@ -653,8 +653,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
 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-