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

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.
 <code>SHA512SUMS.sign</code>). The keys used for these signatures are
-all in the <a href="https://keyring.debian.org">Debian GPG keyring</a>
+all in the <a href="https://keyring.debian.org">Debian OpenPGP keyring</a>
 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 @@
         <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.
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$
 
 <p>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.</p>
@@ -12,7 +12,7 @@ session. Note that all examples use <code>keyring.debian.org</code> as
 the keyserver. If the key in question is not in the Debian keyring,
 replace <code>keyring.debian.org</code> with a public
 keyserver like <code>wwwkeys.pgp.net</code> (which despite the name
-also stores GnuPG keys.)</p>
+also stores OpenPGP keys.)</p>
 
 <p>People should only sign a key under at least two conditions:</p>
 
@@ -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.
 </p>
 
 <ul>
-<li> You need printed out GnuPG fingerprints, key lengths and an
+<li> You need printed out OpenPGP fingerprints, key lengths and an
      identity card to prove your identity (passport, drivers license
      or similar).
 </li>
@@ -54,14 +54,14 @@ and get someone to sign the wrong key.
      ought to sign your key after the meeting.
 </li>
 
-<li> If you don't have a GnuPG key yet, create one with <code>gpg --gen-key</code>.
+<li> If you don't have an OpenPGP key yet, create one with <code>gpg --gen-key</code>.
 </li>
 
 <li> Only sign a key if the identity of the person whose key to sign
      is proven.
 </li>
 
-<li> After the meeting you'll have to fetch the GnuPG key in order to
+<li> After the meeting you'll have to fetch the OpenPGP key in order to
      sign it.  The following may help:
 
 
@@ -132,7 +132,7 @@ and get someone to sign the wrong key.
 
 <p>The <a href="https://packages.debian.org/signing-party">signing-party</a>
 Debian package provides some tools to help you with
-this process. <tt>gpg-key2ps</tt> turns a GnuPG key into a PostScript
+this process. <tt>gpg-key2ps</tt> turns an OpenPGP key into a PostScript
 file to print paper slips with your fingerprint, and
 <tt>gpg-mailkeys</tt> will email a signed key to its author. The package
 also includes <tt>caff</tt> which is a more advanced tool. See the
diff --git a/english/events/material.wml b/english/events/material.wml
index 98e6a5d2466..a251aa95f74 100644
--- a/english/events/material.wml
+++ b/english/events/material.wml
@@ -172,7 +172,7 @@ coordinators during social events can exchange their business cards.
 Giving out business cards with the Debian
 logo contributes to Debian's image and is useful for handing out important
 information that you usually have to scribble down on paper (such as email address,
-your GPG fingerprint...).</p>
+your OpenPGP key fingerprint...).</p>
 
 <p>There is a <a href="materials/business-cards/">prototype</a> for
 business cards which you can use. Customizing it is easy since you only have
diff --git a/english/intro/organization.data b/english/intro/organization.data
index acd3c3c0064..008916dc5a1 100644
--- a/english/intro/organization.data
+++ b/english/intro/organization.data
@@ -206,7 +206,7 @@ transitional (elected or appointed with a certain expiration date).</gettext>
     <member>Jean-Philippe MENGUAL <delegate_he_him>
     <member>Sruthi Chandran <delegate_she_her>
     <member>Andrew Cater <delegate_he_him>
-    <note <gettext domain="organization">To send a private message to all the members of the Community Team, use the GPG key <a href="community-team-pubkey.txt">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>.</gettext>>
+    <note <gettext domain="organization">To send a private message to all the members of the Community Team, use the OpenPGP key <a href="community-team-pubkey.txt">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>.</gettext>>
 
   <job <a name="events" href="$(HOME)/events/"><gettext domain="organization">Events</gettext></a>> <genericemail events@debian.org>
     <member>Alexander Wirt
