Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-for-mac/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 0 additions & 6 deletions docker-for-mac/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions docker-for-windows/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
2 changes: 1 addition & 1 deletion docker-for-windows/install-windows-home.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion docker-for-windows/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions docker-for-windows/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
9 changes: 4 additions & 5 deletions registry/insecure.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down