Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

5 files changed, 23 insertions, 10 deletions

diff --git a/doc/.vale/gitlab/Dropdown.yml b/doc/.vale/gitlab/Dropdown.yml
new file mode 100644
index 00000000000..691d44d1a48
--- /dev/null
+++ b/doc/.vale/gitlab/Dropdown.yml
@@ -0,0 +1,14 @@
+---
+# Suggestion: gitlab.Dropdown
+#
+# Catches many ways the phrase 'dropdown list' can be fumbled.
+#
+# For a list of all options, see https://errata-ai.github.io/vale/styles/
+extends: existence
+message: 'Use "dropdown list".'
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/word_list.html#dropdown-list
+level: suggestion
+ignorecase: true
+tokens:
+  - drop-down( [\w]*)?
+  - dropdown(?! list)
diff --git a/doc/.vale/gitlab/ElementDescriptors.yml b/doc/.vale/gitlab/ElementDescriptors.yml
index 254da16d00c..36f1202aef1 100644
--- a/doc/.vale/gitlab/ElementDescriptors.yml
+++ b/doc/.vale/gitlab/ElementDescriptors.yml
@@ -10,5 +10,4 @@ link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html
 level: suggestion
 ignorecase: true
 swap:
-  button: 'if possible, rewrite to not use'
-  area: 'use "section" instead of'
+  button: 'if possible, rewrite to remove'
diff --git a/doc/.vale/gitlab/SubstitutionWarning.yml b/doc/.vale/gitlab/SubstitutionWarning.yml
index 885b58cc937..fefc0f85cf4 100644
--- a/doc/.vale/gitlab/SubstitutionWarning.yml
+++ b/doc/.vale/gitlab/SubstitutionWarning.yml
@@ -21,6 +21,6 @@ swap:
   repo: repository
   timezone: time zone
   utilize: use
-  administrator access: the Administrator role
-  administrator permission: the Administrator role
-  administrator permissions: the Administrator role
+  administrator permission: the administrator access level
+  administrator permissions: the administrator access level
+  administrator role: the administrator access level
diff --git a/doc/.vale/gitlab/Acronyms.yml b/doc/.vale/gitlab/Uppercase.yml
index 23285fd0038..ae011748748 100644
--- a/doc/.vale/gitlab/Acronyms.yml
+++ b/doc/.vale/gitlab/Uppercase.yml
@@ -1,11 +1,11 @@
 ---
-# Warning: gitlab.Acronyms
+# Warning: gitlab.Uppercase
 #
-# Checks for unexpanded acronyms.
+# Checks for use of all uppercase letters with unknown reason.
 #
-# For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
+# For a list of all options, see https://docs.errata.ai/vale/styles.
 extends: conditional
-message: '"%s" has no definition.'
+message: "'%s' is uppercase. Use lowercase or `backticks` if possible. Otherwise add this word to the rule's exception list."
 link: https://about.gitlab.com/handbook/marketing/growth-marketing/content/editorial-team/#acronyms
 level: warning
 ignorecase: false
diff --git a/doc/.vale/gitlab/spelling-exceptions.txt b/doc/.vale/gitlab/spelling-exceptions.txt
index df228e61278..5ed8dc92249 100644
--- a/doc/.vale/gitlab/spelling-exceptions.txt
+++ b/doc/.vale/gitlab/spelling-exceptions.txt
@@ -128,7 +128,7 @@ crosslinked
 crosslinking
 crosslinks
 Crossplane
-CrowdIn
+Crowdin
 CSV
 cybersecurity
 Dangerfile