diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-30 10:26:10 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-30 10:26:10 +0100 |
| commit | bd8ab7e82b1ae4e8899b30a59a7b35ba009344ea (patch) | |
| tree | 83691f38efeef4d5dd7a85c0893fa8a54274728f /man/nmcli.xml | |
| parent | c15221a34c0af3a5b2c03dfe80c2a9841acefb03 (diff) | |
| parent | 3cdef184c37fa2c152f8542c6107f8a623735a1c (diff) | |
Merge branch 'master' into stretch-backports
Diffstat (limited to 'man/nmcli.xml')
| -rw-r--r-- | man/nmcli.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/man/nmcli.xml b/man/nmcli.xml index 9b951c19..2a0765d0 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1281,6 +1281,11 @@ that will be activated. It will also consider connections that are not set to auto connect.</para> + <para>If no compatible connection exists, a new profile with default + settings will be created and activated. This differentiates + <command>nmcli connection up ifname "$DEVICE"</command> from + <command>nmcli device connect "$DEVICE"</command></para> + <para>If <option>--wait</option> option is not specified, the default timeout will be 90 seconds.</para> </listitem> @@ -2003,6 +2008,26 @@ It's equivalent to the <literal>+bond.options 'option=value'</literal> syntax.</ </tbody> </tgroup></table> + <table><title>WPAN options</title><tgroup cols="2"> + <thead> + <row><entry>Alias</entry><entry>Property</entry></row> + </thead> + <tbody> + <row><entry align="left">mac</entry><entry align="left"><link linkend="nm-settings.property.wpan.mac">wpan.mac</link></entry></row> + <row><entry align="left">short-addr</entry><entry align="left"><link linkend="nm-settings.property.wpan.short-addr">wpan.short-addr</link></entry></row> + <row><entry align="left">pan-id</entry><entry align="left"><link linkend="nm-settings.property.wpan.pan-id">wpan.pan-id</link></entry></row> + </tbody> + </tgroup></table> + + <table><title>6LoWPAN options</title><tgroup cols="2"> + <thead> + <row><entry>Alias</entry><entry>Property</entry></row> + </thead> + <tbody> + <row><entry align="left">dev</entry><entry align="left"><link linkend="nm-settings.property.6lowpan.dev">6lowpan.parent</link></entry></row> + </tbody> + </tgroup></table> + <table><title>IPv4 options</title><tgroup cols="3"> <thead> <row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row> |