Merge pull request #21385 from dvdksn/tidy-vale-rules

vale: housekeeping vocabulary and acronyms
2024-11-08 21:16:01 +01:00 · 2024-11-08 21:16:01 +01:00 · 8c9d19cba9
parent 5ffcf87c16 03120e91a4
commit 8c9d19cba9
24 changed files with 116 additions and 128 deletions
--- a/_vale/Docker/Acronyms.yml
+++ b/_vale/Docker/Acronyms.yml
@ -4,23 +4,29 @@ link: https://docs.docker.com/contribute/style/grammar/#acronyms-and-initialisms
 level: warning
 ignorecase: false
 # Ensures that the existence of 'first' implies the existence of 'second'.
-first: '\b([A-Z]{3,5})\b'
-second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)'
+first: '\b([A-Z]{2,5})\b'
+second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{2,5})\)'
 # ... with the exception of these:
 exceptions:
+  - AGPL
  - API
  - ARM
  - ASP
  - AUFS
  - AWS
  - BIOS
+  - CISA
  - CLI
+  - CNCF
+  - CORS
  - CPU
  - CSS
  - CSV
  - CVE
  - DCT
  - DEBUG
+  - DHCP
+  - DNS
  - DOM
  - DPI
  - DSOS
@ -32,53 +38,84 @@ exceptions:
  - GDB
  - GET
  - GHSA
+  - GNU
+  - GPG
+  - GPL
  - GPU
+  - GRUB
  - GTK
  - GUI
  - HEAD
  - HTML
  - HTTP
  - HTTPS
+  - IAM
  - IDE
+  - IP
  - JAR
  - JSON
  - JSX
  - LESS
  - LLDB
+  - LTS
+  - MAC
+  - MDM
+  - NAT
  - NET
  - NFS
  - NOTE
+  - NTLM
  - NVDA
+  - OCI
  - OSS
  - PATH
  - PDF
+  - PEM
  - PHP
  - POSIX
  - POST
+  - QEMU
  - RAM
  - REPL
  - REST
+  - RHEL
+  - RPM
  - RSA
+  - SAML
+  - SARIF
  - SBOM
+  - SCIM
  - SCM
  - SCSS
  - SDK
+  - SLES
+  - SLSA
+  - SPDX
  - SQL
  - SSD
  - SSH
  - SSL
+  - SSO
  - SVG
  - TBD
  - TCP
+  - TCP
  - TIP
+  - TLS
  - TODO
  - TTY
+  - TXT
+  - UDP
  - URI
  - URL
  - USB
  - USD
  - UTF
+  - UUID
  - VAT
+  - VLAN
+  - VM
+  - VPN
  - WSL
  - XML
  - XSS
--- a/_vale/Docker/RecommendedWords.yml
+++ b/_vale/Docker/RecommendedWords.yml
@ -31,6 +31,7 @@ swap:
  check box: checkbox
  check boxes: checkboxes
  click: select
+  distro: distribution
  ergo: therefore
  file name: filename
  keypress: keystroke
--- a/_vale/config/vocabularies/Docker/accept.txt
+++ b/_vale/config/vocabularies/Docker/accept.txt
@ -1,10 +1,6 @@
-A?GPL(v3)?
-APIs?
-ARM
-AWS
+(?-i)[A-Z]{2,}s
 Admin Console
 Amazon
-Ambassador
 Anchore
 Apple
 Artifactory
@ -14,10 +10,6 @@ Azure
 Btrfs
 BuildKit
 BusyBox
-CISA
-CNCF
-CORS
-CVEs?
 CentOS
 Ceph
 Chrome
@ -27,10 +19,6 @@ Codefresh
 Codespaces
 CouchDB
 Couchbase
-DHCP
-DNS
-DSOS
-DVP
 Datadog
 Ddosify
 Debootstrap
@ -55,91 +43,52 @@ Ethernet
 Fargate
 Fedora
 Flink
-GPG
-GPUs?
-GRUB
 GeoNetwork
 Git
 GitHub( Actions)?
 Google
 Grafana
 Gravatar
-HTTP
 HyperKit
-IAM
-IPs?
 IPv[46]
 IPvlan
 Intel
 Intune
-Jamf
 JFrog
+Jamf
 JetBrains
 Kerberos
-[Kk]eyrings?
 Kitematic
 Kubernetes
-LTS
 Linux
 LinuxKit
 Logstash
-MAC
 Mac
 Mail(chimp|gun)
-MDM
 Microsoft
 MySQL
-NAT
 Netplan
 Nginx
-NTLM
 Nuxeo
-OAT
 OAuth
-OCI
 OTel
 Okta
-PAT
-PEM
 Postgres
 PowerShell
 Python
-QEMU
-RHEL
-RPM
 S3
-SAML
-SARIF
-SBOMs?
-SCIM
-SDKs?
-SLES
-SLSA
-SPDX
 SQLite
-SSH
-SSO
 Slack
 Snyk
 Solr
 SonarQube
 Syft
 Sysdig
-TCP
-TLS
-TXT
 Testcontainers
 Traefik
-UDP
-URLs?
-UUID
 Ubuntu
 Unix
-VLAN
-VM
 VMware
-VPN
-WSL
 Wasm
 Windows
 WireMock
@ -148,12 +97,13 @@ Zsh
 [Bb]uildx
 [Cc]odenames?
 [Cc]ompose
