publish updates from main

_vale/config/vocabularies/Docker/accept.txt

@@ -4,25 +4,34 @@ Anchore
 Apple
 Artifactory
 Azure
+bootup
 Btrfs
 BuildKit
 BusyBox
 CentOS
 Ceph
+cgroup
 Chrome
 Chrome DevTools
 Citrix
 CloudFront
 Codefresh
 Codespaces
+config
+containerd
 Couchbase
 CouchDB
+datacenter
 Datadog
 Ddosify
 Debootstrap
+deprovisioning
+deserialization
+deserialize
 Dev
 Dev Environments?
 Dex
+displayName
 Django
 DMR
 Docker Build Cloud
@@ -37,24 +46,31 @@ Docker Team
 Docker-Sponsored Open Source
 Docker's
 Dockerfile
+dockerignore
 Dockerize
 Dockerizing
 Entra
-Ethernet
 EPERM
+Ethernet
 Fargate
 Fedora
+firewalld
 Flink
+fluentd
+g?libc
 GeoNetwork
 GGUF
 Git
 GitHub( Actions)?
 Google
 Grafana
 Gravatar
+gRPC
 HyperKit
+inotify
 Intel
 Intune
+iptables
 IPv[46]
 IPvlan
 Jamf
@@ -64,48 +80,86 @@ JUnit
 Kerberos
 Kitematic
 Kubeadm
+kubectl
+kubefwd
+kubelet
 Kubernetes
 Laradock
 Laravel
+libseccomp
 Linux
 LinuxKit
 Logstash
+lookup
 Mac
+macOS
+macvlan
 Mail(chimp|gun)
+mfsymlinks
 Microsoft
+minikube
+monorepos?
+musl
 MySQL
+nameserver
+namespace
+namespacing
+netfilter
+netlabel
 Netplan
 NFSv\d
 Nginx
+npm
 Nutanix
 Nuxeo
 OAuth
 Okta
 Ollama
+osquery
+osxfs
 OTel
 Paketo
+pgAdmin
 PKG
 Postgres
 PowerShell
 Python
+rollback
+rootful
+runc
 Ryuk
 S3
 Slack
+snapshotters?
 Snyk
 Solr
 SonarQube
 SQLite
+stdin
+stdout
+subfolder
 Syft
+syntaxes
 Sysbox
+sysctls
 Sysdig
+systemd
 Testcontainers
+tmpfs
 Traefik
 Trixie
 Ubuntu
+ufw
+uid
+umask
 Unix
+unmanaged
 VMware
+vpnkit
+vSphere
 Wasm
 Windows
+windowsfilter
 WireMock
 Xdebug
 Zscaler
@@ -166,56 +220,4 @@ Zsh
 [Vv]irtiofs
 [Vv]irtualize
 [Ww]alkthrough
-bootup
-cgroup
-config
-containerd
-datacenter
-deprovisioning
-deserialization
-deserialize
-displayName
-dockerignore
-firewalld
-fluentd
-g?libc
-gRPC
-inotify
-iptables
-kubectl
-kubefwd
-kubelet
-libseccomp
-lookup
-macOS
-macvlan
-mfsymlinks
-minikube
-monorepos?
-musl
-nameserver
-namespace
-namespacing
-netfilter
-netlabel
-npm
-osquery
-osxfs
-pgAdmin
-rollback
-rootful
-runc
-snapshotters?
-stdin
-stdout
-syntaxes
-sysctls
-systemd
-tmpfs
-ufw
-uid
-umask
-unmanaged
-vSphere
-vpnkit
-windowsfilter
+

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

@@ -42,7 +42,7 @@ account and start a trial of Docker Build Cloud. Personal accounts are limited t
 single user.
 
 For teams to receive the shared cache benefit, they must either be on a Docker
-Team or Docker Business plan.
+Team or Docker Business subscription.
 
 ### Does Docker Build Cloud support CI platforms? Does it work with GitHub Actions?
 

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

