From 8afbba9a89f8d304b7db5db7e68d2d642b25d07a Mon Sep 17 00:00:00 2001 From: ManikaDhiman Date: Wed, 7 Oct 2020 16:44:47 -0700 Subject: [PATCH] Updated topic titles and filenames --- .openpublishing.redirection.json | 45 +++++++++++++++++++ windows/client-management/mdm/TOC.md | 16 +++---- .../mdm/enable-admx-backed-policies-in-mdm.md | 2 +- ...ew-in-windows-mdm-enrollment-management.md | 2 +- ... => policies-in-policy-csp-admx-backed.md} | 10 ++--- ...n-policy-csp-supported-by-group-policy.md} | 10 ++--- ...d-by-hololens-1st-gen-commercial-suite.md} | 6 +-- ...y-hololens-1st-gen-development-edition.md} | 6 +-- ...s-in-policy-csp-supported-by-hololens2.md} | 6 +-- ...es-in-policy-csp-supported-by-iot-core.md} | 6 +-- ...policy-csp-supported-by-iot-enterprise.md} | 6 +-- ...in-policy-csp-supported-by-surface-hub.md} | 6 +-- ...n-policy-csp-that-can-be-set-using-eas.md} | 6 +-- .../policy-configuration-service-provider.md | 30 ++++++------- .../mdm/policy-csp-controlpolicyconflict.md | 2 +- 15 files changed, 102 insertions(+), 57 deletions(-) rename windows/client-management/mdm/{policy-csps-admx-backed.md => policies-in-policy-csp-admx-backed.md} (99%) rename windows/client-management/mdm/{policy-csps-supported-by-group-policy.md => policies-in-policy-csp-supported-by-group-policy.md} (99%) rename windows/client-management/mdm/{policy-csps-supported-by-hololens-1st-gen-commercial-suite.md => policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md} (95%) rename windows/client-management/mdm/{policy-csps-supported-by-hololens-1st-gen-development-edition.md => policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md} (95%) rename windows/client-management/mdm/{policy-csps-supported-by-hololens2.md => policies-in-policy-csp-supported-by-hololens2.md} (98%) rename windows/client-management/mdm/{policy-csps-supported-by-iot-core.md => policies-in-policy-csp-supported-by-iot-core.md} (97%) rename windows/client-management/mdm/{policy-csps-supported-by-iot-enterprise.md => policies-in-policy-csp-supported-by-iot-enterprise.md} (96%) rename windows/client-management/mdm/{policy-csps-supported-by-surface-hub.md => policies-in-policy-csp-supported-by-surface-hub.md} (97%) rename windows/client-management/mdm/{policy-csps-that-can-be-set-using-eas.md => policies-in-policy-csp-that-can-be-set-using-eas.md} (90%) diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 8d507ba71a..b15fa65bb2 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -14565,41 +14565,86 @@ "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-surface-hub", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-surface-hub.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-surface-hub", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-supported-by-iot-enterprise.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-enterprise", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-supported-by-iot-core.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-iot-core", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-iot-core.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-core", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-supported-by-hololens2.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-hololens2", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-hololens2.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-supported-by-hololens-1st-gen-development-edition.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-development-edition", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-development-edition.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-supported-by-hololens-1st-gen-commercial-suite.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-commercial-suite", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-commercial-suite.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-admx-backed.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-admx-backed", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-admx-backed.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-admx-backed", + "redirect_document_id": false + }, { "source_path": "windows/client-management/mdm/policies-supported-by-group-policy.md", "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policy-csps-supported-by-group-policy", "redirect_document_id": false }, + { + "source_path": "windows/client-management/mdm/policy-csps-supported-by-group-policy.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy", + "redirect_document_id": false + }, + { + "source_path": "windows/client-management/mdm/policy-csps-that-can-be-set-using-eas.md", + "redirect_url": "https://docs.microsoft.com/windows/client-management/mdm/policies-in-policy-csp-that-can-be-set-using-eas", + "redirect_document_id": false + }, { "source_path": "windows/keep-secure/collect-wip-audit-event-logs.md", "redirect_url": "https://docs.microsoft.com/windows/threat-protection/windows-information-protection/collect-wip-audit-event-logs", diff --git a/windows/client-management/mdm/TOC.md b/windows/client-management/mdm/TOC.md index a7fbff363b..6b92d9991b 100644 --- a/windows/client-management/mdm/TOC.md +++ b/windows/client-management/mdm/TOC.md @@ -159,14 +159,14 @@ #### [Personalization DDF file](personalization-ddf.md) ### [Policy CSP](policy-configuration-service-provider.md) #### [Policy DDF file](policy-ddf-file.md) -#### [Policy CSPs supported by Group Policy](policy-csps-supported-by-group-policy.md) -#### [ADMX-backed policy CSPs](policy-csps-admx-backed.md) -#### [Policy CSPs supported by HoloLens 2](policy-csps-supported-by-hololens2.md) -#### [Policy CSPs supported by HoloLens (1st gen) Commercial Suite](policy-csps-supported-by-hololens-1st-gen-commercial-suite.md) -#### [Policy CSPs supported by HoloLens (1st gen) Development Edition](policy-csps-supported-by-hololens-1st-gen-development-edition.md) -#### [Policy CSPs supported by Windows 10 IoT Enterprise](policy-csps-supported-by-iot-enterprise.md) -#### [Policy CSPs supported by Windows 10 IoT Core](policy-csps-supported-by-iot-core.md) -#### [Policy CSPs supported by Microsoft Surface Hub](policy-csps-supported-by-surface-hub.md) +#### [Policies in Policy CSP supported by Group Policy](policy-csps-supported-by-group-policy.md) +#### [ADMX-backed policies in Policy CSP](policy-csps-admx-backed.md) +#### [Policies in Policy CSP supported by HoloLens 2](policy-csps-supported-by-hololens2.md) +#### [Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite](policy-csps-supported-by-hololens-1st-gen-commercial-suite.md) +#### [Policies in Policy CSP supported by HoloLens (1st gen) Development Edition](policy-csps-supported-by-hololens-1st-gen-development-edition.md) +#### [Policies in Policy CSP supported by Windows 10 IoT Enterprise](policy-csps-supported-by-iot-enterprise.md) +#### [Policies in Policy CSP supported by Windows 10 IoT Core](policy-csps-supported-by-iot-core.md) +#### [Policies in Policy CSP supported by Microsoft Surface Hub](policy-csps-supported-by-surface-hub.md) #### [Policy CSPs that can be set using Exchange Active Sync (EAS)](policy-csps-that-can-be-set-using-eas.md) #### [AboveLock](policy-csp-abovelock.md) #### [Accounts](policy-csp-accounts.md) diff --git a/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md b/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md index 805f9ee481..d79b428c0e 100644 --- a/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md +++ b/windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md @@ -33,7 +33,7 @@ See [Support Tip: Ingesting Office ADMX-backed policies using Microsoft Intune]( ## Enable a policy > [!NOTE] -> See [Understanding ADMX-backed policy CSPs](https://docs.microsoft.com/windows/client-management/mdm/understanding-admx-backed-policies). +> See [Understanding ADMX-backed policies in Policy CSP](https://docs.microsoft.com/windows/client-management/mdm/understanding-admx-backed-policies). 1. Find the policy from the list [ADMX-backed policies](policy-csps-admx-backed.md). You need the following information listed in the policy description. - GP English name diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index d919c5f1a7..ba8dc31c1f 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -2515,7 +2515,7 @@ How do I turn if off? | The service can be stopped from the "Services" console o