@@ -286,8 +286,8 @@ or through <a href="https://www.spi-inc.org/">SPI</a>.</p>
     <member>Jonathan Wiltshire<delegate_male>
     <member>Nicolas Dandrimont<delegate_male>
     <member>Stuart Prescott<delegate_male>
-    <note <gettext domain="organization">To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2.</gettext>>
-  <job <a name="keyring" href="https://keyring.debian.org/"><gettext domain="organization">Keyring Maintainers (PGP and GPG)</gettext></a>> <genericemail keyring-maint@debian.org> <delegationmail 1535701657.2203656.1492256048.477439EA@webmail.messagingengine.com>
+    <note <gettext domain="organization">To send a private message to all DAMs, use the OpenPGP key 57731224A9762EA155AB2A530CA8D15BB24D96F2.</gettext>>
+  <job <a name="keyring" href="https://keyring.debian.org/"><gettext domain="organization">Keyring Maintainers (OpenPGP)</gettext></a>> <genericemail keyring-maint@debian.org> <delegationmail 1535701657.2203656.1492256048.477439EA@webmail.messagingengine.com>
     <member>Gunnar Wolf<delegate_male>
     <member>John Sullivan<delegate_male>
     <member>Jonathan McDowell<delegate_he_him>
diff --git a/english/po/organization.pot b/english/po/organization.pot
index 532db010c7f..3761f07ca7a 100644
--- a/english/po/organization.pot
+++ b/english/po/organization.pot
@@ -250,7 +250,7 @@ msgid "Community"
 msgstr ""
 
 #: ../../english/intro/organization.data:243
-msgid "To send a private message to all the members of the Community Team, use the GPG key <a href=\"community-team-pubkey.txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
+msgid "To send a private message to all the members of the Community Team, use the OpenPGP key <a href=\"community-team-pubkey.txt\">817DAE61E2FE4CA28E1B7762A89C4D0527C4C869</a>."
 msgstr ""
 
 #: ../../english/intro/organization.data:245
@@ -318,11 +318,11 @@ msgid "Debian Account Managers"
 msgstr ""
 
 #: ../../english/intro/organization.data:327
-msgid "To send a private message to all DAMs, use the GPG key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
+msgid "To send a private message to all DAMs, use the OpenPGP key 57731224A9762EA155AB2A530CA8D15BB24D96F2."
 msgstr ""
 
 #: ../../english/intro/organization.data:328
-msgid "Keyring Maintainers (PGP and GPG)"
+msgid "Keyring Maintainers (OpenPGP)"
 msgstr ""
 
 #: ../../english/intro/organization.data:332
diff --git a/english/ports/hurd/hurd-devel-debian.wml b/english/ports/hurd/hurd-devel-debian.wml
index d4ca9e9fa6f..1e34c76ab3c 100644
--- a/english/ports/hurd/hurd-devel-debian.wml
+++ b/english/ports/hurd/hurd-devel-debian.wml
@@ -46,7 +46,7 @@ Instead <code>-B</code> you can use
 parts of the package (but that is usually useless since they are already
 available in the archive, and building them may require additional
 dependencies). You can add
-<code>-uc</code> to avoid signing the package with your pgp key.</p>
+<code>-uc</code> to avoid signing the package with your OpenPGP key.</p>
 
 <p>
 Building may needed additional installed packages. The simplest way it to run
diff --git a/english/security/faq.wml b/english/security/faq.wml
index b7215959deb..fbce4753ea2 100644
--- a/english/security/faq.wml
+++ b/english/security/faq.wml
@@ -167,7 +167,7 @@
 <p>If desired, email can be encrypted with the Debian Security
    Contact key (key ID <a
    href="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x0d59d2b15144766a14d241c66baf400b05c3e651">\
-   0x0D59D2B15144766A14D241C66BAF400B05C3E651</a>). For the PGP/GPG keys of individual team members, please
+   0x0D59D2B15144766A14D241C66BAF400B05C3E651</a>). For the OpenPGP keys of individual team members, please
    refer to the <a href="https://keyring.debian.org/">keyring.debian.org</a>
    keyserver.</p>