Merge pull request #21946 from docker/published-update

publish updates from main

Author: aevesdocker

content/manuals/admin/organization/onboard.md

@@ -86,8 +86,7 @@ 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/details.md) and they can circumvent [Docker’s security features](/security/for-admins/hardened-desktop/).
 
-There are multiple ways you can enforce sign-in, depending on your company's
-set up and preferences:
+There are multiple ways you can enforce sign-in, depending on your company's setup and preferences:
 - [Registry key method (Windows only)](/security/for-admins/enforce-sign-in/methods/#registry-key-method-windows-only)
 - [`.plist` method (Mac only)](/security/for-admins/enforce-sign-in/methods/#plist-method-mac-only)
 - [`registry.json` method (All)](/security/for-admins/enforce-sign-in/methods/#registryjson-method-all)

content/manuals/build/bake/_index.md

@@ -6,8 +6,6 @@ aliases:
   - /build/customize/bake/
 ---
 
-{{< summary-bar feature_name="Build bake" >}}
-
 Bake is a feature of Docker Buildx that lets you define your build configuration
 using a declarative file, as opposed to specifying a complex CLI expression. It
 also lets you run multiple builds concurrently with a single invocation.

content/manuals/build/building/multi-platform.md

@@ -468,7 +468,7 @@ Steps:
    WORKDIR /app
    ADD https://github.com/dvdksn/buildme.git#eb6279e0ad8a10003718656c6867539bd9426ad8 .
    -RUN go build -o server .
-   RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o server .
+   +RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o server .
 
    FROM alpine
    COPY --from=build /app/server /server

content/manuals/compose/how-tos/file-watch.md

@@ -12,7 +12,7 @@ aliases:
 {{% include "compose/watch.md" %}}
 
 `watch` adheres to the following file path rules:
-* All paths are relative to the project directory
+* All paths are relative to the project directory, apart from ignore file patterns
 * Directories are watched recursively
 * Glob patterns aren't supported
 * Rules from `.dockerignore` apply
@@ -114,14 +114,19 @@ For `path: ./app/html` and a change to `./app/html/index.html`:
 * `target: /app/static` -> `/app/static/index.html`
 * `target: /assets` -> `/assets/index.html`
 
+### `ignore`
+
+The `ignore` patterns are relative to the `path` defined in the current `watch` action, not to the project directory. In the following Example  1, the ignore path would be relative to the `./web` directory specified in the `path` attribute.
+
 ## Example 1
 
 This minimal example targets a Node.js application with the following structure:
 ```text
 myproject/
 ├── web/
 │   ├── App.jsx
-│   └── index.js
+│   ├── index.js
+│   └── node_modules/
 ├── Dockerfile
 ├── compose.yaml
 └── package.json
@@ -152,6 +157,8 @@ For example, `./web/App.jsx` is copied to `/src/web/App.jsx`.
 
 Once copied, the bundler updates the running application without a restart.
 
+And in this case, the `ignore` rule would apply to `myproject/web/node_modules/`, not `myproject/node_modules/`.
+
 Unlike source code files, adding a new dependency can’t be done on-the-fly, so whenever `package.json` is changed, Compose
 rebuilds the image and recreates the `web` service container.
 

content/manuals/desktop/settings-and-maintenance/backup-and-restore.md

@@ -4,7 +4,7 @@ keywords: Docker Desktop, backup, restore, migration, reinstall, containers, ima
   volumes
 weight: 20
 aliases:
- - /desktop/backup-and-restore.md
+ - /desktop/backup-and-restore/
 ---
 
 Use the following procedure to save and restore your images and container data. This is useful if you want to reset your VM disk or to move your Docker environment to a new

content/manuals/desktop/setup/install/_index.md

@@ -5,4 +5,5 @@ title: Install
 weight: 10
 aliases:
 - /desktop/install/
+- /desktop/setup/install/
 ---

content/manuals/desktop/troubleshoot-and-support/faqs/general.md

@@ -9,6 +9,7 @@ aliases:
 - /docker-for-mac/faqs/
 - /docker-for-windows/faqs/
 - /desktop/faqs/
+- /desktop/faqs/general/
 weight: 10
 ---
 

content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md

@@ -6,6 +6,7 @@ linkTitle: Linux
 tags: [FAQ]
 aliases:
 - /desktop/linux/space/
+- /desktop/faqs/linuxfaqs/
 weight: 40
 ---
 

content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md

@@ -7,6 +7,7 @@ tags: [FAQ]
 aliases:
 - /desktop/mac/space/
 - /docker-for-mac/space/
+- /desktop/faqs/macfaqs/
 weight: 20
 ---
 

content/manuals/engine/network/_index.md

@@ -7,6 +7,7 @@ keywords: networking, container, standalone, IP address, DNS resolution
 aliases:
 - /articles/networking/
 - /config/containers/container-networking/
+- /engine/tutorials/networkingcontainers/
 - /engine/userguide/networking/
 - /engine/userguide/networking/configure-dns/
 - /engine/userguide/networking/default_network/binding/