Skip to content

Commit e355e47

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Fix RST syntax of some tables
2 parents f6d7e69 + 3c8f5dc commit e355e47

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

mailer.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,16 @@ This table shows the full list of available DSN formats for each third
156156
party provider:
157157

158158
==================== ==================================================== =========================================== ========================================
159-
Provider SMTP HTTP API
159+
Provider SMTP HTTP API
160160
==================== ==================================================== =========================================== ========================================
161-
Amazon SES ses+smtp://USERNAME:PASSWORD@default ses+https://ACCESS_KEY:SECRET_KEY@default ses+api://ACCESS_KEY:SECRET_KEY@default
162-
Google Gmail gmail+smtp://USERNAME:PASSWORD@default n/a n/a
163-
Mailchimp Mandrill mandrill+smtp://USERNAME:PASSWORD@default mandrill+https://KEY@default mandrill+api://KEY@default
164-
Mailgun mailgun+smtp://USERNAME:PASSWORD@default mailgun+https://KEY:DOMAIN@default mailgun+api://KEY:DOMAIN@default
165-
Mailjet mailjet+smtp://ACCESS_KEY:SECRET_KEY@default n/a mailjet+api://ACCESS_KEY:SECRET_KEY@default
166-
Postmark postmark+smtp://ID@default n/a postmark+api://KEY@default
167-
Sendgrid sendgrid+smtp://KEY@default n/a sendgrid+api://KEY@default
168-
Sendinblue sendinblue+smtp://USERNAME:PASSWORD@default n/a sendinblue+api://KEY@default
161+
Amazon SES ses+smtp://USERNAME:PASSWORD@default ses+https://ACCESS_KEY:SECRET_KEY@default ses+api://ACCESS_KEY:SECRET_KEY@default
162+
Google Gmail gmail+smtp://USERNAME:PASSWORD@default n/a n/a
163+
Mailchimp Mandrill mandrill+smtp://USERNAME:PASSWORD@default mandrill+https://KEY@default mandrill+api://KEY@default
164+
Mailgun mailgun+smtp://USERNAME:PASSWORD@default mailgun+https://KEY:DOMAIN@default mailgun+api://KEY:DOMAIN@default
165+
Mailjet mailjet+smtp://ACCESS_KEY:SECRET_KEY@default n/a mailjet+api://ACCESS_KEY:SECRET_KEY@default
166+
Postmark postmark+smtp://ID@default n/a postmark+api://KEY@default
167+
Sendgrid sendgrid+smtp://KEY@default n/a sendgrid+api://KEY@default
168+
Sendinblue sendinblue+smtp://USERNAME:PASSWORD@default n/a sendinblue+api://KEY@default
169169
==================== ==================================================== =========================================== ========================================
170170

171171
.. caution::

messenger.rst

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

12541254
================== ===================================== ======================
1255-
Option Description Default
1255+
Option Description Default
12561256
================== ===================================== ======================
12571257
table_name Name of the table messenger_messages
12581258
queue_name Name of the queue (a column in the default
@@ -1367,8 +1367,9 @@ The Redis transport DSN may looks like this:
13671367
A number of options can be configured via the DSN or via the ``options`` key
13681368
under the transport in ``messenger.yaml``:
13691369

1370+
13701371
=================== ===================================== =================================
1371-
Option Description Default
1372+
Option Description Default
13721373
=================== ===================================== =================================
13731374
stream The Redis stream name messages
13741375
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)