Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

4 files changed, 247 insertions, 137 deletions

diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
new file mode 100644
index 00000000000..8b223953007
--- /dev/null
+++ b/doc/subscriptions/bronze_starter.md
@@ -0,0 +1,139 @@
+---
+stage: Fulfillment
+group: Purchase
+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
+---
+
+# Features available to Starter and Bronze subscribers
+
+Although GitLab has discontinued selling the Bronze and Starter tiers, GitLab
+continues to honor the entitlements of existing Bronze and Starter tier GitLab
+customers for the duration of their contracts at that level.
+
+These features remain available to Bronze and Starter customers, even though
+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)
+- [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)
+- [Code owners](../user/project/code_owners.md)
+- Description templates:
+  - [Setting a default template for merge requests and issues](../user/project/description_templates.md#setting-a-default-template-for-merge-requests-and-issues)
+- [Email from GitLab](../tools/email.md)
+- Groups:
+  - [Creating group memberships via CN](../user/group/index.md#creating-group-links-via-cn)
+  - [Group push rules](../user/group/index.md#group-push-rules)
+  - [Managing group memberships via LDAP](../user/group/index.md#manage-group-memberships-via-ldap)
+  - [Member locking](../user/group/index.md#member-lock)
+  - [Overriding user permissions](../user/group/index.md#overriding-user-permissions)
+  - [User contribution analysis](../user/group/index.md#user-contribution-analysis)
+  - [Kerberos integration](../integration/kerberos.md)
+- Issue Boards:
+  - [Configurable issue boards](../user/project/issue_board.md#configurable-issue-boards)
+  - [Sum of issue weights](../user/project/issue_board.md#sum-of-issue-weights)
+  - [Work In Progress limits](../user/project/issue_board.md#work-in-progress-limits)
+- Issues:
+  - [Multiple assignees for issues](../user/project/issues/multiple_assignees_for_issues.md)
+  - [Issue weights](../user/project/issues/issue_weight.md)
+  - [Issue histories](../user/project/issues/issue_data_and_actions.md#issue-history) contain changes to issue description
+  - [Adding an issue to an iteration](../user/project/issues/managing_issues.md#add-an-issue-to-an-iteration)
+- [Iterations](../user/group/iterations/index.md)
+- [Kerberos integration](../integration/kerberos.md)
+- LDAP:
+  - Querying LDAP [from the Rails console](../administration/auth/ldap/ldap-troubleshooting.md#query-ldap), or
+    [querying a single group](../administration/auth/ldap/ldap-troubleshooting.md#query-a-group-in-ldap)
+  - [Sync all users](../administration/auth/ldap/ldap-troubleshooting.md#sync-all-users)
+  - [Group management through LDAP](../administration/auth/ldap/ldap-troubleshooting.md#group-memberships)
+  - Syncing information through LDAP:
+    - Groups: [one group](../administration/auth/ldap/ldap-troubleshooting.md#sync-one-group),
+      [all groups programmatically](../administration/auth/ldap/index.md#group-sync),
+      [group sync schedule](../administration/auth/ldap/index.md#adjusting-ldap-group-sync-schedule), and
+      [all groups manually](../administration/auth/ldap/ldap-troubleshooting.md#sync-all-groups)
+    - [Configuration settings](../administration/auth/ldap/index.md#ldap-sync-configuration-settings)
+    - Users: [all users](../administration/auth/ldap/index.md#user-sync),
+      [administrators](../administration/auth/ldap/index.md#administrator-sync),
+      [user sync schedule](../administration/auth/ldap/index.md#adjusting-ldap-user-sync-schedule)
+    - [Adding group links](../administration/auth/ldap/index.md#adding-group-links)
+    - [Lock memberships to LDAP synchronization](../administration/auth/ldap/index.md#global-group-memberships-lock)
+    - Rake tasks for [LDAP tasks](../administration/raketasks/ldap.md), including
+      [syncing groups](../administration/raketasks/ldap.md#run-a-group-sync)
+- Logging:
+  - [`audit_json.log`](../administration/logs.md#audit_jsonlog) (specific entries)
+  - [`elasticsearch.log`](../administration/logs.md#elasticsearchlog)
+- Merge requests:
+  - [Full code quality reports in the code quality tab](../user/project/merge_requests/code_quality.md#code-quality-reports)
+  - [Merge request approvals](../user/project/merge_requests/merge_request_approvals.md)
+  - [Multiple assignees](../user/project/merge_requests/getting_started.md#multiple-assignees)
+  - [Approval Rule information for Reviewers](../user/project/merge_requests/getting_started.md#approval-rule-information-for-reviewers) **(PREMIUM)**
+  - [Required Approvals](../user/project/merge_requests/merge_request_approvals.md#required-approvals)
+  - [Code Owners as eligible approvers](../user/project/merge_requests/merge_request_approvals.md#code-owners-as-eligible-approvers)
+  - All [Approval rules](../user/project/merge_requests/merge_request_approvals.md#approval-rules) features
+  - [Restricting push and merge access to certain users](../user/project/protected_branches.md#restricting-push-and-merge-access-to-certain-users)
+  - [Visual Reviews](../ci/review_apps/index.md#visual-reviews)
+- Metrics and analytics:
+  - [Contribution Analytics](../user/group/contribution_analytics/index.md)
+  - [Merge Request Analytics](../user/analytics/merge_request_analytics.md)
+  - [Code Review Analytics](../user/analytics/code_review_analytics.md)
+  - [Audit Events](../administration/audit_events.md), including
+    [Group events](../administration/audit_events.md#group-events) and
+    [Project events](../administration/audit_events.md#project-events)
+- Rake tasks:
+  - [Displaying GitLab license information](../administration/raketasks/maintenance.md#show-gitlab-license-information)
+- Reference Architecture information:
+  - [Traffic load balancers](../administration/reference_architectures/index.md#traffic-load-balancer)
+  - [Zero downtime updates](../administration/reference_architectures/index.md#zero-downtime-updates)
+- 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
+    - [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)
+- 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)
+  - [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:
+  - [Administrator groups](../integration/saml.md#admin-groups)
+  - [Auditor groups](../integration/saml.md#auditor-groups)
+  - [External groups](../integration/saml.md#external-groups)
+  - [Required groups](../integration/saml.md#required-groups)
+- Search:
+  - [Filtering merge requests by approvers](../user/search/index.md#filtering-merge-requests-by-approvers)
+  - [Filtering merge requests by "approved by"](../user/search/index.md#filtering-merge-requests-by-approved-by)
+  - [Advanced Global Search (Elasticsearch)](../user/search/advanced_global_search.md)
+  - [Advanced Search Syntax](../user/search/advanced_search_syntax.md)
+- [Service Desk](../user/project/service_desk.md)
+- [Storage usage statistics](../user/usage_quotas.md#storage-usage-statistics)
+
+The following developer features continue to be available to Starter and
+Bronze-level subscribers:
+
+- APIs:
+  - LDAP synchronization:
+    - Certain fields in the [group details API](../api/groups.md#details-of-a-group)
+    - [syncing groups](../api/groups.md#sync-group-with-ldap)
+    - Listing, adding, and deleting [group links](../api/groups.md#list-ldap-group-links)
+    - [Push rules](../api/groups.md#push-rules)
+    - [Audit events](../api/audit_events.md), including
+      [group audit events](../api/groups.md#group-audit-events) and
+      [project audit events](../api/audit_events.md#project-audit-events)
+  - Projects API: certain fields in the [Create project API](../api/projects.md)
+  - [Resource iteration events API](../api/resource_iteration_events.md)
+  - Group milestones API: [Get all burndown chart events for a single milestone](../api/group_milestones.md#get-all-burndown-chart-events-for-a-single-milestone)
+  - [Group iterations API](../api/group_iterations.md)
+  - Project milestones API: [Get all burndown chart events for a single milestone](../api/milestones.md#get-all-burndown-chart-events-for-a-single-milestone)
+  - [Project iterations API](../api/iterations.md)
+  - Fields in the [Search API](../api/search.md) available only to [Advanced Global Search (Elasticsearch)](../integration/elasticsearch.md) users
+  - Fields in the [Merge requests API](../api/merge_requests.md) for [merge request approvals](../user/project/merge_requests/merge_request_approvals.md)
+  - Fields in the [Protected branches API](../api/protected_branches.md) that specify users or groups allowed to merge
+  - [Merge request approvals API](../api/merge_request_approvals.md)
+  - [Visual review discussions API](../api/visual_review_discussions.md)
+- Development information:
+  - [Run Jenkins in a macOS development environment](../development/integrations/jenkins.md)
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index aef1c1127c5..b7a1243be72 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -5,115 +5,83 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: index, reference
 ---
 
-# GitLab.com subscription **(BRONZE ONLY)**
+# GitLab SaaS subscription **(PREMIUM SAAS)**
 
-GitLab.com is GitLab Inc.'s software-as-a-service offering. You don't need to
-install anything to use GitLab.com, you only need to
+GitLab SaaS is GitLab Inc.'s 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.
 
-This page reviews the details of your GitLab.com subscription.
+This page reviews the details of your GitLab SaaS subscription.
 
-## Choose a GitLab.com group or personal subscription
-
-On GitLab.com you can apply a subscription to either a group or a personal namespace.
-
-When applied to:
-
-- A **group**, the group, all subgroups, and all projects under the selected
-  group on GitLab.com contains the features of the associated tier. GitLab recommends
-  choosing a group plan when managing an organization's projects and users.
-- A **personal userspace**, all projects contain features with the
-  subscription applied, but as it's not a group, group features aren't available.
-
-You can read more about [common misconceptions](https://about.gitlab.com/handbook/marketing/strategic-marketing/enablement/dotcom-subscriptions/#common-misconceptions) regarding a GitLab.com subscription to help avoid issues.
-
-## Choose a GitLab.com tier
+## Choose a GitLab SaaS tier
 
 Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choose
 the features which fit your budget. For information on what features are available
 at each tier, see the
-[GitLab.com feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/).
+[GitLab SaaS feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/).
 
 ## Choose the number of users
 
 NOTE:
 Applied only to groups.
 
-A GitLab.com subscription uses a concurrent (_seat_) model. You pay for a
+A GitLab SaaS subscription uses a concurrent (_seat_) model. You pay for a
 subscription according to the maximum number of users enabled at once. You can
 add and remove users during the subscription period, as long as the total users
 at any given time doesn't exceed the subscription count.
 
 Every occupied seat is counted in the subscription, with the following exception:
 
-- Members with Guest permissions on a Gold subscription.
+- Members with Guest permissions on an Ultimate subscription.
 
 NOTE:
 To support the open source community and encourage the development of open
-source projects, GitLab grants access to **Gold** features for all GitLab.com
+source projects, GitLab grants access to **Ultimate** features for all GitLab SaaS
 **public** projects, regardless of the subscription.
 
-## Obtain a GitLab.com subscription
-
-To subscribe to GitLab.com:
-
-- **For individuals**:
-  1. Create a user account for yourself using our
-     [sign up page](https://gitlab.com/users/sign_up).
-  1. Visit the [billing page](https://gitlab.com/profile/billings)
-     under your profile.
-  1. Select the **Bronze**, **Silver**, or **Gold** GitLab.com plan through the
-     [Customers Portal](https://customers.gitlab.com/).
-  1. Link your GitLab.com account with your Customers Portal account.
-     Once a plan has been selected, if your account is not
-     already linked, GitLab prompts you to link your account with a
-     **Sign in to GitLab.com** button.
-  1. Select the namespace from the drop-down list to associate the subscription.
-  1. Proceed to checkout.
-- **For groups**:
-  1. Create a user account for yourself using our
-     [sign up page](https://gitlab.com/users/sign_up).
-  1. Create a [group](../../user/group/index.md). GitLab groups help assemble related
-     projects together allowing you to grant members access to several projects
-     at once. A group is not required if you plan on having projects inside a personal
-     namespace.
-  1. Create additional users and
-     [add them to the group](../../user/group/index.md#add-users-to-a-group).
-  1. Select the **Bronze**, **Silver**, or **Gold** GitLab.com plan through the
-     [Customers Portal](https://customers.gitlab.com/).
-  1. Link your GitLab.com account with your Customers Portal account.
-     Once a plan has been selected, if your account is not
-     already linked, GitLab prompts you to link your account with a
-     **Sign in to GitLab.com** button.
-  1. Select the namespace from the drop-down list to associate the subscription.
-  1. Proceed to checkout.
+## Obtain a GitLab SaaS subscription
+
+To subscribe to GitLab SaaS:
+
+1. Create a user account for yourself using our
+   [sign up page](https://gitlab.com/users/sign_up).
+1. Create a [group](../../user/group/index.md). GitLab groups help assemble related
+   projects together allowing you to grant members access to several projects
+   at once. A group is not required if you plan on having projects inside a personal
+   namespace.
+1. Create additional users and
+   [add them to the group](../../user/group/index.md#add-users-to-a-group).
+1. Select the GitLab SaaS plan through the
+   [Customers Portal](https://customers.gitlab.com/).
+1. Link your GitLab SaaS account with your Customers Portal account.
+   Once a plan has been selected, if your account is not
+   already linked, GitLab prompts you to link your account with a
+   **Sign in to GitLab.com** button.
+1. Select the namespace from the drop-down list to associate the subscription.
+1. Proceed to checkout.
 
 NOTE:
 You can also go to the [**My Account**](https://customers.gitlab.com/customers/edit)
-page to add or change the GitLab.com account link.
-
-## View your GitLab.com subscription
+page to add or change the GitLab SaaS account link.
 
-To see the status of your GitLab.com subscription, log in to GitLab.com and go
-to the **Billing** section of the relevant namespace:
+## View your GitLab SaaS subscription
 
-- **For individuals**: Visit the [billing page](https://gitlab.com/profile/billings)
-  under your profile.
-- **For groups**: From the group page (*not* from a project in the group), go to **Settings > Billing**.
+To see the status of your GitLab SaaS subscription, log in to GitLab SaaS and go
+to the **Billing** section:
 
-  NOTE:
-  You must have Owner level [permissions](../../user/permissions.md) to view a group's billing page.
+NOTE:
+You must have Owner level [permissions](../../user/permissions.md) to view the billing page.
 
-  The following table describes details of your subscription for groups:
+The following table describes details of your subscription:
 
-  | Field                       | Description |
-  |-----------------------------|-------------|
-  | **Seats in subscription**   | If this is a paid plan, represents the number of seats you've bought for this group. |
-  | **Seats currently in use**  | Number of seats in use. Select **See usage** to see a list of the users using these seats. For more details, see [Seat usage](#seat-usage). |
-  | **Max seats used**          | Highest number of seats you've used. |
-  | **Seats owed**              | _Seats owed_ = _Max seats used_ - _Seats in subscription_. |
-  | **Subscription start date** | Date your subscription started. If this is for a Free plan, it's the date you transitioned off your group's paid plan. |
-  | **Subscription end date**   | Date your current subscription ends. Does not apply to Free plans. |
+| Field                       | Description |
+|:----------------------------|:------------|
+| **Seats in subscription**   | If this is a paid plan, represents the number of seats you've bought for this group. |
+| **Seats currently in use**  | Number of seats in use. Select **See usage** to see a list of the users using these seats. For more details, see [Seat usage](#seat-usage). |
+| **Max seats used**          | Highest number of seats you've used. |
+| **Seats owed**              | _Seats owed_ = _Max seats used_ - _Seats in subscription_. |
+| **Subscription start date** | Date your subscription started. If this is for a Free plan, it's the date you transitioned off your group's paid plan. |
+| **Subscription end date**   | Date your current subscription ends. Does not apply to Free plans. |
 
 ## Seat usage
 
@@ -125,7 +93,7 @@ The **Seat usage** page lists all users occupying seats. Details for each user i
 
 - Full name
 - Username
-- Public email address (if they have provided one in their [profile settings](../../user/profile/index.md#profile-settings))
+- Public email address (if they have provided one in their [user settings](../../user/profile/index.md#user-settings))
 
 The Seat usage listing is updated live, but the usage statistics on the billing page are updated
 only once per day. For this reason there can be a minor difference between the seat usage listing
@@ -147,12 +115,12 @@ For example:
 | Amir       | `ami`         | Yes     |
 | Amir       | `amr`         | No      |
 
-## Renew your GitLab.com subscription
+## Renew your GitLab SaaS subscription
 
 To renew your subscription:
 
-1. [Prepare for renewal by reviewing your account](#prepare-for-renewal-by-reviewing-your-account)
-1. [Renew your GitLab.com subscription](#renew-or-change-a-gitlabcom-subscription)
+1. [Prepare for renewal by reviewing your account.](#prepare-for-renewal-by-reviewing-your-account)
+1. [Renew your GitLab SaaS subscription.](#renew-or-change-a-gitlab-saas-subscription)
 
 ### Prepare for renewal by reviewing your account
 
@@ -180,21 +148,21 @@ It's important to regularly review your user accounts, because:
 A GitLab subscription is valid for a specific number of users. For details, see
 [Choose the number of users](#choose-the-number-of-users).
 
-If the number of [billable users](#view-your-gitlabcom-subscription) exceeds the number included in the subscription, known
+If the number of [billable users](#view-your-gitlab-saas-subscription) exceeds the number included in the subscription, known
 as the number of _users over license_, you must pay for the excess number of
 users either before renewal, or at the time of renewal. This is also known the
 _true up_ process.
 
-### Renew or change a GitLab.com subscription
+### Renew or change a GitLab SaaS subscription
 
-You can adjust the number of users before renewing your GitLab.com subscription.
+You can adjust the number of users before renewing your GitLab SaaS subscription.
 
-- To renew for more users than are currently included in your GitLab.com plan, [add users to your subscription](#add-users-to-your-subscription).
-- To renew for fewer users than are currently included in your GitLab.com plan,
+- To renew for more users than are currently included in your GitLab SaaS plan, [add users to your subscription](#add-users-to-your-subscription).
+- To renew for fewer users than are currently included in your GitLab SaaS plan,
 either [disable](../../user/admin_area/activating_deactivating_users.md#deactivating-a-user) or [block](../../user/admin_area/blocking_unblocking_users.md#blocking-a-user) the user accounts you no longer need.
 
 For details on upgrading your subscription tier, see
-[Upgrade your GitLab.com subscription tier](#upgrade-your-gitlabcom-subscription-tier).
+[Upgrade your GitLab SaaS subscription tier](#upgrade-your-gitlab-saas-subscription-tier).
 
 #### Automatic renewal
 
@@ -235,7 +203,7 @@ The following is emailed to you:
 - A payment receipt. You can also access this information in the Customers Portal under
   [**View invoices**](https://customers.gitlab.com/receipts).
 
-## Upgrade your GitLab.com subscription tier
+## Upgrade your GitLab SaaS subscription tier
 
 To upgrade your [GitLab tier](https://about.gitlab.com/pricing/):
 
@@ -266,13 +234,12 @@ If you renew or upgrade, your data is accessible again.
 
 CI pipeline minutes are the execution time for your
 [pipelines](../../ci/pipelines/index.md) on GitLab shared runners. Each
-[GitLab.com tier](https://about.gitlab.com/pricing/) includes a monthly quota
+[GitLab SaaS tier](https://about.gitlab.com/pricing/) includes a monthly quota
 of CI pipeline minutes:
 
 - Free: 400 minutes
-- Bronze: 2,000 minutes
-- Silver: 10,000 minutes
-- Gold: 50,000 minutes
+- Premium: 10,000 minutes
+- Ultimate: 50,000 minutes
 
 Quotas apply to:
 
@@ -280,22 +247,25 @@ Quotas apply to:
   subgroups, and nested projects. To view the group's usage, navigate to the group,
   then **Settings > Usage Quotas**.
 - Your personal account, where the minutes are available for your personal projects.
-  To view and buy personal minutes, click your avatar, then
-  **Settings > [Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**.
+  To view and buy personal minutes:
+
+  1. In the top-right corner, select your avatar.
+  1. Select **Edit profile**.
+  1. In the left sidebar, select **[Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**.
 
 Only pipeline minutes for GitLab shared runners are restricted. If you have a
-specific runner set up for your projects, there is no limit to your build time on GitLab.com.
+specific runner set up for your projects, there is no limit to your build time on GitLab SaaS.
 
 The available quota is reset on the first of each calendar month at midnight UTC.
 
 When the CI minutes are depleted, an email is sent automatically to notify the owner(s)
 of the namespace. You can [purchase additional CI minutes](#purchase-additional-ci-minutes),
-or upgrade your account to [Silver or Gold](https://about.gitlab.com/pricing/).
+or upgrade your account to a higher [plan](https://about.gitlab.com/pricing/).
 Your own runners can still be used even if you reach your limits.
 
 ### Purchase additional CI minutes
 
-If you're using GitLab.com, you can purchase additional CI minutes so your
+If you're using GitLab SaaS, you can purchase additional CI minutes so your
 pipelines aren't blocked after you have used all your CI minutes from your
 main quota. You can find pricing for additional CI/CD minutes in the
 [GitLab Customers Portal](https://customers.gitlab.com/plans). Additional minutes:
@@ -303,11 +273,11 @@ main quota. You can find pricing for additional CI/CD minutes in the
 - Are only used after the shared quota included in your subscription runs out.
 - Roll over month to month.
 
-To purchase additional minutes for your group on GitLab.com:
+To purchase additional minutes for your group on GitLab SaaS:
 
 1. From your group, go to **Settings > Usage Quotas**.
 1. Select **Buy additional minutes** and GitLab directs you to the Customers Portal.
-1. Locate the subscription card that's linked to your group on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction.
+1. Locate the subscription card that's linked to your group on GitLab SaaS, click **Buy more CI minutes**, and complete the details about the transaction.
 1. Once we have processed your payment, the extra CI minutes are synced to your group namespace.
 1. To confirm the available CI minutes, go to your group, then **Settings > Usage Quotas**.
 
@@ -315,10 +285,12 @@ To purchase additional minutes for your group on GitLab.com:
 
 To purchase additional minutes for your personal namespace:
 
-1. Click your avatar, then go to **Settings > Usage Quotas**.
+1. In the top-right corner, select your avatar.
+1. Select **Edit profile**.
+1. In the left sidebar, select **Usage Quotas**.
 1. Select **Buy additional minutes** and GitLab redirects you to the Customers Portal.
-1. Locate the subscription card that's linked to your personal namespace on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes are synced to your personal namespace.
-1. To confirm the available CI minutes for your personal projects, click your avatar, then go to **Settings > Usage Quotas**.
+1. Locate the subscription card that's linked to your personal namespace on GitLab SaaS, click **Buy more CI minutes**, and complete the details about the transaction. Once we have processed your payment, the extra CI minutes are synced to your personal namespace.
+1. To confirm the available CI minutes for your personal projects, go to the **Usage Quotas** settings again.
 
    The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month.
 
@@ -348,7 +320,7 @@ locked. Projects can only be unlocked by purchasing more storage subscription un
 
 To purchase more storage for either a personal or group namespace:
 
-1. Sign in to GitLab.com.
+1. Sign in to GitLab SaaS.
 1. From either your personal homepage or the group's page, go to **Settings > Usage Quotas**.
 1. For each locked project, total by how much its **Usage** exceeds the free quota and purchased
    storage. You must purchase the storage increment that exceeds this total.
@@ -361,7 +333,7 @@ To purchase more storage for either a personal or group namespace:
 1. Select the **Privacy Policy** and **Terms of Service** checkbox.
 1. Select **Buy subscription**.
 1. Sign out of the Customers Portal.
-1. Switch back to the GitLab.com tab and refresh the page.
+1. Switch back to the GitLab SaaS tab and refresh the page.
 
 The **Purchased storage available** total is incremented by the amount purchased. All locked
 projects are unlocked and their excess usage is deducted from the additional storage.
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 383ba471df4..aff392f61ff 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: index, reference
 ---
 
-# GitLab subscription **(STARTER)**
+# GitLab subscription **(PREMIUM)**
 
 GitLab offers tiers of features. Your subscription determines which tier you
 have access to. Subscriptions are valid for 12 months.
@@ -19,26 +19,26 @@ GitLab provides special subscriptions to participants in:
 
 When choosing a subscription, there are two factors to consider:
 
-- [GitLab.com or self-managed](#choose-between-gitlabcom-or-self-managed)
+- [GitLab SaaS or GitLab self-managed](#choose-between-gitlab-saas-or-gitlab-self-managed)
 - [GitLab tier](#choose-a-gitlab-tier)
 
-### Choose between GitLab.com or self-managed
+### Choose between GitLab SaaS or GitLab self-managed
 
 There are some differences in how a subscription applies, depending if you use
-GitLab.com or a self-managed instance:
+GitLab SaaS or GitLab self-managed:
 
-- [GitLab.com](gitlab_com/index.md): The GitLab software-as-a-service offering.
-  You don't need to install anything to use GitLab.com, you only need to
+- [GitLab SaaS](gitlab_com/index.md): 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 self-managed](self_managed/index.md): Install, administer, and maintain
   your own GitLab instance.
 
-On a self-managed instance, a GitLab subscription provides the same set of
-features for _all_ users. On GitLab.com, you can apply a subscription to either
+On a GitLab self-managed instance, a GitLab subscription provides the same set of
+features for _all_ users. On GitLab SaaS, you can apply a subscription to either
 a group or a personal namespace.
 
 NOTE:
-Subscriptions cannot be transferred between GitLab.com and GitLab self-managed.
+Subscriptions cannot be transferred between GitLab SaaS and GitLab self-managed.
 A new subscription must be purchased and applied as needed.
 
 ### Choose a GitLab tier
@@ -47,8 +47,8 @@ Pricing is [tier-based](https://about.gitlab.com/pricing/), allowing you to choo
 the features which fit your budget. For information on what features are available
 at each tier for each product, see:
 
-- [GitLab.com feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/)
-- [Self-managed feature comparison](https://about.gitlab.com/pricing/self-managed/feature-comparison/)
+- [GitLab SaaS feature comparison](https://about.gitlab.com/pricing/gitlab-com/feature-comparison/)
+- [GitLab self-managed feature comparison](https://about.gitlab.com/pricing/self-managed/feature-comparison/)
 
 ## Find your subscription
 
@@ -76,7 +76,7 @@ With the [Customers Portal](https://customers.gitlab.com/) you can:
 - [Change your company details](#change-your-company-details)
 - [Change your payment method](#change-your-payment-method)
 - [Change the linked account](#change-the-linked-account)
-- [Change the associated namespace](#change-the-associated-namespace)
+- [Change the namespace the subscription is linked to](#change-the-linked-namespace)
 - [Change customers portal account password](#change-customers-portal-account-password)
 
 ### Change your personal details
@@ -130,27 +130,27 @@ method as the default:
 
 ### Change the linked account
 
-To change the GitLab.com account associated with your Customers Portal
-account:
+To change the GitLab.com account linked to your Customers Portal account:
 
 1. Log in to the
    [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. In a separate browser tab, go to [GitLab.com](https://gitlab.com) and ensure you
+1. In a separate browser tab, go to [GitLab SaaS](https://gitlab.com) and ensure you
    are not logged in.
 1. On the Customers Portal page, click **My account > Account details**.
 1. Under **Your GitLab.com account**, click **Change linked account**.
-1. Log in to the [GitLab.com](https://gitlab.com) account you want to link to the Customers Portal
+1. Log in to the [GitLab SaaS](https://gitlab.com) account you want to link to the Customers Portal
    account.
 
-### Change the associated namespace
+### Change the linked namespace
 
-With a linked GitLab.com account:
+To change the namespace linked to a subscription:
 
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) with a
+   [linked](#change-the-linked-account) GitLab SaaS account.
 1. Navigate to the **Manage Purchases** page.
-1. Click **Change linked namespace**.
+1. Select **Change linked namespace**.
 1. Select the desired group from the **This subscription is for** dropdown.
-1. Click **Proceed to checkout**.
+1. Select **Proceed to checkout**.
 
 Subscription charges are calculated based on the total number of users in a group, including its subgroups and nested projects. If the total number of users exceeds the number of seats in your subscription, your account is charged for the additional users.
 
@@ -173,7 +173,7 @@ Find more information how to apply and renew at
 
 ## GitLab for Open Source subscriptions
 
-All [GitLab for Open Source](https://about.gitlab.com/solutions/open-source/join/)
+All [GitLab for Open Source](https://about.gitlab.com/solutions/open-source/)
 requests, including subscription renewals, must be made by using the application process.
 If you have any questions, send an email to `opensource@gitlab.com` for assistance.
 
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index a9c0337509a..dc98a9415d7 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: index, reference
 ---
 
-# GitLab self-managed subscription **(STARTER ONLY)**
+# GitLab self-managed subscription **(PREMIUM SELF)**
 
 You can install, administer, and maintain your own GitLab instance.
 
@@ -37,10 +37,10 @@ at each tier, see the
 
 ## Subscription seats
 
-A self-managed subscription uses a hybrid model. You pay for a subscription
+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
-simultaneous users in the self-managed installation is checked each quarter,
+simultaneous users in the GitLab self-managed installation is checked each quarter,
 using [Seat Link](#seat-link).
 
 ### Billable users
@@ -76,15 +76,14 @@ GitLab has several features which can help you manage the number of users:
 
 ## Obtain a subscription
 
-To subscribe to GitLab through a self-managed installation:
+To subscribe to GitLab through a GitLab self-managed installation:
 
-1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a
-   **Starter**, **Premium**, or **Ultimate** self-managed plan.
+1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a GitLab self-managed plan.
 1. After purchase, a license file is sent to the email address associated to the Customers Portal account,
    which must be [uploaded to your GitLab instance](../../user/admin_area/license.md#uploading-your-license).
 
 NOTE:
-If you're purchasing a subscription for an existing **Core** self-managed
+If you're purchasing a subscription for an existing **Free** GitLab self-managed
 instance, ensure you're purchasing enough seats to
 [cover your users](../../user/admin_area/index.md#administering-users).
 
@@ -114,7 +113,7 @@ It also displays the following important statistics:
 
 To renew your subscription,
 [prepare for renewal by reviewing your account](#prepare-for-renewal-by-reviewing-your-account),
-then [renew your self-managed subscription](#renew-a-subscription).
+then [renew your GitLab self-managed subscription](#renew-a-subscription).
 
 ### Prepare for renewal by reviewing your account
 
@@ -203,9 +202,9 @@ An invoice is generated for the renewal and available for viewing or download on
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/208832) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.9.
 
-Seat Link allows GitLab Inc. to provide our self-managed customers with prorated charges for user growth throughout the year using a quarterly reconciliation process.
+Seat Link allows GitLab Inc. to provide our GitLab self-managed customers with prorated charges for user growth throughout the year using a quarterly reconciliation process.
 
-Seat Link daily sends a count of all users in connected self-managed instances to GitLab. That information is used to automate prorated reconciliations. The data is sent securely through an encrypted HTTPS connection to `customers.gitlab.com` on port `443`.
+Seat Link daily sends a count of all users in connected GitLab self-managed instances to GitLab. That information is used to automate prorated reconciliations. The data is sent securely through an encrypted HTTPS connection to `customers.gitlab.com` on port `443`.
 
 Seat Link provides **only** the following information to GitLab:
 
@@ -325,11 +324,11 @@ behave as expected if you're not prepared for the expiry. For example,
 [environment specific variables not being passed](https://gitlab.com/gitlab-org/gitlab/-/issues/24759).
 If you renew or upgrade, your data is again accessible.
 
-For self-managed customers, there is a 14-day grace period when your features
+For GitLab self-managed customers, there is a 14-day grace period when your features
 continue to work as-is, after which the entire instance becomes read
 only.
 
-However, if you remove the license, you immediately revert to Core
+However, if you remove the license, you immediately revert to Free
 features, and the instance become read / write again.
 
 ## Contact Support