Merge branch 'vrao-docs-spt192695' into 'master'

Add clarification on internal email visibility

See merge request gitlab-org/gitlab!53947

doc/user/project/service_desk.md

@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Service Desk **(FREE)**
 
-> - Moved to GitLab Free in 13.2.
+> Moved to GitLab Free in 13.2.
 
 Service Desk is a module that allows your team to connect
 with any external party through email, without any external tools.
@@ -54,36 +54,41 @@ Here's how Service Desk works for you:
 
 ## Configuring Service Desk
 
-NOTE:
-Service Desk is enabled on GitLab.com.
-You can skip step 1 below; you only need to enable it per project.
+Users with Maintainer and higher access in a project can configure Service Desk.
+
+Service Desk issues are [confidential](issues/confidential_issues.md), so they are
+only visible to project members. In GitLab 11.7 we updated the generated email
+address format. The older format is still supported, so existing aliases or
+contacts still work.
 
-If you have project maintainer access you have the option to set up Service Desk. Follow these steps:
+If you have [templates](description_templates.md) in your repository, you can optionally select
+one from the selector menu to append it to all Service Desk issues.
 
-1. [Set up incoming email](../../administration/incoming_email.md#set-it-up) for the GitLab instance.
+To enable Service Desk in your project:
+
+1. (GitLab self-managed only) [Set up incoming email](../../administration/incoming_email.md#set-it-up) for the GitLab instance.
    We recommend using [email sub-addressing](../../administration/incoming_email.md#email-sub-addressing),
-   but in GitLab 11.7 and later you can also use [catch-all mailboxes](../../administration/incoming_email.md#catch-all-mailbox).
-1. Navigate to your project's **Settings > General** and locate the **Service Desk** section.
+   but you can also use [catch-all mailboxes](../../administration/incoming_email.md#catch-all-mailbox).
+1. In a project, in the left sidebar, go to **Settings > General** and expand the **Service Desk** section.
 1. Enable the **Activate Service Desk** toggle. This reveals a unique email address to email issues
-   to the project. These issues are [confidential](issues/confidential_issues.md), so they are
-   only visible to project members. Note that in GitLab 11.7, we updated the generated email
-   address's format. The older format is still supported, however, allowing existing aliases or
-   contacts to continue working.
+   to the project.
+
+Service Desk is now enabled for this project! To access it in a project, in the left sidebar, select 
+**Issues > Service Desk**.
 
-   WARNING:
-   This email address can be used by anyone to create an issue on this project, regardless
-   of their access level to your GitLab instance. We recommend **putting this behind an alias on your email system** so it can be
-   changed if needed. We also recommend **[enabling Akismet](../../integration/akismet.md)** on your GitLab
-   instance to add spam checking to this service. Unblocked email spam would result in many spam
-   issues being created.
+WARNING:
+Anyone in your project can use the Service Desk email address to create an issue in this project, **regardless
+of their access level** to your GitLab instance.
 
-   If you have [templates](description_templates.md) in your repository, you can optionally select
-   one from the selector menu to append it to all Service Desk issues.
+To improve your project's security, we recommend the following:
 
-Service Desk is now enabled for this project! You should be able to access it from your project's
-**Issues** menu.
+- Put the Service Desk email address behind an alias on your email system so you can change it later.
+- [Enable Akismet](../../integration/akismet.md) on your GitLab instance to add spam checking to this service.
+  Unblocked email spam can result in many spam issues being created.
 
-![Service Desk Navigation Item](img/service_desk_nav_item.png)
+The unique internal email address is visible to all project members in your GitLab instance. 
+However, when using an email alias externally, an end user (issue creator) cannot see the internal
+email address displayed in the information note.
 
 ### Using customized email templates
 
@@ -232,7 +237,8 @@ The configuration options are the same as for configuring
 
 ## Using Service Desk
 
-There are a few ways Service Desk can be used.
+You can use Service Desk to [create an issue](#as-an-end-user-issue-creator) or [respond to one](#as-a-responder-to-the-issue).
+In these issues, you can also see our friendly neighborhood [Support Bot](#support-bot-user).
 
 ### As an end user (issue creator)