nmcli: fix errors in nmcli help output and man page

Fix some spelling errors and wrong parameter description. Also add the
team connection to the manual page.

https://bugzilla.redhat.com/show_bug.cgi?id=997566

Signed-off-by: Thomas Haller <thaller@redhat.com>

2 files changed, 30 insertions, 18 deletions

diff --git a/cli/src/connections.c b/cli/src/connections.c
index 5e34bd0e67..053fc16658 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -241,25 +241,25 @@ usage_connection_add (void)
 	         "    ethernet:     [mac <MAC address>]\n"
 	         "                  [cloned-mac <cloned MAC address>]\n"
 	         "                  [mtu <MTU>]\n\n"
-	         "    wifi:         [mac <MAC address>]\n"
+	         "    wifi:         ssid <SSID>\n"
+	         "                  [mac <MAC address>]\n"
 	         "                  [cloned-mac <cloned MAC address>]\n"
-	         "                  [mtu <MTU>]\n"
-	         "                  [ssid <SSID>]\n\n"
+	         "                  [mtu <MTU>]\n\n"
 	         "    wimax:        [mac <MAC address>]\n"
 	         "                  [nsp <NSP>]\n\n"
-	         "    gsm:          apn <APN>]\n"
+	         "    gsm:          apn <APN>\n"
 	         "                  [user <username>]\n"
 	         "                  [password <password>]\n\n"
 	         "    cdma:         [user <username>]\n"
 	         "                  [password <password>]\n\n"
 	         "    infiniband:   [mac <MAC address>]\n"
 	         "                  [mtu <MTU>]\n"
-	         "                  [transport-mode datagram | connected]\n\n"
-	         "                  [parent <ifname>]\n\n"
+	         "                  [transport-mode datagram | connected]\n"
+	         "                  [parent <ifname>]\n"
 	         "                  [p-key <IPoIB P_Key>]\n\n"
 	         "    bluetooth:    [addr <bluetooth address>]\n"
-	         "                  [bt-type panu|dun-gsm|dun-cdma]\n"
-	         "    vlan:         dev <parent device (connection  UUID, ifname, or MAC)\n"
+	         "                  [bt-type panu|dun-gsm|dun-cdma]\n\n"
+	         "    vlan:         dev <parent device (connection  UUID, ifname, or MAC)>\n"
 	         "                  [id <VLAN id>]\n"
 	         "                  [flags <VLAN flags>]\n"
 	         "                  [ingress <ingress priority mapping>]\n"
@@ -272,9 +272,9 @@ usage_connection_add (void)
 	         "                  [updelay <num>]\n"
 	         "                  [arp-interval <num>]\n"
 	         "                  [arp-ip-target <num>]\n\n"
-	         "    bond-slave:   master <master (ifname or connection UUID)\n\n"
+	         "    bond-slave:   master <master (ifname or connection UUID)>\n\n"
 	         "    team:         [config <json config>]\n\n"
-	         "    team-slave:   master <master (ifname or connection UUID)\n"
+	         "    team-slave:   master <master (ifname or connection UUID)>\n"
 	         "                  [config <json config>]\n\n"
 	         "    bridge:       [stp yes|no>]\n"
 	         "                  [priority <num>]\n"
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index c3df3a7551..2e5d1f9f01 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -335,7 +335,7 @@ Add a connection for NetworkManager. Arguments differ according to connection ty
 .IP "\fIifname <ifname> | \(dq\&*\(dq\&\fP" 42
 \(en interface to bind the connection to. The connection will only be applicable to this
 interface name. A special value of "\fB*\fP" can be used for interface-independent connections.
-The \fIifname\fP argument is mandatory for all connection types except bond, bridge and vlan.
+The \fIifname\fP argument is mandatory for all connection types except bond, team, bridge and vlan.
 Note: use quotes around \fB*\fP to suppress shell expansion.
 .IP "\fI[con-name <connection name>]\fP" 42
 \(en connection name (when not provided a default name is generated: <type>[-<ifname>][-<num>])
@@ -357,14 +357,14 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
 .RS
 .TP
 .B wifi:
+.IP "\fIssid <SSID>\fP" 42
+\(en SSID
 .IP "\fI[mac <MAC address>]\fP" 42
 \(en MAC address of the device this connection is locked to
 .IP "\fI[cloned-mac <cloned MAC address>]\fP" 42
 \(en cloned MAC
 .IP "\fI[mtu <MTU>]\fP" 42
 \(en MAC
-.IP "\fI[ssid <SSID>]\fP" 42
-\(en SSID
 .RE
 .RS
 .TP
@@ -417,7 +417,7 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
 .RS
 .TP
 .B vlan:
-.IP "\fIdev <parent device (connection UUID, ifname, or MAC)\fP" 42
+.IP "\fIdev <parent device (connection UUID, ifname, or MAC)>\fP" 42
 \(en parent device this VLAN is on
 .IP "\fI[id <VLAN id>]\fP" 42
 \(en VLAN ID
@@ -450,8 +450,20 @@ Note: use quotes around \fB*\fP to suppress shell expansion.
 .RS
 .TP
 .B bond-slave:
-.IP "\fImaster <master (ifname or connection UUID)\fP" 42
-\(en name of bridge master interface
+.IP "\fImaster <master (ifname or connection UUID)>\fP" 42
+\(en name of bond master interface
+.RE
+.RS
+.TP
+.B team:
+.IP "\fI[config <json config>]\fP" 42
+\(en configuration file
+.RE
+.RS
+.TP
+.B team-slave:
+.IP "\fImaster <master (ifname or connection UUID)>\fP" 42
+\(en name of team master interface
 .RE
 .RS
 .TP
@@ -472,7 +484,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)>\fP" 42
 \(en name of bridge master interface
 .IP "\fI[priority <0-63>]\fP" 42
 \(en STP priority of this slave
@@ -493,7 +505,7 @@ to be sent back out through the slave the frame was received on
 .RS
 .TP
 .B olpc-mesh:
-.IP "\fI[ssid <SSID>]\fP" 42
+.IP "\fIssid <SSID>\fP" 42
 \(en SSID
 .IP "\fI[channel <1-13>]\fP" 42
 \(en channel to use for the network