colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

man: update documentation about global DNS configuration

Browse Source 
Now the settings in the [global-dns] section are used *in addition* to
connection-specific ones. Only the global domains sections, when
valid, override connection settings. Update the man page to clarify
that.

Fixes: 1f0d1d78d2 ('dns-manager: always apply options from [global-dns]')
This commit is contained in:
Beniamino Galvani
2023-03-02 22:15:46 +01:00
parent 5c0a927e0f
commit f57a848da5
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
man/NetworkManager.conf.xml
View File

@@ -1453,8 +1453,8 @@ managed=1
<refsect1> <refsect1>
<title><literal>global-dns</literal> section</title> <title><literal>global-dns</literal> section</title>
<para>This section specifies global DNS settings that override <para>This section specifies DNS settings that are applied
connection-specific configuration.</para> globally, in addition to connection-specific ones.</para>
<para> <para>
<variablelist> <variablelist>
<varlistentry> <varlistentry>
@@ -1482,10 +1482,15 @@ managed=1
<para>Sections with a name starting with the "global-dns-domain-" <para>Sections with a name starting with the "global-dns-domain-"
prefix allow to define global DNS configuration for specific prefix allow to define global DNS configuration for specific
domains. The part of section name after "global-dns-domain-" domains. The part of section name after "global-dns-domain-"
specifies the domain name a section applies to. More specific specifies the domain name a section applies to (for example, a
domains have the precedence over less specific ones and the section could be named "global-dns-domain-foobar.com"). More
default domain is represented by the wildcard "*". A default specific domains have the precedence over less specific ones and
domain section is mandatory. the default domain is represented by the wildcard "*".
To be valid, global DNS domains must include a section for the
default domain "*". When the global DNS domains are valid, the
name servers and domains defined globally override the ones from
active connections.
</para> </para>
<para> <para>
<variablelist> <variablelist>