From 78d70b5cda5fde7becd2c039ea9afda492260812 Mon Sep 17 00:00:00 2001
From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>
Date: Wed, 25 Feb 2026 15:58:47 -0500
Subject: [PATCH 1/2] Wipe tooltip: Add instructions to delete the host

For the following quick win:
-

TODO: Moved the copy re preventing re-enrollment to the wipe guide: To prevent the host from automatically reenrolling to Fleet, first release the host from Apple Business Manager and then delete the host in Fleet.
---
 frontend/pages/hosts/details/cards/HostHeader/helpers.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/pages/hosts/details/cards/HostHeader/helpers.tsx b/frontend/pages/hosts/details/cards/HostHeader/helpers.tsx
index 6769b61dbfb..a07d2495ebf 100644
--- a/frontend/pages/hosts/details/cards/HostHeader/helpers.tsx
+++ b/frontend/pages/hosts/details/cards/HostHeader/helpers.tsx
@@ -103,10 +103,8 @@ export const DEVICE_STATUS_TAGS: DeviceStatusTagConfig = {
   wiped: {
     title: "Wiped",
     tagType: "error",
-    generateTooltip: (platform) =>
-      isMacOS(platform)
-        ? "Host is wiped. To prevent the host from automatically reenrolling to Fleet, first release the host from Apple Business Manager and then delete the host in Fleet."
-        : "Host is wiped.",
+    generateTooltip: () =>
+      "Host is wiped. If you re-enrolled the host, delete it to clear the wiped badge. The host will automatically re-appear in Fleet.",
   },
   wiping: {
     title: "Wipe pending",

From fd3c694eea09900f22d0329ca0b4ff23bc2078e3 Mon Sep 17 00:00:00 2001
From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com>
Date: Wed, 25 Feb 2026 16:35:26 -0500
Subject: [PATCH 2/2] Update lock-wipe-hosts.md

---
 articles/lock-wipe-hosts.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/articles/lock-wipe-hosts.md b/articles/lock-wipe-hosts.md
index c40d80940e0..9a9a15c1e3c 100644
--- a/articles/lock-wipe-hosts.md
+++ b/articles/lock-wipe-hosts.md
@@ -11,7 +11,7 @@ Restricting wipe for iPhones and iPads to only company-owned iPhones and iPads i
 ## Lock a host
 
 1. Navigate to the **Hosts** page by clicking the "Hosts" tab in the main navigation header. Find the device you want to lock. You can search by name, hostname, UUID, serial number, or private IP address in the search box in the upper right corner.
-2. Click the host to open the **Host Overview** page.
+2. Click the host to open the **Host details** page.
 3. Click the **Actions** dropdown, then click  **Lock**.
 4. A confirmation dialog will appear. Confirm that you want to lock the device. The host will now be marked with a "Lock pending" badge. Once the lock command is acknowledged by the host, the badge will update to "Locked".*
 
@@ -51,9 +51,11 @@ Example URL:
 3. Click the **Actions** dropdown, then click  **Wipe**.
 4. Confirm that you want to wipe the device in the dialog. The host will now be marked with a "Wipe pending" badge. Once the wipe command is acknowledged by the host, the badge will update to "Wiped".
 
-> **Important** When wiping and re-installing the operating system (OS) on a host, delete the host from Fleet before you re-enroll it. If you re-enroll without deleting, Fleet won't escrow a new disk encryption key.
+When wiping and re-installing the operating system (OS) on a host, delete the host from Fleet before you re-enroll it. If you re-enroll without deleting, Fleet won't escrow a new disk encryption key.
+
+If you're gifting a company-owned macOS host or you want to prevent the host from automatically re-enrolling to Fleet for some other reason, first release the host from Apple Business Manager (ABM) and then delete the host in Fleet.
 
-> **Windows hosts** Fleet uses the [doWipeProtected](https://learn.microsoft.com/en-us/windows/client-management/mdm/remotewipe-csp#dowipeprotected) command. According to Microsoft, this leaves the host [unable to boot](https://learn.microsoft.com/en-us/windows/client-management/mdm/remotewipe-csp#:~:text=In%20some%20device%20configurations%2C%20this%20command%20may%20leave%20the%20device%20unable%20to%20boot.).
+For Windows hosts, Fleet uses the [doWipeProtected](https://learn.microsoft.com/en-us/windows/client-management/mdm/remotewipe-csp#dowipeprotected) command. According to Microsoft, this leaves the host [unable to boot](https://learn.microsoft.com/en-us/windows/client-management/mdm/remotewipe-csp#:~:text=In%20some%20device%20configurations%2C%20this%20command%20may%20leave%20the%20device%20unable%20to%20boot.).
 
 ## Unlock a host