ENGDOCS-1733 (#18457)

* ENGDOCS-1733

* Apply suggestions from code review

Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>

---------

Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>

content/compose/faq.md

@@ -1,6 +1,6 @@
 ---
 description: Frequently asked questions for Docker Compose
-keywords: documentation, docs,  docker, compose, faq
+keywords: documentation, docs,  docker, compose, faq, docker compose vs docker-compose
 title: Compose FAQs
 ---
 
@@ -23,10 +23,18 @@ individuals, we have a number of open channels for communication.
 
 There are [many examples of Compose files on GitHub](https://github.com/docker/awesome-compose).
 
+### What is the difference between `docker compose` and `docker-compose`
+
+Version one of the Docker Compose command-line binary was first released in 2014. It was written in Python, and is invoked with `docker-compose`. Typically, Compose V1 projects include a top-level version element in the compose.yml file, with values ranging from 2.0 to 3.8, which refer to the specific file formats.
+
+Version two of the Docker Compose command-line binary was announced in 2020, is written in Go, and is invoked with `docker compose`. Compose V2 ignores the version top-level element in the compose.yml file.
+
+For further information, see [History and development of Compose](history.md).
+
 ### What's the difference between `up`, `run`, and `start`?
 
 Typically, you want `docker compose up`. Use `up` to start or restart all the
-services defined in a `docker-compose.yml`. In the default "attached"
+services defined in a `compose.yml`. In the default "attached"
 mode, you see all the logs from all the containers. In "detached" mode (`-d`),
 Compose exits after starting the containers, but the containers continue to run
 in the background.

content/compose/history.md

@@ -1,7 +1,7 @@
 ---
 title: History and development of Docker Compose
 description: History of Compose V1 and Compose YAML schema versioning
-keywords: compose, compose yaml, swarm, migration, compatibility
+keywords: compose, compose yaml, swarm, migration, compatibility, docker compose vs docker-compose
 ---
 
 {{< include "compose-eol.md" >}}

content/compose/migrate.md

@@ -1,7 +1,7 @@
 ---
 title: Migrate to Compose V2
 description: How to migrate from Compose V1 to V2
-keywords: compose, upgrade, migration, v1, v2
+keywords: compose, upgrade, migration, v1, v2, docker compose vs docker-compose
 aliases:
 - /compose/compose-v2/
 - /compose/cli-command-compatibility/

content/desktop/_index.md

@@ -48,7 +48,7 @@ aliases:
 Docker Desktop is a one-click-install application for your Mac, Linux, or Windows environment
 that lets you to build, share, and run containerized applications and microservices. 
 
-It provides a straightforward GUI (Graphical User Interface) that lets you manage your containers, applications, and images directly from your machine. Docker Desktop can be used either on its own or as a complementary tool to the CLI. 
+It provides a straightforward GUI (Graphical User Interface) that lets you manage your containers, applications, and images directly from your machine. You can use Docker Desktop either on its own or as a complementary tool to the CLI. 
 
 Docker Desktop reduces the time spent on complex setups so you can focus on writing code. It takes care of port mappings, file system concerns, and other default settings, and is regularly updated with bug fixes and security updates.
 

content/desktop/containerd/_index.md

@@ -18,11 +18,11 @@ image and file system management in the Docker Engine.
 
 ## What is the containerd image store?
 
-containerd is a container runtime that manages the container lifecycle, and
+`containerd` is a container runtime that manages the container lifecycle, and
 provides image and filesystem management. It's a low-level building block,
 designed to be integrated into other systems, such as Docker and Kubernetes.
 
-Docker Engine already uses containerd for container lifecycle management, which
+Docker Engine already uses `containerd` for container lifecycle management, which
 includes creating, starting, and stopping containers. This page describes the
 next step of containerd integration for Docker Engine: the image store.
 
@@ -34,7 +34,7 @@ Docker Engine, including:
   or [nydus][2] and [dragonfly][3] for peer-to-peer image distribution.
 - Natively store and build multi-platform images, and other OCI content types
   that may emerge in the future.
-- Ability to run Wasm containers
+- Ability to run [Wasm](../wasm/_index.md) containers
 
 [1]: https://github.com/containerd/stargz-snapshotter
 [2]: https://github.com/containerd/nydus-snapshotter
@@ -50,9 +50,10 @@ The containerd image store beta feature is turned off by default.
 To start using the feature:
 
 1. Navigate to **Settings**.
-2. Select the **Beta** features tab.
+2. From the **Features in development** tab, select **Beta features**.
 3. Next to **Use containerd for pulling and storing images**, select the
    checkbox.
+4. Select **Apply & Restart**
 
 To turn off this feature, clear the **Use containerd for pulling and storing 
 images** checkbox.

content/desktop/faqs/linuxfaqs.md

@@ -40,7 +40,7 @@ $ sudo systemctl disable docker docker.socket containerd
 ```
 
 #### How do I switch between Docker Desktop and Docker Engine
-{ #context }
+
 
 The Docker CLI can be used to interact with multiple Docker Engines. For example,
 you can use the same Docker CLI to control a local Docker Engine and to control
@@ -186,9 +186,9 @@ To move the disk image file to a different location:
 
 1. Select **Settings** then  **Advanced** from the **Resources** tab.
 
-2. In the **Disk image location** section, click **Browse** and choose a new location for the disk image.
+2. In the **Disk image location** section, select **Browse** and choose a new location for the disk image.
 
-3. Click **Apply & Restart** for the changes to take effect.
+3. Select **Apply & Restart** for the changes to take effect.
 
 Do not move the file directly in Finder as this can cause Docker Desktop to lose track of the file.
 
@@ -250,6 +250,6 @@ To reduce the maximum size of the disk image file:
 
 2. The **Disk image size** section contains a slider that allows you to change the maximum size of the disk image. Adjust the slider to set a lower limit.
 
-3. Click **Apply & Restart**.
+3. Select **Apply & Restart**.
 
 When you reduce the maximum size, the current disk image file is deleted, and therefore, all containers and images will be lost.

content/desktop/faqs/macfaqs.md

@@ -51,9 +51,9 @@ To move the disk image file to a different location:
 
 1. Select **Settings** then  **Advanced** from the **Resources** tab.
 
-2. In the **Disk image location** section, click **Browse** and choose a new location for the disk image.
+2. In the **Disk image location** section, select **Browse** and choose a new location for the disk image.
 
-3. Click **Apply & Restart** for the changes to take effect.
+3. Select **Apply & Restart** for the changes to take effect.
 
 Do not move the file directly in Finder as this can cause Docker Desktop to lose track of the file.
 
@@ -115,7 +115,7 @@ To reduce the maximum size of the disk image file:
 
 2. The **Disk image size** section contains a slider that allows you to change the maximum size of the disk image. Adjust the slider to set a lower limit.
 
-3. Click **Apply & Restart**.
+3. Select **Apply & Restart**.
 
 When you reduce the maximum size, the current disk image file is deleted, and therefore, all containers and images will be lost.
 

content/desktop/faqs/windowsfaqs.md

@@ -32,7 +32,7 @@ Docker Desktop displays the **Docker Desktop - Access Denied** error if a Window
 
 If your admin account is different to your user account, add the **docker-users** group. Run **Computer Management** as an administrator and navigate to **Local Users* and Groups** > **Groups** > **docker-users**.
 
-Right-click to add the user to the group. Log out and log back in for the changes to take effect.
+Right-click to add the user to the group. Sign out and sign back in for the changes to take effect.
 
 ### Why does Docker Desktop fail to start when anti-virus software is installed?
 
@@ -100,7 +100,7 @@ To learn more about how to set the client TLS certificate for verification, see
 [Verify repository client with certificates](../../engine/security/certificates.md)
 in the Docker Engine topics.
 
-## How do I switch between Windows and Linux containers
+### How do I switch between Windows and Linux containers
 
 From the Docker Desktop menu, you can toggle which daemon (Linux or Windows)
 the Docker CLI talks to. Select **Switch to Windows containers** to use Windows

content/desktop/hardened-desktop/_index.md

@@ -41,6 +41,4 @@ Hardened Docker Desktop includes:
 
 The features of Hardened Docker Desktop operate independently of each other. When used together, these mechanisms defend against attacks at different functional layers of the developer workflow, providing a defense-in-depth approach to securing developer environments.
 
-Docker plans to continue adding more security enhancements to the Hardened Docker Desktop security model.
-
 {{< grid >}}

content/desktop/hardened-desktop/settings-management/_index.md

@@ -17,8 +17,8 @@ It is available with [Docker Desktop 4.13.0 and later](../../release-notes.md).
 
 ### Who is it for?
 
-- For Organizations who wish to configure Docker Desktop to be within their organization's centralized control.
-- For Organizations who want to create a standardized Docker Desktop environment at scale.
+- For organizations that want to configure Docker Desktop to be within their organization's centralized control.
+- For organizations that want to create a standardized Docker Desktop environment at scale.
 - For Docker Business customers who want to confidently manage their use of Docker Desktop within tightly regulated environments.
 
 ### How does it work?

content/desktop/install/mac-install.md

@@ -57,7 +57,8 @@ Beginning with Docker Desktop 4.3.0, we have removed the hard requirement to ins
 
 ## Install and run Docker Desktop on Mac
 
-### Install interactively
+{{< tabs >}}
+{{< tab name="Install interactively" >}}
 
 1. Double-click `Docker.dmg` to open the installer, then drag the Docker icon to
     the **Applications** folder.
@@ -65,9 +66,13 @@ Beginning with Docker Desktop 4.3.0, we have removed the hard requirement to ins
 
 2. Double-click `Docker.app` in the **Applications** folder to start Docker.
 
-3. The Docker menu ({{< inline-image src="images/whale-x.svg" alt="whale menu" >}}) displays the Docker Subscription Service Agreement.
+3. The Docker menu displays the Docker Subscription Service Agreement.
 
-    {{< include "desktop-license-update.md" >}}
+    Here’s a summary of the key points: 
+    - Docker Desktop is free for small businesses (fewer than 250 employees AND less than $10 million in annual revenue), personal use, education, and non-commercial open source projects.
+    - Otherwise, it requires a paid subscription for professional use.
+    - Paid subscriptions are also required for government entities.
+    - Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
 
 4. Select **Accept** to continue. 
 
@@ -79,7 +84,8 @@ Beginning with Docker Desktop 4.3.0, we have removed the hard requirement to ins
    - **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](../settings/mac.md#advanced), for more information and how to set the location of the Docker CLI tools.
 6. Select **Finish**. If you have applied any of the above configurations that require a password in step 5, enter your password to confirm your choice.  
 
-### Install from the command line
+{{< /tab >}}
+{{< tab name="Install from the command line" >}}
 
 After downloading `Docker.dmg`, run the following commands in a terminal to install Docker Desktop in the **Applications** folder:
 
@@ -104,7 +110,10 @@ The `install` command accepts the following flags:
 - `--override-proxy-https=<URL>`: Sets the URL of the HTTP proxy that must be used for outgoing HTTPS requests, requires `--proxy-http-mode` to be `manual`
 - `--override-proxy-exclude=<hosts/domains>`: Bypasses proxy settings for the hosts and domains. It's a comma-separated list.
 
-## Where to go next
+{{< /tab >}}
+{{< /tabs >}}
+
+## Where to go next 
 
 - [Get started with Docker](../../get-started/index.md) provides a general Docker tutorial.
 - [Explore Docker Desktop](../use-desktop/index.md) and all its features.

content/desktop/install/windows-install.md

@@ -45,8 +45,7 @@ _For checksums, see [Release notes](../release-notes.md)_
 
   - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation)
   - 4GB system RAM
-  - BIOS-level hardware virtualization support must be turned on in the
-    BIOS settings. For more information, see
+  - Enable hardware virtualization in BIOS. For more information, see
     [Virtualization](../troubleshoot/topics.md#virtualization).
 
 > **Important**
@@ -67,13 +66,13 @@ _For checksums, see [Release notes](../release-notes.md)_
 
   For Windows 10 and Windows 11 Home, see the system requirements in the WSL 2 backend tab.
 
-- Hyper-V and Containers Windows features must be turned on.
+- Turn on Hyper-V and Containers Windows features.
 - The following hardware prerequisites are required to successfully run Client
   Hyper-V on Windows 10:
 
   - 64 bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation)
   - 4GB system RAM
-  - BIOS-level hardware virtualization support must be turned on in the
+  - Turn on BIOS-level hardware virtualization support in the
     BIOS settings. For more information, see
     [Virtualization](../troubleshoot/topics.md#virtualization).
 
@@ -98,7 +97,7 @@ Running Docker Desktop inside a VMware ESXi or Azure VM is supported for Docker
 It requires enabling nested virtualization on the hypervisor first.
 For more information, see [Running Docker Desktop in a VM or VDI environment](../vm-vdi.md).
 
-### About Windows containers
+{{< accordion title="About Windows containers" >}}
 
 Looking for information on using Windows containers?
 
@@ -110,10 +109,12 @@ Looking for information on using Windows containers?
 - Docker Container Platform for Windows [articles and blog
   posts](https://www.docker.com/microsoft/) on the Docker website.
 
+{{< /accordion >}}
 
 ## Install Docker Desktop on Windows
 
-### Install interactively
+{{< tabs >}}
+{{< tab name="Install interactively" >}}
 
 1. Double-click **Docker Desktop Installer.exe** to run the installer.
 
@@ -128,7 +129,8 @@ Looking for information on using Windows containers?
 5. If your admin account is different to your user account, you must add the user to the **docker-users** group. Run **Computer Management** as an **administrator** and navigate to **Local Users and Groups** > **Groups** > **docker-users**. Right-click to add the user to the group.
    Sign out and sign back in for the changes to take effect.
 
-### Install from the command line
+{{< /tab >}}
+{{< tab name="Install from the command line" >}}
 
 After downloading **Docker Desktop Installer.exe**, run the following command in a terminal to install Docker Desktop:
 
@@ -175,6 +177,8 @@ If your admin account is different to your user account, you must add the user t
 ```console
 $ net localgroup docker-users <user> /add
 ```
+{{< /tab >}}
+{{< /tabs >}}
 
 ## Start Docker Desktop
 

content/desktop/mac/permission-requirements.md

@@ -14,7 +14,7 @@ It also provides clarity on running containers as `root` as opposed to having `r
 
 ## Permission requirements
 
-Docker Desktop for Mac is run as an unprivileged user. However, certain functionalities are required for Docker Desktop to perform a limited set of privileged configurations such as:
+Docker Desktop for Mac is run as an unprivileged user. However, Docker Desktop requires certain functionalities to perform a limited set of privileged configurations such as:
  - [Installing symlinks](#installing-symlinks) in`/usr/local/bin`. 
  - [Binding privileged ports](#binding-privileged-ports) that are less than 1024. The so-called "privileged ports" are not generally used as a security boundary, however operating systems still prevent unprivileged processes from binding them which breaks commands like `docker run -p 127.0.0.1:80:80 docker/getting-started`.
  - [Ensuring `localhost` and `kubernetes.docker.internal` are defined](#ensuring-localhost-and-kubernetesdockerinternal-are-defined) in `/etc/hosts`. Some old macOS installs don't have `localhost` in `/etc/hosts`, which causes Docker to fail. Defining the DNS name `kubernetes.docker.internal` allows Docker to share Kubernetes contexts with containers.
@@ -27,7 +27,7 @@ Depending on which version of Docker Desktop for Mac is used, privileged access
 
 From version 4.18 and later, Docker Desktop for Mac provides greater control over functionality that's enabled during installation. 
 
-The first time Docker Desktop for Mac launches, you are presented with an installation window where you can choose to either use the default settings, which work for most developers and require privileged access to be granted, or use advanced settings. 
+The first time Docker Desktop for Mac launches, it presents an installation window where you can choose to either use the default settings, which work for most developers and requires you to grant privileged access, or use advanced settings. 
 
 If you work in an environment with elevated security requirements, for instance where local administrative access is prohibited, then you can use the advanced settings to remove the need for granting privileged access. You can configure:
 - The location of the Docker CLI tools either in the system or user directory
@@ -47,7 +47,7 @@ The only time Docker Desktop may start the privileged process is for binding pri
 {{< /tab >}}
 {{< tab name="Versions prior to 4.15" >}}
 
-Versions prior to 4.15 of Docker Desktop for Mac require `root` access to be granted on the first run. The first time that Docker Desktop is launched you receive an admin prompt to grant permission for the installation of the `com.docker.vmnetd` privileged helper service. For subsequent runs, `root` privileges aren't required. Following the principle of least privilege, this approach allows `root` access to be used only for the operations for which it's absolutely necessary, while still being able to use Docker Desktop as an unprivileged user. 
+Versions prior to 4.15 of Docker Desktop for Mac require `root` access to be granted on the first run. The first time that Docker Desktop launches you receive an admin prompt to grant permission for the installation of the `com.docker.vmnetd` privileged helper service. For subsequent runs, `root` privileges aren't required. Following the principle of least privilege, this approach allows `root` access to be used only for the operations for which it's absolutely necessary, while still being able to use Docker Desktop as an unprivileged user.
 All privileged operations are run using the privileged helper process `com.docker.vmnetd`.
 
 {{< /tab >}}
@@ -55,7 +55,7 @@ All privileged operations are run using the privileged helper process `com.docke
 
 ### Installing symlinks
 
-The Docker binaries are installed by default in `/Applications/Docker.app/Contents/Resources/bin`. Docker Desktop ensures the Docker CLI is on your PATH without having to reconfigure shells, log out then log back in for example. As on most systems `/usr/local/bin` is on the PATH by default, and so Docker Desktop creates symlinks for all Docker binaries in it.
+The Docker binaries are installed by default in `/Applications/Docker.app/Contents/Resources/bin`. Docker Desktop creates symlinks for the binaries in `/usr/local/bin`, which means they're automatically included in `PATH` on most systems.
 
 {{< tabs >}}
 {{< tab name="Version 4.18 and later" >}}

content/desktop/troubleshoot/known-issues.md

@@ -11,11 +11,6 @@ title: Known issues
 {{< tab name="For Mac with Intel chip" >}}
 * The Mac Activity Monitor reports that Docker is using twice the amount of memory it's actually using. This is due to a bug in MacOS. We have written [a detailed report](https://docs.google.com/document/d/17ZiQC1Tp9iH320K-uqVLyiJmk4DHJ3c4zgQetJiKYQM/edit?usp=sharing) on this.
 
-* You might encounter errors when using `docker-compose up` with Docker Desktop
-  (`ValueError: Extra Data`). We've identified this is likely related to data
-  and/or events being passed all at once rather than one by one, so sometimes
-  the data comes back as 2+ objects concatenated and causes an error.
-
 * Force-ejecting the `.dmg` after running `Docker.app` from it can cause the
   whale icon to become unresponsive, Docker tasks to show as not responding in
   the Activity Monitor, and for some processes to consume a large amount of CPU

content/desktop/troubleshoot/overview.md

@@ -15,13 +15,6 @@ aliases:
 - /docker-for-windows/troubleshoot/
 ---
 
-{{< cta
-  header="This feature requires a paid Docker subscription"
-  body="Docker Desktop offers support for developers subscribed to a Pro, Team, or a Business tier. Upgrade now to benefit from Docker Support."
-  url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
-  cta="Upgrade now"
->}}
-
 This page contains information on how to diagnose and troubleshoot Docker Desktop, and how to check the logs.
 
 ## Troubleshoot menu

content/desktop/use-desktop/pause.md

@@ -10,7 +10,8 @@ You can manually pause Docker Desktop by selecting the Docker menu {{< inline-im
 
 When you manually pause Docker Desktop, a paused status displays on the Docker menu and on the Docker Dashboard. You can still access the **Settings** and the **Troubleshoot** menu.
 
->**Note**
+>**Tip**
 >
-> The Resource Saver feature (v4.24+) is enabled by default and provides better
+> The Resource Saver feature, available in Docker Desktop version 4.24 and later, is enabled by default and provides better
 > CPU and memory savings and the manual Pause feature. See [here](resource-saver.md) for more info.
+{ .tip }

content/desktop/windows/permission-requirements.md

@@ -12,7 +12,7 @@ It also provides clarity on running containers as `root` as opposed to having `A
 
 ## Permission requirements
 
-While Docker Desktop on Windows can be run without having `Administrator` privileges, it does require them during installation. On installation you recieve a UAC prompt which allows a privileged helper service to be installed. After that, Docker Desktop can be run without administrator privileges, provided you are members of the `docker-users` group. If you performed the installation, you are automatically added to this group, but other users must be added manually. This allows the administrator to control who has access to Docker Desktop.
+While Docker Desktop on Windows can be run without having `Administrator` privileges, it does require them during installation. On installation you receive a UAC prompt which allows a privileged helper service to be installed. After that, Docker Desktop can be run without administrator privileges, provided you are members of the `docker-users` group. If you performed the installation, you are automatically added to this group, but other users must be added manually. This allows the administrator to control who has access to Docker Desktop.
 
 The reason for this approach is that Docker Desktop needs to perform a limited set of privileged operations which are conducted by the privileged helper process `com.docker.service`. This approach allows, following the principle of least privilege, `Administrator` access to be used only for the operations for which it is absolutely necessary, while still being able to use Docker Desktop as an unprivileged user.
 
@@ -35,7 +35,7 @@ The service performs the following functionalities:
 
 The service start mode depends on which container engine is selected, and, for WSL, on whether it is needed to maintain `host.docker.internal` and `gateway.docker.internal` in the Win32 hosts file. This is controlled by a setting under `Use the WSL 2 based engine` in the settings page. When this is set, WSL engine behaves the same as Hyper-V. So:
 - With Windows containers, or Hyper-v Linux containers, the service is started when the system boots and runs all the time, even when Docker Desktop isn't running. This is required so you can launch Docker Desktop without admin privileges. 
-- With WSL2 Linux containers, the service isn't necessary and therefore doesn't run automatically when the system boots. When you switche to Windows containers or Hyper-v Linux containers, or chooses to maintain `host.docker.internal` and `gateway.docker.internal` in the Win32 hosts file, a UAC prompt is displayed which asks you to accept the privileged operation to start the service. If accepted, the service is started and set to start automatically upon the next Windows boot.
+- With WSL2 Linux containers, the service isn't necessary and therefore doesn't run automatically when the system boots. When you switch to Windows containers or Hyper-V Linux containers, or choose to maintain `host.docker.internal` and `gateway.docker.internal` in the Win32 hosts file, a UAC prompt is displayed which asks you to accept the privileged operation to start the service. If accepted, the service is started and set to start automatically upon the next Windows boot.
 
 ## Containers running as root within the Linux VM