01/02: Revert "doc: Update to cover for an additional OpenPGP signing key."

[guix-commits]

apteryx pushed a commit to branch version-1.3.0
in repository guix.

commit f40b0fa8e686c64196ae3e4fa9eca32a1ffce9c6
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed May 5 11:25:24 2021 -0400

    Revert "doc: Update to cover for an additional OpenPGP signing key."
    
    This reverts commit b9fb13b28437a254683273094f189396a6e1421d.  Per 
discussions
    simply updating OPENPGP-SIGNING-KEY-ID and OPENPGP-SIGNING-KEY-URL will be
    enough.
---
 doc/guix.texi | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 5cb7c2b..ff592ce 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9,11 +9,9 @@
 
 @include version.texi
 
-@c Identifier of the OpenPGP keys used to sign tarballs and such.
-@set OPENPGP-SIGNING-KEY-ID-1 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 @c ludo
-@set OPENPGP-SIGNING-KEY-URL-1 
https://sv.gnu.org/people/viewgpg.php?user_id=15145
-@set OPENPGP-SIGNING-KEY-ID-2 27D586A4F8900854329FF09F1260E46482E63562 @c maxim
-@set OPENPGP-SIGNING-KEY-URL-2 
https://sv.gnu.org/people/viewgpg.php?user_id=127547
+@c Identifier of the OpenPGP key used to sign tarballs and such.
+@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
@@ -655,9 +653,7 @@ If that command fails because you do not have the required 
public key,
 then run this command to import it:
 
 @example
-$ wget '@value{OPENPGP-SIGNING-KEY-URL-1}' \
-      -qO - | gpg --import -
-$ wget '@value{OPENPGP-SIGNING-KEY-URL-2}' \
+$ wget '@value{OPENPGP-SIGNING-KEY-URL}' \
       -qO - | gpg --import -
 @end example
 
@@ -2127,9 +2123,7 @@ If that command fails because you do not have the 
required public key,
 then run this command to import it:
 
 @example
-$ wget @value{OPENPGP-SIGNING-KEY-URL-1} \
-      -qO - | gpg --import -
-$ wget @value{OPENPGP-SIGNING-KEY-URL-2} \
+$ wget @value{OPENPGP-SIGNING-KEY-URL} \
       -qO - | gpg --import -
 @end example
 
@@ -11894,7 +11888,7 @@ Likewise, you can fetch keys to a specific keybox file 
like this:
 
 @example
 gpg --no-default-keyring --keyring mykeyring.kbx \
-  --recv-keys @value{OPENPGP-SIGNING-KEY-ID-1}
+  --recv-keys @value{OPENPGP-SIGNING-KEY-ID}
 @end example
 
 @xref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU