Add latest changes from gitlab-org/gitlab@master

3 files changed, 67 insertions, 6 deletions

diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index 1ebdeddfa67..bda4f65cff5 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -112,6 +112,10 @@ subgroups, sorted in descending order of CI/CD minute usage.
 
 > Displaying shared runners duration [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345795) in GitLab 15.0.
 
+Prerequisite:
+
+- The namespace must be your personal namespace.
+
 You can view the number of CI/CD minutes being used by a personal namespace:
 
 1. On the top bar, in the upper-right corner, select your avatar.
@@ -147,6 +151,10 @@ You can find pricing for additional CI/CD minutes on the
 
 ### Purchase CI/CD minutes for a group **(FREE SAAS)**
 
+Prerequisite:
+
+- You must have the Owner role for the group.
+
 You can purchase additional CI/CD minutes for your group.
 You cannot transfer purchased CI/CD minutes from one group to another,
 so be sure to select the correct group.
@@ -162,6 +170,10 @@ namespace.
 
 ### Purchase CI/CD minutes for a personal namespace **(FREE SAAS)**
 
+Prerequisite:
+
+- The namespace must be your personal namespace.
+
 To purchase additional minutes for your personal namespace:
 
 1. On the top bar, in the upper-right corner, select your avatar.
diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index 7f69a1f0d54..baa46f7bfc2 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -1449,7 +1449,7 @@ For tab titles, be brief and consistent. Ensure they are parallel, and start eac
 For example:
 
 - `Linux package (Omnibus)`, `Helm chart (Kubernetes)` (when documenting configuration edits, follow the
-  [configuration edits guide](#configuration-documentation-for-different-installation-methods))
+  [configuration edits guide](#how-to-document-different-installation-methods))
 - `15.1 and earlier`, `15.2 and later`
 
 Until we implement automated testing for broken links to tabs ([Issue 1355](https://gitlab.com/gitlab-org/gitlab-docs/-/issues/1355)), do not link directly to a single tab, even though they do have unique URL parameters.
@@ -1555,15 +1555,28 @@ we install Ruby from source. To update the guide for a new Ruby version:
 - Replace the sha256sum. It's available on the
   [downloads page](https://www.ruby-lang.org/en/downloads/) of the Ruby website.
 
-### Configuration documentation for different installation methods
+### How to document different installation methods
 
-GitLab supports four installation methods:
+GitLab supports five official installation methods. If you're referring to
+words as part of sentences and titles, use the following phrases:
+
+- Linux package
+- Helm chart
+- GitLab Operator
+- Docker
+- Self-compiled
+
+It's OK to add the explanatory parentheses when
+[using tabs](#use-tabs-to-describe-a-self-managed-configuration-procedure):
 
 - Linux package (Omnibus)
 - Helm chart (Kubernetes)
+- GitLab Operator (Kubernetes)
 - Docker
 - Self-compiled (source)
 
+### Use tabs to describe a self-managed configuration procedure
+
 Configuration procedures can require users to edit configuration files, reconfigure
 GitLab, or restart GitLab. In this case:
 
@@ -1576,8 +1589,8 @@ GitLab, or restart GitLab. In this case:
 - The final step to reconfigure or restart GitLab can be used verbatim since it's
   the same every time.
 
-You can copy and paste the following snippet when describing a configuration
-edit:
+When describing a configuration edit, you can use and edit to your liking the
+following snippet:
 
 <!-- markdownlint-disable tabs-blank-lines -->
 ````markdown
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index 9ecddd08103..48bc98caada 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -296,7 +296,7 @@ Do not use **click**. Instead, use **select** with buttons, links, menu items, a
 ## cloud native
 
 When you're talking about using a Kubernetes cluster to host GitLab, you're talking about a **cloud-native version of GitLab**.
-This version is different than the larger, more monolithic **Omnibus package** that is used to deploy GitLab.
+This version is different than the larger, more monolithic **Linux package** that is used to deploy GitLab.
 
 You can also use **cloud-native GitLab** for short. It should be hyphenated and lowercase.
 
@@ -570,6 +570,10 @@ Do not use **the `gitlab` chart**, **the GitLab Chart**, or **the cloud-native c
 
 You use the **GitLab Helm chart** to deploy **cloud-native GitLab** in a Kubernetes cluster.
 
+If you use it in a context of describing the
+[different installation methods](index.md#how-to-document-different-installation-methods).
+use `Helm chart (Kubernetes)`.
+
 ## GitLab Pages
 
 For consistency and branding, use **GitLab Pages** rather than **Pages**.
@@ -661,6 +665,22 @@ Do not use Latin abbreviations. Use **that is** instead. ([Vale](../testing.md#v
 
 Do not use **in order to**. Use **to** instead. ([Vale](../testing.md#vale) rule: [`Wordy.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/Wordy.yml))
 
+## Installation from source
+
+When referring to the installation method using the self-compiled code, refer to it
+as **self-compiled**.
+
+Use:
+
+- For self-compiled installations...
+
+Instead of:
+
+- For installations from source...
+
+For more information, see the
+[different installation methods](index.md#how-to-document-different-installation-methods).
+
 ## -ing words
 
 Remove **-ing** words whenever possible. They can be difficult to translate,
@@ -894,6 +914,22 @@ Instead of:
 
 - Note that you can change the settings.
 
+## Omnibus GitLab
+
+When referring to the installation method that uses the Linux package, refer to it
+as **Linux package**.
+
+Use:
+
+- For installations that use the Linux package...
+
+Instead of:
+
+- For installations that use Omnibus GitLab...
+
+For more information, see the
+[different installation methods](index.md#how-to-document-different-installation-methods).
+
 ## on
 
 When documenting how to select high-level UI elements, use the word **on**.