From 49f8877bf3ac2c0d42b4e4049ce79d4a78d9acb1 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Thu, 28 Jan 2021 10:07:41 +0000 Subject: [PATCH 1/2] Fix broken links Signed-off-by: Usha Mandya --- docker-for-windows/index.md | 5 +---- registry/insecure.md | 9 ++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 52e187e217..05939e42ae 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -382,10 +382,7 @@ After you have successfully authenticated, you can access your organizations and ## Adding TLS certificates -You can add trusted **Certificate Authorities (CAs)** to your Docker daemon to verify registry server -certificates, and **client certificates**, to authenticate to registries. For more information, see [How do I add custom CA certificates?](faqs.md#how-do-i-add-custom-ca-certificates) -and [How do I add client certificates?](faqs.md#how-do-i-add-client-certificates) -in the FAQs. +You can add trusted **Certificate Authorities (CAs)** to your Docker daemon to verify registry server certificates, and **client certificates**, to authenticate to registries. ### How do I add custom CA certificates? diff --git a/registry/insecure.md b/registry/insecure.md index a64e732fb8..73dafbe7a0 100644 --- a/registry/insecure.md +++ b/registry/insecure.md @@ -95,13 +95,12 @@ This is more secure than the insecure registry solution. 3. Click **Finish**. Restart Docker. - - - **Docker Desktop for Mac**: Follow the instructions on - [Adding custom CA certificates](../docker-for-mac/faqs.md#how-do-i-add-custom-ca-certificates){: target="_blank" rel="noopener" class="_"}. + - **Docker Desktop for Mac**: Follow the instructions in + [Adding custom CA certificates](../docker-for-mac/index.md#add-tls-certificates){: target="_blank" rel="noopener" class="_"}. Restart Docker. - - **Docker Desktop for Windows**: Follow the instructions on - [Adding custom CA certificates](../docker-for-windows/faqs.md#how-do-i-add-custom-ca-certificates){: target="_blank" rel="noopener" class="_"}. + - **Docker Desktop for Windows**: Follow the instructions in + [Adding custom CA certificates](../docker-for-windows/index.md#adding-tls-certificates){: target="_blank" rel="noopener" class="_"}. Restart Docker. From 4d1befcd1a3e9ff369f5c580c1ecbc71abb4e24b Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Thu, 28 Jan 2021 12:10:10 +0000 Subject: [PATCH 2/2] Fix broken links in Mac and Windows topics Signed-off-by: Usha Mandya --- docker-for-mac/install.md | 2 +- docker-for-mac/troubleshoot.md | 6 ------ docker-for-windows/install-windows-home.md | 2 +- docker-for-windows/install.md | 2 +- docker-for-windows/troubleshoot.md | 4 ++-- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md index d290ef51b6..0dd8690f2c 100644 --- a/docker-for-mac/install.md +++ b/docker-for-mac/install.md @@ -109,6 +109,6 @@ For information on how to back up and restore data volumes, see [Backup, restore - [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. - [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. -- [FAQs](faqs.md) provide answers to frequently asked questions. +- [FAQs](../desktop/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/) provides a general Docker tutorial. diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index b3e3c8cb69..4333189377 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -176,12 +176,6 @@ As well as on the registry. For example: For more about using client and server side certificates, see [Adding TLS certificates](index.md#add-tls-certificates) in the Getting Started topic. -### Docker Desktop does not start if Mac user account and home folder are renamed after installing the app - -See -[Do I need to reinstall Docker Desktop if I change the name of my macOS account?](faqs.md#do-i-need-to-reinstall-docker-for-mac-if-i-change-the-name-of-my-macos-account) -in the FAQs. - ### Volume mounting requires file sharing for any project directories outside of `/Users` If you are using mounted volumes and get runtime errors indicating an diff --git a/docker-for-windows/install-windows-home.md b/docker-for-windows/install-windows-home.md index 5de0775102..33aef37d80 100644 --- a/docker-for-windows/install-windows-home.md +++ b/docker-for-windows/install-windows-home.md @@ -143,5 +143,5 @@ For information on how to back up and restore data volumes, see [Backup, restore you how to deploy a multi-service stack. * [Troubleshooting](troubleshoot.md) describes common problems, workarounds, and how to get support. -* [FAQs](faqs.md) provides answers to frequently asked questions. +* [FAQs](../desktop/faqs.md) provides answers to frequently asked questions. * [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index 6971dc3999..3bfbf2dc87 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -150,5 +150,5 @@ For information on how to back up and restore data volumes, see [Backup, restore deploy a multi-service stack. * [Troubleshooting](troubleshoot.md) describes common problems, workarounds, and how to get support. -* [FAQs](faqs.md) provides answers to frequently asked questions. +* [FAQs](../desktop/faqs.md) provides answers to frequently asked questions. * [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases. diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 6a5bbcb3f2..cd176255fb 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -118,7 +118,7 @@ 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?](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?](../desktop/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 @@ -134,7 +134,7 @@ Dockerfile and volume. #### Support for symlinks -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. +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. #### Avoid unexpected syntax errors, use Unix style line endings for files in containers