launchpad-reviewers team mailing list archive

[Quentin Debhi <mp+469476@xxxxxxxxxxxxxxxxxx>]

Quentin Debhi has proposed merging ~ruinedyourlife/launchpad:feat-gpg-keys-help into launchpad:master.

Commit message:
Adds details about verifying the email address and potentially uploading to the global keyserver.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ruinedyourlife/launchpad/+git/launchpad/+merge/469476
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ruinedyourlife/launchpad:feat-gpg-keys-help into launchpad:master.

diff --git a/lib/lp/registry/help/openpgp-keys.html b/lib/lp/registry/help/openpgp-keys.html
index 7d1cef3..a0b9c7e 100644
--- a/lib/lp/registry/help/openpgp-keys.html
+++ b/lib/lp/registry/help/openpgp-keys.html
@@ -68,8 +68,9 @@
         of people's public keys, you can make your public key available to
         anyone else.</p>
 
-      <p>Before you add your key to Launchpad, you need to push it to the
-        Ubuntu keyserver.</p>
+      <p>Before you add your key to Launchpad, you need to push it to the Ubuntu
+      keyserver. (If the import fails, it is worth trying to import it to the
+      global keyserver as well.)</p>
 
       <h4>Using <em>Passwords and Encryption Keys</em></h4>
 
@@ -96,6 +97,11 @@
           Launchpad</a>!
       </p>
 
+      <p>
+        Make sure the email address you used to generate your key with is the
+        same as the one that is registered with Launchpad.
+      </p>
+
       <h3>Renewing your key</h3>
 
       <p>