diff mbox series

[bug#36294,1/3] Use new upstream nomenclature in documentation of NetworkManager’s dnsmasq.

Message ID 20190619160836.cxjilufsrmhrfxqw@pelzflorian.localdomain
State Accepted
Headers show
Series Fix and document NetworkManager + dnsmasq | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

pelzflorian (Florian Pelz) June 19, 2019, 4:08 p.m. UTC 
* doc/guix.texi (Networking Services): Replace term 'split DNS' by
'conditional forwarding'.
---
 doc/guix.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 65c3b8a7f1..694b802e1e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12735,8 +12735,8 @@  NetworkManager will update @code{resolv.conf} to reflect the nameservers
 provided by currently active connections.
 
 @item dnsmasq
-NetworkManager will run @code{dnsmasq} as a local caching nameserver,
-using a "split DNS" configuration if you are connected to a VPN, and
+NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a
+@dfn{conditional forwarding} configuration if you are connected to a VPN, and
 then update @code{resolv.conf} to point to the local nameserver.
 
 @item none