From de4c95d9306dea7048dd6d0df78d8b7918577be8 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Wed, 14 Feb 2024 07:51:50 +0100
Subject: [PATCH 1/2] Add recommendations for Windows devices and update
 Windows Hello for Business configuration

---
 education/windows/toc.yml                        | 16 ++++++++++++++++
 .../hello-for-business/configure.md              |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/education/windows/toc.yml b/education/windows/toc.yml
index 667c2ddc07..338e67e1ce 100644
--- a/education/windows/toc.yml
+++ b/education/windows/toc.yml
@@ -30,6 +30,22 @@ items:
       href: /windows/configuration/shared-devices-concepts?context=/education/context/context
     - name: Windows 10 configuration recommendations for education customers
       href: configure-windows-for-education.md
+    - name: Recommendations for Windows devices
+      items:
+      - name: Overview
+        href: recommendations/overview.md
+      - name: Microsoft Edge
+        href: recommendations/edge.md
+      - name: Windows Update
+        href: recommendations/windows-update.md
+      - name: Defender Antivirus
+        href: recommendations/defender-antivirus.md
+      - name: Windows Hello
+        href: recommendations/windows-hello.md
+      - name: Windows Updates
+        href: recommendations/windows-updates.md
+      - name: UI customizations
+        href: recommendations/ui-customizations.md
     - name: Take tests and assessments in Windows
       href: take-tests-in-windows.md
 - name: How-to-guides
diff --git a/windows/security/identity-protection/hello-for-business/configure.md b/windows/security/identity-protection/hello-for-business/configure.md
index 6d581f8f55..b4d14a1882 100644
--- a/windows/security/identity-protection/hello-for-business/configure.md
+++ b/windows/security/identity-protection/hello-for-business/configure.md
@@ -87,7 +87,7 @@ To check the Windows Hello for Business policy settings applied at enrollment ti
 
 ## Policy conflicts from multiple policy sources
 
-Windows Hello for Business can be configured by GPO or CSP, but not a combination of both. Avoid mixing GPO and CSP policy settings for Windows Hello for Business. If you mix GPO and CSP policy settings, the CSP settings are ignored until all group policy settings are cleared.
+Windows Hello for Business can be configured by GPO or CSP, but not a combination of both. Avoid mixing GPO and CSP policy settings for Windows Hello for Business, as it can lead to unexpected results. If you mix GPO and CSP policy settings, the conflicting CSP settings aren't applied until the group policy settings are cleared.
 
 > [!IMPORTANT]
 > The [*MDMWinsOverGP*](/windows/client-management/mdm/policy-csp-controlpolicyconflict#mdmwinsovergp) policy setting doesn't apply to Windows Hello for Business. MDMWinsOverGP only applies to policies in the *Policy CSP*, while the Windows Hello for Business policies are in the *PassportForWork CSP*.

From 1caaf5e3af78f24c45750b17d43255a8dd114cf1 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Wed, 14 Feb 2024 08:03:43 +0100
Subject: [PATCH 2/2] Updates

---
 education/windows/toc.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/education/windows/toc.yml b/education/windows/toc.yml
index 338e67e1ce..667c2ddc07 100644
--- a/education/windows/toc.yml
+++ b/education/windows/toc.yml
@@ -30,22 +30,6 @@ items:
       href: /windows/configuration/shared-devices-concepts?context=/education/context/context
     - name: Windows 10 configuration recommendations for education customers
       href: configure-windows-for-education.md
-    - name: Recommendations for Windows devices
-      items:
-      - name: Overview
-        href: recommendations/overview.md
-      - name: Microsoft Edge
-        href: recommendations/edge.md
-      - name: Windows Update
-        href: recommendations/windows-update.md
-      - name: Defender Antivirus
-        href: recommendations/defender-antivirus.md
-      - name: Windows Hello
-        href: recommendations/windows-hello.md
-      - name: Windows Updates
-        href: recommendations/windows-updates.md
-      - name: UI customizations
-        href: recommendations/ui-customizations.md
     - name: Take tests and assessments in Windows
       href: take-tests-in-windows.md
 - name: How-to-guides