Merge lp:~dev-nigelj/launchpad/bug-763820 into lp:launchpad

Proposed by Nigel Jones
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 13938
Proposed branch: lp:~dev-nigelj/launchpad/bug-763820
Merge into: lp:launchpad
Diff against target: 14 lines (+2/-2)
1 file modified
lib/lp/registry/templates/person-editpgpkeys.pt (+2/-2)
To merge this branch: bzr merge lp:~dev-nigelj/launchpad/bug-763820
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+75111@code.launchpad.net

Commit message

[r=wgrant][bug=763820] Change message on +editpgpkeys from "The key must be registered with with an Ubuntu key server." to "The key must be registered with the Ubuntu key server."

Description of the change

Very simple/trivial fix to correct a double "with" on +pgpeditkeys

All this changes is the template lib/lp/registry/templates/person-editpgpkeys.pt

I don't think there is much point creating a separate test for this (but if there is, please let me know) and running './bin/test -vvm lp.registry -t gpg' ran clean and so did 'make lint'.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/templates/person-editpgpkeys.pt'
--- lib/lp/registry/templates/person-editpgpkeys.pt 2010-11-10 22:14:57 +0000
+++ lib/lp/registry/templates/person-editpgpkeys.pt 2011-09-13 04:48:25 +0000
@@ -157,8 +157,8 @@
157 <h2>Import an OpenPGP key</h2>157 <h2>Import an OpenPGP key</h2>
158158
159 <p>To start using an OpenPGP key with your Launchpad account, simply159 <p>To start using an OpenPGP key with your Launchpad account, simply
160 paste its fingerprint below. The key must be registered with with160 paste its fingerprint below. The key must be registered with the
161 an Ubuntu key server.161 Ubuntu key server.
162 (<a href="/+help/import-pgp-key.html" target="help">How to get the162 (<a href="/+help/import-pgp-key.html" target="help">How to get the
163 fingerprint</a>)163 fingerprint</a>)
164 </p>164 </p>