unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Florian Pelz <pelzflorian@pelzflorian.de>
To: 36294@debbugs.gnu.org
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	[thread overview]
Message-ID: <20190619160836.cxjilufsrmhrfxqw@pelzflorian.localdomain> (raw)
In-Reply-To: <20190619160557.hkxkioufw2ybpgml@pelzflorian.localdomain>

* 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	other threads:[~2019-06-19 16:09 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-19 16:05 [bug#36294] [PATCH 0/3] Fix and document NetworkManager + dnsmasq pelzflorian (Florian Pelz)
2019-06-19 16:08 ` Florian Pelz [this message]
2019-06-19 16:09 ` [bug#36294] [PATCH 2/3] Have NetworkManager create '/var/lib/misc' directory required by dnsmasq Florian Pelz
2019-06-19 16:09 ` [bug#36294] [PATCH 3/3] Document use cases for NetworkManager with dnsmasq Florian Pelz
2019-06-24 21:26   ` bug#36294: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190619160836.cxjilufsrmhrfxqw@pelzflorian.localdomain \
    --to=pelzflorian@pelzflorian.de \
    --cc=36294@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).