diff options
| author | Florian Pelz <pelzflorian@pelzflorian.de> | 2019-06-19 18:08:36 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-24 23:24:58 +0200 |
| commit | 0207ebf0e95c416924929d33f1a5044fd3f45121 (patch) | |
| tree | 0cafafd3a2781d44cea1bbfeca482916c6a46648 | |
| parent | a53a60e0a039c687a8a958f2c0f3e7eb8e09ac92 (diff) | |
| download | patches-0207ebf0e95c416924929d33f1a5044fd3f45121.tar patches-0207ebf0e95c416924929d33f1a5044fd3f45121.tar.gz | |
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>
| -rw-r--r-- | doc/guix.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 1d807832c3..ce82b48ad2 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 |