summary refs log tree commit diff
path: root/man/NetworkManager.conf.5
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2023-03-09 19:06:14 +0100
committerMichael Biebl <biebl@debian.org>2023-03-09 19:06:14 +0100
commitdfaaf221cfee4ffcc507d793dae051d402646679 (patch)
treec218fc9b1ef10cfa7d2acf0ce401b6d97db2401f /man/NetworkManager.conf.5
parentb22a7b55d0bc5a7999dccaeacdde745f5ace9d66 (diff)
New upstream version 1.42.4 upstream/1.42.4
Diffstat (limited to 'man/NetworkManager.conf.5')
-rw-r--r--man/NetworkManager.conf.510
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