summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-06-29 15:59:44 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-10-01 09:05:08 +0200
commitdd6fbe7bfa78770c965538f045c3814a146ccdf6 (patch)
treeec384a5da90700da4f33a5f593b16f22f24bbc8d
parentae9e82354a9c1b2247b7d071ed62acd9e83ae27b (diff)
downloadNetworkManager-dd6fbe7bfa78770c965538f045c3814a146ccdf6.tar.gz
man: document global DNS configuration sections
-rw-r--r--man/NetworkManager.conf.xml.in66
1 files changed, 66 insertions, 0 deletions
diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index 3dcf97e082..a8b7f3a38d 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -637,6 +637,72 @@ ipv6.ip6-privacy=1
</refsect1>
<refsect1>
+ <title><literal>global-dns</literal> section</title>
+ <para>This section specifies global DNS settings that override
+ connection-specific configuration.</para>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><varname>enable</varname></term>
+ <listitem>
+ <para>
+ Whether the global DNS configuration should be used.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>searches</varname></term>
+ <listitem>
+ <para>
+ A list of search domains to be used during hostname lookup.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>options</varname></term>
+ <listitem>
+ <para>
+ A list of of options to be passed to the hostname resolver.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1>
+ <title><literal>global-dns-domain</literal> sections</title>
+ <para>Sections with a name starting with the "global-dns-domain-"
+ prefix allow to define global DNS configuration for specific
+ domains. The part of section name after "global-dns-domain-"
+ specifies the domain name a section applies to. More specific
+ domains have the precedence over less specific ones and the
+ default domain is represented by the wildcard "*". A default
+ domain section is mandatory.
+ </para>
+ <para>
+ <variablelist>
+ <varlistentry>
+ <term><varname>servers</varname></term>
+ <listitem>
+ <para>
+ A list of addresses of DNS servers to be used for the given domain.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>options</varname></term>
+ <listitem>
+ <para>
+ A list of domain-specific DNS options. Not used at the moment.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </para>
+ </refsect1>
+
+ <refsect1>
<title>Plugins</title>
<variablelist>