Merge pull request #21628 from docker/published-update

publish updates from main

_vale/Docker/Acronyms.yml

@@ -9,6 +9,7 @@ second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)'
 # ... with the exception of these:
 exceptions:
   - AGPL
+  - AI
   - API
   - ARM
   - ASP
@@ -54,6 +55,7 @@ exceptions:
   - HTTP
   - HTTPS
   - IAM
+  - IBM
   - ID
   - IDE
   - IP

_vale/config/vocabularies/Docker/accept.txt

@@ -110,6 +110,7 @@ Zsh
 [Ii]nfosec
 [Kk]eyrings?
 [Ll]oopback
+[Mm]emcached
 [Mm]oby
 [Nn]amespace
 [Oo]nboarding
@@ -153,6 +154,7 @@ kubectl
 kubefwd
 kubelet
 lookup
+label_file
 macOS
 macvlan
 mfsymlinks

_vendor/modules.txt

@@ -2,5 +2,5 @@
 # github.com/moby/buildkit v0.18.0
 # github.com/docker/buildx v0.19.2
 # github.com/docker/cli v27.4.0+incompatible
-# github.com/docker/compose/v2 v2.31.0
+# github.com/docker/compose/v2 v2.32.0
 # github.com/docker/scout-cli v1.15.0

content/_index.md

@@ -80,17 +80,6 @@ grid:
         url: "/scout/quickstart/"
       - text: "Image analysis"
         url: "/scout/image-analysis/"
-  - title: Trusted content
-    icon: verified
-    description: |
-      High-quality, secure images from Docker and verified partners.
-    links:
-      - text: "Overview"
-        url: "/trusted-content/"
-      - text: "Official images"
-        url: "/trusted-content/official-images/"
-      - text: "Verified publisher program"
-        url: "/trusted-content/dvp-program/"
   - title: Subscription
     icon: card_membership
     description: |

content/get-started/docker-concepts/the-basics/what-is-an-image.md

@@ -188,10 +188,7 @@ In this walkthrough, you searched and pulled a Docker image. In addition to pull
 
 The following resources will help you learn more about exploring, finding, and building images:
 
