Skip to content

Commit 6109e69

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Added cautionbox for sender
2 parents 353ae26 + 05e1203 commit 6109e69

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
@@ -3375,8 +3375,9 @@ sender
33753375

33763376
**type**: ``string``
33773377

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

33813382
recipients
33823383
""""""""""
@@ -3641,3 +3642,4 @@ to know their differences.
36413642
.. _`Microsoft NTLM authentication protocol`: https://docs.microsoft.com/en-us/windows/win32/secauthn/microsoft-ntlm
36423643
.. _`utf-8 modifier`: https://www.php.net/reference.pcre.pattern.modifiers
36433644
.. _`Link HTTP header`: https://tools.ietf.org/html/rfc5988
3645+
_ ..`establishment of the SMTP session`: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol#SMTP_transport_example

0 commit comments

Comments
 (0)