Skip to content

Commit ad317c3

Browse files
committed
[#14565] Minor formatting fixes
1 parent 135a270 commit ad317c3

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

mailer.rst

+9-8
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,17 @@ over SMTP by configuring the DSN in your ``.env`` file (the ``user``,
7070
If you are migrating from Swiftmailer (and the Swiftmailer bundle), be
7171
warned that the DSN format is different.
7272

73-
Using built-in transports
73+
Using Built-in Transports
7474
~~~~~~~~~~~~~~~~~~~~~~~~~
7575

76-
============ ==================================== ===========
77-
DSN protocol Example Description
78-
============ ==================================== ===========
79-
smtp smtp://user:[email protected]:25 Mailer uses an SMTP server to send emails
80-
sendmail sendmail://default Mailer uses the local sendmail binary to send emails
81-
============ ==================================== ===========
82-
76+
============ ======================================== ==============================
77+
DSN protocol Example Description
78+
============ ======================================== ==============================
79+
smtp ``smtp://user:[email protected]:25`` Mailer uses an SMTP server to
80+
send emails
81+
sendmail ``sendmail://default`` Mailer uses the local sendmail
82+
binary to send emails
83+
============ ======================================== ==============================
8384

8485
Using a 3rd Party Transport
8586
~~~~~~~~~~~~~~~~~~~~~~~~~~~

reference/configuration/framework.rst

+15-7
Original file line numberDiff line numberDiff line change
@@ -2906,21 +2906,27 @@ Name of the lock you want to create.
29062906
mailer
29072907
~~~~~~
29082908

2909+
.. versionadded:: 4.3
2910+
2911+
The ``mailer`` settings were introduced in Symfony 4.3.
2912+
29092913
.. _mailer-dsn:
29102914

29112915
dsn
29122916
...
29132917

2914-
**type**: ``string``
2918+
**type**: ``string`` **default**: ``null``
29152919

2916-
The DSN used by the mailer. When several DSN may be used, use `transports` (see below) instead.
2920+
The DSN used by the mailer. When several DSN may be used, use
2921+
``transports`` option (see below) instead.
29172922

29182923
transports
29192924
..........
29202925

29212926
**type**: ``array``
29222927

2923-
A :ref:`list of DSN <multiple-email-transports>` that can be used by the mailer. A transport name is the key and the dsn is the value.
2928+
A :ref:`list of DSN <multiple-email-transports>` that can be used by the
2929+
mailer. A transport name is the key and the dsn is the value.
29242930

29252931
envelope
29262932
........
@@ -2930,14 +2936,16 @@ sender
29302936

29312937
**type**: ``string``
29322938

2933-
Sender used by the ``Mailer``. Keep in mind that this setting override a sender set in the code.
2939+
Sender used by the ``Mailer``. Keep in mind that this setting override a
2940+
sender set in the code.
29342941

29352942
recipients
29362943
""""""""""
29372944

29382945
**type**: ``array``
29392946

2940-
Recipients used by the ``Mailer``. Keep in mind that this setting override recipients set in the code.
2947+
Recipients used by the ``Mailer``. Keep in mind that this setting override
2948+
recipients set in the code.
29412949

29422950
.. configuration-block::
29432951

@@ -2963,8 +2971,8 @@ Recipients used by the ``Mailer``. Keep in mind that this setting override recip
29632971
<framework:config>
29642972
<framework:mailer dsn="smtp://localhost:25">
29652973
<framework:envelope>
2966-
<framework:recipients>[email protected]</framework:recipients>
2967-
<framework:recipients>[email protected]</framework:recipients>
2974+
<framework:recipient>[email protected]</framework:recipient>
2975+
<framework:recipient>[email protected]</framework:recipient>
29682976
</framework:envelope>
29692977
</framework:mailer>
29702978
</framework:config>

0 commit comments

Comments
 (0)