Skip to content

Commit 2ccf9c9

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Update browser_kit.rst Fixing "envelope recipient" Minor typos
2 parents a82384b + 8d86ed0 commit 2ccf9c9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

components/browser_kit.rst

+1-1
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

+4-5
Original file line numberDiff line numberDiff line change
@@ -3376,16 +3376,15 @@ sender
33763376
**type**: ``string``
33773377

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

33823381
recipients
33833382
""""""""""
33843383

33853384
**type**: ``array``
33863385

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

33903389
.. configuration-block::
33913390

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

0 commit comments

Comments
 (0)