nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <ludo@gnu.org>
This commit is contained in:
Florian Pelz 2019-06-19 18:08:36 +02:00 committed by Ludovic Courtès
parent a53a60e0a0
commit 0207ebf0e9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -12736,8 +12736,8 @@ NetworkManager will update @code{resolv.conf} to reflect the nameservers
provided by currently active connections. provided by currently active connections.
@item dnsmasq @item dnsmasq
NetworkManager will run @code{dnsmasq} as a local caching nameserver, NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a
using a "split DNS" configuration if you are connected to a VPN, and @dfn{conditional forwarding} configuration if you are connected to a VPN, and
then update @code{resolv.conf} to point to the local nameserver. then update @code{resolv.conf} to point to the local nameserver.
@item none @item none