Merge lp:~cjwatson/launchpad/email-spelling into lp:launchpad

[Colin Watson]

Use the spelling "email" rather than "e-mail" throughout the codebase.

Use the spelling "email" rather than "e-mail" throughout the codebase.

This is by way of following up to a review comment on https://code.launchpad.net/~cjwatson/launchpad/mail-footer-pref/+merge/264720 that I missed. I prefer the spelling "e-mail" in my own writing, but "email" seems dominant in the Launchpad codebase and consistency is important. The last version of the Canonical marketing style guide recommends "email" (it was recently removed from the internal wiki and I can't find a current version, but https://wiki.canonical.com/Marketing/Style_guide?action=recall&rev=55 was the last one).

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2015-06-05 02:29:56 +0000
+++ database/schema/comments.sql	2015-07-21 09:14:19 +0000
@@ -345,7 +345,7 @@
 
 -- BugTrackerPerson
 
-COMMENT ON TABLE BugTrackerPerson IS 'A mapping from a user in an external bug tracker to a Person record in Launchpad. This is used when we can''t get an e-mail address from the bug tracker.';
+COMMENT ON TABLE BugTrackerPerson IS 'A mapping from a user in an external bug tracker to a Person record in Launchpad. This is used when we can''t get an email address from the bug tracker.';
 COMMENT ON COLUMN BugTrackerPerson.date_created IS 'When was this mapping added.';
 COMMENT ON COLUMN BugTrackerPerson.bugtracker IS 'The external bug tracker in which this user has an account.';
 COMMENT ON COLUMN BugTrackerPerson.name IS 'The (within the bug tracker) unique username in the external bug tracker.';

=== modified file 'database/schema/launchpad-2209-00-0.sql'
--- database/schema/launchpad-2209-00-0.sql	2011-12-06 14:13:15 +0000
+++ database/schema/launchpad-2209-00-0.sql	2015-07-21 09:14:19 +0000
@@ -7084,7 +7084,7 @@
 );
 
 
-COMMENT ON TABLE bugtrackerperson IS 'A mapping from a user in an external bug tracker to a Person record in Launchpad. This is used when we can''t get an e-mail address from the bug tracker.';
+COMMENT ON TABLE bugtrackerperson IS 'A mapping from a user in an external bug tracker to a Person record in Launchpad. This is used when we can''t get an email address from the bug tracker.';
 
 
 COMMENT ON COLUMN bugtrackerperson.date_created IS 'When was this mapping added.';

=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py	2015-07-08 16:05:11 +0000
+++ lib/lp/answers/browser/question.py	2015-07-21 09:14:19 +0000
@@ -1079,7 +1079,7 @@
         """Post-processing work common to all workflow actions.
 
         Adds a notification, subscribe the user if he checked the
-        'E-mail me...' option and redirect to the question page.
+        'Email me...' option and redirect to the question page.
         """
         self.request.response.addNotification(message)
 

=== modified file 'lib/lp/answers/interfaces/question.py'
--- lib/lp/answers/interfaces/question.py	2013-01-07 02:40:55 +0000
+++ lib/lp/answers/interfaces/question.py	2015-07-21 09:14:19 +0000
@@ -526,7 +526,7 @@
     message = Text(title=_('Message'), required=False)
 
     subscribe_me = Bool(
-        title=_('E-mail me future discussion about this question'),
+        title=_('Email me future discussion about this question'),
         required=False, default=False)
 
 

=== modified file 'lib/lp/answers/interfaces/questionsubscription.py'
--- lib/lp/answers/interfaces/questionsubscription.py	2013-01-07 02:40:55 +0000
+++ lib/lp/answers/interfaces/questionsubscription.py	2015-07-21 09:14:19 +0000
@@ -33,7 +33,7 @@
     person = exported(PersonChoice(
         title=_('Person'), required=True, vocabulary='ValidPersonOrTeam',
         readonly=True, description=_("The person's Launchpad ID or "
-        "e-mail address.")), as_of="devel")
+        "email address.")), as_of="devel")
     question = exported(Reference(
         Interface, title=_("Question"), required=True, readonly=True),
         as_of="devel")

=== modified file 'lib/lp/answers/stories/question-subscriptions.txt'
--- lib/lp/answers/stories/question-subscriptions.txt	2013-09-27 04:13:23 +0000
+++ lib/lp/answers/stories/question-subscriptions.txt	2015-07-21 09:14:19 +0000
@@ -52,7 +52,7 @@
 == Subscribing While Posting A Message ==
 
 It is also possible to subscribe at the same time than posting a message
-on an existing question. The user can simply check the 'E-mail me future
+on an existing question. The user can simply check the 'Email me future
 discussion about this question' checkbox:
 
     >>> user_browser.open('http://launchpad.dev/firefox/+question/6')
@@ -60,7 +60,7 @@
     ...     "Try starting firefox from the command-line. Are there any "
     ...     "messages appearing?")
     >>> user_browser.getControl(
-    ...     'E-mail me future discussion about this question').selected = True
+    ...     'Email me future discussion about this question').selected = True
     >>> user_browser.getControl("Add Information Request").click()
 
 A notification message is displayed notifying of the subscription:

=== modified file 'lib/lp/app/browser/stringformatter.py'
--- lib/lp/app/browser/stringformatter.py	2015-07-08 16:05:11 +0000
+++ lib/lp/app/browser/stringformatter.py	2015-07-21 09:14:19 +0000
@@ -881,7 +881,7 @@
         matches = re.finditer(re_email_address, text)
         for match in matches:
             address = match.group()
-            # Since we globally replace the e-mail in the text, if we have seen
+            # Since we globally replace the email in the text, if we have seen
             # the address before, skip it.
             if address in seen_addresses:
                 continue

=== modified file 'lib/lp/app/doc/displaying-paragraphs-of-text.txt'
--- lib/lp/app/doc/displaying-paragraphs-of-text.txt	2014-05-19 11:33:05 +0000
+++ lib/lp/app/doc/displaying-paragraphs-of-text.txt	2015-07-21 09:14:19 +0000
@@ -22,7 +22,7 @@
     u'<p>This is a line.<br />\nThis is another line.</p>'
 
     >>> text = (
-    ...     'This is a paragraph that has been hard-wrapped by an e-mail'
+    ...     'This is a paragraph that has been hard-wrapped by an email'
     ...     ' application.\n'
     ...     'We used to handle this specially, but we no longer do because it'
     ...     ' was disturbing\n'
@@ -31,7 +31,7 @@
     ...     '* elation'
     ...     )
     >>> print test_tales('foo/fmt:text-to-html', foo=text)
-    <p>This is a paragraph that has been hard-wrapped by an e-mail
+    <p>This is a paragraph that has been hard-wrapped by an email
     application.<br />
     We used to handle this specially, but we no longer do because it was
     disturbing<br />

=== modified file 'lib/lp/app/tour/bugs'
--- lib/lp/app/tour/bugs	2015-01-30 11:44:42 +0000
+++ lib/lp/app/tour/bugs	2015-07-21 09:14:19 +0000
@@ -98,7 +98,7 @@
                         <p>
                         Manage bug reports entirely through your email client.
 <br /><br />
-						You can use email to report, subscribe, comment on, assign, prioritise and make just about any other update to bugs tracked in Launchpad. Launchpad will also mail you with updates on any bug you're interested in, whether an individual bug or all the bugs associated with a particular project or package. Read more about <a href="https://help.launchpad.net/Bugs/EmailInterface">the bug tracker's e-mail interface &gt;</a><br /><br />
+						You can use email to report, subscribe, comment on, assign, prioritise and make just about any other update to bugs tracked in Launchpad. Launchpad will also mail you with updates on any bug you're interested in, whether an individual bug or all the bugs associated with a particular project or package. Read more about <a href="https://help.launchpad.net/Bugs/EmailInterface">the bug tracker's email interface &gt;</a><br /><br />
 						And, if you prefer, you can also subscribe to bug information in your feed reader with our Atom feeds. <img src="https://launchpad.net/@@/rss" alt="Feed logo" />
                         </p>
                     </div>

=== modified file 'lib/lp/blueprints/interfaces/specificationsubscription.py'
--- lib/lp/blueprints/interfaces/specificationsubscription.py	2013-01-07 02:40:55 +0000
+++ lib/lp/blueprints/interfaces/specificationsubscription.py	2015-07-21 09:14:19 +0000
@@ -41,7 +41,7 @@
             vocabulary='ValidPersonOrTeam', readonly=True,
             description=_(
             'The person you would like to subscribe to this blueprint. '
-            'They will be notified of the subscription by e-mail.')
+            'They will be notified of the subscription by email.')
             )
     personID = Attribute('db person value')
     specification = Int(title=_('Specification'), required=True,

=== modified file 'lib/lp/blueprints/model/tests/test_specification.py'
--- lib/lp/blueprints/model/tests/test_specification.py	2015-03-02 00:40:01 +0000
+++ lib/lp/blueprints/model/tests/test_specification.py	2015-07-21 09:14:19 +0000
@@ -246,7 +246,7 @@
             new_work_item['title'],
             new_work_item['status'].name)
         [email] = stub.test_emails
