Revert "Merge pull request #22773 from aevesdocker/ENGDOCS-2696"

This reverts commit e9e78a3.

Author: aevesdocker

content/manuals/ai/gordon/_index.md

@@ -86,18 +86,21 @@ If you have concerns about data collection or usage, you can
 ## Enable Ask Gordon
 
 1. Sign in to your Docker account.
-2. Navigate to the **Beta features** tab in settings.
-3. Check the **Enable Docker AI** checkbox.
+2. Navigate to the **Features in development** tab in settings.
+3. Under the **Experimental features** tab, select **Access experimental features**.
+4. Select **Apply and restart**. 
+5. Quit and reopen Docker Desktop to ensure the changes take effect. 
+6. Open the **Settings** view in Docker Desktop.
+7. Navigate to **Features in development**.
+8. From the **Beta** tab, check the **Enable Docker AI** checkbox.
 
    The Docker AI terms of service agreement is displayed. You must agree to the
    terms before you can enable the feature. Review the terms and select **Accept
    and enable** to continue.
 
-4. Select **Apply & restart**.
+9. Select **Apply & restart**.
 
-> [!IMPORTANT]
->
-> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page.
+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.
 
 ## Using Ask Gordon
 
@@ -201,7 +204,7 @@ across several dimensions:
 If you've enabled Ask Gordon and you want to disable it again:
 
 1. Open the **Settings** view in Docker Desktop.
-2. Navigate to **Beta features**.
+2. Navigate to **Features in development**.
 3. Clear the **Enable Docker AI** checkbox.
 4. Select **Apply & restart**.
 

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

@@ -37,16 +37,17 @@ Models are pulled from Docker Hub the first time they're used and stored locally
 
 ### Enable DMR in Docker Desktop
 
-1. Navigate to the **Beta features** tab in settings.
-2. Tick the **Enable Docker Model Runner** setting.
-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.
+1. Navigate to the **Features in development** tab in settings.
+2. Under the **Experimental features** tab, select **Access experimental features**.
+3. Select **Apply and restart**.
+4. Quit and reopen Docker Desktop to ensure the changes take effect.
+5. Open the **Settings** view in Docker Desktop.
+6. Navigate to **Features in development**.
+7. From the **Beta** tab, tick the **Enable Docker Model Runner** setting.
+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.
 
 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.
 
-> [!IMPORTANT]
->
-> For Docker Desktop versions 4.41 and earlier, this settings lived under the **Experimental features** tab on the **Features in development** page.
-
 ### Enable DMR in Docker Engine
 
 1. Ensure you have installed [Docker Engine](/engine/install/).

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

@@ -472,23 +472,29 @@ Use the **Extensions** tab to:
 
 For more information about Docker extensions, see [Extensions](/manuals/extensions/_index.md).
 
-## Beta features
+## Features in development
+
+On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**.
+
+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.
+
+### Beta features
 
 Beta features provide access to future product functionality.
 These features are intended for testing and feedback only as they may change
 between releases without warning or remove them entirely from a future
 release. Beta features must not be used in production environments.
 Docker doesn't offer support for beta features.
 
-You can also sign up to the [Developer Preview program](https://www.docker.com/community/get-involved/developer-preview/) from the **Beta features** tab.
+### Experimental features
 
-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).
+Experimental features provide early access to future product functionality.
+These features are intended for testing and feedback only as they may change
+between releases without warning or can be removed entirely from a future
+release. Experimental features must not be used in production environments.
+Docker does not offer support for experimental features.
 
-> [!IMPORTANT]
->
-> For Docker Desktop versions 4.41 and earlier, there is also an **Experimental features** tab under the **Features in development** page.
->
-> As with beta features, experimental features must not be used in production environments. Docker does not offer support for experimental features.
+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).
 
 ## Notifications
 

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

@@ -165,6 +165,10 @@ of configurable settings for the `admin-settings.json` file, see [`admin-setting
     "sbomIndexing": true,
     "useBackgroundIndexing": true
   },
+  "allowExperimentalFeatures": {
+    "locked": false,
+    "value": false
+  },
   "allowBetaFeatures": {
     "locked": false,
     "value": false
@@ -306,18 +310,14 @@ quit and reopened.
 
 For more information, see [Networking](/manuals/desktop/features/networking.md#networking-mode-and-dns-behaviour-for-mac-and-windows).
 
-### Beta features
-
-> [!IMPORTANT]
->
-> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page.
+### Features in development
 
 | Parameter                   | OS | Description                                                                                                                                                   | Version |
 |:----------------------------|----|:--------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
+| `allowExperimentalFeatures` |    | If `value` is set to `true`, experimental features are enabled.                                                                                               |         |
 | `allowBetaFeatures`         |    | If `value` is set to `true`, beta features are enabled.                                                                                                       |         |
 | `enableDockerAI`            |    | If `allowBetaFeatures` is true, setting `enableDockerAI` to `true` enables [Docker AI (Ask Gordon)](/manuals/ai/gordon/_index.md).                                                            |         |
 | `enableDockerMCPToolkit`    |    | If `allowBetaFeatures` is true, setting `enableDockerMCPToolkit` to `true` enables the [MCP toolkit feature](/manuals/ai/mcp-catalog-and-toolkit/toolkit.md). |         |
-| `allowExperimentalFeatures` |    | If `value` is set to `true`, experimental features are enabled.                                                                                               |   Docker Desktop version 4.41 and earlier      |
 
 ### Enhanced Container Isolation
 

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

@@ -763,11 +763,7 @@ third-party or unvetted plugins from being installed.
 - **Configure this setting with:**
     - **Extensions** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
 
-## Beta features
-
-> [!IMPORTANT]
->
-> For Docker Desktop versions 4.41 and earlier, these settings lived under the **Experimental features** tab on the **Features in development** page.
+## Features in development
 
 ### Enable Docker AI
 
@@ -779,7 +775,7 @@ third-party or unvetted plugins from being installed.
 - **OS:** {{< badge color=blue text="All" >}}
 - **Use case:** Enable or disable AI features like "Ask Gordon".
 - **Configure this setting with:**
-    - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
+    - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
     - Settings Management: `enableDockerAI` setting in the [`admin-settings.json` file](/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md)
 
 ### Enable Docker Model Runner
@@ -792,7 +788,7 @@ third-party or unvetted plugins from being installed.
 - **OS:** {{< badge color=blue text="All" >}}
 - **Use case:** Enable or disable Docker Model Runner features.
 - **Configure this setting with:**
-    - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
+    - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
 
 ### Enable host-side TCP support
 
@@ -804,7 +800,7 @@ third-party or unvetted plugins from being installed.
 - **OS:** {{< badge color=blue text="All" >}}
 - **Use case:** Enable or disable Docker Model Runner features.
 - **Configure this setting with:**
-    - **Beta features** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
+    - **Features in development** settings in [Docker Desktop GUI](/manuals/desktop/settings-and-maintenance/settings.md)
 
 > [!NOTE]
 >

data/summary.yaml

@@ -70,7 +70,7 @@ Compliance reporting:
 Compose attach:
   requires: Docker Compose [2.20.0](/manuals/compose/releases/release-notes.md#2200) and later
 Compose bridge:
-  availability: Beta
+  availability: Experimental
 Config profiles:
   requires: Docker Desktop 4.36 and later
 Compose dependent images: