Skip to content

Commit 4ff16ae

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Added cautionbox for sender
2 parents 80ae7b2 + 6109e69 commit 4ff16ae

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

reference/configuration/framework.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3265,8 +3265,9 @@ sender
32653265

32663266
**type**: ``string``
32673267

3268-
Sender used by the ``Mailer``. Keep in mind that this setting override a
3269-
sender set in the code.
3268+
The "envelope sender" which is used as the value of ``MAIL FROM`` during the
3269+
the `establishment of the SMTP session`_. This value overrides any other sender
3270+
set in the code.
32703271

32713272
recipients
32723273
""""""""""
@@ -3526,3 +3527,4 @@ to know their differences.
35263527
.. _`Microsoft NTLM authentication protocol`: https://docs.microsoft.com/en-us/windows/win32/secauthn/microsoft-ntlm
35273528
.. _`utf-8 modifier`: https://www.php.net/reference.pcre.pattern.modifiers
35283529
.. _`Link HTTP header`: https://tools.ietf.org/html/rfc5988
3530+
_ ..`establishment of the SMTP session`: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol#SMTP_transport_example

0 commit comments

Comments
 (0)