add docker consolidated subscriptions

Signed-off-by: Craig <craig.osterhout@docker.com>

content/_index.md

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

content/guides/docker-build-cloud/_index.md

@@ -21,7 +21,7 @@ params:
     - title: Docker Build Cloud overview
       url: /build-cloud/
     - title: Subscriptions and features
-      url: /subscription/build-cloud/build-details/
+      url: /subscription/details/
     - title: Using Docker Build Cloud
       url: /build-cloud/usage/
 ---

content/guides/docker-build-cloud/common-questions.md

@@ -43,10 +43,6 @@ for a total of 1400 minutes per month.
 Docker subscribers (Pro, Team, Business) receive a set number of minutes each
 month, shared across the account, to use Build Cloud.
 
-If you do not have a Docker subscription, you may sign up for a free Personal
-account and get 50 minutes per month. Personal accounts are limited to a single
-user.
-
 For teams to receive the shared cache benefit, they must either be on a Docker
 Team, Docker Business, or paid Build Cloud Team plan. You may buy a month of
 Build Cloud Team for the number of seats testing.

content/includes/tax-compliance.md

@@ -2,4 +2,4 @@
 >
 > Starting July 1, 2024, Docker will begin collecting sales tax on subscription fees in compliance with state regulations for customers in the United States. For our global customers subject to VAT, the implementation will start rolling out on July 1, 2024. Note that while the rollout begins on this date, VAT charges may not apply to all applicable subscriptions immediately.
 >
-> To ensure that tax assessments are correct, make sure that your [billing information](/billing/core-billing/details/) and VAT/Tax ID, if applicable, are updated. If you're exempt from sales tax, see [Register a tax certificate](/billing/tax-certificate/).
+> To ensure that tax assessments are correct, make sure that your [billing information](/billing/details/) and VAT/Tax ID, if applicable, are updated. If you're exempt from sales tax, see [Register a tax certificate](/billing/tax-certificate/).

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

@@ -24,11 +24,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/core-subscription/downgrade.md).
-
-- If you have an active Docker Build Cloud Paid subscription, [downgrade it to a Docker Build Cloud Starter subscription](../billing/build-billing.md#downgrade-your-subscription).
-
-- If you have an active Docker Scout subscription, [downgrade it to a Docker Scout Free subscription](../billing/scout-billing.md#downgrade-your-subscription).
+- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/change.md).
 
 - Download any images and tags you want to keep. Use `docker pull -a <image>:<tag>`.
 

content/manuals/admin/company/organizations.md

@@ -16,7 +16,7 @@ You can manage the organizations in a company in the Docker Admin Console.
 
 ## Add seats to an organization
 
-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.
+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.
 
 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/manuals/admin/deactivate-account.md

@@ -19,9 +19,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 free 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).
+- If you have an active Docker subscription, [downgrade it to a free subscription](../subscription/change.md).
 
 - Remove all other members within the organization.
 

content/manuals/admin/faqs/organization-faqs.md

@@ -48,7 +48,7 @@ revert it to a personal user account. For prerequisites and instructions, see
 
 There isn't any automatic notification when the total number of users for the requested licenses has been met. However, if the number of team
 members exceed the number of licenses, you will receive an error informing you
-to contact the administrator due to lack of seats. You can [add seats](/subscription/core-subscription/add-seats/) if needed.
+to contact the administrator due to lack of seats. You can [add seats](../../subscription/manage-seats.md) if needed.
 
 ### How can I merge organization accounts?
 

content/manuals/admin/organization/insights.md

@@ -11,8 +11,7 @@ is only available to those in the early access feedback program.
 {{% /restricted %}}
 
 > [!NOTE]
