From f4aee0c58b503f3244e4b127f4bf9d44869700d1 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 13 Sep 2017 11:41:22 +0200 Subject: [PATCH 1/2] man: nmcli: improve description of type, ip4, ip6 aliases Clarify that the description refers to the alias, not to the property. https://bugzilla.redhat.com/show_bug.cgi?id=1482772 --- man/nmcli.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/man/nmcli.xml b/man/nmcli.xml index 27cc3dd65c..6d4b23a5ea 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. @@ -1980,10 +1980,8 @@ It's equivalent to the +bond.options 'option=value' syntax. ip4 - ipv4.addresses - ipv4.method - This option can be specified multiple times. -It's equivalent to using the +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 +1994,8 @@ It's equivalent to using the +ipv4.addresses syntax and setti ip6 - ipv6.addresses - ipv6.method - This option can be specified multiple times. -It's equivalent to using the +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 From 3a3f4fb9f78ecc414874b83b464d62ecc86e9eb2 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 13 Sep 2017 12:01:00 +0200 Subject: [PATCH 2/2] man: nmcli: add missing aliases --- man/nmcli.xml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/man/nmcli.xml b/man/nmcli.xml index 6d4b23a5ea..2619234e11 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1724,6 +1724,7 @@ property as well. usernamepppoe.username passwordpppoe.password servicepppoe.service + parentpppoe.parent @@ -1880,6 +1881,7 @@ It's equivalent to the +bond.options 'option=value' syntax.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 to the +bond.options 'option=value' syntax. + MACsec options + + AliasProperty + + + devmacsec.parent + modemacsec.mode + encryptmacsec.encrypt + cakmacsec.cak + cknmacsec.ckn + portmacsec.port + +
+ VxLAN options AliasProperty @@ -2006,10 +2022,13 @@ It's equivalent to the +bond.options 'option=value' syntax.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.