Merge pull request #13356 from docker/master

Publish updates from master

_data/glossary.yaml

@@ -71,14 +71,14 @@ Docker: |
   - The docker daemon process running on the host which manages images and containers
   (also called Docker Engine)
 Docker Desktop for Mac: |
-  [Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight
+  [Docker Desktop for Mac](/desktop/mac/) is an easy-to-install, lightweight
   Docker development environment designed specifically for the Mac. A native
   Mac application, Docker Desktop for Mac uses the macOS Hypervisor
   framework, networking, and filesystem. It's the best solution if you want
   to build, debug, test, package, and ship Dockerized applications on a
   Mac.
 Docker Desktop for Windows: |
-  [Docker Desktop for Windows](/docker-for-windows/) is an
+  [Docker Desktop for Windows](/desktop/windows/) is an
   easy-to-install, lightweight Docker development environment designed
   specifically for Windows 10 systems that support Microsoft Hyper-V
   (Professional, Enterprise and Education). Docker Desktop for Windows uses Hyper-V for

_data/redirects.csv

@@ -1,8 +1,8 @@
 source,destination
 /engine/quickstart/,/get-started/
 /engine/containers/,/engine/tutorials/
-/win/,/docker-for-windows/
+/win/,/desktop/windows/
-/mac/,/docker-for-mac/
+/mac/,/desktop/mac/
 /linux/,/engine/
 /article-img/,/engine/article-img/
 /articles/,/engine/articles/

_data/toc.yaml

@@ -1186,37 +1186,37 @@ manuals:
       title: Overview
     - sectiontitle: Mac
       section:
-        - path: /docker-for-mac/install/
+        - path: /desktop/mac/install/
           title: Install Docker Desktop for Mac
-        - path: /docker-for-mac/
+        - path: /desktop/mac/
           title: User manual
-        - path: /docker-for-mac/networking/
+        - path: /desktop/mac/networking/
           title: Networking
-        - path: /docker-for-mac/space/
+        - path: /desktop/mac/space/
           title: Disk utilization
-        - path: /docker-for-mac/troubleshoot/
+        - path: /desktop/mac/troubleshoot/
           title: Logs and troubleshooting
-        - path: /docker-for-mac/apple-silicon/
+        - path: /desktop/mac/apple-silicon/
           title: Apple silicon
-        - path: /docker-for-mac/release-notes/
+        - path: /desktop/mac/release-notes/
           title: Release notes
-        - path: /docker-for-mac/previous-versions/
+        - path: /desktop/mac/previous-versions/
           title: Previous versions
     - sectiontitle: Windows
       section:
-        - path: /docker-for-windows/install/
+        - path: /desktop/windows/install/
           title: Install Docker Desktop for Windows
-        - path: /docker-for-windows/
+        - path: /desktop/windows/
           title: User manual
-        - path: /docker-for-windows/networking/
+        - path: /desktop/windows/networking/
           title: Networking
-        - path: /docker-for-windows/troubleshoot/
+        - path: /desktop/windows/troubleshoot/
           title: Logs and troubleshooting
-        - path: /docker-for-windows/wsl/
+        - path: /desktop/windows/wsl/
           title: Docker Desktop WSL 2 backend
-        - path: /docker-for-windows/release-notes/
+        - path: /desktop/windows/release-notes/
           title: Release notes
-        - path: /docker-for-windows/previous-versions/
+        - path: /desktop/windows/previous-versions/
           title: Previous versions
     - path: /desktop/dashboard/
       title: Dashboard

_includes/content/compose-var-sub.md

@@ -61,6 +61,6 @@ web:
 If you forget and use a single dollar sign (`$`), Compose interprets the value
 as an environment variable and warns you:
 
-```
+```console
 The VAR_NOT_INTERPOLATED_BY_COMPOSE is not set. Substituting an empty string.
 ```

_includes/desktop-update.md

@@ -4,6 +4,6 @@ Starting with Docker Desktop 3.0.0, updates to Docker Desktop will be available
 
 > To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option.
 
-![Snooze update](../../docker-for-mac/images/snooze-update.png){:width="500px"}
+![Snooze update](/desktop/mac/images/snooze-update.png){:width="500px"}
 
 Click **Download update** When you are ready to download the update. This downloads the update in the background. After downloading the update, click **Update and restart** from the Docker menu. This installs the latest update and restarts Docker Desktop for the changes to take effect.

_includes/enable-buildkit.md

@@ -14,7 +14,7 @@ variable or by making BuildKit the default setting.
 To set the BuildKit environment variable when running the `docker build` command,
 run:
 
-```
+```console
 $ DOCKER_BUILDKIT=1 docker build .
 ```
 

_layouts/landing.html

@@ -204,7 +204,7 @@
                 </a>
               </p>
               <p class="only-win">
-                <a href="/docker-for-windows/install/#system-requirements">
+                <a href="/desktop/windows/install/#system-requirements">
                   What are the system requirements for Docker Desktop?
                 </a>
               </p>
@@ -214,7 +214,7 @@
                 </a>
               </p>
               <p class="only-mac">
-                <a href="/docker-for-mac/install/#system-requirements">
+                <a href="/desktop/mac/install/#system-requirements">
                   What are the system requirements for Docker Desktop?
                 </a>
               </p>
@@ -231,13 +231,13 @@
             </div>
             <div class="col-xs-12 col-md-4 col-lg-5">
               <h6>Popular articles</h6>
-              <p class="only-win"><a href="/docker-for-windows/wsl/">Docker Desktop WSL 2 backend</a></p>
+              <p class="only-win"><a href="/desktop/windows/wsl/">Docker Desktop WSL 2 backend</a></p>
-              <p class="only-mac"><a href="/docker-for-mac/install/">Install Docker Desktop on Mac</a></p>
+              <p class="only-mac"><a href="/desktop/mac/install/">Install Docker Desktop on Mac</a></p>
               <p><a href="/desktop/dashboard/">Docker Desktop Dashboard</a></p>
               <p class="only-win"><a href="/desktop/kubernetes/">Deploy on Kubernetes</a></p>
-              <p class="only-win"><a href="/docker-for-windows/release-notes/">Release notes</a></p>
+              <p class="only-win"><a href="/desktop/windows/release-notes/">Release notes</a></p>
-              <p class="only-win"><a href="/docker-for-windows/troubleshoot/">Logs and troubleshooting</a></p>
+              <p class="only-win"><a href="/desktop/windows/troubleshoot/">Logs and troubleshooting</a></p>
-              <p class="only-mac"><a href="/docker-for-mac/networking/">Networking features in Docker Desktop</a></p>
+              <p class="only-mac"><a href="/desktop/mac/networking/">Networking features in Docker Desktop</a></p>
             </div>
           </div>
           <!-- HUB -->

cloud/aci-integration.md

@@ -26,8 +26,8 @@ To deploy Docker containers on Azure, you must meet the following requirements:
 
 1. Download and install the latest version of Docker Desktop.
 
-    - [Download for Mac](../docker-for-mac/install.md)
+    - [Download for Mac](../desktop/mac/install.md)
-    - [Download for Windows](../docker-for-windows/install.md)
+    - [Download for Windows](../desktop/windows/install.md)
 
     Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux).
 

cloud/ecs-integration.md

@@ -25,8 +25,8 @@ To deploy Docker containers on ECS, you must meet the following requirements:
 
 1. Download and install the latest version of Docker Desktop.
 
-    - [Download for Mac](../docker-for-mac/install.md)
+    - [Download for Mac](../desktop/mac/install.md)
-    - [Download for Windows](../docker-for-windows/install.md)
+    - [Download for Windows](../desktop/windows/install.md)
 
     Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux).
 
@@ -522,35 +522,37 @@ use an existing domain name for your application:
 
 1. Use the AWS web console or CLI to get your VPC and Subnets IDs. You can retrieve the default VPC ID and attached subnets using this AWS CLI commands:
 
-```console
+        ```console
-$ aws ec2 describe-vpcs --filters Name=isDefault,Values=true --query 'Vpcs[0].VpcId'
+        $ aws ec2 describe-vpcs --filters Name=isDefault,Values=true --query 'Vpcs[0].VpcId'
         
-"vpc-123456"
+        "vpc-123456"
-$ aws ec2 describe-subnets --filters Name=vpc-id,Values=vpc-123456 --query 'Subnets[*].SubnetId'
+        $ aws ec2 describe-subnets --filters Name=vpc-id,Values=vpc-123456 --query 'Subnets[*].SubnetId'
         
-[
+        [
             "subnet-1234abcd",
             "subnet-6789ef00",
-]
+        ]
-```
+        ```
-1. Use the AWS CLI to create your load balancer. The AWS Web Console can also be used but will require adding at least one listener, which we don't need here.
  
