diff options
author | Evan Read <eread@gitlab.com> | 2019-08-07 08:42:03 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-08-07 08:42:03 +0000 |
commit | 1e69e67dc330ccb4533bff967c9ad2ebd7200eb0 (patch) | |
tree | 9c7c4cfd67afeb0c2f106876d37f3ea4b86ac04c | |
parent | 5edaf4e59937a961f24eb596d963678f8a332bd2 (diff) | |
parent | fa93e1622403dc8f68d61c48b3c72a9b61fa1b4a (diff) | |
download | gitlab-ce-1e69e67dc330ccb4533bff967c9ad2ebd7200eb0.tar.gz |
Merge branch 'docs/62446-fix-email-nav-path' into 'master'
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446
Closes #62446
See merge request gitlab-org/gitlab-ce!31448
-rw-r--r-- | doc/user/admin_area/settings/email.md | 11 | ||||
-rw-r--r-- | doc/user/admin_area/settings/img/email_settings.png | bin | 53267 -> 0 bytes |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/user/admin_area/settings/email.md b/doc/user/admin_area/settings/email.md index 1f07a4dfdc6..77c9d097283 100644 --- a/doc/user/admin_area/settings/email.md +++ b/doc/user/admin_area/settings/email.md @@ -17,11 +17,10 @@ The logo in the header of some emails can be customized, see the [logo customiza The additional text will appear at the bottom of any email and can be used for legal/auditing/compliance reasons. -1. Go to **Admin area > Settings** (`/admin/application_settings`). -1. Under the **Email** section, change the **Additional text** field. -1. Hit **Save** for the changes to take effect. - -![Admin email settings](img/email_settings.png) +1. Go to **Admin Area > Settings > Preferences** (`/admin/application_settings/preferences`). +1. Expand the **Email** section. +1. Enter your text in the **Additional text** field. +1. Click **Save**. [ee-5031]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031 [eep]: https://about.gitlab.com/pricing/ @@ -53,4 +52,4 @@ questions that you know someone might ask. Each scenario can be a third-level heading, e.g. `### Getting error message X`. If you have none to add when creating a doc, leave this section in place -but commented out to help encourage others to add to it in the future. -->
\ No newline at end of file +but commented out to help encourage others to add to it in the future. --> diff --git a/doc/user/admin_area/settings/img/email_settings.png b/doc/user/admin_area/settings/img/email_settings.png Binary files differdeleted file mode 100644 index ed0a80d10ce..00000000000 --- a/doc/user/admin_area/settings/img/email_settings.png +++ /dev/null |