Django does it, we do it: Changes all occurrences of 'e-mail' to 'email'

Changelog

@@ -1007,7 +1007,7 @@ Fixes
 * Error email body now uses `repr(exception)` instead of `str(exception)`,
   as the latter could result in Unicode decode errors (Issue #245).
 
-* Error e-mail timeout value is now configurable by using the
+* Error email timeout value is now configurable by using the
   :setting:`EMAIL_TIMEOUT` setting.
 
 * `celeryev`: Now works on Windows (but the curses monitor won't work without
@@ -1773,7 +1773,7 @@ Fixes
 * Can now store result/metadata for custom states.
 
 * celeryd: A warning is now emitted if the sending of task error
-  e-mails fails.
+  emails fails.
 
 * celeryev: Curses monitor no longer crashes if the terminal window
   is resized.
@@ -1896,7 +1896,7 @@ Documentation
 
 * Task logger: `warn` method added (synonym for `warning`)
 
-* Can now define a white list of errors to send error e-mails for.
+* Can now define a white list of errors to send error emails for.
 
     Example::
 
@@ -3620,7 +3620,7 @@ Documentation
 * Make sure logger class is process aware, even if running Python >= 2.6.
 
 
-* Error e-mails are not sent anymore when the task is retried.
+* Error emails are not sent anymore when the task is retried.
 
 .. _version-0.8.3:
 
@@ -4114,7 +4114,7 @@ News
 
 * Fixed typo `AMQP_SERVER` in documentation to `AMQP_HOST`.
 
-* Worker exception e-mails sent to administrators now works properly.
+* Worker exception emails sent to administrators now works properly.
 
 * No longer depends on `django`, so installing `celery` won't affect
   the preferred Django version installed.
@@ -4189,7 +4189,7 @@ arguments, so be sure to flush your task queue before you upgrade.
 
 * **IMPORTANT** Celery now depends on carrot >= 0.4.1.
 
-* The celery daemon now sends task errors to the registered admin e-mails.
+* The celery daemon now sends task errors to the registered admin emails.
   To turn off this feature, set `SEND_CELERY_TASK_ERROR_EMAILS` to
   `False` in your `settings.py`. Thanks to Grégoire Cachet.
 

README.rst

@@ -181,7 +181,7 @@ Features
     |                 | enabling the ability to poll task status using     |
     |                 | Ajax.                                              |
     +-----------------+----------------------------------------------------+
-    | Error E-mails   | Can be configured to send e-mails to the           |
+    | Error Emails   | Can be configured to send emails to the           |
     |                 | administrators when tasks fails.                   |
     +-----------------+----------------------------------------------------+
 

celery/app/base.py

@@ -271,7 +271,7 @@ class BaseApp(object):
         return c
 
     def mail_admins(self, subject, body, fail_silently=False):
-        """Send an e-mail to the admins in the :setting:`ADMINS` setting."""
+        """Send an email to the admins in the :setting:`ADMINS` setting."""
         if self.conf.ADMINS:
             to = [admin_email for _, admin_email in self.conf.ADMINS]
             return self.loader.mail_admins(subject, body, fail_silently, to=to,

celery/execute/trace.py

@@ -109,7 +109,7 @@ class TaskTrace(object):
 
         # Create a simpler version of the RetryTaskError that stringifies
         # the original exception instead of including the exception instance.
-        # This is for reporting the retry in logs, e-mail etc, while
+        # This is for reporting the retry in logs, email etc, while
         # guaranteeing pickleability.
         message, orig_exc = exc.args
         expanded_msg = "%s: %s" % (message, str(orig_exc))

celery/task/base.py

@@ -187,12 +187,12 @@ class BaseTask(object):
     #: configured to ignore results.
     store_errors_even_if_ignored = False
 
-    #: If enabled an e-mail will be sent to :setting:`ADMINS` whenever a task
+    #: If enabled an email will be sent to :setting:`ADMINS` whenever a task
     #: of this type fails.
     send_error_emails = False
     disable_error_emails = False                            # FIXME
 
-    #: List of exception types to send error e-mails for.
+    #: List of exception types to send error emails for.
     error_whitelist = ()
 
     #: The name of a serializer that are registered with

celery/utils/mail.py

@@ -10,7 +10,7 @@ supports_timeout = sys.version_info > (2, 5)
 
 
 class SendmailWarning(UserWarning):
-    """Problem happened while sending the e-mail message."""
+    """Problem happened while sending the email message."""
 
 
 class Message(object):
@@ -27,7 +27,7 @@ class Message(object):
             self.to = [self.to]
 
     def __repr__(self):
-        return "<E-mail: To:%r Subject:%r>" % (self.to, self.subject)
+        return "<Email: To:%r Subject:%r>" % (self.to, self.subject)
 
     def __str__(self):
         msg = MIMEText(self.body, "plain", self.charset)

celery/worker/job.py

@@ -26,7 +26,7 @@ from celery.worker import state
 # says "trailing whitespace" ;)
 EMAIL_SIGNATURE_SEP = "-- "
 
-#: format string for the body of an error e-mail.
+#: format string for the body of an error email.
 TASK_ERROR_EMAIL_BODY = """
 Task %%(name)s with id %%(id)s raised exception:\n%%(exc)r
 
@@ -236,12 +236,12 @@ class TaskRequest(object):
     #: Format string used to log task retry.
     retry_msg = """Task %(name)s[%(id)s] retry: %(exc)s"""
 
-    #: Format string used to generate error e-mail subjects.
+    #: Format string used to generate error email subjects.
     email_subject = """\
         [celery@%(hostname)s] Error: Task %(name)s (%(id)s): %(exc)s
     """
 
-    #: Format string used to generate error e-mail content.
+    #: Format string used to generate error email content.
     email_body = TASK_ERROR_EMAIL_BODY
 
     #: Timestamp set when the task is started.

docs/configuration.rst

@@ -908,14 +908,14 @@ CELERY_SEND_TASK_ERROR_EMAILS
 
 The default value for the `Task.send_error_emails` attribute, which if
 set to :const:`True` means errors occurring during task execution will be
-sent to :setting:`ADMINS` by e-mail.
+sent to :setting:`ADMINS` by email.
 
 .. setting:: CELERY_TASK_ERROR_WHITELIST
 
 CELERY_TASK_ERROR_WHITELIST
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A white list of exceptions to send error e-mails for.
+A white list of exceptions to send error emails for.
 
 .. setting:: ADMINS
 
@@ -923,14 +923,14 @@ ADMINS
 ~~~~~~
 
 List of `(name, email_address)` tuples for the administrators that should
-receive error e-mails.
+receive error emails.
 
 .. setting:: SERVER_EMAIL
 
 SERVER_EMAIL
 ~~~~~~~~~~~~
 
-The e-mail address this worker sends e-mails from.
+The email address this worker sends emails from.
 Default is celery@localhost.
 
 .. setting:: MAIL_HOST
@@ -966,21 +966,21 @@ The port the mail server is listening on.  Default is `25`.
 Example E-Mail configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-This configuration enables the sending of error e-mails to
+This configuration enables the sending of error emails to
 george@vandelay.com and kramer@vandelay.com:
 
 .. code-block:: python
 
-    # Enables error e-mails.
+    # Enables error emails.
     CELERY_SEND_TASK_ERROR_EMAILS = True
 
-    # Name and e-mail addresses of recipients
+    # Name and email addresses of recipients
     ADMINS = (
         ("George Costanza", "george@vandelay.com"),
         ("Cosmo Kramer", "kosmo@vandelay.com"),
     )
 
-    # E-mail address used as sender (From field).
+    # Email address used as sender (From field).
     SERVER_EMAIL = "no-reply@vandelay.com"
 
     # Mailserver configuration

docs/homepage/index.html

@@ -144,7 +144,7 @@ pageTracker._trackPageview();
     <p>
     You can <a href='http://www.pledgie.com/campaigns/8424'
         target='_new'>donate to the project</a> using PayPal.
-    For other arrangements you can send an e-mail to
+    For other arrangements you can send an email to
     <a href="mailto:donate@celeryproject">donate@celeryproject.org</a>.
 
 

docs/includes/introduction.txt

@@ -176,7 +176,7 @@ Features
     |                 | enabling the ability to poll task status using     |
     |                 | Ajax.                                              |
     +-----------------+----------------------------------------------------+
-    | Error E-mails   | Can be configured to send e-mails to the           |
+    | Error Emails    | Can be configured to send emails to the            |
     |                 | administrators when tasks fails.                   |
     +-----------------+----------------------------------------------------+
 

docs/userguide/monitoring.rst

@@ -256,7 +256,7 @@ to be able to log into the admin later)::
     have any superusers defined.  Would you like to create
     one now? (yes/no): yes
     Username (Leave blank to use 'username'): username
-    E-mail address: me@example.com
+    Email address: me@example.com
     Password: ******
     Password (again): ******
     Superuser created successfully.
@@ -418,7 +418,7 @@ still only periodically write it to disk.
 
 To take snapshots you need a Camera class, with this you can define
 what should happen every time the state is captured;  You can
-write it to a database, send it by e-mail or something else entirely.
+write it to a database, send it by email or something else entirely.
 
 :program:`celeryev` is then used to take snapshots with the camera,
 for example if you want to capture state every 2 seconds using the

docs/userguide/tasks.rst

@@ -226,14 +226,14 @@ General
 
 .. attribute:: Task.send_error_emails
 
-    Send an e-mail whenever a task of this type fails.
+    Send an email whenever a task of this type fails.
     Defaults to the :setting:`CELERY_SEND_TASK_ERROR_EMAILS` setting.
     See :ref:`conf-error-mails` for more information.
 
 .. attribute:: Task.error_whitelist
 
-    If the sending of error e-mails is enabled for this task, then
-    this is a white list of exceptions to actually send e-mails about.
+    If the sending of error emails is enabled for this task, then
+    this is a white list of exceptions to actually send emails about.
 
 .. attribute:: Task.serializer
 
@@ -986,7 +986,7 @@ The comment model looks like this:
 
     class Comment(models.Model):
         name = models.CharField(_("name"), max_length=64)
-        email_address = models.EmailField(_("e-mail address"))
+        email_address = models.EmailField(_("email address"))
         homepage = models.URLField(_("home page"),
                                    blank=True, verify_exists=False)
         comment = models.TextField(_("comment"))