Skip to content

Commit 4b659f4

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '7.0' into 7.1
* 7.0: format dsn in mailer documentation
2 parents afe4b3e + 0dbfd0e commit 4b659f4

File tree

1 file changed

+57
-57
lines changed

1 file changed

+57
-57
lines changed

‎mailer.rst

+57-57
Original file line numberDiff line numberDiff line change
@@ -164,63 +164,63 @@ transport, but you can force to use one:
164164
This table shows the full list of available DSN formats for each third
165165
party provider:
166166

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

225225
.. caution::
226226

0 commit comments

Comments
 (0)