Browse Source

[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
David D Lowe 1 year ago
parent
commit
7e3ba869a6
1 changed files with 9 additions and 4 deletions
  1. 9 4
      docs/ref/settings.txt

+ 9 - 4
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?