@@ -73,9 +73,9 @@ information, see [Configure SSO](../../security/for-admins/single-sign-on/config
 
 > [!IMPORTANT]
 >
-> As of December 10, 2024, service accounts are no longer available. Existing Service Account agreements will be honored until their current term expires, but new purchases or renewals of service accounts no longer available and customers must renew under a new subscription plan. It is recommended to transition to Organization Access Tokens (OATs), which can provide similar functionality. For more information, see [Organization access tokens (Beta)](/manuals/security/for-admins/access-tokens.md).
+> As of December 10, 2024, service accounts are no longer available. Existing Service Account agreements will be honored until their current term expires, but new purchases or renewals of service accounts no longer available and customers must renew under a new subscription. It is recommended to transition to Organization Access Tokens (OATs), which can provide similar functionality. For more information, see [Organization access tokens (Beta)](/manuals/security/for-admins/access-tokens.md).
 
-A [service account](../../docker-hub/service-accounts.md) is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and don't share Docker IDs with the members in the Team or Business plan. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process.
+A [service account](../../docker-hub/service-accounts.md) is a Docker ID used for automated management of container images or containerized applications. Service accounts are typically used in automated workflows, and don't share Docker IDs with the members in the Team or Business subscription. Common use cases for service accounts include mirroring content on Docker Hub, or tying in image pulls from your CI/CD process.
 
 ### Can I delete or deactivate a Docker account for another user?
 

content/manuals/admin/organization/activity-logs.md

@@ -18,7 +18,7 @@ With activity logs, owners can view and track:
 
 For example, activity logs display activities such as the date when a repository was created or deleted, the member who created the repository, the name of the repository, and when there was a change to the privacy settings.
 
-Owners can also see the activity logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team plan.
+Owners can also see the activity logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team subscription.
 
 ## Manage activity logs
 
@@ -71,6 +71,14 @@ Refer to the following section for a list of events and their descriptions:
 | Policy updated | Details of updating a settings policy |
 | Policy deleted | Details of deleting a settings policy |
 | Policy transferred | Details of transferring a settings policy to another owner |
+| Create SSO Connection | Details of creating a new org/company SSO connection |
+| Update SSO Connection | Details of updating an existing org/company SSO connection |
+| Delete SSO Connection | Details of deleting an existing org/company SSO connection |
+| Enforce SSO | Details of toggling enforcement on an existing org/company SSO connection |
+| Enforce SCIM | Details of toggling SCIM on an existing org/company SSO connection |
+| Refresh SCIM Token | Details of a SCIM token refresh on an existing org/company SSO connection |
+| Change SSO Connection Type | Details of a connection type change on an existing org/company SSO connection |
+| Toggle JIT provisioning | Details of a JIT toggle on an existing org/company SSO connection |
 
 ### Repository events
 

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

@@ -11,7 +11,7 @@ aliases:
 
 You can convert an existing user account to an organization. This is useful if you need multiple users to access your account and the repositories that it’s connected to. Converting it to an organization gives you better control over permissions for these users through [teams](manage-a-team.md) and [roles](roles-and-permissions.md).
 
-When you convert a user account to an organization, the account is migrated to a Docker Team plan.
+When you convert a user account to an organization, the account is migrated to a Docker Team subscription.
 
 > [!IMPORTANT]
 >
@@ -40,7 +40,7 @@ Consider the following effects of converting your account:
 
 - This process removes the email address for the account, and organization owners will receive notification emails instead. You'll be able to reuse the removed email address for another account after converting.
 
-- The current plan will cancel and your new subscription will start.
+- The current subscription will cancel and your new subscription will start.
 
 - Repository namespaces and names won't change, but converting your account removes any repository collaborators. Once you convert the account, you'll need to add those users as team members.
 

content/manuals/admin/organization/orgs.md

@@ -13,7 +13,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/details.md) to determine what plan to choose for your organization
+- Review the [Docker subscriptions and features](../../subscription/details.md) to determine what subscription to choose for your organization
 
 ## Create an organization
 