-        # Actual message is part 2 of the e-mail.
+        # Actual message is part 2 of the email.
         msg = email[2]
         self.assertIn(rationale, msg)
 
@@ -267,7 +267,7 @@
         self.assertEqual(1, len(stub.test_emails))
         rationale = '- %s: %s' % (wi.title, wi.status.name)
         [email] = stub.test_emails
-        # Actual message is part 2 of the e-mail.
+        # Actual message is part 2 of the email.
         msg = email[2]
         self.assertIn(rationale, msg)
 
@@ -309,7 +309,7 @@
         rationale_added = '+ %s: %s' % (
             new_work_item['title'], new_work_item['status'].name)
         [email] = stub.test_emails
-        # Actual message is part 2 of the e-mail.
+        # Actual message is part 2 of the email.
         msg = email[2]
         self.assertIn(rationale_removed, msg)
         self.assertIn(rationale_added, msg)

=== modified file 'lib/lp/bugs/browser/structuralsubscription.py'
--- lib/lp/bugs/browser/structuralsubscription.py	2014-11-24 15:08:36 +0000
+++ lib/lp/bugs/browser/structuralsubscription.py	2015-07-21 09:14:19 +0000
@@ -243,13 +243,13 @@
             target.addBugSubscription(self.user, self.user)
             self.request.response.addNotification(
                 'You have subscribed to "%s". You will now receive an '
-                'e-mail each time someone reports or changes one of '
+                'email each time someone reports or changes one of '
                 'its bugs.' % target.displayname)
         elif is_subscribed and not subscribe:
             target.removeBugSubscription(self.user, self.user)
             self.request.response.addNotification(
                 'You have unsubscribed from "%s". You '
-                'will no longer automatically receive e-mail about '
+                'will no longer automatically receive email about '
                 'changes to its bugs.' % target.displayname)
         else:
             # The subscription status did not change: nothing to do.
@@ -270,7 +270,7 @@
         for team in form_selected_teams - subscriptions:
             target.addBugSubscription(team, self.user)
             self.request.response.addNotification(
-                'The %s team will now receive an e-mail each time '
+                'The %s team will now receive an email each time '
                 'someone reports or changes a public bug in "%s".' % (
                 team.displayname, self.context.displayname))
 
@@ -278,7 +278,7 @@
             target.removeBugSubscription(team, self.user)
             self.request.response.addNotification(
                 'The %s team will no longer automatically receive '
-                'e-mail about changes to public bugs in "%s".' % (
+                'email about changes to public bugs in "%s".' % (
                     team.displayname, self.context.displayname))
 
     def _handleDriverChanges(self, data):
@@ -291,7 +291,7 @@
         if new_subscription is not None:
             target.addBugSubscription(new_subscription, self.user)
             self.request.response.addNotification(
-                '%s will now receive an e-mail each time someone '
+                '%s will now receive an email each time someone '
                 'reports or changes a public bug in "%s".' % (
                 new_subscription.displayname,
                 target.displayname))
@@ -300,7 +300,7 @@
         for subscription in subscriptions_to_remove:
             target.removeBugSubscription(subscription, self.user)
             self.request.response.addNotification(
-                '%s will no longer automatically receive e-mail about '
+                '%s will no longer automatically receive email about '
                 'public bugs in "%s".' % (
                     subscription.displayname, target.displayname))
 

=== modified file 'lib/lp/bugs/doc/bugnotification-email.txt'
--- lib/lp/bugs/doc/bugnotification-email.txt	2015-03-13 19:05:50 +0000
+++ lib/lp/bugs/doc/bugnotification-email.txt	2015-07-21 09:14:19 +0000
@@ -246,7 +246,7 @@
     ** Information type changed from Public to Private Security
     -----------------------------
 
-Now we set the bug back to public and check if the e-mail sent changed as well.
+Now we set the bug back to public and check if the email sent changed as well.
 
     >>> changed = edited_bug.transitionToInformationType(
     ...     InformationType.PUBLIC, getUtility(ILaunchBag).user)

=== modified file 'lib/lp/bugs/doc/bugtarget.txt'
--- lib/lp/bugs/doc/bugtarget.txt	2010-10-17 15:44:08 +0000
+++ lib/lp/bugs/doc/bugtarget.txt	2015-07-21 09:14:19 +0000
@@ -9,7 +9,7 @@
 Bug targets have a bugtargetdisplayname attribute, which returns a value
 tailored for human reading (e.g. display in Web pages); and a bugtargetname
 attribute, which returns a value tailored for unique identification of the
-target (such as in filterable e-mail messages).
+target (such as in filterable email messages).
 
     >>> from zope.component import getUtility
     >>> from lp.bugs.interfaces.bugtarget import IBugTarget

=== modified file 'lib/lp/bugs/doc/externalbugtracker-bug-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2015-07-08 16:05:11 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2015-07-21 09:14:19 +0000
@@ -86,7 +86,7 @@
     Joe Bloggs
 
 Since he didn't have a Launchpad account before, he doesn't have a
-preferred e-mail address, and the one that is associated with his
+preferred email address, and the one that is associated with his
 account is marked as NEW, since we don't know whether it's valid.
 
     >>> from lp.services.identity.interfaces.emailaddress import (
@@ -105,7 +105,7 @@
     u'when importing bug #3 from http://...'
 
 No one got subscribed to the created bug, since the relevant people
-already get e-mail notifications via the external bug tracker.
+already get email notifications via the external bug tracker.
 
     >>> [person.name for person in bug.getDirectSubscribers()]
     []
@@ -168,7 +168,7 @@
 ----------------------------------------
 
 Even if the reporter of the bug has an account in Launchpad (and thus a
-valid e-mail address), he still won't be subscribed to the imported bug.
+valid email address), he still won't be subscribed to the imported bug.
 
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
     >>> no_priv.preferredemail is not None

=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2015-07-08 16:05:11 +0000
+++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2015-07-21 09:14:19 +0000
@@ -143,7 +143,7 @@
 
 In the examples above, [e-mail] was used as the poster of
 all the comments. Since Joe didn't have a Launchpad account, it was
-created automatically for him, with the e-mail address marked as
+created automatically for him, with the email address marked as
 invalid.
 
     >>> joe = getUtility(IPersonSet).getByEmail('[e-mail]',
@@ -160,7 +160,7 @@
     >>> print joe.creation_comment
     when importing comments for Bugzilla *TESTING* #123456.
 
-If the poster's e-mail is already registered in Launchpad, the comment
+If the poster's email is already registered in Launchpad, the comment
 is associated with the existing person.
 
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
@@ -423,11 +423,11 @@
     >>> karma_helper.unregister_listener()
 
 
-== E-mail notifications ==
+== Email notifications ==
 
 When bug comments are imported, notifications are sent to inform the bug
 subscribers about it. The first time we import comments from a bug
-watch, there can be a lot of comments. To avoid causing a lot of e-mail
+watch, there can be a lot of comments. To avoid causing a lot of email
 notifications to be sent, only one notification is sent for all the
 comments.
 

=== modified file 'lib/lp/bugs/interfaces/bugactivity.py'
--- lib/lp/bugs/interfaces/bugactivity.py	2013-01-07 02:40:55 +0000
+++ lib/lp/bugs/interfaces/bugactivity.py	2015-07-21 09:14:19 +0000
@@ -47,7 +47,7 @@
     person = exported(PersonChoice(
         title=_('Person'), required=True, vocabulary='ValidPersonOrTeam',
         readonly=True, description=_("The person's Launchpad ID or "
-        "e-mail address.")))
+        "email address.")))
 
     whatchanged = exported(
         TextLine(title=_('What Changed'),

=== modified file 'lib/lp/bugs/interfaces/bugmessage.py'
--- lib/lp/bugs/interfaces/bugmessage.py	2014-05-29 16:18:50 +0000
+++ lib/lp/bugs/interfaces/bugmessage.py	2015-07-21 09:14:19 +0000
@@ -104,7 +104,7 @@
         required=False, default=False)
     attachment_description = Title(title=u'Description', required=False)
     email_me = Bool(
-        title=u"E-mail me about changes to this bug report",
+        title=u"Email me about changes to this bug report",
         required=False, default=False)
     bugwatch_id = Int(
         title=(u"Synchronize this comment with a remote bug "

=== modified file 'lib/lp/bugs/interfaces/bugsubscription.py'
--- lib/lp/bugs/interfaces/bugsubscription.py	2013-01-07 02:40:55 +0000
+++ lib/lp/bugs/interfaces/bugsubscription.py	2015-07-21 09:14:19 +0000
@@ -44,7 +44,7 @@
     person = exported(PersonChoice(
         title=_('Person'), required=True, vocabulary='ValidPersonOrTeam',
         readonly=True, description=_("The person's Launchpad ID or "
-        "e-mail address.")), as_of="beta")
+        "email address.")), as_of="beta")
     bug = exported(Reference(
         Interface, title=_("Bug"), required=True, readonly=True),
         as_of="beta")

