Merge branch 'main' into patch-1

windows/configuration/assigned-access/configuration-file.md

@@ -127,7 +127,7 @@ Example of two profiles, a desktop app and a UWP app:
 
 ### AllAppList
 
-Based on the purpose of the kiosk device, define the list of applications that are allowed to run. This list can contain both UWP apps and desktop apps. When the mult-app kiosk configuration is applied to a device, AppLocker rules are generated to allow the apps that are listed in the configuration.
+Based on the purpose of the kiosk device, define the list of applications that are allowed to run. This list can contain both UWP apps and desktop apps. When the multi-app kiosk configuration is applied to a device, AppLocker rules are generated to allow the apps that are listed in the configuration.
 
 > [!NOTE]
 > If an app has a dependency on another app, both must be included in the allowed apps list.
@@ -157,11 +157,19 @@ Example:
 </AllAppsList>
 ```
 
-> [!IMPORTANT]
+#### Microsoft Edge secondary tiles considerations
-> If you pins elements to the Start menu with Microsoft Edge secondary tiles, include the following apps in the allowed apps list:
+
->
+Microsoft Edge secondary tiles are pinned website shortcuts that appear on the Start menu. These pins provide quick access to specific websites directly from the Start menu, functioning similarly to app shortcuts.
-> - `<App DesktopAppPath="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge_proxy.exe" />`
+
-> - `<App AppUserModelId="Microsoft.MicrosoftEdge.Stable_8wekyb3d8bbwe!App"/>`
+If you pin elements to the Start menu with Microsoft Edge secondary tiles, include the following apps in the allowed apps list:
+
+```xml
+    <App DesktopAppPath="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge.exe" />
+    <App DesktopAppPath="%ProgramFiles(x86)%\Microsoft\Edge\Application\msedge_proxy.exe" />
+    <App AppUserModelId="Microsoft.MicrosoftEdge.Stable_8wekyb3d8bbwe!App"/>
+```
+
+For more information about Start menu customizations and pinning secondary tiles, see [Customize the Start layout](../start/layout.md).
 
 ::: zone pivot="windows-10"
 

windows/privacy/basic-level-windows-diagnostic-events-and-fields-1809.md

@@ -6,10 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 10/01/2024
 ms.topic: reference
-ms.collection: privacy-windows
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 

windows/privacy/configure-windows-diagnostic-data-in-your-organization.md

@@ -6,10 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 03/11/2016
-ms.collection: highpri
 ms.topic: how-to
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Configure Windows diagnostic data in your organization

windows/privacy/diagnostic-data-viewer-overview.md

@@ -6,10 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 01/09/2018
-ms.collection: highpri
 ms.topic: how-to
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Diagnostic Data Viewer Overview

windows/privacy/diagnostic-data-viewer-powershell.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 12/13/2018
 ms.topic: how-to
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Diagnostic Data Viewer for PowerShell Overview

windows/privacy/essential-services-and-connected-experiences.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 06/13/2024
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Essential services and connected experiences for Windows

windows/privacy/index.yml

@@ -13,9 +13,10 @@ metadata:
   ms.collection:
   - essentials-privacy
   - privacy-windows
+  - must-keep
   author: DHB-MSFT
   ms.author: danbrown
-  manager: laurawi
+  manager: dansimp
   ms.date: 04/30/2025
   ms.localizationpriority: high
 

windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services-using-MDM.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 05/15/2019
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Manage connections from Windows 10 and Windows 11 operating system components to Microsoft services using Microsoft Intune MDM Server

windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 06/27/2024
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Manage connections from Windows 10 and Windows 11 operating system components to Microsoft services

windows/privacy/manage-windows-11-endpoints.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 10/06/2023
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Manage connection endpoints for Windows 11 Enterprise

windows/privacy/manage-windows-1809-endpoints.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 01/18/2018
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Manage connection endpoints for Windows 10 Enterprise, version 1809

windows/privacy/manage-windows-21h2-endpoints.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 01/18/2018
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Manage connection endpoints for Windows 10 Enterprise, version 21H2

windows/privacy/optional-diagnostic-data.md

@@ -6,10 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 03/31/2017
-ms.collection: highpri
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Optional diagnostic data for Windows 11 and Windows 10

windows/privacy/required-diagnostic-events-fields-windows-11-22H2.md

@@ -7,10 +7,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 10/01/2024
 ms.topic: reference
-ms.collection: privacy-windows
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Required diagnostic events and fields for Windows 11, versions 23H2 and 22H2

windows/privacy/required-diagnostic-events-fields-windows-11-24H2.md

@@ -7,10 +7,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 10/01/2024
 ms.topic: reference
-ms.collection: privacy-windows
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 
 # Required diagnostic events and fields for Windows 11, version 24H2

windows/privacy/required-windows-diagnostic-data-events-and-fields-2004.md

@@ -6,9 +6,11 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 10/01/2024
-ms.collection: privacy-windows
+ms.collection: 
+- privacy-windows
+- must-keep
 ms.topic: reference
 ---
 

windows/privacy/windows-11-endpoints-non-enterprise-editions.md

@@ -6,9 +6,12 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 10/06/2023
 ms.topic: reference
+ms.collection: 
+- privacy-windows
+- must-keep
 ---
 # Windows 11 connection endpoints for non-Enterprise editions
 

windows/privacy/windows-privacy-compliance-guide.md

@@ -6,10 +6,13 @@ ms.subservice: itpro-privacy
 ms.localizationpriority: high
 author: DHB-MSFT
 ms.author: danbrown
-manager: laurawi
+manager: dansimp
 ms.date: 05/20/2019
 ms.topic: article
-ms.collection: essentials-compliance
+ms.collection: 
+- essentials-compliance
+- privacy-windows
+- must-keep
 ---
 
 # Windows Privacy Compliance:<br />A Guide for IT and Compliance Professionals

windows/security/identity-protection/passkeys/index.md

@@ -41,9 +41,12 @@ Passkeys have several advantages over passwords, including their ease of use and
 
 By default, Windows offers to save the passkey locally on the **Windows device**, in which case the passkey is protected by Windows Hello (biometrics and PIN). You can also choose to save the passkey in one of the following locations:
 
-- **iPhone, iPad or Android device**: the passkey is saved on a phone or tablet, protected by the device's biometrics, if offered by the device. This option requires you to scan a QR code with your phone or tablet, which must be in proximity of the Windows device
+- **iPhone, iPad or Android device**: the passkey is saved on a phone or tablet, protected by the device's biometrics, if offered by the device. This option requires you to scan a QR code with your phone or tablet, which must be in proximity of the Windows device.
-- **Linked device**: the passkey is saved on a phone or tablet, protected by the device's biometrics, if offered by the device. This option requires the linked device to be in proximity of the Windows device, and it's only supported for Android devices
+- **Linked device**: the passkey is saved on a phone or tablet, protected by the device's biometrics, if offered by the device. This option requires the linked device to be in proximity of the Windows device, and it's only supported for Android devices.
-- **Security key**: the passkey is saved to a FIDO2 security key, protected by the key's unlock mechanism (for example, biometrics or PIN)
+- **Security key**: the passkey is saved to a FIDO2 security key, protected by the key's unlock mechanism (for example, biometrics or PIN).
+
+>[!NOTE]
+>Currently, Microsoft Entra ID passkeys can't be stored on Windows devices. To learn more, see [Passkey authentication matrix with Microsoft Entra ID](/entra/identity/authentication/concept-fido2-compatibility).
 
 Pick one of the following options to learn how to save a passkey, based on where you want to store it.
 
@@ -388,7 +391,7 @@ To provide feedback for passkeys, open [**Feedback Hub**][FHUB] and use the cate
 
 [CSP-1]: /windows/client-management/mdm/policy-csp-bluetooth#allowadvertising
 [CSP-2]: /windows/client-management/mdm/policy-csp-bluetooth#allowdiscoverablemode
-[CSP-3]: /windows/client-management/mdm/policy-csp-bluetooth#allowprepairing
+[CSP-3]: /windows/client-management/mdm/policy-csp-bluetooth#allowpreparing
 [CSP-4]: /windows/client-management/mdm/policy-csp-bluetooth#allowpromptedproximalconnections
 [CSP-5]: /windows/client-management/mdm/policy-csp-bluetooth#servicesallowedlist
 [CSP-6]: /windows/client-management/mdm/policy-csp-deviceinstallation#preventinstallationofmatchingdeviceids