From 2a31bb8da6f050512f990f85fc21767c93610433 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 19 Aug 2024 08:13:09 +0100 Subject: [PATCH] ENGDOCS-2182 (#20628) * ENGDOCS-2182 * ENGDOCS-2182 * ENGDOCS-2182 * update note * update note * caps fix --- content/desktop/install/msi/_index.md | 9 ++++----- .../for-admins/enforce-sign-in/_index.md | 4 ++-- .../for-admins/enforce-sign-in/methods.md | 18 ++++++++---------- data/toc.yaml | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/content/desktop/install/msi/_index.md b/content/desktop/install/msi/_index.md index 0003e96d7f..b013a3dc85 100644 --- a/content/desktop/install/msi/_index.md +++ b/content/desktop/install/msi/_index.md @@ -3,11 +3,10 @@ title: Deploy with Microsoft installer description: If you're an IT admin, learn how to deploy Docker Desktop with Microsoft installer keywords: msi, docker desktop, windows, installation --- - -{{% restricted title="Early Access" %}} -The MSI installer is an [early access](../../../release-lifecycle.md#early-access-ea) feature for Docker Business subscribers. -It's available to all company owners and organization owners with Docker Desktop version 4.32 and later. -{{% /restricted %}} + +> [!NOTE] +> +> The MSI installer is available to all company owners and organization owners with Docker Desktop version 4.32 and later. Docker offers a 64-bit Microsoft Installer (MSI) package designed to assist IT administrators in customizing and deploying Docker Desktop across multiple users or machines in an enterprise environment. diff --git a/content/security/for-admins/enforce-sign-in/_index.md b/content/security/for-admins/enforce-sign-in/_index.md index b1adf05ffc..7eb1090e7a 100644 --- a/content/security/for-admins/enforce-sign-in/_index.md +++ b/content/security/for-admins/enforce-sign-in/_index.md @@ -14,8 +14,8 @@ subscription](../../../subscription/core-subscription/details.md) and they can c security features](/security/for-admins/hardened-desktop/_index.md) for your organization. There are multiple ways you can enforce sign-in, depending on your companies' set up and preferences: -- [Registry key method (Windows only)](methods.md#registry-key-method-windows-only){{< badge color=violet text="Early Access" >}} -- [`.plist` method (Mac only)](methods.md#plist-method-mac-only){{< badge color=violet text="Early Access" >}} +- [Registry key method (Windows only)](methods.md#registry-key-method-windows-only){{< badge color=blue text="New" >}} +- [`.plist` method (Mac only)](methods.md#plist-method-mac-only){{< badge color=blue text="New" >}} - [`registry.json` method (All)](methods.md#registryjson-method-all) ## How is sign-in enforced? diff --git a/content/security/for-admins/enforce-sign-in/methods.md b/content/security/for-admins/enforce-sign-in/methods.md index 52382bd3b5..6b82c4552b 100644 --- a/content/security/for-admins/enforce-sign-in/methods.md +++ b/content/security/for-admins/enforce-sign-in/methods.md @@ -8,10 +8,9 @@ This page outlines the different ways you can enforce sign-in for Docker Desktop ## Registry key method (Windows only) -{{% restricted title="Early Access" %}} -The registry key method is an [early access](../../../release-lifecycle.md#early-access-ea) feature for Docker Business subscribers. -It's available with Docker Desktop version 4.32 and later. -{{% /restricted %}} +> [!NOTE] +> +> The registry key method is available with Docker Desktop version 4.32 and later. 1. Create the registry key. Your new key should look like the following: @@ -28,7 +27,7 @@ It's available with Docker Desktop version 4.32 and later. In some cases, a system reboot may be necessary for enforcement to take effect. ->**Note** +> [!NOTE] > > If a registry key and a `registry.json` file both exist, the registry key takes precedence. @@ -49,10 +48,9 @@ There are many ways to deploy the registry key, for example using an MDM solutio ## plist method (Mac only) -{{% restricted title="Early Access" %}} -The plist method is an [early access](../../../release-lifecycle.md#early-access-ea) feature for Docker Business subscribers. -It's available with Docker Desktop version 4.32 and later. -{{% /restricted %}} +> [!NOTE] +> +> The registry key method is available with Docker Desktop version 4.32 and later. 1. Create the file `/Library/Application Support/com.docker.docker/desktop.plist`. 2. Open `desktop.plist` in a text editor and add the following content, where `myorg` is replaced with your organization’s name all lowercase: @@ -77,7 +75,7 @@ It's available with Docker Desktop version 4.32 and later. 4. Restart Docker Desktop. 5. Open Docker Desktop and when Docker Desktop starts, verify that the **Sign in required!** prompt appears. ->**Note** +> [!NOTE] > > If a `plist` and `registry.json` file both exist, the `plist` file takes precedence. diff --git a/data/toc.yaml b/data/toc.yaml index 2f4ba6e0e8..603536d31c 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -1185,7 +1185,7 @@ Manuals: title: Understand permission requirements for Mac - path: /desktop/install/windows-install/ title: Windows - - sectiontitle: Use the MSI installer {{< badge color=violet text="Early Access" >}} + - sectiontitle: Use the MSI installer {{< badge color=blue text="New" >}} section: - path: /desktop/install/msi/ title: Overview