Merge pull request #9710 from MicrosoftDocs/main

publish main to live 3:30 PM 3/18/24

.openpublishing.redirection.windows-configuration.json

@@ -282,7 +282,7 @@
     },
     {
       "source_path": "windows/configuration/configure-windows-10-taskbar.md",
-      "redirect_url": "/windows/configuration/taskbar/configure-windows-10-taskbar",
+      "redirect_url": "/windows/configuration/taskbar/",
       "redirect_document_id": false
     },
     {
@@ -297,7 +297,7 @@
     },
     {
       "source_path": "windows/configuration/customize-taskbar-windows-11.md",
-      "redirect_url": "/windows/configuration/taskbar/customize-taskbar-windows-11",
+      "redirect_url": "/windows/configuration/taskbar",
       "redirect_document_id": false
     },
     {
@@ -447,7 +447,7 @@
     },
     {
       "source_path": "windows/configuration/supported-csp-taskbar-windows.md",
-      "redirect_url": "/windows/configuration/taskbar/supported-csp-taskbar-windows",
+      "redirect_url": "/windows/configuration/taskbar/policy-settings",
       "redirect_document_id": false
     },
     {
@@ -842,18 +842,28 @@
     },
     {
       "source_path": "windows/configuration/taskbar/configure-windows-10-taskbar.md",
-      "redirect_url": "/windows/configuration/taskbar",
+      "redirect_url": "/windows/configuration/taskbar/",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/configuration/taskbar/customize-taskbar-windows-11.md",
-      "redirect_url": "/windows/configuration/taskbar",
+      "redirect_url": "/windows/configuration/taskbar/",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/configuration/tips/manage-tips-and-suggestions.md",
       "redirect_url": "/windows/configuration",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/configuration/taskbar/configure.md",
+      "redirect_url": "/windows/configuration/taskbar/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/configuration/taskbar/supported-csp-taskbar-windows.md",
+      "redirect_url": "/windows/configuration/taskbar/policy-settings",
+      "redirect_document_id": false
     }
   ]
 }

windows/client-management/mdm/bitlocker-csp.md

@@ -16,13 +16,19 @@ ms.date: 01/18/2024
 The BitLocker configuration service provider (CSP) is used by the enterprise to manage encryption of PCs and devices. This CSP was added in Windows 10, version 1703. Starting in Windows 10, version 1809, it's also supported in Windows 10 Pro.
 
 > [!NOTE]
+> To manage BitLocker through CSP except to enable and disable it using the `RequireDeviceEncryption` policy, one of the following licenses must be assigned to your users regardless of your management platform:
 >
-> - Settings are enforced only at the time encryption is started. Encryption isn't restarted with settings changes.
+> - Windows 10/11 Enterprise E3 or E5 (included in Microsoft 365 F3, E3, and E5).
-> - You must send all the settings together in a single SyncML to be effective.
+> - Windows 10/11 Enterprise A3 or A5 (included in Microsoft 365 A3 and A5).
 
 A `Get` operation on any of the settings, except for `RequireDeviceEncryption` and `RequireStorageCardEncryption`, returns the setting configured by the admin.
 
 For RequireDeviceEncryption and RequireStorageCardEncryption, the Get operation returns the actual status of enforcement to the admin, such as if Trusted Platform Module (TPM) protection is required and if encryption is required. And if the device has BitLocker enabled but with password protector, the status reported is 0. A Get operation on RequireDeviceEncryption doesn't verify that a minimum PIN length is enforced (SystemDrivesMinimumPINLength).
+
+> [!NOTE]
+>
+> - Settings are enforced only at the time encryption is started. Encryption isn't restarted with settings changes.
+> - You must send all the settings together in a single SyncML to be effective.
 <!-- BitLocker-Editable-End -->
 
 <!-- BitLocker-Tree-Begin -->
@@ -654,7 +660,7 @@ Sample value for this node to enable this policy is: `<enabled/>`
 <!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
 **Example**:
 
-To disable this policy, use hte following SyncML:
+To disable this policy, use the following SyncML:
 
 ```xml
 <Replace>

windows/configuration/index.yml

@@ -24,7 +24,7 @@ landingContent:
           - text: Customize the Windows Start menu layout
             url: start/customize-and-export-start-layout.md
           - text: Customize the Windows taskbar
-            url: taskbar/configure.md
+            url: taskbar/index.md
           - text: Configure Windows Spotlight on the lock screen
             url: lock-screen/windows-spotlight.md
           - text: Accessibility information for IT pros

windows/configuration/taskbar/toc.yml

@@ -1,5 +1,5 @@
 items:
 - name: Customize the Taskbar
-  href: configure.md
+  href: index.md
 - name: Supported Taskbar CSPs
-  href: supported-csp-taskbar-windows.md
+  href: policy-settings.md