=== modified file 'lib/lp/bugs/interfaces/structuralsubscription.py'
--- lib/lp/bugs/interfaces/structuralsubscription.py	2015-01-29 10:07:53 +0000
+++ lib/lp/bugs/interfaces/structuralsubscription.py	2015-07-21 09:14:19 +0000
@@ -265,5 +265,5 @@
 class IStructuralSubscriptionForm(Interface):
     """Schema for the structural subscription form."""
     subscribe_me = Bool(
-        title=u"I want to receive these notifications by e-mail.",
+        title=u"I want to receive these notifications by email.",
         required=False)

=== modified file 'lib/lp/bugs/mail/tests/test_bug_task_assignment.py'
--- lib/lp/bugs/mail/tests/test_bug_task_assignment.py	2012-08-08 07:22:51 +0000
+++ lib/lp/bugs/mail/tests/test_bug_task_assignment.py	2015-07-21 09:14:19 +0000
@@ -78,7 +78,7 @@
         rationale = (
             'You have assigned this bug to yourself for Rebirth')
         [email] = stub.test_emails
-        # Actual message is part 2 of the e-mail.
+        # Actual message is part 2 of the email.
         msg = email[2]
         self.assertIn(rationale, msg)
 
@@ -98,7 +98,7 @@
                         '%s not in \n%s\n' % (new_message, msg))
 
     def test_assignee_new_subscriber(self):
-        """Build a list of people who will receive e-mails about the bug
+        """Build a list of people who will receive emails about the bug
         task changes and ensure the assignee is not one."""
         self.bug_task.transitionToAssignee(self.person_assigned)
         notify(ObjectModifiedEvent(
@@ -115,7 +115,7 @@
 
     def test_team_assigned_new_subscriber(self):
         """Assign a team, who is not subscribed to a bug, a bug task and
