Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 11 insertions, 11 deletions

diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt
index baed78dcef..241bdc1a37 100644
--- a/docs/howto/error-reporting.txt
+++ b/docs/howto/error-reporting.txt
@@ -1,4 +1,4 @@
-Error reporting via e-mail
+Error reporting via email
 ==========================
 
 When you're running a public site you should always turn off the
@@ -9,12 +9,12 @@ revealed by the error pages.
 However, running with :setting:`DEBUG` set to ``False`` means you'll never see
 errors generated by your site -- everyone will just see your public error pages.
 You need to keep track of errors that occur in deployed sites, so Django can be
-configured to e-mail you details of those errors.
+configured to email you details of those errors.
 
 Server errors
 -------------
 
-When :setting:`DEBUG` is ``False``, Django will e-mail the users listed in the
+When :setting:`DEBUG` is ``False``, Django will email the users listed in the
 :setting:`ADMINS` setting whenever your code raises an unhandled exception and
 results in an internal server error (HTTP status code 500). This gives the
 administrators immediate notification of any errors. The :setting:`ADMINS` will
@@ -23,7 +23,7 @@ the HTTP request that caused the error.
 
 .. note::
 
-   In order to send e-mail, Django requires a few settings telling it
+   In order to send email, Django requires a few settings telling it
    how to connect to your mail server. At the very least, you'll need
    to specify :setting:`EMAIL_HOST` and possibly
    :setting:`EMAIL_HOST_USER` and :setting:`EMAIL_HOST_PASSWORD`,
@@ -32,8 +32,8 @@ the HTTP request that caused the error.
    documentation </ref/settings>` for a full list of email-related
    settings.
 
-By default, Django will send e-mail from root@localhost. However, some mail
-providers reject all e-mail from this address. To use a different sender
+By default, Django will send email from root@localhost. However, some mail
+providers reject all email from this address. To use a different sender
 address, modify the :setting:`SERVER_EMAIL` setting.
 
 To disable this behavior, just remove all entries from the :setting:`ADMINS`
@@ -43,15 +43,15 @@ setting.
 
    .. versionadded:: 1.3
 
-   Server error e-mails are sent using the logging framework, so you can
+   Server error emails are sent using the logging framework, so you can
    customize this behaviour by :doc:`customizing your logging configuration
    </topics/logging>`.
 
 404 errors
 ----------
 
-Django can also be configured to e-mail errors about broken links (404 "page
-not found" errors). Django sends e-mails about 404 errors when:
+Django can also be configured to email errors about broken links (404 "page
+not found" errors). Django sends emails about 404 errors when:
 
     * :setting:`DEBUG` is ``False``
 
@@ -60,9 +60,9 @@ not found" errors). Django sends e-mails about 404 errors when:
     * Your :setting:`MIDDLEWARE_CLASSES` setting includes ``CommonMiddleware``
       (which it does by default).
 
-If those conditions are met, Django will e-mail the users listed in the
+If those conditions are met, Django will email the users listed in the
 :setting:`MANAGERS` setting whenever your code raises a 404 and the request has
-a referer. (It doesn't bother to e-mail for 404s that don't have a referer --
+a referer. (It doesn't bother to email for 404s that don't have a referer --
 those are usually just people typing in broken URLs or broken Web 'bots).
 
 You can tell Django to stop reporting particular 404s by tweaking the