summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-01-07 23:05:16 +0000
committerMike Lewis <mlewis@gitlab.com>2019-01-07 23:05:16 +0000
commit42fffacc6b8b5fd9c2d4539f697aa4593640a544 (patch)
tree3b760197f91b756bcd3a1617830e67a11f4c941a
parentbedf5c03859b0e8f6eb36a8f36d4883730fe7194 (diff)
downloadgitlab-ce-29951-support-new-issue-creation-by-email-without-subaddressing-docs.tar.gz
Edits to Requirements and Email Sub-Addressing29951-support-new-issue-creation-by-email-without-subaddressing-docs
-rw-r--r--doc/administration/incoming_email.md30
1 files changed, 15 insertions, 15 deletions
diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md
index 06af6a08b28..9e0acddc6e8 100644
--- a/doc/administration/incoming_email.md
+++ b/doc/administration/incoming_email.md
@@ -13,29 +13,29 @@ GitLab has several features based on receiving incoming emails:
## Requirements
-Handling incoming emails requires an [IMAP]-enabled email account. GitLab
-requires one of the following three strategies:
+Handling incoming emails requires an [IMAP](https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol)-enabled
+email account. GitLab requires one of the following three strategies:
-- Email sub-addressing
+- Email sub-addressing (recommended)
- Catch-all mailbox
-- Dedicated email address
+- Dedicated email address (supports Reply by Email only)
Let's walk through each of these options.
-**If your provider or server supports email sub-addressing, we recommend using it.
-A dedicated email address only supports reply by email.**
-
-[IMAP]: https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol
-
### Email sub-addressing
[Sub-addressing](https://en.wikipedia.org/wiki/Email_address#Sub-addressing) is
-a feature where any email to `user+some_arbitrary_tag@example.com` will end up
-in the mailbox for `user@example.com`, and is supported by providers such as
-Gmail, Google Apps, Yahoo! Mail, Outlook.com and iCloud, as well as the
-[Postfix mail server] which you can run on-premises.
-
-[Postfix mail server]: reply_by_email_postfix_setup.md
+a feature where any email to `user+arbitrary_tag@example.com` will end up
+in the mailbox for `user@example.com`. It is supported by providers such as
+Gmail, Google Apps, Yahoo! Mail, Outlook.com, and iCloud, as well as the
+[Postfix mail server](reply_by_email_postfix_setup.md), which you can run on-premises.
+
+TIP: **Tip:**
+If your provider or server supports email sub-addressing, we recommend using it.
+A dedicated email address only supports Reply by Email functionality.
+A catch-all mailbox supports the same features as sub-addressing as of GitLab 11.7,
+but sub-addressing is still preferred because only one email address is used,
+leaving a catch-all available for other purposes beyond GitLab.
### Catch-all mailbox