-        ensure that team members do not receive an e-mail about the bug
+        ensure that team members do not receive an email about the bug
         task changes."""
         self.bug_task.transitionToAssignee(self.team_assigned)
         notify(ObjectModifiedEvent(

=== modified file 'lib/lp/bugs/scripts/updateremoteproduct.py'
--- lib/lp/bugs/scripts/updateremoteproduct.py	2012-06-29 08:40:05 +0000
+++ lib/lp/bugs/scripts/updateremoteproduct.py	2015-07-21 09:14:19 +0000
@@ -38,7 +38,7 @@
 
     def update(self):
         """Update `remote_product` for all Products it can be set for."""
-        # We can't interact with an e-mail address, so don't try to
+        # We can't interact with an email address, so don't try to
         # update products with such trackers.
         types_to_exclude = (
             SINGLE_PRODUCT_BUGTRACKERTYPES + [BugTrackerType.EMAILADDRESS])

=== modified file 'lib/lp/bugs/stories/bugs/xx-unique-ids-on-bug-page.txt'
--- lib/lp/bugs/stories/bugs/xx-unique-ids-on-bug-page.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugs/xx-unique-ids-on-bug-page.txt	2015-07-21 09:14:19 +0000
@@ -3,7 +3,7 @@
 On the bug page, the bugtasks are editable inline. This means that
 basically the same form is included on the page for each bugtask. Even
 so, if a bug has more than one bugtasks, all the ids used in the forms
-are unique (except.for the "E-mail me about changes to this bug report"
+are unique (except.for the "Email me about changes to this bug report"
 option).
 
 For example, bug one has more than one Package field.
@@ -25,7 +25,7 @@
     ...        non_unique_ids.append(tag['id'])
     ...    found_ids.add(tag['id'])
 
-(The "E-mail me..." option has the same id everywhere since the
+(The "Email me..." option has the same id everywhere since the
 user is not subscribing to the bugtask, but to the bug.)
 
     >>> non_unique_ids

=== modified file 'lib/lp/bugs/stories/bugtask-management/xx-subscribe-while-editing.txt'
--- lib/lp/bugs/stories/bugtask-management/xx-subscribe-while-editing.txt	2011-05-16 01:53:42 +0000
+++ lib/lp/bugs/stories/bugtask-management/xx-subscribe-while-editing.txt	2015-07-21 09:14:19 +0000
@@ -8,7 +8,7 @@
     >>> browser.getControl("Status").value = ["Confirmed"]
     >>> browser.getControl("Comment on this change (optional)").value = "test"
     >>> browser.getControl(
-    ...     "E-mail me about changes to this bug report").selected = True
+    ...     "Email me about changes to this bug report").selected = True
 
     >>> browser.getControl("Save Changes").click()
 
@@ -21,7 +21,7 @@
     >>> browser.open(
     ...     "http://launchpad.dev/firefox/+bug/5/+editstatus")
 
-    >>> browser.getControl("E-mail me about changes to this bug report")
+    >>> browser.getControl("Email me about changes to this bug report")
     Traceback (most recent call last):
       ...
     LookupError: ...

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt	2013-09-27 04:13:23 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-distro-guided-filebug.txt	2015-07-21 09:14:19 +0000
@@ -41,7 +41,7 @@
     # zope.testbrowser truncates document content after goBack().
     >>> user_browser.open("http://launchpad.dev/ubuntu/+filebug")
     >>> user_browser.getControl("Summary", index=0).value = (
-    ...     "Thunderbird crashes when opening large e-mails")
+    ...     "Thunderbird crashes when opening large emails")
     >>> user_browser.getControl("Continue").click()
 
 ...and continue filing our bug.

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt	2011-04-20 14:56:23 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-distro-sourcepackage-guided-filebug.txt	2015-07-21 09:14:19 +0000
@@ -7,7 +7,7 @@
     ...     "http://launchpad.dev/ubuntu/+source/mozilla-firefox/"
     ...     "+filebug")
     >>> user_browser.getControl(name="field.title", index=0).value = (
-    ...     "Thunderbird crashes when opening large e-mails")
+    ...     "Thunderbird crashes when opening large emails")
     >>> user_browser.getControl("Continue").click()
 
 In this case, since we search only Ubuntu Firefox bugs, there are no

=== modified file 'lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt'
--- lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2015-06-26 14:00:41 +0000
+++ lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt	2015-07-21 09:14:19 +0000
@@ -28,7 +28,7 @@
     ... 'http://bugs.launchpad.dev/ubuntu/+source/mozilla-firefox')
     >>> browser.getLink('Subscribe to bug mail').click()
     >>> subscribe_myself = browser.getControl(
-    ...    'I want to receive these notifications by e-mail')
+    ...    'I want to receive these notifications by email')
     >>> subscribe_myself.selected
     False
     >>> subscribe_myself.selected = True
@@ -56,7 +56,7 @@
 Sample Person can also unsubscribe himself and the Landscape team.
 
     >>> subscribe_myself = browser.getControl(
-    ...    'I want to receive these notifications by e-mail')
+    ...    'I want to receive these notifications by email')
     >>> subscribe_myself.selected = False
     >>> subscribe_team = browser.getControl('Landscape')
     >>> subscribe_team.selected = False
@@ -105,7 +105,7 @@
 
     >>> for message in find_tags_by_class(browser.contents, 'message'):
     ...     print message.renderContents()
-    No Privileges Person will now receive an e-mail each time someone reports
+    No Privileges Person will now receive an email each time someone reports
     or changes a public bug in &quot;mozilla-firefox in Ubuntu&quot;.
 
     >>> browser.open(
@@ -128,7 +128,7 @@
     >>> browser.getControl('Save these changes').click()
     >>> print find_tags_by_class(
     ...    browser.contents, 'informational message')[0].contents[0]
-    No Privileges Person will no longer automatically receive e-mail about
+    No Privileges Person will no longer automatically receive email about
     public bugs in &quot;mozilla-firefox in Ubuntu&quot;.
     >>> browser.open(
     ... 'http://bugs.launchpad.dev/ubuntu/+source/mozilla-firefox/+subscribe')
@@ -205,7 +205,7 @@
 
     >>> browser.open('http://bugs.launchpad.dev/ubuntu/+subscribe')
     >>> text_contents = extract_text(find_main_content(browser.contents))
-    >>> "You can choose to receive an e-mail every time" in text_contents
+    >>> "You can choose to receive an email every time" in text_contents
     True
 
 Set a bug supervisor for Ubuntu.

=== modified file 'lib/lp/bugs/templates/bug-addsubscriber.pt'
--- lib/lp/bugs/templates/bug-addsubscriber.pt	2009-08-31 15:41:15 +0000
+++ lib/lp/bugs/templates/bug-addsubscriber.pt	2015-07-21 09:14:19 +0000
@@ -13,7 +13,7 @@
           <div metal:use-macro="context/@@launchpad_form/form">
             <p metal:fill-slot="extra_info">
               You should only subscribe someone who really will want to receive
-              e-mail notifications of changes to the bug report.
+              email notifications of changes to the bug report.
             </p>
           </div>
     </div>

=== modified file 'lib/lp/bugs/templates/bugtask-edit-form.pt'
--- lib/lp/bugs/templates/bugtask-edit-form.pt	2012-12-10 13:43:47 +0000
+++ lib/lp/bugs/templates/bugtask-edit-form.pt	2015-07-21 09:14:19 +0000
@@ -255,7 +255,7 @@
       <label style="font-weight: normal">
         <input type="checkbox" name="subscribe" id="subscribe"
                value="Subscribe" />
-        E-mail me about changes to this bug report
+        Email me about changes to this bug report
       </label>
     </div>
   </div>

=== modified file 'lib/lp/bugs/templates/malone-portlet-bugmail-filtering-faq.pt'
--- lib/lp/bugs/templates/malone-portlet-bugmail-filtering-faq.pt	2012-07-06 06:02:33 +0000
+++ lib/lp/bugs/templates/malone-portlet-bugmail-filtering-faq.pt	2015-07-21 09:14:19 +0000
@@ -3,8 +3,8 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   class="portlet" id="portlet-help">
-  <h2>Managing Launchpad Bugs e-mail</h2>
-    <p>Every e-mail message sent by the Launchpad Bug Tracker includes one or
+  <h2>Managing Launchpad Bugs email</h2>
+    <p>Every email message sent by the Launchpad Bug Tracker includes one or
       more <a href="https://help.launchpad.net/Bugs/Subscriptions"
     ><code>X-Launchpad-Bug:</code></a> headers. You can use tools such as
     <a href="http://www.procmail.org">procmail</a> to create custom filters

=== modified file 'lib/lp/bugs/templates/structural-subscriptions-manage.pt'
--- lib/lp/bugs/templates/structural-subscriptions-manage.pt	2011-01-21 08:12:29 +0000
+++ lib/lp/bugs/templates/structural-subscriptions-manage.pt	2015-07-21 09:14:19 +0000
@@ -12,7 +12,7 @@
     <p>
       You are unable to subscribe to bug reports about <span
         tal:replace="context/title">this item</span> as it generates
-      a high amount of bug activity which results in more e-mails than
+      a high amount of bug activity which results in more emails than
       most users can handle.
     </p>
     <p>
@@ -23,14 +23,13 @@
     </tal:no_permissions>
     <tal:has_permissions condition="view/userCanAlter|nothing">
     <p>
-      You can choose to receive an e-mail every time someone reports or
+      You can choose to receive an email every time someone reports or
       changes a public bug associated with 
       <span tal:replace="context/title">this item</span>.
     </p>
     <p>
       <strong>Important:</strong> subscribing here may mean you receive a
-      great deal of e-mail. You can return here to unsubscribe at any 
-      time.
+      great deal of email. You can return here to unsubscribe at any time.
     </p>
     <div metal:use-macro="context/@@launchpad_form/form" />
   </tal:has_permissions>

=== modified file 'lib/lp/bugs/tests/bugs-emailinterface.txt'
--- lib/lp/bugs/tests/bugs-emailinterface.txt	2015-03-13 19:05:50 +0000
+++ lib/lp/bugs/tests/bugs-emailinterface.txt	2015-07-21 09:14:19 +0000
@@ -1,7 +1,7 @@
-Launchpad Bugs e-mail interface
-===============================
+Launchpad Bugs email interface
+==============================
 
-Launchpad's bugtracker has an e-mail interface, with which you may report new
+Launchpad's bugtracker has an email interface, with which you may report new
 bugs, add comments, and change the details of existing bug reports. Commands
 can be interleaved within a comment, so to distinguish them from the comment,
 they must be indented with at least one space or tab character.
@@ -9,7 +9,7 @@
 Submit a new bug
 ----------------
 
-To report a bug, you send an OpenPGP-signed e-mail message to
+To report a bug, you send an OpenPGP-signed email message to
 [e-mail]-domain. You must have registered your key in
 Launchpad as well. The subject of the email will be used as the summary
 of the bug, and the body will be used as the description. In the body of
@@ -2061,7 +2061,7 @@
     Some error message.
     <BLANKLINE>
     --
-    For more information about using Launchpad by e-mail, see
+    For more information about using Launchpad by email, see
     https://help.launchpad.net/EmailInterface
     or send an email to [e-mail]
 
@@ -2204,7 +2204,7 @@
     There's no such person with the specified name or email: nonexistentuser
     <BLANKLINE>
     --
-    For more information about using Launchpad by e-mail, see
+    For more information about using Launchpad by email, see
     https://help.launchpad.net/EmailInterface
     or send an email to [e-mail]
 
@@ -2256,7 +2256,7 @@
         security yes
     <BLANKLINE>
     --
-    For more information about using Launchpad by e-mail, see
+    For more information about using Launchpad by email, see
     https://help.launchpad.net/EmailInterface
     or send an email to [e-mail]
 

=== modified file 'lib/lp/bugs/tests/test_bugchanges.py'
--- lib/lp/bugs/tests/test_bugchanges.py	2013-11-29 14:12:13 +0000
+++ lib/lp/bugs/tests/test_bugchanges.py	2015-07-21 09:14:19 +0000
@@ -198,7 +198,7 @@
 
     def test_subscribe(self):
         # Subscribing someone to a bug adds an item to the activity log,
-        # but doesn't send an e-mail notification.
+        # but doesn't send an email notification.
         subscriber = self.factory.makePerson(displayname='Mom')
         bug_subscription = self.bug.subscribe(self.user, subscriber)
         notify(ObjectCreatedEvent(bug_subscription, user=subscriber))
@@ -210,7 +210,7 @@
 
     def test_unsubscribe(self):
         # Unsubscribing someone from a bug adds an item to the activity
-        # log, but doesn't send an e-mail notification.
+        # log, but doesn't send an email notification.
         subscriber = self.factory.makePerson(displayname='Mom')
         self.bug.subscribe(self.user, subscriber)
         self.saveOldChanges()
@@ -452,7 +452,7 @@
 
     def test_link_branch(self):
         # Linking a branch to a bug adds both to the activity log and
-        # sends an e-mail notification.
+        # sends an email notification.
         branch = self.factory.makeBranch()
         self.bug.linkBranch(branch, self.user)
 
@@ -477,7 +477,7 @@
     def test_link_branch_to_complete_bug(self):
         # Linking a branch to a bug that is "complete" (see
         # IBug.is_complete) adds to the activity log but does *not*
-        # send an e-mail notification.
+        # send an email notification.
         for bug_task in self.bug.bugtasks:
             bug_task.transitionToStatus(
                 BugTaskStatus.FIXRELEASED, user=self.user)
@@ -495,7 +495,7 @@
 
     def test_link_private_branch(self):
         # Linking a *private* branch to a bug adds *nothing* to the
-        # activity log and does *not* send an e-mail notification.
+        # activity log and does *not* send an email notification.
         branch = self.factory.makeBranch(
             information_type=InformationType.USERDATA)
         self.bug.linkBranch(branch, self.user)
@@ -503,7 +503,7 @@
 
     def test_unlink_branch(self):
         # Unlinking a branch from a bug adds both to the activity log and
-        # sends an e-mail notification.
+        # sends an email notification.
         branch = self.factory.makeBranch()
         self.bug.linkBranch(branch, self.user)
         self.saveOldChanges()
@@ -530,7 +530,7 @@
     def test_unlink_branch_from_complete_bug(self):
         # Unlinking a branch from a bug that is "complete" (see
         # IBug.is_complete) adds to the activity log but does *not*
-        # send an e-mail notification.
+        # send an email notification.
         for bug_task in self.bug.bugtasks:
             bug_task.transitionToStatus(
                 BugTaskStatus.FIXRELEASED, user=self.user)
@@ -549,7 +549,7 @@
 
     def test_unlink_private_branch(self):
         # Unlinking a *private* branch from a bug adds *nothing* to
-        # the activity log and does *not* send an e-mail notification.
+        # the activity log and does *not* send an email notification.
         branch = self.factory.makeBranch(
             information_type=InformationType.USERDATA)
         self.bug.linkBranch(branch, self.user)
@@ -1639,7 +1639,7 @@
     def test_convert_to_question_no_comment(self):
         # When a bug task is converted to a question, its status is
         # first set to invalid, which causes the normal notifications for
-        # that to be added to the activity log and sent out as e-mail
+        # that to be added to the activity log and sent out as email
         # notification. After that another item is added to the activity
         # log saying that the bug was converted to a question.
         self.product.official_answers = True

=== modified file 'lib/lp/code/doc/branch-merge-proposal-notifications.txt'
--- lib/lp/code/doc/branch-merge-proposal-notifications.txt	2014-11-14 23:21:57 +0000
+++ lib/lp/code/doc/branch-merge-proposal-notifications.txt	2015-07-21 09:14:19 +0000
@@ -88,8 +88,8 @@
     You are subscribed to branch ...
 
 
-E-mail
-------
+Email
+-----
 
 Jobs for notifications are automagically generated when the merge proposal
 is created.  When those jobs are run, the email is sent from the registrant.

=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py	2015-06-03 14:22:21 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py	2015-07-21 09:14:19 +0000
@@ -231,7 +231,7 @@
 
 
         --\x20
-        For more information about using Launchpad by e-mail, see
+        For more information about using Launchpad by email, see
         https://help.launchpad.net/EmailInterface
         or send an email to [e-mail]"""),
                                 message.get_payload(decode=True))

