From patchwork Wed Jun 19 16:08:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 14352 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CC3B917118; Wed, 19 Jun 2019 17:29:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 726821710E for ; Wed, 19 Jun 2019 17:29:30 +0100 (BST) Received: from localhost ([::1]:40286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hddSh-0007yP-7p for patchwork@mira.cbaines.net; Wed, 19 Jun 2019 12:29:27 -0400 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 X-Loop: help-debbugs@gnu.org 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-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Jun 2019 16:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36294@debbugs.gnu.org Received: via spool by 36294-submit@debbugs.gnu.org id=B36294.15609605203837 (code B ref 36294); Wed, 19 Jun 2019 16:09:01 +0000 Received: (at 36294) by debbugs.gnu.org; 19 Jun 2019 16:08:40 +0000 Received: from localhost ([127.0.0.1]:47333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdd8a-0000zm-1x for submit@debbugs.gnu.org; Wed, 19 Jun 2019 12:08:40 -0400 Received: from pelzflorian.de ([5.45.111.108]:41654 helo=mail.pelzflorian.de) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hdd8X-0000zd-LM for 36294@debbugs.gnu.org; Wed, 19 Jun 2019 12:08:38 -0400 Received: from pelzflorian.localdomain (unknown [5.45.111.108]) by mail.pelzflorian.de (Postfix) with ESMTPSA id 627B236007F for <36294@debbugs.gnu.org>; Wed, 19 Jun 2019 18:08:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pelzflorian.de; s=mail; t=1560960516; bh=MUTj3o+/rl9LcjV/iaCbxT7aVJdudDes4zDasGXjw4E=; h=Date:From:To:Subject; b=IqwT0Vr7y5h9TY3bZB2Vwts4gYqEH43IYYPpt1gePHvgZQl1Lt3xLX4R2mYivrHmP HTVqQQSQTCceTN/lta61lmTMHMZY0NaDKTNJeaaZ3Tn6/6qr0ddpwrxQoNt4LeWq2u BNOkE0aJGZbwaiBGpEnRb7Fh1mK2BElZBS1/b8RI= Date: Wed, 19 Jun 2019 18:08:36 +0200 From: Florian Pelz Message-ID: <20190619160836.cxjilufsrmhrfxqw@pelzflorian.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20180716 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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