From f9bfd1158b8d08d6a5ed3bb7cc1ba7a6455e5201 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 1 Sep 2024 22:38:35 +0200
Subject: New upstream version 1.49.90

---
 man/NetworkManager.conf.xml | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'man/NetworkManager.conf.xml')

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 4c490657..474e7951 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -168,17 +168,16 @@ plugins-=remove-me
       <varlistentry>
         <term><varname>dhcp</varname></term>
         <listitem><para>This key sets up what DHCP client
-        NetworkManager will use. Allowed values are
-        <literal>dhclient</literal>, <literal>dhcpcd</literal>, and
-        <literal>internal</literal>. The <literal>dhclient</literal>
-        and <literal>dhcpcd</literal> options require the indicated
-        clients to be installed. The <literal>internal</literal>
-        option uses a built-in DHCP client which is not currently as
-        featureful as the external clients.</para>
-        <para>If this key is missing, it defaults to <literal>&NM_CONFIG_DEFAULT_MAIN_DHCP;</literal>.
-        If the chosen plugin is not available, clients are looked for
-        in this order: <literal>dhclient</literal>, <literal>dhcpcd</literal>,
-        <literal>internal</literal>.</para></listitem>
+        NetworkManager will use. Allowed values depend on build configuration and
+        typically include <literal>internal</literal> and <literal>dhcpcd</literal>.
+        Support for unmaintained <literal>dhclient</literal> client has been deprecated
+        and disabled by default.</para>
+        <para>The <literal>internal</literal> client is built-in, while other options
+        may require an external DHCP client to be installed.</para>
+        <para>If this key is missing, <literal>&NM_CONFIG_DEFAULT_MAIN_DHCP;</literal>
+        is used with a fallback to other suppored clients in this order:
+        <literal>internal</literal>, <literal>dhcpcd</literal>,
+        <literal>dhclient</literal>.</para></listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>no-auto-default</varname></term>
@@ -492,7 +491,7 @@ no-auto-default=*
             files without preserving their contents.
           </para>
           <para>
-            The path can also be overriden by pointing to a specific
+            The path can also be overridden by pointing to a specific
             existing and writable directory.  On the other hand setting
             this to an empty string or any other value disables the
             profile conversion mechanism.
@@ -1485,6 +1484,12 @@ managed=1
           set to 0 connectivity checking is disabled.  If missing, the
           default is 300 seconds.</para></listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>timeout</varname></term>
+          <listitem><para>Specified in seconds; controls how long
+          to wait for a response before connectivity is marked as
+          limited.  If missing, the default is 20 seconds.</para></listitem>
+        </varlistentry>
         <varlistentry>
           <term><varname>response</varname></term>
           <listitem><para>If set, controls what body content
-- 
cgit 1.3.0-6-gf8a5