summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2010-11-16 13:32:07 +0000
committerLuke Plant <L.Plant.98@cantab.net>2010-11-16 13:32:07 +0000
commit3cbcce429c0f3fdbd9cfca0a7678a5a994262676 (patch)
treea0a8e55953c781d474307334d89666de0ce63e01 /docs
parent478a4e22ad147175ca8672963154e196dbeb1ab6 (diff)
[1.2.X] Corrected 'email' to 'e-mail' in error reporting docs.
Backport of [14571] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/error-reporting.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt
index 2c197e1acb..9c61c97f65 100644
--- a/docs/howto/error-reporting.txt
+++ b/docs/howto/error-reporting.txt
@@ -9,7 +9,7 @@ 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 email you details of those errors.
+configured to e-mail you details of those errors.
Server errors
-------------
@@ -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 email from root@localhost. However, some mail
-providers reject all email from this address. To use a different sender
+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
address, modify the :setting:`SERVER_EMAIL` setting.
To disable this behavior, just remove all entries from the :setting:`ADMINS`
@@ -42,8 +42,8 @@ setting.
404 errors
----------
-Django can also be configured to email errors about broken links (404 "page
-not found" errors). Django sends emails about 404 errors when:
+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:
* :setting:`DEBUG` is ``False``