summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid D Lowe <daviddlowe.flimm@gmail.com>2023-12-15 09:50:34 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-12-28 08:30:50 +0100
commit61aae838f77c2d3f1bb2b50095cdf3d79afffb02 (patch)
treee57a708976cc5c4c62738cf731c4a73d5ce472a1
parent751d732a3815a68bdb5b7aceda0e7d5981362c4a (diff)
Improved DEFAULT_FROM_EMAIL/SERVER_EMAIL docs.
Co-authored-by: nessita <124304+nessita@users.noreply.github.com>
-rw-r--r--docs/ref/settings.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 089c8897e5..ed956f70c7 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1343,9 +1343,12 @@ See :ref:`Filtering error reports<filtering-error-reports>`.
Default: ``'webmaster@localhost'``
-Default email address to use for various automated correspondence from the
-site manager(s). This doesn't include error messages sent to :setting:`ADMINS`
-and :setting:`MANAGERS`; for that, see :setting:`SERVER_EMAIL`.
+Default email address for automated correspondence from the site manager(s).
+This address is used in the ``From:`` header of outgoing emails and can take
+any format valid in the chosen email sending protocol.
+
+This doesn't affect error messages sent to :setting:`ADMINS` and
+:setting:`MANAGERS`. See :setting:`SERVER_EMAIL` for that.
.. setting:: DEFAULT_INDEX_TABLESPACE
@@ -2535,7 +2538,9 @@ example, to define a YAML serializer, use::
Default: ``'root@localhost'``
The email address that error messages come from, such as those sent to
-:setting:`ADMINS` and :setting:`MANAGERS`.
+:setting:`ADMINS` and :setting:`MANAGERS`. This address is used in the
+``From:`` header and can take any format valid in the chosen email sending
+protocol.
.. admonition:: Why are my emails sent from a different address?