-> Insights requires a [Docker Business
-> subscription](/subscription/core-subscription/details/#docker-business) and
+> Insights requires a [Docker Business subscription](../../subscription/details.md#docker-business) and
 > administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/)
 > to ensure that users sign in with an account associated with their
 > organization.
@@ -49,12 +48,14 @@ Key benefits include:
 
 You can view data in the following charts:
 
- * [Docker Desktop users](#docker-desktop-users)
- * [Builds](#builds)
- * [Containers](#containers)
- * [Docker Desktop usage](#docker-desktop-usage)
- * [Docker Hub images](#docker-hub-images)
- * [Extensions](#extensions)
+- [View Insights for organization users](#view-insights-for-organization-users)
+  - [Docker Desktop users](#docker-desktop-users)
+  - [Builds](#builds)
+  - [Containers](#containers)
+  - [Docker Desktop usage](#docker-desktop-usage)
+  - [Docker Hub images](#docker-hub-images)
+  - [Extensions](#extensions)
+- [Troubleshoot Insights](#troubleshoot-insights)
 
 ### Docker Desktop users
 

content/manuals/admin/organization/onboard.md

@@ -15,7 +15,7 @@ aliases:
 
 Learn how to onboard your organization using Docker Hub or the Docker Admin Console.
 
-Onboarding your organization lets you gain visibility into the activity of your users and enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits. For more details, see [Docker subscriptions and features](/subscription/core-subscription/details/).
+Onboarding your organization lets you gain visibility into the activity of your users and enforce security settings. In addition, members of your organization receive increased pull limits and other organization wide benefits. For more details, see [Docker subscriptions and features](../../subscription/details.md).
 
 In this guide, you'll learn how to get started with the following:
 
@@ -81,8 +81,7 @@ You can manage your members in your identity provider and automatically provisio
 
 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/core-subscription/details/) and they can circumvent
+receive the [benefits of your organization’s subscription](../../subscription/details.md) and they can circumvent
 [Docker’s security features](/security/for-admins/hardened-desktop/) for your
 organization.
 

content/manuals/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](/accounts/create-account/).
-- Review the [Docker subscriptions and features](../../subscription/core-subscription/details.md) to determine what plan to choose for your organization.
+- Review the [Docker subscriptions and features](../../subscription/details.md) to determine what plan to choose for your organization.
 
 ## Create an organization
 
@@ -104,21 +104,20 @@ 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/core-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/history.md).
 
 ## Merge organizations
 
 If you have multiple organizations that you want to merge into one, complete the following:
 
-1. Based on the number of seats from the secondary organization, [purchase additional seats](../../subscription/core-subscription/add-seats.md) for the primary organization account that you want to keep.
+1. Based on the number of seats from the secondary organization, [purchase additional seats](../../subscription/manage-seats.md) for the primary organization account that you want to keep.
 2. Manually add users to the primary organization and remove existing users from the secondary organization.
 3. Manually move over your data, including all repositories.
-4. Once you're done moving all of your users and data, [downgrade](../../subscription/core-subscription/downgrade.md) the secondary account to a free subscription.
+4. Once you're done moving all of your users and data, [downgrade](../../subscription/change.md) the secondary account to a free subscription.
 
 > [!TIP]
 >
-> If your organization has a Docker Core Business subscription with a purchase order, contact Support or your Account Manager at Docker.
->
+> If your organization has a Docker Business subscription with a purchase order, contact Support or your Account Manager at Docker.
 
 ## More resources
 

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

@@ -7,16 +7,16 @@ weight: 40
 
 > [!NOTE]
 >
-> [Docker Core subscription](/billing/core-billing/get-started-core/) payments support 3D secure authentication.
+> [Docker subscription](../subscription/setup.md) payments support 3D secure authentication.
 
 3D Secure (3DS) authentication incorporates an additional security layer for credit card transactions. If you’re making payments for your Docker billing in a region that requires 3DS, or using a payment method that requires 3DS, you’ll need to verify your identity to complete any transactions. The method used to verify your identity varies depending on your banking institution.
 
 The following transactions will use 3DS authentication if your payment method requires it.
 
-- Starting a [new paid subscription](/billing/core-billing/get-started-core/)
-- Changing your [billing cycle](/billing/core-billing/cycle/) from monthly to annual
-- [Upgrading your subscription](/subscription/core-subscription/upgrade/)
-- [Adding seats](/subscription/core-subscription/add-seats/) to an existing subscription
+- Starting a [new paid subscription](../subscription/setup.md)
+- Changing your [billing cycle](/billing/cycle/) from monthly to annual
+- [Upgrading your subscription](../subscription/change.md)
+- [Adding seats](../subscription/manage-seats.md) to an existing subscription
 
 ## Troubleshooting
 

content/manuals/billing/_index.md

@@ -5,32 +5,18 @@ weight: 200
 description: Discover information on billing and payment processes for Docker subscriptions.
 keywords: billing, invoice, payment, subscription
 grid_core:
-- title: Get started
-  description: Learn how to set up a Docker Core subscription for a personal account or organization.
-  link: /billing/core-billing/get-started-core/
-  icon: shopping_cart
 - 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/core-billing/payment-method/
+  link: /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/core-billing/details/
+  link: /billing/details/
   icon: contract_edit
 - title: View billing history
   description: Learn how to view billing history and download past invoices.
-  link: /billing/core-billing/history/
+  link: /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/
-  icon: query_stats
-- title: Docker Build Cloud billing
-  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/
@@ -47,14 +33,7 @@ grid_resources:
 
 Use the resources in this section to manage your billing and payment settings for your Docker subscriptions.
 
-## Docker Core
 
 {{< grid items="grid_core" >}}
 
-## Docker products
 
-{{< grid items="grid_products" >}}
-
-## Resources
-
-{{< grid items="grid_resources" >}}