From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54816) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdd90-0002as-4F for guix-patches@gnu.org; Wed, 19 Jun 2019 12:09:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdd8x-0007IO-Td for guix-patches@gnu.org; Wed, 19 Jun 2019 12:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdd8w-0007Fb-1D for guix-patches@gnu.org; Wed, 19 Jun 2019 12:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hdd8v-00010R-Me for guix-patches@gnu.org; Wed, 19 Jun 2019 12:09:01 -0400 Subject: [bug#36294] [PATCH 1/3] Use new upstream nomenclature in documentation of =?UTF-8?Q?NetworkManager=E2=80=99s?= dnsmasq. References: <20190619160557.hkxkioufw2ybpgml@pelzflorian.localdomain> In-Reply-To: <20190619160557.hkxkioufw2ybpgml@pelzflorian.localdomain> Resent-Message-ID: Date: Wed, 19 Jun 2019 18:08:36 +0200 From: Florian Pelz Message-ID: <20190619160836.cxjilufsrmhrfxqw@pelzflorian.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36294@debbugs.gnu.org * 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