=== modified file 'lib/lp/registry/browser/peoplemerge.py'
--- lib/lp/registry/browser/peoplemerge.py	2015-02-23 19:47:01 +0000
+++ lib/lp/registry/browser/peoplemerge.py	2015-07-21 09:14:19 +0000
@@ -189,7 +189,7 @@
             return
         self.doMerge(data)
 
-    @action('Reassign E-mails and Merge', name='reassign_emails_and_merge')
+    @action('Reassign Emails and Merge', name='reassign_emails_and_merge')
     def reassign_emails_and_merge_action(self, action, data):
         """Reassign emails of the person to be merged and merge them."""
         self.setUpPeople(data)

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2015-07-21 08:42:30 +0000
+++ lib/lp/registry/browser/person.py	2015-07-21 09:14:19 +0000
@@ -829,7 +829,7 @@
     @enabled_with_permission('launchpad.Edit')
     def editemailaddresses(self):
         target = '+editemails'
-        text = 'Change e-mail settings'
+        text = 'Change email settings'
         return Link(target, text, icon='edit')
 
     @enabled_with_permission('launchpad.Edit')
@@ -960,7 +960,7 @@
 
     def email_settings(self):
         target = '+editemails'
-        text = 'E-mail Settings'
+        text = 'Email Settings'
         return Link(target, text)
 
     @enabled_with_permission('launchpad.Special')
@@ -2779,7 +2779,7 @@
     custom_widget('UNVALIDATED_SELECTED', LaunchpadRadioWidget,
                   orientation='vertical')
 
-    label = 'Change your e-mail settings'
+    label = 'Change your email settings'
 
     def initialize(self):
         require_fresh_login(self.request, self.context, '+editemails')
@@ -2993,7 +2993,7 @@
             LoginTokenType.VALIDATEEMAIL)
         token.sendEmailValidationRequest()
         self.request.response.addInfoNotification(
-            "An e-mail message was sent to '%s' with "
+            "An email message was sent to '%s' with "
             "instructions on how to confirm that "
             "it belongs to you." % email)
         self.next_url = self.action_url

=== modified file 'lib/lp/registry/browser/tests/distroseries-views.txt'
--- lib/lp/registry/browser/tests/distroseries-views.txt	2014-07-07 03:43:30 +0000
+++ lib/lp/registry/browser/tests/distroseries-views.txt	2015-07-21 09:14:19 +0000
@@ -63,7 +63,7 @@
     >>> form['field.changeslist'] = ''
     >>> administrate_distroseries(hoary, form)
     1 errors
-    E-mail changes to: changeslist
+    Email changes to: changeslist
     Name: hoary
     Version: 5.04
     Changeslist: [e-mail]
@@ -72,7 +72,7 @@
     >>> form['field.changeslist'] = 'bRoKen_AdDreSs'
     >>> administrate_distroseries(hoary, form)
     1 errors
-    E-mail changes to: Invalid email &#x27;bRoKen_AdDreSs&#x27;.
+    Email changes to: Invalid email &#x27;bRoKen_AdDreSs&#x27;.
     Name: hoary
     Version: 5.04
     Changeslist: [e-mail]

=== modified file 'lib/lp/registry/browser/tests/test_peoplemerge.py'
--- lib/lp/registry/browser/tests/test_peoplemerge.py	2015-05-14 13:57:51 +0000
+++ lib/lp/registry/browser/tests/test_peoplemerge.py	2015-07-21 09:14:19 +0000
@@ -74,7 +74,7 @@
         self.assertThat(
             extract_text(explanation), DocTestMatches(
                 "The account..."
-                "has more than one registered e-mail address..."))
+                "has more than one registered email address..."))
         email_select_control = browser.getControl(name='selected')
         for ctrl in email_select_control.controls:
             ctrl.selected = True
@@ -124,7 +124,7 @@
         # wasn't finished because the duplicate account still have a registered
         # email addresses.
         self.assertIn(
-            'has other registered e-mail addresses too', browser.contents)
+            'has other registered email addresses too', browser.contents)
         return browser, emails
 
     def test_validation_email_confirm(self):
@@ -231,7 +231,7 @@
         explanation = find_tag_by_id(browser.contents, 'explanation')
         self.assertThat(
             extract_text(explanation), DocTestMatches(
-                "The account...has 2 registered e-mail addresses..."))
+                "The account...has 2 registered email addresses..."))
         self.assertRaises(LookupError, browser.getControl, 'selected')
         self.assertNotIn('[e-mail]', browser.contents)
         self.assertNotIn('[e-mail]', browser.contents)
@@ -246,7 +246,7 @@
         self.assertThat(
             extract_text(confirmation), DocTestMatches(
                 "Confirmation email messages were sent to the 2 registered "
-                "e-mail addresses..."))
+                "email addresses..."))
         self.assertNotIn('[e-mail]', browser.contents)
         self.assertNotIn('[e-mail]', browser.contents)
 
@@ -457,7 +457,7 @@
                 'field.dupe_person': self.dupe_person.name,
                 'field.target_person': self.target_person.name,
                 'field.actions.reassign_emails_and_merge':
-                    'Reassign E-mails and Merge',
+                    'Reassign Emails and Merge',
                 }
         return create_initialized_view(
             self.person_set, '+adminpeoplemerge', form=form)

=== modified file 'lib/lp/registry/browser/tests/test_person.py'
--- lib/lp/registry/browser/tests/test_person.py	2015-05-14 13:57:51 +0000
+++ lib/lp/registry/browser/tests/test_person.py	2015-07-21 09:14:19 +0000
@@ -608,7 +608,7 @@
         notifications = view.request.response.notifications
         self.assertEqual(1, len(notifications))
         expected_msg = html_escape(
-            u"An e-mail message was sent to '%s' "
+            u"An email message was sent to '%s' "
             "with instructions on how to confirm that it belongs to you."
             % added_email)
         self.assertEqual(expected_msg, notifications[0].message)
@@ -638,7 +638,7 @@
         token_url = get_token_url_from_email(raw_msg)
         browser = setupBrowserForUser(user=self.person)
         browser.open(token_url)
-        expected_msg = u'Confirm e-mail address <code>%s</code>' % added_email
+        expected_msg = u'Confirm email address <code>%s</code>' % added_email
         self.assertIn(expected_msg, browser.contents)
         browser.getControl('Continue').click()
         # Login again to access displayname, since browser logged us out.

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2015-04-20 15:59:27 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2015-07-21 09:14:19 +0000
@@ -265,8 +265,8 @@
             required=False, vocabulary='ValidPersonOrTeam', schema=IPerson))
     changeslist = exported(
         TextLine(
-            title=_("E-mail changes to"), required=True,
-            description=_("The mailing list or other e-mail address that "
+            title=_("Email changes to"), required=True,
+            description=_("The mailing list or other email address that "
                           "Launchpad should notify about new uploads."),
             constraint=email_validator))
     sourcecount = Attribute("Source Packages Counter")

=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2015-07-14 12:55:00 +0000
+++ lib/lp/registry/interfaces/person.py	2015-07-21 09:14:19 +0000
@@ -553,9 +553,9 @@
         required=False, default=False)
 
     expanded_notification_footers = Bool(
-        title=_("Include filtering information in e-mail footers"),
+        title=_("Include filtering information in email footers"),
         description=_(
-            "Some e-mail clients do not allow filtering on arbitrary message "
+            "Some email clients do not allow filtering on arbitrary message "
             "headers.  If you use one of these, you can set this option to "
             "add more information to the end of message bodies."),
         required=False, default=False)
@@ -848,9 +848,9 @@
         "came from a gina or POFileImporter run.")
     validatedemails = exported(
         CollectionField(
-            title=_("Confirmed e-mails of this person."),
+            title=_("Confirmed emails of this person."),
             description=_(
-                "Confirmed e-mails are the ones in the VALIDATED state"),
+                "Confirmed emails are the ones in the VALIDATED state"),
             readonly=True, required=False,
             value_type=Reference(schema=IEmailAddress)),
         exported_as='confirmed_email_addresses')
@@ -2424,7 +2424,7 @@
         title=_('Duplicated Account'), required=True,
         vocabulary='PersonAccountToMerge',
         description=_(
-            "The e-mail address or Launchpad ID of the account you want to "
+            "The email address or Launchpad ID of the account you want to "
             "merge into yours."))
 
 
@@ -2486,7 +2486,7 @@
         """)
 
     EXTERNAL_ADDRESS = Item("""
-        Another e-mail address
+        Another email address
 
         Notifications directed to this team are sent to the contact address
         specified.

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2015-07-21 08:42:30 +0000
+++ lib/lp/registry/model/person.py	2015-07-21 09:14:19 +0000
@@ -2191,7 +2191,7 @@
         if pre_deactivate and not comment:
             raise AssertionError("Require a comment to deactivate.")
 
