From 7a05925d59113b31a24b5b3948f83f678fc94fa0 Mon Sep 17 00:00:00 2001
From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:53:59 -0400
Subject: [PATCH] Update copy on Integrations > MDM > Windows page (#12672)

Changes:
- Update copy to accurately reflect Windows MDM features
---
 .../ActivityFeed/ActivityItem/ActivityItem.tsx      |  2 +-
 .../MdmSettings/WindowsMdmPage/WindowsMdmPage.tsx   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
index 2d0646d290..418a71fa38 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
@@ -486,7 +486,7 @@ const TAGGED_TEMPLATES = {
     );
   },
   disabledWindowsMdm: (activity: IActivity) => {
-    return <> told Fleet to turn off MDM features for all Windows hosts.</>;
+    return <> told Fleet to turn off Windows MDM features.</>;
   },
 };
 
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsMdmPage/WindowsMdmPage.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsMdmPage/WindowsMdmPage.tsx
index be2e6861b6..121f102b12 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsMdmPage/WindowsMdmPage.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsMdmPage/WindowsMdmPage.tsx
@@ -62,11 +62,9 @@ const WindowsMdmOnContent = ({ router }: IWindowsMdmOnContentProps) => {
   return (
     <>
       <h1>Turn on Windows MDM</h1>
-      <p>
-        This will turn MDM on for Windows hosts with fleetd, overriding existing
-        MDM solutions.
-      </p>
-      <p>MDM won&apos;t be turned on for Windows servers</p>
+      <p>This will turn MDM on for Windows hosts with fleetd.</p>
+      <p>Hosts connected to another MDM solution won&apos;t be migrated.</p>
+      <p>MDM won&apos;t be turned on for Windows servers.</p>
       <Button onClick={turnOnWindowsMdm}>Turn on</Button>
     </>
   );
@@ -87,7 +85,10 @@ const WindowsMdmOffContent = ({ router }: IWindowsMdmOffContentProps) => {
   return (
     <>
       <h1>Turn off Windows MDM</h1>
-      <p>This will turn off MDM on each Windows host.</p>
+      <p>
+        MDM will no longer be turned on for Windows hosts that enroll to Fleet.
+      </p>
+      <p>Hosts with MDM already turned on MDM will not have MDM removed.</p>
       <Button onClick={turnOffWindowsMdm}>Turn off MDM</Button>
     </>
   );