summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-10-05 14:00:00 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-10-05 14:00:00 +0200
commit4fd0ad95003c05f2c962ee55d523d346cfc9a29a (patch)
treec7b0c8188db2587e43bfb5176b3697189686c242
parent94103a2517ef0f40953301f7e55f498df8ad2587 (diff)
downloadNetworkManager-th/config-enable-bgo755935.tar.gz
fixup! config: drop global-dns.enable option in favor of .config.enableth/config-enable-bgo755935
-rw-r--r--man/NetworkManager.conf.xml.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index 6bc395bfb0..b7d54200e6 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -762,7 +762,7 @@ enable=env:TAG1
In other words, a except predicate always wins over other predicates.
<programlisting>
# enable the configuration either when the environment variable
-# is present of the version is at least 1.2.0.
+# is present or the version is at least 1.2.0.
[.config]
enable=env:TAG2,nm-version-min:1.2.0