Merge pull request #21628 from docker/published-update

publish updates from main

Author: sarahsanders-docker

_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