@@ -33,7 +33,7 @@ To create an organization:
 1. Sign in to [Docker Home](https://app.docker.com/).
 2. Under Settings and administration, select **Go to Admin Console**.
 3. Select the **Organization** drop-down in the left-hand navigation and then **Create Organization**.
-4. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan.
+4. Choose a subscription for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business subscription.
 5. Select **Continue to profile**.
 6. Enter an **Organization namespace**. This is the official, unique name for
 your organization in Docker Hub. It's not possible to change the name of the
@@ -60,7 +60,7 @@ You've now created an organization.
 
 1. Sign in to [Docker Hub](https://hub.docker.com/) using your Docker ID, your email address, or your social provider.
 2. Select **My Hub**, select the account drop-down, and then **Create Organization** to create a new organization.
-3. Choose a plan for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business plan.
+3. Choose a subscription for your organization, a billing cycle, and specify how many seats you need. See [Docker Pricing](https://www.docker.com/pricing/) for details on the features offered in the Team and Business subscription.
 4. Select **Continue to profile**.
 5. Enter an **Organization namespace**. This is the official, unique name for
 your organization in Docker Hub. It's not possible to change the name of the
@@ -161,7 +161,7 @@ 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/history.md).
+[Docker subscription](../../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).
 
 {{< /tab >}}
 {{< /tabs >}}

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

@@ -7,7 +7,7 @@ weight: 40
 
 > [!NOTE]
 >
-> [Docker plan](../subscription/setup.md) 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.
 

content/manuals/billing/_index.md

@@ -36,6 +36,6 @@ aliases:
   - /billing/docker-hub-pricing/
 ---
 
-Use the resources in this section to manage your billing and payment settings for your Docker subscription plans.
+Use the resources in this section to manage your billing and payment settings for your Docker subscriptions.
 
 {{< grid items="grid_core" >}}

content/manuals/billing/cycle.md

@@ -5,11 +5,11 @@ description: Learn to change your billing cycle for your Docker subscription
 keywords: billing, cycle, payments, subscription
 ---
 
-You can pay for a subscription plan on a monthly or yearly billing cycle. You select your preferred billing cycle when you buy your subscription.
+You can pay for a subscription on a monthly or yearly billing cycle. You select your preferred billing cycle when you buy your subscription.
 
 > [!NOTE]
 >
-> Business plan is available only on yearly billing cycle.
+> Business subscriptions are available only on yearly billing cycle.
 
 If you have a monthly billing cycle, you can choose to switch to an annual billing cycle.
 
@@ -21,14 +21,14 @@ When you change the billing cycle's duration:
 
 - The next billing date reflects the new cycle. To find your next billing date, see [View renewal date](history.md#view-renewal-date).
 - The subscription's start date resets. For example, if the start date of the monthly subscription is March 1st and the end date is April 1st, then after switching the billing duration to March 15th, 2024 the new start date is March 15th, 2024, and the new end date is March 15th, 2025.
-- Any unused monthly subscription is prorated and applied as credit towards the new annual period. For example, if you switch from a $10 monthly subscription to a $100 annual plan, deducting the unused monthly value (in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost after March 15, 2025 is $100.
+- Any unused monthly subscription is prorated and applied as credit towards the new annual period. For example, if you switch from a $10 monthly subscription to a $100 annual subscription, deducting the unused monthly value (in this case $5), the migration cost becomes $95 ($100 - $5). The renewal cost after March 15, 2025 is $100.
 
 {{% include "tax-compliance.md" %}}
 
 ## Personal account
 
 {{< tabs >}}
-{{< tab name="Docker plan" >}}
+{{< tab name="Docker subscription" >}}
 
 To change your billing cycle:
 
@@ -44,10 +44,10 @@ To change your billing cycle:
 > If you choose to pay using a US bank account, you must verify the account. For
 > more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
 
-The billing plans and usage page will now reflect your new annual plan details.
+The billing plans and usage page will now reflect your new annual subscription details.
 
 {{< /tab >}}
-{{< tab name="Legacy Docker plan" >}}
+{{< tab name="Legacy Docker subscription" >}}
 
 To change your billing cycle:
 
@@ -67,7 +67,7 @@ To change your billing cycle:
 > You must be an organization owner to make changes to the payment information.
 
 {{< tabs >}}
-{{< tab name="Docker plan" >}}
+{{< tab name="Docker subscription" >}}
 
 To change your organization's billing cycle:
 
@@ -84,7 +84,7 @@ To change your organization's billing cycle:
 > more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
 
 {{< /tab >}}
-{{< tab name="Legacy Docker plan" >}}
+{{< tab name="Legacy Docker subscription" >}}
 
 To change your organization's billing cycle: