diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 11c9028238..7d68fb343c 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -275,10 +275,12 @@ no-auto-default=* dns Set the DNS (resolv.conf) processing mode. - default: The default if the key is - not specified. NetworkManager will update + default: NetworkManager will update resolv.conf to reflect the nameservers - provided by currently active connections. + provided by currently active connections. This is the default + if the key is not specified, unless the system is configured + to use systemd-resolved; in this case the default is + systemd-resolved dnsmasq: NetworkManager will run dnsmasq as a local caching nameserver, using a "split DNS" configuration if you are connected to a VPN, and then update @@ -288,6 +290,8 @@ no-auto-default=* to unbound and dnssec-triggerd, providing a "split DNS" configuration with DNSSEC support. The /etc/resolv.conf will be managed by dnssec-trigger daemon. + systemd-resolved: NetworkManager will + push the DNS configuration to systemd-resolved none: NetworkManager will not modify resolv.conf. This implies rc-manager unmanaged