-```console
+2. Use the AWS CLI to create your load balancer. The AWS Web Console can also be used but will require adding at least one listener, which we don't need here.
-$ aws elbv2 create-load-balancer --name myloadbalancer --type application --subnets "subnet-1234abcd" "subnet-6789ef00"
 
-{
+        ```console
+        $ aws elbv2 create-load-balancer --name myloadbalancer --type application --subnets "subnet-1234abcd" "subnet-6789ef00"
+        
+        {
             "LoadBalancers": [
                 {
                     "IpAddressType": "ipv4",
                     "VpcId": "vpc-123456",
                     "LoadBalancerArn": "arn:aws:elasticloadbalancing:us-east-1:1234567890:loadbalancer/app/myloadbalancer/123abcd456",
                     "DNSName": "myloadbalancer-123456.us-east-1.elb.amazonaws.com",
-...
+        <...>
-```
+        ```
-1. To assign your application an existing domain name, you can configure your DNS with a
-CNAME entry pointing to just-created loadbalancer's `DNSName` reported as you created the loadbalancer.
  
-1. Use Loadbalancer ARN to set `x-aws-loadbalancer` in your compose file, and deploy your application using `docker compose up` command.
+3. To assign your application an existing domain name, you can configure your DNS with a
+   CNAME entry pointing to just-created loadbalancer's `DNSName` reported as you created the loadbalancer.
+
+4. Use Loadbalancer ARN to set `x-aws-loadbalancer` in your compose file, and deploy your application using `docker compose up` command.
 
 Please note Docker ECS integration won't be aware of this domain name, so `docker compose ps` command will report URLs with loadbalancer DNSName, not your own domain.
 

components.md

@@ -29,6 +29,7 @@ For components and controls we are using [Bootstrap](https://getbootstrap.com)
 
   <button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button>
 ```
+
 <hr>
 
 <!-- ### Popover

compose/cli-command.md

@@ -28,7 +28,7 @@ Introduction of the [Compose specification](https://github.com/compose-spec/comp
 
 While docker-compose is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. This allows us to include community proposals, experimental implementations by the Docker CLI and/or Engine, and deliver features faster to users. Compose V2 also  supports some of the newer additions to the Compose specification, such as [profiles](profiles.md) and [GPU](gpu-support.md) devices.
 
-Additionally, Compose V2 also supports [Apple silicon](../docker-for-mac/apple-silicon.md).
+Additionally, Compose V2 also supports [Apple silicon](../desktop/mac/apple-silicon.md).
 
 For more information about the flags that are supported in the new compose command, see the [docker-compose compatibility list](cli-command-compatibility.md).
 
@@ -46,8 +46,8 @@ We will progressively turn Docker Compose V2 on automatically for Docker Desktop
 
 For Docker Desktop installation instructions, see:
 
-- [Install Docker Desktop on Mac](../docker-for-mac/install.md)
+- [Install Docker Desktop on Mac](../desktop/mac/install.md)
-- [Install Docker Desktop on Windows](../docker-for-windows/install.md)
+- [Install Docker Desktop on Windows](../desktop/windows/install.md)
 
 To disable Docker Compose V2 using Docker Desktop:
 

compose/completion.md

@@ -25,6 +25,7 @@ available.
        -L https://raw.githubusercontent.com/docker/compose/{{site.compose_version}}/contrib/completion/bash/docker-compose \
        -o /etc/bash_completion.d/docker-compose
    ```
+
 3. Reload your terminal. You can close and then open a new terminal, or reload your setting with `source ~/.bashrc` command in your current terminal.
 
 #### Mac

compose/compose-file/compose-file-v3.md

@@ -579,10 +579,7 @@ format `file://<filename>` or `registry://<value-name>`.
 When using `file:`, the referenced file must be present in the `CredentialSpecs`
 subdirectory in the Docker data directory, which defaults to `C:\ProgramData\Docker\`
 on Windows. The following example loads the credential spec from a file named
-
+`C:\ProgramData\Docker\CredentialSpecs\my-credential-spec.json`.
-```
-C:\ProgramData\Docker\CredentialSpecs\my-credential-spec.json
-```
 
 ```yaml
 credential_spec:

compose/environment-variables.md

@@ -93,6 +93,7 @@ done using the `--env-file` option:
 ```console
 $ docker-compose --env-file ./config/.env.dev up 
 ```
+
 This file path is relative to the current working directory where the Docker Compose
 command is executed.
 
@@ -120,6 +121,7 @@ services:
   web:
     image: 'webapp:v1.5'
 ```
+
 Passing the `--env-file ` argument overrides the default file path:
 
 ```console
@@ -132,7 +134,7 @@ services:
 
 When an invalid file path is being passed as `--env-file` argument, Compose returns an error:
 
-```
+```console
 $ docker-compose --env-file ./doesnotexist/.env.dev  config
 ERROR: Couldn't find env file: /home/user/./doesnotexist/.env.dev
 ```

compose/gettingstarted.md

@@ -276,14 +276,14 @@ If you get runtime errors indicating an application file is not found, a volume
 mount is denied, or a service cannot start, try enabling file or drive sharing.
 Volume mounting requires shared drives for projects that live outside of
 `C:\Users` (Windows) or `/Users` (Mac), and is required for _any_ project on
-Docker Desktop for Windows that uses [Linux containers](../docker-for-windows/index.md#switch-between-windows-and-linux-containers).
+Docker Desktop for Windows that uses [Linux containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers).
-For more information, see [File sharing](../docker-for-mac/index.md#file-sharing) on Docker
+For more information, see [File sharing](../desktop/mac/index.md#file-sharing) on Docker
 for Mac, and the general examples on how to
 > [Manage data in containers](../storage/volumes.md).
 >
 > * If you are using Oracle VirtualBox on an older Windows OS, you might encounter an issue with shared folders as described in this [VB trouble
 ticket](https://www.virtualbox.org/ticket/14920). Newer Windows systems meet the
-requirements for [Docker Desktop for Windows](../docker-for-windows/install.md) and do not
+requirements for [Docker Desktop for Windows](../desktop/windows/install.md) and do not
 need VirtualBox.
 {: .important}
 

compose/gpu-support.md

@@ -56,9 +56,10 @@ services:
             count: 1
             capabilities: [gpu, utility]
 ```
+
 Run with Docker Compose:
 
-```sh
+```console
 $ docker-compose up
 Creating network "gpu_default" with the default driver
 Creating gpu_test_1 ... done
@@ -99,7 +100,8 @@ services:
           devices:
           - capabilities: [gpu]
 ```
-```sh
+
+```console
 $ docker-compose up
 Creating network "gpu_default" with the default driver
 Creating gpu_test_1 ... done
@@ -114,7 +116,7 @@ gpu_test_1 exited with code 0
 
 On machines hosting multiple GPUs, `device_ids` field can be set to target specific GPU devices and `count` can be used to limit the number of GPU devices assigned to a service container. If `count` exceeds the number of available GPUs on the host, the deployment will error out.
 
-```
+```console
 $ nvidia-smi   
 +-----------------------------------------------------------------------------+
 | NVIDIA-SMI 450.80.02    Driver Version: 450.80.02    CUDA Version: 11.0     |
@@ -140,6 +142,7 @@ $ nvidia-smi
 |                               |                      |                  N/A |
 +-------------------------------+----------------------+----------------------+
 ```
+
 To enable access only to GPU-0 and GPU-3 devices:
 
 ```yaml

compose/install.md

@@ -54,7 +54,7 @@ Python package manager or installing Compose as a container.
 
 **Docker Desktop for Mac** includes Compose along
 with other Docker apps, so Mac users do not need to install Compose separately.
-For installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md).
+For installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md).
 
 </div>
 <div id="windows" class="tab-pane fade" markdown="1">
@@ -63,7 +63,7 @@ For installation instructions, see [Install Docker Desktop on Mac](../docker-for
 
 **Docker Desktop for Windows** includes Compose
 along with other Docker apps, so most Windows users do not need to
-install Compose separately. For install instructions, see [Install Docker Desktop on Windows](../docker-for-windows/install.md).
+install Compose separately. For install instructions, see [Install Docker Desktop on Windows](../desktop/windows/install.md).
 
 If you are running the Docker daemon and client directly on Microsoft
 Windows Server, follow the instructions in the Windows Server tab.
@@ -159,6 +159,7 @@ $ sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
     $ docker-compose --version
     docker-compose version {{site.compose_version}}, build 1110ad01
     ```
+
 </div>
 <div id="alternatives" class="tab-pane fade" markdown="1">
 
@@ -185,6 +186,7 @@ started.
 ```console
 $ pip install docker-compose
 ```
+
 If you are not using virtualenv,
 
 ```console

compose/networking.md

@@ -175,6 +175,7 @@ networks:
     # Use a custom driver
     driver: custom-driver-1
 ```
+
 ## Use a pre-existing network
 
 If you want your containers to join a pre-existing network, use the [`external` option](compose-file/compose-file-v2.md#network-configuration-reference):

compose/reference/index.md

@@ -90,13 +90,13 @@ add to their predecessors.
 
 For example, consider this command line:
 
-```
+```console
 $ docker-compose -f docker-compose.yml -f docker-compose.admin.yml run backup_db
 ```
 
 The `docker-compose.yml` file might specify a `webapp` service.
 
-```
+```yaml
 webapp:
   image: examples/web
   ports:
@@ -109,7 +109,7 @@ If the `docker-compose.admin.yml` also specifies this same service, any matching
 fields override the previous file. New values, add to the `webapp` service
 configuration.
 
-```
+```yaml
 webapp:
   build: .
   environment:
@@ -149,7 +149,7 @@ follows: `docker-compose -f ~/sandbox/rails/docker-compose.yml pull db`
 
 Here's the full example:
 
-```
+```console
 $ docker-compose -f ~/sandbox/rails/docker-compose.yml pull db
 Pulling db (postgres:latest)...
 latest: Pulling from library/postgres

compose/release-notes.md

@@ -2412,7 +2412,7 @@ The highlights:
 
    This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode.
 
- - Fig can be used with the [official Docker OS X installer](../docker-for-mac/install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
+ - Fig can be used with the [official Docker OS X installer](../desktop/mac/install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
 
  - Fig supports Docker 1.3.
 

config/containers/resource_constraints.md

@@ -191,6 +191,7 @@ most 50% of the CPU every second.
 ```console
 $ docker run -it --cpus=".5" ubuntu /bin/bash
 ```
+
 Which is the equivalent to manually specifying `--cpu-period` and `--cpu-quota`;
 
 ```console

config/daemon/index.md

@@ -109,8 +109,8 @@ $ dockerd --debug \
 You can learn what configuration options are available in the
 [dockerd reference docs](../../engine/reference/commandline/dockerd.md), or by running:
 
-```
+```console
-dockerd --help
+$ dockerd --help
 ```
 
 Many specific configuration options are discussed throughout the Docker

config/formatting.md

@@ -42,8 +42,8 @@ include examples of customizing the output format.
 It puts a separator between each element in the list.
 
 {% raw %}
-```
+```console
-docker inspect --format '{{join .Args " , "}}' container
+$ docker inspect --format '{{join .Args " , "}}' container
 ```
 {% endraw %}
 
@@ -52,8 +52,8 @@ docker inspect --format '{{join .Args " , "}}' container
 `table` specifies which fields you want to see its output.
 
 {% raw %}
-```
+```console
-docker image list --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.Size}}"
+$ docker image list --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.Size}}"
 ```
 {% endraw %}
 
@@ -63,8 +63,8 @@ docker image list --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.Size}}"
 
 
 {% raw %}
-```
+```console
-docker inspect --format '{{json .Mounts}}' container
+$ docker inspect --format '{{json .Mounts}}' container
 ```
 {% endraw %}
 
@@ -73,8 +73,8 @@ docker inspect --format '{{json .Mounts}}' container
 `lower` transforms a string into its lowercase representation.
 
 {% raw %}
-```
+```console
-docker inspect --format "{{lower .Name}}" container
+$ docker inspect --format "{{lower .Name}}" container
 ```
 {% endraw %}
 
@@ -83,8 +83,8 @@ docker inspect --format "{{lower .Name}}" container
 `split` slices a string into a list of strings separated by a separator.
 
 {% raw %}
-```
+```console
-docker inspect --format '{{split .Image ":"}}'
+$ docker inspect --format '{{split .Image ":"}}'
 ```
 {% endraw %}
 
@@ -93,8 +93,8 @@ docker inspect --format '{{split .Image ":"}}'
 `title` capitalizes the first character of a string.
 
 {% raw %}
-```
+```console
-docker inspect --format "{{title .Name}}" container
+$ docker inspect --format "{{title .Name}}" container
 ```
 {% endraw %}
 
@@ -103,8 +103,8 @@ docker inspect --format "{{title .Name}}" container
 `upper` transforms a string into its uppercase representation.
 
 {% raw %}
-```
+```console
-docker inspect --format "{{upper .Name}}" container
+$ docker inspect --format "{{upper .Name}}" container
 ```
 {% endraw %}
 
@@ -114,8 +114,8 @@ docker inspect --format "{{upper .Name}}" container
 `println` prints each value on a new line.
 
 {% raw %}
-```
+```console
-docker inspect --format='{{range .NetworkSettings.Networks}}{{println .IPAddress}}{{end}}' container
+$ docker inspect --format='{{range .NetworkSettings.Networks}}{{println .IPAddress}}{{end}}' container
 ```
 {% endraw %}
 
@@ -124,7 +124,7 @@ docker inspect --format='{{range .NetworkSettings.Networks}}{{println .IPAddress
 To find out what data can be printed, show all content as json:
 
 {% raw %} 
-```
+```console
-docker container ls --format='{{json .}}'
+$ docker container ls --format='{{json .}}'
 ```
 {% endraw %} 

desktop/backup-and-restore.md

@@ -52,12 +52,12 @@ computer.
    page in the storage section.
 
 After backing up your data, you can uninstall the current version of Docker Desktop
-and install a different version ([Windows](../docker-for-windows/install.md)
+and install a different version ([Windows](windows/install.md)
-[macOS](../docker-for-mac/install.md), or reset Docker Desktop to factory defaults.
+[macOS](mac/install.md), or reset Docker Desktop to factory defaults.
 
 ## Restore your data
 
-1. Use [`docker pull`]((../engine/reference/commandline/load.md)) to restore images
+1. Use [`docker pull`](../engine/reference/commandline/load.md) to restore images
    you pushed to Docker Hub in "step 2." in the [save your data section](#save-your-data)
 
    If you backed up your images to a local tar file, use [`docker image load -i images.tar`](../engine/reference/commandline/load.md)

desktop/dev-environments.md

@@ -16,14 +16,14 @@ Dev Environments also allow you to switch between your developer environments or
 
 To access Dev Environments, from the Docker menu, select **Dashboard** > **Dev Environments**.
 
-![Dev environment intro](/images/dev-env-create.png){:width="700px"}
+![Dev environment intro](images/dev-env-create.png){:width="700px"}
 
 ## Prerequisites
 
 Dev Environments are available as part of Docker Desktop 3.5.0 release. Download and install **Docker Desktop 3.5.0** or higher:
 
-- [Mac](https://docs.docker.com/docker-for-mac/release-notes/)
+- [Mac](mac/release-notes.md)
-- [Windows](https://docs.docker.com/docker-for-windows/release-notes/)
+- [Windows](windows/release-notes.md)
 
 To get started with Dev Environments, you must have the following tools and extension installed on your machine:
 
@@ -41,7 +41,7 @@ If you have already installed Git, and it's not detected properly, run the follo
 
 If it doesn't detect Git as a valid command, you must reinstall Git and ensure you choose the option  **Git from the command line...** or the **Use Git and optional Unix tools...**  on the **Adjusting your PATH environment**  step.
 
-![Windows add Git to path](/images/dev-env-gitbash.png){:width="300px"}
+![Windows add Git to path](images/dev-env-gitbash.png){:width="300px"}
 
 ## Start a single container Dev Environment
 
@@ -56,7 +56,7 @@ The simplest way to get started with Dev Environments is to create a new environ
 
     This clones the Git code inside a volume, determines the best image for your Dev Environment, and finally, opens VS Code inside the Dev Environment container.
 
-![Single container Dev environment](/images/dev-env-container.png){:width="700px"}
+![Single container Dev environment](images/dev-env-container.png){:width="700px"}
 
 In the above example, the names `amazing_mclaren` and `stoic_carver` are randomly generated. You'll most likely see different names when you create your Dev Environment.
 
@@ -64,7 +64,7 @@ Hover over the container and click **Open in VS Code** to start working in VS Co
 
 You can launch the application by running the command `make run` in your VS Code terminal. This opens an http server on port 8080. Open [http://localhost:8080](http://localhost:8080) in your browser to see the running application.
 
-![Single container Dev environment](/images/dev-env-localhost.png){:width="700px"}
+![Single container Dev environment](images/dev-env-localhost.png){:width="700px"}
 
 ### Create a Dev Environment from a specific branch or tag
 
@@ -90,11 +90,11 @@ Let's summarize the tasks we performed so far to start a single container Dev En
 
 If you are a member of the Docker [Team plan](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}, you can now share you Dev Environment with your team. When you are ready to share your environment, just click the **Share** button and specify the Docker Hub namespace where you'd like to push your Dev Environment to.
 
-![Share a Dev environment](/images/dev-env-share.png){:width="700px"}
+![Share a Dev environment](images/dev-env-share.png){:width="700px"}
 
 This creates a Docker image of your dev environment, uploads it to the Docker Hub namespace you have specified in the previous step, and provides a tiny URL which you can use to share your work with your team members.
 
-![Dev environment shared](/images/dev-env-shared.png){:width="700px"}
+![Dev environment shared](images/dev-env-shared.png){:width="700px"}
 
 Your team members need to open the **Create** dialog, select the **Existing Dev Environment** tab, and then paste the URL. Your Dev Environment now starts in the exact same state as you shared it.
 
@@ -116,7 +116,7 @@ You can also use Dev Environments to collaborate on any Docker Compose-based pro
     - Creates volumes and networks
     - Starts the Compose stack
 
-![Compose Dev environment](/images/dev-env-compose.png){:width="700px"}
+![Compose Dev environment](images/dev-env-compose.png){:width="700px"}
 
 Now your application is up and running, you can check by opening [http://localhost:8080](http://localhost:8080) in your browser.
 

desktop/faqs.md

@@ -13,7 +13,7 @@ toc_max: 2
 
 ### What are the system requirements for Docker Desktop?
 
-For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](../docker-for-mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](../docker-for-windows/install.md#system-requirements).
+For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](windows/install.md#system-requirements).
 
 ### What is an experimental feature?
 
@@ -21,7 +21,7 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo
 
 ### Where can I find information about diagnosing and troubleshooting Docker Desktop issues?
 
-You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](../docker-for-mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](../docker-for-windows/troubleshoot.md).
+You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](windows/troubleshoot.md).
 
 If you do not find a solution in Troubleshooting, browse issues on
 [docker/for-mac](https://github.com/docker/for-mac/issues){: target="_blank" rel="noopener" class="_"} or [docker/for-win](https://github.com/docker/for-win/issues){: target="_blank" rel="noopener" class="_"} GitHub repository, or create a new one.
@@ -52,19 +52,19 @@ For details, see [Docker Engine API](../engine/api/index.md).
 Both Mac and Windows have a changing IP address (or none if you have no network access). On both Mac and Windows, we recommend that you connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. This is for development purposes and does not work in a production environment outside of Docker Desktop.
 
 For more information and examples, see how to connect from a container to a service on the host
-[on Mac](../docker-for-mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](../docker-for-windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host).
+[on Mac](mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host).
 
 ### How do I connect to a container from Mac or Windows?
 
 We recommend that you publish a port, or connect from another container. Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work.
 
 For more information and examples, see
-[I want to connect to a container from Mac](../docker-for-mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](../docker-for-windows/networking.md#i-want-to-connect-to-a-container-from-the-mac).
+[I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](windows/networking.md#i-want-to-connect-to-a-container-from-the-mac).
 
 ### How do I add custom CA certificates?
 
 Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client side certs, see
-[Add TLS certificates on Mac](../docker-for-mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](../docker-for-windows/index.md#adding-tls-certificates).
+[Add TLS certificates on Mac](mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](windows/index.md#adding-tls-certificates).
 
 ### Can I pass through a USB device to a container?
 
@@ -79,7 +79,7 @@ problems and intermittent failures may still occur due to the way these apps
 virtualize the hardware. For these reasons, **Docker Desktop is not supported in
 nested virtualization scenarios**. It might work in some cases, and not in others.
 
-For more information, see [Running Docker Desktop in nested virtualization scenarios](../docker-for-windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios).
+For more information, see [Running Docker Desktop in nested virtualization scenarios](windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios).
 
 ### Docker Desktop's UI appears green, distorted, or has visual artifacts. How do I fix this?
 
@@ -98,7 +98,7 @@ After updating the `settings.json` file, close and restart Docker Desktop to app
 
 ### When will Docker Desktop move to a cumulative release stream?
 
-Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](../docker-for-mac/install.md#automatic-updates).
+Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](mac/install.md#automatic-updates).
 
 ### How do new users install Docker Desktop?
 
@@ -124,7 +124,7 @@ Starting with Docker Desktop 3.0.0, Stable and Edge releases are combined into a
 
 ### Does Docker Desktop offer support?
 
-Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](../docker-for-mac/troubleshoot.md#support).
+Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support).
 
 For information about the pricing plans and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
 
@@ -151,7 +151,7 @@ For more information, see [Docker Data Processing Agreement](https://www.docker.
 
 ### Is Docker Desktop compatible with Apple silicon processors?
 
-Yes, you can now install Docker Desktop for Mac on Apple silicon. For more information, see [Docker Desktop for Apple silicon](../docker-for-mac/apple-silicon.md).
+Yes, you can now install Docker Desktop for Mac on Apple silicon. For more information, see [Docker Desktop for Apple silicon](mac/apple-silicon.md).
 
 ### What is HyperKit?
 
@@ -182,7 +182,7 @@ Docker Desktop uses the Windows Hyper-V features. While older Windows versions h
 
 ### Can I install Docker Desktop on Windows 10 Home?
 
-If you are running Windows 10 Home (starting with version 1903), you can install [Docker Desktop for Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows/){: target="_blank" rel="noopener" class="_"} with the [WSL 2 backend](../docker-for-windows/wsl.md).
+If you are running Windows 10 Home (starting with version 1903), you can install [Docker Desktop for Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows/){: target="_blank" rel="noopener" class="_"} with the [WSL 2 backend](windows/wsl.md).
 
 ### Can I run Docker Desktop on Windows Server?
 
@@ -205,19 +205,19 @@ Right-click to add the user to the group. Log out and log back in for the change
 ### Why does Docker Desktop fail to start when anti-virus software is installed?
 
 Some anti-virus software may be incompatible with Hyper-V and Windows 10 builds which impact Docker
-Desktop. For more information, see [Docker Desktop fails to start when anti-virus software is installed](../docker-for-windows/troubleshoot.md#docker-desktop-fails-to-start-when-anti-virus-software-is-installed).
+Desktop. For more information, see [Docker Desktop fails to start when anti-virus software is installed](windows/troubleshoot.md#docker-desktop-fails-to-start-when-anti-virus-software-is-installed).
 
 ### Can I change permissions on shared volumes for container-specific deployment requirements?
 
 Docker Desktop does not enable you to control (`chmod`)
-the Unix-style permissions on [shared volumes](../docker-for-windows/index.md#file-sharing) for
+the Unix-style permissions on [shared volumes](windows/index.md#file-sharing) for
 deployed containers, but rather sets permissions to a default value of
 [0777](http://permissions-calculator.org/decode/0777/){: target="_blank" rel="noopener" class="_"}
 (`read`, `write`, `execute` permissions for `user` and for
 `group`) which is not configurable.
 
 For workarounds and to learn more, see
-[Permissions errors on data directories for shared volumes](../docker-for-windows/troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes).
+[Permissions errors on data directories for shared volumes](windows/troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes).
 
 ### How do symlinks work on Windows?
 

desktop/index.md

@@ -26,19 +26,19 @@ Some of the key features of Docker Desktop include:
 
 Docker Desktop is available for Mac and Windows. For download information, system requirements, and installation instructions, see:
 
-* [Install Docker Desktop on Mac](../docker-for-mac/install.md)
+* [Install Docker Desktop on Mac](mac/install.md)
-* [Install Docker Desktop on Windows](../docker-for-windows/install.md)
+* [Install Docker Desktop on Windows](windows/install.md)
 
 ## Configure Docker Desktop
 
 To learn about the various UI options and their usage, see:
 
-* [Docker Desktop for Mac user manual](../docker-for-mac/index.md)
+* [Docker Desktop for Mac user manual](mac/index.md)
-* [Docker Desktop for Windows user manual](../docker-for-windows/index.md)
+* [Docker Desktop for Windows user manual](windows/index.md)
 
 ## Release notes
 
 For information about new features, improvements, and bug fixes in Docker Desktop releases, see:
 
-* [Docker Desktop for Mac Release notes](../docker-for-mac/release-notes.md)
+* [Docker Desktop for Mac Release notes](mac/release-notes.md)
-* [Docker Desktop for Windows Release notes](../docker-for-windows/release-notes.md)
+* [Docker Desktop for Windows Release notes](windows/release-notes.md)

desktop/mac/apple-silicon.md

@@ -6,11 +6,12 @@ toc_min: 2
 toc_max: 3
 redirect_from:
 - /docker-for-mac/apple-m1/
+- /docker-for-mac/apple-silicon/
 ---
 
 Docker Desktop for Mac on Apple silicon is now available as a GA release. This enables you to develop applications with your choice of local development environments, and extends development pipelines for ARM-based applications.
 
-Docker Desktop for Apple silicon also supports multi-platform images, which allows you to build and run images for both x86 and ARM architectures without having to set up a complex cross-compilation development environment. Additionally, you can use [docker buildx](../engine/reference/commandline/buildx.md){:target="_blank" rel="noopener" class="_"} to seamlessly integrate multi-platform builds into your build pipeline, and use [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} to identify and share repositories that provide multi-platform images.
+Docker Desktop for Apple silicon also supports multi-platform images, which allows you to build and run images for both x86 and ARM architectures without having to set up a complex cross-compilation development environment. Additionally, you can use [docker buildx](../../engine/reference/commandline/buildx.md){:target="_blank" rel="noopener" class="_"} to seamlessly integrate multi-platform builds into your build pipeline, and use [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} to identify and share repositories that provide multi-platform images.
 
 Download Docker Desktop for Mac on Apple silicon:
 

desktop/mac/edge-release-notes.md

@@ -9,7 +9,7 @@ toc_max: 2
 This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.
 
 For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see
-[What to know before you install](install.md#what-to-know-before-you-install).
+[What to know before you install](install.md#system-requirements).
 
 ## Docker Desktop Community 2.5.4
 2020-12-07
@@ -989,7 +989,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
   - [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce)
 
 * New
-  - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [https://docs.docker.com/docker-for-mac/kubernetes/](kubernetes.md)
+  - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md)
   - DNS name `docker.for.mac.host.internal` should be used instead of `docker.for.mac.localhost` (still valid) for host resolution from containers, since since there is an RFC banning the use of subdomains of localhost (See https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06).
 
 * Bug fixes and minor changes
@@ -1196,7 +1196,7 @@ TCP connection is idle for more than five minutes (related to
 
 - Add daemon options validation
 - Diagnose can be cancelled & Improved help information. Fixes [docker/for-mac#1134](https://github.com/docker/for-mac/issues/1134), [docker/for-mac#1474](https://github.com/docker/for-mac/issues/1474)
-- Support paging of Docker Cloud [repositories](../docker-hub/repos.md) and [organizations](../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538)
+- Support paging of Docker Cloud [repositories](../../docker-hub/repos.md) and [organizations](../../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538)
 
 ### Docker Community Edition 17.06.1-ce-mac20, 2017-07-18
 
@@ -2049,7 +2049,7 @@ events or unexpected unmounts.
 
 **Bug fixes and minor changes**
 
-* Documentation moved to [https://docs.docker.com/docker-for-mac/](index.md)
+* Documentation moved to [https://docs.docker.com/desktop/mac/](index.md)
 * Allow non-admin users to launch the app for the first time (using admin creds)
 * Prompt non-admin users for admin password when needed in Preferences
 * Fixed download links, documentation links

desktop/mac/index.md

@@ -2,6 +2,7 @@
 description: Getting Started
 keywords: mac, tutorial, run, docker, local, machine
 redirect_from:
+- /docker-for-mac/
 - /docker-for-mac/index/
 - /docker-for-mac/mutagen/
 - /docker-for-mac/mutagen-caching/
@@ -107,8 +108,8 @@ File share settings are:
  * Shared folders are designed to allow application code to be edited 
  on the host while being executed in containers. For non-code items
  such as cache directories or databases, the performance will be much 
- better if they are stored in the Linux VM, using a [data volume](../storage/volumes.md)
+ better if they are stored in the Linux VM, using a [data volume](../../storage/volumes.md)
- (named volume) or [data container](../storage/volumes.md).
+ (named volume) or [data container](../../storage/volumes.md).
 >
  * If you share the whole of your home directory into a container, MacOS may
  prompt you to give Docker access to personal areas of your home directory such as
@@ -137,7 +138,7 @@ Your proxy settings, however, will not be propagated into the containers you sta
 If you wish to set the proxy settings for your containers, you need to define
 environment variables for them, just like you would do on Linux, for example:
 
-```
+```console
 $ docker run -e HTTP_PROXY=http://proxy.example.com:3128 alpine env
 
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -212,7 +213,7 @@ Server: Docker Engine - Community
 Docker Desktop includes a standalone Kubernetes server that runs on your Mac, so
 that you can test deploying your Docker workloads on Kubernetes. To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**.
 
-For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../desktop/kubernetes.md){:target="_blank" rel="noopener" class="_"}.
+For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../kubernetes.md){:target="_blank" rel="noopener" class="_"}.
 
 ### Reset
 
@@ -224,7 +225,7 @@ For information about the reset options, see [Logs and Troubleshooting](troubles
 
 ## Dashboard
 
-The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../desktop/dashboard.md).
+The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md).
 
 ## Add TLS certificates
 
@@ -250,7 +251,7 @@ $ sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.ke
 Or, if you prefer to add the certificate to your own local keychain only (rather
 than for all users), run this command instead:
 
-```
+```console
 $ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychain ca.crt
 ```
 
@@ -322,7 +323,7 @@ also in your keychain.
 
 To learn more about how to install a CA root certificate for the registry and
 how to set the client TLS certificate for verification, see
-[Verify repository client with certificates](../engine/security/certificates.md)
+[Verify repository client with certificates](../../engine/security/certificates.md)
 in the Docker Engine topics.
 
 ## Install shell completion
@@ -411,11 +412,11 @@ For information about providing feedback on the documentation or update it yours
 
 Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories and organizations directly from the Docker Desktop menu.
 
-For more information, refer to the following [Docker Hub topics](../docker-hub/index.md){:target="_blank"
+For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){:target="_blank"
 class="_"}:
 
-* [Organizations and Teams in Docker Hub](../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"}
+* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"}
-* [Builds](../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"}
+* [Builds](../../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"}
 
 ### Two-factor authentication
 
@@ -444,7 +445,7 @@ After you have successfully authenticated, you can access your organizations and
   walkthroughs and source code.
 
 * For a summary of Docker command line interface (CLI) commands, see
-  [Docker CLI Reference Guide](../engine/api/index.md){: target="_blank" rel="noopener" class="_"}.
+  [Docker CLI Reference Guide](../../engine/api/index.md){: target="_blank" rel="noopener" class="_"}.
 
 * Check out the blog post, [What’s New in Docker 17.06 Community Edition
   (CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" rel="noopener" class="_"}.

desktop/mac/install.md

@@ -2,6 +2,8 @@
 description: How to install Docker Desktop on Mac
 keywords: mac, install, download, run, docker, local
 title: Install Docker Desktop on Mac
+redirect_from:
+- /docker-for-mac/install/
 ---
 
 Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, installation instructions, and automatic updates.
@@ -57,8 +59,8 @@ Your Mac must meet the following requirements to successfully install Docker Des
 ## What's included in the installer
 
 The Docker Desktop installation includes
-  [Docker Engine](../engine/index.md), Docker CLI client,
+  [Docker Engine](../../engine/index.md), Docker CLI client,
-  [Docker Compose](../compose/index.md), [Docker Content Trust](../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
+  [Docker Compose](../../compose/index.md), [Docker Content Trust](../../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
 
 ## Install and run Docker Desktop on Mac
 
@@ -104,7 +106,7 @@ To uninstall Docker Desktop from your Mac:
 >
 > Uninstalling Docker Desktop destroys Docker containers, images, volumes, and
 > other Docker related data local to the machine, and removes the files generated
-> by the application. Refer to the [back up and restore data](../desktop/backup-and-restore.md)
+> by the application. Refer to the [back up and restore data](../backup-and-restore.md)
 > section to learn how to preserve important data before uninstalling.
 
 ## Where to go next
@@ -113,8 +115,8 @@ To uninstall Docker Desktop from your Mac:
 - [Docker Desktop for Apple silicon](apple-silicon.md) for detailed information about Docker Desktop for Apple silicon.
 - [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how
   to run and submit diagnostics, and submit issues.
-- [FAQs](../desktop/faqs.md) provide answers to frequently asked questions.
+- [FAQs](../faqs.md) provide answers to frequently asked questions.
 - [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases.
-- [Get started with Docker](../get-started/index.md) provides a general Docker tutorial.
+- [Get started with Docker](../../get-started/index.md) provides a general Docker tutorial.
-* [Back up and restore data](../desktop/backup-and-restore.md) provides instructions
+* [Back up and restore data](../backup-and-restore.md) provides instructions
   on backing up and restoring data related to Docker.

desktop/mac/networking.md

@@ -2,6 +2,7 @@
 description: Networking
 keywords: mac, networking
 redirect_from:
+- /docker-for-mac/networking/
 - /mackit/networking/
 title: Networking features in Docker Desktop for Mac
 ---
@@ -22,7 +23,7 @@ Docker Desktop for {{Arch}} intercepts traffic from the containers and injects i
 
 When you run a container with the `-p` argument, for example:
 
-```
+```console
 $ docker run -p 80:80 -d nginx
 ```
 
@@ -32,7 +33,7 @@ host and container ports are the same. What if you need to specify a different
 host port? If, for example, you already have something running on port 80 of
 your host machine, you can connect the container to a different port:
 
-```
+```console
 $ docker run -p 8000:80 -d nginx
 ```
 
@@ -130,5 +131,5 @@ container to random ports on the host.
 $ docker run -d -P --name webserver nginx
 ```
 
-See the [run command](../engine/reference/commandline/run.md) for more details on
+See the [run command](../../engine/reference/commandline/run.md) for more details on
 publish options used with `docker run`.

desktop/mac/previous-versions.md

@@ -4,6 +4,8 @@ keywords: Docker Desktop for Mac, release notes
 title: Release notes for previous versions
 toc_min: 1
 toc_max: 2
+redirect_from:
+- /docker-for-mac/previous-versions/
 ---
 
 This page contains release notes for older versions of Docker Desktop for Mac.
@@ -248,7 +250,7 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
 ### New
 
 - **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior.
-For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../desktop/dashboard.md).
+For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../dashboard.md).
 
 - Introduced a new user interface for the Docker Desktop **Preferences** menu.
 - The Restart, Reset, and Uninstall options are now available on the **Troubleshoot** menu.
@@ -476,7 +478,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
   - Linux Kernel 4.9.93 with CEPH, DRBD, RBD, MPLS_ROUTING and MPLS_IPTUNNEL enabled
 
 * New
-  - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [https://docs.docker.com/docker-for-mac/kubernetes/](kubernetes.md)
+  - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md)
   - Add an experimental SOCKS server to allow access to container networks, see [docker/for-mac#2670](https://github.com/docker/for-mac/issues/2670#issuecomment-372365274). Also see [docker/for-mac#2721](https://github.com/docker/for-mac/issues/2721)
   - Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
 
@@ -597,7 +599,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
   - VM entirely built with Linuxkit
   - VM disk size can be changed in disk preferences. (See [docker/for-mac#1037](https://github.com/docker/for-mac/issues/1037))
   - For systems running APFS on SSD on High Sierra, use `raw` format VM disks by default. This improves disk throughput (from 320MiB/sec to 600MiB/sec in `dd` on a 2015 MacBook Pro) and disk space handling.
-  Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See https://docs.docker.com/docker-for-mac/faqs/#disk-usage
+  Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See [Disk utilization](space.md)
   - DNS name `docker.for.mac.host.internal` should be used instead of `docker.for.mac.localhost` (still valid) for host resolution from containers, since since there is an RFC banning the use of subdomains of localhost. See  https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06.
 
 * Bug fixes and minor changes

desktop/mac/release-notes.md

@@ -2,6 +2,7 @@
 description: Change log / release notes for Docker Desktop Mac
 keywords: Docker Desktop for Mac, release notes
 redirect_from:
+- /docker-for-mac/release-notes/
 - /mackit/release-notes/
 - /docker-for-mac/edge-release-notes/
 title: Docker for Mac release notes
@@ -21,8 +22,8 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../desktop/dev-environments.md#start-a-dev-environment-from-a-local-folder).
+- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../dev-environments.md#start-a-dev-environment-from-a-local-folder).
-- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
+- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
 
 ### Upgrades
 
@@ -35,9 +36,14 @@ This page contains information about the new features, improvements, known issue
 - [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9)
 - [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1)
 - [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3)
+- [Linux kernel 5.10.47](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.47-0b705d955f5e283f62583c4e227d64a7924c138f/images/sha256-a4c79bc185ec9eba48dcc802a8881b9d97e532b3f803d23e5b8d4951588f4d51?context=repo)
 
 ### Bug fixes and minor changes
 
+- Update kernel configuration to fix a performance regression in [Docker Desktop 3.0.0](#docker-desktop-300)
+  that caused publishing container ports to take 10 times longer than on older
+  versions. For more information, see [linuxkit/linuxkit#3701](https://github.com/linuxkit/linuxkit/pull/3701)
+  and [docker/for-mac#5668](https://github.com/docker/for-mac/issues/5668).
 - Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram.
 - Fixed an issue related to hardware acceleration [docker/for-mac#5121](https://github.com/docker/for-mac/issues/5121)
 - Fixed an issue related to Skip This Update for mac [docker/for-mac#5842](https://github.com/docker/for-mac/issues/5842)
@@ -50,7 +56,7 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
+**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
 
 ### Upgrades
@@ -82,9 +88,9 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
+**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
-**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
+**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
 
 ### Bug fixes and minor changes
 
@@ -98,9 +104,9 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
+**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
-**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
+**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
 
 ### Upgrades
 
@@ -133,15 +139,15 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
+**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
 
-**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
+**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
 
-**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../docker-for-windows/install.md#updates).
+**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../windows/install.md#updates).
 
 ### Deprecation
 
-- Docker Desktop no longer installs Notary. You can now use [Docker Content Trust](../engine/security/trust.md) for image signing.
+- Docker Desktop no longer installs Notary. You can now use [Docker Content Trust](../../engine/security/trust/index.md) for image signing.
 
 ### Upgrades
 

desktop/mac/space.md

@@ -2,6 +2,8 @@
 description: Disk utilization
 keywords: mac, disk
 title: Disk utilization in Docker for Mac
+redirect_from:
+- /docker-for-mac/space/
 ---
 
 Docker Desktop stores Linux containers and images in a single, large "disk image" file in the Mac filesystem. This is different from Docker on Linux, which usually stores containers and images in the `/var/lib/docker` directory.
@@ -39,8 +41,8 @@ Do not move the file directly in Finder as this can cause Docker Desktop to lose
 
 Check whether you have any unnecessary containers and images. If your client and daemon API are running version 1.25 or later (use the `docker version` command on the client to check your client and daemon API versions), you can see the detailed space usage information by running:
 
-```
+```console
-docker system df -v
+$ docker system df -v
 ```
 
 Alternatively, to list images, run:
@@ -70,7 +72,7 @@ It might take a few minutes to reclaim space on the host depending on the format
 
 Space is only freed when images are deleted. Space is not freed automatically when files are deleted inside running containers. To trigger a space reclamation at any point, run the command:
 
-```
+```console
 $ docker run --privileged --pid=host docker/desktop-reclaim-space
 ```
 
@@ -78,8 +80,7 @@ Note that many tools report the maximum file size, not the actual file size.
 To query the actual size of the file on the host from a terminal, run:
 
 ```console
-$ cd ~/Library/Containers/com.docker.docker/Data
+$ cd ~/Library/Containers/com.docker.docker/Data/vms/0/data
-$ cd vms/0/data
 $ ls -klsh Docker.raw
 2333548 -rw-r--r--@ 1 username  staff    64G Dec 13 17:42 Docker.raw
 ```

desktop/mac/troubleshoot.md

@@ -2,6 +2,7 @@
 description: Troubleshooting, logs, and known issues
 keywords: mac, troubleshooting, logs, issues
 redirect_from:
+- /docker-for-mac/troubleshoot/
 - /mackit/troubleshoot/
 title: Logs and troubleshooting
 toc_max: 2
@@ -27,7 +28,7 @@ The Troubleshoot page contains the following options:
 
 * **Support**:  Developers on Pro and Team plans can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support).
 
-* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](/docker-for-mac/index/#kubernetes).
+* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes).
 
 * **Clean / Purge data**: This option resets all Docker data _without_ a
 reset to factory defaults. Selecting this option results in the loss of existing settings.
@@ -177,7 +178,7 @@ ways, and create reports.
 
 #### View the Docker Daemon logs
 
-Refer to the [read the logs](../config/daemon/index.md#read-the-logs) section
+Refer to the [read the logs](../../config/daemon/index.md#read-the-logs) section
 to learn how to view the Docker Daemon logs.
 
 <a name="troubleshoot"></a>
@@ -207,7 +208,7 @@ For more about using client and server side certificates, see
 
 If you are using mounted volumes and get runtime errors indicating an
 application file is not found, access to a volume mount is denied, or a service
-cannot start, such as when using [Docker Compose](../compose/gettingstarted.md),
+cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md),
 you might need to enable [file sharing](index.md#file-sharing).
 
 Volume mounting requires shared drives for projects that live outside of the
@@ -418,8 +419,8 @@ As a Team, you can get support for Docker Desktop for the number of machines equ
 
 Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages:
 
-* [Mac system requirements](../docker-for-mac/install.md#system-requirements)
+* [Mac system requirements](install.md#system-requirements)
-* [Windows system requirements](../docker-for-windows/install.md#system-requirements)
+* [Windows system requirements](../windows/install.md#system-requirements)
 
 ### Can I run Docker Desktop on Virtualized hardware?
 

desktop/opensource.md

@@ -9,7 +9,7 @@ redirect_from:
 ---
 
 Docker Desktop is built using open source software. For information about the
-licensing, choose ![whale menu](/docker-for-mac/images/whale-x.png){: .inline}
+licensing, choose ![whale menu](mac/images/whale-x.png){: .inline}
 →  **About Docker Desktop** and then **Acknowledgements**.
 
 Docker Desktop distributes some components that are licensed under the

desktop/windows/edge-release-notes.md

@@ -636,7 +636,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
 
   To access the Dashboard UI, select the Docker menu from the system tray and then click **Dashboard**.
 
-- **WSL 2 backend:** The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](https://docs.docker.com/docker-for-windows/wsl/).
+- **WSL 2 backend:** The new Docker Desktop WSL 2 backend replaces the Docker Desktop WSL 2 Tech Preview. The WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](wsl.md).
 
 - **New file sharing implementation:** Docker Desktop introduces a new file sharing implementation which uses gRPC, FUSE, and Hypervisor sockets instead of Samba, CIFS, and Hyper-V networking. The new implementation  offers improved I/O performance. Additionally, when using the new file system:
 
@@ -711,7 +711,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
 
 #### New
 
-- [Docker Desktop WSL 2 Tech Preview](https://docs.docker.com/docker-for-windows/wsl/)
+- [Docker Desktop WSL 2 Tech Preview](wsl.md)
 
 #### Bug fixes and minor changes
 
@@ -1140,7 +1140,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
   - [Docker 18.02.0-ce-rc1](https://github.com/docker/docker-ce/releases/tag/v18.02.0-ce-rc1)
 
 * New
-  - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as docker commands. See https://docs.docker.com/docker-for-windows/kubernetes/
+  - Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md).
   - LCOW containers can now be run next to Windows containers (on Windows RS3 build 16299 and later). Use `--platform=linux` in Windows container mode to run Linux Containers On Windows. Note that LCOW is still experimental, and requires daemon `experimental` option.
 
 * Bug fixes and minor changes
@@ -2114,7 +2114,7 @@ Unreleased. See Beta 23 for changes.
 
 **New**
 
-* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [Getting Started](index.md#download-docker-for-windows).
+* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](install.md).
 
 * Removed the docker host name. Containers with exported ports are reachable via localhost.
 

desktop/windows/index.md

@@ -2,6 +2,7 @@
 description: Getting Started
 keywords: windows, edge, tutorial, run, docker, local, machine
 redirect_from:
+- /docker-for-windows/
 - /docker-for-windows/index/
 - /docker-for-windows/started/
 - /engine/installation/windows/
@@ -121,8 +122,8 @@ File share settings are:
 >
  * Shared folders are designed to allow application code to be edited on the host while being executed in containers. For non-code items
  such as cache directories or databases, the performance will be much better if they are stored in
- the Linux VM, using a [data volume](../storage/volumes.md)
+ the Linux VM, using a [data volume](../../storage/volumes.md)
- (named volume) or [data container](../storage/volumes.md).
+ (named volume) or [data container](../../storage/volumes.md).
 >
  * Docker Desktop sets permissions to read/write/execute for users, groups and others [0777 or a+rwx](http://permissions-calculator.org/decode/0777/).
    This is not configurable. See [Permissions errors on data directories for shared volumes](troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes).
@@ -267,7 +268,7 @@ Server: Docker Engine - Community
 Docker Desktop includes a standalone Kubernetes server that runs on your Windows machine, so
 that you can test deploying your Docker workloads on Kubernetes. To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**.
 
-For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../desktop/kubernetes.md){:target="_blank" rel="noopener" class="_"}.
+For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../kubernetes.md){:target="_blank" rel="noopener" class="_"}.
 
 ### Reset
 
@@ -323,16 +324,16 @@ again when you switch back.
 
 ## Dashboard
 
-The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and Docker Compose applications. For more information, see [Docker Desktop Dashboard](../desktop/dashboard.md).
+The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md).
 
 ## Docker Hub
 
 Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories directly from the Docker Desktop menu.
 
-For more information, refer to the following [Docker Hub topics](../docker-hub/index.md){: target="_blank" rel="noopener" class="_" }:
+For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){: target="_blank" rel="noopener" class="_" }:
 
-* [Organizations and Teams in Docker Hub](../docker-hub/orgs.md){: target="_blank" rel="noopener" class="_" }
+* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){: target="_blank" rel="noopener" class="_" }
-* [Builds and Images](../docker-hub/builds/index.md){: target="_blank" rel="noopener" class="_" }
+* [Builds and Images](../../docker-hub/builds/index.md){: target="_blank" rel="noopener" class="_" }
 
 ### Two-factor authentication
 
@@ -366,7 +367,7 @@ Docker Desktop creates a certificate bundle of all user-trusted CAs based on
 the Windows certificate store, and appends it to Moby trusted certificates. Therefore, if an enterprise SSL certificate is trusted by the user on the host, it is trusted by Docker Desktop.
 
 To learn more about how to install a CA root certificate for the registry, see
-[Verify repository client with certificates](../engine/security/certificates.md)
+[Verify repository client with certificates](../../engine/security/certificates.md)
 in the Docker Engine topics.
 
 ### How do I add client certificates?
@@ -389,12 +390,12 @@ certificates. Commands like `docker run` that attempt to pull from the registry
 produce error messages on the command line, as well as on the registry.
 
 To learn more about how to set the client TLS certificate for verification, see
-[Verify repository client with certificates](../engine/security/certificates.md)
+[Verify repository client with certificates](../../engine/security/certificates.md)
 in the Docker Engine topics.
 
 ## Where to go next
 
-* Try out the walkthrough at [Get Started](../get-started/index.md){: target="_blank" rel="noopener" class="_"}.
+* Try out the walkthrough at [Get Started](../../get-started/index.md){: target="_blank" rel="noopener" class="_"}.
 
 * Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
 

desktop/windows/install.md

@@ -3,6 +3,7 @@ description: How to install Docker Desktop for Windows
 keywords: windows, install, download, run, docker, local
 title: Install Docker Desktop on Windows
 redirect_from:
+- /docker-for-windows/install/
 - /docker-ee-for-windows/install/
 - /docker-for-windows/install-windows-home/
 - /ee/docker-ee/windows/docker-ee/
@@ -71,9 +72,9 @@ Hyper-V on Windows 10:
 
 ### What's included in the installer
 
-The Docker Desktop installation includes [Docker Engine](../engine/index.md),
+The Docker Desktop installation includes [Docker Engine](../../engine/index.md),
-Docker CLI client, [Docker Compose](../compose/index.md),
+Docker CLI client, [Docker Compose](../../compose/index.md),
-[Docker Content Trust](../engine/security/trust/index.md),
+[Docker Content Trust](../../engine/security/trust/index.md),
 [Kubernetes](https://github.com/kubernetes/kubernetes/),
 and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
 
@@ -83,7 +84,7 @@ accounts use the same VM to build and run containers. Note that it is not possib
 
 Nested virtualization scenarios, such as running Docker Desktop on a
 VMWare or Parallels instance might work, but there are no guarantees. For
-more information, see [Running Docker Desktop in nested virtualization scenarios](troubleshoot.md#running-docker-desktop-for-windows-in-nested-virtualization-scenarios).
+more information, see [Running Docker Desktop in nested virtualization scenarios](troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios).
 
 ### About Windows containers
 
@@ -126,7 +127,7 @@ When the whale icon in the status bar stays steady, Docker Desktop is up-and-run
 ![whale on taskbar](images/whale-icon-systray.png)
 
 If the whale icon is hidden in the Notifications area, click the up arrow on the
-taskbar to show it. To learn more, see [Docker Settings](index.md#docker-settings-dialog).
+taskbar to show it. To learn more, see [Docker Settings](index.md#settings).
 
 ## Quick Start Guide
 
@@ -154,7 +155,7 @@ To uninstall Docker Desktop from your Windows machine:
 >
 > Uninstalling Docker Desktop destroys Docker containers, images, volumes, and
 > other Docker related data local to the machine, and removes the files generated
-> by the application. Refer to the [back up and restore data](../desktop/backup-and-restore.md)
+> by the application. Refer to the [back up and restore data](../backup-and-restore.md)
 > section to learn how to preserve important data before uninstalling.
 
 ## Where to go next
@@ -164,6 +165,6 @@ To uninstall Docker Desktop from your Windows machine:
   deploy a multi-service stack.
 * [Troubleshooting](troubleshoot.md) describes common problems, workarounds, and
   how to get support.
-* [FAQs](../desktop/faqs.md) provide answers to frequently asked questions.
+* [FAQs](../faqs.md) provide answers to frequently asked questions.
 * [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases.
-* [Back up and restore data](../desktop/backup-and-restore.md) provides instructions on backing up and restoring data related to Docker.
+* [Back up and restore data](../backup-and-restore.md) provides instructions on backing up and restoring data related to Docker.

desktop/windows/networking.md

@@ -4,6 +4,7 @@ keywords: windows, networking
 title: Networking features in Docker Desktop for Windows
 redirect_from:
 - /docker-for-win/networking/
+- /docker-for-windows/networking/
 ---
 {% assign Arch = 'Windows' %}
 
@@ -22,7 +23,7 @@ Docker Desktop intercepts traffic from the containers and injects it into
 
 When you run a container with the `-p` argument, for example:
 
-```
+```console
 $ docker run -p 80:80 -d nginx
 ```
 
@@ -32,7 +33,7 @@ host and container ports are the same. What if you need to specify a different
 host port? If, for example, you already have something running on port 80 of
 your host machine, you can connect the container to a different port:
 
-```
+```console
 $ docker run -p 8000:80 -d nginx
 ```
 
@@ -125,5 +126,5 @@ container to random ports on the host.
 $ docker run -d -P --name webserver nginx
 ```
 
-See the [run command](../engine/reference/commandline/run.md) for more details on
+See the [run command](../../engine/reference/commandline/run.md) for more details on
 publish options used with `docker run`.

desktop/windows/previous-versions.md

@@ -4,6 +4,8 @@ keywords: Docker Desktop for Windows, release notes
 title: Release notes for previous versions
 toc_min: 1
 toc_max: 2
+redirect_from:
+- /docker-for-windows/previous-versions/
 ---
 
 This page contains release notes for older versions of Docker Desktop for Windows.
@@ -366,9 +368,9 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
 ### New
 
 - **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior.
-For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../desktop/dashboard.md).
+For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../dashboard.md).
 
-- **WSL 2 backend:** The experimental Docker Desktop WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](https://docs.docker.com/docker-for-windows/wsl/).
+- **WSL 2 backend:** The experimental Docker Desktop WSL 2 backend architecture introduces support for Kubernetes, provides an updated Docker daemon, offers VPN-friendly networking, and additional features. For more information, see [Docker Desktop WSL 2 backend](wsl.md).
 
 - **New file sharing implementation:** Docker Desktop introduces a new file sharing implementation that replaces Samba, CIFS, and Hyper-V networking. The new implementation  offers improved I/O performance. Additionally, when using the new file system:
 
@@ -640,7 +642,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
   - Linux Kernel 4.9.93 with CEPH, DRBD, RBD, MPLS_ROUTING and MPLS_IPTUNNEL enabled
 
 * New
-  - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See https://docs.docker.com/docker-for-windows/kubernetes/
+  - Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker for Windows settings and use kubectl commands as well as Docker commands. See [the Kubernetes section](../kubernetes.md)
 
 * Bug fixes and minor changes
   - AUFS storage driver is deprecated in Docker Desktop and AUFS support will be removed in the next major release. You can continue with AUFS in Docker Desktop 18.06.x, but you will need to reset the disk image (in Settings > Reset menu) before updating to the next major update. You can check documentation to [save images](https://docs.docker.com/engine/reference/commandline/save/#examples) and [backup volumes](https://docs.docker.com/storage/volumes/#backup-restore-or-migrate-data-volumes)

desktop/windows/release-notes.md

@@ -4,6 +4,7 @@ keywords: Docker Desktop for Windows, release notes
 redirect_from:
 - /winkit/release-notes/
 - /docker-for-windows/edge-release-notes/
+- /docker-for-windows/release-notes/
 title: Docker for Windows release notes
 toc_min: 1
 toc_max: 2
@@ -20,8 +21,8 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../desktop/dev-environments.md#start-a-dev-environment-from-a-local-folder).
+- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../dev-environments.md#start-a-dev-environment-from-a-local-folder).
-- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
+- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
 
 ### Upgrades
 
@@ -34,9 +35,14 @@ This page contains information about the new features, improvements, known issue
 - [containerd v1.4.9](https://github.com/containerd/containerd/releases/tag/v1.4.9)
 - [runc v1.0.1](https://github.com/opencontainers/runc/releases/tag/v1.0.1)
 - [Kubernetes 1.21.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.3)
+- [Linux kernel 5.10.47](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.47-0b705d955f5e283f62583c4e227d64a7924c138f/images/sha256-a4c79bc185ec9eba48dcc802a8881b9d97e532b3f803d23e5b8d4951588f4d51?context=repo)
 
 ### Bug fixes and minor changes
 
+- Update kernel configuration to fix a performance regression in [Docker Desktop 3.0.0](#docker-desktop-300)
+  that caused publishing container ports to take 10 times longer than on older
+  versions. For more information, see [linuxkit/linuxkit#3701](https://github.com/linuxkit/linuxkit/pull/3701)
+  and [docker/for-mac#5668](https://github.com/docker/for-mac/issues/5668).
 - Fixed a bug where the DNS server would fail after receiving an unexpectedly large datagram.
 - Fixed spurious traces on iptables updates.
 - Fixed slowness when adding multiple ports forwarding option.
@@ -55,7 +61,7 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
+**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
 
 ### Upgrades
@@ -86,9 +92,9 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
+**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
-**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
+**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
 
 ### Bug fixes and minor changes
 
@@ -102,9 +108,9 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
+**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
 
-**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
+**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
 
 ### Upgrades
 
@@ -136,11 +142,11 @@ This page contains information about the new features, improvements, known issue
 
 ### New
 
-**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
+**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
 
-**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
+**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
 
-**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../docker-for-windows/install.md#updates).
+**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](install.md#updates).
 
 ### Deprecation
 

desktop/windows/troubleshoot.md

@@ -4,6 +4,7 @@ keywords: windows, troubleshooting, logs, issues
 redirect_from:
 - /windows/troubleshoot/
 - /docker-for-win/troubleshoot/
+- /docker-for-windows/troubleshoot/
 title: Logs and troubleshooting
 toc_max: 2
 ---
@@ -111,13 +112,13 @@ does not send client certificates to them. Commands like `docker run` that
 attempt to pull from the registry produces error messages on the command line,
 like this:
 
-```
+```console
 Error response from daemon: Get http://192.168.203.139:5858/v2/: malformed HTTP response "\x15\x03\x01\x00\x02\x02"
 ```
 
 As well as on the registry. For example:
 
-```
+```console
 2017/06/20 18:15:30 http: TLS handshake error from 192.168.203.139:52882: tls: client didn't provide a certificate
 2017/06/20 18:15:30 http: TLS handshake error from 192.168.203.139:52883: tls: first record does not look like a TLS handshake
 ```
@@ -142,14 +143,14 @@ volumes or find a way to make the applications work with the default file
 permissions.
 
 See also,
-[Can I change permissions on shared volumes for container-specific deployment requirements?](../desktop/faqs.md#can-i-change-permissions-on-shared-volumes-for-container-specific-deployment-requirements)
+[Can I change permissions on shared volumes for container-specific deployment requirements?](../faqs.md#can-i-change-permissions-on-shared-volumes-for-container-specific-deployment-requirements)
 in the FAQs.
 
 #### Volume mounting requires shared folders for Linux containers
 
 If you are using mounted volumes and get runtime errors indicating an
 application file is not found, access is denied to a volume mount, or a service
-cannot start, such as when using [Docker Compose](../compose/gettingstarted.md),
+cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md),
 you might need to enable [shared folders](index.md#file-sharing).
 
 With the Hyper-V backend, mounting files from Windows requires shared folders for Linux containers. Click ![whale menu](images/whale-x.png){: .inline}
@@ -158,7 +159,7 @@ Dockerfile and volume.
 
 #### Support for symlinks
 
-Symlinks work within and across containers. To learn more, see [How do symlinks work on Windows?](../desktop/faqs.md#how-do-symlinks-work-on-windows) in the FAQs.
+Symlinks work within and across containers. To learn more, see [How do symlinks work on Windows?](../faqs.md#how-do-symlinks-work-on-windows) in the FAQs.
 
 #### Avoid unexpected syntax errors, use Unix style line endings for files in containers
 
@@ -413,8 +414,8 @@ As a Team, you can get support for Docker Desktop for the number of machines equ
 
 Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages:
 
-* [Windows system requirements](../docker-for-windows/install.md#system-requirements)
+* [Windows system requirements](install.md#system-requirements)
-* [Mac system requirements](../docker-for-mac/install.md#system-requirements)
+* [Mac system requirements](../mac/install.md#system-requirements)
 
 ### Can I run Docker Desktop on Virtualized hardware?
 

desktop/windows/wsl.md

@@ -2,6 +2,7 @@
 description: Docker Desktop WSL 2 backend
 keywords: WSL, WSL 2 Tech Preview, Windows Subsystem for Linux, WSL 2 backend Docker
 redirect_from:
+- /docker-for-windows/wsl/
 - /docker-for-windows/wsl-tech-preview/
 title: Docker Desktop WSL 2 backend
 toc_min: 2
@@ -113,8 +114,8 @@ Starting with Docker Desktop 3.1.0, Docker Desktop supports WSL 2 GPU Paravirtua
 
 To validate that everything works as expected, run the following command to run a short benchmark on your GPU:
 
-```
+```console
-❯ docker run --rm -it --gpus=all nvcr.io/nvidia/k8s/cuda-sample:nbody nbody -gpu -benchmark
+$ docker run --rm -it --gpus=all nvcr.io/nvidia/k8s/cuda-sample:nbody nbody -gpu -benchmark
 Run "nbody -benchmark [-numbodies=<numBodies>]" to measure performance.
         -fullscreen       (run n-body simulation in fullscreen mode)
         -fp64             (use double precision floating point values for simulation)

develop/develop-images/dockerfile_best-practices.md

@@ -579,6 +579,7 @@ build from inadvertently succeeding. For example:
 ```dockerfile
 RUN set -o pipefail && wget -O - https://some.site | wc -l > /number
 ```
+
 > Not all shells support the `-o pipefail` option.
 >
 > In cases such as the `dash` shell on

docker-hub/publish/certify-images.md

@@ -227,7 +227,7 @@ Some "testing/helper" scripts are available for testing Linux and Windows Docker
 cat ./run_my_application.sh
 ```
 
-```
+```bash
 #!/usr/bin/env bash
 docker container run -d \
 -p 80:8080 --name tomcat-wildbook \
@@ -237,7 +237,7 @@ $1
 
 #### To inspect the Docker image, `gforghetti/tomcat-wildbook:latest`, with a custom startup script and upload the result to Docker Hub (leave out the `-product-id` parameter if you are just testing):
 
-```
+```console
 root:[~/] # ./inspectDockerImage --start-script ./run_my_application.sh -product-id=<store-product-id> gforghetti/tomcat-wildbook:latest
 ```
 
@@ -462,7 +462,7 @@ root:[~/] #
 
 #### To inspect the Docker image, `gforghetti/apache:latest`, with JSON output:
 
-```
+```console
 root:[~/] # ./inspectDockerImage --json gforghetti/apache:latest | jq
 ```
 
@@ -589,7 +589,7 @@ root:[~/] # ./inspectDockerImage --json gforghetti/apache:latest | jq
 
 #### To inspect the Docker image, `gforghetti/apache:latest`, with HTML output:
 
-```
+```console
 root:[~/] # ./inspectDockerImage --html gforghetti/apache:latest
 ```
 
@@ -622,7 +622,7 @@ root:[~/] #
 
 #### To inspect the Docker image, `microsoft/nanoserver:latest`:
 
-```
+```console
 PS D:\InspectDockerimage> .\inspectDockerImage microsoft/nanoserver:latest
 ```
 

docker-hub/publish/certify-plugins-logging.md

@@ -256,9 +256,10 @@ By default, `inspectDockerLoggingPlugin` displays output locally to `stdout` (th
 
 #### To inspect the Docker logging plugin "gforghetti/docker-log-driver-test:latest", and upload the result to Docker Hub (leave out the `-product-id` parameter if you are just testing):
 
+```console
+$ ./inspectDockerLoggingPlugin -product-id=<store-product-id> gforghetti/docker-log-driver-test:latest
 ```
-gforghetti:~:$ ./inspectDockerLoggingPlugin -product-id=<store-product-id> gforghetti/docker-log-driver-test:latest
+
-```
 #### Output:
 
 ```
@@ -360,8 +361,8 @@ gforghetti:~/$
 
 #### To inspect the  Docker logging plugin `gforghetti/docker-log-driver-test:latest` with JSON Output:
 
-```
+```console
-gforghetti:~:$ ./inspectDockerLoggingPlugin --json gforghetti/docker-log-driver-test:latest | jq
+$ ./inspectDockerLoggingPlugin --json gforghetti/docker-log-driver-test:latest | jq
 ```
 
 > **Note**: The output was piped to the `jq` command to display it "nicely".
@@ -431,8 +432,8 @@ gforghetti:~:$ ./inspectDockerLoggingPlugin --json gforghetti/docker-log-driver-
 
 #### To inspect the  Docker logging plugin `gforghetti/docker-log-driver-test:latest` with HTML output:
 
-```
+```console
-gforghetti:~:$ ./inspectDockerLoggingPlugin --html gforghetti/docker-log-driver-test:latest
+$ ./inspectDockerLoggingPlugin --html gforghetti/docker-log-driver-test:latest
 ```
 
 #### Output:
@@ -442,7 +443,6 @@ Note: The majority of the stdout message output has been intentionally omitted b
 ```
 The inspection of the Docker logging plugin cpuguy83/docker-logdriver-test:latest has completed.
 An HTML report has been generated in the file cpuguy83-docker-logdriver-test-latest_inspection_report.html
-gforghetti:~/$
 ```
 
 ![HTML Output Image](images/gforghetti-log-driver-latest_inspection_report.html.png)
@@ -520,10 +520,11 @@ The **curl** command can be used to test and use the **http_api_endpoint** HTTP
 
 ##### Script to run a container to test the Logging Plugin
 
+```console
+$ cat test_new_plugin.sh
 ```
-# cat test_new_plugin.sh
+
-```
+```bash
-```
 #!/usr/bin/env bash
 
 #######################################################################################################################################
@@ -571,10 +572,11 @@ exit $?
 
 ##### Script to retrieve the logging data from the http_api_endpoint HTTP Server
 
+```console
+$ cat get_plugin_logs.sh
 ```
-# cat get_plugin_logs.sh
+
-```
+```bash
-```
 #!/usr/bin/env sh
 
 #######################################################################################################################################
@@ -589,6 +591,6 @@ curl -s -X GET http://127.0.0.1:80
 
 ##### To test the Docker logging plugin
 
-```
+```console
-./inspectDockerLoggingPlugin --verbose --html --test-script ./test_plugin.sh --get-logs-script ./get_plugin_logs.sh myNamespace/docker-logging-driver:1.0.2
+$ ./inspectDockerLoggingPlugin --verbose --html --test-script ./test_plugin.sh --get-logs-script ./get_plugin_logs.sh myNamespace/docker-logging-driver:1.0.2
 ```

docsarchive.md

@@ -7,8 +7,8 @@ prior version of Docker was shipped.
 
 To view the docs offline on your local machine, run:
 
-```
+```console
-docker run -ti -p 4000:4000 {{ archive.image }}
+$ docker run -ti -p 4000:4000 {{ archive.image }}
 ```
 
 ## Accessing unsupported archived documentation
@@ -21,6 +21,6 @@ you can still access that documentation in the following ways:
 - By running a container of the specific [tag for your documentation version](https://hub.docker.com/r/docs/docker.github.io)
   in Docker Hub. For example, run the following to access `v1.9`:
 
-  ```console
+```console
-  $ docker run  -it -p 4000:4000 docs/docker.github.io:v1.9
+$ docker run  -it -p 4000:4000 docs/docker.github.io:v1.9
-  ```
+```

engine/api/sdk/examples.md

@@ -450,6 +450,7 @@ Reticulating spline 3...
 Reticulating spline 4...
 Reticulating spline 5...
 ```
+
 </div>
 </div><!-- end tab-content -->
 

engine/breaking_changes.md

@@ -10,15 +10,15 @@ Every Engine release strives to be backward compatible with its predecessors,
 and interface stability is always a priority at Docker.
 
 In all cases, feature removal is communicated three releases
-in advance and documented as part of the [deprecated features](deprecated.md)
+in advance and documented as part of the [deprecated features](/engine/deprecated/)
 page.
   
 The following list compiles any updates to Docker Engine that created
 backwards-incompatibility for old versions of Docker tools.
 
 > **Note**: In the case of your local environment, you should be updating your
-  Docker Engine using [Docker Desktop for Mac](/docker-for-mac),
+  Docker Engine using [Docker Desktop for Mac](../desktop/mac/index.md),
-  [Docker Desktop for Windows](/docker-for-windows). That way all your tools stay
+  [Docker Desktop for Windows](../desktop/windows/index.md). That way all your tools stay
   in sync with Docker Engine.
 
 ## Engine 1.10

engine/context/working-with-contexts.md

@@ -40,7 +40,7 @@ A context is a combination of several properties. These include:
 
 The easiest way to see what a context looks like is to view the **default** context.
 
-```
+```console
 $ docker context ls
 NAME          DESCRIPTION     DOCKER ENDPOINT                KUBERNETES ENDPOINT      ORCHESTRATOR
 default *     Current...      unix:///var/run/docker.sock                             swarm
@@ -52,7 +52,7 @@ The asterisk in the `NAME` column indicates that this is the active context. Thi
 
 Dig a bit deeper with `docker context inspect`. In this example, we're inspecting the context called `default`.
 
-```
+```console
 $ docker context inspect default
 [
     {
@@ -86,7 +86,7 @@ The following example creates a new context called "docker-test" and specifies t
 - Default orchestrator = Swarm
 - Issue commands to the local Unix socket `/var/run/docker.sock`
 
-```
+```console
 $ docker context create docker-test \
   --default-stack-orchestrator=swarm \
   --docker host=unix:///var/run/docker.sock
@@ -102,7 +102,7 @@ You can view the new context with `docker context ls` and `docker context inspec
 
 The following can be used to create a config with Kubernetes as the default orchestrator using the existing kubeconfig stored in `/home/ubuntu/.kube/config`. For this to work, you will need a valid kubeconfig file in `/home/ubuntu/.kube/config`. If your kubeconfig has more than one context, the current context (`kubectl config current-context`) will be used.
 
-```
+```console
 $ docker context create k8s-test \
   --default-stack-orchestrator=kubernetes \
   --kubernetes config-file=/home/ubuntu/.kube/config \
@@ -113,7 +113,7 @@ Successfully created context "k8s-test"
 
 You can view all contexts on the system with `docker context ls`.
 
-```
+```console
 $ docker context ls
 NAME           DESCRIPTION   DOCKER ENDPOINT               KUBERNETES ENDPOINT               ORCHESTRATOR
 default *      Current       unix:///var/run/docker.sock   https://35.226.99.100 (default)   swarm
@@ -129,7 +129,7 @@ You can use `docker context use` to quickly switch between contexts.
 
 The following command will switch the `docker` CLI to use the "k8s-test" context.
 
-```
+```console
 $ docker context use k8s-test
 
 k8s-test
@@ -138,7 +138,7 @@ Current context is now "k8s-test"
 
 Verify the operation by listing all contexts and ensuring the asterisk ("\*") is against the "k8s-test" context.
 
-```
+```console
 $ docker context ls
 NAME            DESCRIPTION                               DOCKER ENDPOINT               KUBERNETES ENDPOINT               ORCHESTRATOR
 default         Current DOCKER_HOST based configuration   unix:///var/run/docker.sock   https://35.226.99.100 (default)   swarm
@@ -154,13 +154,13 @@ Use the appropriate command below to set the context to `docker-test` using an e
 
 Windows PowerShell:
 
-```
+```console
 > $Env:DOCKER_CONTEXT=docker-test
 ```
 
 Linux:
 
-```
+```console
 $ export DOCKER_CONTEXT=docker-test
 ```
 
@@ -168,7 +168,7 @@ Run a `docker context ls` to verify that the "docker-test" context is now the ac
 
 You can also use the global `--context` flag to override the context specified by the `DOCKER_CONTEXT` environment variable. For example, the following will send the command to a context called "production".
 
-```
+```console
 $ docker --context production container ls
 ```
 
@@ -188,21 +188,21 @@ Let's look at exporting and importing a native Docker context.
 
 The following example exports an existing context called "docker-test". It will be written to a file called `docker-test.dockercontext`.
 
-```
+```console
 $ docker context export docker-test
 Written file "docker-test.dockercontext"
 ```
 
 Check the contents of the export file.
 
-```
+```console
 $ cat docker-test.dockercontext
 meta.json0000644000000000000000000000022300000000000011023 0ustar0000000000000000{"Name":"docker-test","Metadata":{"StackOrchestrator":"swarm"},"Endpoints":{"docker":{"Host":"unix:///var/run/docker.sock","SkipTLSVerify":false}}}tls0000700000000000000000000000000000000000000007716 5ustar0000000000000000
 ```
 
 This file can be imported on another host using `docker context import`. The target host must have the Docker client installed.
 
-```
+```console
 $ docker context import docker-test docker-test.dockercontext
 docker-test
 Successfully imported context "docker-test"
@@ -220,14 +220,14 @@ You can export a Kubernetes context only if the context you are exporting has a
 
 These steps will use the `--kubeconfig` flag to export **only** the Kubernetes elements of the existing `k8s-test` context to a file called "k8s-test.kubeconfig". The `cat` command will then show that it's exported as a valid kubeconfig file.
 
-```
+```console
 $ docker context export k8s-test --kubeconfig
 Written file "k8s-test.kubeconfig"
 ```
 
 Verify that the exported file contains a valid kubectl config.
 
-```
+```console
 $ cat k8s-test.kubeconfig
 apiVersion: v1
 clusters:
@@ -265,7 +265,7 @@ You can use `docker context update` to update fields in an existing context.
 
 The following example updates the "Description" field in the existing `k8s-test` context.
 
-```
+```console
 $ docker context update k8s-test --description "Test Kubernetes cluster"
 k8s-test
 Successfully updated context "k8s-test"

engine/install/index.md

@@ -32,7 +32,7 @@ redirect_from:
 ## Supported platforms
 
 Docker Engine is available on a variety of [Linux platforms](#server),
-[macOS](../../docker-for-mac/install.md) and [Windows 10](../../docker-for-windows/install.md)
+[macOS](../../desktop/mac/install.md) and [Windows 10](../../desktop/windows/install.md)
 through Docker Desktop, and as a [static binary installation](binaries.md). Find
 your preferred operating system below.
 
@@ -42,8 +42,8 @@ your preferred operating system below.
 
 | Platform                                                          | x86_64 / amd64                                   | arm64 (Apple Silicon)                            |
 |:------------------------------------------------------------------|:------------------------------------------------:|:------------------------------------------------:|
-| [Docker Desktop for Mac (macOS)](../../docker-for-mac/install.md) | [{{ yes }}](../../docker-for-mac/install.md)     | [{{ yes }}](../../docker-for-mac/install.md)     |
+| [Docker Desktop for Mac (macOS)](../../desktop/mac/install.md)    | [{{ yes }}](../../desktop/mac/install.md)        | [{{ yes }}](../../desktop/mac/install.md)     |
-| [Docker Desktop for Windows](../../docker-for-windows/install.md) | [{{ yes }}](../../docker-for-windows/install.md) |                                                  |
+| [Docker Desktop for Windows](../../desktop/windows/install.md) | [{{ yes }}](../../desktop/windows/install.md) |                                                  |
 
 ### Server
 

engine/reference/commandline/app.md

@@ -68,7 +68,7 @@ it initializes a new project based on the Compose file.
 
 Use the following command to initialize a new empty project called "hello-world".
 
-```
+```console
 $ docker app init hello-world
 Created "hello-world.dockerapp"
 ```
@@ -82,7 +82,7 @@ project with `.dockerapp` appended, and the three YAML files are:
 
 Inspect the YAML files with the following commands.
 
-```
+```console
 $ cd hello-world.dockerapp/
 
 $ cat docker-compose.yml
@@ -116,19 +116,19 @@ This section describes editing the project YAML files so that it runs a simple w
 Use your preferred editor to edit the `docker-compose.yml` YAML file and update it with 
 the following information:
 
-```
+```yaml
 version: "3.6"
 services:
   hello:
     image: hashicorp/http-echo
     command: ["-text", "${hello.text}"]
     ports:
-      - ${hello.port}:5678
+      - "${hello.port}:5678"
 ```
 
 Update the `parameters.yml` file to the following:
 
-```
+```yaml
 hello:
   port: 8080
   text: Hello world!
@@ -147,7 +147,7 @@ It is a quick way to check how to configure the application before deployment, w
 the `Compose file`. It's important to note that the application is not running at this point, and that 
 the `inspect` operation inspects the configuration file(s).
 
-```
+```console
 $ docker app inspect hello-world.dockerapp
 hello-world 0.1.0
 
@@ -171,7 +171,7 @@ The application is ready to be validated and rendered.
 Docker App provides the `validate` subcommand to check syntax and other aspects of the configuration. 
 If the app passes validation, the command returns no arguments.
 
-```
+```console
 $ docker app validate hello-world.dockerapp
 Validated "hello-world.dockerapp"
 ```
@@ -199,7 +199,7 @@ Use `docker app install` to deploy the application.
 
 Use the following command to deploy (install) the application.
 
-```
+```console
 $ docker app install hello-world.dockerapp --name my-app
 Creating network my-app_default
 Creating service my-app_hello
@@ -211,7 +211,7 @@ installation container and as a target context to deploy the application. You ca
 using the flag `--target-context` or by using the environment variable `DOCKER_TARGET_CONTEXT`. This flag is also 
 available for the commands `status`, `upgrade`, and `uninstall`.
 
-```
+```console
 $ docker app install hello-world.dockerapp --name my-app --target-context=my-big-production-cluster
 Creating network my-app_default
 Creating service my-app_hello
@@ -223,7 +223,7 @@ valid if they are deployed on different target contexts.
 
 You can check the status of the app with the `docker app status <app-name>` command.
 
-```
+```console
 $ docker app status my-app
 INSTALLATION
 ------------
@@ -254,7 +254,7 @@ miqdk1v7j3zk    my-app_hello    replicated    1/1         hashicorp/http-echo:la
 
 The app is deployed using the stack orchestrator. This means you can also inspect it using the regular `docker stack` commands.
 
-```
+```console
 $ docker stack ls
 NAME                SERVICES            ORCHESTRATOR
 my-app              1                   Swarm
@@ -265,7 +265,8 @@ port 8080 and see the app. You must ensure traffic to port 8080 is allowed on
 the connection from your browser to your Docker host.
 
 Now change the port of the application using `docker app upgrade <app-name>` command.
-```
+
+```console
 $ docker app upgrade my-app --set hello.port=8181
 Upgrading service my-app_hello
 Application "my-app" upgraded on context "default"
@@ -286,13 +287,13 @@ Rendering is the process of reading the entire application configuration and out
 
 Use the following command to render the app to a Compose file called `docker-compose.yml` in the current directory.
 
-```
+```console
 $ docker app render --output docker-compose.yml hello-world.dockerapp
 ```
 
 Check the contents of the resulting `docker-compose.yml` file.
 
-```
+```console
 $ cat docker-compose.yml
 version: "3.6"
 services:
@@ -315,7 +316,7 @@ section of the project's YAML file. For example, `${hello.text}` has been expand
 
 Try to render the application with a different text:
 
-```
+```console
 $ docker app render hello-world.dockerapp --set hello.text="Hello whales!" 
 version: "3.6"
 services:
@@ -333,7 +334,7 @@ services:
 
 Use `docker-compose up` to deploy the app.
 
-```
+```console
 $ docker-compose up --detach
 WARNING: The Docker Engine you're using is running in swarm mode.
 <Snip>
@@ -354,7 +355,7 @@ Deploying the app as a Docker stack is a two-step process very similar to deploy
 Complete the steps in the previous section to render the Docker app project as a Compose file and make sure 
 you're ready to deploy it as a Docker Stack. Your Docker host must be in Swarm mode.
 
-```
+```console
 $ docker stack deploy hello-world-app -c docker-compose.yml
 Creating network hello-world-app_default
 Creating service hello-world-app_hello
@@ -394,7 +395,7 @@ $ docker app push my-app --platform="linux/amd64" --tag <hub-id>/<repo>:0.1.0
 Now that the app is pushed to the registry, try an `inspect` and `install` command against it. 
 The location of your app is different from the one provided in the examples.
 
-```
+```console
 $ docker app inspect myuser/hello-world:0.1.0
 hello-world 0.1.0
 
@@ -412,7 +413,7 @@ This action was performed directly against the app in the registry.
 
 Now install it as a native Docker App by referencing the app in the registry, with a different port.
 
-```
+```console
 $ docker app install myuser/hello-world:0.1.0 --set hello.port=8181
 Creating network hello-world_default
 Creating service hello-world_hello
@@ -424,14 +425,14 @@ Test that the app is working.
 The app used in these examples is a simple web server that displays the text "Hello world!" on port 8181, 
 your app might be different.
 
-```
+```console
 $ curl http://localhost:8181
 Hello world!
 ```
 
 Uninstall the app.
 
-```
+```console
 $ docker app uninstall hello-world
 Removing service hello-world_hello
 Removing network hello-world_default

engine/release-notes/18.09.md

@@ -192,6 +192,7 @@ Run the following command to get the current value of the `MountFlags` property
 $ sudo systemctl show --property=MountFlags docker.service
 MountFlags=
 ```
+
 Update your configuration if this command prints a non-empty value for `MountFlags`, and restart the docker service.
 
 ### Security fixes