Imported Upstream version 1.1.92 upstream/1.1.92

1 files changed, 17 insertions, 24 deletions

diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index fbd53c49..3c76348f 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -21,7 +21,7 @@
 .\"
 .\" Copyright 2010 - 2015 Red Hat, Inc.
 .\"
-.TH NMCLI "1" "12 August 2015"
+.TH NMCLI "1" "2016-03-09" "NetworkManager 1.2"
 
 .SH NAME
 nmcli \- command\(hyline tool for controlling NetworkManager
@@ -435,7 +435,7 @@ See \fBconnection show\fP above for the description of the <ID>-specifying keywo
 .br
 If '--wait' option is not specified, the default timeout will be 10 seconds.
 .TP
-.B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- [+|-]<setting>.<property> <value> ...]
+.B add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS [-- [+|-]<setting>.<property> <value> ...]
 .br
 Add a connection for NetworkManager. Arguments differ according to connection types, see below.
 .RS
@@ -460,7 +460,6 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
 .IP "\fI[master <master (ifname, or connection UUID or name)>]\fP" 42
 \(en master interface name, or connection UUID or ID of master connection profile.
 The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disambiguate it.
-See below \fBSLAVE_OPTIONS\fP for additional options for slave connection to masters of various types.
 .IP "\fI[slave-type <master connection type>]\fP" 42
 \(en type of master connection. Only required when it can not be inferred (i.e. the master connection does
 not exist yet).
@@ -610,6 +609,11 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
+.IP "\fI[config <file>|<raw JSON data>]\fP" 42
+\(en JSON configuration for team
+.RE
+.RS
+.TP
 .B bridge:
 .IP "\fI[stp yes|no]\fP" 42
 \(en controls whether Spanning Tree Protocol (STP) is enabled for this bridge (default: yes)
@@ -638,6 +642,16 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
+.IP "\fI[priority <0-63>]\fP" 42
+\(en STP priority of this slave (default: 32)
+.IP "\fI[path-cost <1-65535>]\fP" 42
+\(en STP port cost for destinations via this slave (default: 100)
+.IP "\fI[hairpin yes|no]\fP" 42
+\(en 'hairpin mode' for the slave, which allows frames
+to be sent back out through the slave the frame was received on (default: yes)
+.RE
+.RS
+.TP
 .B vpn:
 .IP "\fIvpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|strongswan|ssh|l2tp|iodine|fortisslvpn|...\fP" 42
 \(en VPN type
@@ -724,27 +738,6 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb
 .RE
 .RS
 .TP
-.B SLAVE_OPTIONS:
-.RE
-.RS
-.TP
-.B bridge:
-.IP "\fI[priority <0-63>]\fP" 42
-\(en STP priority of this slave (default: 32)
-.IP "\fI[path-cost <1-65535>]\fP" 42
-\(en STP port cost for destinations via this slave (default: 100)
-.IP "\fI[hairpin yes|no]\fP" 42
-\(en 'hairpin mode' for the slave, which allows frames
-to be sent back out through the slave the frame was received on (default: yes)
-.RE
-.RS
-.TP
-.B team:
-.IP "\fI[config <file>|<raw JSON data>]\fP" 42
-\(en JSON configuration for team
-.RE
-.RS
-.TP
 .B IP_OPTIONS:
 .IP "\fI[ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\fP" 42
 \(en IPv4 addresses