New upstream version 1.29.90 upstream/1.29.90

1 files changed, 58 insertions, 17 deletions

diff --git a/man/nmcli.xml b/man/nmcli.xml
index e1b2d81b..b0665efd 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -946,30 +946,71 @@
           <option>connection.type</option> property (or use the <option>type</option> alias)
           to one of known NetworkManager connection types:</para>
 
+          <!--
+            See also: nm_meta_setting_info_get_base_type_priority().
+
+              nmcli '-'-complete-args connection add type "" |
+              sort |
+              awk '
+                /^(bond|bridge|team)-slave$/ {
+                    printf "            <listitem><para><literal>%s</literal> (deprecated for ethernet with master)</para></listitem>\n", $0;
+                    next;
+                }
+                /^(wifi|ethernet|olpc-mash)$/ {
+                    next;
+                }
+                {
+                    alias = "";
+                    if ($0 == "802-11-wireless")  { alias = "wifi"; }
+                    if ($0 == "802-3-ethernet")   { alias = "ethernet"; }
+                    if ($0 == "802-11-olpc-mesh") { alias = "olpc-mesh"; }
+                    if (alias != "") {
+                        printf "            <listitem><para><literal>%s</literal> (alias <literal>%s</literal>)</para></listitem>\n", $0, alias;
+                    } else {
+                        printf "            <listitem><para><literal>%s</literal></para></listitem>\n", $0;
+                    }
+                }
+              '
+
+          -->
           <itemizedlist spacing='compact'>
-            <listitem><para><literal>ethernet</literal></para></listitem>
-            <listitem><para><literal>wifi</literal></para></listitem>
-            <listitem><para><literal>wimax</literal></para></listitem>
-            <listitem><para><literal>pppoe</literal></para></listitem>
-            <listitem><para><literal>gsm</literal></para></listitem>
-            <listitem><para><literal>cdma</literal></para></listitem>
-            <listitem><para><literal>infiniband</literal></para></listitem>
+            <listitem><para><literal>6lowpan</literal></para></listitem>
+            <listitem><para><literal>802-11-olpc-mesh</literal> (alias <literal>olpc-mesh</literal>)</para></listitem>
+            <listitem><para><literal>802-11-wireless</literal> (alias <literal>wifi</literal>)</para></listitem>
+            <listitem><para><literal>802-3-ethernet</literal> (alias <literal>ethernet</literal>)</para></listitem>
+            <listitem><para><literal>adsl</literal></para></listitem>
             <listitem><para><literal>bluetooth</literal></para></listitem>
-            <listitem><para><literal>vlan</literal></para></listitem>
             <listitem><para><literal>bond</literal></para></listitem>
-            <listitem><para><literal>bond-slave</literal></para></listitem>
-            <listitem><para><literal>team</literal></para></listitem>
-            <listitem><para><literal>team-slave</literal></para></listitem>
+            <listitem><para><literal>bond-slave</literal> (deprecated for ethernet with master)</para></listitem>
             <listitem><para><literal>bridge</literal></para></listitem>
-            <listitem><para><literal>bridge-slave</literal></para></listitem>
-            <listitem><para><literal>vpn</literal></para></listitem>
-            <listitem><para><literal>olpc-mesh</literal></para></listitem>
-            <listitem><para><literal>adsl</literal></para></listitem>
-            <listitem><para><literal>tun</literal></para></listitem>
+            <listitem><para><literal>bridge-slave</literal> (deprecated for ethernet with master)</para></listitem>
+            <listitem><para><literal>cdma</literal></para></listitem>
+            <listitem><para><literal>dummy</literal></para></listitem>
+            <listitem><para><literal>generic</literal></para></listitem>
+            <listitem><para><literal>gsm</literal></para></listitem>
+            <listitem><para><literal>infiniband</literal></para></listitem>
             <listitem><para><literal>ip-tunnel</literal></para></listitem>
+            <listitem><para><literal>macsec</literal></para></listitem>
             <listitem><para><literal>macvlan</literal></para></listitem>
+            <listitem><para><literal>olpc-mesh</literal></para></listitem>
+            <listitem><para><literal>ovs-bridge</literal></para></listitem>
+            <listitem><para><literal>ovs-dpdk</literal></para></listitem>
+            <listitem><para><literal>ovs-interface</literal></para></listitem>
+            <listitem><para><literal>ovs-patch</literal></para></listitem>
+            <listitem><para><literal>ovs-port</literal></para></listitem>
+            <listitem><para><literal>pppoe</literal></para></listitem>
+            <listitem><para><literal>team</literal></para></listitem>
+            <listitem><para><literal>team-slave</literal> (deprecated for ethernet with master)</para></listitem>
+            <listitem><para><literal>tun</literal></para></listitem>
+            <listitem><para><literal>veth</literal></para></listitem>
+            <listitem><para><literal>vlan</literal></para></listitem>
+            <listitem><para><literal>vpn</literal></para></listitem>
+            <listitem><para><literal>vrf</literal></para></listitem>
             <listitem><para><literal>vxlan</literal></para></listitem>
-            <listitem><para><literal>dummy</literal></para></listitem>
+            <listitem><para><literal>wifi-p2p</literal></para></listitem>
+            <listitem><para><literal>wimax</literal></para></listitem>
+            <listitem><para><literal>wireguard</literal></para></listitem>
+            <listitem><para><literal>wpan</literal></para></listitem>
           </itemizedlist>
 
           <para>The most typical uses are described in the <link linkend='examples' endterm='examples.title' /> section.</para>