Sync from docker/docs@9969d8e by PCIT

SUMMARY.md

@@ -942,6 +942,13 @@
         * [Use Containers For Generative AI Development](content/guides/use-case/genai-pdf-bot/develop.md)
       - Genai Video Bot
         * [Gen AI Video Transcription And Chat](content/guides/use-case/genai-video-bot/_index.md)
+      - Nlp
+        * [Natural Language Processing Guides](content/guides/use-case/nlp/_index.md)
+        * [Build A Language Translation App](content/guides/use-case/nlp/language-translation.md)
+        * [Build A Named Entity Recognition App](content/guides/use-case/nlp/named-entity-recognition.md)
+        * [Build A Sentiment Analysis App](content/guides/use-case/nlp/sentiment-analysis.md)
+        * [Build A Text Recognition App](content/guides/use-case/nlp/text-classification.md)
+        * [Build A Text Summarization App](content/guides/use-case/nlp/text-summarization.md)
     - Walkthroughs
       * [Access A Local Folder From A Container](content/guides/walkthroughs/access-local-folder.md)
       * [Containerize Your Application](content/guides/walkthroughs/containerize-your-app.md)

assets/css/typography.css

@@ -1,4 +1,45 @@
 @layer base {
+
+  /*
+   * Font faces for Roboto Flex and Roboto Mono.
+   *
+   * - https://fonts.google.com/specimen/Roboto+Flex
+   * - https://fonts.google.com/specimen/Roboto+Mono
+   *
+   * The TTF fonts have been compressed to woff2,
+   * preserving the latin character subset.
+   *
+   * */
+
+  /* Roboto Flex */
+  @font-face {
+    font-family: 'Roboto Flex';
+    src: url('/assets/fonts/RobotoFlex.woff2') format('woff2 supports variations'),
+         url('/assets/fonts/RobotoFlex.woff2') format('woff2-variations');
+    font-weight: 100 1000; /* Range of weights Roboto Flex supports */
+    font-stretch: 25% 151%; /* Range of width Roboto Flex supports */
+    font-style: oblique 0deg 10deg; /* Range of oblique angle Roboto Flex supports */
+    font-display: fallback;
+  }
+
+  /* Roboto Mono */
+  @font-face {
+    font-family: 'Roboto Mono';
+    src: url('/assets/fonts/RobotoMono-Regular.woff2') format('woff2');
+    font-weight: 100 700; /* Define the range of weight the variable font supports */
+    font-style: normal;
+    font-display: fallback;
+  }
+
+  /* Roboto Mono Italic */
+  @font-face {
+    font-family: 'Roboto Mono';
+    src: url('/assets/fonts/RobotoMono-Italic.woff2') format('woff2');
+    font-weight: 100 700; /* Define the range of weight the variable font supports */
+    font-style: italic;
+    font-display: fallback;
+  }
+
   .prose {
     li {
       @apply my-2;

content/admin/company/new-company.md

@@ -39,8 +39,8 @@ To create a new company:
 To create a new company:
 
 1. In the Admin Console, navigate to the organization you want to place under a company. The organization must have a Business subscription, and you must be an owner of the organization.
-2. Under **Organization Settings**, select **General**.
-3. In the **Organization management** section, select **Create a company**.
+2. Under **Organization settings**, select **Company management**.
+3. Select **Create a company**.
 4. Enter a unique name for your company, then select **Continue**.
 
     > **Tip**

content/admin/organization/_index.md

@@ -19,8 +19,8 @@ grid:
   description: Define which registries your developers can access.
   icon: home_storage
   link: /admin/organization/registry-access/
-- title: General settings
-  description: Configure general information or create a company.
+- title: Organization settings
+  description: Configure information for your organization and manage settings.
   icon: settings
   link: /admin/organization/general-settings/
 - title: SSO & SCIM

content/admin/organization/general-settings.md

@@ -1,12 +1,12 @@
 ---
-description: Learn how to manage general settings for organizations.
+description: Learn how to manage settings for organizations using Docker Admin Console.
 keywords: organization, settings, Admin Console
 title: General organization settings
 ---
 
 {{< include "admin-early-access.md" >}}
 
-This section describes how to manage general settings in the Docker Admin Console.
+This section describes how to manage organization settings in the Docker Admin Console.
 
 ## Configure general information
 
@@ -23,16 +23,9 @@ To edit this information:
 
 1. Sign in to the [Admin Console](https://admin.docker.com).
 2. In the left navigation, select your organization in the drop-down menu.
-3. Under **Organization Settings**, select **General**.
+3. Under **Organization settings**, select **General**.
 4. Specify the organization information and select **Save**.
 
-## Create a company
+## Next steps
 
-To create a new company:
-
-1. Sign in to the [Admin Console](https://admin.docker.com).
-2. In the left navigation, select your organization in the drop-down menu.
-3. Under **Organization Settings**, select **General**.
-4. In the **Organization management** section, select **Create a company**.
-5. Enter a unique name for your company, then select **Continue**.
-6. Review the company migration details and then select **Create company**.
+In the **Organization settings** menu, you can also [configure SSO](../../security/for-admins/single-sign-on/configure/) and [set up SCIM](../../security/for-admins/scim.md). If your organization isn't part of a company, from here you can also [audit your domains](../../security/for-admins/domain-audit.md) or [create a company](new-company.md).

content/compose/multiple-compose-files/extends.md

@@ -192,6 +192,40 @@ configuration. But this isn’t an acceptable solution when you want to re-use
 someone else's unfamiliar configurations and you don’t know about its own
 dependencies.
 
+## Relative paths
+
+When using `extends` with a `file` attribute which points to another folder, relative paths 
+declared by the service being extended are converted so they still point to the
+same file when used by the extending service. This is illustrated in the following example:
+
+Base Compose file:
+```yaml
+services:
+  webapp:
+    image: example
+    extends:
+      file: ../commons/compose.yaml
+      service: base
+```
+
+The `commons/compose.yaml` file:
+```yaml
+services:
+  base:
+    env_file: ./container.env
+```
+
+The resulting service refers to the original `container.env` file
+within the `commons` directory. This can be confirmed with `docker compose config`
+which inspects the actual model:
+```yaml
+services:
+  webapp:
+    image: example
+    env_file: 
+      - ../commons/container.env
+```
+
 ## Reference information
 
 - [`extends`](../compose-file/05-services.md#extends)

content/compose/multiple-compose-files/include.md

@@ -36,6 +36,47 @@ services:
 
 This means the team managing `serviceB` can refactor its own database component to introduce additional services without impacting any dependent teams. It also means that the dependent teams don't need to include additional flags on each Compose command they run.
 
+## Include and overrides
+
+Compose reports an error if any resource from `include` conflicts with resources from the included Compose file. This rule prevents
+unexpected conflicts with resources defined by the included compose file author. However, there may be some circumstances where you might want to tweak the
+included model. This can be achieved by adding an override file to the include directive:
+```yaml
+include:
+  - path : 
+      - third-party/compose.yaml
+      - override.yaml  # local override for third-party model
+```
+
+The main limitation with this approach is that you need to maintain a dedicated override file per include. For complex projects with multiple
+includes this would result into many Compose files.
+
+The other option is to use a `compose.override.yaml` file. While conflicts will be rejected from the file using `include` when same
+resource is declared, a global Compose override file can override the resulting merged model, as demonstrated in following example:
+
+Main `compose.yaml` file:
+```yaml
+include:
+  - team-1/compose.yaml # declare service-1
+  - team-2/compose.yaml # declare service-2
+```
+
+Override `compose.override.yaml` file:
+```yaml
+services:
+  service-1:
+    # override included service-1 to enable debugger port
+    ports:
+      - 2345:2345
+
+  service-2:
+    # override included service-2 to use local data folder containing test data
+    volumes:
+      - ./data:/data
+```
+
+Combined together, this allows you to benefit from third-party reusable components, and adjust the Compose model for your needs.
+
 ## Reference information
 
 [`include` top-level element](../compose-file/14-include.md)

content/engine/release-notes/25.0.md

@@ -19,6 +19,43 @@ For more information about:
 - Deprecated and removed features, see [Deprecated Engine Features](../deprecated.md).
 - Changes to the Engine API, see [Engine API version history](../api/version-history.md).
 
+## 25.0.3
+
+{{< release-date date="2024-02-06" >}}
+
+For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:
+
+- [docker/cli, 25.0.3 milestone](https://github.com/docker/cli/issues?q=is%3Aclosed+milestone%3A25.0.3)
+- [moby/moby, 25.0.3 milestone](https://github.com/moby/moby/issues?q=is%3Aclosed+milestone%3A25.0.3)
+
+
+### Bug fixes and enhancements
+
+- containerd image store: Fix a bug where `docker image history` would fail if a manifest wasn't found in the content store. [moby/moby#47348](https://github.com/moby/moby/pull/47348)
+- Ensure that a generated MAC address is not restored when a container is restarted, but a configured MAC address is preserved. [moby/moby#47304](https://github.com/moby/moby/pull/47304)
+
+  > **Note**
+  >
+  > - Containers created with Docker Engine version 25.0.0 may have duplicate MAC addresses.
+  >   They must be re-created.
+  > - Containers with user-defined MAC addresses created with Docker Engine versions 25.0.0 or 25.0.1
+  >   receive new MAC addresses when started using Docker Engine version 25.0.2.
+  >   They must also be re-created.
+
+- Fix `docker save <image>@<digest>` producing an OCI archive with index without manifests. [moby/moby#47294](https://github.com/moby/moby/pull/47294)
+- Fix a bug preventing bridge networks from being created with an MTU higher than 1500 on RHEL and CentOS 7. [moby/moby#47308](https://github.com/moby/moby/issues/47308), [moby/moby#47311](https://github.com/moby/moby/pull/47311)
+- Fix a bug where containers are unable to communicate over an `internal` network. [moby/moby#47303](https://github.com/moby/moby/pull/47303)
+- Fix a bug where the value of the `ipv6` daemon option was ignored. [moby/moby#47310](https://github.com/moby/moby/pull/47310)
+- Fix a bug where trying to install a pulling using a digest revision would cause a panic. [moby/moby#47323](https://github.com/moby/moby/pull/47323)
+- Fix a potential race condition in the managed containerd supervisor. [moby/moby#47313](https://github.com/moby/moby/pull/47313)
+- Fix an issue with the `journald` log driver preventing container logs from being followed correctly with systemd version 255. [moby/moby47243](https://github.com/moby/moby/pull/47243)
+- seccomp: Update the builtin seccomp profile to include syscalls added in kernel v5.17 - v6.7 to align the profile with the profile used by containerd. [moby/moby#47341](https://github.com/moby/moby/pull/47341)
+- Windows: Fix cache not being used when building images based on Windows versions older than the host's version. [moby/moby#47307](https://github.com/moby/moby/pull/47307), [moby/moby#47337](https://github.com/moby/moby/pull/47337)
+
+### Packaging updates
+
+- Removed support for Ubuntu Lunar (23.04). [docker/ce-packaging#986](https://github.com/docker/docker-ce-packaging/pull/986)
+
 ## 25.0.2
 
 {{< release-date date="2024-01-31" >}}

content/guides/use-case/nlp/_index.md

@@ -0,0 +1,33 @@
+---
+description: Learn how to build natural language processing (NLP) applications.
+keywords:  nlp, natural language processing
+title: Natural language processing guides
+---
+
+The natural language processing (NLP) guides teach you how to build and run NLP
+applications. NLP applications can interpret and generate human language, both
+spoken and written. This is a natural language, as opposed to a formal or
+artificial one. NLP is a part of artificial intelligence (AI) and has a long
+history that goes back to the origins of linguistics.
+
+> **Acknowledgment**
+>
+> These NLP guides are community contributions. Docker would like to thank
+> [Harsh Manvar](https://github.com/harsh4870) for his contribution to the NLP
+> guides.
+
+Select one of the guides to get started:
+
+* [Language translation](language-translation.md): Automatically translate text
+  or speech from one language to another.
+* [Named entity recognition](named-entity-recognition.md): Identify and extract
+  specific entities or phrases from text, such as person names, locations,
+  organizations, dates, etc., and classify them into predefined categories.
+* [Sentiment analysis](sentiment-analysis.md): Identify and extract emotions,
+  opinions, and attitudes from text or speech.
+* [Text classification](text-classification.md): Assign a label or category to a
+  text document or a segment of text, based on its content or context.
+* [Text summarization](text-summarization.md): Create a concise and informative
+  summary of a longer text.
+
+