diff options
| author | Zbigniew Siciarz <antyqjon@gmail.com> | 2014-02-15 19:11:46 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-02-15 13:30:13 -0500 |
| commit | 14366ed33e4473c8c2f321f224dd62221adc7629 (patch) | |
| tree | aa071da46aeb2d1aa823d3b0b4e0dc219b8a7e73 /docs/ref | |
| parent | a6f05af016b5488b42b9334ec915d6dfd2702c00 (diff) | |
[1.6.x] Fixed #22013 -- Documented difference between SERVER_EMAIL and DEFAULT_FROM_EMAIL.
Backport of 44814e78cc from master
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 42f2038650..296ac7bbf5 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -955,7 +955,8 @@ DEFAULT_FROM_EMAIL Default: ``'webmaster@localhost'`` Default email address to use for various automated correspondence from the -site manager(s). +site manager(s). This doesn't include error messages sent to :setting:`ADMINS` +and :setting:`MANAGERS`; for that, see :setting:`SERVER_EMAIL`. .. setting:: DEFAULT_INDEX_TABLESPACE @@ -1657,6 +1658,12 @@ Default: ``'root@localhost'`` The email address that error messages come from, such as those sent to :setting:`ADMINS` and :setting:`MANAGERS`. +.. admonition:: Why are my emails sent from a different address? + + This address is used only for error messages. It is *not* the address that + regular email messages sent with :meth:`~django.core.mail.send_mail()` + come from; for that, see :setting:`DEFAULT_FROM_EMAIL`. + .. setting:: SHORT_DATE_FORMAT SHORT_DATE_FORMAT |