-        # Set account status, and set all e-mails to NEW.
+        # Set account status, and set all emails to NEW.
         if pre_deactivate:
             self.preDeactivate(comment)
 

=== modified file 'lib/lp/registry/stories/mailinglists/hosted-email-address.txt'
--- lib/lp/registry/stories/mailinglists/hosted-email-address.txt	2013-09-27 04:13:23 +0000
+++ lib/lp/registry/stories/mailinglists/hosted-email-address.txt	2015-07-21 09:14:19 +0000
@@ -34,7 +34,7 @@
 
     >>> from lp.services.mail import stub
     >>> stub.test_emails = []
-    >>> user_browser.getControl('Another e-mail address').selected = True
+    >>> user_browser.getControl('Another email address').selected = True
     >>> user_browser.getControl(
     ...     name='field.contact_address').value = '[e-mail]'
     >>> user_browser.getControl('Change').click()
@@ -60,7 +60,7 @@
     >>> token_url = get_token_url_from_email(raw_msg)
     >>> user_browser.open(token_url)
     >>> print user_browser.title
-    Confirm e-mail address
+    Confirm email address
     >>> user_browser.getControl('Continue').click()
     >>> print user_browser.title
     Aardvarks in Launchpad
@@ -70,7 +70,7 @@
     >>> user_browser.getLink(url="+contactaddress").click()
     >>> control = user_browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
-    ['Another e-mail address']
+    ['Another email address']
 
 The web UI will only display the team's contact address, but the
 EmailAddress object for that team's mailing list will still be in the

=== modified file 'lib/lp/registry/stories/person/xx-adminpeoplemerge.txt'
--- lib/lp/registry/stories/person/xx-adminpeoplemerge.txt	2013-09-27 04:13:23 +0000
+++ lib/lp/registry/stories/person/xx-adminpeoplemerge.txt	2015-07-21 09:14:19 +0000
@@ -32,7 +32,7 @@
 
 If the user confirms, spiv will be merged into salgado.
 
-    >>> admin_browser.getControl('Reassign E-mails and Merge').click()
+    >>> admin_browser.getControl('Reassign Emails and Merge').click()
     >>> admin_browser.url
     'http://launchpad.dev/~salgado'
 

=== modified file 'lib/lp/registry/stories/person/xx-person-edit.txt'
--- lib/lp/registry/stories/person/xx-person-edit.txt	2015-07-14 13:12:45 +0000
+++ lib/lp/registry/stories/person/xx-person-edit.txt	2015-07-21 09:14:19 +0000
@@ -81,7 +81,7 @@
 He will enable expanded mail notification footers.
 
     >>> expanded_footer_control = browser.getControl(
-    ...     "Include filtering information in e-mail footers")
+    ...     "Include filtering information in email footers")
     >>> expanded_footer_control.selected
     False
     >>> expanded_footer_control.click()
@@ -100,5 +100,5 @@
     ...     "Send me bug notifications for changes I make").selected
     True
     >>> browser.getControl(
-    ...     "Include filtering information in e-mail footers").selected
+    ...     "Include filtering information in email footers").selected
     True

=== modified file 'lib/lp/registry/stories/person/xx-person-editgpgkeys-invalid-key.txt'
--- lib/lp/registry/stories/person/xx-person-editgpgkeys-invalid-key.txt	2012-08-21 14:04:55 +0000
+++ lib/lp/registry/stories/person/xx-person-editgpgkeys-invalid-key.txt	2015-07-21 09:14:19 +0000
@@ -57,7 +57,7 @@
     <BLANKLINE>
     The key 046C6D63 cannot be validated because it has expired. Change the
     expiry date (in a terminal,  enter <kbd>gpg --edit-key
-    <var>[e-mail]</var></kbd> then enter <kbd>expire</kbd>),
+    <var>[e-mail]</var></kbd> then enter <kbd>expire</kbd>),
     and try again.
     <BLANKLINE>
 
@@ -107,7 +107,7 @@
     There is 1 error.
     The key 046C6D63 cannot be validated because it has expired. Change the
     expiry date (in a terminal,  enter <kbd>gpg --edit-key
-    <var>[e-mail]</var></kbd> then enter <kbd>expire</kbd>),
+    <var>[e-mail]</var></kbd> then enter <kbd>expire</kbd>),
     and try again.
 
 The login tokens are only consumed if they're successfully processed.

=== modified file 'lib/lp/registry/stories/person/xx-person-home.txt'
--- lib/lp/registry/stories/person/xx-person-home.txt	2015-02-27 00:57:04 +0000
+++ lib/lp/registry/stories/person/xx-person-home.txt	2015-07-21 09:14:19 +0000
@@ -51,7 +51,7 @@
     Email:
     [e-mail]
     [e-mail]
-    Change e-mail settings
+    Change email settings
     Manage mailing list subscriptions
 
 
@@ -269,6 +269,6 @@
     >>> print extract_text(
     ...     find_tag_by_id(admin_browser.contents, 'email-addresses'))
     [e-mail]
-    Change e-mail settings
+    Change email settings
 
 

=== modified file 'lib/lp/registry/stories/team/xx-team-contactemail-xss.txt'
--- lib/lp/registry/stories/team/xx-team-contactemail-xss.txt	2012-12-10 13:43:47 +0000
+++ lib/lp/registry/stories/team/xx-team-contactemail-xss.txt	2015-07-21 09:14:19 +0000
@@ -5,7 +5,7 @@
 
     >>> admin_browser.open(
     ...     'http://launchpad.dev/~guadamen/+contactaddress')
-    >>> admin_browser.getControl('Another e-mail address').selected = True
+    >>> admin_browser.getControl('Another email address').selected = True
     >>> admin_browser.getControl(name='field.contact_address').value = (
     ...     '<script>alert("cheezburger");</script>')
     >>> admin_browser.getControl('Change').click()

=== modified file 'lib/lp/registry/stories/team/xx-team-contactemail.txt'
--- lib/lp/registry/stories/team/xx-team-contactemail.txt	2013-09-27 04:13:23 +0000
+++ lib/lp/registry/stories/team/xx-team-contactemail.txt	2015-07-21 09:14:19 +0000
@@ -27,7 +27,7 @@
     >>> from BeautifulSoup import BeautifulSoup
     >>> soup = BeautifulSoup(browser.contents)
     >>> soup.find(id='email-warning')
-    <p ... E-mail sent to a mailing list or external contact address may ...
+    <p ... Email sent to a mailing list or external contact address may ...
 
 As we can see, the landscape-developers team has no contact address.
 
@@ -43,7 +43,7 @@
 Changing the contact address to an external address will require the
 user to go through the email address confirmation process.
 
-    >>> browser.getControl('Another e-mail address').selected = True
+    >>> browser.getControl('Another email address').selected = True
     >>> browser.getControl(
     ...     name='field.contact_address').value = '[e-mail]'
     >>> browser.getControl('Change').click()
@@ -71,7 +71,7 @@
 
     >>> browser.open(token_url)
     >>> browser.title
-    'Confirm e-mail address'
+    'Confirm email address'
     >>> browser.getControl('Continue').click()
 
     >>> browser.title
@@ -84,6 +84,6 @@
     'Landscape Developers contact address...
     >>> control = browser.getControl(name='field.contact_method')
     >>> [strip_label(label) for label in control.displayValue]
-    ['Another e-mail address']
+    ['Another email address']
     >>> browser.getControl(name='field.contact_address').value
     '[e-mail]'

=== modified file 'lib/lp/registry/templates/people-requestmerge-multiple.pt'
--- lib/lp/registry/templates/people-requestmerge-multiple.pt	2010-01-12 15:39:10 +0000
+++ lib/lp/registry/templates/people-requestmerge-multiple.pt	2015-07-21 09:14:19 +0000
@@ -23,9 +23,9 @@
             <tal:email_visible condition="not: view/email_hidden">
               <p id="explanation">
               The account <code tal:content="view/dupe/name">foo</code>
-              has more than one registered e-mail address.
+              has more than one registered email address.
               You need to prove that you have access to
-              all e-mail addresses registered for this account.
+              all email addresses registered for this account.
               Unselect any you cannot access.
               If you don&#8217;t have access to one or more of these addresses,
               Launchpad will not be able to merge the account but all confirmed
@@ -56,9 +56,9 @@
               <p id="explanation">
                 The account <code tal:content="view/dupe/name">foo</code>
                 has <span tal:replace="view/dupeemails/count" /> registered
-                e-mail addresses but they are hidden.
+                email addresses but they are hidden.
                 You need to prove that you have access to
-                all e-mail addresses registered for this account.
+                all email addresses registered for this account.
               </p>
               <p>
                 To do so, click the button.  An email will be sent to each
@@ -93,7 +93,7 @@
             <p id="confirmation">
               Confirmation email messages were sent to the
               <span tal:content="view/dupeemails/count" /> registered
