Skip to content

Commit 1183130

Browse files
authored
ENGDOCS-2696b (#22784)
<!--Delete sections as needed --> ## Description Redo #22773 ## Related issues or tickets <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review
1 parent df41305 commit 1183130

File tree

6 files changed

+40
-45
lines changed

6 files changed

+40
-45
lines changed

content/manuals/ai/gordon/_index.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,18 @@ If you have concerns about data collection or usage, you can
8686
## Enable Ask Gordon
8787

8888
1. Sign in to your Docker account.
89-
2. Navigate to the **Features in development** tab in settings.
90-
3. Under the **Experimental features** tab, select **Access experimental features**.
91-
4. Select **Apply and restart**.
92-
5. Quit and reopen Docker Desktop to ensure the changes take effect.
93-
6. Open the **Settings** view in Docker Desktop.
94-
7. Navigate to **Features in development**.
95-
8. From the **Beta** tab, check the **Enable Docker AI** checkbox.
89+
2. Navigate to the **Beta features** tab in settings.
90+
3. Check the **Enable Docker AI** checkbox.
9691

9792
The Docker AI terms of service agreement is displayed. You must agree to the
9893
terms before you can enable the feature. Review the terms and select **Accept
9994
and enable** to continue.
10095

101-
9. Select **Apply & restart**.
96+
4. Select **Apply & restart**.
10297

103-
You can also enable Ask Gordon from the **Ask Gordon** tab if you have selected the **Access experimental features** setting. Simply select the **Enable Ask Gordon** button, and then accept the Docker AI terms of service agreement.
98+
> [!IMPORTANT]
99+
>
100+
> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page.
104101
105102
## Using Ask Gordon
106103

@@ -204,7 +201,7 @@ across several dimensions:
204201
If you've enabled Ask Gordon and you want to disable it again:
205202

206203
1. Open the **Settings** view in Docker Desktop.
207-
2. Navigate to **Features in development**.
204+
2. Navigate to **Beta features**.
208205
3. Clear the **Enable Docker AI** checkbox.
209206
4. Select **Apply & restart**.
210207

content/manuals/ai/model-runner/_index.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,16 @@ Models are pulled from Docker Hub the first time they're used and stored locally
3737

3838
### Enable DMR in Docker Desktop
3939

40-
1. Navigate to the **Features in development** tab in settings.
41-
2. Under the **Experimental features** tab, select **Access experimental features**.
42-
3. Select **Apply and restart**.
43-
4. Quit and reopen Docker Desktop to ensure the changes take effect.
44-
5. Open the **Settings** view in Docker Desktop.
45-
6. Navigate to **Features in development**.
46-
7. From the **Beta** tab, tick the **Enable Docker Model Runner** setting.
47-
8. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting.
40+
1. Navigate to the **Beta features** tab in settings.
41+
2. Tick the **Enable Docker Model Runner** setting.
42+
3. If you are running on Windows with a supported NVIDIA GPU, you should also see and be able to tick the **Enable GPU-backed inference** setting.
4843

4944
You can now use the `docker model` command in the CLI and view and interact with your local models in the **Models** tab in the Docker Desktop Dashboard.
5045

46+
> [!IMPORTANT]
47+
>
48+
> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page.
49+
5150
### Enable DMR in Docker Engine
5251

5352
1. Ensure you have installed [Docker Engine](/engine/install/).

content/manuals/desktop/settings-and-maintenance/settings.md

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -472,30 +472,24 @@ Use the **Extensions** tab to:
472472

473473
For more information about Docker extensions, see [Extensions](/manuals/extensions/_index.md).
474474

475-
## Features in development
476-
477-
On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**.
478-
479-
You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Features in development** tab.
480-
481-
### Beta features
475+
## Beta features
482476

483477
Beta features provide access to future product functionality.
484478
These features are intended for testing and feedback only as they may change
485479
between releases without warning or remove them entirely from a future
486480
release. Beta features must not be used in production environments.
487481
Docker doesn't offer support for beta features.
488482

489-
### Experimental features
490-
491-
Experimental features provide early access to future product functionality.
492-
These features are intended for testing and feedback only as they may change
493-
between releases without warning or can be removed entirely from a future
494-
release. Experimental features must not be used in production environments.
495-
Docker does not offer support for experimental features.
483+
You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Beta features** tab.
496484

497485
For a list of current experimental features in the Docker CLI, see [Docker CLI Experimental features](https://github.com/docker/cli/blob/master/experimental/README.md).
498486

487+
> [!IMPORTANT]
488+
>
489+
> For Docker Desktop versions 4.41 and earlier, there is also an **Experimental features** tab under the **Features in development** page.
490+
>
491+
> As with beta features, experimental features must not be used in production environments. Docker does not offer support for experimental features.
492+
499493
## Notifications
500494

501495
Use the **Notifications** tab to turn on or turn off notifications for the following events:

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,6 @@ of configurable settings for the `admin-settings.json` file, see [`admin-setting
165165
"sbomIndexing": true,
166166
"useBackgroundIndexing": true
167167
},
168-
"allowExperimentalFeatures": {
169-
"locked": false,
170-
"value": false
171-
},
172168
"allowBetaFeatures": {
173169
"locked": false,
174170
"value": false
@@ -310,14 +306,19 @@ quit and reopened.
310306

311307
For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows).
312308

313-
### Features in development
309+
### Beta features
310+
311+
> [!IMPORTANT]
312+
>
313+
> For Docker Desktop versions 4.41 and earlier, some of these settings lived under the **Experimental features** tab on the **Features in development** page.
314314
315315
| Parameter | OS | Description | Version |
316316
|:----------------------------|----|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
317-
| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | |
318317
| `allowBetaFeatures` | | If `value` is set to `true`, beta features are enabled. | |
319-
| `enableDockerAI` | | If `allowBetaFeatures` is true, setting `enableDockerAI` to `true` enables [Docker AI (Ask Gordon)](/manuals/ai/gordon/_index.md). | |
320-
| `enableDockerMCPToolkit` | | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md). | |
318+
| `enableDockerAI` | | If `allowBetaFeatures` is true, setting `enableDockerAI` to `true` enables [Docker AI (Ask Gordon)](/manuals/ai/gordon/_index.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | |
319+
| `enableInference` | | If `allowBetaFeatures` is true, setting `enableInference` to `true` enables [Docker Model Runner](/manuals/ai/model-runner/_index.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | |
320+
| `enableDockerMCPToolkit` | | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md) by default. You can independently control this setting from the `allowBetaFeatures` setting. | |
321+
| `allowExperimentalFeatures` | | If `value` is set to `true`, experimental features are enabled. | Docker Desktop version 4.41 and earlier |
321322

322323
### Enhanced Container Isolation
323324

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,11 @@ third-party or unvetted plugins from being installed.
763763
- **Configure this setting with:**
764764
- **Extensions** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
765765

766-
## Features in development
766+
## Beta features
767+
768+
> [!IMPORTANT]
769+
>
770+
> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page.
767771
768772
### Enable Docker AI
769773

@@ -775,7 +779,7 @@ third-party or unvetted plugins from being installed.
775779
- **OS:** {{< badge color=blue text="All" >}}
776780
- **Use case:** Enable or disable AI features like "Ask Gordon".
777781
- **Configure this setting with:**
778-
- **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
782+
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
779783
- Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
780784

781785
### Enable Docker Model Runner
@@ -788,7 +792,7 @@ third-party or unvetted plugins from being installed.
788792
- **OS:** {{< badge color=blue text="All" >}}
789793
- **Use case:** Enable or disable Docker Model Runner features.
790794
- **Configure this setting with:**
791-
- **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
795+
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
792796

793797
### Enable host-side TCP support
794798

@@ -800,7 +804,7 @@ third-party or unvetted plugins from being installed.
800804
- **OS:** {{< badge color=blue text="All" >}}
801805
- **Use case:** Enable or disable Docker Model Runner features.
802806
- **Configure this setting with:**
803-
- **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
807+
- **Beta** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
804808

805809
> [!NOTE]
806810
>

data/summary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Compliance reporting:
7070
Compose attach:
7171
requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later
7272
Compose bridge:
73-
availability: Experimental
73+
availability: Beta
7474
Config profiles:
7575
requires: Docker Desktop 4.36 and later
7676
Compose dependent images:

0 commit comments

Comments
 (0)