Add latest changes from gitlab-org/gitlab@master

3 files changed, 43 insertions, 2 deletions

diff --git a/doc/.linting/vale/styles/gitlab/Substitutions.yml b/doc/.linting/vale/styles/gitlab/Substitutions.yml
new file mode 100644
index 00000000000..d9ae1dfcb07
--- /dev/null
+++ b/doc/.linting/vale/styles/gitlab/Substitutions.yml
@@ -0,0 +1,36 @@
+---
+# `extends` indicates the Vale extension point being used.
+# Full list of styles: https://errata-ai.github.io/vale/styles/
+extends: substitution
+
+# Substitution rules can display the matched and suggested strings in the 
+# message shown to the user. The first use of %s prints the suggested option,
+# and the second use of %s displays what was found in the text.
+message: Use "%s" instead of "%s."
+
+# Should a result be flagged as a suggestion, warning, or error?
+# Results that fall below the MinAlertLevel set in 
+# https://gitlab.com/gitlab-org/gitlab/blob/master/.vale.ini won't be shown.
+level: warning
+
+# Should a match be case-insensitive or case-sensitive?
+# Acceptable values are 'true' or 'false'
+ignorecase: true
+
+# Should this rule be limited to a specific scope? If yes, uncomment the line.
+# Possible scopes: https://errata-ai.github.io/vale/formats/#available-scopes
+# scope: heading
+
+# Should this rule ignore normal word boundaries, such as \b ?
+# Acceptable values are 'true' or 'false'
+nonword: true
+
+# What is the source for this rule?
+link: https://about.gitlab.com/handbook/communication/#top-misused-terms
+
+# The 'swap' section provides a list of values, one per line, in the form of
+# $bad: $good
+swap:
+  GitLabber: GitLab team member
+  self hosted: self-managed
+  self-hosted: self-managed
diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md
index 57a1f46ac6e..5a5ab4dce05 100644
--- a/doc/user/clusters/management_project.md
+++ b/doc/user/clusters/management_project.md
@@ -24,9 +24,9 @@ other projects will continue to receive [namespace scoped `edit` level privilege
 
 Management projects are restricted to the following:
 
-- For project-level clusters, the management project must in the same
+- For project-level clusters, the management project must be in the same
   namespace (or descendants) as the cluster's project.
-- For group-level clusters, the management project must in the same
+- For group-level clusters, the management project must be in the same
   group (or descendants) as as the cluster's group.
 - For instance-level clusters, there are no such restrictions.
 
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index 131e2413e5f..ad0e33207ce 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -108,6 +108,11 @@ You can use `%{ISSUE_ID}` placeholder which will be replaced by an issue iid
 in the email, `%{ISSUE_PATH}` placeholder which will be replaced by
  project path and the issue iid and `%{NOTE_TEXT}` placeholder which will be replaced by the note text.
 
+### Using custom email display name
+
+You can customize the email display name. Emails sent from Service Desk will have
+this name in the `From` header. The default display name is `GitLab Support Bot`.
+
 ## Using Service Desk
 
 ### As an end user (issue creator)