From e536d40eaea5dcdc0743b0a5e8e17faa46608a50 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 19 Feb 2020 23:31:24 +0100
Subject: New upstream version 1.22.8

---
 docs/libnm/html/NMSettingIPConfig.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'docs/libnm/html/NMSettingIPConfig.html')

diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index c7f19f28..32891026 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -6472,7 +6472,10 @@ providing a static hostname for the computer.  If the
 <div class="refsect2">
 <a name="NMSettingIPConfig--dhcp-timeout"></a><h3>The <code class="literal">“dhcp-timeout”</code> property</h3>
 <pre class="programlisting">  “dhcp-timeout”             <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a></pre>
-<p>A timeout for a DHCP transaction in seconds.</p>
+<p>A timeout for a DHCP transaction in seconds. If zero (the default), a
+globally configured default is used. If still unspecified, a device specific
+timeout is used (usually 45 seconds).</p>
+<p>Set to 2147483647 (MAXINT32) for infinity.</p>
 <p>Flags: Read / Write</p>
 <p>Allowed values: &gt;= 0</p>
 <p>Default value: 0</p>
@@ -6510,10 +6513,11 @@ same connection profile.</p>
 <p>When using dns=default, servers with higher priority will be on top of
 resolv.conf.  To prioritize a given server over another one within the
 same connection, just specify them in the desired order.  When multiple
-devices have configurations with the same priority, the one with an
-active default route will be preferred.  Negative values have the special
+devices have configurations with the same priority, VPNs will be
+considered first, then devices with the best (lowest metric) default
+route and then all other devices.  Negative values have the special
 effect of excluding other configurations with a greater priority value;
-so in presence of at least a negative priority, only DNS servers from
+so in presence of at least one negative priority, only DNS servers from
 connections with the lowest priority value will be used.</p>
 <p>When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or
 dns=systemd-resolved, each connection is used to query domains in its
-- 
cgit 1.3.0-6-gf8a5