Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest

1 files changed, 185 insertions, 22 deletions

diff --git a/man/nmcli.1 b/man/nmcli.1
index 03d031a0..d7a01bc7 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 12/06/2020
+.\"      Date: 02/18/2021
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.28.0
+.\"    Source: NetworkManager 1.30.0
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.28\&.0" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.30\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -659,7 +659,7 @@ alias) to one of known NetworkManager connection types:
 .sp -1
 .IP \(bu 2.3
 .\}
-ethernet
+6lowpan
 .RE
 .sp
 .RS 4
@@ -670,7 +670,9 @@ ethernet
 .sp -1
 .IP \(bu 2.3
 .\}
-wifi
+802\-11\-olpc\-mesh
+(alias
+olpc\-mesh)
 .RE
 .sp
 .RS 4
@@ -681,7 +683,9 @@ wifi
 .sp -1
 .IP \(bu 2.3
 .\}
-wimax
+802\-11\-wireless
+(alias
+wifi)
 .RE
 .sp
 .RS 4
@@ -692,7 +696,9 @@ wimax
 .sp -1
 .IP \(bu 2.3
 .\}
-pppoe
+802\-3\-ethernet
+(alias
+ethernet)
 .RE
 .sp
 .RS 4
@@ -703,7 +709,64 @@ pppoe
 .sp -1
 .IP \(bu 2.3
 .\}
-gsm
+adsl
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bluetooth
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bond
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bond\-slave
+(deprecated for ethernet with master)
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bridge
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bridge\-slave
+(deprecated for ethernet with master)
 .RE
 .sp
 .RS 4
@@ -725,6 +788,39 @@ cdma
 .sp -1
 .IP \(bu 2.3
 .\}
+dummy
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+generic
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+gsm
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 infiniband
 .RE
 .sp
@@ -736,7 +832,7 @@ infiniband
 .sp -1
 .IP \(bu 2.3
 .\}
-bluetooth
+ip\-tunnel
 .RE
 .sp
 .RS 4
@@ -747,7 +843,7 @@ bluetooth
 .sp -1
 .IP \(bu 2.3
 .\}
-vlan
+macsec
 .RE
 .sp
 .RS 4
@@ -758,7 +854,7 @@ vlan
 .sp -1
 .IP \(bu 2.3
 .\}
-bond
+macvlan
 .RE
 .sp
 .RS 4
@@ -769,7 +865,7 @@ bond
 .sp -1
 .IP \(bu 2.3
 .\}
-bond\-slave
+olpc\-mesh
 .RE
 .sp
 .RS 4
@@ -780,7 +876,7 @@ bond\-slave
 .sp -1
 .IP \(bu 2.3
 .\}
-team
+ovs\-bridge
 .RE
 .sp
 .RS 4
@@ -791,7 +887,7 @@ team
 .sp -1
 .IP \(bu 2.3
 .\}
-team\-slave
+ovs\-dpdk
 .RE
 .sp
 .RS 4
@@ -802,7 +898,7 @@ team\-slave
 .sp -1
 .IP \(bu 2.3
 .\}
-bridge
+ovs\-interface
 .RE
 .sp
 .RS 4
@@ -813,7 +909,7 @@ bridge
 .sp -1
 .IP \(bu 2.3
 .\}
-bridge\-slave
+ovs\-patch
 .RE
 .sp
 .RS 4
@@ -824,7 +920,7 @@ bridge\-slave
 .sp -1
 .IP \(bu 2.3
 .\}
-vpn
+ovs\-port
 .RE
 .sp
 .RS 4
@@ -835,7 +931,7 @@ vpn
 .sp -1
 .IP \(bu 2.3
 .\}
-olpc\-mesh
+pppoe
 .RE
 .sp
 .RS 4
@@ -846,7 +942,19 @@ olpc\-mesh
 .sp -1
 .IP \(bu 2.3
 .\}
-adsl
+team
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+team\-slave
+(deprecated for ethernet with master)
 .RE
 .sp
 .RS 4
@@ -868,7 +976,7 @@ tun
 .sp -1
 .IP \(bu 2.3
 .\}
-ip\-tunnel
+veth
 .RE
 .sp
 .RS 4
@@ -879,7 +987,29 @@ ip\-tunnel
 .sp -1
 .IP \(bu 2.3
 .\}
-macvlan
+vlan
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+vpn
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+vrf
 .RE
 .sp
 .RS 4
@@ -901,7 +1031,40 @@ vxlan
 .sp -1
 .IP \(bu 2.3
 .\}
-dummy
+wifi\-p2p
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+wimax
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+wireguard
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+wpan
 .RE
 .sp
 The most typical uses are described in the