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/admin-set-up/_index.md

@@ -22,10 +22,8 @@ params:
       url: /security/for-admins/hardened-desktop/registry-access-management/
     - title: Image Access Management
       url: /security/for-admins/hardened-desktop/image-access-management/
-    - title: Docker Build Cloud subscription information
-      url: /subscription/build-cloud/build-details/
-    - title: Docker Scout subscription information
-      url: /subscription/scout-details/
+    - title: Docker subscription information
+      url: /subscription/details/
 ---
 
 Docker's tools provide a scalable, secure platform that empowers your developers to create, ship, and run applications faster. As an administrator, you have the ability to streamline workflows, standardize development environments, and ensure smooth deployments across your organization.

content/guides/admin-set-up/comms-and-info-gathering.md

@@ -24,7 +24,7 @@ Some companies may have more than one [Docker organization](/manuals/admin/organ
 
 ## Step three: Gather requirements
 
-Through [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md), Docker provides numerous configuration parameters that can be preset. The Docker organization owner, development lead, and infosec representative should review these settings to establish the company’s baseline configuration, including security features and [enforcing sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for Docker Desktop users. Additionally, they should decide whether to take advantage of free trials for other Docker products, such as [Docker Scout](/manuals/scout/_index.md), which is included in the subscription.
+Through [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/_index.md), Docker provides numerous configuration parameters that can be preset. The Docker organization owner, development lead, and infosec representative should review these settings to establish the company’s baseline configuration, including security features and [enforcing sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md) for Docker Desktop users. Additionally, they should decide whether to take advantage of other Docker products, such as [Docker Scout](/manuals/scout/_index.md), which is included in the subscription.
 
 To view the parameters that can be preset, see [Configure Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/configure.md#step-two-configure-the-settings-you-want-to-lock-in).
 

content/guides/admin-set-up/finalize-plans-and-setup.md

@@ -26,7 +26,7 @@ Single sign-on (SSO) lets developers authenticate using their identity providers
 
 You can also enable [SCIM](/manuals/security/for-admins/provisioning/scim.md) for further automation of provisioning and deprovisioning of users.
 
-### Set up free tier Docker product entitlements included in the subscription
+### Set up Docker product entitlements included in the subscription
 
 [Docker Build Cloud](/manuals/build-cloud/_index.md) significantly reduces build times, both locally and in CI, by providing a dedicated remote builder and shared cache. Powered by the cloud, developer time and local resources are freed up so your team can focus on more important things, like innovation. To get started, [set up a cloud builder](http://build.docker.com). 
 

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

@@ -38,12 +38,11 @@ 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.
+account and start a trial of Build Cloud. 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.
 
 ### 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

@@ -15,7 +15,7 @@ Your Docker ID becomes your username for hosted Docker services, and [Docker for
 
 > [!TIP]
 >
-> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. 
+> Explore [Docker's subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. 
 
 ## Create a Docker ID