From 7e7d5c07ddb571524bd9af1dee59bb03b12e91c9 Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Fri, 29 Jan 2021 17:27:37 +0000 Subject: [PATCH 1/4] Update apple-m1.md --- docker-for-mac/apple-m1.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-for-mac/apple-m1.md b/docker-for-mac/apple-m1.md index b8bcf52806..11ba844d9f 100644 --- a/docker-for-mac/apple-m1.md +++ b/docker-for-mac/apple-m1.md @@ -27,6 +27,7 @@ The tech preview of Docker Desktop for Apple M1 currently has the following limi - The DNS name `host.docker.internal` only works if you add `--add-host=host.docker.internal:host-gateway` to the `docker run` command - The DNS name `vm.docker.internal` does not work. - Kubernetes does not initialize because of a missing DNS name. +- osxfs file sharing does not work. - The HTTP proxy is not enabled. - Not all images are available for ARM64. You can add `--platform linux/amd64` to run an Intel image under emulation. From b92b229c054e8934164acadd7d793f9eb08160d1 Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Fri, 29 Jan 2021 17:42:28 +0000 Subject: [PATCH 2/4] Update install.md --- docker-for-windows/install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index 3bfbf2dc87..a8442cea08 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -32,7 +32,7 @@ Hyper-V on Windows 10: BIOS settings. For more information, see [Virtualization](troubleshoot.md#virtualization-must-be-enabled). -> **Note:** Docker supports Docker Desktop on Windows based on Microsoft’s support lifecycle for Windows 10 operating system. For more information, see the [Windows lifecycle fact sheet](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet). +> **Note:** Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet). ### What's included in the installer From 079957c72affb891f002a5a607b7deb3cb346ced Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Fri, 29 Jan 2021 17:43:51 +0000 Subject: [PATCH 3/4] Update install-windows-home.md --- docker-for-windows/install-windows-home.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-for-windows/install-windows-home.md b/docker-for-windows/install-windows-home.md index 33aef37d80..6ca1ec9967 100644 --- a/docker-for-windows/install-windows-home.md +++ b/docker-for-windows/install-windows-home.md @@ -48,9 +48,7 @@ WSL 2 on Windows 10 Home: > **Note** > -> Docker supports Docker Desktop on Windows based on Microsoft’s support lifecycle -> for Windows 10 operating system. For more information, see the -> [Windows lifecycle fact sheet](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet). +> Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet). ### What's included in the installer From 27473b18dd8cfb333b627bb2b00a61850d2c2fc3 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Fri, 29 Jan 2021 18:31:16 +0000 Subject: [PATCH 4/4] Updated the Note format --- docker-for-windows/install.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index a8442cea08..84df916d8f 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -32,7 +32,9 @@ Hyper-V on Windows 10: BIOS settings. For more information, see [Virtualization](troubleshoot.md#virtualization-must-be-enabled). -> **Note:** Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet). +> **Note** +> +> Docker supports Docker Desktop on Windows for those versions of Windows 10 that are still within [Microsoft’s servicing timeline](https://support.microsoft.com/en-us/help/13853/windows-lifecycle-fact-sheet){:target="_blank" rel="noopener" class="_"}. ### What's included in the installer @@ -118,7 +120,9 @@ To uninstall Docker Desktop from your Windows machine: 2. Select **Docker Desktop** from the **Apps & features** list and then select **Uninstall**. 3. Click **Uninstall** to confirm your selection. -> **Note:** Uninstalling Docker Desktop will destroy Docker containers and images local to the machine and remove the files generated by the application. +> **Note** +> +> Uninstalling Docker Desktop will destroy Docker containers and images local to the machine and remove the files generated by the application. ### Save and restore data