mirror of
https://github.com/django/django.git
synced 2024-12-24 18:16:19 +00:00
Fixed #22013 -- Documented difference between SERVER_EMAIL and DEFAULT_FROM_EMAIL.
This commit is contained in:
parent
0b6f9f7c6f
commit
44814e78cc
@ -955,7 +955,8 @@ DEFAULT_FROM_EMAIL
|
|||||||
Default: ``'webmaster@localhost'``
|
Default: ``'webmaster@localhost'``
|
||||||
|
|
||||||
Default email address to use for various automated correspondence from the
|
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
|
.. setting:: DEFAULT_INDEX_TABLESPACE
|
||||||
|
|
||||||
@ -1727,6 +1728,12 @@ Default: ``'root@localhost'``
|
|||||||
The email address that error messages come from, such as those sent to
|
The email address that error messages come from, such as those sent to
|
||||||
:setting:`ADMINS` and :setting:`MANAGERS`.
|
: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
|
.. setting:: SHORT_DATE_FORMAT
|
||||||
|
|
||||||
SHORT_DATE_FORMAT
|
SHORT_DATE_FORMAT
|
||||||
|
Loading…
Reference in New Issue
Block a user