From 3538d7b7ee97359ad53d68caae242dd85b825e96 Mon Sep 17 00:00:00 2001
From: Vinay Pamnani <37223378+vinaypamnani-msft@users.noreply.github.com>
Date: Tue, 29 Nov 2022 15:46:59 -0500
Subject: [PATCH 1/3] Update policy-csp-controlpolicyconflict.md
---
.../mdm/policy-csp-controlpolicyconflict.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
index 0a98ca8f3a..0e435678e9 100644
--- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
+++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
@@ -35,10 +35,10 @@ manager: aaroncz
> [!NOTE]
> This setting doesn't apply to the following types of group policies:
>
-> - If they don't map to an MDM policy. For example, firewall policies and account lockout policies.
-> - If they aren't defined by an ADMX. For example, Password policy - minimum password age.
-> - If they're in the Windows Update category.
-> - If they have list entries. For example, the Microsoft Edge CookiesAllowedForUrls policy.
+> - If they don't map to an MDM policy. For example, Windows Settings > Security Settings > Public Key Policies.
+> - If they are group policies that aren't defined by an ADMX template. For example, Windows Settings > Scripts.
+> - If they have list entries. For example, Administrative Templates > Windows Components > ActiveX Installer Service > Approved Installation Sites for ActiveX Controls.
+> - If they are in the Windows Update category.
From 5a1cb35669ee6eae82add2a8ed24adb3bff66457 Mon Sep 17 00:00:00 2001
From: Vinay Pamnani <37223378+vinaypamnani-msft@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:22:55 -0500
Subject: [PATCH 2/3] Update new-in-windows-mdm-enrollment-management.md
---
.../new-in-windows-mdm-enrollment-management.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/windows/client-management/new-in-windows-mdm-enrollment-management.md b/windows/client-management/new-in-windows-mdm-enrollment-management.md
index b87e711db8..74ca04fcc6 100644
--- a/windows/client-management/new-in-windows-mdm-enrollment-management.md
+++ b/windows/client-management/new-in-windows-mdm-enrollment-management.md
@@ -348,9 +348,9 @@ No. Only one MDM is allowed.
Entry | Description
--------------- | --------------------
-What is dmwappushsvc? | It's a Windows service that ships in Windows 10 and Windows 11 operating system as a part of the windows management platform. It's used internally by the operating system as a queue for categorizing and processing all WAP messages, which include Windows management messages, MMS, NabSync, and Service Indication/Service Loading (SI/SL). The service also initiates and orchestrates management sync sessions with the MDM server. |
-What data is handled by dmwappushsvc? | It's a component handling the internal workings of the management platform and involved in processing messages that have been received by the device remotely for management. The messages in the queue are serviced by another component that is also part of the Windows management stack to process messages. The service also routes and authenticates WAP messages received by the device to internal OS components that process them further: MMS, NabSync, SI/SL. This service doesn't send telemetry.|
-How do I turn if off? | The service can be stopped from the "Services" console on the device (Start > Run > services.msc). However, since this service is a component part of the OS and required for the proper functioning of the device, we strongly recommend not to disable the service. Disabling this service will cause your management to fail.|
+What is dmwappushsvc? | It's a Windows service that ships in Windows 10 and Windows 11 operating system as a part of the windows management platform. It's used internally by the operating system as a queue for categorizing and processing all Wireless Application Protocol (WAP) messages, which include Windows management messages, and Service Indication/Service Loading (SI/SL). The service also initiates and orchestrates management sync sessions with the MDM server. |
+What data is handled by dmwappushsvc? | It's a component handling the internal workings of the management platform and involved in processing messages that have been received by the device remotely for management. The messages in the queue are serviced by another component that is also part of the Windows management stack to process messages. The service also routes and authenticates WAP messages received by the device to internal OS components that process them further. This service doesn't send telemetry.|
+How do I turn if off? | The service can be stopped from the "Services" console on the device (Start > Run > services.msc) and locating *Device Management Wireless Application Protocol (WAP) Push message Routing Service*. However, since this service is a component part of the OS and required for the proper functioning of the device, we strongly recommend not to disable the service. Disabling this service will cause your management to fail.|
## Change history for MDM documentation
From 5f19512340b464e585f6515a57505e55e5770d5c Mon Sep 17 00:00:00 2001
From: Vinay Pamnani <37223378+vinaypamnani-msft@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:36:30 -0500
Subject: [PATCH 3/3] Update policy-csp-controlpolicyconflict.md
---
.../mdm/policy-csp-controlpolicyconflict.md | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
index 0e435678e9..98923c408a 100644
--- a/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
+++ b/windows/client-management/mdm/policy-csp-controlpolicyconflict.md
@@ -20,15 +20,6 @@ manager: aaroncz
## ControlPolicyConflict policies
-
- -
- ControlPolicyConflict/MDMWinsOverGP
-
-
-
-
-
-
**ControlPolicyConflict/MDMWinsOverGP**