diff options
| author | Zbigniew Siciarz <antyqjon@gmail.com> | 2014-02-15 19:11:46 +0100 |
|---|---|---|
| committer | Zbigniew Siciarz <antyqjon@gmail.com> | 2014-02-15 19:11:46 +0100 |
| commit | 44814e78ccd3a54da41c1b77ba3504c648ef4e89 (patch) | |
| tree | 8d482126339dc0e6750f28fe36db1c6ce90788f7 | |
| parent | 0b6f9f7c6fb3589157c3231f28409c97c5c451ab (diff) | |
Fixed #22013 -- Documented difference between SERVER_EMAIL and DEFAULT_FROM_EMAIL.
| -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 d3fc66b8e1..4e3e033b68 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 @@ -1727,6 +1728,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 |