Automatic merge of gitlab-org/gitlab master

doc/api/groups.md

@@ -1119,7 +1119,7 @@ DELETE /groups/:id/hooks/:hook_id
 
 Group audit events can be accessed via the [Group Audit Events API](audit_events.md#group-audit-events)
 
-## Sync group with LDAP **(STARTER)**
+## Sync group with LDAP **(STARTER ONLY)**
 
 Syncs the group with its linked LDAP group. Only available to group owners and administrators.
 
@@ -1139,7 +1139,7 @@ Please consult the [Group Members](members.md) documentation.
 
 List, add, and delete LDAP group links.
 
-### List LDAP group links **(STARTER)**
+### List LDAP group links **(STARTER ONLY)**
 
 Lists LDAP group links.
 
@@ -1151,7 +1151,7 @@ GET /groups/:id/ldap_group_links
 | --------- | -------------- | -------- | ----------- |
 | `id`      | integer/string | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) |
 
-### Add LDAP group link with CN or filter **(STARTER)**
+### Add LDAP group link with CN or filter **(STARTER ONLY)**
 
 Adds an LDAP group link using a CN or filter. Adding a group link by filter is only supported in the Premium tier and above.
 
@@ -1170,7 +1170,7 @@ POST /groups/:id/ldap_group_links
 NOTE: **Note:**
 To define the LDAP group link, provide either a `cn` or a `filter`, but not both.
 
-### Delete LDAP group link **(STARTER)**
+### Delete LDAP group link **(STARTER ONLY)**
 
 Deletes an LDAP group link. Deprecated. Will be removed in a future release.
 
@@ -1195,7 +1195,7 @@ DELETE /groups/:id/ldap_group_links/:provider/:cn
 | `cn`      | string         | yes      | The CN of an LDAP group |
 | `provider` | string        | yes      | LDAP provider for the LDAP group link |
 
-### Delete LDAP group link with CN or filter **(STARTER)**
+### Delete LDAP group link with CN or filter **(STARTER ONLY)**
 
 Deletes an LDAP group link using a CN or filter. Deleting by filter is only supported in the Premium tier and above.
 

doc/development/documentation/styleguide.md

@@ -557,12 +557,13 @@ tenses, words, and phrases:
   - Exceptions to this rule include commonly accepted technical terms, such as
     CI/CD and TCP/IP.
 - <!-- vale gitlab.LatinTerms = NO -->
-  We discourage use of Latin abbreviations, such as "e.g.," "i.e.," or "etc.,"
-  as even native users of English might misunderstand them.
-  (Tested in [`LatinTerms.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/LatinTerms.yml).)
-  - Instead of "i.e.," use "that is."
-  - Instead of "e.g.," use "for example," "such as," "for instance," or "like."
-  - Instead of "etc.," either use "and so on" or consider editing it out, since
+  We discourage the use of Latin abbreviations and terms, such as _e.g._,
+  _i.e._, _etc._, or _via_, as even native users of English can misunderstand
+  those terms. (Tested in [`LatinTerms.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/LatinTerms.yml).)
+  - Instead of _i.e._, use _that is_.
+  - Instead of _via_, use _through_.
+  - Instead of _e.g._, use _for example_, _such as_, _for instance_, or _like_.
+  - Instead of _etc._, either use _and so on_ or consider editing it out, since
     it can be vague.
     <!-- vale gitlab.LatinTerms = YES -->
 - Avoid using the word *currently* when talking about the product or its
@@ -740,8 +741,7 @@ This is a list of available features:
 
 - Don't add commas (`,`) or semicolons (`;`) to the ends of list items.
 - Only add periods to the end of a list item if the item consists of a complete
-  sentence. The [definition of full sentence](https://www.le.ac.uk/oerresources/ssds/grammarguides/page_02.htm)
-  is: _"a complete sentence always contains a verb, expresses a complete idea, and makes sense standing alone"_.
+  sentence (with a subject and a verb).
 - Be consistent throughout the list: if the majority of the items do not end in
   a period, do not end any of the items in a period, even if they consist of a
   complete sentence. The opposite is also valid: if the majority of the items

doc/university/training/topics/env_setup.md

@@ -6,22 +6,31 @@ comments: false
 
 ## Install
 
-- **Windows**
-  - Install 'Git for Windows' from <https://gitforwindows.org>
-
+- **Windows** - Install 'Git for Windows' from [Git for Windows](https://gitforwindows.org).
 - **Mac**
   - Type '`git`' in the Terminal application.
   - If it's not installed, it will prompt you to install it.
 
-- **Linux**
-
-  ```shell
-  sudo yum install git-all
-  ```
-
-  ```shell
-  sudo apt-get install git-all
-  ```
+- **Linux** - Enter `which git` in the Terminal application and press <kbd>Enter</kbd> to
+  determine if Git is installed on your system.
+
+  - If the output of that command gives you the path to the Git executable, similar to
+    `/usr/bin/git`, then Git is already installed on your system.
+  - If the output of the command displays "command not found" error, Git isn't installed on your system.
+
+  GitLab recommends installing Git with the default package manager of your distribution.
+  The following commands install Git on various GNU/Linux distributions using their
+  default package managers. After you run the command corresponding to your distribution
+  and complete the installation process, Git should be available on your system:
+
+  - **Arch Linux and its derivatives** - `sudo pacman -S git`
+  - **Fedora, RHEL, and CentOS** - For the `yum` package manager run `sudo yum install git-all`,
+    and for the `dnf` package manager run `sudo dnf install git`.
+  - **Debian/Ubuntu and their derivatives** - `sudo apt-get install git`
+  - **Gentoo** - `sudo emerge --ask --verbose dev-vcs/git`
+  - **openSUSE** - `sudo zypper install git`
+  - **FreeBSD** - `sudo pkg install git`
+  - **OpenBSD** - `doas pkg_add git`
 
 ## Configure Git