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 ( <>
- This will turn MDM on for Windows hosts with fleetd, overriding existing - MDM solutions. -
-MDM won't be turned on for Windows servers
+This will turn MDM on for Windows hosts with fleetd.
+Hosts connected to another MDM solution won't be migrated.
+MDM won't be turned on for Windows servers.
> ); @@ -87,7 +85,10 @@ const WindowsMdmOffContent = ({ router }: IWindowsMdmOffContentProps) => { return ( <>This will turn off MDM on each Windows host.
++ MDM will no longer be turned on for Windows hosts that enroll to Fleet. +
+Hosts with MDM already turned on MDM will not have MDM removed.
> );