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

This reverts commit b9fb13b284.  Per discussions
simply updating OPENPGP-SIGNING-KEY-ID and OPENPGP-SIGNING-KEY-URL will be
enough.
This commit is contained in:
Maxim Cournoyer 2021-05-05 11:25:24 -04:00
parent 74009c4cf0
commit f40b0fa8e6
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 6 additions and 12 deletions

View File

@ -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