add docker consolidated subscriptions

Signed-off-by: Craig <[email protected]>

Author: craig-osterhout

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

@@ -28,28 +28,14 @@ Build Cloud.
 Docker Compose works out of the box with Docker Build Cloud. Install the Docker
 Build Cloud-compatible client (buildx) and it works with both commands.
 
-### How many minutes are included in Docker Build Cloud Team plans?
-
-You receive 200 minutes per month per purchased seat. If you are also a Docker
-subscriber (Personal, Pro, Team, Business), you will also receive your included
-build minutes from that plan.
-
-For example, if a Docker Team customer purchases 5 Build Cloud Team seats, they
-will have 400 minutes from their Docker Team plan plus 1000 minutes (200 min/mo * 5 seats) 
-for a total of 1400 minutes per month.
-
-### I’m a Docker personal user. Can I try Docker Build Cloud?
+### I’m a Docker Personal user. Can I try Docker Build Cloud?
 
 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.
+Team, or Docker Business plan. Docker Personal users may start a trial of Build
+Cloud.
 
 ### Does Docker Build Cloud support CI platforms? Does it work with GitHub Actions?
 

content/includes/hub-limits.md

@@ -0,0 +1,8 @@
+---
+---
+
+> [!NOTE]
+>
+> The Docker Hub plan limits will take effect on Feb 1, 2025. No charges on
+> Docker Hub image pulls or storage will be incurred between November 15, 2024,
+> and January 31, 2025.

content/includes/new-plans.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/includes/tax-compliance.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, you must assign the owner role to another member of the organization 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/accounts/deactivate-user-account.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/company/organizations.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/deactivate-account.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?