aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Claghorn <george@basecamp.com>2019-01-10 11:04:54 -0500
committerGeorge Claghorn <george@basecamp.com>2019-01-10 11:04:54 -0500
commit9edc84cdfa8908a436901d85309cadf65d457d8f (patch)
treee727c555a2f9a97960c63b76825572c451eb3b03
parent7aaf9b8076704426c5e3f20bc3018c398f58dc88 (diff)
downloadrails-9edc84cdfa8908a436901d85309cadf65d457d8f.tar.gz
rails-9edc84cdfa8908a436901d85309cadf65d457d8f.tar.bz2
rails-9edc84cdfa8908a436901d85309cadf65d457d8f.zip
Add Postmark to the ingress lists [ci skip]
-rw-r--r--actionmailbox/README.md2
-rw-r--r--guides/source/action_mailbox_basics.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionmailbox/README.md b/actionmailbox/README.md
index f0bde03961..c70f73b40f 100644
--- a/actionmailbox/README.md
+++ b/actionmailbox/README.md
@@ -1,6 +1,6 @@
# Action Mailbox
-Action Mailbox routes incoming emails to controller-like mailboxes for processing in Rails. It ships with ingresses for Amazon SES, Mailgun, Mandrill, and SendGrid. You can also handle inbound mails directly via the built-in Postfix ingress.
+Action Mailbox routes incoming emails to controller-like mailboxes for processing in Rails. It ships with ingresses for Amazon SES, Mailgun, Mandrill, Postmark, and SendGrid. You can also handle inbound mails directly via the built-in Postfix ingress.
The inbound emails are turned into `InboundEmail` records using Active Record and feature lifecycle tracking, storage of the original email on cloud storage via Active Storage, and responsible data handling with on-by-default incineration.
diff --git a/guides/source/action_mailbox_basics.md b/guides/source/action_mailbox_basics.md
index f2c8a0a6b7..c5ec921ad5 100644
--- a/guides/source/action_mailbox_basics.md
+++ b/guides/source/action_mailbox_basics.md
@@ -20,8 +20,8 @@ Introduction
Action Mailbox routes incoming emails to controller-like mailboxes for
processing in Rails. It ships with ingresses for Amazon SES, Mailgun, Mandrill,
-and SendGrid. You can also handle inbound mails directly via the built-in
-Postfix ingress.
+Postmark, and SendGrid. You can also handle inbound mails directly via the
+built-in Postfix ingress.
The inbound emails are turned into `InboundEmail` records using Active Record
and feature lifecycle tracking, storage of the original email on cloud storage