Added a new section:

diff --git a/windows/client-management/mdm/policy-csps-admx-backed.md b/windows/client-management/mdm/policies-in-policy-csp-admx-backed.md similarity index 99% rename from windows/client-management/mdm/policy-csps-admx-backed.md rename to windows/client-management/mdm/policies-in-policy-csp-admx-backed.md index a580f4a524..75ac21a8b3 100644 --- a/windows/client-management/mdm/policy-csps-admx-backed.md +++ b/windows/client-management/mdm/policies-in-policy-csp-admx-backed.md @@ -1,6 +1,6 @@ --- -title: ADMX-backed policy CSPs -description: ADMX-backed policy CSPs +title: ADMX-backed policies in Policy CSP +description: ADMX-backed policies in Policy CSP ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,12 +12,12 @@ ms.localizationpriority: medium ms.date: 08/18/2020 --- -# ADMX-backed policy CSPs +# ADMX-backed policies in Policy CSP > [!div class="op_single_selector"] > -> - [Policy CSPs supported by Group Policy](policy-csps-supported-by-group-policy.md) -> - [ADMX-backed policy-CSPs](policy-csps-admx-backed.md) +> - [Policies in Policy CSP supported by Group Policy](policy-csps-supported-by-group-policy.md) +> - [ADMX-backed policies in Policy CSP](policy-csps-admx-backed.md) > - [ActiveXControls/ApprovedInstallationSites](./policy-csp-activexcontrols.md#activexcontrols-approvedinstallationsites) diff --git a/windows/client-management/mdm/policy-csps-supported-by-group-policy.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md similarity index 99% rename from windows/client-management/mdm/policy-csps-supported-by-group-policy.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md index 651f088e72..09c680512c 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-group-policy.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by Group Policy -description: Policy CSPs supported by Group Policy +title: Policies in Policy CSP supported by Group Policy +description: Policies in Policy CSP supported by Group Policy ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,12 +12,12 @@ ms.localizationpriority: medium ms.date: 07/18/2019 --- -# Policy CSPs supported by Group Policy +# Policies in Policy CSP supported by Group Policy > [!div class="op_single_selector"] > -> - [Policy CSPs supported by Group Policy](policy-csps-supported-by-group-policy.md) -> - [ADMX-backed policy CSPs](policy-csps-admx-backed.md) +> - [Policies in Policy CSP supported by Group Policy](policy-csps-supported-by-group-policy.md) +> - [ADMX-backed policies in Policy CSP](policy-csps-admx-backed.md) > - [AboveLock/AllowCortanaAboveLock](./policy-csp-abovelock.md#abovelock-allowcortanaabovelock) diff --git a/windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-commercial-suite.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md similarity index 95% rename from windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-commercial-suite.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md index f77d3c1308..0a8beec733 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-commercial-suite.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by HoloLens (1st gen) Commercial Suite -description: Policy CSPs supported by HoloLens (1st gen) Commercial Suite +title: Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite +description: Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 09/17/2019 --- -# Policy CSPs supported by HoloLens (1st gen) Commercial Suite +# Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite > [!div class="op_single_selector"] > diff --git a/windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-development-edition.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md similarity index 95% rename from windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-development-edition.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md index 2dec2fdb8b..256ddb3528 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-hololens-1st-gen-development-edition.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by HoloLens (1st gen) Development Edition -description: Policy CSPs supported by HoloLens (1st gen) Development Edition +title: Policies in Policy CSP supported by HoloLens (1st gen) Development Edition +description: Policies in Policy CSP supported by HoloLens (1st gen) Development Edition ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 07/18/2019 --- -# Policy CSPs supported by HoloLens (1st gen) Development Edition +# Policies in Policy CSP supported by HoloLens (1st gen) Development Edition > [!div class="op_single_selector"] > diff --git a/windows/client-management/mdm/policy-csps-supported-by-hololens2.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md similarity index 98% rename from windows/client-management/mdm/policy-csps-supported-by-hololens2.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md index e5cdb0f0ca..4757f9c46c 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-hololens2.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by HoloLens 2 -description: Policy CSPs supported by HoloLens 2 +title: Policies in Policy CSP supported by HoloLens 2 +description: Policies in Policy CSP supported by HoloLens 2 ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 05/11/2020 --- -# Policy CSPs supported by HoloLens 2 +# Policies in Policy CSP supported by HoloLens 2 > [!div class="op_single_selector"] > diff --git a/windows/client-management/mdm/policy-csps-supported-by-iot-core.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-core.md similarity index 97% rename from windows/client-management/mdm/policy-csps-supported-by-iot-core.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-core.md index c43363b357..f3143ed222 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-iot-core.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-core.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by Windows 10 IoT Core -description: Policy CSPs supported by Windows 10 IoT Core +title: Policies in Policy CSP supported by Windows 10 IoT Core +description: Policies in Policy CSP supported by Windows 10 IoT Core ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 09/16/2019 --- -# Policy CSPs supported by Windows 10 IoT Core +# Policies in Policy CSP supported by Windows 10 IoT Core > [!div class="op_single_selector"] > diff --git a/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-enterprise.md similarity index 96% rename from windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-enterprise.md index 8e70dd707e..afb79c5bfe 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-iot-enterprise.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-iot-enterprise.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by Windows 10 IoT Enterprise -description: Policy CSPs supported by Windows 10 IoT Enterprise +title: Policies in Policy CSP supported by Windows 10 IoT Enterprise +description: Policies in Policy CSP supported by Windows 10 IoT Enterprise ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 07/18/2019 --- -# Policy CSPs supported by Windows 10 IoT Enterprise +# Policies in Policy CSP supported by Windows 10 IoT Enterprise > [!div class="op_single_selector"] > diff --git a/windows/client-management/mdm/policy-csps-supported-by-surface-hub.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-surface-hub.md similarity index 97% rename from windows/client-management/mdm/policy-csps-supported-by-surface-hub.md rename to windows/client-management/mdm/policies-in-policy-csp-supported-by-surface-hub.md index 1d89eb88de..e39b0aef27 100644 --- a/windows/client-management/mdm/policy-csps-supported-by-surface-hub.md +++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-surface-hub.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs supported by Microsoft Surface Hub -description: Policy CSPs supported by Microsoft Surface Hub +title: Policies in Policy CSP supported by Microsoft Surface Hub +description: Policies in Policy CSP supported by Microsoft Surface Hub ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 07/22/2020 --- -# Policy CSPs supported by Microsoft Surface Hub +# Policies in Policy CSP supported by Microsoft Surface Hub - [ApplicationManagement/AllowAppStoreAutoUpdate](https://docs.microsoft.com/windows/client-management/mdm/policy-csp-applicationmanagement#applicationmanagement-allowappstoreautoupdate) diff --git a/windows/client-management/mdm/policy-csps-that-can-be-set-using-eas.md b/windows/client-management/mdm/policies-in-policy-csp-that-can-be-set-using-eas.md similarity index 90% rename from windows/client-management/mdm/policy-csps-that-can-be-set-using-eas.md rename to windows/client-management/mdm/policies-in-policy-csp-that-can-be-set-using-eas.md index 171652aa2b..4fa3380c87 100644 --- a/windows/client-management/mdm/policy-csps-that-can-be-set-using-eas.md +++ b/windows/client-management/mdm/policies-in-policy-csp-that-can-be-set-using-eas.md @@ -1,6 +1,6 @@ --- -title: Policy CSPs that can be set using Exchange Active Sync (EAS) -description: Policy CSPs that can be set using Exchange Active Sync (EAS) +title: Policies in Policy CSP that can be set using Exchange Active Sync (EAS) +description: Policies in Policy CSP that can be set using Exchange Active Sync (EAS) ms.reviewer: manager: dansimp ms.author: dansimp @@ -12,7 +12,7 @@ ms.localizationpriority: medium ms.date: 07/18/2019 --- -# Policy CSPs that can be set using Exchange Active Sync (EAS) +# Policies in Policy CSP that can be set using Exchange Active Sync (EAS) - [Camera/AllowCamera](policy-csp-camera.md#camera-allowcamera) - [Cellular/ShowAppCellularAccessUI](policy-csp-cellular.md#cellular-showappcellularaccessui) diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index 0349f6cde6..ba400e3ffb 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -4901,27 +4901,27 @@ The following diagram shows the Policy configuration service provider in tree fo -## Policy CSPs supported by Group Policy and ADMX-backed policy CSPs -- [Policy CSPs supported by Group Policy](policy-csps-supported-by-group-policy.md) -- [ADMX-backed policy CSPs](policy-csps-admx-backed.md) +## Policies in Policy CSP supported by Group Policy and ADMX-backed policies in Policy CSP +- [Policies in Policy CSP supported by Group Policy](policy-csps-supported-by-group-policy.md) +- [ADMX-backed policies in Policy CSP](policy-csps-admx-backed.md) > [!NOTE] -> Not all Policy CSPs supported by Group Policy are ADMX-backed. For more details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md). +> Not all Policies in Policy CSP supported by Group Policy are ADMX-backed. For more details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md). -## Policy CSPs supported by HoloLens devices -- [Policy CSPs supported by HoloLens 2](policy-csps-supported-by-hololens2.md) -- [Policy CSPs supported by HoloLens (1st gen) Commercial Suite](policy-csps-supported-by-hololens-1st-gen-commercial-suite.md) -- [Policy CSPs supported by HoloLens (1st gen) Development Edition](policy-csps-supported-by-hololens-1st-gen-development-edition.md) +## Policies in Policy CSP supported by HoloLens devices +- [Policies in Policy CSP supported by HoloLens 2](policy-csps-supported-by-hololens2.md) +- [Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite](policy-csps-supported-by-hololens-1st-gen-commercial-suite.md) +- [Policies in Policy CSP supported by HoloLens (1st gen) Development Edition](policy-csps-supported-by-hololens-1st-gen-development-edition.md) -## Policy CSPs supported by Windows 10 IoT -- [Policy CSPs supported by Windows 10 IoT Enterprise](policy-csps-supported-by-iot-enterprise.md) -- [Policy CSPs supported by Windows 10 IoT Core](policy-csps-supported-by-iot-core.md) +## Policies in Policy CSP supported by Windows 10 IoT +- [Policies in Policy CSP supported by Windows 10 IoT Enterprise](policy-csps-supported-by-iot-enterprise.md) +- [Policies in Policy CSP supported by Windows 10 IoT Core](policy-csps-supported-by-iot-core.md) -## Policy CSPs supported by Microsoft Surface Hub -- [Policy CSPs supported by Microsoft Surface Hub](policy-csps-supported-by-surface-hub.md) +## Policies in Policy CSP supported by Microsoft Surface Hub +- [Policies in Policy CSP supported by Microsoft Surface Hub](policy-csps-supported-by-surface-hub.md) -## Policy CSPs that can be set using Exchange ActiveSync (EAS) -- [Policy CSPs that can be set using Exchange ActiveSync (EAS)](policy-csps-that-can-be-set-using-eas.md) +## Policies in Policy CSP that can be set using Exchange ActiveSync (EAS) +- [Policies in Policy CSP that can be set using Exchange ActiveSync (EAS)](policy-csps-that-can-be-set-using-eas.md) ## Related topics diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md index 9a867b0778..2cde160250 100644 --- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md +++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md @@ -100,7 +100,7 @@ The [Policy DDF](policy-ddf-file.md) contains the following tags to identify the - \ - \ -For the list MDM-GP mapping list, see [Policy CSPs supported by Group Policy +For the list MDM-GP mapping list, see [Policies in Policy CSP supported by Group Policy ](policy-csps-supported-by-group-policy.md). The MDM Diagnostic report shows the applied configurations states of a device including policies, certificates, configuration sources, and resource information. The report includes a list of blocked GP settings because MDM equivalent is configured, if any. To get the diagnostic report, go to **Settings** > **Accounts** > **Access work or school** > and then click the desired work or school account. Scroll to the bottom of the page to **Advanced Diagnostic Report** and then click **Create Report**.