Add latest changes from gitlab-org/gitlab@master

8 files changed, 49 insertions, 28 deletions

diff --git a/doc/api/groups.md b/doc/api/groups.md
index be2d9993ca0..312688202f6 100644
--- a/doc/api/groups.md
+++ b/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.
 
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index 128fd2fa9a0..b48c6915abf 100644
--- a/doc/development/documentation/styleguide.md
+++ b/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
diff --git a/doc/development/testing_guide/ci.md b/doc/development/testing_guide/ci.md
index 8091142410c..0e292676c5a 100644
--- a/doc/development/testing_guide/ci.md
+++ b/doc/development/testing_guide/ci.md
@@ -6,7 +6,7 @@ Our current CI parallelization setup is as follows:
 
 1. The `retrieve-tests-metadata` job in the `prepare` stage ensures we have a
    `knapsack/report-master.json` file:
-   - The `knapsack/report-master.json` file is fetched from S3, if it's not here
+   - The `knapsack/report-master.json` file is fetched from the latest `master` artifacts, if it's not here
      we initialize the file with `{}`.
 1. Each `[rspec|rspec-ee] [unit|integration|system|geo] n m` job are run with
    `knapsack rspec` and should have an evenly distributed share of tests:
@@ -19,7 +19,7 @@ Our current CI parallelization setup is as follows:
 1. The `update-tests-metadata` job (which only runs on scheduled pipelines for
    [the canonical project](https://gitlab.com/gitlab-org/gitlab) takes all the
    `knapsack/rspec*_pg_*.json` files and merge them all together into a single
-   `knapsack/report-master.json` file that is then uploaded to S3.
+   `knapsack/report-master.json` file that is saved as artifact.
 
 After that, the next pipeline will use the up-to-date `knapsack/report-master.json` file.
 
diff --git a/doc/university/training/topics/env_setup.md b/doc/university/training/topics/env_setup.md
index be517032a1b..e99b8696189 100644
--- a/doc/university/training/topics/env_setup.md
+++ b/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
 
diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md
index 55dabce7342..da1e4ca2581 100644
--- a/doc/user/admin_area/appearance.md
+++ b/doc/user/admin_area/appearance.md
@@ -76,7 +76,7 @@ to activate it in the GitLab instance. You can also click on the **Sign-in page*
 to review the saved appearance settings:
 
 NOTE: **Note:**
-You can add also add a [customized help message](settings/help_page.md) below the sign in message.
+You can add also add a [customized help message](settings/help_page.md) below the sign in message or add [a Sign in text message](settings/sign_in_restrictions.md#sign-in-information).
 
 ## New project pages
 
diff --git a/doc/user/analytics/index.md b/doc/user/analytics/index.md
index c26c3c3453a..0debb99f4f0 100644
--- a/doc/user/analytics/index.md
+++ b/doc/user/analytics/index.md
@@ -26,6 +26,7 @@ The following analytics features are available at the group level:
 - [Insights](../group/insights/index.md). **(ULTIMATE)**
 - [Issue](../group/issues_analytics/index.md). **(PREMIUM)**
 - [Productivity](productivity_analytics.md) **(PREMIUM)**
+- [Repositories](../group/repositories_analytics/index.md) **(PREMIUM)**
 - [Value Stream](value_stream_analytics.md). **(PREMIUM)**
 
 ## Project-level analytics
diff --git a/doc/user/project/clusters/add_remove_clusters.md b/doc/user/project/clusters/add_remove_clusters.md
index 094f4bcf6ba..af870693f23 100644
--- a/doc/user/project/clusters/add_remove_clusters.md
+++ b/doc/user/project/clusters/add_remove_clusters.md
@@ -149,6 +149,9 @@ Amazon Elastic Kubernetes Service (EKS) at the project, group, or instance level
    - [Amazon EKS](add_eks_clusters.md#new-eks-cluster).
    - [Google GKE](add_gke_clusters.md#creating-the-cluster-on-gke).
 
+After creating a cluster, you can install runners for it as described in
+[GitLab Managed Apps](../../clusters/applications.md).
+
 ## Add existing cluster
 
 If you have an existing Kubernetes cluster, you can add it to a project, group,
@@ -158,6 +161,9 @@ Kubernetes integration isn't supported for arm64 clusters. See the issue
 [Helm Tiller fails to install on arm64 cluster](https://gitlab.com/gitlab-org/gitlab/-/issues/29838)
 for details.
 
+After adding an existing cluster, you can install runners for it as described in
+[GitLab Managed Apps](../../clusters/applications.md).
+
 ### Existing Kubernetes cluster
 
 To add a Kubernetes cluster to your project, group, or instance:
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index a1c28cfa2b7..a113758495a 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -30,6 +30,11 @@ repository is too large the import can timeout.
 
 There is also the option of [connecting your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md). **(PREMIUM)**
 
+## LFS authentication
+
+When importing a project that contains LFS objects, if the project has an [`.lfsconfig`](https://github.com/git-lfs/git-lfs/blob/master/docs/man/git-lfs-config.5.ronn)
+file with a URL host (`lfs.url`) different from the repository URL host, LFS files are not downloaded.
+
 ## Migrating from self-managed GitLab to GitLab.com
 
 If you only need to migrate Git repositories, you can [import each project by URL](repo_by_url.md). Issues and merge requests can't be imported.