From 90e8691111889a7b5f3c812f5a41f15a8a058913 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Nov 2017 00:14:39 +0100 Subject: New upstream version 1.9.90 --- man/nmcli.xml | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-) (limited to 'man/nmcli.xml') diff --git a/man/nmcli.xml b/man/nmcli.xml index 8ee7914b..2619234e 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1684,7 +1684,7 @@ type connection.type - This option also accepts values of , + This alias also accepts values of , and . They create connection profiles. Their use is discouraged in favor of using a specific type with option. @@ -1724,6 +1724,7 @@ property as well. usernamepppoe.username passwordpppoe.password servicepppoe.service + parentpppoe.parent @@ -1804,10 +1805,10 @@ property as well. bt-type bluetooth.type - Apart from the usual dun and -panu options, the values of dun-gsm -and dun-cdma can be used for compatibility with older -versions. They are equivalent to using dun and setting + Apart from the usual panu, +nap and dun options, the values of +dun-gsm and dun-cdma can be used for compatibility +with older versions. They are equivalent to using dun and setting appropriate gsm.* or cdma.* properties. @@ -1835,7 +1836,7 @@ appropriate gsm.* or cdma.* properties.mode bond.options Setting each of these adds the option to bond.options property. -It's equivalent of using the +bond.options 'option=value' syntax. +It's equivalent to the +bond.options 'option=value' syntax. primary miimon @@ -1880,6 +1881,7 @@ It's equivalent of using the +bond.options 'option=value' syn hello-timebridge.hello-time max-agebridge.max-age ageing-timebridge.ageing-time + group-forward-maskbridge.group-forward-mask multicast-snoopingbridge.multicast-snooping macbridge.mac-address prioritybridge-port.priority @@ -1932,6 +1934,20 @@ It's equivalent of using the +bond.options 'option=value' syn + MACsec options + + AliasProperty + + + devmacsec.parent + modemacsec.mode + encryptmacsec.encrypt + cakmacsec.cak + cknmacsec.ckn + portmacsec.port + +
+ VxLAN options AliasProperty @@ -1980,10 +1996,8 @@ It's equivalent of using the +bond.options 'option=value' syn ip4 - ipv4.addresses - ipv4.method - This option can be specified multiple times. -It's equivalent of using +ipv4.addresses syntax and setting ipv4.method to manual. + ipv4.addresses ipv4.method + The alias is equivalent to the +ipv4.addresses syntax and also sets ipv4.method to manual. It can be specified multiple times. gw4ipv4.gateway @@ -1996,10 +2010,8 @@ It's equivalent of using +ipv4.addresses syntax and setting < ip6 - ipv6.addresses - ipv6.method - This option can be specified multiple times. -It's equivalent of using +ipv6.addresses syntax and setting ipv6.method to manual. + ipv6.addresses ipv6.method + The alias is equivalent to the +ipv6.addresses syntax and also sets ipv6.method to manual. It can be specified multiple times. gw6ipv6.gateway @@ -2010,10 +2022,13 @@ It's equivalent of using +ipv6.addresses syntax and setting < AliasPropertyNote + methodproxy.method + browser-onlyproxy.browser-only + pac-urlproxy.pac-url - + pac-script proxy.pac-script - Read the java script pac-script from file or pass it directly on the command line. Prefix the value with "file://" or "js://" to force one or the other. + Read the JavaScript PAC (proxy auto-config) script from file or pass it directly on the command line. Prefix the value with "file://" or "js://" to force one or the other.
-- cgit 1.3.0-6-gf8a5