-              e-mail addresses for
+              email addresses for
               <code tal:content="view/dupe/name">foo</code>.
             </p>
           </tal:email_hidden>

=== modified file 'lib/lp/registry/templates/people-requestmerge.pt'
--- lib/lp/registry/templates/people-requestmerge.pt	2011-02-23 17:39:56 +0000
+++ lib/lp/registry/templates/people-requestmerge.pt	2015-07-21 09:14:19 +0000
@@ -17,13 +17,13 @@
         <ul class="bulleted">
           <li>You must be logged in to Launchpad under the account you
             want to keep.</li>
-          <li>You must have access to the e-mail address registered
+          <li>You must have access to the email address registered
             under the other account that you want to remove.</li>
         </ul>
         <p>
           You will receive an email notification requesting you authorize
           the merge, and once you've proven that you own the duplicated
-          account's e-mail address, it will be assigned to you, along with
+          account's email address, it will be assigned to you, along with
           everything else owned by it.
         </p>
         <p>

=== modified file 'lib/lp/registry/templates/person-claim-team.pt'
--- lib/lp/registry/templates/person-claim-team.pt	2009-09-15 17:30:28 +0000
+++ lib/lp/registry/templates/person-claim-team.pt	2015-07-21 09:14:19 +0000
@@ -12,10 +12,10 @@
   <div metal:use-macro="context/@@launchpad_form/form">
     <metal:extra-info fill-slot="extra_info">
       <p>
-        To claim this team, enter one of the e-mail addresses it is
+        To claim this team, enter one of the email addresses it is
         associated with. (We are not showing you the list of addresses to
         protect <span tal:replace="context/displayname" />'s privacy in case
-        you don't run it.) We will e-mail that address to ask for confirmation.
+        you don't run it.) We will email that address to ask for confirmation.
       </p>
     </metal:extra-info>
   </div>

=== modified file 'lib/lp/registry/templates/person-editemails.pt'
--- lib/lp/registry/templates/person-editemails.pt	2015-02-27 01:11:06 +0000
+++ lib/lp/registry/templates/person-editemails.pt	2015-07-21 09:14:19 +0000
@@ -10,9 +10,9 @@
 <div metal:fill-slot="main">
   <div metal:use-macro="context/@@launchpad_form/form">
     <metal:extra-info fill-slot="extra_info">
-      <h2>Your e-mail addresses</h2>
+      <h2>Your email addresses</h2>
       <p tal:condition="context/preferredemail">
-        Your preferred contact address for all Launchpad e-mail is:
+        Your preferred contact address for all Launchpad email is:
         <b tal:content="context/preferredemail/email" />
       </p>
       <p tal:condition="not: context/preferredemail"

=== modified file 'lib/lp/registry/templates/person-editpgpkeys.pt'
--- lib/lp/registry/templates/person-editpgpkeys.pt	2012-05-31 02:20:41 +0000
+++ lib/lp/registry/templates/person-editpgpkeys.pt	2015-07-21 09:14:19 +0000
@@ -61,7 +61,7 @@
       <p tal:condition="view/key/expired" class="error message">
         The key <span tal:replace="view/key/keyid" /> cannot be validated
         because it has expired. Change the expiry date (in a terminal, enter
-        <kbd>gpg --edit-key <var>[e-mail]</var></kbd> then enter
+        <kbd>gpg --edit-key <var>[e-mail]</var></kbd> then enter
         <kbd>expire</kbd>), and try again.
       </p>
 
@@ -180,7 +180,7 @@
             </tbody>
           </table>
           <p>
-            Next, Launchpad will send e-mail to you at
+            Next, Launchpad will send email to you at
             <code tal:content="context/preferredemail/email"/> with instructions
             on finishing the process.
           </p>

=== modified file 'lib/lp/registry/templates/team-contactaddress.pt'
--- lib/lp/registry/templates/team-contactaddress.pt	2012-07-21 03:04:06 +0000
+++ lib/lp/registry/templates/team-contactaddress.pt	2015-07-21 09:14:19 +0000
@@ -16,7 +16,7 @@
 
   <div metal:use-macro="context/@@launchpad_form/form">
     <p metal:fill-slot="extra_top">
-      E-mail notifications for this team should go to:
+      Email notifications for this team should go to:
     </p>
     <metal:widgets fill-slot="widgets">
       <style>
@@ -49,7 +49,7 @@
     </p>
 
     <p id="email-warning" class="block-sprite large-warning">
-        E-mail sent to a mailing list or external contact address may
+        Email sent to a mailing list or external contact address may
         be publicly accessible.<br/>If this team is subscribed to private
         bug or branches, private information may be disclosed.<br/>
         The safest option to avoid leaking private information is to

=== modified file 'lib/lp/services/mail/doc/sending-mail.txt'
--- lib/lp/services/mail/doc/sending-mail.txt	2015-03-13 19:05:50 +0000
+++ lib/lp/services/mail/doc/sending-mail.txt	2015-07-21 09:14:19 +0000
@@ -322,7 +322,7 @@
     >>> sent_msg['CC']
     '[e-mail]'
 
-Since sendmail() gets the addresses to send to from the e-mail header,
+Since sendmail() gets the addresses to send to from the email header,
 it needs to take care of unfolding the headers, so that they don't
 contain any line breaks.
 

=== modified file 'lib/lp/services/mail/emailtemplates/email-processing-error.txt'
--- lib/lp/services/mail/emailtemplates/email-processing-error.txt	2008-12-10 00:23:53 +0000
+++ lib/lp/services/mail/emailtemplates/email-processing-error.txt	2015-07-21 09:14:19 +0000
@@ -8,6 +8,6 @@
 %(error_msg)s
 
 -- 
-For more information about using Launchpad by e-mail, see
+For more information about using Launchpad by email, see
 https://help.launchpad.net/EmailInterface
 or send an email to [e-mail]

=== modified file 'lib/lp/services/mail/sendmail.py'
--- lib/lp/services/mail/sendmail.py	2015-03-13 19:05:50 +0000
+++ lib/lp/services/mail/sendmail.py	2015-07-21 09:14:19 +0000
@@ -142,7 +142,7 @@
         '"Foo \\[Baz\\] Bar" <[e-mail]>'
 
     Really long names doesn't get folded, since we're not constructing
-    an e-mail header here.
+    an email header here.
 
         >>> formatted_address = format_address(
         ...     'a '*100, '[e-mail]')
@@ -333,7 +333,7 @@
 
 
 def get_addresses_from_header(email_header):
-    r"""Get the e-mail addresses specificed in an e-mail header.
+    r"""Get the email addresses specificed in an email header.
 
         >>> get_addresses_from_header('[e-mail]')
         ['[e-mail]']

=== modified file 'lib/lp/services/verification/browser/logintoken.py'
--- lib/lp/services/verification/browser/logintoken.py	2013-04-10 08:09:05 +0000
+++ lib/lp/services/verification/browser/logintoken.py	2015-07-21 09:14:19 +0000
@@ -396,7 +396,7 @@
                         structured(_(
                 'The key ${key} cannot be validated because it has expired. '
                 'Change the expiry date (in a terminal, enter '
-                '<kbd>gpg --edit-key <var>[e-mail]</var></kbd> '
+                '<kbd>gpg --edit-key <var>[e-mail]</var></kbd> '
                 'then enter <kbd>expire</kbd>), and try again.',
                 mapping=dict(key=e.key.keyid))))
         else:
@@ -408,7 +408,7 @@
     schema = Interface
     field_names = []
     expected_token_types = (LoginTokenType.VALIDATEEMAIL,)
-    label = 'Confirm e-mail address'
+    label = 'Confirm email address'
 
     def initialize(self):
         if self.redirectIfInvalidOrConsumedToken():
@@ -537,10 +537,10 @@
                 'duplicated account will belong to your own account.'))
         else:
             self.success(_(
-                'The e-mail address %s has been assigned to you, but the '
-                'duplicate account you selected has other registered e-mail '
+                'The email address %s has been assigned to you, but the '
+                'duplicate account you selected has other registered email '
                 'addresses too. To complete the merge, you have to prove '
-                'that you have access to all those e-mail addresses.'
+                'that you have access to all those email addresses.'
                 % self.context.email))
         self.context.consume()
 

=== modified file 'lib/lp/services/verification/interfaces/logintoken.py'
--- lib/lp/services/verification/interfaces/logintoken.py	2013-01-10 06:04:00 +0000
+++ lib/lp/services/verification/interfaces/logintoken.py	2015-07-21 09:14:19 +0000
@@ -78,7 +78,7 @@
         """
 
     def sendClaimTeamEmail():
-        """E-mail instructions for claiming a team to self.email."""
+        """Email instructions for claiming a team to self.email."""
 
     def activateGPGKey(key, can_encrypt):
         """Activate a GPG key.

=== modified file 'lib/lp/services/verification/model/logintoken.py'
--- lib/lp/services/verification/model/logintoken.py	2015-07-08 16:05:11 +0000
+++ lib/lp/services/verification/model/logintoken.py	2015-07-21 09:14:19 +0000
@@ -279,7 +279,7 @@
 class LoginTokenSet:
 
     def __init__(self):
