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 09:44:37 +0100
commit7e3ba869a6c3dd80e42460e82db2402218ce805a (patch)
treeb554073cbb1c3e5333d07a7cd9c5cde7d33605cd
parent9a182f3d959d16354e24f34713df602f1bef6556 (diff)
[5.0.x] Improved DEFAULT_FROM_EMAIL/SERVER_EMAIL docs.
Co-authored-by: nessita <124304+nessita@users.noreply.github.com> Backport of 61aae838f77c2d3f1bb2b50095cdf3d79afffb02 from main
-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 2c3ebb2acf..c1f04c7f1d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1361,9 +1361,12 @@ specify a particular storage system. See :doc:`/topics/files`.
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
@@ -2553,7 +2556,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?