From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eOkUB+vdcGRAPgAASxT56A (envelope-from ) for ; Fri, 26 May 2023 18:27:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id KJvCBuvdcGTKEwAAauVa8A (envelope-from ) for ; Fri, 26 May 2023 18:27:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EE6F09480 for ; Fri, 26 May 2023 18:27:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2aHR-0005ox-Ff; Fri, 26 May 2023 12:27:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q2aHP-0005oF-Ai for guix-patches@gnu.org; Fri, 26 May 2023 12:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q2aHP-00062N-2c for guix-patches@gnu.org; Fri, 26 May 2023 12:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q2aHO-0003AQ-V0 for guix-patches@gnu.org; Fri, 26 May 2023 12:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49610] [PATCH v4 2/2] doc: guix.texi: Clarify wording in Channels section. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 May 2023 16:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49610 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49610@debbugs.gnu.org Cc: ludo@gnu.org, zimon.toutoune@gmail.com Received: via spool by 49610-submit@debbugs.gnu.org id=B49610.168511838912118 (code B ref 49610); Fri, 26 May 2023 16:27:02 +0000 Received: (at 49610) by debbugs.gnu.org; 26 May 2023 16:26:29 +0000 Received: from localhost ([127.0.0.1]:50676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2aGr-00039O-7P for submit@debbugs.gnu.org; Fri, 26 May 2023 12:26:29 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:34986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q2aGn-00038v-Ru for 49610@debbugs.gnu.org; Fri, 26 May 2023 12:26:26 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4QSVfZ22SFz9sdC; Fri, 26 May 2023 18:26:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1685118374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LUrsRyESr6tffv4DXqW4KsWj3SpGZ7eYDT4jcccOZHs=; b=Bjxe3h3xP/tQPb2rLcUKgKE6EN5srM3yU3Kqw1ImdYr8GfXMdbsGKoR0cz8rRq1B4iImwl o92zB8x2yR0jg3MW30qb7ug0CGWHHv5BLnO28SN34tBt2e93HAJoyMtvoJAUQ1Ymx+xqcz 5JEJNfCJT18raxI3k4cZRymhxydbOw8AP3ar7Zm2L5NqpnOCwPByo3NAB4upS2mIeNDRQM rgOQ+x/O+f3EtQ2I+JNikxzoHqMMcA5Xp2qCiYFuaU28nvbB+4zScOW0eNKVtiidH3nTAz LM2I2AQdGl/BVJCXjO4u39nDzIC3P9cm48NegVbeMrzu0fMQ/rWn6z91Vfju5g== Date: Fri, 26 May 2023 16:26:06 +0000 Message-Id: <20230526162606.6747-2-antero@mailbox.org> In-Reply-To: <20230526162606.6747-1-antero@mailbox.org> References: <20230526162606.6747-1-antero@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-ID: 415eb2f7e095857f755 X-MBO-RS-META: 65srwmh73y3cj9dywsy858cgg5k3fus4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches From: Antero Mejr via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1685118443; a=rsa-sha256; cv=none; b=qpGVsXkUSuqBmjU2GCLj6rF5SYLYN1LgJiQ5CTWWgv9J5E0eC1fqmiPGDw7oRhXiBv/0il OPCG00JInshtM4q7i6Moq9A8+nCxyPv8/p50MBXjeYujXLhmofnXge1VooWJ/fG01j/gPu uiMAJTEV+zmpET+MSftXSSSoewt+TqBPZ+vrm+CE/hoEwYloxbxdQDJ/yvZrfGmhNn6ujN NOTsE3XPu/+ChTRJc/ERXGhyiyhoIr2zda60ZLuNotwyTflMHmdG5eTucjOMtwLDECiNjZ mB29zm1bwyd5/s2dcz8RYKp5V/zrVKrjrKR2ui/824c+i41V1JGTFIsWivtBwQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=Bjxe3h3x; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1685118443; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LUrsRyESr6tffv4DXqW4KsWj3SpGZ7eYDT4jcccOZHs=; b=YqZO4vAat38RoLn3BZY1P7YjXbq2jUPWKCAkHv4ZpsO41H9j6km4tqECh0IxesKLcTAB1n 9GHtEgT0Ogzglru+W2budRQeMV218I1jvzG58E1/yqdNdG2zPesOHMLfaOeP+1GRS4imFp u3XTDTbWvdnNu8c1Sx5DpAR4HzF6WXoY6R3w0iSFgVKEr9LuFQj3WxtuLSXwjzXT+iNqJ8 Gj4K+Gk8vlTg1gZIqRqGfA9GHYE1KS/UqD4XZYtm40tJpS0fmDKsIdqSKIHIwTmdI8l+6Q Q/eSBfeSrrxSNmJzxzSoZ3HPopiS3X5AR/+q4tUoxBLoIBrpL1+wK85idejh2g== X-Migadu-Spam-Score: -1.86 X-Spam-Score: -1.86 X-Migadu-Queue-Id: EE6F09480 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mailbox.org header.s=mail20150812 header.b=Bjxe3h3x; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: 1qdHsHsiWckZ * doc/guix.texi (Channels): Specify that '/etc/guix/channels.scm' contains channels configuration. --- doc/guix.texi | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9ebdf70d81..643a36358d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5396,14 +5396,15 @@ $ wget -O - \ @cindex configuration of @command{guix pull} Guix and its package collection are updated by running @command{guix pull} (@pxref{Invoking guix pull}). By default @command{guix pull} downloads and -deploys Guix itself from the official GNU@tie{}Guix repository. This can be -customized by defining @dfn{channels} in the -@file{~/.config/guix/channels.scm} file. A channel specifies a URL and branch -of a Git repository to be deployed, and @command{guix pull} can be instructed -to pull from one or more channels. In other words, channels can be used -to @emph{customize} and to @emph{extend} Guix, as we will see below. -Guix is able to take into account security concerns and deal with authenticated -updates. +deploys Guix itself from the official GNU@tie{}Guix repository. A +channel specifies a URL and branch customized by defining @dfn{channels} +in the @file{~/.config/guix/channels.scm} file, and/or the +@file{/etc/guix/channels.scm} file and/or the built-in default specified +in the @code{%default-channels} variable. Guix honors the channels file +in that previous order (@xref{Invoking guix pull}). In other words, +channels can be used to @emph{customize} and to @emph{extend} Guix, as +we will see below. Guix is able to take into account security concerns +and deal with authenticated updates. @menu * Specifying Additional Channels:: Extending the package collection. -- 2.39.2