From 09b984b77d060e6fd37833541b828f73238cf2be Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Dec 2022 09:50:38 +0100 Subject: doc: Verify the release with my own OpenPGP key. * doc/guix.texi (OPENPGP-SIGNING-KEY-ID, OPENPGP-SIGNING-KEY-URL): Switch to my key. --- doc/guix.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index e547d469f4..84bfa390f7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10,8 +10,8 @@ @include version.texi @c Identifier of the OpenPGP key used to sign tarballs and such. -@set OPENPGP-SIGNING-KEY-ID 27D586A4F8900854329FF09F1260E46482E63562 -@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=127547 +@set OPENPGP-SIGNING-KEY-ID 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 +@set OPENPGP-SIGNING-KEY-URL https://sv.gnu.org/people/viewgpg.php?user_id=15145 @c Base URL for downloads. @set BASE-URL https://ftp.gnu.org/gnu/guix -- cgit v1.2.3 From 2cf16f2c31e5e124754ec8c400f22ad9fe4a506b Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Tue, 29 Nov 2022 21:21:59 +0000 Subject: doc: Fix formatting for 'computed-file'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (G-Expressions): Fix formatting for 'computed-file'. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 84bfa390f7..2fc73b8f3e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11706,8 +11706,7 @@ This is the declarative counterpart of @code{text-file}. @end deffn @deffn {Scheme Procedure} computed-file @var{name} @var{gexp} @ - [#:local-build? #t] - [#:options '()] + [#:local-build? #t] [#:options '()] Return an object representing the store item @var{name}, a file or directory computed by @var{gexp}. When @var{local-build?} is true (the default), the derivation is built locally. @var{options} is a list of -- cgit v1.2.3 From 047ae5c3458d03bea4926e6cc1760bcfce1e2ab4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 15 Dec 2022 00:12:43 +0100 Subject: doc: Use VM image file name consistently. Previously, what "/tmp/qemu-image" refers to could be unclear at first. * doc/guix.texi (Running Guix in a VM): Use the original image file name instead of /tmp/qemu-image. * po/doc/guix-manual.de.po, po/doc/guix-manual.es.po, po/doc/guix-manual.fr.po, po/doc/guix-manual.pt_BR.po, po/doc/guix-manual.ru.po, po/doc/guix-manual.zh_CN.po: Adjust accordingly. --- doc/guix.texi | 7 ++++--- po/doc/guix-manual.de.po | 4 ++-- po/doc/guix-manual.es.po | 4 ++-- po/doc/guix-manual.fr.po | 4 ++-- po/doc/guix-manual.pt_BR.po | 4 ++-- po/doc/guix-manual.ru.po | 4 ++-- po/doc/guix-manual.zh_CN.po | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 2fc73b8f3e..784114f0bb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -39223,7 +39223,7 @@ $ qemu-system-x86_64 \ -nic user,model=virtio-net-pci \ -enable-kvm -m 2048 \ -device virtio-blk,drive=myhd \ - -drive if=none,file=/tmp/qemu-image,id=myhd + -drive if=none,file=guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2,id=myhd @end example Here is what each of these options means: @@ -39259,8 +39259,9 @@ better performance than if it were emulating a complete disk drive. See the QEMU and KVM documentation for more info. @item -drive if=none,file=/tmp/qemu-image,id=myhd -Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing -store of the ``myhd'' drive. +Use our QCOW image, the +@file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as +the backing store of the ``myhd'' drive. @end table The default @command{run-vm.sh} script that is returned by an invocation of diff --git a/po/doc/guix-manual.de.po b/po/doc/guix-manual.de.po index e8b2de6943..b33bce32e9 100644 --- a/po/doc/guix-manual.de.po +++ b/po/doc/guix-manual.de.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.2.0-pre3\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "POT-Creation-Date: 2022-12-02 03:18+0000\n" -"PO-Revision-Date: 2022-12-03 17:33+0000\n" +"PO-Revision-Date: 2022-12-15 00:11+0100\n" "Last-Translator: Florian Pelz \n" "Language-Team: German \n" "Language: de\n" @@ -73899,7 +73899,7 @@ msgstr "-drive if=none,file=/tmp/qemu-image,id=myhd" #. type: table #: guix-git/doc/guix.texi:39296 -msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive." +msgid "Use our QCOW image, the @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as the backing store of the ``myhd'' drive." msgstr "Unser QCOW-Abbild in der Datei @file{/tmp/qemu-image} soll als Inhalt des „myhd“-Laufwerks herhalten." #. type: Plain text diff --git a/po/doc/guix-manual.es.po b/po/doc/guix-manual.es.po index ec048f03e3..a7441941b9 100644 --- a/po/doc/guix-manual.es.po +++ b/po/doc/guix-manual.es.po @@ -55,7 +55,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.2.0-pre3\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "POT-Creation-Date: 2022-12-02 03:18+0000\n" -"PO-Revision-Date: 2022-11-04 11:27+0000\n" +"PO-Revision-Date: 2022-12-15 00:11+0100\n" "Last-Translator: Julien Lepiller \n" "Language-Team: Spanish \n" "Language: es\n" @@ -77483,7 +77483,7 @@ msgstr "-drive if=none,file=/tmp/imagen-qemu,id=midisco" #. type: table #: guix-git/doc/guix.texi:39296 -msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive." +msgid "Use our QCOW image, the @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as the backing store of the ``myhd'' drive." msgstr "Usa nuestra imagen QCOW, el archivo @file{/tmp/imagen-qemu}, como almacenamiento físico para la unidad ``midisco''." #. type: Plain text diff --git a/po/doc/guix-manual.fr.po b/po/doc/guix-manual.fr.po index bec07beebf..aed8e16128 100644 --- a/po/doc/guix-manual.fr.po +++ b/po/doc/guix-manual.fr.po @@ -46,7 +46,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.2.0-pre3\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "POT-Creation-Date: 2022-12-02 03:18+0000\n" -"PO-Revision-Date: 2022-12-03 17:33+0000\n" +"PO-Revision-Date: 2022-12-15 00:11+0100\n" "Last-Translator: Julien Lepiller \n" "Language-Team: French \n" "Language: fr\n" @@ -74054,7 +74054,7 @@ msgstr "-drive if=none,file=/tmp/qemu-image,id=myhd" #. type: table #: guix-git/doc/guix.texi:39296 -msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive." +msgid "Use our QCOW image, the @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as the backing store of the ``myhd'' drive." msgstr "Utilise notre image QCOW, le fichier @file{/tmp/qemu-image}, comme stockage pour le lecteur « myhd »." #. type: Plain text diff --git a/po/doc/guix-manual.pt_BR.po b/po/doc/guix-manual.pt_BR.po index bfe3e98eb1..0372dc2c13 100644 --- a/po/doc/guix-manual.pt_BR.po +++ b/po/doc/guix-manual.pt_BR.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: guix manual checkout\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "POT-Creation-Date: 2022-12-02 03:18+0000\n" -"PO-Revision-Date: 2022-01-25 15:16+0000\n" +"PO-Revision-Date: 2022-12-15 00:11+0100\n" "Last-Translator: Fábio Rodrigues Ribeiro \n" "Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" @@ -71324,7 +71324,7 @@ msgstr "" #. type: table #: guix-git/doc/guix.texi:39296 -msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive." +msgid "Use our QCOW image, the @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as the backing store of the ``myhd'' drive." msgstr "" #. type: Plain text diff --git a/po/doc/guix-manual.ru.po b/po/doc/guix-manual.ru.po index 2efbce94c1..9738d516c6 100644 --- a/po/doc/guix-manual.ru.po +++ b/po/doc/guix-manual.ru.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.2.0-pre2\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "POT-Creation-Date: 2022-12-02 03:18+0000\n" -"PO-Revision-Date: 2021-12-11 23:16+0000\n" +"PO-Revision-Date: 2022-12-15 00:11+0100\n" "Last-Translator: Nikolay Korotkiy \n" "Language-Team: Russian \n" "Language: ru\n" @@ -72867,7 +72867,7 @@ msgstr "" #. type: table #: guix-git/doc/guix.texi:39296 -msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive." +msgid "Use our QCOW image, the @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as the backing store of the ``myhd'' drive." msgstr "" #. type: Plain text diff --git a/po/doc/guix-manual.zh_CN.po b/po/doc/guix-manual.zh_CN.po index 7e53f0f41d..f5abe54b11 100644 --- a/po/doc/guix-manual.zh_CN.po +++ b/po/doc/guix-manual.zh_CN.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: guix-manual 1.0.1-pre1\n" "Report-Msgid-Bugs-To: bug-guix@gnu.org\n" "POT-Creation-Date: 2022-12-02 03:18+0000\n" -"PO-Revision-Date: 2022-09-22 13:19+0000\n" +"PO-Revision-Date: 2022-12-15 00:11+0100\n" "Last-Translator: Yang Yulin \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" @@ -71148,7 +71148,7 @@ msgstr "" #. type: table #: guix-git/doc/guix.texi:39296 -msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive." +msgid "Use our QCOW image, the @file{guix-system-vm-image-@value{VERSION}.x86_64-linux.qcow2} file, as the backing store of the ``myhd'' drive." msgstr "" #. type: Plain text -- cgit v1.2.3 From b77b4c7c3a5ac180f5aed0983be50ffbe6832f87 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 18 Dec 2022 15:53:43 +0100 Subject: doc: Add guile-netlink to 'htmlxref.cnf'. * doc/htmlxref.cnf: Add guile-netlink. --- doc/htmlxref.cnf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf index 21efbe2ddc..d961c91c56 100644 --- a/doc/htmlxref.cnf +++ b/doc/htmlxref.cnf @@ -1,7 +1,7 @@ # htmlxref.cnf - reference file for free Texinfo manuals on the web. # Modified by Ludovic Courtès for the GNU Guix manual. -htmlxrefversion=2022-08-04.13; # UTC +htmlxrefversion=2022-12-18.14; # UTC # Copyright 2010-2020, 2022 Free Software Foundation, Inc. # @@ -409,6 +409,8 @@ GUILE_GNOME = ${GS}/guile-gnome/docs guile-gtk node ${GS}/guile-gtk/docs/guile-gtk/ +guile-netlink mono https://git.lepiller.eu/guile-netlink/manual/manual.html + guile-rpc mono ${GS}/guile-rpc/manual/guile-rpc.html guile-rpc node ${GS}/guile-rpc/manual/html_node/ -- cgit v1.2.3 From 8e2f32cee982d42a79e53fc1e9aa7b8ff0514714 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 18 Dec 2022 16:01:32 +0100 Subject: doc: Update URLs for the manual and cookbook translations. * doc/htmlxref.cnf: Update URLs for "guix" and "guix-cookbook". --- doc/htmlxref.cnf | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf index d961c91c56..d8a7aa12c9 100644 --- a/doc/htmlxref.cnf +++ b/doc/htmlxref.cnf @@ -1,7 +1,7 @@ # htmlxref.cnf - reference file for free Texinfo manuals on the web. # Modified by Ludovic Courtès for the GNU Guix manual. -htmlxrefversion=2022-12-18.14; # UTC +htmlxrefversion=2022-12-18.15; # UTC # Copyright 2010-2020, 2022 Free Software Foundation, Inc. # @@ -422,6 +422,8 @@ GUIX = ${GUIX_ROOT}/manual guix.es node ${GUIX}/es/html_node/ guix.fr mono ${GUIX}/fr/guix.fr.html guix.fr node ${GUIX}/fr/html_node/ + guix.pt_BR mono ${GUIX}/pt-br/guix.pt_BR.html + guix.pt_BR node ${GUIX}/pt-br/html_node/ guix.ru mono ${GUIX}/ru/guix.ru.html guix.ru node ${GUIX}/ru/html_node/ guix.zh_CN mono ${GUIX}/zh-cn/guix.zh_CN.html @@ -430,10 +432,12 @@ GUIX = ${GUIX_ROOT}/manual guix node ${GUIX}/en/html_node/ GUIX_COOKBOOK = ${GUIX_ROOT}/cookbook - guix-cookbook.de mono ${GUIX_COOKBOOK}/de/guix-cookbook.html + guix-cookbook.de mono ${GUIX_COOKBOOK}/de/guix-cookbook.de.html guix-cookbook.de node ${GUIX_COOKBOOK}/de/html_node/ - guix-cookbook.fr mono ${GUIX_COOKBOOK}/fr/guix-cookbook.html + guix-cookbook.fr mono ${GUIX_COOKBOOK}/fr/guix-cookbook.fr.html guix-cookbook.fr node ${GUIX_COOKBOOK}/fr/html_node/ + guix-cookbook.sk mono ${GUIX_COOKBOOK}/sk/guix-cookbook.sk.html + guix-cookbook.sk node ${GUIX_COOKBOOK}/sk/html_node/ guix-cookbook mono ${GUIX_COOKBOOK}/en/guix-cookbook.html guix-cookbook node ${GUIX_COOKBOOK}/en/html_node/ -- cgit v1.2.3