diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-09-23 10:30:57 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-09-27 10:59:47 +0200 |
| commit | c1a4c084b014fdf35fc836a93c2bb6ba834c4bb2 (patch) | |
| tree | 71c9a12743027907a023cbf7c36d93b2f75cc51e /man | |
| parent | 146e0d23bc6a0f148c654003a43c9bab0e93f9f6 (diff) | |
| download | NetworkManager-c1a4c084b014fdf35fc836a93c2bb6ba834c4bb2.tar.gz | |
cli: support explicitly selecting team-config as file or json data
nmcli has a heuristic when setting the team-config to accepting both
a filename or the plain json text.
Add support for two schemes "file://" and "json://" to explicitly
determine whether to read from file or from json.
Also, no longer silently ignore an all-whitespace word. That is an
error (unless you have a file named " ").
Also, no longer replace newlines with space. Don't mangle the input
text at all.
Diffstat (limited to 'man')
| -rw-r--r-- | man/nmcli.xml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/man/nmcli.xml b/man/nmcli.xml index 5a936335c0..965c05f955 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1827,21 +1827,25 @@ It's equivalent of using the <literal>+bond.options 'option=value'</literal> syn </tbody> </tgroup></table> - <table><title>Team options</title><tgroup cols="2"> + <table><title>Team options</title><tgroup cols="3"> <thead> - <row><entry>Alias</entry><entry>Property</entry></row> + <row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row> </thead> <tbody> - <row><entry align="left">config</entry><entry align="left"><link linkend="nm-settings.property.team.config">team.config</link></entry></row> + <row><entry align="left">config</entry><entry align="left"><link linkend="nm-settings.property.team.config">team.config</link></entry> + <entry align="left">Either a filename or a team configuration in JSON format. To enforce one or the other, the value can be prefixed with "file://" or "json://".</entry> + </row> </tbody> </tgroup></table> - <table><title>Team port options</title><tgroup cols="2"> + <table><title>Team port options</title><tgroup cols="3"> <thead> - <row><entry>Alias</entry><entry>Property</entry></row> + <row><entry>Alias</entry><entry>Property</entry><entry>Note</entry></row> </thead> <tbody> - <row><entry align="left">config</entry><entry align="left"><link linkend="nm-settings.property.team-port.config">team-port.config</link></entry></row> + <row><entry align="left">config</entry><entry align="left"><link linkend="nm-settings.property.team-port.config">team-port.config</link></entry> + <entry align="left">Either a filename or a team configuration in JSON format. To enforce one or the other, the value can be prefixed with "file://" or "json://".</entry> + </row> </tbody> </tgroup></table> |