From d0330fb9094351ab9d28eef159be02e0adb9f269 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 15 Jan 2025 16:26:24 +0100
Subject: [PATCH] man: remove sentence about order of DHCP clients

The list describing the order of DHCP clients is confusing because it
doesn't take into account what clients are disabled at build
time. Instead, just show the available clients in the preferred order.
---
 man/NetworkManager.conf.xml | 4 +---
 meson.build                 | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 5c366423a8..8710628783 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -174,9 +174,7 @@ plugins-=remove-me
         <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>
+        is used with a fallback to other supported clients.</para></listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>no-auto-default</varname></term>
diff --git a/meson.build b/meson.build
index f410687810..43fd88c818 100644
--- a/meson.build
+++ b/meson.build
@@ -633,7 +633,7 @@ config_dhcp_default = get_option('config_dhcp_default')
 config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default)
 config_dhcp_clients_enabled = [ 'internal' ]
 dhcp_summary = ''
-foreach client : [ 'dhclient', 'dhcpcd' ]
+foreach client : [ 'dhcpcd', 'dhclient' ]
   client_path = get_option(client)
   client_enable = (client_path != 'no')
   if client_enable