diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2017-09-13 11:41:22 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-09-13 16:38:34 +0200 |
commit | f4aee0c58b503f3244e4b127f4bf9d44869700d1 (patch) | |
tree | fe2a767764f1ed4e19acef3c9684eb3b541ce96d | |
parent | 121321542e2e0b36ef5dc3b1094b3225b2013ce8 (diff) | |
download | NetworkManager-f4aee0c58b503f3244e4b127f4bf9d44869700d1.tar.gz |
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
-rw-r--r-- | man/nmcli.xml | 14 |
1 files 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 @@ <row> <entry align="left">type</entry> <entry align="left"><link linkend="nm-settings.property.connection.type">connection.type</link></entry> - <entry align="left" valign="top">This option also accepts values of <option>bond-slave</option>, + <entry align="left" valign="top">This alias also accepts values of <option>bond-slave</option>, <option>team-slave</option> and <option>bridge-slave</option>. They create <option>ethernet</option> connection profiles. Their use is discouraged in favor of using a specific type with <option>master</option> option.</entry> @@ -1980,10 +1980,8 @@ It's equivalent to the <literal>+bond.options 'option=value'</literal> syntax.</ <tbody> <row> <entry align="left">ip4</entry> - <entry align="left"><link linkend="nm-settings.property.ipv4.addresses">ipv4.addresses</link> - <link linkend="nm-settings.property.ipv4.method">ipv4.method</link></entry> - <entry align="left" valign="top">This option can be specified multiple times. -It's equivalent to using the <literal>+ipv4.addresses</literal> syntax and setting <literal>ipv4.method</literal> to <literal>manual</literal>.</entry> + <entry align="left"><link linkend="nm-settings.property.ipv4.addresses">ipv4.addresses</link> <link linkend="nm-settings.property.ipv4.method">ipv4.method</link></entry> + <entry align="left" valign="top">The alias is equivalent to the <literal>+ipv4.addresses</literal> syntax and also sets <literal>ipv4.method</literal> to <literal>manual</literal>. It can be specified multiple times.</entry> </row> <row><entry align="left">gw4</entry><entry align="left"><link linkend="nm-settings.property.ipv4.gateway">ipv4.gateway</link></entry><entry align="left" /></row> </tbody> @@ -1996,10 +1994,8 @@ It's equivalent to using the <literal>+ipv4.addresses</literal> syntax and setti <tbody> <row> <entry align="left">ip6</entry> - <entry align="left"><link linkend="nm-settings.property.ipv6.addresses">ipv6.addresses</link> - <link linkend="nm-settings.property.ipv6.method">ipv6.method</link></entry> - <entry align="left" valign="top">This option can be specified multiple times. -It's equivalent to using the <literal>+ipv6.addresses</literal> syntax and setting <literal>ipv6.method</literal> to <literal>manual</literal>.</entry> + <entry align="left"><link linkend="nm-settings.property.ipv6.addresses">ipv6.addresses</link> <link linkend="nm-settings.property.ipv6.method">ipv6.method</link></entry> + <entry align="left" valign="top">The alias is equivalent to the <literal>+ipv6.addresses</literal> syntax and also sets <literal>ipv6.method</literal> to <literal>manual</literal>. It can be specified multiple times.</entry> </row> <row><entry align="left">gw6</entry><entry align="left"><link linkend="nm-settings.property.ipv6.gateway">ipv6.gateway</link></entry><entry align="left" /></row> </tbody> |