Use OpenPGP instead of GnuPG, gpg or pgp when referring to the standard

7 files changed, 7 insertions, 7 deletions

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 @@
         <dt><a href="join/">How to join Debian</a></dt>
         <dd>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.</dd>
         <dt><a href="https://db.debian.org/">Developer Database</a></dt>
-        <dd>Some information in this database is accessible to everybody, some information only to developers who have logged in. The database contains information such as <a href="https://db.debian.org/machines.cgi">project machines</a> and developers' GnuPG keys.
+        <dd>Some information in this database is accessible to everybody, some information only to developers who have logged in. The database contains information such as <a href="https://db.debian.org/machines.cgi">project machines</a> 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 <a href="https://db.debian.org/password.html">change their password</a> and set up <a href="https://db.debian.org/forward.html">mail forwarding</a> for their Debian account. If you're planning to use one of the Debian machines, please make sure to read the <a href="dmup">Debian Machine Usage Policies</a>.</dd>
         <dt><a href="constitution">The Constitution</a></dt>
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</a>. After that, you have to click on their name in the <a
 href="https://nm.debian.org/process/">listing of Applicants</a>
 and go the <q>Advocate this application</q> page. Enter your Debian login
 and press the <q>Advocate</q> 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.
 </p>
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:</p>
 
   <p>If the Applicant's location makes it <em>impossible</em> 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.
   </p>
  </li>
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</a> are located all over the world
 (see the <a href="$(DEVEL)/developers.loc">developer locations</a>) 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 <a href="http://www.gnupg.org/">OpenPGP</a>
+are identified by their <a href="https://openpgp.org/">OpenPGP</a>
 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 <code>debian-keyring</code> package.</p>
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
 <a href="https://contributors.debian.org">contributors.debian.org</a>.</p>
 
-<p>GPG/PGP keys of package maintainers can be downloaded from
+<p>OpenPGP keys of package maintainers can be downloaded from
 <a href="http://ftp.debian.org/debian/pool/main/d/debian-keyring/">here</a>.
 </p>
 
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.
 </li>
 
 <li>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.