diff options
| author | Jonas DOREL <5148-jdorel@users.noreply.gitlab.freedesktop.org> | 2019-05-12 17:18:44 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-17 12:08:45 +0200 |
| commit | 13be4492965332fafd7f66c4b68f30cb9b8bb79a (patch) | |
| tree | 2126a8c204f4292a69f2746ee3b43c452d4cb3f1 /man/NetworkManager.conf.xml | |
| parent | ac14ebb322acb3249b0dfb1bd14bc95fce4cc273 (diff) | |
| download | NetworkManager-13be4492965332fafd7f66c4b68f30cb9b8bb79a.tar.gz | |
doc: replace "Split DNS" with "Conditional Forwarding"
Split DNS usually refers to "Split Horizon DNS" whereas "Conditional
Forwarding" is specifically for what the documentation describes.
[thaller@redhat.com: rewrote commit message]
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/143
Diffstat (limited to 'man/NetworkManager.conf.xml')
| -rw-r--r-- | man/NetworkManager.conf.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 289342473a..fc02af4fa5 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -328,8 +328,8 @@ no-auto-default=* <filename>/etc/resolv.conf</filename> to reflect the nameservers provided by currently active connections.</para> <para><literal>dnsmasq</literal>: NetworkManager will run - dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update + dnsmasq as a local caching nameserver, using "Conditional Forwarding" + if you are connected to a VPN, and then update <filename>resolv.conf</filename> to point to the local nameserver. It is possible to pass custom options to the dnsmasq instance by adding them to files in the @@ -343,8 +343,8 @@ no-auto-default=* <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, providing a "split DNS" - configuration with DNSSEC support. <filename>/etc/resolv.conf</filename> + to unbound and dnssec-triggerd, using "Conditional Forwarding" + with DNSSEC support. <filename>/etc/resolv.conf</filename> will be managed by dnssec-trigger daemon.</para> <para><literal>none</literal>: NetworkManager will not modify resolv.conf. This implies |