From patchwork Thu Sep 21 18:53:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nikolaos Chatzikonstantinou X-Patchwork-Id: 54141 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 9AF3327BBE9; Thu, 21 Sep 2023 19:55:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A585727BBE2 for ; Thu, 21 Sep 2023 19:55:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjOpC-0002EI-I1; Thu, 21 Sep 2023 14:54:54 -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 1qjOpA-0002DJ-Ob for guix-patches@gnu.org; Thu, 21 Sep 2023 14:54:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjOpA-0006QK-Fc for guix-patches@gnu.org; Thu, 21 Sep 2023 14:54:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjOpK-0005sO-I7 for guix-patches@gnu.org; Thu, 21 Sep 2023 14:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66142] [PATCH] doc: Fix channel name typo. Resent-From: Nikolaos Chatzikonstantinou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Sep 2023 18:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66142 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66142@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169532244722515 (code B ref -1); Thu, 21 Sep 2023 18:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Sep 2023 18:54:07 +0000 Received: from localhost ([127.0.0.1]:34820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjOoQ-0005r4-8q for submit@debbugs.gnu.org; Thu, 21 Sep 2023 14:54:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:52560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjOoL-0005qW-Uj for submit@debbugs.gnu.org; Thu, 21 Sep 2023 14:54: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 1qjOo6-0001nq-0R for guix-patches@gnu.org; Thu, 21 Sep 2023 14:53:46 -0400 Received: from mail-yb1-xb35.google.com ([2607:f8b0:4864:20::b35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjOo3-0006IO-IR for guix-patches@gnu.org; Thu, 21 Sep 2023 14:53:45 -0400 Received: by mail-yb1-xb35.google.com with SMTP id 3f1490d57ef6-d81b9f0487eso1615444276.2 for ; Thu, 21 Sep 2023 11:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695322422; x=1695927222; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=mxWTTHtiEfoMJwzMn16E88JpEBkaZmf5Gga9zaHhL0M=; b=jRDRNjYYuh6mJ/yXAdzOkeDuSbRSLB4ySQLJ6TDe4P+DkW/0fIODxk6scl/x5YS5p1 Oxu8ohYCWHLZNnGmkEVp0V4DVn4T9i/pM9mCyiir6Fh7S/XVBu2mYjWYnVX18yDOzdLa vjsM7O4bmU7zp6GtLT+q7/2kWCXvWpD7wAu+a2wQUn8lDAY+0Xc5IJAyToup5wHCAhxv 8tp/Pe9Lzg9F7U9QjInYXbURvAXxrc0QMWgtB7+oS7ow5pxfJy0XTOxauQiWKHTIAdfu ohcOQ6aTrRtB/Aez/GF0qT1QLTS4konG0am3HWcFFW/C31v5QdkwN/PncmSaSIvJVW81 ip/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695322422; x=1695927222; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=mxWTTHtiEfoMJwzMn16E88JpEBkaZmf5Gga9zaHhL0M=; b=sdQ7Gy3+MfJAFcV6+9OazLU9LTEPaBMGbR1ZPpzTl5t04GQMh4L9UPIH/p0KXuMq83 sZYr5vLYe/72bFSAAkhsYRW1zhUKyKX7FRKOy0PKqtPdJwcsMRgIyMUq1VepFOgmbx8X 9K0U7yMbOChC85W9E42zZxHD/2yPdyuospWQCpNkHeRM732ZtevFyAabThVaAN+XibGg /C7/DduNx+ULGX1uUeT7mmx33Ev3Z9ULiFA6+vY+jEt5/+Fp97zuypT18SYTldnAymCe vpOmMo79JDZwfGXwzeaGiv1eGp0gay+e+MhCa+9fgMAMt+LTCN61ZcYxFukaWkVOaDoy +1yQ== X-Gm-Message-State: AOJu0Yxy5WLkRt9qZopNpwKqvbDZPThUPTN16D5FYGpx0ufJfeObiSYr GluqSWc//Xh4RfuxFhcwE4PeIvCkdBonL9RhOQWdj1HI X-Google-Smtp-Source: AGHT+IEe1iRzijpGHlzqKyePgX1T7oImxtbhmNIm3NEMgfOilW1tbwfBhTfDBG4oLI/6CrvGUv39fJSSae8UNer1R/s= X-Received: by 2002:a25:d87:0:b0:d7f:2cb6:7d8b with SMTP id 129-20020a250d87000000b00d7f2cb67d8bmr6074953ybn.63.1695322421866; Thu, 21 Sep 2023 11:53:41 -0700 (PDT) MIME-Version: 1.0 From: Nikolaos Chatzikonstantinou Date: Thu, 21 Sep 2023 21:53:30 +0300 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::b35; envelope-from=nchatz314@gmail.com; helo=mail-yb1-xb35.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, I noticed a typo where a channel name is accidentally referred to once as "variant-personal-packages" and I corrected it. Regards, Nikoaos Chatzikonstantinou From 9d34492bba8104dbb93232dfe97863ec578a5c2b Mon Sep 17 00:00:00 2001 From: Nikolaos Chatzikonstantinou Date: Thu, 21 Sep 2023 21:39:47 +0300 Subject: [PATCH] doc: Fix channel name typo. When the manual has "variant-personal-packages", it actually refers to the channel "variant-packages", as it is named so elsewhere. To correct this, I ran the command grep -r -l variant-personal-packages | xargs \ sed -i 's/variang-personal-packages/variant-packages/g' * doc/guix.texi (Specifying Additional Channels): Fix channel name typo. * po/doc/guix-manual.de.po: Fix channel name typo. * po/doc/guix-manual.es.po: Fix channel name typo. * po/doc/guix-manual.fr.po: Fix channel name typo. * po/doc/guix-manual.pt_BR.po: Fix channel name typo. * po/doc/guix-manual.ru.po: Fix channel name typo. * po/doc/guix-manual.zh_CN.po: Fix channel name typo. Signed-off-by: Nikolaos Chatzikonstantinou --- doc/guix.texi | 2 +- po/doc/guix-manual.de.po | 4 ++-- po/doc/guix-manual.es.po | 4 ++-- po/doc/guix-manual.fr.po | 6 +++--- po/doc/guix-manual.pt_BR.po | 2 +- po/doc/guix-manual.ru.po | 4 ++-- po/doc/guix-manual.zh_CN.po | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 617b8463e3..f83aa3ce4f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5661,7 +5661,7 @@ Generation 19 Aug 27 2018 16:20:48 @noindent The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes -both Guix and packages from the @code{variant-personal-packages} channel +both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe}). @node Using a Custom Guix Channel diff --git a/po/doc/guix-manual.de.po b/po/doc/guix-manual.de.po index 88490638e6..6f39441786 100644 --- a/po/doc/guix-manual.de.po +++ b/po/doc/guix-manual.de.po @@ -13904,7 +13904,7 @@ msgstr "" #. type: Plain text #: guix-git/doc/guix.texi:5649 -msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-personal-packages} channel (@pxref{Invoking guix describe})." +msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe})." msgstr "Obige Ausgabe von @command{guix describe} zeigt an, dass jetzt Generation@tie{}19 läuft und diese sowohl Guix als auch Pakete aus dem Kanal @code{paketvarianten} enthält (siehe @ref{Invoking guix describe})." #. type: Plain text @@ -88275,7 +88275,7 @@ msgstr "fdl-1.3.texi" #~ msgid "Client VPN IP." #~ msgstr "VPN-IP-Adresse des Clients." -#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-personal-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." +#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." #~ msgstr "Obige Ausgabe von @command{guix pull} zeigt an, dass Generation@tie{}19 sowohl Guix als auch Pakete aus dem Kanal @code{paketvarianten} enthält. Unter den aufgeführten neuen und aktualisierten Paketen kommen vielleicht manche wie @code{gimp-variante} und @code{emacs-variante-mit-coolen-features} aus @code{paketvarianten}, während andere aus dem Standard-Guix-Kanal kommen." #~ msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine. It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines." diff --git a/po/doc/guix-manual.es.po b/po/doc/guix-manual.es.po index 2fb0cbba99..43cd7a3a83 100644 --- a/po/doc/guix-manual.es.po +++ b/po/doc/guix-manual.es.po @@ -14489,7 +14489,7 @@ msgstr "" #. type: Plain text #: guix-git/doc/guix.texi:5599 -msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-personal-packages} channel (@pxref{Invoking guix describe})." +msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe})." msgstr "" #. type: Plain text @@ -91809,7 +91809,7 @@ msgstr "fdl-1.3.texi" #~ msgstr "IP de la VPN del cliente." # FUZZY -#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-personal-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." +#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." #~ msgstr "La salida de @command{guix pull} previa muestra que la generación@tie{}19 incluye tanto Guix como paquetes del canal @code{paquetes-personalizados}. Entre los paquetes nuevos y actualizados que son enumerados, algunos como @code{mi-gimp} y @code{mi-emacs-con-cosas-bonitas} pueden venir de @code{paquetes-personalizados}, mientras que otros vienen del canal predeterminado de Guix." #~ msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine. It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines." diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po index c3a1d3771f..6dfde4c540 100644 --- a/po/doc/guix-manual.fr.po +++ b/po/doc/guix-manual.fr.po @@ -14046,8 +14046,8 @@ msgstr "" #. type: Plain text #: guix-git/doc/guix.texi:5649 -msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-personal-packages} channel (@pxref{Invoking guix describe})." -msgstr "La sortie de @command{guix describe} ci-dessus montre que nous sommes maintenant à la génération@tie{}19 et qu'il contient à la fois Guix et les paquets du canal @code{variant-personal-packages} (@pxref{Invoking guix describe})." +msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe})." +msgstr "La sortie de @command{guix describe} ci-dessus montre que nous sommes maintenant à la génération@tie{}19 et qu'il contient à la fois Guix et les paquets du canal @code{variant-packages} (@pxref{Invoking guix describe})." #. type: Plain text #: guix-git/doc/guix.texi:5658 @@ -89499,7 +89499,7 @@ msgstr "fdl-1.3.texi" #~ msgid "Client VPN IP." #~ msgstr "IP du client sur le VPN." -#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-personal-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." +#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." #~ msgstr "La sortie de @command{guix pull} ci-dessus montre que la génération@tie{}19 contient aussi bien Guix que les paquets du canal @code{variant-packages}. Parmi les nouveaux paquets et les paquets mis à jour qui sont listés, certains comme @code{variant-gimp} et @code{variant-emacs-with-cool-features} peuvent provenir de @code{variant-packages}, tandis que d'autres viennent du canal par défaut de Guix." #~ msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine. It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines." diff --git a/po/doc/guix-manual.pt_BR.po b/po/doc/guix-manual.pt_BR.po index 35f32eb4d5..d34d0fe2a8 100644 --- a/po/doc/guix-manual.pt_BR.po +++ b/po/doc/guix-manual.pt_BR.po @@ -13775,7 +13775,7 @@ msgstr "" #. type: Plain text #: guix-git/doc/guix.texi:5649 -msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-personal-packages} channel (@pxref{Invoking guix describe})." +msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe})." msgstr "" #. type: Plain text diff --git a/po/doc/guix-manual.ru.po b/po/doc/guix-manual.ru.po index d1ca53f69a..032fd664cf 100644 --- a/po/doc/guix-manual.ru.po +++ b/po/doc/guix-manual.ru.po @@ -14078,7 +14078,7 @@ msgstr "" #. type: Plain text #: guix-git/doc/guix.texi:5599 -msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-personal-packages} channel (@pxref{Invoking guix describe})." +msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe})." msgstr "" #. type: Plain text @@ -85393,7 +85393,7 @@ msgstr "fdl-1.3.texi" #~ msgid "@code{user} (default: @samp{\"root\"})" #~ msgstr "@code{port} (default: @code{22})" -#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-personal-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." +#~ msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-packages} channel. Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel." #~ msgstr "Результат @command{guix pull} выше показывает, что поколение Generation@tie{}19 включает как репозиторий Guix, так и пакеты из канала @code{my-personal-packages}. Вместе с новыми и обновлёнными пакетами, которые присутствуют в списке, что-нибудь типа @code{my-gimp} и @code{my-emacs-with-cool-features} может прийти из @code{my-personal-packages}, когда остальные идут из канала Guix по умолчанию." #~ msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}. The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine. It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines." diff --git a/po/doc/guix-manual.zh_CN.po b/po/doc/guix-manual.zh_CN.po index 6d5c54044a..44a32b0a8f 100644 --- a/po/doc/guix-manual.zh_CN.po +++ b/po/doc/guix-manual.zh_CN.po @@ -13853,7 +13853,7 @@ msgstr "" #. type: Plain text #: guix-git/doc/guix.texi:5649 -msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-personal-packages} channel (@pxref{Invoking guix describe})." +msgid "The output of @command{guix describe} above shows that we're now running Generation@tie{}19 and that it includes both Guix and packages from the @code{variant-packages} channel (@pxref{Invoking guix describe})." msgstr "" #. type: Plain text -- 2.39.2