Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

4 files changed, 39 insertions, 20 deletions

diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
index 66ab61e48b8..410759aa506 100644
--- a/doc/subscriptions/bronze_starter.md
+++ b/doc/subscriptions/bronze_starter.md
@@ -16,7 +16,7 @@ The following features remain available to Bronze and Starter customers, even th
 the tiers are no longer mentioned in GitLab documentation:
 
 - [Activate GitLab EE with a license](../user/admin_area/license.md)
-- [Adding a help message to the login page](../user/admin_area/settings/help_page.md#adding-a-help-message-to-the-login-page)
+- [Add a help message to the sign-in page](../user/admin_area/settings/help_page.md#add-a-help-message-to-the-sign-in-page)
 - [Burndown and burnup charts](../user/project/milestones/burndown_and_burnup_charts.md),
   including [per-project charts](../user/project/milestones/index.md#project-burndown-charts) and
   [per-group charts](../user/project/milestones/index.md#group-burndown-charts)
@@ -72,7 +72,7 @@ the tiers are no longer mentioned in GitLab documentation:
   - [Required Approvals](../user/project/merge_requests/approvals/index.md#required-approvals)
   - [Code Owners as eligible approvers](../user/project/merge_requests/approvals/rules.md#code-owners-as-eligible-approvers)
   - [Approval rules](../user/project/merge_requests/approvals/rules.md) features
-  - [Restricting push and merge access to certain users](../user/project/protected_branches.md#restricting-push-and-merge-access-to-certain-users)
+  - [Restricting push and merge access to certain users](../user/project/protected_branches.md)
   - [Visual Reviews](../ci/review_apps/index.md#visual-reviews)
 - Metrics and analytics:
   - [Contribution Analytics](../user/group/contribution_analytics/index.md)
@@ -89,16 +89,16 @@ the tiers are no longer mentioned in GitLab documentation:
 - Repositories:
   - [Repository size limit](../user/admin_area/settings/account_and_limit_settings.md#repository-size-limit)
   - Repository mirroring:
-    - [Pull mirroring](../user/project/repository/repository_mirroring.md#pulling-from-a-remote-repository) outside repositories in a GitLab repository
+    - [Pull mirroring](../user/project/repository/repository_mirroring.md#pull-from-a-remote-repository) outside repositories in a GitLab repository
     - [Overwrite diverged branches](../user/project/repository/repository_mirroring.md#overwrite-diverged-branches)
     - [Trigger pipelines for mirror updates](../user/project/repository/repository_mirroring.md#trigger-pipelines-for-mirror-updates)
     - [Hard failures](../user/project/repository/repository_mirroring.md#hard-failure) when mirroring fails
     - [Trigger pull mirroring from the API](../user/project/repository/repository_mirroring.md#trigger-an-update-using-the-api)
     - [Mirror only protected branches](../user/project/repository/repository_mirroring.md#mirror-only-protected-branches)
     - [Bidirectional mirroring](../user/project/repository/repository_mirroring.md#bidirectional-mirroring)
-    - [Mirroring with Perforce Helix via Git Fusion](../user/project/repository/repository_mirroring.md#mirroring-with-perforce-helix-via-git-fusion)
+    - [Mirror with Perforce Helix via Git Fusion](../user/project/repository/repository_mirroring.md#mirror-with-perforce-helix-via-git-fusion)
 - Runners:
-  - Run pipelines in the parent project [for merge requests from a forked project](../ci/merge_request_pipelines/index.md#run-pipelines-in-the-parent-project-for-merge-requests-from-a-forked-project)
+  - Run pipelines in the parent project [for merge requests from a forked project](../ci/pipelines/merge_request_pipelines.md#run-pipelines-in-the-parent-project-for-merge-requests-from-a-forked-project)
   - [Shared runners pipeline minutes quota](../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota)
 - [Push rules](../push_rules/push_rules.md)
 - SAML for self-managed GitLab instance:
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index 552f0e28d95..fad415807bd 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -7,9 +7,9 @@ type: index, reference
 
 # GitLab SaaS subscription **(PREMIUM SAAS)**
 
-GitLab SaaS is the GitLab software-as-a-service offering. You don't need to
-install anything to use GitLab SaaS, you only need to
-[sign up](https://gitlab.com/users/sign_up) and start using GitLab straight away.
+GitLab SaaS is the GitLab software-as-a-service offering, which is available at GitLab.com.
+You don't need to install anything to use GitLab SaaS, you only need to
+[sign up](https://gitlab.com/users/sign_up).
 
 This page reviews the details of your GitLab SaaS subscription.
 
@@ -272,14 +272,33 @@ If you add a member to a group by using the [share a group with another group](.
 
 ## CI pipeline minutes
 
-CI pipeline minutes are the execution time for your
-[pipelines](../../ci/pipelines/index.md) on GitLab shared runners. Each
-[GitLab SaaS tier](https://about.gitlab.com/pricing/) includes a monthly quota
-of CI pipeline minutes:
-
-- Free: 400 minutes
-- Premium: 10,000 minutes
-- Ultimate: 50,000 minutes
+CI pipeline minutes are the execution time for your [pipelines](../../ci/pipelines/index.md)
+on GitLab shared runners. Each [GitLab SaaS tier](https://about.gitlab.com/pricing/)
+includes a monthly quota of CI pipeline minutes for private and public projects in
+the namespace:
+
+| Plan     | CI pipeline minutes |
+|----------|---------------------|
+| Free     | 400                 |
+| Premium  | 10,000              |
+| Ultimate | 50,000              |
+
+The consumption rate for CI pipeline minutes is based on the visibility of the projects:
+
+- Private projects in the namespace consume pipeline minutes at a rate of 1 CI pipeline minute
+  per 1 minute of execution time on GitLab shared runners.
+- Public projects in:
+  - Namespaces [created on or after 2021-07-17](https://gitlab.com/gitlab-org/gitlab/-/issues/332708)
+    consume pipeline minutes at a slower rate, 1 CI pipeline minute per 125 minutes
+    of execution time on GitLab shared runners. The per-minute rate for public projects
+    is 0.008 CI pipeline minutes per 1 minute of execution time on GitLab shared runners.
+  - Namespaces created before 2021-07-17 do not consume CI pipeline minutes.
+
+| Plan     | CI pipeline minutes | Maximum **private** project execution time (all namespaces) | Maximum **public** project execution time (namespaces created 2021-07-17 and later) |
+|----------|---------------------|-------------------------------------------------------------|-------------------------------------------------------------------------------------|
+| Free     | 400                 | 400 minutes                                                 | 50,000 minutes                                                                      |
+| Premium  | 10,000              | 10,000 minutes                                              | 1,250,000 minutes                                                                   |
+| Ultimate | 50,000              | 50,000 minutes                                              | 6,250,000 minutes                                                                   |
 
 Quotas apply to:
 
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 575ddd5462e..b6aa2d09770 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -184,7 +184,7 @@ For qualifying open source projects, the [GitLab for Open Source](https://about.
 the top GitLab tier, plus 50,000 CI minutes per month.
 
 You can find more information about the [program requirements](https://about.gitlab.com/solutions/open-source/join/#requirements),
-[renewals](https://about.gitlab.com/solutions/open-source/join/$renewals),
+[renewals](https://about.gitlab.com/solutions/open-source/join/#renewals),
 and benefits on the [GitLab for Open Source application page](https://about.gitlab.com/solutions/open-source/join/).
 
 If you have any questions, send an email to `opensource@gitlab.com` for assistance.
@@ -209,13 +209,13 @@ You must ensure that you add the correct license to each project within your gro
 
 After you ensure that you are using OSI-approved licenses for your projects, you can take your screenshots.
 
-###### Screenshot 1: License overview
+##### Screenshot 1: License overview
 
 On the left sidebar, select **Project information > Details**. Take a screenshot that includes a view of the license you've chosen for your project.
 
 ![License overview](img/license-overview.png)
 
-###### Screenshot 2: License file
+##### Screenshot 2: License file
 
 Navigate to one of the license files that you uploaded. You can usually find the license file by selecting **Project information > Details** and scanning the page for the license.
 Make sure the screenshot includes the title of the license.
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index c4484ea609f..2f3d705c1fe 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -39,7 +39,7 @@ for each tier, see the
 
 A GitLab self-managed subscription uses a hybrid model. You pay for a subscription
 according to the maximum number of users enabled during the subscription period.
-For instances that aren't offline or on a closed network, the maximum number of
+For instances that are offline or on a closed network, the maximum number of
 simultaneous users in the GitLab self-managed installation is checked each quarter,
 using [Seat Link](#seat-link).