From 848f05ee39ce74ed77b065b215fbbefc6aa4532c Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 6 Oct 2023 23:55:11 +0200 Subject: Use OpenPGP instead of GnuPG, gpg or pgp when referring to the standard --- english/CD/verify.wml | 2 +- english/devel/buildd/operation.wml | 2 +- english/devel/index.wml | 2 +- english/devel/join/nm-advocate.wml | 2 +- english/devel/join/nm-step1.wml | 2 +- english/devel/join/nm-step2.wml | 2 +- english/devel/people.wml | 2 +- english/devel/tech-ctte.wml | 2 +- english/events/keysigning.wml | 16 ++++++++-------- english/events/material.wml | 2 +- english/intro/organization.data | 6 +++--- english/po/organization.pot | 6 +++--- english/ports/hurd/hurd-devel-debian.wml | 2 +- english/security/faq.wml | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/english/CD/verify.wml b/english/CD/verify.wml index 5fe97596a76..fd4b76bebe1 100644 --- a/english/CD/verify.wml +++ b/english/CD/verify.wml @@ -24,7 +24,7 @@ should use the matching tools To ensure that the checksums files themselves are correct, use GnuPG to verify them against the accompanying signature files (e.g. SHA512SUMS.sign). The keys used for these signatures are -all in the Debian GPG keyring +all in the Debian OpenPGP keyring and the best way to check them is to use that keyring to validate via the web of trust. To make life easier for people who don't have ready access to an existing Debian machine, here are details of the keys diff --git a/english/devel/buildd/operation.wml b/english/devel/buildd/operation.wml index 5ce56fc8e29..5ca652114d1 100644 --- a/english/devel/buildd/operation.wml +++ b/english/devel/buildd/operation.wml @@ -60,7 +60,7 @@ process if no errors happen. There are two good reasons for not further automating this: First, sometimes builds end with an ``OK'' result but the build nevertheless failed for reasons that are invisible to the machine. And second, directly uploading would require -to automatically PGP-sign the resulting files with a key without +to automatically OpenPGP-sign the resulting files with a key without passphrase on the build machine. I considered this an unacceptable security hole. diff --git a/english/devel/index.wml b/english/devel/index.wml index adce38691d2..783039d1347 100644 --- a/english/devel/index.wml +++ b/english/devel/index.wml @@ -34,7 +34,7 @@
How to join Debian
Would you like to contribute and join the project? We're always looking for new developers or free software enthusiasts with technical and non-technical skills. For more information, please visit this page.
Developer Database
-
Some information in this database is accessible to everybody, some information only to developers who have logged in. The database contains information such as project machines and developers' GnuPG keys. +
Some information in this database is accessible to everybody, some information only to developers who have logged in. The database contains information such as project machines and developers' OpenPGP keys. To extract a developer's key click on the “PGP/GPG fingerprint” link(s) once you have found them. Developers can change their password and set up mail forwarding for their Debian account. If you're planning to use one of the Debian machines, please make sure to read the Debian Machine Usage Policies.
The Constitution
diff --git a/english/devel/join/nm-advocate.wml b/english/devel/join/nm-advocate.wml index c734beedece..40038702975 100644 --- a/english/devel/join/nm-advocate.wml +++ b/english/devel/join/nm-advocate.wml @@ -46,7 +46,7 @@ up. After that, you have to click on their name in the listing of Applicants and go the Advocate this application page. Enter your Debian login and press the Advocate button. You then will receive an e-mail with an -auth key which you have to return PGP/GPG signed. After this, the +auth key which you have to return OpenPGP signed. After this, the Applicant is added to the queue for an Application Manager with whom they will go through all steps of the New Member checks.

diff --git a/english/devel/join/nm-step1.wml b/english/devel/join/nm-step1.wml index 0f3dae181b3..6b7864382d5 100644 --- a/english/devel/join/nm-step1.wml +++ b/english/devel/join/nm-step1.wml @@ -27,7 +27,7 @@ the most important prerequisites are listed below:

If the Applicant's location makes it impossible to get a key signed by another Debian Developer, a scanned photo of their drivers license - or passport signed with their GPG key can be accepted as an alternative + or passport signed with their OpenPGP key can be accepted as an alternative method of identification.

diff --git a/english/devel/join/nm-step2.wml b/english/devel/join/nm-step2.wml index e85b971d141..0fec6984e9a 100644 --- a/english/devel/join/nm-step2.wml +++ b/english/devel/join/nm-step2.wml @@ -14,7 +14,7 @@ href="newmaint#Member">Debian members are located all over the world (see the developer locations) and rarely meet each other in person. This means trust cannot be built up by personal contact and other means are necessary. All Debian developers -are identified by their OpenPGP +are identified by their OpenPGP key. These keys make it possible to authenticate messages and other data by signing it. For more information on OpenPGP keys see the README file in the debian-keyring package.

diff --git a/english/devel/people.wml b/english/devel/people.wml index 498063eef4e..8ad7530271e 100644 --- a/english/devel/people.wml +++ b/english/devel/people.wml @@ -8,7 +8,7 @@ managed. A broader list of Debian contributors can be found on contributors.debian.org.

-

GPG/PGP keys of package maintainers can be downloaded from +

OpenPGP keys of package maintainers can be downloaded from here.

diff --git a/english/devel/tech-ctte.wml b/english/devel/tech-ctte.wml index 1fe0c94a3b6..d7072c1f82a 100644 --- a/english/devel/tech-ctte.wml +++ b/english/devel/tech-ctte.wml @@ -80,7 +80,7 @@ which makes the final decision on technical disputes in the Debian project.
  • To post to the committee mailing list you must either be - subscribed to the list from your posting address, or PGP-sign your + subscribed to the list from your posting address, or OpenPGP-sign your message. This is an anti-spam measure. We apologise for the inconvenience, but this setup makes it possible for committee members to pay proper attention to the committee list mails. diff --git a/english/events/keysigning.wml b/english/events/keysigning.wml index 3c9ec02474d..8ad94e123ac 100644 --- a/english/events/keysigning.wml +++ b/english/events/keysigning.wml @@ -2,7 +2,7 @@ # $Id$

    Since a lot of developers meet at trade shows or conferences they -have become a nice way to get other people sign ones GnuPG key and +have become a nice way to get other people sign ones OpenPGP key and improve the web of trust. Especially for people who are new to the project, keysigning and meeting other developers has been very interesting.

    @@ -12,7 +12,7 @@ session. Note that all examples use keyring.debian.org as the keyserver. If the key in question is not in the Debian keyring, replace keyring.debian.org with a public keyserver like wwwkeys.pgp.net (which despite the name -also stores GnuPG keys.)

    +also stores OpenPGP keys.)

    People should only sign a key under at least two conditions:

    @@ -37,15 +37,15 @@ Most importantly, if the key owner is not actively participating in the exchange, you won't be able to complete either requisite 1 or 2. Nobody can complete the key owner's part of requisite 1 on the key owner's behalf, because otherwise anyone with a stolen ID card could -easily get a PGP key to go with it by pretending to be an agent of the +easily get an OpenPGP key to go with it by pretending to be an agent of the keyowner. Nobody can complete the key owner's part of requisite 2 on the key owner's behalf, since the agent could substitute the -fingerprint for a different PGP key with the key owner's name on it +fingerprint for a different OpenPGP key with the key owner's name on it and get someone to sign the wrong key.