-[Dd]istros
+[Dd]istroless
 [Ff]ilepaths?
 [Ff]iletypes?
 [GgCc]oroutine
 [Hh]ostname
 [Ii]nfosec
+[Kk]eyrings?
 [Ll]oopback
 [Mm]oby
 [Oo]nboarding
@ -165,8 +115,8 @@ Zsh
 [Ss]wappable
 [Ss]warm
 [Tt]oolchains?
-[Vv]irtualize
 [Vv]irtiofs
+[Vv]irtualize
 [Ww]alkthrough
 cgroup
 config
--- a/content/manuals/compose/install/linux.md
+++ b/content/manuals/compose/install/linux.md
@ -25,7 +25,7 @@ For Compose standalone, see [Install Compose Standalone](standalone.md).

 ## Install using the repository

-1. Set up the repository. Find distro-specific instructions in:
+1. Set up the repository. Find distribution-specific instructions in:

    [Ubuntu](/manuals/engine/install/ubuntu.md#install-using-the-repository) |
    [CentOS](/manuals/engine/install/centos.md#set-up-the-repository) |
@ -43,7 +43,7 @@ For Compose standalone, see [Install Compose Standalone](standalone.md).
        $ sudo apt-get update
        $ sudo apt-get install docker-compose-plugin
        ```
-    * For RPM-based distros, run:
+    * For RPM-based distributions, run:

        ```console
        $ sudo yum update
@ -74,7 +74,7 @@ To update the Compose plugin, run the following commands:
    $ sudo apt-get update
    $ sudo apt-get install docker-compose-plugin
    ```
-* For RPM-based distros, run:
+* For RPM-based distributions, run:

    ```console
    $ sudo yum update
--- a/content/manuals/compose/install/uninstall.md
+++ b/content/manuals/compose/install/uninstall.md
@ -24,7 +24,7 @@ Ubuntu, Debian:
   ```console
   $ sudo apt-get remove docker-compose-plugin
   ```
-RPM-based distros:
+RPM-based distributions:

   ```console
   $ sudo yum remove docker-compose-plugin
--- a/content/manuals/compose/releases/release-notes.md
+++ b/content/manuals/compose/releases/release-notes.md
@ -1751,7 +1751,7 @@ For a list of PRs and issues fixed in this release, see [Compose 1.28.3](https:/

 - Removed `None` entries on exec command.

- Added `distro` package to get distro information.
+- Added `distribution` package to get distribution information.

 - Added `python-dotenv` to delegate `.env` file processing.

--- a/content/manuals/desktop/features/wsl/_index.md
+++ b/content/manuals/desktop/features/wsl/_index.md
@ -58,11 +58,11 @@ Now `docker` commands work from Windows using the new WSL 2 engine.
 > If you want to change the location, for example, to another drive you can do so via the `Settings -> Resources -> Advanced` page from the Docker Dashboard.
 > Read more about this and other Windows settings at [Changing settings](/manuals/desktop/settings-and-maintenance/settings.md)

-## Enabling Docker support in WSL 2 distros
+## Enabling Docker support in WSL 2 distributions

-WSL 2 adds support for "Linux distros" to Windows, where each distro behaves like a VM except they all run on top of a single shared Linux kernel.
+WSL 2 adds support for "Linux distributions" to Windows, where each distribution behaves like a VM except they all run on top of a single shared Linux kernel.

-Docker Desktop does not require any particular Linux distros to be installed. The `docker` CLI and UI all work fine from Windows without any additional Linux distros. However for the best developer experience, we recommend installing at least one additional distro and enable Docker support:
+Docker Desktop does not require any particular Linux distributions to be installed. The `docker` CLI and UI all work fine from Windows without any additional Linux distributions. However for the best developer experience, we recommend installing at least one additional distribution and enable Docker support:

 1. Ensure the distribution runs in WSL 2 mode. WSL can run distributions in both v1 or v2 mode.

@ -72,10 +72,10 @@ Docker Desktop does not require any particular Linux distros to be installed. Th
     $ wsl.exe -l -v
     ```

-    To upgrade the Linux distro to v2, run:
+    To upgrade the Linux distribution to v2, run:

    ```console
-    $ wsl.exe --set-version (distro name) 2
+    $ wsl.exe --set-version (distribution name) 2
    ```

    To set v2 as the default version for future installations, run:
@ -86,19 +86,19 @@ Docker Desktop does not require any particular Linux distros to be installed. Th

 2. When Docker Desktop starts, go to **Settings** > **Resources** > **WSL Integration**.

-    The Docker-WSL integration is enabled on the default WSL distribution, which is [Ubuntu](https://learn.microsoft.com/en-us/windows/wsl/install). To change your default WSL distro, run:
+    The Docker-WSL integration is enabled on the default WSL distribution, which is [Ubuntu](https://learn.microsoft.com/en-us/windows/wsl/install). To change your default WSL distribution, run:
     ```console
-    $ wsl --set-default <distro name>
+    $ wsl --set-default <distribution name>
    ```

 3. Select **Apply & Restart**.

 > [!NOTE]
 >
-> With Docker Desktop version 4.30 and earlier, Docker Desktop installed two special-purpose internal Linux distros `docker-desktop` and `docker-desktop-data`. `docker-desktop` is used to run the Docker engine `dockerd`, while `docker-desktop-data` stores containers and images. Neither can be used for general development.
+> With Docker Desktop version 4.30 and earlier, Docker Desktop installed two special-purpose internal Linux distributions `docker-desktop` and `docker-desktop-data`. `docker-desktop` is used to run the Docker engine `dockerd`, while `docker-desktop-data` stores containers and images. Neither can be used for general development.
 >
 > With fresh installations of Docker Desktop 4.30 and later, `docker-desktop-data` is no longer created. Instead, Docker Desktop creates and 
-> manages its own virtual hard disk for storage. The `docker-desktop` distro is still created and used to run the Docker engine.
+> manages its own virtual hard disk for storage. The `docker-desktop` distribution is still created and used to run the Docker engine.
 >
 > Note that Docker Desktop version 4.30 and later keeps using the `docker-desktop-data` distribution if it was already created by an earlier version of Docker Desktop and has not been freshly installed or factory reset.

--- a/content/manuals/desktop/features/wsl/use-wsl.md
+++ b/content/manuals/desktop/features/wsl/use-wsl.md
@ -6,11 +6,11 @@ aliases:
 - /desktop/wsl/use-wsl/
 ---

-The following section describes how to start developing your applications using Docker and WSL 2. We recommend that you have your code in your default Linux distribution for the best development experience using Docker and WSL 2. After you have turned on the WSL 2 feature on Docker Desktop, you can start working with your code inside the Linux distro and ideally with your IDE still in Windows. This workflow is straightforward if you are using [VS Code](https://code.visualstudio.com/download).
+The following section describes how to start developing your applications using Docker and WSL 2. We recommend that you have your code in your default Linux distribution for the best development experience using Docker and WSL 2. After you have turned on the WSL 2 feature on Docker Desktop, you can start working with your code inside the Linux distribution and ideally with your IDE still in Windows. This workflow is straightforward if you are using [VS Code](https://code.visualstudio.com/download).

 ## Develop with Docker and WSL 2

-1. Open VS Code and install the [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) extension. This extension lets you work with a remote server in the Linux distro and your IDE client still on Windows.
+1. Open VS Code and install the [Remote - WSL](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) extension. This extension lets you work with a remote server in the Linux distribution and your IDE client still on Windows.
 2. Open your terminal and type:

    ```console
@ -22,7 +22,7 @@ The following section describes how to start developing your applications using
    $ code .
    ```

-    This opens a new VS Code window connected remotely to your default Linux distro which you can check in the bottom corner of the screen.
+    This opens a new VS Code window connected remotely to your default Linux distribution which you can check in the bottom corner of the screen.


 Alternatively, you can open your default Linux distribution from the **Start** menu, navigate to your project directory, and then run `code .`
--- a/content/manuals/desktop/previous-versions/2.x-windows.md
+++ b/content/manuals/desktop/previous-versions/2.x-windows.md
@ -104,15 +104,15 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus

 ### WSL 2 changes

- Docker contexts are now synced between Windows and WSL distros.
+- Docker contexts are now synced between Windows and WSL distributions.
 - Fixed an issue that intermittently causes the backend to fail to start.
 - Fixed a proxy crash that happened when glibc was not compatible. See [docker/for-win#8183](https://github.com/docker/for-win/issues/8183).
 - Fixed an issue when removing a container mounting `/mnt/wsl` would break WSL integration. See [docker/for-win#7836](https://github.com/docker/for-win/issues/7836).
- Added support for mounting files from a distro using the Windows CLI (e.g. `docker run -v \\wsl$\Ubuntu\home\simon\web:/web ...`)
+- Added support for mounting files from a distribution using the Windows CLI (e.g. `docker run -v \\wsl$\Ubuntu\home\simon\web:/web ...`)
 - Fixed the error message when attempting to use a shared volume with a relative path. Fixes [docker/for-win#6894](https://github.com/docker/for-win/issues/6894).
 - Fixed an issue when updating Windows to a WSL 2 capable version, where a configuration file is locked by the old Hyper-V VM.
 - Fixed a discrepancy in the version of Docker Compose inside and outside of WSL 2. Fixes [docker/for-win#6461](https://github.com/docker/for-win/issues/6461).
- Detect when the `docker-desktop` wsl distro is stopped and display a clearer error message.
+- Detect when the `docker-desktop` wsl distribution is stopped and display a clearer error message.
 - Fix a race condition when exposing ports.
 - Enable dialog no longer blocks other windows.

@ -205,7 +205,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
 **WSL 2**

 - Docker Desktop only exposes host ports in Linux if the Windows port is available.
- Docker Desktop now allows users to refresh the list of distros.
+- Docker Desktop now allows users to refresh the list of distributions.
 - Docker Desktop defaults to WSL 2 on install on compatible OS versions.
 - Docker Desktop detects missing Linux kernel and adds a pointer to the Microsoft documentation to download the kernel.
 - Detect when the WSL 2 backend stops and allow the user to restart it.
--- a/content/manuals/desktop/previous-versions/edge-releases-windows.md
+++ b/content/manuals/desktop/previous-versions/edge-releases-windows.md
@ -179,7 +179,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for

 ### Bug fixes and minor changes

- Fixed an issue with Docker Desktop integration with other WSL 2 distros. See [docker/for-win#6894](https://github.com/docker/for-win/issues/6894)
+- Fixed an issue with Docker Desktop integration with other WSL 2 distributions. See [docker/for-win#6894](https://github.com/docker/for-win/issues/6894)
 - Fixed DNS resolution of short names. See [docker/for-win#4425](https://github.com/docker/for-win/issues/4425)

 ## Docker Desktop Community 2.3.5.1
@ -354,7 +354,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
 - Fixed an upgrade bug where users on versions still using the PowerShell-based VM management experience a silent un-installation crash leading to Docker Desktop being uninstalled instead of upgraded.
 - Fixed a crash when failing to login due to no Internet connection.
 - Fixed bug in handling shared volume paths with `..` characters. Fixes [docker/for-win#5375](https://github.com/docker/for-win/issues/5375).
- WSL 2: Docker Desktop detects when the wsl-distro is stopped and displays an actionable error message.
+- WSL 2: Docker Desktop detects when the wsl-distribution is stopped and displays an actionable error message.
 - Fixed a bug in `ftruncate` which prevented [libgit2sharp](https://github.com/libgit2/libgit2sharp) from cloning repositories on shared volumes. See [docker/for-win#5808](https://github.com/docker/for-win/issues/5808#issuecomment-610996272).
 - Fixed a bug that caused starting and stopping of a Compose application from the UI to fail when the path contains whitespace.

@ -423,7 +423,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for

 **WSL 2**
 - Docker Desktop only exposes host ports in Linux if the Windows port is available.
- Docker Desktop now allows users to refresh the list of Linux distros.
+- Docker Desktop now allows users to refresh the list of Linux distributions.
 - Docker Desktop defaults to WSL 2 on install on compatible OS versions.
 - Docker Desktop detects missing Linux kernel and adds a pointer to the Microsoft documentation to download the kernel.

@ -594,8 +594,8 @@ Added the ability to start and stop Compose-based applications and view combined
 - Fixed a container start error when a container has more than one port with an arbitrary or not-yet-configured external port number. For example, `docker run -p 80 -p 443 nginx`). Fixes [docker/for-win#4935](https://github.com/docker/for-win/issues/4935) and [docker/compose#6998](https://github.com/docker/compose/issues/6998).
 - Fixed an issue which caused Docker Desktop to crash when resetting to factory defaults while running Windows containers.
 - Fixed multiple issues related to Fast Startup.
- Injected Docker CLI, CLI plugins, Docker Compose, Notary, and kubectl into WSL distros when Docker Desktop WSL integration is enabled.
- Fixed an issue where bind mounts created with Docker Compose from a WSL distro were incorrectly translated. Fixes [docker/for-win#5084](https://github.com/docker/for-win/issues/5084).
+- Injected Docker CLI, CLI plugins, Docker Compose, Notary, and kubectl into WSL distributions when Docker Desktop WSL integration is enabled.
+- Fixed an issue where bind mounts created with Docker Compose from a WSL distribution were incorrectly translated. Fixes [docker/for-win#5084](https://github.com/docker/for-win/issues/5084).
 - Docker Desktop now supports inotify events on shared filesystems for Windows file sharing.
 - Fixed a cache invalidation bug when a file in a shared volume is renamed on the host for Windows file sharing.
 - Fixed a handle leak when calling `Mknod` on a shared volume for Windows file sharing.
--- a/content/manuals/desktop/release-notes.md
+++ b/content/manuals/desktop/release-notes.md
@ -202,7 +202,7 @@ Take a look at the [Docker Public Roadmap](https://github.com/orgs/docker/projec

 - Fixed a bug where Docker Desktop would reset docker's `credsStore` to `desktop` when the user's intention is to keep it empty. Fixes [docker/for-win#9843](https://github.com/docker/for-win/issues/9843).
 - Fixed a bug that would cause Docker Desktop to not start in the WSL2 engine  [docker/for-win#14034](https://github.com/docker/for-win/issues/14034).
- Fixed a bug that caused WSL distro to terminate abruptly. Fixes [docker/for-win/14230](https://github.com/docker/for-win/issues/14230).
+- Fixed a bug that caused WSL distribution to terminate abruptly. Fixes [docker/for-win/14230](https://github.com/docker/for-win/issues/14230).
 - Fixed an issue that caused WSL to update in each startup. Fixes [docker/for-win/13868](https://github.com/docker/for-win/issues/13868), [docker/for-win/13806](https://github.com/docker/for-win/issues/13806).

 ### Known issues
@ -615,7 +615,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
 #### For Windows

 - Fixed a bug where `docker run -v` would fail after switching between WSL 2 and Hyper-V.
- Fixed a bug where Docker Desktop was not stopping its WSL distros (`docker-desktop` and `docker-desktop-data`) when it was shutdown. Fixes [docker/for-win/issues/13443](https://github.com/docker/for-win/issues/13443) and [docker/for-win/issues/13938](https://github.com/docker/for-win/issues/13938).
+- Fixed a bug where Docker Desktop was not stopping its WSL distributions (`docker-desktop` and `docker-desktop-data`) when it was shutdown. Fixes [docker/for-win/issues/13443](https://github.com/docker/for-win/issues/13443) and [docker/for-win/issues/13938](https://github.com/docker/for-win/issues/13938).

 #### For Linux

@ -689,7 +689,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
 #### For Windows

 - Fixed an issue with DNS timeouts on Windows.
- Added support for Enhanced Container Isolation Docker socket mount permission on WSL user distros.
+- Added support for Enhanced Container Isolation Docker socket mount permission on WSL user distributions.
 - Fixed an issue that caused the `failed to get console mode` error when redirecting output from the CLI.
 - Fixed an issue with the engine socket permissions when mounted inside containers. Fixes [docker/for-win#13898](https://github.com/docker/for-win/issues/13898)

@ -1312,13 +1312,13 @@ This can be resolved by adding the user to the **docker-users** group. Before st

 - Fixed a bug on WSL 2 where if Desktop is paused, killed, and then restarted, the startup hangs unless WSL is shut down first with `wsl --shutdown`.
 - Fixed the WSL engine in cases where wsl.exe is not on the PATH [docker/for-win#13547](https://github.com/docker/for-win/issues/13547).
- Fixed the WSL engine's ability to detect cases where one of the Docker Desktop distros' drive is missing [docker/for-win#13554](https://github.com/docker/for-win/issues/13554).
+- Fixed the WSL engine's ability to detect cases where one of the Docker Desktop distributions' drive is missing [docker/for-win#13554](https://github.com/docker/for-win/issues/13554).
 - A slow or unresponsive WSL integration no longer prevents Docker Desktop from starting. Fixes [docker/for-win#13549](https://github.com/docker/for-win/issues/13549).
 - Fixed a bug that caused Docker Desktop to crash on startup [docker/for-win#6890](https://github.com/docker/for-mac/issues/6890).
 - Added the following installer flags:
  - `--hyper-v-default-data-root` which specifies the default location for Hyper-V VM disk.
  - `--windows-containers-default-data-root` which specifies the default data root for Windows Containers.
-  - `--wsl-default-data-root` which specifies the default location for WSL distro disks.
+  - `--wsl-default-data-root` which specifies the default location for WSL distribution disks.

 ## 4.20.1

@ -1367,7 +1367,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st
 #### For Windows

 - Fixed a bug that meant WSL data could not be moved to a different disk. Fixes [docker/for-win#13269](https://github.com/docker/for-win/issues/13269).
- Fixed a bug where Docker Desktop was not stopping its WSL distros (docker-desktop and docker-desktop-data) when it was shutdown, consuming host memory unnecessarily.
+- Fixed a bug where Docker Desktop was not stopping its WSL distributions (docker-desktop and docker-desktop-data) when it was shutdown, consuming host memory unnecessarily.
 - Added a new setting that allows the Windows Docker daemon to use Docker Desktop's internal proxy when running Windows containers. See [Windows proxy settings](/manuals/desktop/settings-and-maintenance/settings.md#proxies).

 #### For Linux
@ -1581,11 +1581,11 @@ This can be resolved by adding the user to the **docker-users** group. Before st

 ### For Windows

- Added statical linking of WSL integration tools against `musl` so there is no need to install `alpine-pkg-glibc` in user distros.
+- Added statical linking of WSL integration tools against `musl` so there is no need to install `alpine-pkg-glibc` in user distributions.
 - Added support for running under cgroupv2 on WSL 2. This is activated by adding `kernelCommandLine = systemd.unified_cgroup_hierarchy=1 cgroup_no_v1=all` to your `%USERPROFILE%\.wslconfig` file in the `[wsl2]` section.
 - Fixed an issue that caused Docker Desktop to get stuck in the "starting" phase when in WSL 2 mode (introduced in 4.16).
 - Fixed Docker Desktop failing to start the WSL 2 backend when file system compression or encryption is enabled on `%LOCALAPPDATA%`.
- Fixed Docker Desktop failing to report a missing or outdated (incapable of running WSL version 2 distros) WSL installation when starting.
+- Fixed Docker Desktop failing to report a missing or outdated (incapable of running WSL version 2 distributions) WSL installation when starting.
 - Fixed a bug where opening in Visual Studio Code fails if the target path has a space.
 - Fixed a bug that causes `~/.docker/context` corruption and the error message "unexpected end of JSON input". You can also remove `~/.docker/context` to work around this problem.
 - Ensured the credential helper used in WSL 2 is properly signed. Related to [docker/for-win#10247](https://github.com/docker/for-win/issues/10247).
@ -2012,7 +2012,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

 #### For Windows

- Fixed `docker login` to private registries from WSL2 distro [docker/for-win#12871](https://github.com/docker/for-win/issues/12871)
+- Fixed `docker login` to private registries from WSL2 distribution [docker/for-win#12871](https://github.com/docker/for-win/issues/12871)

 ## 4.11.0

@ -2758,7 +2758,7 @@ actual memory usage. See

 #### For Windows

- Fixed a regression in WSL 2 integrations for some distros (e.g. Arch or Alpine). Fixes [docker/for-win#12229](https://github.com/docker/for-win/issues/12229)
+- Fixed a regression in WSL 2 integrations for some distributions (e.g. Arch or Alpine). Fixes [docker/for-win#12229](https://github.com/docker/for-win/issues/12229)
 - Fixed update notification overlay sometimes getting out of sync between the Settings button and the Software update button in the Dashboard.

 ## 4.1.0
@ -2779,7 +2779,7 @@ actual memory usage. See
 - [Go 1.17.1](https://github.com/golang/go/releases/tag/go1.17.1)
 - [Alpine 3.14](https://alpinelinux.org/posts/Alpine-3.14.0-released.html)
 - [Qemu 6.1.0](https://wiki.qemu.org/ChangeLog/6.1)
- Base distro to debian:bullseye
+- Base distribution to debian:bullseye

 ### Bug fixes and minor changes

@ -2791,7 +2791,7 @@ actual memory usage. See
 - Fixed CLI context switch sync with UI. See [docker/for-win#11721](https://github.com/docker/for-win/issues/11721).
 - Added the key `vpnKitMaxPortIdleTime` to `settings.json` to allow the idle network connection timeout to be disabled or extended.
 - Fixed a crash on exit. See [docker/for-win#12128](https://github.com/docker/for-win/issues/12128).
- Fixed a bug where the CLI tools would not be available in WSL 2 distros.
+- Fixed a bug where the CLI tools would not be available in WSL 2 distributions.
 - Fixed switching from Linux to Windows containers that was stuck because access rights on panic.log. See [for-win#11899](https://github.com/docker/for-win/issues/11899).

 ### Known Issues
@ -2857,5 +2857,5 @@ For more information, see [Docker subscription overview](../subscription/_index.

 #### For Windows

- Fixed a bug where the CLI tools would not be available in WSL 2 distros.
+- Fixed a bug where the CLI tools would not be available in WSL 2 distributions.
 - Fixed a bug when switching from Linux to Windows containers due to access rights on `panic.log`. [for-win#11899](https://github.com/docker/for-win/issues/11899)
--- a/content/manuals/desktop/settings-and-maintenance/settings.md
+++ b/content/manuals/desktop/settings-and-maintenance/settings.md
@ -313,8 +313,8 @@ On Windows in WSL 2 mode, you can configure which WSL 2 distributions will have
 WSL integration.

 By default, the integration is enabled on your default WSL distribution.
-To change your default WSL distro, run `wsl --set-default <distro name>`. (For example,
-to set Ubuntu as your default WSL distro, run `wsl --set-default ubuntu`).
+To change your default WSL distribution, run `wsl --set-default <distribution name>`. (For example,
+to set Ubuntu as your default WSL distribution, run `wsl --set-default ubuntu`).

 You can also select any additional distributions you would like to enable the WSL 2 integration on.

--- a/content/manuals/desktop/setup/install/linux/_index.md
+++ b/content/manuals/desktop/setup/install/linux/_index.md
@ -138,7 +138,7 @@ To install Docker Desktop successfully, your Linux host must meet the following
 - QEMU must be version 5.2 or later. We recommend upgrading to the latest version.
 - systemd init system.
 - Gnome, KDE, or MATE Desktop environment.
-  - For many Linux distros, the Gnome environment does not support tray icons. To add support for tray icons, you need to install a Gnome extension. For example, [AppIndicator](https://extensions.gnome.org/extension/615/appindicator-support/).
+  - For many Linux distributions, the Gnome environment does not support tray icons. To add support for tray icons, you need to install a Gnome extension. For example, [AppIndicator](https://extensions.gnome.org/extension/615/appindicator-support/).
 - At least 4 GB of RAM.
 - Enable configuring ID mapping in user namespaces, see [File sharing](/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md#how-do-i-enable-file-sharing). Note that for Docker Desktop version 4.35 and later, this is not required anymore.
 - Recommended: [Initialize `pass`](/manuals/desktop/setup/sign-in.md#credentials-management-for-linux-users) for credentials management.
--- a/content/manuals/desktop/use-desktop/resource-saver.md
+++ b/content/manuals/desktop/use-desktop/resource-saver.md
@ -63,8 +63,8 @@ feature, as it results in much better CPU and memory savings.

 Resource Saver works a bit differently on Windows with WSL. Instead of
 stopping the WSL VM, it only pauses the Docker Engine inside the
-`docker-desktop` WSL distro. That's because in WSL there's a single Linux VM
-shared by all WSL distros, so Docker Desktop can't stop the Linux VM (i.e.,
+`docker-desktop` WSL distribution. That's because in WSL there's a single Linux VM
+shared by all WSL distributions, so Docker Desktop can't stop the Linux VM (i.e.,
 the WSL Linux VM is not owned by Docker Desktop). As a result, Resource Saver
 reduces CPU utilization on WSL, but it does not reduce Docker's memory
 utilization. 
--- a/content/manuals/engine/containers/runmetrics.md
+++ b/content/manuals/engine/containers/runmetrics.md
@ -38,7 +38,7 @@ CPU, memory, and block I/O usage. You can access those metrics and
 obtain network usage metrics as well. This is relevant for "pure" LXC
 containers, as well as for Docker containers.

-Control groups are exposed through a pseudo-filesystem. In modern distros, you
+Control groups are exposed through a pseudo-filesystem. In modern distributions, you
 should find this filesystem under `/sys/fs/cgroup`. Under that directory, you
 see multiple sub-directories, called `devices`, `freezer`, `blkio`, and so on.
 Each sub-directory actually corresponds to a different cgroup hierarchy.
@ -151,7 +151,7 @@ more pseudo-files exist and contain statistics.

 Memory metrics are found in the `memory` cgroup. The memory
 control group adds a little overhead, because it does very fine-grained
-accounting of the memory usage on your host. Therefore, many distros
+accounting of the memory usage on your host. Therefore, many distributions
 chose to not enable it by default. Generally, to enable it, all you have
 to do is to add some kernel command-line parameters:
 `cgroup_enable=memory swapaccount=1`.
--- a/content/manuals/engine/install/_index.md
+++ b/content/manuals/engine/install/_index.md
@ -54,32 +54,32 @@ through Docker Desktop. For instructions on how to install Docker Desktop, see:
 | [Ubuntu](ubuntu.md)                            |       ✅       |       ✅        |      ✅      |   ✅    |  ✅   |
 | [Binaries](binaries.md)                        |       ✅       |       ✅        |      ✅      |         |       |

-### Other Linux distros
+### Other Linux distributions

 > [!NOTE]
 >
 > While the following instructions may work, Docker doesn't test or verify
-> installation on distro derivatives.
+> installation on distribution derivatives.

 - If you use Debian derivatives such as "BunsenLabs Linux", "Kali Linux" or 
  "LMDE" (Debian-based Mint) should follow the installation instructions for
-  [Debian](debian.md), substitute the version of your distro for the
-  corresponding Debian release. Refer to the documentation of your distro to find
+  [Debian](debian.md), substitute the version of your distribution for the
+  corresponding Debian release. Refer to the documentation of your distribution to find
  which Debian release corresponds with your derivative version.
 - Likewise, if you use Ubuntu derivatives such as "Kubuntu", "Lubuntu" or "Xubuntu"
  you should follow the installation instructions for [Ubuntu](ubuntu.md),
-  substituting the version of your distro for the corresponding Ubuntu release.
-  Refer to the documentation of your distro to find which Ubuntu release
+  substituting the version of your distribution for the corresponding Ubuntu release.
+  Refer to the documentation of your distribution to find which Ubuntu release
  corresponds with your derivative version.
- Some Linux distros provide a package of Docker Engine through their
+- Some Linux distributions provide a package of Docker Engine through their
  package repositories. These packages are built and maintained by the Linux
-  distro's package maintainers and may have differences in configuration
+  distribution's package maintainers and may have differences in configuration
  or are built from modified source code. Docker isn't involved in releasing these
  packages and you should report any bugs or issues involving these packages to
-  your Linux distro's issue tracker.
+  your Linux distribution's issue tracker.

 Docker provides [binaries](binaries.md) for manual installation of Docker Engine.
-These binaries are statically linked and you can use them on any Linux distro.
+These binaries are statically linked and you can use them on any Linux distribution.

 ## Release channels

--- a/content/manuals/engine/install/debian.md
+++ b/content/manuals/engine/install/debian.md
@ -123,7 +123,7 @@ Docker from the repository.

   > [!NOTE]
   >
-   > If you use a derivative distro, such as Kali Linux,
+   > If you use a derivative distribution, such as Kali Linux,
   > you may need to substitute the part of this command that's expected to
   > print the version codename:
   >
--- a/content/manuals/engine/install/ubuntu.md
+++ b/content/manuals/engine/install/ubuntu.md
@ -134,7 +134,7 @@ Docker from the repository.

   > [!NOTE]
   >
-   > If you use an Ubuntu derivative distro, such as Linux Mint,
+   > If you use an Ubuntu derivative distribution, such as Linux Mint,
   > you may need to use `UBUNTU_CODENAME` instead of `VERSION_CODENAME`.

 2. Install the Docker packages.
--- a/content/manuals/engine/release-notes/18.09.md
+++ b/content/manuals/engine/release-notes/18.09.md
@ -16,7 +16,7 @@ toc_max: 2
 > ```
 > 
 > See the [installation instructions](../install/_index.md) for the corresponding
-> Linux distro for details.
+> Linux distribution for details.

 ## 18.09.9
 2019-09-03
--- a/content/manuals/engine/release-notes/20.10.md
+++ b/content/manuals/engine/release-notes/20.10.md
@ -50,7 +50,7 @@ Docker Buildx, containerd, and some minor bug fixes and enhancements.
 - Update Docker Compose to [v2.15.1](https://github.com/docker/compose/releases/tag/v2.15.1).
 - Update Docker Buildx to [v0.10.0](https://github.com/docker/buildx/releases/tag/v0.10.0).
 - Update containerd (`containerd.io` package) to [v1.6.15](https://github.com/containerd/containerd/releases/tag/v1.6.15).
- Update the package versioning format for `docker-compose-cli` to allow distro version updates [docker/docker-ce-packaging#822](https://github.com/docker/docker-ce-packaging/pull/822).
+- Update the package versioning format for `docker-compose-cli` to allow distribution version updates [docker/docker-ce-packaging#822](https://github.com/docker/docker-ce-packaging/pull/822).
 - Update Go runtime to [1.18.10](https://go.dev/doc/devel/release#go1.18.minor),

 ### Bug fixes and enhancements
@ -365,13 +365,13 @@ the latest version. Use the instructions below to update `docker scan` to the la
 version. You can also use these instructions to install, or upgrade the `docker scan`
 package without upgrading the Docker Engine:

-On `.deb` based distros, such as Ubuntu and Debian:
+On `.deb` based distributions, such as Ubuntu and Debian:

 ```console
 $ apt-get update && apt-get install docker-scan-plugin
 ```

-On rpm-based distros, such as CentOS or Fedora:
+On rpm-based distributions, such as CentOS or Fedora:

 ```console
 $ yum install docker-scan-plugin
--- a/content/manuals/engine/release-notes/prior-releases.md
+++ b/content/manuals/engine/release-notes/prior-releases.md
@ -518,7 +518,7 @@ systemctl restart docker` to reload changes and (re)start the docker daemon.

 - Run "dnf upgrade" before installing in fedora [#29150](https://github.com/docker/docker/pull/29150)
 - Add build-date back to RPM packages [#29150](https://github.com/docker/docker/pull/29150)
- deb package filename changed to include distro to distinguish between distro code names [#27829](https://github.com/docker/docker/pull/27829)
+- deb package filename changed to include distribution to distinguish between distribution code names [#27829](https://github.com/docker/docker/pull/27829)

 ## 1.12.3 (2016-10-26)

@ -704,7 +704,7 @@ systemctl restart docker` to reload changes and (re)start the docker daemon.
 ### Contrib

 + Official ARM installation for Debian Jessie, Ubuntu Trusty, and Raspbian Jessie [#24815](https://github.com/docker/docker/pull/24815) [#25591](https://github.com/docker/docker/pull/25637)
- Add selinux policy per distro/version, fixing issue preventing successful installation on Fedora 24, and Oracle Linux [#25334](https://github.com/docker/docker/pull/25334) [#25593](https://github.com/docker/docker/pull/25593)
+- Add selinux policy per distribution/version, fixing issue preventing successful installation on Fedora 24, and Oracle Linux [#25334](https://github.com/docker/docker/pull/25334) [#25593](https://github.com/docker/docker/pull/25593)

 ### Networking

--- a/content/manuals/engine/security/rootless.md
+++ b/content/manuals/engine/security/rootless.md
@ -27,7 +27,7 @@ UIDs/GIDs to be used in the user namespace.
 ## Prerequisites

 -  You must install `newuidmap` and `newgidmap` on the host. These commands
-  are provided by the `uidmap` package on most distros.
+  are provided by the `uidmap` package on most distributions.

 - `/etc/subuid` and `/etc/subgid` should contain at least 65,536 subordinate
  UIDs/GIDs for the user. In the following example, the user `testuser` has
@ -123,7 +123,7 @@ testuser:231072:65536
  This step is not required on openSUSE Tumbleweed.

 - `sudo modprobe ip_tables iptable_mangle iptable_nat iptable_filter` is required.
-  This might be required on other distros as well depending on the configuration.
+  This might be required on other distributions as well depending on the configuration.

 - Known to work on openSUSE 15 and SLES 15.
 {{< /tab >}}
--- a/content/manuals/security/faqs/networking-and-vms.md
+++ b/content/manuals/security/faqs/networking-and-vms.md
@ -35,4 +35,4 @@ On Mac it is an unprivileged operation to start a VM, so that is not enforced by

 ### How does Docker Desktop achieve network level isolation when Hyper-V and/or WSL2 is used?

-The VM processes are the same for both WSL 2 (running inside the `docker-desktop` distro) and Hyper-V (running inside the `DockerDesktopVM`). Host/VM communication uses `AF_VSOCK` hypervisor sockets (shared memory). It does not use Hyper-V network switches or network interfaces. All host networking is performed using normal TCP/IP sockets from the `com.docker.vpnkit.exe` and `com.docker.backend.exe` processes. For more information see [How Docker Desktop networking works under the hood](https://www.docker.com/blog/how-docker-desktop-networking-works-under-the-hood/).
+The VM processes are the same for both WSL 2 (running inside the `docker-desktop` distribution) and Hyper-V (running inside the `DockerDesktopVM`). Host/VM communication uses `AF_VSOCK` hypervisor sockets (shared memory). It does not use Hyper-V network switches or network interfaces. All host networking is performed using normal TCP/IP sockets from the `com.docker.vpnkit.exe` and `com.docker.backend.exe` processes. For more information see [How Docker Desktop networking works under the hood](https://www.docker.com/blog/how-docker-desktop-networking-works-under-the-hood/).
--- a/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/limitations.md
+++ b/content/manuals/security/for-admins/hardened-desktop/enhanced-container-isolation/limitations.md
@ -36,9 +36,9 @@ Note however that ECI on WSL is not as secure as on Hyper-V because:
  ECI on Hyper-V does not allow Docker Desktop users to breach the Docker
  Desktop Linux VM.

-* With WSL 2, all WSL 2 distros on the same Windows host share the same instance
+* With WSL 2, all WSL 2 distributions on the same Windows host share the same instance
  of the Linux kernel. As a result, Docker Desktop can't ensure the integrity of
-  the kernel in the Docker Desktop Linux VM since another WSL 2 distro could
+  the kernel in the Docker Desktop Linux VM since another WSL 2 distribution could
  modify shared kernel settings. In contrast, when using Hyper-V, the Docker
  Desktop Linux VM has a dedicated kernel that is solely under the control of
  Docker Desktop.
@ -53,8 +53,8 @@ The table below summarizes this.

 In general, using ECI with Hyper-V is more secure than with WSL 2. But WSL 2
 offers advantages for performance and resource utilization on the host machine,
-and it's an excellent way for users to run their favorite Linux distro on
-Windows hosts and access Docker from within (see Docker Desktop's WSL distro
+and it's an excellent way for users to run their favorite Linux distribution on
+Windows hosts and access Docker from within (see Docker Desktop's WSL distribution
 integration feature, enabled via the Dashboard's **Settings** > **Resources** > **WSL Integration**).

 ### ECI protection for Docker Builds with the "Docker" driver