Skip to content

Commit cf47a93

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: minor Minor tweak Add "frontend" as one of the topic to getting started
2 parents 103241d + fdac1d3 commit cf47a93

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

mailer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ party provider:
179179
| | - HTTP n/a |
180180
| | - API infobip+api://KEY@BASE_URL |
181181
+------------------------+-----------------------------------------------------+
182-
| `Mailchimp Mandrill`_ | - SMTP mandrill+smtp://USERNAME:PASSWORD@default |
182+
| `Mandrill`_ | - SMTP mandrill+smtp://USERNAME:PASSWORD@default |
183183
| | - HTTP mandrill+https://KEY@default |
184184
| | - API mandrill+api://KEY@default |
185185
+------------------------+-----------------------------------------------------+
@@ -1484,8 +1484,8 @@ If your transport does not support tags and metadata, they will be added as cust
14841484
The following transports currently support tags and metadata:
14851485

14861486
* Brevo
1487-
* Mailchimp
14881487
* Mailgun
1488+
* Mandrill
14891489
* Postmark
14901490
* Sendgrid
14911491

page_creation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ OK, time to finish mastering the fundamentals by reading these articles:
281281
* :doc:`/routing`
282282
* :doc:`/controller`
283283
* :doc:`/templates`
284+
* :doc:`/frontend`
284285
* :doc:`/configuration`
285286

286287
Then, learn about other important topics like the

0 commit comments

Comments
 (0)