Update upstream source from tag 'upstream/1.42.4'

Update to upstream version '1.42.4'
with Debian dir 0dae05faaf02396619ae5080a3de6ac980b94990

1 files changed, 11 insertions, 6 deletions

diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index 0523fb54..30d5660a 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -1432,8 +1432,8 @@ managed=1
 <div class="refsect1">
 <a name="id-1.2.3.14"></a><h2>
 <code class="literal">global-dns</code> section</h2>
-<p>This section specifies global DNS settings that override
-    connection-specific configuration.</p>
+<p>This section specifies DNS settings that are applied
+    globally, in addition to connection-specific ones.</p>
 <p>
       </p>
 <div class="variablelist"><table border="0" class="variablelist">
@@ -1465,10 +1465,15 @@ managed=1
 <p>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.
+    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.
     </p>
 <p>
       </p>