Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

4 files changed, 8 insertions, 9 deletions

diff --git a/doc/ci/runners/configure_runners.md b/doc/ci/runners/configure_runners.md
index b2885262e9d..d826b28acce 100644
--- a/doc/ci/runners/configure_runners.md
+++ b/doc/ci/runners/configure_runners.md
@@ -2,7 +2,6 @@
 stage: Verify
 group: Runner
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
-type: reference
 ---
 
 # Configuring runners **(FREE)**
@@ -640,7 +639,7 @@ support this feature.
 
 A meter can be enabled to provide the rate of transfer for uploads and downloads.
 
-You can set a maximum time for cache upload and download with the `CACHE_REQUEST_TIMEOUT` setting. 
+You can set a maximum time for cache upload and download with the `CACHE_REQUEST_TIMEOUT` setting.
 This setting can be useful when slow cache uploads substantially increase the duration of your job.
 
 ```yaml
diff --git a/doc/ci/runners/index.md b/doc/ci/runners/index.md
index b4e9fe818cf..064ad64b79f 100644
--- a/doc/ci/runners/index.md
+++ b/doc/ci/runners/index.md
@@ -17,6 +17,6 @@ No configuration is required. Your jobs can run on:
 - [Windows runners](build_cloud/windows_build_cloud.md) (beta).
 - [macOS runners](build_cloud/macos_build_cloud.md) (beta).
 
-The number of minutes you can use on these runners depends on your
-[quota](../../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota),
-which depends on your [subscription plan](../../subscriptions/gitlab_com/index.md#ci-pipeline-minutes).
+The number of minutes you can use on these runners depends on the
+[maximum number of CI/CD minutes](../pipelines/cicd_minutes.md)
+in your [subscription plan](https://about.gitlab.com/pricing/).
diff --git a/doc/ci/runners/runners_scope.md b/doc/ci/runners/runners_scope.md
index b16957ae83c..f76a767abec 100644
--- a/doc/ci/runners/runners_scope.md
+++ b/doc/ci/runners/runners_scope.md
@@ -28,13 +28,13 @@ If you are using a self-managed instance of GitLab:
   going to your project's **Settings > CI/CD**, expanding the **Runners** section,
   and clicking **Show runner installation instructions**.
   These instructions are also available [in the documentation](https://docs.gitlab.com/runner/install/index.html).
-- The administrator can also configure a maximum number of shared runner [pipeline minutes for
-  each group](../../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota).
+- The administrator can also configure a maximum number of shared runner [CI/CD minutes for
+  each group](../pipelines/cicd_minutes.md#set-the-quota-of-cicd-minutes-for-a-specific-namespace).
 
 If you are using GitLab.com:
 
 - You can select from a list of [shared runners that GitLab maintains](index.md).
-- The shared runners consume the [pipelines minutes](../../subscriptions/gitlab_com/index.md#ci-pipeline-minutes)
+- The shared runners consume the [CI/CD minutes](../pipelines/cicd_minutes.md)
   included with your account.
 
 ### Enable shared runners
diff --git a/doc/ci/runners/saas/windows_saas_runner.md b/doc/ci/runners/saas/windows_saas_runner.md
index 87ee542fb14..b08be14dbc3 100644
--- a/doc/ci/runners/saas/windows_saas_runner.md
+++ b/doc/ci/runners/saas/windows_saas_runner.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 SaaS runners on Windows are in [beta](https://about.gitlab.com/handbook/product/gitlab-the-product/#beta)
 and shouldn't be used for production workloads.
 
-During this beta period, the [shared runner pipeline quota](../../../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota)
+During this beta period, the [shared runner quota for CI/CD minutes](../../pipelines/cicd_minutes.md)
 applies for groups and projects in the same manner as Linux runners. This may
 change when the beta period ends, as discussed in this [related issue](https://gitlab.com/gitlab-org/gitlab/-/issues/30834).