summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-06-01 13:53:41 +0200
committerThomas Haller <thaller@redhat.com>2021-06-01 13:54:16 +0200
commit4a2fe09853cdb590675385c9baecc56e2f24f752 (patch)
tree3ce5e7c927a75361b1d5e34c5c03e8dca973e672 /man
parent4eeafaf6548ed4aea67df525d67fbdef3c2e7651 (diff)
downloadNetworkManager-4a2fe09853cdb590675385c9baecc56e2f24f752.tar.gz
man: mark [main].dns=unbound as deprecated
Diffstat (limited to 'man')
-rw-r--r--man/NetworkManager.conf.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 13dcc09399..df85e6413b 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -319,10 +319,12 @@ no-auto-default=*
<filename>/usr/lib/systemd/resolv.conf</filename>.
In that case, <literal>systemd-resolved</literal> is chosen automatically.
</para>
+
<para><literal>default</literal>: NetworkManager will update
<filename>/etc/resolv.conf</filename> to reflect the nameservers
provided by currently active connections. The <literal>rc-manager</literal>
setting (below) controls how this is done.</para>
+
<para><literal>dnsmasq</literal>: NetworkManager will run
dnsmasq as a local caching nameserver, using "Conditional Forwarding"
if you are connected to a VPN, and then update
@@ -336,12 +338,17 @@ no-auto-default=*
after some time. This behavior can be modified passing the
'all-servers' or 'strict-order' options to dnsmasq (see the
manual page for more details).</para>
+
<para><literal>systemd-resolved</literal>: NetworkManager will
push the DNS configuration to systemd-resolved</para>
+
<para><literal>unbound</literal>: NetworkManager will talk
to unbound and dnssec-triggerd, using "Conditional Forwarding"
with DNSSEC support. <filename>/etc/resolv.conf</filename>
- will be managed by dnssec-trigger daemon.</para>
+ will be managed by dnssec-trigger daemon. This option is
+ deprecated. Note that dnssec-trigger ships a NetworkManager dispatcher
+ script so this DNS plugin is not necessary.</para>
+
<para><literal>none</literal>: NetworkManager will not
modify resolv.conf. This implies
<literal>rc-manager</literal>&nbsp;<literal>unmanaged</literal></para>