docs: merge Subscription and Billing into one Platform section

.github/CODEOWNERS

@@ -25,14 +25,12 @@
 
 /content/reference/cli/ @dvdksn
 
-/content/manuals/subscription/ @sarahsanders-docker
+/content/manuals/subscription-billing/ @sarahsanders-docker
 
 /content/manuals/security/ @aevesdocker @sarahsanders-docker
 
 /content/manuals/admin/ @sarahsanders-docker
 
-/content/manuals/billing/ @sarahsanders-docker
-
 /content/manuals/accounts/ @sarahsanders-docker
 
 /content/manuals/ai/ @dvdksn

.github/labeler.yml

@@ -143,12 +143,12 @@ area/scout:
 area/billing:
   - changed-files:
       - any-glob-to-any-file:
-          - content/manuals/billing/**
+          - content/manuals/subscription-billing/**
 
 area/subscription:
   - changed-files:
       - any-glob-to-any-file:
-          - content/manuals/subscription/**
+          - content/manuals/subscription-billing/**
 
 area/admin:
   - changed-files:

content/manuals/_index.md

@@ -83,10 +83,10 @@ params:
     description: Centralized observability for companies and organizations.
     icon: shield-check
     link: /admin/
-  - title: Billing
-    description: Manage billing and payment methods.
+  - title: Subscription and billing
+    description: Manage Docker subscriptions, plans, billing, and payments.
     icon: credit-card
-    link: /billing/
+    link: /subscription-billing/
   - title: Accounts
     description: Manage your Docker account.
     icon: user-circle
@@ -95,10 +95,6 @@ params:
     description: Security guardrails for both administrators and developers.
     icon: lock-closed
     link: /security/
-  - title: Subscription
-    description: Commercial use licenses for Docker products.
-    icon: credit-card
-    link: /subscription/
   enterprise:
   - title: Deploy Docker Desktop
     description: Deploy Docker Desktop at scale within your company

content/manuals/accounts/deactivate-user-account.md

@@ -38,7 +38,7 @@ requirements:
   and then remove yourself, or deactivate the company.
 - If you have an active Docker subscription,
   [downgrade it to a Docker Personal
-  subscription](/manuals/subscription/plans/docker.md#cancel-a-docker-plan).
+  subscription](/manuals/subscription-billing/subscription/plans/docker.md#cancel-a-docker-plan).
 - Download any images and tags you want to keep. Use
   `docker pull -a <image>` to pull all tags, or `docker pull <image>:<tag>`
   to pull a specific tag.

content/manuals/admin/organization/deactivate-account.md

@@ -32,7 +32,7 @@ organization:
   to pull all tags, or `docker pull <image>:<tag>` to pull a specific tag.
 - If you have an active Docker subscription, [downgrade it to a basic
   organization
-  account](/manuals/subscription/plans/docker.md#cancel-a-docker-plan).
+  account](/manuals/subscription-billing/subscription/plans/docker.md#cancel-a-docker-plan).
 - Remove all other members within the organization.
 - Unlink your [GitHub and Bitbucket
   accounts](/manuals/docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account).

content/manuals/admin/organization/manage/_index.md

@@ -20,7 +20,7 @@ grid:
   - title: Billing
     description: Manage payment methods and view billing history.
     icon: credit-card
-    link: /billing/
+    link: /subscription-billing/billing/
 ---
 
 As an organization owner, you manage your organization's membership, access,

content/manuals/admin/organization/manage/manage-licenses.md

@@ -13,7 +13,7 @@ products.
 
 > [!TIP]
 > To learn more about product licenses, Docker Core seats, and other Docker
-> add-ons, see [Docker plans](/manuals/subscription/plans/_index.md),
+> add-ons, see [Docker plans](/manuals/subscription-billing/subscription/plans/_index.md),
 > or
 > <a href="https://www.docker.com/pricing/contact-sales/" id="dkr_docs_cs_admin_licenses" class="link" rel="noopener">contact sales</a>
 > to purchase licenses.
@@ -114,11 +114,11 @@ To manage licenses for your organization:
 
 Explore Docker Core add-ons and products that need licenses:
 
-- [Docker plans](/manuals/subscription/plans/_index.md) to learn about different
+- [Docker plans](/manuals/subscription-billing/subscription/plans/_index.md) to learn about different
   add-ons
 - [Manage seats](/manuals/admin/organization/manage/manage-seats.md) to add more
   seats to your Docker Core subscription
-- [AI Governance plan](/manuals/subscription/plans/ai-governance.md) to learn
+- [AI Governance plan](/manuals/subscription-billing/subscription/plans/ai-governance.md) to learn
   about AI Governance license usage and billing
 - [Docker Offload](/manuals/offload/about.md) to let your developers offload
   building and running containers to the cloud

content/manuals/admin/organization/manage/manage-products.md

@@ -140,7 +140,7 @@ following table to learn where you can monitor organization usage:
 | Docker Offload       | From [Docker Home](https://app.docker.com/), select **Offload**, then **Offload activity**. See [Docker Offload usage and billing](../../../offload/usage.md) for more details.                  |
 
 If your usage or seat count exceeds your subscription amount, you can
-[add seats](./manage-seats.md) or [view available Docker plans](../../../subscription/plans/_index.md) to meet your needs.
+[add seats](./manage-seats.md) or [view available Docker plans](../../../subscription-billing/subscription/plans/_index.md) to meet your needs.
 
 ## Next steps
 

content/manuals/admin/organization/setup/onboard.md

@@ -122,7 +122,7 @@ For more details, see [Invite members](/manuals/admin/organization/manage/member
 
 Configuring SSO and SCIM is optional and only available to Docker Business
 subscribers. To upgrade a Docker Team subscription to a Docker Business
-subscription, see [Upgrade a plan](/manuals/subscription/manage.md#upgrade-plans).
+subscription, see [Upgrade a plan](/manuals/subscription-billing/subscription/manage.md#upgrade-plans).
 
 Use your identity provider (IdP) to manage members and provision them to Docker
 automatically via SSO and SCIM. See the following for more details:

content/manuals/admin/organization/setup/orgs.md

@@ -71,7 +71,7 @@ the following steps:
 1. Based on the number of seats from the secondary organization, [purchase additional seats](../manage/manage-seats.md) for the primary organization account that you want to keep.
 1. Manually add users to the primary organization and remove existing users from the secondary organization.
 1. Manually move over your data, including all repositories.
-1. Once you're done moving all of your users and data, [downgrade](../../../subscription/plans/docker.md#cancel-a-docker-plan) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle.
+1. Once you're done moving all of your users and data, [downgrade](../../../subscription-billing/subscription/plans/docker.md#cancel-a-docker-plan) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle.
 
 If your organization has a Docker Business subscription with a purchase
 order, contact Support or your Account Manager at Docker.

content/manuals/agentic-platform/_index.md

@@ -65,6 +65,6 @@ Account-level configuration can be reused across sandboxes:
 
 To begin, open [Docker Agentic Platform](https://agentic-platform.docker.com/)
 and sign in with your Docker account. Docker meters sandbox compute per second.
-For account and payment information, see [Docker Billing](/billing/).
+For account and payment information, see [Docker Billing](/subscription-billing/billing/).
 
 {{< grid >}}

content/manuals/agentic-platform/faq.md

@@ -49,7 +49,7 @@ also shows the equivalent hourly rate.
 
 Model inference is billed separately. The sandbox uses your credential for an
 external model provider, which meters and bills inference under that provider
-account. See [Docker Billing](/billing/) for account, usage, and payment
+account. See [Docker Billing](/subscription-billing/billing/) for account, usage, and payment
 information.
 
 ## How long are logs, telemetry, and snapshots retained?

content/manuals/agentic-platform/sandboxes.md

@@ -62,7 +62,7 @@ when the sandbox is created and cannot be changed while it runs.
 
 Docker bills sandbox compute per second while the sandbox runs. Model inference
 uses your external provider credential and is metered by that provider. For
-account, usage, and payment information, see [Docker Billing](/billing/).
+account, usage, and payment information, see [Docker Billing](/subscription-billing/billing/).
 
 ## Check sandbox configuration
 

content/manuals/ai/sandboxes/governance/audit/_index.md

@@ -29,7 +29,7 @@ don't send audit data to audit logs.
 
 To use AI Governance Audit Logs, your organization needs:
 
-- A Docker [AI Governance plan](/manuals/subscription/plans/ai-governance.md)
+- A Docker [AI Governance plan](/manuals/subscription-billing/subscription/plans/ai-governance.md)
 - An enforced organization governance policy
 - A Docker organization account
 - An organization owner, or a user with a [custom role](/manuals/enterprise/security/roles-and-permissions/custom-roles/_index.md) that includes AI Governance audit permissions, to configure delivery and view hosted events

content/manuals/ai/sandboxes/governance/audit/configure.md

@@ -19,7 +19,7 @@ together:
 
 Your organization needs:
 
-- A Docker [AI Governance plan](/manuals/subscription/plans/ai-governance.md)
+- A Docker [AI Governance plan](/manuals/subscription-billing/subscription/plans/ai-governance.md)
 - An enforced organization governance policy
 - Organization owner access, or a [custom role](/manuals/enterprise/security/roles-and-permissions/custom-roles/_index.md) with AI Governance audit permissions
 

content/manuals/build-cloud/builder-settings.md

@@ -47,7 +47,7 @@ two builders:
 
 ### Get more build cache space
 
-To get more Build cache space, [upgrade your subscription](/manuals/subscription/manage.md#upgrade-plans).
+To get more Build cache space, [upgrade your subscription](/manuals/subscription-billing/subscription/manage.md#upgrade-plans).
 
 > [!TIP]
 >

content/manuals/desktop/release-notes.md

@@ -5262,7 +5262,7 @@ The updated [Docker Subscription Service Agreement](https://www.docker.com/legal
 - **No changes** to Docker Engine or any other upstream **open source** Docker or Moby project.
 
 To understand how these changes affect you, read the [FAQs](https://www.docker.com/pricing/faq).
-For more information, see [Docker subscription overview](../subscription/_index.md).
+For more information, see [Docker subscription overview](../subscription-billing/subscription/_index.md).
 
 ### Upgrades
 

content/manuals/dhi/how-to/select-enterprise.md

@@ -20,7 +20,7 @@ To use this workflow, you need:
 - One of the following:
   - A DHI Select or Enterprise subscription. [Contact Docker
     sales](https://www.docker.com/products/hardened-images/#compare) to purchase DHI Enterprise
-    or [learn more about DHI plans](../../subscription/plans/dhi.md).
+    or [learn more about DHI plans](../../subscription-billing/subscription/plans/dhi.md).
   - An active DHI trial. [Start a free DHI
     trial](https://hub.docker.com/hardened-images/start-free-trial).
 - [Docker Desktop](../../desktop/release-notes.md) 4.65 or later to use the

content/manuals/docker-hub/release-notes.md

@@ -182,7 +182,7 @@ known issues for each Docker Hub release.
 
 ### New
 
-- You can now purchase or upgrade to a Docker Business subscription using a credit card. To learn more, see [Upgrade your subscription](../subscription/plans/docker.md).
+- You can now purchase or upgrade to a Docker Business subscription using a credit card. To learn more, see [Upgrade your subscription](../subscription-billing/subscription/plans/docker.md).
 
 ## 2021-08-31
 
@@ -199,7 +199,7 @@ The updated [Docker Subscription Service Agreement](https://www.docker.com/legal
 - The existing Docker Free subscription has been renamed **Docker Personal**.
 - **No changes** to Docker Engine or any other upstream **open source** Docker or Moby project.
 
-  To understand how these changes affect you, read the [FAQs](https://www.docker.com/pricing/faq). For more information, see [Docker subscription overview](../subscription/_index.md).
+  To understand how these changes affect you, read the [FAQs](https://www.docker.com/pricing/faq). For more information, see [Docker subscription overview](../subscription-billing/subscription/_index.md).
 
 ## 2021-05-05
 
@@ -223,7 +223,7 @@ You can now specify any email address to receive billing-related emails for your
 
 To change the email address receiving billing-related emails, log into Docker Hub and navigate to the **Billing** tab of your organization. Select **Payment Methods** > **Billing Information**. Enter the new email address that you'd like to use in the **Email** field. Click **Update** for the changes to take effect.
 
-For details on how to update your billing information, see [Update billing information](../billing/_index.md).
+For details on how to update your billing information, see [Update billing information](../subscription-billing/billing/_index.md).
 
 ## 2021-03-22
 
@@ -257,7 +257,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically
 
 ### New features
 
-- Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/concurrent autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription/_index.md).
+- Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/concurrent autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription-billing/subscription/_index.md).
 
 - Docker has enabled download rate limits for downloads and pull requests on Docker Hub. This caps the number of objects that users can download within a specified timeframe. For more information, see [Usage and limits](/manuals/docker-hub/usage/_index.md).
 
@@ -328,7 +328,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically
 
 ### Enhancements
 
-- The [billing page](../subscription/plans/docker.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-billing/subscription/plans/docker.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/manuals/docker-hub/troubleshoot.md

@@ -33,7 +33,7 @@ You have reached your pull rate limit. You may increase the limit by authenticat
 You can use one of the following solutions:
 
 - [Authenticate](./usage/pulls.md#authentication) or
-  [upgrade](../subscription/manage.md#upgrade-plans) your Docker
+  [upgrade](../subscription-billing/subscription/manage.md#upgrade-plans) your Docker
   account.
 - [View your pull rate limit](./usage/pulls.md#view-hourly-pull-rate-and-limit),
   wait until your pull rate limit decreases, and then try again.

content/manuals/scout/_index.md

@@ -38,7 +38,7 @@ grid:
       Ensure that your artifacts align with supply chain best practices.
     icon: shield-check
   - title: Upgrade
-    link: /subscription/change/
+    link: /subscription-billing/subscription/manage/
     description: |
       A Personal subscription includes up to 1 repository. Upgrade for more.
     icon: arrow-up-circle

content/manuals/subscription-billing/_index.md

@@ -0,0 +1,16 @@
+---
+title: Subscription and billing
+linkTitle: Subscription and billing
+description: Manage Docker subscriptions, plans, billing, and payments.
+keywords: subscription, billing, docker plans, payments, invoices, pricing
+weight: 20
+params:
+  sidebar:
+    group: Platform
+aliases:
+  - /subscription/
+  - /billing/
+  - /docker-hub/billing/
+  - /docker-hub/billing/faq/
+  - /billing/docker-hub-pricing/
+---

content/manuals/billing/3d-secure.md → content/manuals/subscription-billing/billing/3d-secure.md

@@ -4,6 +4,8 @@ linkTitle: 3D Secure
 description: Learn how 3D Secure authentication works for Docker subscription payments and how to troubleshoot verification issues.
 keywords: billing, payments, subscriptions, 3D Secure, 3DS, credit card verification, payment authentication
 weight: 30
+aliases:
+  - /billing/3d-secure/
 ---
 
 Docker supports 3D Secure (3DS), an extra layer of authentication required
@@ -27,10 +29,10 @@ requirements.
 You may be asked to verify your identity when performing any of the following
 actions:
 
-- Starting a [paid subscription](../subscription/manage.md)
-- Changing your [billing cycle](/manuals/billing/details.md#billing-cycle) from monthly to annual
-- [Upgrading your subscription](../subscription/manage.md#upgrade-plans)
-- [Adding seats](../admin/organization/manage/manage-seats.md) to an existing
+- Starting a [paid subscription](/manuals/subscription-billing/subscription/manage.md)
+- Changing your [billing cycle](/manuals/subscription-billing/billing/details.md#billing-cycle) from monthly to annual
+- [Upgrading your subscription](/manuals/subscription-billing/subscription/manage.md#upgrade-plans)
+- [Adding seats](/manuals/admin/organization/manage/manage-seats.md) to an existing
   subscription
 
 If 3DS is required and your payment method supports it, the verification prompt

content/manuals/billing/_index.md → content/manuals/subscription-billing/billing/_index.md

@@ -8,33 +8,28 @@ keywords:
   billing, invoice, payment, subscription, Docker billing, update payment
   method, billing history, invoices, payment verification, tax exemption,
   usage, costs, credits, metered billing
-weight: 30
-params:
-  sidebar:
-    group: Platform
+weight: 20
 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: /subscription-billing/billing/payment-method/
     icon: credit-card
   - title: Update billing information
     description: Learn how to update billing information for your personal account or organization.
-    link: /billing/details/
+    link: /subscription-billing/billing/details/
     icon: pencil-square
   - title: View billing history
     description: Learn how to view billing history and download past invoices.
-    link: /billing/history/
+    link: /subscription-billing/billing/history/
     icon: credit-card
   - title: 3D Secure authentication
     description: Learn how 3DS works and how to troubleshoot verification issues.
-    link: /billing/3d-secure/
+    link: /subscription-billing/billing/3d-secure/
     icon: wallet
   - title: Taxes
     description: Learn how to submit a US tax exemption certificate or add a VAT number.
-    link: /billing/tax-certificate/
+    link: /subscription-billing/billing/tax-certificate/
     icon: document-text
-aliases:
-  - /billing/docker-hub-pricing/
 ---
 
 You can use the billing portal to manage your Docker subscriptions, such
@@ -72,8 +67,8 @@ from this page.
 
 Your invoice history is a reference to the Docker plans you subscribe
 to. For information about your billing cycle and renewal dates, see
-[Billing cycle](/manuals/billing/details.md#billing-cycle). To upgrade or add
-a new plan, see [Subscription](/manuals/subscription/_index.md).
+[Billing cycle](/manuals/subscription-billing/billing/details.md#billing-cycle). To upgrade or add
+a new plan, see [Subscription](/manuals/subscription-billing/subscription/_index.md).
 
 ## Next steps
 

content/manuals/billing/details.md → content/manuals/subscription-billing/billing/details.md

@@ -5,6 +5,7 @@ weight: 40
 description: Learn how to update billing details, like contact information, addresses, and notification email for Docker subscriptions.
 keywords: payments, billing, subscription, invoices, update billing email, change billing address, Docker billing account
 aliases:
+  - /billing/details/
   - /billing/cycle/
 ---
 
@@ -22,7 +23,7 @@ To update your billing information from **Settings** in Docker Home:
 1. Select **Edit** to make your changes.
 1. Verify your information, then select **Save as default**.
 
-For more information on changing your default payment method, see [Change default payment method](/manuals/billing/payment-method.md#change-default-payment-method).
+For more information on changing your default payment method, see [Change default payment method](/manuals/subscription-billing/billing/payment-method.md#change-default-payment-method).
 
 ## Billing notifications
 
@@ -37,4 +38,4 @@ to the billing account's email address. These communications include:
 
 Billing cycles are defined on a per-plan basis. Depending on the product you
 subscribe to, your cycle can be monthly, annual, or another cadence. For
-plan-specific billing cycle details, see [Plans](/manuals/subscription/plans/_index.md).
+plan-specific billing cycle details, see [Plans](/manuals/subscription-billing/subscription/plans/_index.md).