Add latest changes from gitlab-org/gitlab@master

7 files changed, 287 insertions, 308 deletions

diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index 2528a53088d..f23ee5fad10 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -223,8 +223,8 @@ The cost factors for jobs running on shared runners on GitLab.com are:
 
 - `1` for internal, public, and private projects.
 - Exceptions for public projects:
-  - `0.5` for projects in the [GitLab for Open Source program](../../subscriptions/index.md#gitlab-for-open-source).
-  - `0.008` for forks of projects in the [GitLab for Open Source program](../../subscriptions/index.md#gitlab-for-open-source). For every 125 minutes of job execution time,
+  - `0.5` for projects in the [GitLab for Open Source program](../../subscriptions/community_programs.md#gitlab-for-open-source).
+  - `0.008` for forks of projects in the [GitLab for Open Source program](../../subscriptions/community_programs.md#gitlab-for-open-source). For every 125 minutes of job execution time,
   you use 1 CI/CD minute.
 - Discounted dynamically for [community contributions to GitLab projects](#cost-factor-for-community-contributions-to-gitlab-projects).
 
diff --git a/doc/subscriptions/choosing_subscription.md b/doc/subscriptions/choosing_subscription.md
new file mode 100644
index 00000000000..07b04c83bd7
--- /dev/null
+++ b/doc/subscriptions/choosing_subscription.md
@@ -0,0 +1,61 @@
+---
+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/product/ux/technical-writing/#assignments
+---
+
+# Choosing a GitLab subscription
+
+To choose the right GitLab subscription, choose an offering and a tier.
+
+## Choose a subscription
+
+Choose which GitLab subscription suits your needs:
+
+- [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 Dedicated](gitlab_dedicated/index.md): A single-tenant SaaS service for highly regulated and large enterprises.
+- [GitLab self-managed](self_managed/index.md): Install, administer, and maintain
+  your own GitLab instance.
+
+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 a group
+namespace. You cannot apply a subscription to a personal namespace.
+
+NOTE:
+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
+
+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 for each product, see the [GitLab self-managed feature comparison](https://about.gitlab.com/pricing/feature-comparison/).
+
+## Find your subscription
+
+The following chart should help you determine your subscription model. Select
+the list item to go to the respective help page.
+
+```mermaid
+graph TD
+
+A(Is your user account on GitLab.com?)
+A --> B(Yes)
+A --> C(No)
+B --> D(fa:fa-link View your subscription on GitLab.com)
+C --> E(fa:fa-link View your self-hosted subscription)
+
+click D "./gitlab_com/index.html#view-your-gitlabcom-subscription"
+click E "./self_managed/index.html#view-your-subscription"
+```
+
+## Contact Support
+
+- See the tiers of [GitLab Support](https://about.gitlab.com/support/).
+- [Submit a request](https://support.gitlab.com/hc/en-us/requests/new) through the Support Portal.
+
+We also encourage all users to search our project trackers for known issues and existing feature requests in the [GitLab project](https://gitlab.com/gitlab-org/gitlab/-/issues/).
+
+These issues are the best avenue for getting updates on specific product plans and for communicating directly with the relevant GitLab team members.
diff --git a/doc/subscriptions/community_programs.md b/doc/subscriptions/community_programs.md
new file mode 100644
index 00000000000..05c5d66b0e5
--- /dev/null
+++ b/doc/subscriptions/community_programs.md
@@ -0,0 +1,80 @@
+---
+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/product/ux/technical-writing/#assignments
+---
+
+# Community programs
+
+GitLab provides the following community program subscriptions.
+
+## GitLab for Education
+
+For qualifying non-profit educational institutions, the [GitLab for Education Program](https://about.gitlab.com/solutions/education/) provides GitLab Ultimate, plus 50,000 CI/CD minutes per month. The subscription granted under GitLab for Education can only be used for instructional use or non-commercial academic research. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Education Program page](https://about.gitlab.com/solutions/education/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/education-program/).
+
+## GitLab for Open Source
+
+For qualifying open source projects, the [GitLab for Open Source Program](https://about.gitlab.com/solutions/open-source/) provides GitLab Ultimate, plus 50,000 CI/CD minutes per month. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Open Source Program page](https://about.gitlab.com/solutions/open-source/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/opensource-program/).
+
+### Meeting GitLab for Open Source Program requirements
+
+To meet GitLab for Open Source Program requirements, first add an OSI-approved open source license to all projects in your namespace.
+
+To add a license to a project:
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the overview page, select **Add LICENSE**. If the license you want is not available as a license template, manually copy the entire, unaltered [text of your chosen license](https://opensource.org/licenses/) into the `LICENSE` file. Note that GitLab defaults to **All rights reserved** if users do not perform this action.
+
+![Add license](img/add-license.png)
+
+Applicants must add the correct license to each project in their respective groups or namespaces. When you're sure you're using OSI-approved licenses for your projects, you can take your screenshots.
+
+NOTE:
+GitLab for Open Source Program benefits apply to an entire GitLab namespace. To qualify for the GitLab for Open Source Program, all projects in an applicant's namespace must meet program requirements. Applicants submit materials related to one project in the applying namespace, and the open source program team uses that project to verify eligibility of the entire namespace.
+
+### Verification for Open Source Program
+
+Next, take screenshots of your project to confirm that project's eligibility. You must upload three screenshots:
+
+- [OSI-approved license overview](#screenshot-1-license-overview)
+- [OSI-approved license contents](#screenshot-2-license-contents)
+- [Publicly visible settings](#screenshot-3-publicly-visible-settings)
+
+NOTE:
+Benefits of the GitLab Open Source Program apply to all projects in a GitLab namespace. All projects in an eligible namespace must meet program requirements.
+
+#### Screenshot 1: License overview
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the left sidebar, select your project avatar. If you haven't specified an avatar for your project, the avatar displays as a single letter.
+1. Take a screenshot of the project overview that clearly displays the license you've chosen for your project.
+
+![License overview](img/license-overview.png)
+
+#### Screenshot 2: License contents
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the left sidebar, select **Repository** and locate the project's `LICENSE` file.
+1. Take a screenshot of the contents of the file. Make sure the screenshot includes the title of the license.
+
+![License file](img/license-file.png)
+
+#### Screenshot 3: Publicly visible settings
+
+To be eligible for the GitLab Open Source Program, projects must be publicly visible. To check your project's public visibility settings:
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. From the left sidebar, select **Settings > General**.
+1. Expand **Visibility, project features, permissions**.
+1. From the **Project visibility** dropdown list, select **Public**.
+1. Select the **Users can request access** checkbox.
+1. Take a screenshot of this view. Include as much of the publicly visible settings as possible. Make sure to include your project's name in the upper-left of the screenshot.
+
+![Publicly visible setting](img/publicly-visible.png)
+
+NOTE:
+Exceptions to this public visibility requirement apply in select circumstances (for example, in cases where a project in an applicant's namespace may hold sensitive data). Email `opensource@gitlab.com` with details of your use case to request written permission for exceptions.
+
+## GitLab for Startups
+
+For qualifying startups, the [GitLab for Startups](https://about.gitlab.com/solutions/startups/) program provides GitLab Ultimate, plus 50,000 CI/CD minutes per month for 12 months. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Startups Program page](https://about.gitlab.com/solutions/startups/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/startups-program/).
diff --git a/doc/subscriptions/customers_portal.md b/doc/subscriptions/customers_portal.md
new file mode 100644
index 00000000000..3f493f255dc
--- /dev/null
+++ b/doc/subscriptions/customers_portal.md
@@ -0,0 +1,109 @@
+---
+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/product/ux/technical-writing/#assignments
+---
+
+# The Customers Portal
+
+For some management tasks for your subscription and account, you use the Customers Portal.
+
+The Customers Portal is available to customers who purchased their
+subscription from GitLab. If you made your purchase through a partner or
+reseller, contact them directly for assistance with your subscription.
+
+You can also specifically manage your [GitLab SaaS subscription](gitlab_com/index.md)
+or [self-managed subscription](self_managed/index.md).
+
+## Change account owner information
+
+Account owner personal details are used on invoices. The account owner email address is used for the Customers Portal legacy login and license-related email.
+
+If you have registered a Customers Portal account through a GitLab.com account, the GitLab.com account is used for login.
+
+To change account owner information, including name, billing address, and email address:
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Select **My account > Account details**.
+1. Expand the **Personal details** section.
+1. Edit the personal details.
+1. Select **Save changes**.
+
+If you want to transfer ownership of the Customers Portal account
+to another person, after you enter that person's personal details, you must also:
+
+- [Change the Customers Portal account password](#change-customers-portal-account-password).
+- [Change the linked GitLab.com account](#change-the-linked-account), if you have one linked.
+
+## Change your company details
+
+To change your company details, including company name and VAT number:
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Select **My account > Account details**.
+1. Expand the **Company details** section.
+1. Edit the company details.
+1. Select **Save changes**.
+
+## Change your payment method
+
+Purchases in the Customers Portal require a credit card on record as a payment method. You can add
+multiple credit cards to your account, so that purchases for different products are charged to the
+correct card.
+
+If you would like to use an alternative method to pay, please
+[contact our Sales team](https://about.gitlab.com/sales/).
+
+To change your payment method:
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Select **My account > Payment methods**.
+1. **Edit** an existing payment method's information or **Add new payment method**.
+1. Select **Save Changes**.
+
+### Set a default payment method
+
+Automatic renewal of a subscription is charged to your default payment method. To mark a payment
+method as the default:
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Select **My account > Payment methods**.
+1. **Edit** the selected payment method and check the **Make default payment method** checkbox.
+1. Select **Save Changes**.
+
+## Link a GitLab.com account
+
+Follow this guideline if you have a legacy Customers Portal account and use an email and password to log in.
+
+To link a GitLab.com account to your Customers Portal account:
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in?legacy=true) using email and password.
+1. On the Customers Portal page, select **My account > Account details**.
+1. Under **Your GitLab.com account**, select **Link account**.
+1. Log in to the [GitLab.com](https://gitlab.com/users/sign_in) account you want to link to the Customers Portal account.
+
+## Change the linked account
+
+Customers are required to use their GitLab.com account to register for a new Customers Portal account.
+
+If you have a legacy Customers Portal account that is not linked to a GitLab.com account, you may still [sign in](https://customers.gitlab.com/customers/sign_in?legacy=true) using an email and password. However, you should [create](https://gitlab.com/users/sign_up) and [link a GitLab.com account](#change-the-linked-account) to ensure continued access to the Customers Portal.
+
+Customers of resellers do not have access to this portal and should contact their reseller for any
+changes to their subscription.
+
+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/users/sign_in) and ensure you are not logged in.
+1. On the Customers Portal page, select **My account > Account details**.
+1. Under **Your GitLab.com account**, select **Change linked account**.
+1. Log in to the [GitLab.com](https://gitlab.com/users/sign_in) account you want to link to the Customers Portal account.
+
+## Change Customers Portal account password
+
+To change the password for this customers portal account:
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Select the **My account** dropdown list and select **Account details**.
+1. Make the required changes to the **Your password** section.
+1. Select **Save changes**.
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index cd36e426852..4d11a6fffc8 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -237,7 +237,7 @@ amounts at which the alert displays.
 To change the namespace linked to a subscription:
 
 1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) with a
-   [linked](../index.md#link-a-gitlabcom-account) GitLab.com account.
+   [linked](../customers_portal.md#link-a-gitlabcom-account) GitLab.com account.
 1. Go to the **Manage Purchases** page.
 1. Select **Change linked namespace**.
 1. Select the desired group from the **This subscription is for** dropdown list. For a group to appear here, you must have the Owner role for that group.
@@ -312,7 +312,7 @@ For details on upgrading your subscription tier, see
 ### Automatic subscription renewal
 
 When a subscription is set to auto-renew, it renews automatically on the
-expiration date without a gap in available service. Subscriptions purchased through Customers Portal or GitLab.com are set to auto-renew by default. The number of seats is adjusted to fit the [number of billable users in your group](#view-seat-usage) at the time of renewal. You can view and download your renewal invoice on the Customers Portal [View invoices](https://customers.gitlab.com/receipts) page. If your account has a [saved credit card](../index.md#change-your-payment-method), the card is charged for the invoice amount. If we are unable to process a payment or the auto-renewal fails for any other reason, you have 14 days to renew your subscription, after which your access is downgraded.
+expiration date without a gap in available service. Subscriptions purchased through Customers Portal or GitLab.com are set to auto-renew by default. The number of seats is adjusted to fit the [number of billable users in your group](#view-seat-usage) at the time of renewal. You can view and download your renewal invoice on the Customers Portal [View invoices](https://customers.gitlab.com/receipts) page. If your account has a [saved credit card](../customers_portal.md#change-your-payment-method), the card is charged for the invoice amount. If we are unable to process a payment or the auto-renewal fails for any other reason, you have 14 days to renew your subscription, after which your access is downgraded.
 
 #### Email notifications
 
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index f1a960a6aa9..9f329700c74 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -5,259 +5,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: index, reference
 ---
 
-# GitLab subscription **(PREMIUM)**
-
-GitLab offers tiers of features. Your subscription determines which tier you
-have access to. Subscriptions are valid for 12 months.
-
-GitLab provides special subscriptions to participants in:
-
-- [Education](#gitlab-for-education)
-- [Open Source](#gitlab-for-open-source)
-
-## Choose a GitLab subscription
-
-When choosing a subscription, there are two factors to consider:
-
-- [GitLab SaaS or GitLab self-managed](#choose-between-gitlab-saas-or-gitlab-self-managed)
-- [GitLab tier](#choose-a-gitlab-tier)
-
-### Choose between GitLab SaaS or GitLab self-managed
-
-There are some differences in how a subscription applies, depending if you use
-GitLab SaaS or GitLab self-managed:
-
-- [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 Dedicated](gitlab_dedicated/index.md): a single-tenant SaaS service for highly regulated and large enterprises.
-- [GitLab self-managed](self_managed/index.md): Install, administer, and maintain
-  your own GitLab instance.
-
-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 a group
-namespace. You cannot apply a subscription to a personal namespace.
-
-NOTE:
-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
-
-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 for each product, see: [GitLab self-managed feature comparison](https://about.gitlab.com/pricing/feature-comparison/)
-
-## Find your subscription
-
-The following chart should help you determine your subscription model. Select
-the list item to go to the respective help page.
-
-```mermaid
-graph TD
-
-A(Is your user account on GitLab.com?)
-A --> B(Yes)
-A --> C(No)
-B --> D(fa:fa-link View your subscription on GitLab.com)
-C --> E(fa:fa-link View your self-hosted subscription)
-
-click D "./gitlab_com/index.html#view-your-gitlabcom-subscription"
-click E "./self_managed/index.html#view-your-subscription"
-```
-
-## Customers Portal
-
-With the [Customers Portal](https://customers.gitlab.com/) you can:
-
-- [Change account owner information](#change-account-owner-information)
-- [Change your company details](#change-your-company-details)
-- [Change your payment method](#change-your-payment-method)
-- [Link a GitLab.com account](#link-a-gitlabcom-account)
-- [Change the linked account](#change-the-linked-account)
-- [Change the namespace the subscription is linked to](gitlab_com/index.md#change-the-linked-namespace)
-- [Change customers portal account password](#change-customers-portal-account-password)
-
-The Customers Portal is available only to customers who purchased their
-subscription from GitLab. If you made your purchase through a partner or
-reseller, you must contact them directly for assistance with your subscription.
-
-### Change account owner information
-
-Account owner personal details are used on invoices. The account owner email address is used for the Customers Portal legacy login and license-related email.
-
-If you have registered a Customers Portal account through a GitLab.com account, the GitLab.com account is used for login.
-
-To change account owner information, including name, billing address, and email address:
-
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. Select **My account > Account details**.
-1. Expand the **Personal details** section.
-1. Edit the personal details.
-1. Select **Save changes**.
-
-If you want to transfer ownership of the Customers Portal account
-to another person, after you enter that person's personal details, you must also:
-
-- [Change the Customers Portal account password](#change-customers-portal-account-password).
-- [Change the linked GitLab.com account](#change-the-linked-account), if you have one linked.
-
-### Change your company details
-
-To change your company details, including company name and VAT number:
-
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. Select **My account > Account details**.
-1. Expand the **Company details** section.
-1. Edit the company details.
-1. Select **Save changes**.
-
-### Change your payment method
-
-Purchases in the Customers Portal require a credit card on record as a payment method. You can add
-multiple credit cards to your account, so that purchases for different products are charged to the
-correct card.
-
-If you would like to use an alternative method to pay, please
-[contact our Sales team](https://about.gitlab.com/sales/).
-
-To change your payment method:
-
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. Select **My account > Payment methods**.
-1. **Edit** an existing payment method's information or **Add new payment method**.
-1. Select **Save Changes**.
-
-#### Set a default payment method
-
-Automatic renewal of a subscription is charged to your default payment method. To mark a payment
-method as the default:
-
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. Select **My account > Payment methods**.
-1. **Edit** the selected payment method and check the **Make default payment method** checkbox.
-1. Select **Save Changes**.
-
-### Link a GitLab.com account
-
-Follow this guideline if you have a legacy Customers Portal account and use an email and password to log in.
-
-To link a GitLab.com account to your Customers Portal account:
-
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in?legacy=true) using email and password.
-1. On the Customers Portal page, select **My account > Account details**.
-1. Under **Your GitLab.com account**, select **Link account**.
-1. Log in to the [GitLab.com](https://gitlab.com/users/sign_in) account you want to link to the Customers Portal account.
-
-### Change the linked 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/users/sign_in) and ensure you are not logged in.
-1. On the Customers Portal page, select **My account > Account details**.
-1. Under **Your GitLab.com account**, select **Change linked account**.
-1. Log in to the [GitLab.com](https://gitlab.com/users/sign_in) account you want to link to the Customers Portal account.
-
-### Change Customers Portal account password
-
-To change the password for this customers portal account:
-
-1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
-1. Select the **My account** dropdown list and select **Account details**.
-1. Make the required changes to the **Your password** section.
-1. Select **Save changes**.
-
-## Community program subscriptions
-
-### GitLab for Education
-
-For qualifying non-profit educational institutions, the [GitLab for Education Program](https://about.gitlab.com/solutions/education/) provides GitLab Ultimate, plus 50,000 CI/CD minutes per month. The subscription granted under GitLab for Education can only be used for instructional use or non-commercial academic research. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Education Program page](https://about.gitlab.com/solutions/education/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/education-program/).
-
-### GitLab for Open Source
-
-For qualifying open source projects, the [GitLab for Open Source Program](https://about.gitlab.com/solutions/open-source/) provides GitLab Ultimate, plus 50,000 CI/CD minutes per month. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Open Source Program page](https://about.gitlab.com/solutions/open-source/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/opensource-program/).
-
-#### Meeting GitLab for Open Source Program requirements
-
-To meet GitLab for Open Source Program requirements, first add an OSI-approved open source license to all projects in your namespace.
-
-To add a license to a project:
-
-1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the overview page, select **Add LICENSE**. If the license you want is not available as a license template, manually copy the entire, unaltered [text of your chosen license](https://opensource.org/licenses/) into the `LICENSE` file. Note that GitLab defaults to **All rights reserved** if users do not perform this action.
-
-![Add license](img/add-license.png)
-
-Applicants must add the correct license to each project in their respective groups or namespaces. When you're sure you're using OSI-approved licenses for your projects, you can take your screenshots.
-
-NOTE:
-GitLab for Open Source Program benefits apply to an entire GitLab namespace. To qualify for the GitLab for Open Source Program, all projects in an applicant's namespace must meet program requirements. Applicants submit materials related to one project in the applying namespace, and the open source program team uses that project to verify eligibility of the entire namespace.
-
-#### Verification for Open Source Program
-
-Next, take screenshots of your project to confirm that project's eligibility. You must upload three screenshots:
-
-- [OSI-approved license overview](#screenshot-1-license-overview)
-- [OSI-approved license contents](#screenshot-2-license-contents)
-- [Publicly visible settings](#screenshot-3-publicly-visible-settings)
-
-NOTE:
-Benefits of the GitLab Open Source Program apply to all projects in a GitLab namespace. All projects in an eligible namespace must meet program requirements.
-
-##### Screenshot 1: License overview
-
-1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select your project avatar. If you haven't specified an avatar for your project, the avatar displays as a single letter.
-1. Take a screenshot of the project overview that clearly displays the license you've chosen for your project.
-
-![License overview](img/license-overview.png)
-
-##### Screenshot 2: License contents
-
-1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Repository** and locate the project's `LICENSE` file.
-1. Take a screenshot of the contents of the file. Make sure the screenshot includes the title of the license.
-
-![License file](img/license-file.png)
-
-##### Screenshot 3: Publicly visible settings
-
-To be eligible for the GitLab Open Source Program, projects must be publicly visible. To check your project's public visibility settings:
-
-1. On the top bar, select **Main menu > Projects** and find your project.
-1. From the left sidebar, select **Settings > General**.
-1. Expand **Visibility, project features, permissions**.
-1. From the **Project visibility** dropdown list, select **Public**.
-1. Select the **Users can request access** checkbox.
-1. Take a screenshot of this view. Include as much of the publicly visible settings as possible. Make sure to include your project's name in the upper-left of the screenshot.
-
-![Publicly visible setting](img/publicly-visible.png)
-
-NOTE:
-Exceptions to this public visibility requirement apply in select circumstances (for example, in cases where a project in an applicant's namespace may hold sensitive data). Email `opensource@gitlab.com` with details of your use case to request written permission for exceptions.
-
-### GitLab for Startups
-
-For qualifying startups, the [GitLab for Startups](https://about.gitlab.com/solutions/startups/) program provides GitLab Ultimate, plus 50,000 CI/CD minutes per month for 12 months. For more information—including instructions for applying to the program and renewing program membership—see the [GitLab for Startups Program page](https://about.gitlab.com/solutions/startups/) and the [GitLab handbook](https://about.gitlab.com/handbook/marketing/community-relations/community-programs/startups-program/).
-
-## Contact Support
-
-- See the tiers of [GitLab Support](https://about.gitlab.com/support/).
-- [Submit a request](https://support.gitlab.com/hc/en-us/requests/new) through the Support Portal.
-
-We also encourage all users to search our project trackers for known issues and existing feature requests in the [GitLab project](https://gitlab.com/gitlab-org/gitlab/-/issues/).
-
-These issues are the best avenue for getting updates on specific product plans and for communicating directly with the relevant GitLab team members.
-
-<!-- ## Troubleshooting
-
-Include any troubleshooting steps that you can foresee. If you know beforehand what issues
-one might have when setting this up, or when something is changed, or on upgrading, it's
-important to describe those, too. Think of things that may go wrong and include them here.
-This is important to minimize requests for support, and to avoid doc comments with
-questions that you know someone might ask.
-
-Each scenario can be a third-level heading, for example `### Getting error message X`.
-If you have none to add when creating a doc, leave this section in place
-but commented out to help encourage others to add to it in the future. -->
+# Subscribe to GitLab **(PREMIUM)**
+
+Choose and manage the subscription that's right for you and your organization.
+
+- [Choose a subscription](choosing_subscription.md)
+- [Compare self-managed to SaaS](../install/migrate/compare_sm_to_saas.md)
+- [GitLab SaaS](gitlab_com/index.md)
+- [GitLab self-managed](self_managed/index.md)
+- [GitLab Dedicated](gitlab_dedicated/index.md)
+- [Community programs](community_programs.md)
+- [Customers Portal](customers_portal.md)
+- [Quarterly reconciliation](quarterly_reconciliation.md)
+- [Storage usage quota](../user/usage_quotas.md)
+- [CI/CD minutes quota](../ci/pipelines/cicd_minutes.md)
+- [Features available to Starter and Bronze subscribers](../subscriptions/bronze_starter.md)
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 0eb6a2fe495..b5faf3bb0f3 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -7,39 +7,22 @@ type: index, reference
 
 # GitLab self-managed subscription **(PREMIUM SELF)**
 
-You can install, administer, and maintain your own GitLab instance.
+After you subscribe to GitLab, you can manage the details of your self-managed subscription.
 
-This page covers the details of your GitLab self-managed subscription.
+## Obtain a self-managed subscription
 
-GitLab subscription management requires access to the Customers Portal.
+To subscribe to GitLab for a GitLab self-managed installation:
 
-## Customers Portal
-
-GitLab provides the [Customers Portal](../index.md#customers-portal) where you can
-manage your subscriptions and your account details.
-
-Customers are required to use their GitLab.com account to register for a new Customers Portal account.
-
-If you have a legacy Customers Portal account that is not linked to a GitLab.com account, you may still [sign in](https://customers.gitlab.com/customers/sign_in?legacy=true) using an email and password. However, you should [create](https://gitlab.com/users/sign_up) and [link a GitLab.com account](../index.md#change-the-linked-account) to ensure continued access to the Customers Portal.
-
-Customers of resellers do not have access to this portal and should contact their reseller for any
-changes to their subscription.
-
-## Subscription
-
-The cost of a GitLab self-managed subscription is determined by the following:
-
-- [GitLab tier](https://about.gitlab.com/pricing/)
-- [Subscription seats](#subscription-seats)
-
-## Choose a GitLab tier
+1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a GitLab self-managed plan.
+1. After purchase, an activation code is sent to the email address associated with the Customers Portal account.
+   You must [add this code to your GitLab instance](../../user/admin_area/license.md).
 
-Pricing is [tier-based](https://about.gitlab.com/pricing/), so you can choose
-the features that fit your budget. For information on the features available
-for each tier, see the
-[GitLab self-managed feature comparison](https://about.gitlab.com/pricing/feature-comparison/).
+NOTE:
+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).
 
-## Subscription seats
+### Subscription seats
 
 A GitLab self-managed subscription uses a hybrid model. You pay for a subscription
 according to the [maximum number](#maximum-users) of users enabled during the subscription period.
@@ -49,7 +32,7 @@ simultaneous users in the GitLab self-managed installation is checked each quart
 If an instance is unable to generate a quarterly usage report, the existing [true up model](#users-over-subscription) is used.
 Prorated charges are not possible without a quarterly usage report.
 
-### View user totals
+## View user totals
 
 You can view users for your license and determine if you've gone over your subscription.
 
@@ -58,7 +41,7 @@ You can view users for your license and determine if you've gone over your subsc
 
 The lists of users are displayed.
 
-#### Billable users
+### Billable users
 
 A _billable user_ counts against the number of subscription seats. Every user is considered a
 billable user, with the following exceptions:
@@ -80,11 +63,11 @@ billable user, with the following exceptions:
 
 **Billable users** as reported in the `/admin` section is updated once per day.
 
-#### Maximum users
+### Maximum users
 
 The number of _maximum users_ reflects the highest number of billable users for the current license period.
 
-#### Users over subscription
+### Users over subscription
 
 The number of _users over subscription_ shows how many users are in excess of the number allowed by the subscription. This number reflects the current subscription period.
 
@@ -103,7 +86,7 @@ If you add more users to your GitLab instance than you are licensed for, payment
 
 If you do not add these users during the renewal process, your license key will not work.
 
-#### Free Guest users **(ULTIMATE)**
+### Free Guest users **(ULTIMATE)**
 
 In the **Ultimate** tier, users who are assigned the Guest role do not consume a seat.
 The user must not be assigned any other role, anywhere in the instance.
@@ -119,7 +102,7 @@ If a user creates a project, they are assigned the Maintainer or Owner role.
 To prevent a user from creating projects, as an administrator, you can mark the user
 as [external](../../user/admin_area/external_users.md).
 
-### Tips for managing users and subscription seats
+## Tips for managing users and subscription seats
 
 Managing the number of users against the number of subscription seats can be a challenge:
 
@@ -239,19 +222,6 @@ You can manually synchronize your subscription details at any time.
 
 A job is queued. When the job finishes, the subscription details are updated.
 
-## Obtain a subscription
-
-To subscribe to GitLab through a GitLab self-managed installation:
-
-1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a GitLab self-managed plan.
-1. After purchase, an activation code is sent to the email address associated with the Customers Portal account.
-   You must [add this code to your GitLab instance](../../user/admin_area/license.md).
-
-NOTE:
-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).
-
 ## View your subscription
 
 If you are an administrator, you can view the status of your subscription:
@@ -406,7 +376,7 @@ Before auto-renewal you should [prepare for the renewal](#prepare-for-renewal-by
 you must have enabled the [synchronization of subscription data](#subscription-data-synchronization).
 
 You can view and download your renewal invoice on the Customers Portal
-[View invoices](https://customers.gitlab.com/receipts) page. If your account has a [saved credit card](../index.md#change-your-payment-method), the card is charged for the invoice amount. If we are unable to process a payment or the auto-renewal fails for any other reason, you have 14 days to renew your subscription, after which your GitLab tier is downgraded.
+[View invoices](https://customers.gitlab.com/receipts) page. If your account has a [saved credit card](../customers_portal.md#change-your-payment-method), the card is charged for the invoice amount. If we are unable to process a payment or the auto-renewal fails for any other reason, you have 14 days to renew your subscription, after which your GitLab tier is downgraded.
 
 #### Email notifications