summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-21 11:42:19 +0200
committerDouwe Maan <douwe@gitlab.com>2015-09-21 11:42:36 +0200
commit017219e7f548936ce348eeb445dc4717896902ec (patch)
treee20227ad24753f4bf33e9f2e47f783aaec9fca5a /doc
parent0c833498678603e2fd222a2f6386418822ce0a19 (diff)
downloadgitlab-ce-017219e7f548936ce348eeb445dc4717896902ec.tar.gz
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r--doc/incoming_email/README.md6
-rw-r--r--doc/incoming_email/postfix.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/incoming_email/README.md b/doc/incoming_email/README.md
index 2a94bc07f2e..c94e25bd4cc 100644
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
@@ -16,7 +16,7 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
### Omnibus package installations
-1. Find the `incoming_email` section in `/etc/gitlab/gitlab.rb`, enable the feature, enter the email address including a placeholder for the `key` and fill in the details for your specific IMAP server and email account:
+1. Find the `incoming_email` section in `/etc/gitlab/gitlab.rb`, enable the feature, enter the email address including a placeholder for the `key` that references the item being replied to and fill in the details for your specific IMAP server and email account:
```ruby
gitlab_rails['incoming_email_enabled'] = true
@@ -53,7 +53,7 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
cd /home/git/gitlab
```
-1. Find the `incoming_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `key`:
+1. Find the `incoming_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `key` that references the item being replied to:
```sh
sudo editor config/gitlab.yml
@@ -134,7 +134,7 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
1. Go to the GitLab installation directory.
-1. Find the `incoming_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `key`:
+1. Find the `incoming_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `key` that references the item being replied to:
```yaml
incoming_email:
diff --git a/doc/incoming_email/postfix.md b/doc/incoming_email/postfix.md
index 09c5804cb77..18bf3db1744 100644
--- a/doc/incoming_email/postfix.md
+++ b/doc/incoming_email/postfix.md
@@ -27,7 +27,7 @@ The instructions make the assumption that you will be using the email address `i
## Create user
-1. Create a user for incoming.
+1. Create a user for incoming email.
```sh
sudo useradd -m -s /bin/bash incoming