summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-07-27 20:56:41 +0200
committerThomas Haller <thaller@redhat.com>2023-07-27 21:10:11 +0200
commitbba0d553b1954bca9bfa491a8133c452d3cad14f (patch)
tree9f1e333704f542ff7d1e14b9ee85544552452119
parent401ceb85bc03fc547af99a217ed7b09c74520e04 (diff)
man: clarify relation of "dns.systemd-resolved" setting with "dns"
-rw-r--r--man/NetworkManager.conf.xml15
1 files changed, 7 insertions, 8 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 3e31ecb759..3e43c37f85 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -421,16 +421,15 @@ no-auto-default=*
<varlistentry>
<term><varname>systemd-resolved</varname></term>
- <listitem><para>Send the connection DNS configuration to
+ <listitem><para>Additionally, send the connection DNS configuration to
<literal>systemd-resolved</literal>. Defaults to "<literal>true</literal>".
</para>
- <para>Note that this setting is complementary to the
- <varname>dns</varname> setting. You can keep this enabled while using
- <varname>dns</varname> set to another DNS plugin alongside
- <literal>systemd-resolved</literal>, or <varname>dns</varname> set to
- <literal>systemd-resolved</literal> to configure the system resolver to use
- <literal>systemd-resolved</literal>.</para>
- <para>If systemd-resolved is enabled, the connectivity check resolves the
+ <para>Note that this setting has no effect if the main <varname>dns</varname>
+ plugin is already <literal>systemd-resolved</literal>. It is complementary to the
+ <varname>dns</varname> setting to configure systemd-resolved alongside the
+ main plugin.</para>
+ <para>If systemd-resolved is enabled, either via this setting as the main
+ DNS plugin, the connectivity check resolves the
hostname per-device.</para>
</listitem>
</varlistentry>