summaryrefslogtreecommitdiff
path: root/libnm-core
diff options
context:
space:
mode:
authorJonas DOREL <5148-jdorel@users.noreply.gitlab.freedesktop.org>2019-05-12 17:18:44 +0200
committerThomas Haller <thaller@redhat.com>2019-05-17 12:08:45 +0200
commit13be4492965332fafd7f66c4b68f30cb9b8bb79a (patch)
tree2126a8c204f4292a69f2746ee3b43c452d4cb3f1 /libnm-core
parentac14ebb322acb3249b0dfb1bd14bc95fce4cc273 (diff)
downloadNetworkManager-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 'libnm-core')
-rw-r--r--libnm-core/nm-setting-ip-config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index d0b4ab1e4c..595d8fb23d 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -5468,7 +5468,7 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass)
* so in presence of at least a negative priority, only DNS servers from
* connections with the lowest priority value will be used.
*
- * When using a DNS resolver that supports split-DNS as dns=dnsmasq or
+ * When using a DNS resolver that supports Conditional Forwarding as dns=dnsmasq or
* dns=systemd-resolved, each connection is used to query domains in its
* search list. Queries for domains not present in any search list are
* routed through connections having the '~.' special wildcard domain, which