Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

5 files changed, 28 insertions, 9 deletions

diff --git a/doc/.vale/gitlab/Acronyms.yml b/doc/.vale/gitlab/Acronyms.yml
index d7f5c750ec0..bc8f38fe5e2 100644
--- a/doc/.vale/gitlab/Acronyms.yml
+++ b/doc/.vale/gitlab/Acronyms.yml
@@ -102,6 +102,7 @@ exceptions:
   - NFS
   - NGINX
   - NOTE
+  - NPM
   - NTP
   - ONLY
   - OSS
@@ -119,6 +120,7 @@ exceptions:
   - PUT
   - RAID
   - RAM
+  - RBAC
   - RDP
   - REST
   - RFC
diff --git a/doc/.vale/gitlab/HeaderGerunds.yml b/doc/.vale/gitlab/HeaderGerunds.yml
new file mode 100644
index 00000000000..9e5fa19f867
--- /dev/null
+++ b/doc/.vale/gitlab/HeaderGerunds.yml
@@ -0,0 +1,14 @@
+---
+# Suggestion: gitlab.HeaderGerunds
+#
+# Checks for headers that start with gerunds (ing words).
+# Related to: https://docs.gitlab.com/ee/development/documentation/structure.html
+#
+# For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
+extends: substitution
+message: 'Can this header start with an imperative verb, instead of a gerund (ing word)?'
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/#heading-titles
+level: suggestion
+scope: heading
+swap:
+  - '^\w*ing.*': 'Troubleshooting'
diff --git a/doc/.vale/gitlab/SubstitutionWarning.yml b/doc/.vale/gitlab/SubstitutionWarning.yml
index b38427ace09..50ac97bc227 100644
--- a/doc/.vale/gitlab/SubstitutionWarning.yml
+++ b/doc/.vale/gitlab/SubstitutionWarning.yml
@@ -19,15 +19,6 @@ swap:
   info: information
   repo: repository
   utilize: use
-  owner access: the Owner role
-  owner permission: the Owner role
-  owner permissions: the Owner role
-  maintainer access: the Maintainer role
-  maintainer permission: the Maintainer role
-  maintainer permissions: the Maintainer role
   administrator access: the Administrator role
   administrator permission: the Administrator role
   administrator permissions: the Administrator role
-  developer access: the Developer role
-  developer permission: the Developer role
-  developer permissions: the Developer role
diff --git a/doc/.vale/gitlab/Substitutions.yml b/doc/.vale/gitlab/Substitutions.yml
index 99d2eb1f11a..e6c150fb8be 100644
--- a/doc/.vale/gitlab/Substitutions.yml
+++ b/doc/.vale/gitlab/Substitutions.yml
@@ -38,3 +38,12 @@ swap:
   can sign-in: can sign in
   x509: X.509
   yaml: YAML
+  developer access: the Developer role
+  developer permission: the Developer role
+  developer permissions: the Developer role
+  maintainer access: the Maintainer role
+  maintainer permission: the Maintainer role
+  maintainer permissions: the Maintainer role
+  owner access: the Owner role
+  owner permission: the Owner role
+  owner permissions: the Owner role
diff --git a/doc/.vale/gitlab/spelling-exceptions.txt b/doc/.vale/gitlab/spelling-exceptions.txt
index d465767049f..0520fd53c16 100644
--- a/doc/.vale/gitlab/spelling-exceptions.txt
+++ b/doc/.vale/gitlab/spelling-exceptions.txt
@@ -247,6 +247,7 @@ Helm
 Heroku
 Herokuish
 Hexo
+HipChat
 hostname
 hostnames
 hotfix
@@ -289,12 +290,14 @@ kanbans
 kaniko
 Karma
 Kerberos
+Keycloak
 keyset
 keyspace
 keytab
 keytabs
 Kibana
 Kinesis
+Klar
 Knative
 Kramdown
 Kroki