guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#36294] [PATCH 1/3] Use new upstream nomenclature in documentation o


From: Florian Pelz
Subject: [bug#36294] [PATCH 1/3] Use new upstream nomenclature in documentation of NetworkManager’s dnsmasq.
Date: Wed, 19 Jun 2019 18:08:36 +0200
User-agent: NeoMutt/20180716

* doc/guix.texi (Networking Services): Replace term 'split DNS' by
'conditional forwarding'.
---
 doc/guix.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
-- 
2.22.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]