-        self.title = 'Launchpad e-mail address confirmation'
+        self.title = 'Launchpad email address confirmation'
 
     def get(self, id, default=None):
         """See ILoginTokenSet."""

=== modified file 'lib/lp/services/verification/templates/logintoken-validateemail.pt'
--- lib/lp/services/verification/templates/logintoken-validateemail.pt	2012-02-25 03:13:36 +0000
+++ lib/lp/services/verification/templates/logintoken-validateemail.pt	2015-07-21 09:14:19 +0000
@@ -9,7 +9,7 @@
   <body>
   <div metal:fill-slot="main">
     <p>
-      Confirm e-mail address <code tal:content="context/email"></code>
+      Confirm email address <code tal:content="context/email"></code>
     </p>
 
     <div metal:use-macro="context/@@launchpad_form/form"></div>

=== modified file 'lib/lp/services/webapp/doc/canonical_url.txt'
--- lib/lp/services/webapp/doc/canonical_url.txt	2015-07-08 16:05:11 +0000
+++ lib/lp/services/webapp/doc/canonical_url.txt	2015-07-21 09:14:19 +0000
@@ -511,7 +511,7 @@
 
 canonical_url() is sometimes used in code that doesn't have direct
 access to the current request, and always wants a URL that can be used
-in a browser (for example e-mail notifications or XHTML representations
+in a browser (for example email notifications or XHTML representations
 of objects). Therefore, if no request is explicitly given,
 canonical_url() returns the browser URL, even if the current request is
 a web service request

=== modified file 'lib/lp/services/webapp/tests/test_launchpad_login_source.txt'
--- lib/lp/services/webapp/tests/test_launchpad_login_source.txt	2013-04-10 08:36:30 +0000
+++ lib/lp/services/webapp/tests/test_launchpad_login_source.txt	2015-07-21 09:14:19 +0000
@@ -1,8 +1,8 @@
 = LaunchpadLoginSource =
 
 LaunchpadLoginSource is used to create principals, from login
-information, passing the e-mail address to getPrincipalByLogin. If no
-person is found with the given e-mail address, None is returned
+information, passing the email address to getPrincipalByLogin. If no
+person is found with the given email address, None is returned
 
     >>> from lp.services.webapp.authentication import (
     ...     LaunchpadLoginSource)
@@ -10,7 +10,7 @@
     >>> print login_source.getPrincipalByLogin('[e-mail]')
     None
 
-Giving getPrincipalByLogin() an existing e-mail address, returns a
+Giving getPrincipalByLogin() an existing email address, returns a
 ILaunchpadPrincipal with the same id as the corresponding Account record's
 account id.
 

=== modified file 'lib/lp/soyuz/adapters/notification.py'
--- lib/lp/soyuz/adapters/notification.py	2015-07-07 13:34:46 +0000
+++ lib/lp/soyuz/adapters/notification.py	2015-07-21 09:14:19 +0000
@@ -77,7 +77,7 @@
 
 
 def get_template(archive, action):
-    """Return the appropriate e-mail template."""
+    """Return the appropriate email template."""
     template_name = 'upload-'
     if action in ('new', 'accepted', 'announcement'):
         template_name += action
@@ -102,7 +102,7 @@
 
 def calculate_subject(spr, bprs, customfiles, archive, distroseries,
                       pocket, action):
-    """Return the e-mail subject for the notification."""
+    """Return the email subject for the notification."""
     suite = distroseries.getSuite(pocket)
     names = set()
     version = '-'
@@ -261,7 +261,7 @@
 
 def assemble_body(blamer, spr, bprs, archive, distroseries, summary, changes,
                   action, previous_version=None):
-    """Assemble the e-mail notification body."""
+    """Assemble the email notification body."""
     if changes is None:
         changes = {}
     info = fetch_information(
@@ -568,7 +568,7 @@
 
 
 def person_to_email(person):
-    """Return a string of full name <e-mail address> given an IPerson."""
+    """Return a string of full name <email address> given an IPerson."""
     if person and person.preferredemail:
         # This will use email.header to encode any non-ASCII characters.
         return format_address_for_person(person)

=== modified file 'lib/lp/soyuz/doc/archivesubscriber.txt'
--- lib/lp/soyuz/doc/archivesubscriber.txt	2012-01-27 14:25:50 +0000
+++ lib/lp/soyuz/doc/archivesubscriber.txt	2015-07-21 09:14:19 +0000
@@ -138,7 +138,7 @@
     ----------------------------------------
 
 If the description of the P3A is changed to None, and a new user subscribed
-the e-mail does not contain the description.
+the email does not contain the description.
 
     >>> cprov_private_ppa.description = None
     >>> unused = cprov_private_ppa.newSubscription(fredsmith, cprov)

=== modified file 'lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt'
--- lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt	2014-08-09 19:31:03 +0000
+++ lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt	2015-07-21 09:14:19 +0000
@@ -143,7 +143,7 @@
 
 A bug notification is created for both the status change, and for the
 comment addition. The both notifications will be batched together into a
-single e-mail later.
+single email later.
 
     >>> from lp.bugs.model.bugnotification import BugNotification
     >>> notifications = BugNotification.select(orderBy='id')

=== modified file 'lib/lp/soyuz/tests/test_distroseriesqueue_debian_installer.py'
--- lib/lp/soyuz/tests/test_distroseriesqueue_debian_installer.py	2012-07-03 10:29:53 +0000
+++ lib/lp/soyuz/tests/test_distroseriesqueue_debian_installer.py	2015-07-21 09:14:19 +0000
@@ -52,7 +52,7 @@
         self.assertEqual(1, len(upload.queue_root.customfiles))
 
     def test_generates_mail(self):
-        # Two e-mail messages were generated (acceptance and announcement).
+        # Two email messages were generated (acceptance and announcement).
         self.anything_policy.setDistroSeriesAndPocket("hoary-test")
         self.anything_policy.distroseries.changeslist = "[e-mail]"
         self.uploadTestData()

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2015-06-30 01:10:06 +0000
+++ lib/lp/testing/__init__.py	2015-07-21 09:14:19 +0000
@@ -690,12 +690,12 @@
         return tempdir
 
     def _unfoldEmailHeader(self, header):
-        """Unfold a multiline e-mail header."""
+        """Unfold a multiline email header."""
         header = ''.join(header.splitlines())
         return header.replace('\t', ' ')
 
     def assertEmailHeadersEqual(self, expected, observed):
-        """Assert that two e-mail headers are equal.
+        """Assert that two email headers are equal.
 
         The headers are unfolded before being compared.
         """

=== modified file 'lib/lp/testing/mail_helpers.py'
--- lib/lp/testing/mail_helpers.py	2011-12-19 23:38:16 +0000
+++ lib/lp/testing/mail_helpers.py	2015-07-21 09:14:19 +0000
@@ -48,7 +48,7 @@
 
 
 def sort_addresses(header):
-    """Sort an address-list in an e-mail header field body."""
+    """Sort an address-list in an email header field body."""
     addresses = set(address.strip() for address in header.split(','))
     return ", ".join(sorted(addresses))
 

=== modified file 'lib/lp/testopenid/interfaces/server.py'
--- lib/lp/testopenid/interfaces/server.py	2013-03-20 03:41:40 +0000
+++ lib/lp/testopenid/interfaces/server.py	2015-07-21 09:14:19 +0000
@@ -23,7 +23,7 @@
 
 
 class ITestOpenIDLoginForm(Interface):
-    email = TextLine(title=u'What is your e-mail address?', required=True)
+    email = TextLine(title=u'What is your email address?', required=True)
 
 
 class ITestOpenIDPersistentIdentity(IOpenIDPersistentIdentity):

=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-export.txt'
--- lib/lp/translations/stories/standalone/xx-pofile-export.txt	2014-11-27 22:13:36 +0000
+++ lib/lp/translations/stories/standalone/xx-pofile-export.txt	2015-07-21 09:14:19 +0000
@@ -25,7 +25,7 @@
     >>> print find_main_content(user_browser.contents)
     <...
     ...Download Spanish translation...
-    Once the file is ready for download, Launchpad will e-mail
+    Once the file is ready for download, Launchpad will email
     <code>[e-mail]</code>
     with a link to the file...
 

=== modified file 'lib/lp/translations/templates/pofile-export.pt'
--- lib/lp/translations/templates/pofile-export.pt	2012-05-02 13:26:12 +0000
+++ lib/lp/translations/templates/pofile-export.pt	2015-07-21 09:14:19 +0000
@@ -63,7 +63,7 @@
             store.  See bug #462891 for details.
           </tal:comment>
           <p tal:condition="view/user/preferredemail">
-            Once the file is ready for download, Launchpad will e-mail
+            Once the file is ready for download, Launchpad will email
             <code tal:content="view/user/preferredemail/email">user@domain</code>
             with a link to the file.
           </p>