Skip to content

Commit ba0ab72

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Update browser_kit.rst Fixing "envelope recipient" Minor typos
2 parents 99b9c6b + 2ccf9c9 commit ba0ab72

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

components/browser_kit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ This method accepts a request and should return a response::
6060
For a simple implementation of a browser based on the HTTP layer, have a look
6161
at the :class:`Symfony\\Component\\BrowserKit\\HttpBrowser` provided by
6262
:ref:`this component <component-browserkit-external-requests>`. For an implementation based
63-
on ``HttpKernelInterface``, have a look at the :class:`Symfony\\Component\\HttpKernel\\Client`
63+
on ``HttpKernelInterface``, have a look at the :class:`Symfony\\Component\\HttpKernel\\HttpClientKernel`
6464
provided by the :doc:`HttpKernel component </components/http_kernel>`.
6565

6666
Making Requests

reference/configuration/framework.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3266,16 +3266,15 @@ sender
32663266
**type**: ``string``
32673267

32683268
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.
3269+
`SMTP session`_. This value overrides any other sender set in the code.
32713270

32723271
recipients
32733272
""""""""""
32743273

32753274
**type**: ``array``
32763275

3277-
Recipients used by the ``Mailer``. Keep in mind that this setting override
3278-
recipients set in the code.
3276+
The "envelope recipient" which is used as the value of ``RCPT TO`` during the
3277+
the `SMTP session`_. This value overrides any other recipient set in the code.
32793278

32803279
.. configuration-block::
32813280

@@ -3527,4 +3526,4 @@ to know their differences.
35273526
.. _`Microsoft NTLM authentication protocol`: https://docs.microsoft.com/en-us/windows/win32/secauthn/microsoft-ntlm
35283527
.. _`utf-8 modifier`: https://www.php.net/reference.pcre.pattern.modifiers
35293528
.. _`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
3529+
.. _`SMTP session`: https://en.wikipedia.org/wiki/Simple_Mail_Transfer_Protocol#SMTP_transport_example

0 commit comments

Comments
 (0)