Skip to content

Commit 1b071e2

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix RST syntax of some tables
2 parents d9db717 + e355e47 commit 1b071e2

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

mailer.rst

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,18 +161,17 @@ This table shows the full list of available DSN formats for each third
161161
party provider:
162162

163163
==================== ==================================================== =========================================== ========================================
164-
Provider SMTP HTTP API
164+
Provider SMTP HTTP API
165165
==================== ==================================================== =========================================== ========================================
166-
Amazon SES ses+smtp://USERNAME:PASSWORD@default ses+https://ACCESS_KEY:SECRET_KEY@default ses+api://ACCESS_KEY:SECRET_KEY@default
167-
Google Gmail gmail+smtp://USERNAME:PASSWORD@default n/a n/a
168-
Mailchimp Mandrill mandrill+smtp://USERNAME:PASSWORD@default mandrill+https://KEY@default mandrill+api://KEY@default
169-
Mailgun mailgun+smtp://USERNAME:PASSWORD@default mailgun+https://KEY:DOMAIN@default mailgun+api://KEY:DOMAIN@default
170-
Mailjet mailjet+smtp://ACCESS_KEY:SECRET_KEY@default n/a mailjet+api://ACCESS_KEY:SECRET_KEY@default
171-
Postmark postmark+smtp://ID@default n/a postmark+api://KEY@default
172-
Sendgrid sendgrid+smtp://KEY@default n/a sendgrid+api://KEY@default
173-
Sendinblue sendinblue+smtp://USERNAME:PASSWORD@default n/a sendinblue+api://KEY@default
174-
OhMySMTP ohmysmtp+smtp://API_TOKEN@default n/a ohmysmtp+api://API_TOKEN@default
175-
166+
Amazon SES ses+smtp://USERNAME:PASSWORD@default ses+https://ACCESS_KEY:SECRET_KEY@default ses+api://ACCESS_KEY:SECRET_KEY@default
167+
Google Gmail gmail+smtp://USERNAME:PASSWORD@default n/a n/a
168+
Mailchimp Mandrill mandrill+smtp://USERNAME:PASSWORD@default mandrill+https://KEY@default mandrill+api://KEY@default
169+
Mailgun mailgun+smtp://USERNAME:PASSWORD@default mailgun+https://KEY:DOMAIN@default mailgun+api://KEY:DOMAIN@default
170+
Mailjet mailjet+smtp://ACCESS_KEY:SECRET_KEY@default n/a mailjet+api://ACCESS_KEY:SECRET_KEY@default
171+
Postmark postmark+smtp://ID@default n/a postmark+api://KEY@default
172+
Sendgrid sendgrid+smtp://KEY@default n/a sendgrid+api://KEY@default
173+
Sendinblue sendinblue+smtp://USERNAME:PASSWORD@default n/a sendinblue+api://KEY@default
174+
OhMySMTP ohmysmtp+smtp://API_TOKEN@default n/a ohmysmtp+api://API_TOKEN@default
176175
==================== ==================================================== =========================================== ========================================
177176

178177
.. caution::
@@ -189,7 +188,7 @@ party provider:
189188
a value lower than ``10``: ``ses+smtp://USERNAME:PASSWORD@default?ping_threshold=9``
190189

191190
.. versionadded:: 5.4
192-
191+
193192
The ``ping_threshold`` option for ``ses-smtp`` was introduced in Symfony 5.4.
194193

195194
.. note::

messenger.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@ Or, to create the table yourself, set the ``auto_setup`` option to ``false`` and
13251325
The transport has a number of options:
13261326

13271327
================== ===================================== ======================
1328-
Option Description Default
1328+
Option Description Default
13291329
================== ===================================== ======================
13301330
table_name Name of the table messenger_messages
13311331
queue_name Name of the queue (a column in the default
@@ -1440,8 +1440,9 @@ The Redis transport DSN may looks like this:
14401440
A number of options can be configured via the DSN or via the ``options`` key
14411441
under the transport in ``messenger.yaml``:
14421442

1443+
14431444
=================== ===================================== =================================
1444-
Option Description Default
1445+
Option Description Default
14451446
=================== ===================================== =================================
14461447
stream The Redis stream name messages
14471448
group The Redis consumer group name symfony

page_creation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ To get a list of *all* of the routes in your system, use the ``debug:router`` co
166166
You should see your ``app_lucky_number`` route in the list:
167167

168168
================== ======== ======== ====== ===============
169-
Name Method Scheme Host Path
169+
Name Method Scheme Host Path
170170
================== ======== ======== ====== ===============
171-
app_lucky_number ANY ANY ANY /lucky/number
171+
app_lucky_number ANY ANY ANY /lucky/number
172172
================== ======== ======== ====== ===============
173173

174174
You will also see debugging routes besides ``app_lucky_number`` -- more on

0 commit comments

Comments
 (0)