Skip to content

Commit 8193b2f

Browse files
authored
consolidate settings (#20810)
1 parent d271b4b commit 8193b2f

File tree

27 files changed

+233
-829
lines changed

27 files changed

+233
-829
lines changed

content/get-started/workshop/06_bind_mounts.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ work.
5050

5151
1. Verify that your `getting-started-app` directory is in a directory defined in
5252
Docker Desktop's file sharing setting. This setting defines which parts of your
53-
filesystem you can share with containers. For details about accessing the
54-
setting, see the topic for [Mac](/manuals/desktop/settings/mac.md#file-sharing),
55-
[Windows](/manuals/desktop/settings/windows.md#file-sharing), or
56-
[Linux](/manuals/desktop/settings/linux.md#file-sharing).
53+
filesystem you can share with containers. For details about accessing the setting, see [File sharing](/manuals/desktop/settings.md#file-sharing).
5754

5855
2. Open a terminal and change directory to the `getting-started-app`
5956
directory.

content/includes/beta.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

content/includes/desktop-builders-setting.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

content/includes/desktop-experimental.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

content/includes/desktop-network-setting.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

content/includes/desktop-notifications-settings.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

content/manuals/build/builders/manage.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,4 @@ It only removes your connection to the builder.
123123

124124
If you have turned on the
125125
[Docker Desktop Builds view](/manuals/desktop/use-desktop/builds.md),
126-
you can inspect builders in Docker Desktop settings. See:
127-
128-
- [Change settings, Windows](/manuals/desktop/settings/windows.md#builders)
129-
- [Change settings, Mac](/manuals/desktop/settings/mac.md#builders)
130-
- [Change settings, Linux](/manuals/desktop/settings/linux.md#builders)
126+
you can inspect builders in [Docker Desktop settings](/manuals/desktop/settings.md#builders).

content/manuals/desktop/faqs/windowsfaqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ No, running Docker Desktop on Windows Server is not supported.
2020
### Can I change permissions on shared volumes for container-specific deployment requirements?
2121

2222
Docker Desktop does not enable you to control (`chmod`)
23-
the Unix-style permissions on [shared volumes](../settings/windows.md#file-sharing) for
23+
the Unix-style permissions on [shared volumes](/manuals/desktop/settings.md#file-sharing) for
2424
deployed containers, but rather sets permissions to a default value of
2525
[0777](https://chmodcommand.com/chmod-0777/)
2626
(`read`, `write`, `execute` permissions for `user` and for
@@ -69,7 +69,7 @@ You need to restart Docker Desktop after making any changes to the keychain
6969
or to the `~/.docker/certs.d` directory in order for the changes to take effect.
7070

7171
The registry cannot be listed as an insecure registry (see
72-
[Docker Daemon](../settings/windows.md#docker-engine)). Docker Desktop ignores
72+
[Docker Daemon](/manuals/desktop/settings.md#docker-engine)). Docker Desktop ignores
7373
certificates listed under insecure registries, and does not send client
7474
certificates. Commands like `docker run` that attempt to pull from the registry
7575
produce error messages on the command line, as well as on the registry.

content/manuals/desktop/install/linux-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Docker Desktop for Linux provides a user-friendly graphical interface that simpl
3838
Docker Desktop for Linux and Docker Engine can be installed side-by-side on the
3939
same machine. Docker Desktop for Linux stores containers and images in an isolated
4040
storage location within a VM and offers
41-
controls to restrict [its resources](../settings/linux.md#resources). Using a dedicated storage
41+
controls to restrict [its resources](/manuals/desktop/settings.md#resources). Using a dedicated storage
4242
location for Docker Desktop prevents it from interfering with a Docker Engine
4343
installation on the same machine.
4444

content/manuals/desktop/install/mac-install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ This page contains download URLs, information about system requirements, and ins
8787

8888
6. From the installation window, select either:
8989
- **Use recommended settings (Requires password)**. This lets Docker Desktop automatically set the necessary configuration settings.
90-
- **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](../settings/mac.md#advanced), for more information and how to set the location of the Docker CLI tools.
90+
- **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](/manuals/desktop/settings.md#advanced), for more information and how to set the location of the Docker CLI tools.
9191
7. Select **Finish**. If you have applied any of the previous configurations that require a password in step 6, enter your password to confirm your choice.
9292

9393
### Install from the command line

0 commit comments

Comments
 (0)