Skip to content

Commit

Permalink
[1.2.X] Corrected 'email' to 'e-mail' in error reporting docs.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
spookylukey committed Nov 16, 2010
1 parent 478a4e2 commit 3cbcce4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions docs/howto/error-reporting.txt
Expand Up @@ -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
-------------
Expand All @@ -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`
Expand All @@ -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``

Expand Down

0 comments on commit 3cbcce4

Please sign in to comment.