New upstream version 1.42.4 upstream/1.42.4

5 files changed, 16 insertions, 11 deletions

diff --git a/docs/api/html/NetworkManager-wait-online.service.html b/docs/api/html/NetworkManager-wait-online.service.html
index c951c7b6..71b80e38 100644
--- a/docs/api/html/NetworkManager-wait-online.service.html
+++ b/docs/api/html/NetworkManager-wait-online.service.html
@@ -115,7 +115,7 @@
         </p></li>
 <li class="listitem"><p>
          With Ethernet devices, NetworkManager waits for the carrier until the value in
-	 <code class="literal">[device*].carrier-timeout</code> is reached. This is because some
+	 <code class="literal">[device*].carrier-wait-timeout</code> is reached. This is because some
 	 devices take a long time to detect the carrier. Consequently, booting with cable
 	 unplugged, unnecessarily delays <code class="literal">NetworkManager-wait-online.service</code>.
        </p></li>
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>
diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index 24562d5c..b8815102 100644
--- a/docs/api/html/index.html
+++ b/docs/api/html/index.html
@@ -16,7 +16,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for NetworkManager 1.42.2
+      for NetworkManager 1.42.4
 
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="https://networkmanager.dev/docs/api/latest/" target="_top">https://networkmanager.dev/docs/api/latest/</a>.
diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
index 1a4f4495..69b51835 100644
--- a/docs/api/html/nm-settings-nmcli.html
+++ b/docs/api/html/nm-settings-nmcli.html
@@ -2315,7 +2315,7 @@
 <li class="listitem"><p><code class="literal">"table"</code> - an unsigned 32 bit integer. The default depends on ipv4.route-table.</p></li>
 <li class="listitem"><p><code class="literal">"tos"</code> - an unsigned 8 bit integer. IPv4 only.</p></li>
 <li class="listitem"><p><code class="literal">"type"</code> - one of <code class="literal">unicast</code>, <code class="literal">local</code>, <code class="literal">blackhole</code>,
-       <code class="literal">unavailable</code>, <code class="literal">prohibit</code>, <code class="literal">throw</code>.
+       <code class="literal">unreachable</code>, <code class="literal">prohibit</code>, <code class="literal">throw</code>.
        The default is <code class="literal">unicast</code>.</p></li>
 <li class="listitem">
 <p><code class="literal">"weight"</code> - an unsigned 32 bit integer
@@ -2661,7 +2661,7 @@ Example: <code class="literal">priority 5 from 192.167.4.0/24 table 45</code>
 <li class="listitem"><p><code class="literal">"src"</code> - an IPv6 address.</p></li>
 <li class="listitem"><p><code class="literal">"table"</code> - an unsigned 32 bit integer. The default depends on ipv6.route-table.</p></li>
 <li class="listitem"><p><code class="literal">"type"</code> - one of <code class="literal">unicast</code>, <code class="literal">local</code>, <code class="literal">blackhole</code>,
-       <code class="literal">unavailable</code>, <code class="literal">prohibit</code>, <code class="literal">throw</code>.
+       <code class="literal">unreachable</code>, <code class="literal">prohibit</code>, <code class="literal">throw</code>.
        The default is <code class="literal">unicast</code>.</p></li>
 <li class="listitem"><p><code class="literal">"window"</code> - an unsigned 32 bit integer.</p></li>
 </ul></div>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 2259c77c..6f7c8cda 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.42.2
+1.42.4