Billing and subscription freshness (#19573)

* update toc and refresh billing and subscription pages

* update links

* fix another link

* update image path and fix typo

content/_index.md

@@ -88,9 +88,9 @@ grid:
       - text: "Overview"
         url: "/subscription/"
       - text: "Subscriptions and features"
-        url: "/subscription/details/"
+        url: "/subscription/core-subscription/details/"
       - text: "Upgrade"
-        url: "/subscription/upgrade/"
+        url: "/subscription/core-subscription/upgrade/"
   - title: Billing
     icon: payments
     description: |
@@ -99,9 +99,9 @@ grid:
       - text: "Overview"
         url: "/billing/"
       - text: "Update payment method"
-        url: "/billing/payment-method/"
+        url: "/billing/core-billing/payment-method/"
       - text: "View billing history"
-        url: "/billing/history/"
+        url: "/billing/core-billing/history/"
   - title: Administration
     icon: admin_panel_settings
     description: |

content/admin/company/organizations.md

@@ -48,7 +48,7 @@ There is no limit to the number of organizations you can have under a company la
 
 ## Add seats to an organization
 
-When you have a [self-serve](../../subscription/details.md#self-serve) subscription that has no pending subscription changes, you can add seats using the following steps.
+When you have a [self-serve](../../subscription/core-subscription/details.md#self-serve) subscription that has no pending subscription changes, you can add seats using the following steps.
 
 1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your company in the drop-down menu.

content/admin/deactivate-account.md

@@ -28,7 +28,7 @@ Before deactivating your Docker account, ensure that you meet the following requ
 
 - If you are the sole owner of an organization, either assign another member of the organization the owner role and then remove yourself from the organization, or deactivate the organization. Similarly, if you are the sole owner of a company, either add someone else as a company owner and then remove yourself, or deactivate the company.
 
-- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/downgrade.md).
+- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/core-subscription/downgrade.md).
 
 - If you have an active Docker Build Cloud Team subscription, [downgrade it to a Docker Build Cloud Starter subscription](../billing/build-billing.md#downgrade-your-subscription).
 
@@ -56,7 +56,7 @@ Before deactivating an organization, complete the following:
 - Download any images and tags you want to keep:
   `docker pull -a <image>:<tag>`.
 
-- If you have an active Docker subscription, [downgrade it to a **Docker Free Team** subscription](../subscription/downgrade.md).
+- If you have an active Docker subscription, [downgrade it to a **Docker Free Team** subscription](../subscription/core-subscription/downgrade.md).
 
 - If you have an active Docker Scout subscription, [downgrade it to a Docker Scout Free subscription](../billing/scout-billing.md#downgrade-your-subscription).
 

content/admin/organization/activity-logs.md

@@ -19,7 +19,7 @@ Owners can also see the activity logs for their repository if the repository is
 
 > **Note**
 >
-> Activity logs requires a [Docker Team or Business subscription](../../subscription/_index.md).
+> Activity logs requires a [Docker Team or Business subscription](../../../subscription/_index.md).
 
 {{< tabs >}}
 {{< tab name="Docker Hub" >}}

content/admin/organization/orgs.md

@@ -11,7 +11,7 @@ aliases:
 This section describes how to create an organization. Before you begin:
 
 - You need a [Docker ID](../../docker-id/_index.md).
-- Review the [Docker subscriptions and features](../../subscription/details.md) to determine what plan to choose for your organization.
+- Review the [Docker subscriptions and features](../../subscription/core-subscription/details.md) to determine what plan to choose for your organization.
 
 ## Create an organization
 
@@ -108,7 +108,7 @@ configure your organization.
    organization's **Settings** page.
 
 - **Billing**: Displays information about your existing
-[Docker subscription (plan)](../../subscription/_index.md), including the number of seats and next payment due date. For how to access the billing history and payment methods for your organization, see [View billing history](../../billing/history.md).
+[Docker subscription (plan)](../../subscription/_index.md), including the number of seats and next payment due date. For how to access the billing history and payment methods for your organization, see [View billing history](../../billing/core-billing/history.md).
 
 ## Videos
 

content/billing/_index.md

@@ -2,19 +2,20 @@
 title: Billing and payments
 description: Discover information on billing and payment processes for Docker subscriptions.
 keywords: billing, invoice, payment, subscription
-grid:
+grid_core:
 - title: Add or update a payment method
   description: Learn how to add or update a payment method for your personal account or organization.
-  link: /billing/payment-method/
+  link: /billing/core-billing/payment-method/
   icon: credit_score
 - title: Update the billing information
   description: Discover how to update the billing information for your personal account or organization.
-  link: /billing/details/
+  link: /billing/core-billing/details/
   icon: contract_edit
 - title: View billing history
   description: Learn how to view billing history and download past invoices.
-  link: /billing/history/
+  link: /billing/core-billing/history/
   icon: payments
+grid_products:
 - title: Docker Scout billing
   description: Explore how to buy and manage a Docker Scout subscription.
   link: /billing/scout-billing/
@@ -23,12 +24,23 @@ grid:
   description: Learn how to buy and manage a Docker Build Cloud subscription.
   link: /billing/build-billing/
   icon: build
+grid_resources:
 - title: Billing FAQs
   description: Find the answers you need and explore common questions.
   link: /billing/faqs/
   icon: help
 ---
 
-Use the resources in this section to manage your billing and payment settings for your Pro, Team, or Business subscription, or for your Docker Scout subscription.
+Use the resources in this section to manage your billing and payment settings for your Docker subscriptions.
 
-{{< grid >}}
+## Docker Core
+
+{{< grid items="grid_core" >}}
+
+## Docker products
+
+{{< grid items="grid_products" >}}
+
+## Resources
+
+{{< grid items="grid_resources" >}}

content/billing/core-billing/cycle.md

@@ -2,6 +2,8 @@
 title: Change your billing cycle
 description: Learn to change your billing cycle for your Docker subscription
 keywords: billing, cycle, payments, subscription
+aliases:
+- /billing/cycle/
 ---
 
 You can pay for a Pro or Team subscription on a monthly or yearly billing cycle. You select your preferred billing cycle when you buy your subscription.
@@ -10,7 +12,7 @@ If you have a monthly billing cycle, you can choose to switch to an annual billi
 
 When you change the billing cycle's duration:
 - The next billing date reflects the new cycle. To find your next billing date, see [View renewal date](history.md#view-renewal-date).
-- The subscription's start date resets. For example, if the start date of the monthly subscription is March 1st and the end date is April 1st, then after switching the billing duration to March 15th 2023 the new start date is March 15th, 2023, and the new end date is March 15th, 2024.
+- The subscription's start date resets. For example, if the start date of the monthly subscription is March 1st and the end date is April 1st, then after switching the billing duration to March 15th, 2023 the new start date is March 15th, 2023, and the new end date is March 15th, 2024.
 - Any unused monthly subscription is prorated and applied as credit towards the new annual period. For example, if you switch from a $10 monthly subscription to a $100 annual plan, deducting the unused monthly value (in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost after March 15, 2024 is $100.
 
 ## Personal account

content/billing/core-billing/details.md

@@ -2,6 +2,8 @@
 title: Update the billing information
 description: Learn how to update your billing information in Docker Hub
 keywords: payments, billing, subscription, invoices
+aliases:
+- /billing/details/
 ---
 
 You can update the billing information for your personal account or for an organization. When you update your billing information, these changes apply to future billing invoices.
@@ -13,16 +15,18 @@ You can update the billing information for your personal account or for an organ
 
 The billing information provided appears on all your billing invoices. The email address provided is where Docker sends all invoices and other [billing-related communication](#update-your-email-address-that-receives-billing-invoices).
 
-## Personal account
+## Manage billing information
+
+### Personal account
 
 1. Select your avatar in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
 3. Select the **Payment methods and billing history** link.
 4. In the **Billing Information** section, select **Update information**.
 5. Enter your updated billing details.
-6. Select **Save**. 
+6. Select **Save**.
 
-## Organization 
+### Organization
 
 > **Note**
 >

content/billing/core-billing/history.md

@@ -2,6 +2,8 @@
 title: View billing history
 description: Discover how to view your billing history in Docker Hub
 keywords: payments, billing, subscription, invoices, renewals, invoice management, billing administration
+aliases:
+- /billing/history/
 ---
 
 In this section, learn how you can view your billing history, manage your invoices, and verify your renewal date. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment.
@@ -19,7 +21,7 @@ Your invoice includes the following:
 
 Amounts are in USD.
 
-The information listed in the Bill to section is based on your billing information. Not all fields are required. The billing information includes the following:
+The information listed in the **Bill** to section is based on your billing information. Not all fields are required. The billing information includes the following:
 
 - Name (required) - the name of the administrator or company.
 - Email address (required) - the email address that receives all billing-related emails for the account.

content/billing/core-billing/payment-method.md

@@ -2,15 +2,17 @@
 title: Add or update a payment method
 description: Learn how to add or update a payment method in Docker Hub
 keywords: payments, billing, subscription, supported payment methods, failed payments, coupons
+billing:
+- /billing/payment-method/
 ---
 
-This page describes how to add or update a payment method for your personal account or for an organization. 
+This page describes how to add or update a payment method for your personal account or for an organization.
 
 You can add a payment method or update your account's existing payment method at any time.
 
 >**Important**
 >
-> If you want to remove all payment methods, you must first downgrade your subscription to a free plan. See [Downgrade](../subscription/downgrade.md), for more information. 
+> If you want to remove all payment methods, you must first downgrade your subscription to a free plan. See [Downgrade](../../subscription/core-subscription/downgrade.md).
 
 The following payment methods are supported:
 
@@ -24,24 +26,26 @@ The following payment methods are supported:
 
 All currency, for example the amount listed on your billing invoice, is in United States dollar (USD).
 
-## Personal account
+## Manage payment method
+
+### Personal account
 
 1. Select your avatar in the top-right corner of Docker Hub.
 2. From the drop-down menu select **Billing**.
 3. Select the **Payment methods and billing history** link.
-4. In the **Payment Method** section, select **Add payment method**.
+4. In the **Payment method** section, select **Add payment method**.
 5. Enter your new payment information, then select **Add**.
 6. Select the **Actions** icon, then select **Make default** to ensure that your new payment method applies to all purchases and subscriptions.
 7. Optional. You can remove non-default payment methods by selecting the **Actions** icon. Then, select **Delete**.
 
-## Organization 
+### Organization
 
 > **Note**
 >
 > You must be an organization owner to make changes to the payment information.
 
 1. Select your avatar in the top-right corner of Docker Hub.
-2. From the drop-down menu select **Billing**. 
+2. From the drop-down menu select **Billing**.
 3. Select the organization account you want to update.
 4. Select the **Payment methods and billing history** link.
 5. In the **Payment Method** section, select **Add payment method**.

content/docker-hub/release-notes.md

@@ -107,7 +107,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/pro
 
 ### New
 
-- You can now purchase or upgrade to a Docker Business subscription using a credit card. To learn more, see [Upgrade your subscription](../subscription/upgrade.md).
+- You can now purchase or upgrade to a Docker Business subscription using a credit card. To learn more, see [Upgrade your subscription](../subscription/core-subscription/upgrade.md).
 
 ## 2021-08-31
 
@@ -254,7 +254,7 @@ Each organization page now breaks down into these tabs:
 
 ### Enhancements
 
-* The [billing page](../subscription/upgrade.md) for personal accounts has been updated. You can access the page at its new URL: [https://hub.docker.com/billing/plan](https://hub.docker.com/billing/plan).
+* The [billing page](../subscription/core-subscription/upgrade.md) for personal accounts has been updated. You can access the page at its new URL: [https://hub.docker.com/billing/plan](https://hub.docker.com/billing/plan).
 
 ### Known Issues
 

content/docker-hub/repos/access.md

@@ -12,7 +12,7 @@ Within your repository, you can give others access to push and pull to your repo
 A collaborator is someone you want to give access to a private repository. Once designated, they can `push` and `pull` to your repositories. They're not
 allowed to perform any administrative tasks such as deleting the repository or changing its status from private to public. 
 
-Only personal account repositories can use collaborators. You can add unlimited collaborators to public repositories, and [Docker Pro](../../subscription/details.md#docker-pro) accounts can add up to 1 collaborator on private repositories. Organization repositories can't use collaborators. Organization owners can control repository access with [member roles](../../security/for-admins/roles-and-permissions.md) and [teams](../../admin/organization/manage-a-team.md).
+Only personal account repositories can use collaborators. You can add unlimited collaborators to public repositories, and [Docker Pro](../../subscription/core-subscription/details.md#docker-pro) accounts can add up to 1 collaborator on private repositories. Organization repositories can't use collaborators. Organization owners can control repository access with [member roles](../../security/for-admins/roles-and-permissions.md) and [teams](../../admin/organization/manage-a-team.md).
 
 You can choose collaborators and manage their access to a private
 repository from that repository's **Settings** page.

content/faq/security/single-sign-on/enforcement-faqs.md

@@ -8,7 +8,7 @@ aliases:
 
 ### We currently have a Docker Team subscription. How do we enable SSO?
 
-SSO is available with a Docker Business subscription. To enable SSO, you must first upgrade your subscription to a Docker Business subscription. To learn how to upgrade your existing account, see [Upgrade your subscription](../../../subscription/upgrade.md).
+SSO is available with a Docker Business subscription. To enable SSO, you must first upgrade your subscription to a Docker Business subscription. To learn how to upgrade your existing account, see [Upgrade your subscription](../../../subscription/core-subscription/upgrade.md).
 
 ### How do service accounts work with SSO?
 

content/security/for-admins/configure-sign-in.md

@@ -10,7 +10,7 @@ aliases:
 By default, members of your organization can use Docker Desktop without signing
 in. When users don’t sign in as a member of your organization, they don’t
 receive the [benefits of your organization’s
-subscription](../../subscription/details.md) and they can circumvent [Docker’s
+subscription](../../subscription/core-subscription/details.md) and they can circumvent [Docker’s
 security features](../../desktop/hardened-desktop/_index.md) for your organization.
 
 To ensure members of your organization always sign in, you can deploy a

content/security/for-admins/domain-audit.md

@@ -23,7 +23,7 @@ Although domain audit can't identify all Docker users in your environment, you c
 
 Before you audit your domains, review the following required prerequisites:
 
-- Your organization must be part of a Docker Business subscription. To upgrade your existing account to a Docker Business subscription, see [Upgrade your subscription](../../subscription/upgrade.md).
+- Your organization must be part of a Docker Business subscription. To upgrade your existing account to a Docker Business subscription, see [Upgrade your subscription](../../subscription/core-subscription/upgrade.md).
 - You must [add and verify your domains](./single-sign-on/configure/_index.md#step-one-add-and-verify-your-domain).
 
 > **Important**

content/security/for-admins/image-access-management.md

@@ -10,7 +10,7 @@ aliases:
 
 > **Note**
 >
-> Image Access Management is available to [Docker Business](../../subscription/details.md#docker-business) customers only.
+> Image Access Management is available to [Docker Business](../../subscription/core-subscription/details.md#docker-business) customers only.
 
 Image Access Management gives administrators control over which types of images, such as Docker Official Images, Docker Verified Publisher Images, or community images, their developers can pull from Docker Hub.
 

content/security/for-admins/registry-access-management.md

@@ -10,7 +10,7 @@ aliases:
 
 > **Note**
 >
-> Registry Access Management is available to [Docker Business](../../subscription/details.md) customers only. 
+> Registry Access Management is available to [Docker Business](../../subscription/core-subscription/details.md) customers only. 
 
 With Registry Access Management (RAM), administrators can ensure that their developers using Docker Desktop only access allowed registries. This is done through the Registry Access Management dashboard in Docker Hub or the Docker Admin Console.
 

content/subscription/_index.md

@@ -2,8 +2,8 @@
 description: Learn about subscription features and how to manage your subscription
 keywords: Docker, pricing, billing, Pro, Team, business, subscription, tier, plan
 title: Docker subscription overview
-grid:
+grid_subscriptions:
-- title: Docker subscriptions and features
+- title: Docker Core subscriptions and features
   description: Explore what you can do with your Docker subscription.
   link: /subscription/details/
   icon: feature_search
@@ -15,6 +15,7 @@ grid:
   description: Learn how a Docker Build Cloud subscription can accelerate your builds.
   link: /subscription/build-details/
   icon: build
+grid_core:
 - title: Upgrade your subscription
   description: Learn how to upgrade your plan to the next level.
   link: /subscription/upgrade/
@@ -23,21 +24,32 @@ grid:
   description: Do more with Docker and add seats to your subscription.
   link: /subscription/add-seats/
   icon: group_add
-- title: Subscription FAQs
+grid_resources:
-  description: Find the answers you need and explore common questions.
-  link: /subscription/faq/
-  icon: help
 - title: Docker Desktop license agreement
   description: Review the terms of the Docker Subscription Service Agreement.
   link: /subscription/desktop-license/
   icon: license
+- title: Subscription FAQs
+  description: Find the answers you need and explore common questions.
+  link: /subscription/faq/
+  icon: help
 aliases:
 - /docker-hub/billing/
 - /docker-hub/billing/faq/
 ---
 
-A Docker subscription includes licensing for commercial use of Docker components including Docker Desktop and Docker Hub.
+A Docker Core subscription includes licensing for commercial use of Docker components including Docker Desktop and Docker Hub.
 
-Use the resources here to decide what subscription you need, manage an existing subscription, or explore additional products like Docker Scout.
+Use the resources here to decide what subscription you need, manage an existing subscription, or explore additional products like Docker Scout or Docker Build Cloud.
 
-{{< grid >}}
+## Docker subscriptions and features
+
+{{< grid items="grid_subscriptions" >}}
+
+## Manage your Docker Core subscription
+
+{{< grid items="grid_core" >}}
+
+## Resources
+
+{{< grid items="grid_resources" >}}

content/subscription/build-details.md

@@ -8,7 +8,7 @@ You can enhance your teams' builds with a Build Cloud subscription. This page de
 
 ## Docker Build Cloud Starter
 
-If you have an existing [Docker Core subscription](./details.md), a base level of Build Cloud minutes and cache are included. The features available vary depending on your Docker Core subscription tier.
+If you have an existing [Docker Core subscription](../subscription/core-subscription/details.md), a base level of Build Cloud minutes and cache are included. The features available vary depending on your Docker Core subscription tier.
 
 ### Docker Personal
 

content/subscription/core-subscription/add-seats.md

@@ -1,9 +1,10 @@
 ---
 description: Learn how to add seats to an existing subscription
-keywords: Docker, Docker Hub, subscription, update, add, seats, pricing
+keywords: Docker, Docker Hub, subscription, update, add, seats, pricing, docker core
 title: Add seats to your subscription
 aliases:
 - /docker-hub/billing/add-seats/
+- /subscription/add-seats/
 ---
 
 You can add seats at anytime to your existing subscription.
@@ -27,7 +28,7 @@ When you add seats to your subscription in the middle of your billing cycle, you
 5. Select **Purchase** to confirm. 
     The **Billing** tab displays the new number of seats. 
 
-6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../admin/organization/members.md#add-a-member-to-a-team).
+6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../../admin/organization/members.md#add-a-member-to-a-team).
 
 ## Volume pricing
 

content/subscription/core-subscription/details.md

@@ -2,17 +2,19 @@
 title: Docker subscriptions and features
 description: Learn about Docker subscription tiers and their features
 keywords: subscription, personal, pro, team, business, features, docker core subscription, docker core
+aliases:
+- /subscription/details/
 ---
 
 You can do more with Docker with a Docker Core subscription, such as add collaborators, create scoped access tokens, and create private repositories. This page provides an overview of each subscription tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
 The following describes some of the key features included with your Docker Core subscription:
 
-![Docker Core subscription diagram](images/subscription-diagram.webp)
+![Docker Core subscription diagram](../images/subscription-diagram.webp)
 
-3 Docker Scout-enabled repositories for advanced remote image analysis. You can purchase a Docker Scout subscription to enable more repositories. See [Docker Scout subscriptions and features](./scout-details.md).
+3 Docker Scout-enabled repositories for advanced remote image analysis. You can purchase a Docker Scout subscription to enable more repositories. See [Docker Scout subscriptions and features](../scout-details.md).
 
-Docker Build Cloud minutes are also included. For more information, see [Docker Build Cloud subscriptions and features](./build-details.md).
+Docker Build Cloud minutes are also included. For more information, see [Docker Build Cloud subscriptions and features](../build-details.md).
 
 Docker maintains a [public roadmap](https://github.com/docker/roadmap) so subscribers can see what new features are in development, as well as request new capabilities.
 
@@ -22,9 +24,9 @@ Docker Personal (formerly Docker Free) is ideal for open-source communities, ind
 Docker Personal includes:
 
 - Unlimited public repositories
-- Unlimited [Scoped Access Tokens](../security/for-developers/access-tokens.md)
+- Unlimited [Scoped Access Tokens](../../security/for-developers/access-tokens.md)
-- Unlimited [collaborators](../docker-hub/repos/access.md#collaborators-and-their-role) for public repositories at no cost per month.
+- Unlimited [collaborators](../../docker-hub/repos/access.md#collaborators-and-their-role) for public repositories at no cost per month.
-- Access to [Docker Scout Free](./scout-details.md#docker-scout-free) to get started with software supply chain security.
+- Access to [Docker Scout Free](../scout-details.md#docker-scout-free) to get started with software supply chain security.
 
 Additionally, anonymous users get 100 pulls every 6 hours and users that sign in to Docker get 200 pulls every 6 hours.
 
@@ -37,9 +39,9 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
 Docker Pro includes:
 - All the features available in Personal
 - Unlimited private repositories
-- 5000 image [pulls per day](../docker-hub/download-rate-limit.md)
+- 5000 image [pulls per day](../../docker-hub/download-rate-limit.md)
-- [Auto Builds](../docker-hub/builds/index.md) with 5 concurrent builds
+- [Auto Builds](../../docker-hub/builds/index.md) with 5 concurrent builds
-- 300 [Vulnerability Scans](../docker-hub/vulnerability-scanning.md)
+- 300 [Vulnerability Scans](../../docker-hub/vulnerability-scanning.md)
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
@@ -50,11 +52,11 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
 Docker Team includes:
 - Everything included in Docker Pro
 - Unlimited teams
-- [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds
+- [Auto Builds](../../docker-hub/builds/index.md) with 15 concurrent builds
-- Unlimited [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md)
+- Unlimited [Vulnerability Scanning](../../docker-hub/vulnerability-scanning.md)
-- 5000 image [pulls per day](../docker-hub/download-rate-limit.md) for each team member
+- 5000 image [pulls per day](../../docker-hub/download-rate-limit.md) for each team member
 
-There are also advanced collaboration and management tools, including organization and team management with [Role Based Access Control (RBAC)](../security/for-admins/roles-and-permissions.md), [activity logs](../admin/organization/activity-logs.md), and more.
+There are also advanced collaboration and management tools, including organization and team management with [Role Based Access Control (RBAC)](../../security/for-admins/roles-and-permissions.md), [activity logs](../../admin/organization/activity-logs.md), and more.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 
@@ -64,12 +66,12 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
 
 Docker Business includes:
 - Everything included in Docker Team
-- [Hardened Docker Desktop](../desktop/hardened-desktop/index.md) 
+- [Hardened Docker Desktop](../../desktop/hardened-desktop/index.md) 
-- [Image Access Management](../security/for-admins/image-access-management.md) which lets admins control what content developers can access
+- [Image Access Management](../../security/for-admins/image-access-management.md) which lets admins control what content developers can access
-- [Registry Access Management](../security/for-admins/registry-access-management.md) which lets admins control what registries developers can access
+- [Registry Access Management](../../security/for-admins/registry-access-management.md) which lets admins control what registries developers can access
-- [Company layer](../admin/company/_index.md) to manage multiple organizations and settings
+- [Company layer](../../admin/company/_index.md) to manage multiple organizations and settings
-- [Single Sign-On](../security/for-admins/single-sign-on/index.md)
+- [Single Sign-On](../../security/for-admins/single-sign-on/index.md)
-- [System for Cross-domain Identity Management](../security/for-admins/scim.md) and more.
+- [System for Cross-domain Identity Management](../../security/for-admins/scim.md) and more.
 
 For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).
 

content/subscription/core-subscription/downgrade.md

@@ -1,10 +1,11 @@
 ---
 description: Learn how to downgrade your Docker subscription
-keywords: Docker Hub, downgrade, subscription, Pro, Team, pricing plan, pause subscription
+keywords: Docker Hub, downgrade, subscription, Pro, Team, pricing plan, pause subscription, docker core
 title: Downgrade your subscription
 aliases:
 - /docker-hub/cancel-downgrade/
 - /docker-hub/billing/downgrade/
+- /subscription/downgrade/
 ---
 
 You can downgrade your Docker subscription at anytime before the renewal date. The unused portion of the subscription isn't refundable or creditable.

content/subscription/core-subscription/remove-seats.md

@@ -1,12 +1,13 @@
 ---
 description: Learn how to remove seats from your subscription
-keywords: Docker, Docker Hub, subscription, update, remove, seats
+keywords: Docker, Docker Hub, subscription, update, remove, seats, docker core
 title: Remove seats from your subscription
 aliases:
 - /docker-hub/billing/remove-seats/
+- /subscription/remove-seats/
 ---
 
-You can remove seats from your Team or Business subscription at anytime. 
+You can remove seats from your Team or Business subscription at anytime.
 
 If you remove seats in the middle of the billing cycle, changes apply in the next billing cycle. Any unused portion of the subscription for removed seats isn't refundable or creditable.
 
@@ -29,4 +30,4 @@ For example, if you receive your billing on the 8th of every month for 10 seats
 
 5. The **Billing** tab confirms the seat removal and the details on when the changes take effect.
 
-To cancel the removal of seats, [contact support](https://hub.docker.com/support/contact/).
+You can cancel the removal of seats before your next billing cycle. To do so, select **Cancel change** in the bottom-right corner.

content/subscription/core-subscription/upgrade.md

@@ -1,10 +1,11 @@
 ---
 description: Learn how to upgrade your Docker subscription
-keywords: Docker Hub, upgrade, subscription, Pro, Team, business, pricing plan,
+keywords: Docker Hub, upgrade, subscription, Pro, Team, business, pricing plan, docker core
 title: Upgrade your subscription
 aliases:
 - /docker-hub/upgrade/
 - /docker-hub/billing/upgrade/
+- /subscription/upgrade/
 ---
 
 When you upgrade to a paid subscription, you immediately have access to all the features and entitlements available in your new chosen subscription. For detailed information on features available in each subscription, see [Docker Pricing](https://www.docker.com/pricing).
@@ -13,14 +14,20 @@ When you upgrade to a paid subscription, you immediately have access to all the
 
 1. Sign in to your [Docker Hub](https://hub.docker.com) account.
 
-2. Optional: If you're upgrading from a free user account to a Team subscription and want to keep your account name, [convert your user account into an organization](../admin/convert-account.md).
+2. Optional: If you're upgrading from a free user account to a Team subscription and want to keep your account name, [convert your user account into an organization](../../admin/convert-account.md).
 
 3. Select your avatar in the top-right corner of Docker Hub.
 
 4. From the drop-down menu select **Billing**, then the account you want to upgrade.
 
-5. In the **Plan** section, select **Change plan** and then choose the plan you'd like to upgrade to.
+5. Go to your current plan, then select **Change plan** and then choose the plan you'd like to upgrade to.
+
+   > **Tip**
+   >
+   > If your current plan is a free plan, select **Buy now**.
+   {.tip}
 
 6. Follow the on-screen instructions.
 
-    If you have a [coupon](../billing/faqs.md#how-do-i-redeem-a-coupon) to use, you can enter it during this step.
+   If you have a coupon to use, you can enter it during this step.
+   

content/subscription/desktop-license.md

@@ -26,5 +26,5 @@ GNU General Public License. Select [here](https://download.docker.com/opensource
 
 > **Tip**
 >
-> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. 
+> Explore [Docker subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. 
 { .tip }

content/subscription/scout-details.md

@@ -8,7 +8,7 @@ This page provides an overview of the subscription plans for Docker Scout. To co
 
 ## Docker Scout Free
 
-Docker Scout Free is available for both personal accounts and organizations. If you have a [Docker subscription](./details.md), you automatically have access to Docker Scout Free. This plan is ideal for individual developers getting started with software supply chain security.
+Docker Scout Free is available for both personal accounts and organizations. If you have a [Docker subscription](./core-subscription/details.md), you automatically have access to Docker Scout Free. This plan is ideal for individual developers getting started with software supply chain security.
 
 Docker Scout Free includes:
 

data/toc.yaml

@@ -2126,14 +2126,16 @@ Manuals:
   section:
   - path: /billing/
     title: Overview
-  - path: /billing/payment-method/
+  - sectiontitle: Docker Core billing
-    title: Add or update a payment method
+    section:
-  - path: /billing/details/
+    - path: /billing/core-billing/payment-method/
-    title: Update the billing information
+      title: Add or update a payment method
-  - path: /billing/history/
+    - path: /billing/core-billing/details/
-    title: View your billing history
+      title: Update the billing information
-  - path: /billing/cycle/
+    - path: /billing/core-billing/history/
-    title: Change your billing cycle
+      title: View your billing history
+    - path: /billing/core-billing/cycle/
+      title: Change your billing cycle
   - path: /billing/scout-billing/
     title: Docker Scout billing
   - path: /billing/build-billing/
@@ -2144,16 +2146,18 @@ Manuals:
   section:
   - path: /subscription/
     title: Overview
-  - path: /subscription/details/
+  - sectiontitle: Docker Core
-    title: Docker subscriptions and features
+    section:
-  - path: /subscription/upgrade/
+    - path: /subscription/core-subscription/details/
-    title: Upgrade
+      title: Subscriptions and features
-  - path: /subscription/add-seats/
+    - path: /subscription/core-subscription/upgrade/
-    title: Add seats
+      title: Upgrade
-  - path: /subscription/remove-seats/
+    - path: /subscription/core-subscription/add-seats/
-    title: Remove seats
+      title: Add seats
-  - path: /subscription/downgrade/
+    - path: /subscription/core-subscription/remove-seats/
-    title: Downgrade
+      title: Remove seats
+    - path: /subscription/core-subscription/downgrade/
+      title: Downgrade
   - path: /subscription/desktop-license/
     title: Docker Desktop license agreement
   - path: /subscription/scout-details/