Skip to content

Commit 5093f01

Browse files
committed
Let the user know about the previous filename.
1 parent 6f79818 commit 5093f01

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

content/manuals/desktop/settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ To navigate to **Settings** either:
1616
- Select the Docker menu {{< inline-image src="images/whale-x.svg" alt="whale menu" >}} and then **Settings**
1717
- Select the **Settings** icon from the Docker Dashboard.
1818

19-
You can also locate the `settings-store.json` file at:
19+
You can also locate the `settings-store.json` file (or `settings.json` for Docker Desktop versions 4.34 and earlier) at:
2020
- Mac: `~/Library/Group Containers/group.com.docker/settings-store.json`
2121
- Windows: `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings-store.json`
2222
- Linux: `~/.docker/desktop/settings-store.json`

content/manuals/desktop/troubleshoot/topics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Docker Desktop uses hardware-accelerated graphics by default, which may cause pr
4242
Docker Desktop will launch successfully, but some screens may appear green, distorted,
4343
or have some visual artifacts.
4444

45-
To work around this issue, disable hardware acceleration by creating a `"disableHardwareAcceleration": true` entry in Docker Desktop's `settings-store.json` file. You can find this file at:
45+
To work around this issue, disable hardware acceleration by creating a `"disableHardwareAcceleration": true` entry in Docker Desktop's `settings-store.json` file (or `settings.json` for Docker Desktop versions 4.34 and earlier). You can find this file at:
4646

4747
- Mac: `~/Library/Group Containers/group.com.docker/settings-store.json`
4848
- Windows: `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings-store.json`

content/manuals/desktop/use-desktop/resource-saver.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ timer as shown below.
2424

2525
If the values available aren't sufficient for your
2626
needs, you can reconfigure it to any value, as long as the value is larger than 30 seconds, by
27-
changing `autoPauseTimeoutSeconds` in the Docker Desktop `settings-store.json` file:
27+
changing `autoPauseTimeoutSeconds` in the Docker Desktop `settings-store.json` file (or `settings.json` for Docker Desktop versions 4.34 and earlier):
2828

2929
- Mac: `~/Library/Group Containers/group.com.docker/settings-store.json`
3030
- Windows: `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings-store.json`

content/manuals/extensions/settings-feedback.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Docker Extensions is switched on by default. To change your settings:
2222
>**Note**
2323
>
2424
> If you are an [organization owner](/manuals/admin/organization/manage-a-team.md#organization-owner), you can turn off extensions for your users. Open the `settings-store.json` file, and set `"extensionsEnabled"` to `false`.
25-
> The `settings-store.json` file is located at:
25+
> The `settings-store.json` file (or `settings.json` for Docker Desktop versions 4.34 and earlier) is located at:
2626
> - `~/Library/Group Containers/group.com.docker/settings-store.json` on Mac
2727
> - `C:\Users\[USERNAME]\AppData\Roaming\Docker\settings-store.json` on Windows
2828
>

content/manuals/security/for-admins/hardened-desktop/settings-management/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Docker doesn't automatically mandate that developers re-launch and re-authentica
7575

7676
### What do developers see when the settings are enforced?
7777

78-
Any settings that are enforced, are grayed out in Docker Desktop and the user is unable to edit them, either via the Docker Desktop UI, CLI, or the `settings-store.json` file. In addition, if Enhanced Container Isolation is enforced, developers can't use privileged containers or similar techniques to modify enforced settings within the Docker Desktop Linux VM, for example, reconfigure proxy and networking of reconfigure Docker Engine.
78+
Any settings that are enforced, are grayed out in Docker Desktop and the user is unable to edit them, either via the Docker Desktop UI, CLI, or the `settings-store.json` file (or `settings.json` for Docker Desktop versions 4.34 and earlier). In addition, if Enhanced Container Isolation is enforced, developers can't use privileged containers or similar techniques to modify enforced settings within the Docker Desktop Linux VM, for example, reconfigure proxy and networking of reconfigure Docker Engine.
7979

8080
![Proxy settings grayed out](/assets/images/grayed-setting.png)
8181

content/manuals/security/for-admins/hardened-desktop/settings-management/configure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ If `locked: true`, users aren't able to edit this setting from Docker Desktop or
5959
If `locked: false`, it's similar to setting a factory default in that:
6060
- For new installs, `locked: false` pre-populates the relevant settings in the Docker Desktop UI, but users are able to modify it.
6161

62-
- If Docker Desktop is already installed and being used, `locked: false` is ignored. This is because existing users of Docker Desktop may have already updated a setting, which in turn will have been written to the relevant config file, for example the `settings-store.json` or `daemon.json`. In these instances, the user's preferences are respected and we don't alter these values. These can be controlled by the admin by setting `locked: true`.
62+
- If Docker Desktop is already installed and being used, `locked: false` is ignored. This is because existing users of Docker Desktop may have already updated a setting, which in turn will have been written to the relevant config file, for example the `settings-store.json` (or `settings.json` for Docker Desktop versions 4.34 and earlier) or `daemon.json`. In these instances, the user's preferences are respected and we don't alter these values. These can be controlled by the admin by setting `locked: true`.
6363

6464
The following `admin-settings.json` code and table provides an example of the required syntax and descriptions for parameters and values:
6565

0 commit comments

Comments
 (0)