Merge pull request #12663 from usha-mandya/engdocs-391

Docs for Desktop 3.3.1 release

_data/toc.yaml

@@ -1284,8 +1284,8 @@ manuals:
       title: Logs and troubleshooting
     - path: /docker-for-mac/release-notes/
       title: Release notes
-    - path: /docker-for-mac/apple-m1/
+    - path: /docker-for-mac/apple-silicon/
-      title: Apple Silicon Tech Preview
+      title: Apple silicon
   - sectiontitle: Windows
     section:
     - path: /docker-for-windows/install/

_includes/landing-page/apple-silicon.html

@@ -0,0 +1,19 @@
+<section class="cta-banner dockercon">
+  <div class="container">
+    <div class="row">
+      <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
+        <h2>
+          Docker Desktop for Apple silicon is now GA!
+        </h2>
+        <h5>
+          We are excited to announce the general availability of Docker Desktop for Mac with Apple silicon, continuing to delight millions of developers in our community with their choice of local development environments.
+        </h5>
+      </div>
+      <div class="col-xs-12 col-md-6 col-lg-4 text-center">
+        <a class="btn" href="https://docs.docker.com/docker-for-mac/apple-silicon/" target="_blank" rel="noopener">
+          Check out the details
+        </a>
+      </div>
+    </div>
+  </div>
+</section>

_layouts/landing.html

@@ -143,7 +143,7 @@
     </div>
   </section>
 
-  {% include landing-page/docker-pricing.html %}
+  {% include landing-page/apple-silicon.html %}
 
   <section class="container help-by-product">
     <div class="row">

_scss/_buttons.scss

