summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-03-11 12:10:00 +0100
committerJiří Klimeš <jklimes@redhat.com>2014-03-12 10:32:11 +0100
commit90c02cafdc7a6076bb6a07dc19f29eef768ca63f (patch)
tree3621eeaa234477498b3898b6bea9830ddc7c3e16 /man
parent8bed556019dfd76f884475b2040f39e7d420332f (diff)
downloadNetworkManager-90c02cafdc7a6076bb6a07dc19f29eef768ca63f.tar.gz
cli: allow specifying 'master' for slaves as connection ID (rh #1057494)
nmcli con add type *-slave ifname em1 master <ifname|UUID|name> 'master' property of 'connection' setting has to be either interface name or connection UUID of master connection. However, to make nmcli more convenient for users, we also allow specifying connection name and translating it to UUID automatically. https://bugzilla.redhat.com/show_bug.cgi?id=1057494
Diffstat (limited to 'man')
-rw-r--r--man/nmcli.1.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index 0292fa5257..bc3b942cf1 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -521,7 +521,7 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
.RS
.TP
.B bond-slave:
-.IP "\fImaster <master (ifname or connection UUID)>\fP" 42
+.IP "\fImaster <master (ifname, or connection UUID or name)>\fP" 42
\(en name of bond master interface
.RE
.RS
@@ -533,7 +533,7 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
.RS
.TP
.B team-slave:
-.IP "\fImaster <master (ifname or connection UUID)>\fP" 42
+.IP "\fImaster <master (ifname, or connection UUID or name)>\fP" 42
\(en name of team master interface
.IP "\fI[config <file>|<raw JSON data>]\fP" 42
\(en JSON configuration for team
@@ -557,7 +557,7 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
.RS
.TP
.B bridge-slave:
-.IP "\fImaster <master (ifname or connection UUID)>\fP" 42
+.IP "\fImaster <master (ifname, or connection UUID or name)>\fP" 42
\(en name of bridge master interface
.IP "\fI[priority <0-63>]\fP" 42
\(en STP priority of this slave (default: 32)