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=* /usr/lib/systemd/resolv.conf. In that case, systemd-resolved is chosen automatically. + default: NetworkManager will update /etc/resolv.conf to reflect the nameservers provided by currently active connections. The rc-manager setting (below) controls how this is done. + dnsmasq: 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). + systemd-resolved: NetworkManager will push the DNS configuration to systemd-resolved + unbound: NetworkManager will talk to unbound and dnssec-triggerd, using "Conditional Forwarding" with DNSSEC support. /etc/resolv.conf - will be managed by dnssec-trigger daemon. + 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. + none: NetworkManager will not modify resolv.conf. This implies rc-manager unmanaged