04/06: doc: Use new upstream nomenclature for NetworkManager’s dnsmasq.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 0207ebf0e95c416924929d33f1a5044fd3f45121
Author: Florian Pelz <address@hidden>
Date:   Wed Jun 19 18:08:36 2019 +0200

    doc: Use new upstream nomenclature for NetworkManager’s dnsmasq.
    
    * doc/guix.texi (Networking Services): Replace term 'split DNS' by
    'conditional forwarding'.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 doc/guix.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 1d80783..ce82b48 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12736,8 +12736,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