Add plans category

content/manuals/accounts/_index.md

@@ -2,7 +2,7 @@
 title: Docker accounts
 description: Learn how to create and manage your Docker account
 keywords: accounts, docker ID, account management, account settings, docker account, docker home
-weight: 30
+weight: 10
 params:
   sidebar:
     group: Platform

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

@@ -32,7 +32,7 @@ Before deactivating your Docker account, ensure you meet the following requireme
   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/change.md).
+- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/plans/docker.md#deactivate-or-downgrade).
 - 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.
 - If you linked a GitHub or Bitbucket account for automated builds, unlink it.

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

@@ -26,7 +26,7 @@ organization:
 
 - 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.
-- If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md).
+- If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/plans/docker.md#deactivate-or-downgrade).
 - Remove all other members within the organization.
 - Unlink your [GitHub and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account).
 - For Business organizations, [remove your SSO connection](/manuals/enterprise/security/single-sign-on/manage.md#delete-a-connection).

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

@@ -6,43 +6,43 @@ keywords: licenses, organization, members, Docker Core, Docker Offload, AI gover
 weight: 30
 ---
 
-Licenses let you selectively choose which of your organization members have access to supported Docker products. Organization owners can oversee who on their team has active licenses, or configure licenses to assign automatically when members access supported Docker products. Like Docker Core seats, licenses can be configured on a per member basis. 
+Licenses let you selectively choose which of your organization members have access to supported Docker products. Organization owners can oversee who on their team has active licenses, or configure licenses to assign automatically when members access supported Docker products. Like Docker Core seats, licenses can be configured on a per member basis.
 
 > [!TIP]
-> To learn more about product licenses, Docker Core seats, and other Docker add-ons see [scale your subscription](/manuals/subscription/scale.md), 
+> To learn more about product licenses, Docker Core seats, and other Docker add-ons see [Docker plans](/manuals/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.
 
 ## Manage licenses
 
-The **Members** page lets you track the number of available licenses for your organization and who currently holds a license. You can also assign or revoke licenses from this page. 
+The **Members** page lets you track the number of available licenses for your organization and who currently holds a license. You can also assign or revoke licenses from this page.
 
-To manage licenses for your organization: 
+To manage licenses for your organization:
 
 1. Sign in to [Docker Home](https://app.docker.com), then choose your organization.
 1. Select **Members** from the left navigation.
 1. Select the action menu at the end of the row to assign or revoke an active license.
-1. Optional. To bulk assign or revoke licenses, choose the members you want to bulk manage, then select the **Bulk actions** menu. 
-1. Optional. To manage automatic license assignment, turn off or turn on with the **Automatically assign licenses** toggle. 
+1. Optional. To bulk assign or revoke licenses, choose the members you want to bulk manage, then select the **Bulk actions** menu.
+1. Optional. To manage automatic license assignment, turn off or turn on with the **Automatically assign licenses** toggle.
 
 You must assign licenses manually, or configure automatic license assignment to consume a license. Inviting a new member to your organization consumes a seat or license if you select a product in **Licenses (optional)** during the [invite flow](/manuals/admin/organization/manage/members.md), but won't auto-assign product licenses by default. Conversely, purchasing a set of licenses won't trigger automatic assignment to existing members.
 
 ## Automatic license assignment
 
-Automatic license assignment gives members a product license when they use a supported product for the first time. Automatic license assignment is available for AI Governance licenses. Only organizations that purchase AI Governance can set up auto-assignment for Docker Core as well. 
+Automatic license assignment gives members a product license when they use a supported product for the first time. Automatic license assignment is available for AI Governance licenses. Only organizations that purchase AI Governance can set up auto-assignment for Docker Core as well.
 
-- When you purchase AI Governance, signing into [Docker Sandboxes](https://docs.docker.com/ai/sandboxes/) with `login` command in `sbx` CLI (`sbx login`) automatically provisions AI Governance licenses on a first-come, first served basis. 
+- When you purchase AI Governance, signing into [Docker Sandboxes](https://docs.docker.com/ai/sandboxes/) with `login` command in `sbx` CLI (`sbx login`) automatically provisions AI Governance licenses on a first-come, first served basis.
 - Similarly, logins to Docker Desktop will automatically provision Docker Core for AI Governance license-holding organizations that have available Docker Core seats.
-- Licenses are assigned until exhausted. 
-   - Once the available licenses are exhausted, automatic license assignment will stop until you purchase more licenses or revoke assigned licenses.
-   - Members can still use Docker Sandbox or Docker Desktop, but organization policies for those products won't affect their usage. 
+- Licenses are assigned until exhausted.
+  - Once the available licenses are exhausted, automatic license assignment will stop until you purchase more licenses or revoke assigned licenses.
+  - Members can still use Docker Sandbox or Docker Desktop, but organization policies for those products won't affect their usage.
 
 AI Governance licenses include single sign-on (SSO) and provisioning features regardless of your Docker Core subscription. Automatic license assignment requires [setting up SSO](/manuals/enterprise/security/single-sign-on/connect.md), then [provisioning](/manuals/enterprise/security/provisioning/_index.md) with System for Cross-domain Identity Management (SCIM) or Just-in-Time (JIT).
 
 ## What's next
 
 See these docs to explore Docker Core add-ons, or products that need licenses:
 
-- [Scale your subscription](/manuals/subscription/scale.md) to learn about different add-ons
+- [Docker plans](/manuals/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](/manuals/ai/sandboxes/governance/org.md) to set up organization policies for your organization members
 - [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

@@ -149,4 +149,4 @@ To view usage for Docker products:
   [Docker Offload usage and billing](/manuals/offload/usage.md).
 
 If your usage or seat count exceeds your subscription amount, you can
-[scale your subscription](../../../subscription/scale.md) to meet your needs.
+[add seats](./manage-seats.md) or [view available Docker plans](../../../subscription/plans/_index.md) to meet your needs.

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

@@ -73,13 +73,13 @@ receive your Docker subscription benefits.
 
 1. Identify the Docker users in your organization.
    - If your organization uses device management software, like MDM or Jamf,
-   you can use the device management software to help identify Docker users.
-   See your device management software's documentation for details. You can
-   identify Docker users by checking if Docker Desktop is installed at the
-   following location on each user's machine:
-      - Mac: `/Applications/Docker.app`
-      - Windows: `C:\Program Files\Docker\Docker`(all-user installation) or `%LOCALAPPDATA%\Programs\DockerDesktop` (per-user installation (Beta))
-      - Linux: `/opt/docker-desktop`
+     you can use the device management software to help identify Docker users.
+     See your device management software's documentation for details. You can
+     identify Docker users by checking if Docker Desktop is installed at the
+     following location on each user's machine:
+     - Mac: `/Applications/Docker.app`
+     - Windows: `C:\Program Files\Docker\Docker`(all-user installation) or `%LOCALAPPDATA%\Programs\DockerDesktop` (per-user installation (Beta))
+     - Linux: `/opt/docker-desktop`
    - If your organization doesn't use device management software or your
      users haven't installed Docker Desktop yet, you can survey your users to
      identify who is using Docker Desktop.
@@ -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 [Change your subscription](/manuals/subscription/change.md).
+subscription, see [Upgrade or downgrade a plan](/manuals/subscription/manage.md#upgrade-or-downgrade-a-plan).
 
 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

@@ -74,7 +74,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/change.md) 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/plans/docker.md#deactivate-or-downgrade) 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/billing/3d-secure.md

@@ -27,9 +27,9 @@ requirements.
 You may be asked to verify your identity when performing any of the following
 actions:
 
-- Starting a [paid subscription](../subscription/setup.md)
+- Starting a [paid subscription](../subscription/manage.md)
 - Changing your [billing cycle](/manuals/billing/cycle.md) from monthly to annual
-- [Upgrading your subscription](../subscription/change.md)
+- [Upgrading your subscription](../subscription/manage.md#upgrade-or-downgrade-a-plan)
 - [Adding seats](../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

@@ -3,7 +3,7 @@ title: Manage billing and payments
 linkTitle: Billing
 description: Find information about managing billing and payments for Docker subscriptions.
 keywords: billing, invoice, payment, subscription, Docker billing, update payment method, billing history, invoices, payment verification, tax exemption
-weight: 10
+weight: 30
 params:
   sidebar:
     group: Platform

content/manuals/billing/payment-method.md

@@ -66,7 +66,7 @@ To remove a single payment method:
 1. Find the payment method you want to remove from the **Payment method** table.
 1. Select the three dots, then choose **Remove**.
 
-To remove your default payment method, first set a different payment method as default, or [downgrade to a free subscription](/manuals/subscription/change.md).
+To remove your default payment method, first set a different payment method as default, or [downgrade to a free subscription](/manuals/subscription/plans/docker.md#deactivate-or-downgrade).
 
 ## Enable and disable pay by invoice
 

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

@@ -25,7 +25,7 @@ Any changes take effect immediately.
 Your subscription includes the following Build cache space:
 
 | Subscription | Build cache space |
-|--------------|-------------------|
+| ------------ | ----------------- |
 | Personal     | N/A               |
 | Pro          | 50GB              |
 | Team         | 100GB             |
@@ -43,16 +43,16 @@ two builders:
 > [!IMPORTANT]
 >
 > If you only build for one architecture, be aware that your effective cache
-space is half of your subscription's total allocation.
+> space is half of your subscription's total allocation.
 
 ### Get more build cache space
 
-To get more Build cache space, [upgrade your subscription](/manuals/subscription/scale.md).
+To get more Build cache space, [upgrade your subscription](/manuals/subscription/manage.md#upgrade-or-downgrade-a-plan).
 
 > [!TIP]
 >
 > If you build large images, consider allocating less storage for caching to
-leave more space for active builds.
+> leave more space for active builds.
 
 ## Private resource access
 

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 Select](../../subscription/scale.md#add-dhi-select-to-organization-accounts).
+    or [learn more about DHI plans](../../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

@@ -162,7 +162,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//change.md).
+- 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).
 
 ## 2021-08-31
 
@@ -308,7 +308,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically
 
 ### Enhancements
 
-- The [billing page](../subscription/change.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/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/change.md#upgrade-your-subscription) your Docker
+  [upgrade](../subscription/manage.md#upgrade-or-downgrade-a-plan) 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.
@@ -79,4 +79,4 @@ Unexpected status code 500
 1. View the [Docker System Status Page](https://www.dockerstatus.com/) and
    verify that all services are operational.
 2. Try accessing Docker Hub again. It may be a temporary issue.
-3. [Contact Docker Support](https://www.docker.com/support/) to report the issue.
+3. [Contact Docker Support](https://www.docker.com/support/) to report the issue.

content/manuals/subscription/_index.md

@@ -1,37 +1,33 @@
 ---
-title: Subscription overview
+title: Plans overview
 linkTitle: Subscription
 description: Learn about Docker plans, like how to subscribe to product-based plans and how they apply to personal and organization accounts.
 keywords:
   docker subscription, pricing, billing, subscription types, subscription
   plans, docker hardened images, gordon, cloud sandboxes, subscription
   management
-weight: 30
+weight: 20
 params:
   sidebar:
     group: Platform
 grid_subscriptions:
-  - title: Compare Docker subscriptions
-    description: Visit the pricing page to see what's included in different Docker subscriptions.
+  - title: Compare Docker plans
+    description: Visit the pricing page to see what's included in different Docker plans.
     link: "https://www.docker.com/pricing?ref=Docs&refAction=DocsSubscription"
     icon: magnifying-glass
   - title: Set up your plan
-    description: Get started setting up a personal or organization subscription.
-    link: /subscription/setup/
+    description: Get started setting up a personal or organization plan.
+    link: /subscription/manage/
     icon: shopping-cart
-  - title: Scale your subscription
-    description: Add plans to your Docker account that fit your needs.
-    link: /subscription/scale/
+  - title: Explore plans
+    description: Browse available Docker plans and add-ons for individuals, teams, and organizations.
+    link: /subscription/plans/
     icon: chart-bar
-  - title: Upgrade Docker plans for accounts
-    description: Learn how to upgrade or downgrade your Docker plan.
-    link: /subscription/change/
-    icon: arrow-up-circle
   - title: Docker Desktop license agreement
     description: Review the terms of the Docker Subscription Service Agreement.
     link: /subscription/desktop-license/
     icon: document-text
-  - title: Subscription FAQs
+  - title: Plan FAQs
     description: Find the answers you need and explore common questions.
     link: /subscription/faq/
     icon: question-mark-circle
@@ -54,7 +50,7 @@ You can subscribe to plans for individual or organization accounts, or plans for
 | [Gordon](/ai/gordon/)                          | Prepaid usage for the Gordon AI agent                     | Gordon Plus, Gordon Max, Gordon Ultra     |
 | [AI Governance](/ai/sandboxes/governance/org/) | Purchase set amount of licenses                           | AI Governance                             |
 
-Docker plans that upgrade your account (Docker Pro or Docker Team and Business) can provide a foundation for most use cases. Some product plans may require an upgraded Docker account while other product plans let you subscribe without an upgraded account. To learn more, see [Scale your subscription](/manuals/subscription/scale.md). 
+Docker plans that upgrade your account (Docker Pro or Docker Team and Business) can provide a foundation for most use cases. Some product plans may require an upgraded Docker account while other product plans let you subscribe without an upgraded account. To learn more, see [Docker plans](/manuals/subscription/plans/_index.md).
 
 To subscribe to a plan, you can self-serve through **Billing** in [Docker Home](https://app.docker.com), or contact sales.