add docker consolidated subscriptions

_vale/Docker/Acronyms.yml

@@ -37,6 +37,7 @@ exceptions:
   - ELK
   - FAQ
   - FUSE
+  - GB
   - GCC
   - GDB
   - GET

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

@@ -23,10 +23,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-json-file.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 @@
 
 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](https://app.docker.com/build/). 
 

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

@@ -20,7 +20,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 Docker 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 March 1, 2025. No charges on
+> Docker Hub image pulls or storage will be incurred between December 10, 2024,
+> and February 28, 2025.

content/includes/tax-compliance.md

@@ -1,5 +1,5 @@
 > [!IMPORTANT]
 >
-> 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.
+> 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 roll out 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/create-account.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 subscription plans 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
 

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

@@ -24,11 +24,7 @@ Before deactivating your Docker account, ensure you meet the following requireme
 
 - 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/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

@@ -1,5 +1,5 @@
 ---
-title: Deactivating an organization
+title: Deactivate an organization
 description: Learn how to deactivate a Docker organization.
 keywords: Docker Hub, delete, deactivate organization, account, organization management
 aliases:
@@ -19,14 +19,14 @@ 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.
 
 - 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](../security/for-admins/single-sign-on/manage/#remove-an-organization).
+
 ## Deactivate
 
 Once you have completed all the previous steps, you can deactivate your 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

@@ -5,11 +5,8 @@ title: Insights
 ---
 
 > [!NOTE]
-> Insights requires a [Docker Business
-> subscription](/subscription/core-subscription/details/#docker-business) and
-> administrators must [enforce sign-in](/manuals/security/for-admins/enforce-sign-in/_index.md)
-> to ensure that users sign in with an account associated with their
-> organization.
+>
+> Insights requires a [Docker Business subscription](../../subscription/details.md#docker-business) and administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/). This ensures users sign in with an account associated with their organization.
 
 Insights helps administrators visualize and understand how Docker is used within
 their organizations. With Insights, administrators can ensure their teams are

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

@@ -0,0 +1,107 @@
+---
+title: Manage Docker products
+weight: 45
+description: Learn how to manage Docker products for your organization
+keywords: organization, tools, products
+---
+
+In this section, learn how to manage access and view usage of the Docker
+products for your organization. For more detailed information about each
+product, including how to set up and configure them, see the following manuals:
+
+- [Docker Build Cloud](../../build-cloud/_index.md)
+- [Docker Desktop](../../desktop/_index.md)
+- [Docker Hub](../../docker-hub/_index.md)
+- [Docker Scout](../../scout/_index.md)
+- [Testcontainers Cloud](https://testcontainers.com/cloud/docs/#getting-started)
+
+## Manage access to Docker products
+
+Access to Docker products included in your subscription is enabled by default
+for all users. The included products are:
+
+- Docker Hub
+- Docker Build Cloud
+- Docker Desktop
+- Docker Scout
+
+Testcontainers Cloud is not enabled by default. To enable Testcontainers Cloud, see the Testcontainers [Getting Started](https://testcontainers.com/cloud/docs/#getting-started) guide.
+
+The following sections describe how to enable or disable access for these products.
+
+### Manage access to Docker Build Cloud
+
+To learn how to initially set up and configure Docker Build Cloud, sign in to
+the [Docker Build Cloud Dashboard](https://app.docker.com/build) and follow the
+on-screen instructions.
+
+To manage access to Docker Build Cloud, sign in to [Docker Build
+Cloud](http://app.docker.com/build) as an organization owner, select **Account
+settings**, and then manage access under **Lock Docker Build Cloud**.
+
+### Manage access to Docker Scout
+
+To learn how to initially set up and configure Docker Scout for remote
+repositories, sign in to the [Docker Scout Dashboard](https://scout.docker.com/)
+and follow the on-screen instructions.
+
+To manage access to Docker Scout for use on remote repositories, sign in to the
+[Docker Scout Dashboard](https://scout.docker.com/) and configure
+[integrations](../../scout/explore/dashboard.md#integrations) and [repository
+settings](../../scout/explore/dashboard.md#repository-settings).
+
+To manage access to Docker Scout for use on local images with Docker Desktop, use
+[Settings
+Management](../../security/for-admins/hardened-desktop/settings-management/_index.md)
+and set `sbomIndexing` to `false` to disable, or to `true` to enable.
+
+### Manage access to Docker Hub
+
+To manage access to Docker Hub, sign in to the [Docker Admin Console](https://app.docker.com/admin) and configure [Registry Access
+Management](../../security/for-admins/hardened-desktop/registry-access-management.md)
+or [Image Access
+Management](../../security/for-admins/hardened-desktop/image-access-management.md).
+
+### Manage access to Testcontainers Cloud
+
+To learn how to initially set up and configure Testcontainers Cloud, sign in to
+[Testcontainers Cloud](https://app.testcontainers.cloud/) and follow the
+on-screen instructions.
+
+To manage access to Testcontainers Cloud, sign in to the [Testcontainers Cloud
+Settings page](https://app.testcontainers.cloud/dashboard/settings) as
+an organization owner, and then manage access under **Lock Testcontainers
+Cloud**.
+
+### Manage access to Docker Desktop
+
+To manage access to Docker Desktop, you can [enforce
+sign-in](../../security/for-admins/enforce-sign-in/_index.md), then and manage
+members [manually](./members.md) or use
+[provisioning](../../security/for-admins/provisioning/_index.md). With sign-in
+enforced, only users who are a member of your organization can use Docker
+Desktop after signing in.
+
+## View Docker product usage
+
+View usage for the products on the following pages:
+
+- Docker Build Cloud: View the **Build minutes** page in the [Docker Build Cloud
+  Dashboard](http://app.docker.com/build).
+
+- Docker Scout: View the [**Repository settings**
+  page](https://scout.docker.com/settings/repos) in the Docker Scout
+  Dashboard.
+
+- Docker Hub: View the [**Usage** page](https://hub.docker.com/usage) in Docker
+  Hub.
+
+- Testcontainers Cloud: View the [**Billing**
+  page](https://app.testcontainers.cloud/dashboard/billing) in the
+  Testcontainers Cloud Dashboard.
+
+- Docker Desktop: View the **Insights** page in the [Docker Admin Console](https://app.docker.com/admin). For more details, see
+  [Insights](./insights.md).
+
+If your usage exceeds your subscription amount, you can [scale your
+subscription](../../subscription/scale.md) to meet your needs.

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 administrators 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.
 
@@ -94,8 +93,7 @@ set up and preferences:
 
 ## What's next
 
-- [Create](/docker-hub/repos/create/) and [manage](/docker-hub/repos/) repositories.
-- Create [teams](/admin/organization/manage-a-team/) for fine-grained repository access.
+- [Manage Docker products](./manage-products.md) to configure access and view usage.
 - Configure [Hardened Docker Desktop](/desktop/hardened-desktop/) to improve your organization’s security posture for containerized development.
 - [Audit your domains](/docker-hub/domain-audit/) to ensure that all Docker users in your domain are part of your organization.