diff options
| author | Michael Biebl <biebl@debian.org> | 2023-03-09 19:07:28 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-03-09 19:07:28 +0100 |
| commit | 0829d7c18b0c99511de316ce551ed1930a400ca6 (patch) | |
| tree | 3822530717417783d3d6ba9fb08309ed55982a32 /man/NetworkManager.conf.5 | |
| parent | 22d6ee88e62404d127054bfee20c28da1ee324ce (diff) | |
| parent | dfaaf221cfee4ffcc507d793dae051d402646679 (diff) | |
Update upstream source from tag 'upstream/1.42.4'
Update to upstream version '1.42.4' with Debian dir 0dae05faaf02396619ae5080a3de6ac980b94990
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 7622aa69..5cdb15ff 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 02/23/2023 +.\" Date: 03/09/2023 .\" Manual: Configuration -.\" Source: NetworkManager 1.42.2 +.\" Source: NetworkManager 1.42.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.42\&.2" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.42\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1282,7 +1282,7 @@ If set, controls what body content NetworkManager checks for when requesting the .RE .SH "GLOBAL\-DNS SECTION" .PP -This section specifies global DNS settings that override connection\-specific configuration\&. +This section specifies DNS settings that are applied globally, in addition to connection\-specific ones\&. .PP .PP \fIsearches\fR @@ -1296,7 +1296,7 @@ A list of options to be passed to the hostname resolver\&. .RE .SH "GLOBAL\-DNS\-DOMAIN SECTIONS" .PP -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\&. +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 (for example, a section could be named "global\-dns\-domain\-foobar\&.com")\&. More specific domains have the precedence over less specific ones and 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\&. .PP .PP \fIservers\fR |