Skip to content

Commit 0dbfd0e

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '6.4' into 7.0
* 6.4: format dsn in mailer documentation
2 parents 6b4a4e3 + 99b6451 commit 0dbfd0e

File tree

1 file changed

+51
-51
lines changed

1 file changed

+51
-51
lines changed

‎mailer.rst

+51-51
Original file line numberDiff line numberDiff line change
@@ -158,57 +158,57 @@ transport, but you can force to use one:
158158
This table shows the full list of available DSN formats for each third
159159
party provider:
160160

161-
+------------------------+-----------------------------------------------------+
162-
| Provider | Formats |
163-
+========================+=====================================================+
164-
| `Amazon SES`_ | - SMTP ses+smtp://USERNAME:PASSWORD@default |
165-
| | - HTTP ses+https://ACCESS_KEY:SECRET_KEY@default |
166-
| | - API ses+api://ACCESS_KEY:SECRET_KEY@default |
167-
+------------------------+-----------------------------------------------------+
168-
| `Brevo`_ | - SMTP brevo+smtp://USERNAME:PASSWORD@default |
169-
| | - HTTP n/a |
170-
| | - API brevo+api://KEY@default |
171-
+------------------------+-----------------------------------------------------+
172-
| `Google Gmail`_ | - SMTP gmail+smtp://USERNAME:APP-PASSWORD@default |
173-
| | - HTTP n/a |
174-
| | - API n/a |
175-
+------------------------+-----------------------------------------------------+
176-
| `Infobip`_ | - SMTP infobip+smtp://KEY@default |
177-
| | - HTTP n/a |
178-
| | - API infobip+api://KEY@BASE_URL |
179-
+------------------------+-----------------------------------------------------+
180-
| `Mandrill`_ | - SMTP mandrill+smtp://USERNAME:PASSWORD@default |
181-
| | - HTTP mandrill+https://KEY@default |
182-
| | - API mandrill+api://KEY@default |
183-
+------------------------+-----------------------------------------------------+
184-
| `MailerSend`_ | - SMTP mailersend+smtp://KEY@default |
185-
| | - HTTP n/a |
186-
| | - API mailersend+api://KEY@BASE_URL |
187-
+------------------------+-----------------------------------------------------+
188-
| `Mailgun`_ | - SMTP mailgun+smtp://USERNAME:PASSWORD@default |
189-
| | - HTTP mailgun+https://KEY:DOMAIN@default |
190-
| | - API mailgun+api://KEY:DOMAIN@default |
191-
+------------------------+-----------------------------------------------------+
192-
| `Mailjet`_ | - SMTP mailjet+smtp://ACCESS_KEY:SECRET_KEY@default |
193-
| | - HTTP n/a |
194-
| | - API mailjet+api://ACCESS_KEY:SECRET_KEY@default |
195-
+------------------------+-----------------------------------------------------+
196-
| `MailPace`_ | - SMTP mailpace+api://API_TOKEN@default |
197-
| | - HTTP n/a |
198-
| | - API mailpace+api://API_TOKEN@default |
199-
+------------------------+-----------------------------------------------------+
200-
| `Postmark`_ | - SMTP postmark+smtp://ID@default |
201-
| | - HTTP n/a |
202-
| | - API postmark+api://KEY@default |
203-
+------------------------+-----------------------------------------------------+
204-
| `Scaleway`_ | - SMTP scaleway+smtp://PROJECT_ID:API_KEY@default |
205-
| | - HTTP n/a |
206-
| | - API scaleway+api://PROJECT_ID:API_KEY@default |
207-
+------------------------+-----------------------------------------------------+
208-
| `Sendgrid`_ | - SMTP sendgrid+smtp://KEY@default |
209-
| | - HTTP n/a |
210-
| | - API sendgrid+api://KEY@default |
211-
+------------------------+-----------------------------------------------------+
161+
+------------------------+---------------------------------------------------------+
162+
| Provider | Formats |
163+
+========================+=========================================================+
164+
| `Amazon SES`_ | - SMTP ``ses+smtp://USERNAME:PASSWORD@default`` |
165+
| | - HTTP ``ses+https://ACCESS_KEY:SECRET_KEY@default`` |
166+
| | - API ``ses+api://ACCESS_KEY:SECRET_KEY@default`` |
167+
+------------------------+---------------------------------------------------------+
168+
| `Brevo`_ | - SMTP ``brevo+smtp://USERNAME:PASSWORD@default`` |
169+
| | - HTTP n/a |
170+
| | - API ``brevo+api://KEY@default`` |
171+
+------------------------+---------------------------------------------------------+
172+
| `Google Gmail`_ | - SMTP ``gmail+smtp://USERNAME:APP-PASSWORD@default`` |
173+
| | - HTTP n/a |
174+
| | - API n/a |
175+
+------------------------+---------------------------------------------------------+
176+
| `Infobip`_ | - SMTP ``infobip+smtp://KEY@default`` |
177+
| | - HTTP n/a |
178+
| | - API ``infobip+api://KEY@BASE_URL`` |
179+
+------------------------+---------------------------------------------------------+
180+
| `Mandrill`_ | - SMTP ``mandrill+smtp://USERNAME:PASSWORD@default`` |
181+
| | - HTTP ``mandrill+https://KEY@default`` |
182+
| | - API ``mandrill+api://KEY@default`` |
183+
+------------------------+---------------------------------------------------------+
184+
| `MailerSend`_ | - SMTP ``mailersend+smtp://KEY@default`` |
185+
| | - HTTP n/a |
186+
| | - API ``mailersend+api://KEY@BASE_URL`` |
187+
+------------------------+---------------------------------------------------------+
188+
| `Mailgun`_ | - SMTP ``mailgun+smtp://USERNAME:PASSWORD@default`` |
189+
| | - HTTP ``mailgun+https://KEY:DOMAIN@default`` |
190+
| | - API ``mailgun+api://KEY:DOMAIN@default`` |
191+
+------------------------+---------------------------------------------------------+
192+
| `Mailjet`_ | - SMTP ``mailjet+smtp://ACCESS_KEY:SECRET_KEY@default`` |
193+
| | - HTTP n/a |
194+
| | - API ``mailjet+api://ACCESS_KEY:SECRET_KEY@default`` |
195+
+------------------------+---------------------------------------------------------+
196+
| `MailPace`_ | - SMTP ``mailpace+api://API_TOKEN@default`` |
197+
| | - HTTP n/a |
198+
| | - API ``mailpace+api://API_TOKEN@default`` |
199+
+------------------------+---------------------------------------------------------+
200+
| `Postmark`_ | - SMTP ``postmark+smtp://ID@default`` |
201+
| | - HTTP n/a |
202+
| | - API ``postmark+api://KEY@default`` |
203+
+------------------------+---------------------------------------------------------+
204+
| `Scaleway`_ | - SMTP ``scaleway+smtp://PROJECT_ID:API_KEY@default`` |
205+
| | - HTTP n/a |
206+
| | - API ``scaleway+api://PROJECT_ID:API_KEY@default`` |
207+
+------------------------+---------------------------------------------------------+
208+
| `Sendgrid`_ | - SMTP ``sendgrid+smtp://KEY@default`` |
209+
| | - HTTP n/a |
210+
| | - API ``sendgrid+api://KEY@default`` |
211+
+------------------------+---------------------------------------------------------+
212212

213213
.. caution::
214214

0 commit comments

Comments
 (0)