-- [Docker Trusted Content](/manuals/trusted-content/_index.md)
-  - [Docker Official Images docs](/manuals/trusted-content/official-images/_index.md)
-  - [Docker Verified Publisher docs](/manuals/trusted-content/dvp-program.md)
-  - [Docker-Sponsored Open Source Program docs](/manuals/trusted-content/dsos-program.md)
+- [Docker trusted content](/manuals/docker-hub/image-library/trusted-content.md)
 - [Explore the Image view in Docker Desktop](/manuals/desktop/use-desktop/images.md)
 - [Docker Build overview](/manuals/build/concepts/overview.md)
 - [Docker Hub](https://hub.docker.com)

content/get-started/introduction/build-and-push-first-image.md

@@ -33,7 +33,7 @@ If you’re new to container images, think of them as a standardized package tha
 
 To share your Docker images, you need a place to store them. This is where registries come in. While there are many registries, Docker Hub is the default and go-to registry for images. Docker Hub provides both a place for you to store your own images and to find images from others to either run or use as the bases for your own images.
 
-In [Develop with containers](develop-with-containers.md), you used the following images that came from Docker Hub, each of which are [Docker Official Images](/trusted-content/official-images/):
+In [Develop with containers](develop-with-containers.md), you used the following images that came from Docker Hub, each of which are [Docker Official Images](/manuals/docker-hub/image-library/trusted-content.md#docker-official-images):
 
 - [node](https://hub.docker.com/_/node) - provides a Node environment and is used as the base of your development efforts. This image is also used as the base for the final application image.
 - [mysql](https://hub.docker.com/_/mysql) - provides a MySQL database to store the to-do list items

content/get-started/workshop/02_our_app.md

@@ -104,7 +104,7 @@ Now that you have an image, you can run the application in a container using the
 
    The `-d` flag (short for `--detach`) runs the container in the background.
    This means that Docker starts your container and returns you to the terminal
-   prompt.
+   prompt. Also, it does not display logs in the terminal.
 
    The `-p` flag (short for `--publish`) creates a port mapping between the
    host and the container. The `-p` flag takes a string value in the format of

content/includes/hub-categories.md

@@ -0,0 +1,34 @@
+The categories include:
+
+- **API Management**: Tools for creating, publishing, analyzing, and securing
+  APIs.
+- **Content Management System:** Software applications to create and manage
+  digital content through templates, procedures, and standard formats.
+- **Data Science:** Tools and software to support analyzing data and generating
+  actionable insights.
+- **Databases & Storage:** Systems for storing, retrieving, and managing data.
+- **Languages & Frameworks:** Programming language runtimes and frameworks.
+- **Integrations & Delivery:** Tools for Continuous Integration (CI) and
+  Continuous Delivery (CD).
+- **Internet of Things:** Tools supporting Internet of Things (IoT)
+  applications.
+- **Machine Learning & AI:** Tools and frameworks optimized for artificial
+  intelligence and machine learning projects, such as pre-installed libraries
+  and frameworks for data analysis, model training, and deployment.
+- **Message Queues:** Message queuing systems optimized for reliable, scalable,
+  and efficient message handling.
+- **Monitoring & Observability:** Tools to track software and system performance
+  through metrics, logs, and traces, as well as observability to explore the
+  system’s state and diagnose issues.
+- **Networking:** Repositories that support data exchange and connecting
+  computers and other devices to share resources.
+- **Operating Systems:** Software that manages all other programs on a computer
+  and serves as an intermediary between users and the computer hardware, while
+  overseeing applications and system resources.
+- **Security:** Tools to protect a computer system or network from theft,
+  unauthorized access, or damage to their hardware, software, or electronic
+  data, as well as from service disruption.
+- **Web Servers:** Software to serve web pages, HTML files, and other assets to
+  users or other systems.
+- **Web Analytics:** Tools to collect, measure, analyze, and report on web data
+  and website visitor engagement.

content/manuals/_index.md

@@ -76,10 +76,6 @@ params:
     description: Commercial use licenses for Docker products.
     icon: card_membership
     link: /subscription/
-  - title: Trusted content
-    description: Curated, high-quality content from trusted sources.
-    icon: verified
-    link: /trusted-content/
 ---
 
 This section contains user guides on how to install, set up, configure, and use

content/manuals/admin/organization/general-settings.md

@@ -11,7 +11,7 @@ This section describes how to manage organization settings in the Docker Admin C
 
 ## Configure general information
 
-General organization information appears on your organization landing page in Docker Hub.
+General organization information appears on your organization landing page in the Admin Console.
 
 This information includes:
  - Organization Name

content/manuals/admin/organization/insights.md

@@ -15,36 +15,39 @@ productivity and efficiency across the organization.
 
 Key benefits include:
 
-* Uniform working environment. Establish and maintain standardized
+- Uniform working environment. Establish and maintain standardized
   configurations across teams.
-* Best practices. Promote and enforce usage guidelines to ensure optimal
+- Best practices. Promote and enforce usage guidelines to ensure optimal
   performance.
-* Increased visibility. Monitor and drive adoption of organizational
+- Increased visibility. Monitor and drive adoption of organizational
   configurations and policies.
-* Optimized license use. Ensure that developers have access to advanced
+- Optimized license use. Ensure that developers have access to advanced
   features provided by a Docker subscription.
 
 ## View Insights for organization users
 
+{{< include "admin-early-access.md" >}}
+
 1. Go to the [Admin Console](https://app.docker.com/admin/) and sign in to an
    account that is an organization owner.
 2. Select your company on the **Choose profile** page.
 3. Select **Insights**.
 4. On the **Insights** page, select the period of time for the data.
 
 > [!NOTE]
+>
 > Insights data is not real-time and is updated daily. At the top-right of the
 > Insights page, view the **Last updated** date to understand when the data was
 > last updated.
 
 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)
+ - [Docker Desktop users](#docker-desktop-users)
+ - [Builds](#builds)
+ - [Containers](#containers)
+ - [Docker Desktop usage](#docker-desktop-usage)
+ - [Docker Hub images](#docker-hub-images)
+ - [Extensions](#extensions)
 
 ### Docker Desktop users
 
@@ -56,13 +59,12 @@ counts.
 
 The chart contains the following data.
 
-| Data                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+| Data | Description |
 |:-----------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Total active users           | The number of users that have actively used Docker Desktop and either signed in with a Docker account that has a license in your organization or signed in to a Docker account with an email address from a domain associated with your organization. <br><br>Users who don’t sign in to an account associated with your organization are not represented in the data. To ensure users sign in with an account associated with your organization, you can [enforce sign-in](/security/for-admins/enforce-sign-in/).                                                                                                                                                                                                                                                     |
-| Active with license          | The number of users that have actively used Docker Desktop and have signed in to a Docker account with a license in your organization.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| Active without license       | The number of users that have actively used Docker Desktop, are linked to a Docker account with an email address from a domain associated with your organization, and don’t have a license assigned to their account. <br><br>Users without a license don’t receive the benefits of your subscription. You can use [domain audit](/security/for-admins/domain-audit/) to identify users without a license. You can also use [Just-in-Time provisioning](/security/for-admins/provisioning/just-in-time/) or [SCIM](/security/for-admins/provisioning/scim/) to help automatically provision users with a license. Note that when SSO is configured and enforced, active without license will be 0. |
-| Users opted out of analytics | The number of users that are a member of your organization that have opted out of sending analytics. <br><br>When users opt out of sending analytics, you won't see any of their data in Insights. To ensure that the data includes all users, you can use [Settings Management](/desktop/hardened-desktop/settings-management/) to set `analyticsEnabled` for all your users.                                                                                                                                                                                                                                                                                                                                                                                          |
-| Active users (graph)         | The view over time for total active users.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| Active user | The number of users that have actively used Docker Desktop and either signed in with a Docker account that has a license in your organization or signed in to a Docker account with an email address from a domain associated with your organization. <br><br>Users who don’t sign in to an account associated with your organization are not represented in the data. To ensure users sign in with an account associated with your organization, you can [enforce sign-in](/security/for-admins/enforce-sign-in/). |
+| Total organization members | The number of users that have used Docker Desktop, regardless of their Insights activity. |
+| Users opted out of analytics | The number of users that are a member of your organization that have opted out of sending analytics. <br><br>When users opt out of sending analytics, you won't see any of their data in Insights. To ensure that the data includes all users, you can use [Settings Management](/desktop/hardened-desktop/settings-management/) to set `analyticsEnabled` for all your users. |
+| Active users (graph) | The view over time for total active users. |
 
 
 ### Builds