Merge branch 'axil-docs-refactor-subscriptions' into 'master'

Refactor the subscriptions documentation

See merge request gitlab-org/gitlab!41981

doc/administration/auth/ldap/index.md

@@ -16,7 +16,7 @@ This integration works with most LDAP-compliant directory servers, including:
 - Open LDAP
 - 389 Server
 
-Users added through LDAP take a [licensed seat](../../../subscriptions/index.md#choosing-the-number-of-users).
+Users added through LDAP take a [licensed seat](../../../subscriptions/self_managed/index.md#choose-the-number-of-users).
 
 GitLab Enterprise Editions (EE) include enhanced integration,
 including group membership syncing as well as multiple LDAP servers support.

doc/ci/pipelines/index.md

@@ -199,7 +199,7 @@ such as builds, logs, artifacts, and triggers. **This action cannot be undone.**
 ### Pipeline quotas
 
 Each user has a personal pipeline quota that tracks the usage of shared runners in all personal projects.
-Each group has a [usage quota](../../subscriptions/index.md#ci-pipeline-minutes) that tracks the usage of shared runners for all projects created within the group.
+Each group has a [usage quota](../../subscriptions/gitlab_com/index.md#ci-pipeline-minutes) that tracks the usage of shared runners for all projects created within the group.
 
 When a pipeline is triggered, regardless of who triggered it, the pipeline quota for the project owner's [namespace](../../user/group/index.md#namespaces) is used. In this case, the namespace can be the user or group that owns the project.
 

doc/ci/runners/README.md

@@ -50,7 +50,7 @@ If you are using a self-managed instance of GitLab:
 If you are using GitLab.com:
 
 - You can select from a list of [shared runners that GitLab maintains](../../user/gitlab_com/index.md#shared-runners).
-- The shared runners consume the [pipelines minutes](../../subscriptions/index.md#ci-pipeline-minutes)
+- The shared runners consume the [pipelines minutes](../../subscriptions/gitlab_com/index.md#ci-pipeline-minutes)
   included with your account.
 
 #### How shared runners pick jobs

doc/user/admin_area/activating_deactivating_users.md

@@ -44,7 +44,7 @@ Please note that for the deactivation option to be visible to an admin, the user
 Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
 
 NOTE: **Note:**
-A deactivated user does not consume a [seat](../../subscriptions/index.md#choosing-the-number-of-users).
+A deactivated user does not consume a [seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
 
 ## Activating a user
 
@@ -63,7 +63,7 @@ Users can also be activated using the [GitLab API](../../api/users.md#activate-u
 
 NOTE: **Note:**
 Activating a user will change the user's state to active and it consumes a
-[seat](../../subscriptions/index.md#choosing-the-number-of-users).
+[seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
 
 TIP: **Tip:**
 A deactivated user can also activate their account themselves by simply logging back in via the UI.

doc/user/admin_area/blocking_unblocking_users.md

@@ -33,7 +33,7 @@ Personal projects, and group and user history of the blocked user will be left i
 Users can also be blocked using the [GitLab API](../../api/users.md#block-user).
 
 NOTE: **Note:**
-A blocked user does not consume a [seat](../../subscriptions/index.md#choosing-the-number-of-users).
+A blocked user does not consume a [seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
 
 ## Unblocking a user
 
@@ -48,4 +48,4 @@ Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-us
 
 NOTE: **Note:**
 Unblocking a user will change the user's state to active and it consumes a
-[seat](../../subscriptions/index.md#choosing-the-number-of-users).
+[seat](../../subscriptions/self_managed/index.md#choose-the-number-of-users).

doc/user/admin_area/index.md

@@ -147,7 +147,7 @@ The following totals are also included:
 
 GitLab billing is based on the number of **Active users**, calculated as **Total users** -
 **Blocked users**. For details of active users, see
-[Choosing the number of users](../../subscriptions/index.md#choosing-the-number-of-users).
+[Choosing the number of users](../../subscriptions/self_managed/index.md#choose-the-number-of-users).
 
 NOTE: **Note:**
 Users statistics are calculated daily, so user changes made since the last update won't be

doc/user/admin_area/license.md

@@ -125,7 +125,7 @@ before uploading your license.
 
 GitLab.com users cannot upload and use a self-managed license. If you
 wish to use paid features on GitLab.com, a separate subscription may be
-[purchased](../../subscriptions/index.md#subscribe-to-gitlabcom).
+[purchased](../../subscriptions/gitlab_com/index.md).
 
 ### Users exceed license limit upon renewal
 

doc/user/clusters/applications.md

@@ -125,7 +125,7 @@ service included with GitLab that coordinates the jobs.
 
 If the project is on GitLab.com, shared runners are available
 (the first 2000 minutes are free, you can
-[buy more later](../../subscriptions/index.md#purchasing-additional-ci-minutes))
+[buy more later](../../subscriptions/gitlab_com/index.md#purchase-additional-ci-minutes))
 and you do not have to deploy one if they are enough for your needs. If a
 project-specific runner is desired, or there are no shared runners, it is easy
 to deploy one.

doc/user/gitlab_com/index.md

@@ -137,7 +137,7 @@ Linux shared runners on GitLab.com run in [autoscale mode](https://docs.gitlab.c
 Autoscaling means reduced waiting times to spin up CI/CD jobs, and isolated VMs for each project,
 thus maximizing security. They're free to use for public open source projects and limited
 to 2000 CI minutes per month per group for private projects. More minutes
-[can be purchased](../../subscriptions/index.md#purchasing-additional-ci-minutes), if
+[can be purchased](../../subscriptions/gitlab_com/index.md#purchase-additional-ci-minutes), if
 needed. Read about all [GitLab.com plans](https://about.gitlab.com/pricing/).
 
 All your CI/CD jobs run on [n1-standard-1 instances](https://cloud.google.com/compute/docs/machine-types) with 3.75GB of RAM, CoreOS and the latest Docker Engine

doc/user/project/settings/project_access_tokens.md

@@ -54,7 +54,7 @@ When the project access token is [revoked](#revoking-a-project-access-token) the
 records will be moved to a system-wide user with the username "Ghost User". For more information,
 see [Associated Records](../../profile/account/delete_account.md#associated-records).
 
-Project bot users are a [GitLab-created service account](../../../subscriptions/index.md#self-managed), but count as a licensed seat.
+Project bot users are a [GitLab-created service account](../../../subscriptions/self_managed/index.md#choose-the-number-of-users), but count as a licensed seat.
 These users will not count against your licensed seat in the future when [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/223695) is resolved.
 
 ## Revoking a project access token

ee/app/views/admin/application_settings/_seat_link_form.html.haml

@@ -14,7 +14,7 @@
           - if can_be_configured
             %p.mb-2= _('To simplify the billing process, GitLab will collect user counts in order to prorate charges for user growth throughout the year using a quarterly reconciliation process.')
 
-            - link_path = help_page_path('subscriptions/index', anchor: 'seat-link')
+            - link_path = help_page_path('subscriptions/self_managed/index', anchor: 'seat-link')
             - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_path }
             %p.mb-2= s_('%{link_start}Learn more%{link_end} about what information is shared with GitLab Inc.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
 
@@ -24,7 +24,7 @@
             %pre.usage-data.js-syntax-highlight.code.highlight.mt-2.d-none{ class: payload_class, data: { endpoint: seat_link_payload_admin_application_settings_path(format: :html) } }
           - else
             = _('Seat Link is disabled, and cannot be configured through this form.')
-            - link_path = help_page_path('subscriptions/index', anchor: 'disable-seat-link')
+            - link_path = help_page_path('subscriptions/self_managed/index', anchor: 'disable-seat-link')
             - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_path }
             = s_('For more information, see the documentation on %{link_start}disabling Seat Link%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
 

ee/app/views/admin/licenses/_info.html.haml

@@ -19,7 +19,7 @@
           - unless @license.ultimate?
             = ' - '
             = link_to _('How to upgrade'),
-              help_page_path('subscriptions/index.md', anchor: 'upgrade-your-self-managed-subscription-tier'),
+              help_page_path('subscriptions/self_managed/index.md', anchor: 'upgrade-your-subscription-tier'),
               class: 'inline-link',
               target: :_blank,
               rel: :noreferrer

ee/app/views/namespaces/pipelines_quota/_extra_shared_runners_minutes_quota.html.haml

@@ -8,7 +8,7 @@
     %div
       = ci_minutes_report(minutes_quota.purchased_minutes_report)
       minutes
-      = link_to sprite_icon('question-o'), help_page_path('subscriptions/index', anchor: 'purchasing-additional-ci-minutes'), target: '_blank', rel: 'noopener noreferrer'
+      = link_to sprite_icon('question-o'), help_page_path('subscriptions/gitlab_com/index', anchor: 'purchase-additional-ci-minutes'), target: '_blank', rel: 'noopener noreferrer'
   .col-sm-6.right
     #{minutes_quota.purchased_percent_used}% used
     = ci_minutes_progress_bar(minutes_quota.purchased_percent_used)