@@ -9,7 +9,7 @@ a.button {
 }
 
 a.button.outline-btn {
-    color: #0087C8;
+    color: $primary-links;
     float: none;
     margin-bottom: 30px;
     display: inline-block;
@@ -20,6 +20,7 @@ a.button.outline-btn.min-hgt {
 }
 
 .button {
+    display: inline-block;
     margin: 10px 10px 10px 0;
     font-family: $buttons;
     padding: 12px 35px 10px;
@@ -27,6 +28,7 @@ a.button.outline-btn.min-hgt {
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1);
     float: left;
     text-align: center;
+    white-space: nowrap;
     &:hover {
         color: #fff;
         opacity: 0.7;
@@ -34,10 +36,12 @@ a.button.outline-btn.min-hgt {
 }
 
 .primary-btn {
-    background: #1488C6;
+    background:    $primary-links;
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    border:        1px solid rgba(0, 0, 0, 0.1);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.2);
+    border-radius: 4px;
+    padding-top:   16px
 }
+
 /*
 .secondary-btn {
     background-color: rgba(255, 255, 255, 0.2);

_scss/_content.scss

@@ -1,6 +1,7 @@
 
 .content, p {
   line-height: 24px;
+  clear:       both;
 
   img {
     display:   block;

_scss/_night-mode.scss

@@ -100,11 +100,12 @@ body.night {
         color: #d0e8ff;
     }
     .outline-btn {
-        background: #101c29;
+        background: $bg-sidebar-night;
-        border: 1px solid #37404a;
+        border: 1px solid $body-text;
+
     }
     a.button.outline-btn {
-        color: #a7e2ff;
+        color: $primary-links-night;
     }
     a.glossary,
     .toc-nav i.fa {
@@ -197,7 +198,7 @@ body.night {
         border-color: #374656;
         >.panel-heading {
             color: #c0c3c4;
-            background-color: #101c29;
+            background-color: $bg-sidebar-night;
             border-color: #2f4050;
         }
     }

desktop/faqs.md

@@ -136,9 +136,7 @@ By default Docker, Inc. will delete uploaded diagnostics bundles after 30 days.
 
 ### Is Docker Desktop compatible with Apple silicon processors?
 
-At the moment, Docker Desktop is compatible with Intel processors only. For more information, see [Apple M1 Tech preview](../docker-for-mac/apple-m1.md).
+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).
-
-You can also follow the status of Apple Silicon support in our [Roadmap](https://github.com/docker/roadmap/issues/142){:target="_blank" rel="noopener" class="_"}.
 
 ### What is HyperKit?
 

docker-for-mac/apple-silicon.md

@@ -0,0 +1,78 @@
+---
+description: Docker Desktop for Apple silicon
+keywords: Docker Desktop, M1, Silicon, Apple,
+title: Docker Desktop for Apple silicon
+toc_min: 2
+toc_max: 3
+redirect_from:
+- /docker-for-mac/apple-m1/
+---
+
+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 3.3.1
+
+2021-04-15
+
+Click the following link to download Docker Desktop.
+
+[Download](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn}
+
+<br>
+
+### System requirements
+
+You must install **Rosetta 2** as some binaries are still Darwin/AMD64. To install Rosetta 2 manually from the command line, run the following command:
+
+```
+softwareupdate --install-rosetta
+```
+
+We expect to fix this in a future release.
+
+### Known issues
+
+- Not all images are available for ARM64 architecture. You can add `--platform linux/amd64` to run an Intel image under emulation. In particular, the [mysql](https://hub.docker.com/_/mysql?tab=tags&page=1&ordering=last_updated) image is not available for ARM64. You can work around this issue by using a [mariadb](https://hub.docker.com/_/mariadb?tab=tags&page=1&ordering=last_updated) image.
+
+   However, attempts to run Intel-based containers on Apple Silicon machines can crash as QEMU sometimes fails to run the container. Filesystem change notification APIs (e.g. `inotify`) do not work under QEMU emulation, see [docker/for-mac#5321](https://github.com/docker/for-mac/issues/5321). Therefore, we recommend that you run ARM64 containers on Apple Silicon machines. These containers are also faster and use less memory than Intel-based containers.
+
+   We expect this issue to become less common over time, as more and more images are rebuilt [supporting multiple architectures](https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/).
+- When using the `qemu` backend, `ping` from inside a container to the Internet does not work as expected.  To test the network, we recommend using `curl` or `wget`. See [docker/for-mac#5322](https://github.com/docker/for-mac/issues/5322#issuecomment-809392861).
+
+- ICMP echo responses (`ping` responses) can contain incorrect sequence numbers.
+- Users may occasionally experience data drop when a TCP stream is half-closed.
+
+### Fixes since Docker Desktop RC 3
+
+- Docker Desktop now ensures the permissions of `/dev/null` and other devices are correctly set to `0666` (`rw-rw-rw-`) inside `--privileged` containers. Fixes [docker/for-mac#5527](https://github.com/docker/for-mac/issues/5527).
+- Docker Desktop now reduces the idle CPU consumption.
+
+### Fixes since Docker Desktop RC 2
+
+- Update to [Linux kernel 5.10.25](https://hub.docker.com/layers/docker/for-desktop-kernel/5.10.25-6594e668feec68f102a58011bb42bd5dc07a7a9b/images/sha256-80e22cd9c9e6a188a785d0e23b4cefae76595abe1e4a535449627c2794b10871?context=repo) to improve reliability.
+
+### Fixes since Docker Desktop RC 1
+
+- Inter-container HTTP and HTTPS traffic is now routed correctly. Fixes [docker/for-mac#5476](https://github.com/docker/for-mac/issues/5476).
+
+### Fixes since Docker Desktop preview 3.1.0
+
+- The build should update automatically to future versions.
+- HTTP proxy support is working, including support for domain name based `no_proxy` rules via TLS SNI. Fixes [docker/for-mac#2732](https://github.com/docker/for-mac/issues/2732).
+
+### Fixes since the Apple Silicon preview 7
+
+- Kubernetes now works (although you might need to reset the cluster in our Troubleshoot menu one time to regenerate the certificates).
+- osxfs file sharing works.
+- The `host.docker.internal` and `vm.docker.internal` DNS entries now resolve.
+- Removed hard-coded IP addresses: Docker Desktop now dynamically discovers the IP allocated by macOS.
+- The updated version includes a  change that should improve disk performance.
+- The **Restart** option in the Docker menu works.
+
+## Feedback
+
+Your feedback is important to us. Let us know your feedback by creating an issue in the [Docker Desktop for Mac GitHub](https://github.com/docker/for-mac/issues)repository.
+
+We also recommend that you join the [Docker Community Slack](https://www.docker.com/docker-community) and ask questions in **#docker-desktop-mac** channel.

docker-for-mac/install.md

@@ -4,16 +4,27 @@ keywords: mac, install, download, run, docker, local
 title: Install Docker Desktop on Mac
 ---
 
-Docker Desktop for Mac is the [Community](https://www.docker.com/community-edition) version of Docker for Mac.
+Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, installation instructions, and automatic updates.
-You can download Docker Desktop for Mac from Docker Hub.
 
-[Download from Docker Hub](https://hub.docker.com/editions/community/docker-ce-desktop-mac/){: .button .outline-btn}
+Download Docker Desktop for Mac:
+
+[Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn}
+[Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn}
 
 By downloading Docker Desktop, you agree to the terms of the [Docker Software End User License Agreement](https://www.docker.com/legal/docker-software-end-user-license-agreement){: target="_blank" rel="noopener" class="_"} and the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"}.
 
 ## System requirements
 
-Your Mac must meet the following requirements to successfully install Docker Desktop:
+Your Mac must meet the following requirements to successfully install Docker Desktop.
+
+<ul class="nav nav-tabs">
+<li class="active"><a data-toggle="tab" data-target="#mac-intel">Mac with Intel chip</a></li>
+<li><a data-toggle="tab" data-target="#mac-apple-silicon">Mac with Apple silicon</a></li>
+</ul>
+<div class="tab-content">
+<div id="mac-intel" class="tab-pane fade in active" markdown="1">
+
+### Mac with Intel chip
 
 - **macOS must be version 10.14 or newer**. That is, Mojave, Catalina, or Big Sur. We recommend upgrading to the latest version of macOS.
 
@@ -27,6 +38,22 @@ Your Mac must meet the following requirements to successfully install Docker Des
 
 - VirtualBox prior to version 4.3.30 must not be installed as it is not compatible with Docker Desktop.
 
+</div>
+<div id="mac-apple-silicon" class="tab-pane fade" markdown="1">
+
+### Mac with Apple silicon
+
+- You must install **Rosetta 2** as some binaries are still Darwin/AMD64. To install Rosetta 2 manually from the command line, run the following command:
+
+  ```bash
+    softwareupdate --install-rosetta
+  ```
+
+ For more information, see [Docker Desktop for Apple silicon](apple-silicon.md).
+
+</div>
+</div>
+
 ## What's included in the installer
 
 The Docker Desktop installation includes
@@ -87,6 +114,7 @@ To uninstall Docker Desktop from your Mac:
 ## Where to go next
 
 - [Getting started](index.md) provides an overview of Docker Desktop on Mac, basic Docker command examples, how to get help or give feedback, and links to other topics about Docker Desktop on 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.

docker-for-mac/release-notes.md

@@ -11,10 +11,40 @@ toc_max: 2
 
 This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
 
+## Docker Desktop 3.3.1
+2021-04-15
+
+[Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn}
+[Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn}
+
+### New
+
+Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](apple-silicon.md).
+
+### Bug fixes and minor changes
+
+- Docker Desktop now ensures the permissions of `/dev/null` and other devices are correctly set to `0666` (`rw-rw-rw-`) inside `--privileged` containers. Fixes [docker/for-mac#5527](https://github.com/docker/for-mac/issues/5527)
+- Fixed an issue that caused Docker Desktop to fail during startup when it is unable to establish a connection with Docker Hub in the backend. Fixes [docker/for-win#10896](https://github.com/docker/for-win/issues/10896)
+
+- **Mac with Apple silicon**: Docker Desktop now reduces the idle CPU consumption.
+
+### Known issues
+
+**Apple silicon**
+
+- Not all images are available for ARM64 architecture. You can add `--platform linux/amd64` to run an Intel image under emulation. In particular, the [mysql](https://hub.docker.com/_/mysql?tab=tags&page=1&ordering=last_updated) image is not available for ARM64. You can work around this issue by using a [mariadb](https://hub.docker.com/_/mariadb?tab=tags&page=1&ordering=last_updated) image.
+
+   However, attempts to run Intel-based containers on Apple Silicon machines can crash as QEMU sometimes fails to run the container. Filesystem change notification APIs (e.g. `inotify`) do not work under QEMU emulation, see [docker/for-mac#5321](https://github.com/docker/for-mac/issues/5321). Therefore, we recommend that you run ARM64 containers on Apple Silicon machines. These containers are also faster and use less memory than Intel-based containers.
+
+   We expect this issue to become less common over time, as more and more images are rebuilt [supporting multiple architectures](https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/).
+- When using the `qemu` backend, `ping` from inside a container to the Internet does not work as expected.  To test the network, we recommend using `curl` or `wget`. See [docker/for-mac#5322](https://github.com/docker/for-mac/issues/5322#issuecomment-809392861).
+- ICMP echo responses (`ping` responses) can contain incorrect sequence numbers.
+- Users may occasionally experience data drop when a TCP stream is half-closed.
+
 ## Docker Desktop 3.3.0
 2021-04-08
 
-> [Download](https://desktop.docker.com/mac/stable/amd64/Docker.dmg)
+> [Download](https://desktop.docker.com/mac/stable/amd64/62916/Docker.dmg)
 
 ### New
 

docker-for-mac/troubleshoot.md

@@ -152,10 +152,6 @@ ways, and create reports.
 <a name="troubleshoot"></a>
 ## Troubleshooting
 
-### Support for Apple silicon processors
-
-At the moment, Docker Desktop is compatible with Intel processors only. You can learn more about the technical preview for Apple silicon in our [docs](apple-m1.md).
-
 ### Make sure certificates are set up correctly
 
 Docker Desktop ignores certificates listed under insecure registries, and does
@@ -248,6 +244,28 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install
 
 ## Known issues
 
+* The following issues are seen when using the `virtualization.framework` experimental feature:
+
+  * Some VPN clients can prevent the VM running Docker from communicating with the host, preventing Docker Desktop starting correctly. See [docker/for-mac#5208](https://github.com/docker/for-mac/issues/5208).
+
+    This is an interaction between `vmnet.framework` (as used by `virtualization.framework` in Big Sur) and the VPN clients.
+
+  * Docker Desktop is incompatible with macOS Internet Sharing. See [docker/for-mac#5348](https://github.com/docker/for-mac/issues/5348).
+
+    This is an interaction between `vmnet.framework` (as used by `virtualization.framework` in Big Sur) and macOS Internet Sharing. At the moment it is not possible to use Docker Desktop and macOS Internet Sharing at the same time.
+
+  * Some container disk I/O is much slower than expected. See [docker/for-mac#5389](https://github.com/docker/for-mac/issues/5389). Disk flushes are particularly slow due to the need to guarantee data is written to stable storage on the host.
+
+    This is an artifact of the new `virtualization.framework` in Big Sur.
+
+  * TCP and UDP port 53 (DNS) are bound on the host when Docker Desktop starts. Therefore you cannot bind to port 53 on all interfaces with a command like `docker run -p 53:53`. See [docker/for-mac#5335](https://github.com/docker/for-mac/issues/5335).
+
+    This is an artifact of the new `virtualization.framework` in Big Sur. A workaround is to bind to a specific IP address e.g. `docker run -p 127.0.0.1:53:53`.
+
+  * The Linux Kernel may occasionally crash. Docker now detects this problem and pops up an error dialog offering the user the ability to quickly restart Linux.
+
+    We are still gathering data and testing alternate kernel versions.
+
 * IPv6 is not (yet) supported on Docker Desktop.
 
 * You might encounter errors when using `docker-compose up` with Docker Desktop
@@ -337,6 +355,7 @@ Docker Desktop excludes support for the following types of issues:
 
 * Use on or in conjunction with hardware or software other than that specified in the applicable documentation
 * Running on unsupported operating systems, including beta/preview versions of operating systems
+* Running containers of a different architecture using emulation
 * Support for the Docker engine, Docker CLI, or other bundled Linux components
 * Support for Kubernetes
 * Features labeled as experimental

docker-for-windows/install.md

@@ -6,12 +6,10 @@ redirect_from:
 - /docker-for-windows/install-windows-home/
 ---
 
-Docker Desktop for Windows is the [Community](https://www.docker.com/community-edition) version of Docker for Microsoft Windows.
+Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, installation instructions, and automatic updates.
-You can download Docker Desktop for Windows from Docker Hub.
 
-[Download from Docker
+[Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){:
-Hub](https://hub.docker.com/editions/community/docker-ce-desktop-windows/){:
+.button .primary-btn}
-.button .outline-btn}
 
 By downloading Docker Desktop, you agree to the terms of the [Docker Software End User License Agreement](https://www.docker.com/legal/docker-software-end-user-license-agreement){: target="_blank" rel="noopener" class="_"} and the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"}.
 
@@ -19,6 +17,31 @@ By downloading Docker Desktop, you agree to the terms of the [Docker Software En
 
 Your Windows machine must meet the following requirements to successfully install Docker Desktop.
 
+<ul class="nav nav-tabs">
+<li class="active"><a data-toggle="tab" data-target="#win-wsl2">WSL 2 backend</a></li>
+<li><a data-toggle="tab" data-target="#win-hyper-v">Hyper-V backend and Windows containers</a></li>
+</ul>
+<div class="tab-content">
+<div id="win-wsl2" class="tab-pane fade in active" markdown="1">
+
+### WSL 2 backend
+
+- Windows 10 64-bit: Home, Pro, Enterprise, or Education, version 1903 (Build 18362 or higher).
+- Enable the WSL 2 feature on Windows. For detailed instructions, refer to the
+    [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10){: target="_blank" rel="noopener" class="_"}.
+- The following hardware prerequisites are required to successfully run
+WSL 2 on Windows 10:
+
+  - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation){: target="_blank" rel="noopener" class="_"}
+  - 4GB system RAM
+  - BIOS-level hardware virtualization support must be enabled in the
+    BIOS settings.  For more information, see
+    [Virtualization](troubleshoot.md#virtualization-must-be-enabled).
+- Download and install the [Linux kernel update package](https://docs.microsoft.com/windows/wsl/wsl2-kernel){: target="_blank" rel="noopener" class="_"}.
+
+</div>
+<div id="win-hyper-v" class="tab-pane fade" markdown="1">
+
 ### Hyper-V backend and Windows containers
 
 - Windows 10 64-bit: Pro, Enterprise, or Education (Build 17134 or higher).
@@ -34,20 +57,8 @@ Hyper-V on Windows 10:
     BIOS settings.  For more information, see
     [Virtualization](troubleshoot.md#virtualization-must-be-enabled).
 
-### WSL 2 backend
+</div>
-
+</div>
-- Windows 10 64-bit: Home, Pro, Enterprise, or Education, version 1903 (Build 18362 or higher).
-- Enable the WSL 2 feature on Windows. For detailed instructions, refer to the
-    [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10){: target="_blank" rel="noopener" class="_"}.
-- The following hardware prerequisites are required to successfully run
-WSL 2 on Windows 10:
-
-  - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation){: target="_blank" rel="noopener" class="_"}
-  - 4GB system RAM
-  - BIOS-level hardware virtualization support must be enabled in the
-    BIOS settings.  For more information, see
-    [Virtualization](troubleshoot.md#virtualization-must-be-enabled).
-- Download and install the [Linux kernel update package](https://docs.microsoft.com/windows/wsl/wsl2-kernel){: target="_blank" rel="noopener" class="_"}.
 
 > **Note**
 >

docker-for-windows/release-notes.md

@@ -11,10 +11,22 @@ toc_max: 2
 
 This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
 
+## Docker Desktop 3.3.1
+2021-04-15
+
+> [Download](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64)
+
+### Bug fixes and minor changes
+
+- Docker Desktop now ensures the permissions of `/dev/null` and other devices are correctly set to `0666` (`rw-rw-rw-`) inside `--privileged` containers. Fixes [docker/for-mac#5527](https://github.com/docker/for-mac/issues/5527).
+- Fixed an issue that caused `docker run` to fail when using `\\wsl.localhost` path to a directory. Fixes [docker/for-win#10786](https://github.com/docker/for-win/issues/10786)
+- Fixed an issue that caused Docker Desktop to fail during startup when it is unable to establish a connection with Docker Hub in the backend. Fixes [docker/for-win#10896](https://github.com/docker/for-win/issues/10896)
+- Fixed file permission when creating a file from a delta update. Fixes [docker/for-win#10881](https://github.com/docker/for-win/issues/10881)
+
 ## Docker Desktop 3.3.0
 2021-04-08
 
-> [Download](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe)
+> [Download](https://desktop.docker.com/win/stable/amd64/62916/Docker%20Desktop%20Installer.exe)
 
 ### New
 
@@ -38,7 +50,7 @@ For developers in IT managed environments, who don’t have administrative acces
 
 - Fixed an issue when viewing compose applications that have been started with an explicit project name. Fixes [docker/for-win#10564](https://github.com/docker/for-win/issues/10564).
 - Ensure `--add-host host.docker.internal:host-gateway` causes `host.docker.internal` resolves to the host IP, rather than the IP of the IP router. See [docker/for-linux#264](https://github.com/docker/for-linux/issues/264).
-- Fixed port allocation for Windows containers. Fixes[docker/for-win#10552](https://github.com/docker/for-win/issues/10552).
+- Fixed port allocation for Windows containers. Fixes [docker/for-win#10552](https://github.com/docker/for-win/issues/10552).
 - Fixed an issue where running a container with a random port on the host caused Docker Desktop dashboard to incorrectly open a browser with port 0, instead of using the allocated port.
 - Fixed an issue where pulling an image from Docker Hub using the Docker Desktop dashboard was failing silently.
 - Perform a filesystem check when starting the Linux VM.

docker-for-windows/troubleshoot.md

@@ -357,6 +357,7 @@ Docker Desktop excludes support for the following types of issues:
 
 * Use on or in conjunction with hardware or software other than that specified in the applicable documentation
 * Running on unsupported operating systems, including beta/preview versions of operating systems
+* Running containers of a different architecture using emulation
 * Support for the Docker engine, Docker CLI, or other bundled Linux components
 * Support for Kubernetes
 * Features labeled as experimental

get-started/index.md

@@ -78,11 +78,10 @@ We also recommend the video walkthrough from DockerCon 2020.
 This tutorial assumes you have a current version of Docker installed on your
 machine. If you do not have Docker installed, choose your preferred operating system below to download Docker:
 
-- [Download Docker Desktop for Mac](https://desktop.docker.com/mac/stable/Docker.dmg)
+[Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn}
-
+[Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn}
-- [Download Docker Desktop for Windows](https://desktop.docker.com/win/stable/Docker%20Desktop%20Installer.exe)
+[Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn}
-
+[Linux](../engine/install/index.md){: .button .primary-btn}
-- [Install Docker Engine on Linux](../engine/install/index.md)
 
 For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md) and [Install Docker Desktop on Windows](../docker-for-windows/install.md).
 

get-started/orchestration.md

@@ -317,7 +317,7 @@ Docker Desktop runs primarily on Docker Engine, which has everything you need to
 
 At this point, you've confirmed that you can run simple containerized workloads in Kubernetes and Swarm. The next step will be to write the Kubernetes yaml that describes how to run and manage these containers on Kubernetes.
 
-[On to deploying to Kubernetes >>](kube-deploy.md){: class="button outline-btn" style="margin-bottom: 30px; margin-right: 200%"}
+[On to deploying to Kubernetes >>](kube-deploy.md){: class="button primary-btn" style="margin-bottom: 30px; margin-right: 200%"}
 
 To learn how to write the stack file to help you run and manage containers on Swarm, see [Deploying to Swarm](swarm-deploy.md).
 

go/apple-silicon.md

@@ -2,5 +2,5 @@
 title: How to run Docker Desktop on new Mac with Apple Silicon processors
 description: Instructions on enabling BuildKit
 keywords: mac, troubleshooting, apple, silicon, issues
-redirect_to: /docker-for-mac/apple-m1/
+redirect_to: /docker-for-mac/apple-silicon/
 ---

language/nodejs/build-images.md

@@ -253,7 +253,7 @@ Our image that was tagged with `:v1.0.0` has been removed but we still have the
 
 In this module, we took a look at setting up our example Node application that we will use for the rest of the tutorial. We also created a Dockerfile that we used to build our Docker image. Then, we took a look at tagging our images and removing images. In the next module, we’ll take a look at how to:
 
-[Run your image as a container](run-containers.md){: .button .outline-btn}
+[Run your image as a container](run-containers.md){: .button .primary-btn}
 
 ## Feedback
 

language/nodejs/configure-ci-cd.md

@@ -233,7 +233,7 @@ In this module, you have learnt how to set up GitHub Actions workflow to an exis
 
 You can also consider deploying your application to the cloud. For detailed instructions, see:
 
-[Deploy your app to the cloud](/deploy.md){: .button .outline-btn}
+[Deploy your app to the cloud](/deploy.md){: .button .primary-btn}
 
 ## Feedback
 

language/nodejs/develop.md

@@ -224,7 +224,7 @@ In this module, we took a look at creating a general development image that we c
 
 In the next module, we’ll take a look at how to run unit tests in Docker. See:
 
-[Run your tests](run-tests.md){: .button .outline-btn}
+[Run your tests](run-tests.md){: .button .primary-btn}
 
 ## Feedback
 

language/nodejs/index.md

@@ -19,6 +19,6 @@ After completing the Node.js getting started modules, you should be able to cont
 
 Let's get started!
 
-[Build your Node.js image](build-images.md){: .button .outline-btn}
+[Build your Node.js image](build-images.md){: .button .primary-btn}
 
 <br />

language/nodejs/run-containers.md

@@ -197,7 +197,7 @@ Now, we can easily identify our container based on the name.
 
 In this module, we took a look at running containers, publishing ports, and running containers in detached mode. We also took a look at managing containers by starting, stopping, and restarting them. We also looked at naming our containers so they are more easily identifiable. In the next module, we’ll learn how to run a database in a container and connect it to our application. See:
 
-[How to develop your application](develop.md){: .button .outline-btn}
+[How to develop your application](develop.md){: .button .primary-btn}
 
 ## Feedback
 

language/nodejs/run-tests.md

@@ -285,7 +285,7 @@ In this module, we took a look at running tests as part of our Docker image buil
 
 In the next module, we’ll take a look at how to set up a CI/CD pipeline using GitHub Actions. See:
 
-[Configure CI/CD](configure-ci-cd.md){: .button .outline-btn}
+[Configure CI/CD](configure-ci-cd.md){: .button .primary-btn}
 
 ## Feedback
 

language/python/build-images.md

@@ -233,7 +233,7 @@ Our image that was tagged with `:v1.0.0` has been removed, but we still have the
 
 In this module, we took a look at setting up our example Python application that we will use for the rest of the tutorial. We also created a Dockerfile that we used to build our Docker image. Then, we took a look at tagging our images and removing images. In the next module we’ll take a look at how to:
 
-[Run your image as a container](run-containers.md){: .button .outline-btn}
+[Run your image as a container](run-containers.md){: .button .primary-btn}
 
 ## Feedback
 

language/python/configure-ci-cd.md

@@ -233,7 +233,7 @@ In this module, you have learnt how to set up GitHub Actions workflow to an exis
 
 You can also consider deploying your application to the cloud. For detailed instructions, see:
 
-[Deploy your application to the cloud](deploy.md){: .button .outline-btn}
+[Deploy your application to the cloud](deploy.md){: .button .primary-btn}
 
 ## Feedback
 

language/python/develop.md

@@ -247,7 +247,7 @@ In this module, we took a look at creating a general development image that we c
 
 In the next module, we’ll take a look at how to set up a CI/CD pipeline using GitHub Actions. See:
 
-[Configure CI/CD](configure-ci-cd.md){: .button .outline-btn}
+[Configure CI/CD](configure-ci-cd.md){: .button .primary-btn}
 
 ## Feedback
 

language/python/index.md

@@ -21,6 +21,6 @@ After completing the Python getting started modules, you should be able to conta
 
 Let's get started!
 
-[Build your first Python image](build-images.md){: .button .outline-btn}
+[Build your first Python image](build-images.md){: .button .primary-btn}
 
 <br />

language/python/run-containers.md

@@ -180,7 +180,7 @@ That’s better! We can now easily identify our container based on the name.
 
 In this module, we took a look at running containers, publishing ports, and running containers in detached mode. We also took a look at managing containers by starting, stopping, and, restarting them. We also looked at naming our containers so they are more easily identifiable. In the next module, we’ll learn how to run a database in a container and connect it to our application. See:
 
-[How to develop your application](develop.md){: .button .outline-btn}
+[How to develop your application](develop.md){: .button .primary-btn}
 
 ## Feedback
 

test.md

@@ -243,11 +243,11 @@ only need to do it on the first one. If you have a `<th>`, set it there.
   </tr>
   <tr>
   <td>
-  <p><a class="button outline-btn" href="/">Go to the docs!</a></p>
+  <p><a class="button primary-btn" href="/">Go to the docs!</a></p>
   <p><a href="/"><font color="#BDBDBD" size="-1">It is dark here. You are likely to be eaten by a grue.</font></a></p>
   </td>
   <td>
-  <p><a class="button outline-btn" href="/">Go to the docs!</a></p>
+  <p><a class="button primary-btn" href="/">Go to the docs!</a></p>
   <p><a href="/"><font color="#BDBDBD" size="-1">It is dark here. You are likely to be eaten by a grue.</font></a></p>
   </td>
   </tr>