summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-12-09 13:28:11 +0100
committerThomas Haller <thaller@redhat.com>2015-12-09 14:08:43 +0100
commit783b3642d08eab71146aaee267d41d71e611b7bf (patch)
tree3ea6f3089c5002b7633776cfcd56a3eff6271250 /man
parent4a9ae9d14ed98ba47a2c7fbd6f4cb63ef405ab53 (diff)
downloadNetworkManager-783b3642d08eab71146aaee267d41d71e611b7bf.tar.gz
man: correct manual page with respect to whitespace in device-spec
Diffstat (limited to 'man')
-rw-r--r--man/NetworkManager.conf.xml.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index b7e228aa3e..ce2a7ab278 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -949,11 +949,15 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
<varlistentry>
<term>SPEC[,;]SPEC</term>
<listitem><para>Multiple specs can be concatenated with comman or semicolon. The order does not matter as
- matches are either positive (inclusive) or negative, with negative matches having higher priority.</para>
+ matches are either inclusive or negative (<literal>except:</literal>), with negative matches having higher
+ priority.
+ </para>
<para>Backslash is supported to escape the separators ';' and ',', and to express special
characters such as newline ('\n'), tabulator ('\t'), whitespace ('\s') and backslash ('\\'). The globbing of
- interface names cannot be escaped. Whitespace is taken literally so usually the specs will be concatenated
- without spaces.</para></listitem>
+ interface names cannot be escaped. Whitespace is not a separator but will be trimmed between
+ two specs (unless escaped as '\s').
+ </para>
+ </listitem>
</varlistentry>
</variablelist>
</para>