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

2 files changed, 9 insertions, 9 deletions

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