Merge pull request MicrosoftDocs#204 from ErikjeMS/deptoade

dep to ade

Author: PRMerger12

memdocs/intune/enrollment/enrollment-autopilot.md

@@ -227,9 +227,9 @@ If you aren't interested in mobile device management, you can use Autopilot in o
 You can group Windows devices by a correlator ID when enrolling using [Autopilot for existing devices](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/New-Windows-Autopilot-capabilities-and-expanded-partner-support/ba-p/260430) through Configuration Manager. The correlator ID is a parameter of the Autopilot configuration file. The [Azure AD device attribute enrollmentProfileName](https://docs.microsoft.com/azure/active-directory/users-groups-roles/groups-dynamic-membership#rules-for-devices) is automatically set to equal "OfflineAutopilotprofile-\<correlator ID\>". This allows arbitrary Azure AD dynamic groups to be created based off correlator ID by using the enrollmentprofileName attribute.
 
 >[!WARNING] 
-> Because the correlator ID is not pre-listed in Intune, the device may report any correlator ID they want. If the user creates a correlator ID matching an Autopilot or Apple DEP profile name, the device will be added to any dynamic Azure AD device group based off the enrollmentProfileName attribute. To avoid this conflict:
+> Because the correlator ID is not pre-listed in Intune, the device may report any correlator ID they want. If the user creates a correlator ID matching an Autopilot or Apple ADE profile name, the device will be added to any dynamic Azure AD device group based off the enrollmentProfileName attribute. To avoid this conflict:
 > - Always create dynamic group rules matching against the *entire* enrollmentProfileName value
-> - Never name Autopilot or Apple DEP profiles beginning with "OfflineAutopilotprofile-".
+> - Never name Autopilot or Apple ADE profiles beginning with "OfflineAutopilotprofile-".
 
 ## Next steps
 After you configure Windows Autopilot for registered Windows 10 devices, learn how to manage those devices. For more information, see [What is Microsoft Intune device management?](../remote-actions/device-management.md)

memdocs/intune/enrollment/macos-enroll.md

@@ -64,7 +64,7 @@ For information about other end-user tasks, see these articles:
 
 ## Company-owned macOS devices
 For organizations that purchase devices for their users, Intune supports the following macOS company-owned device enrollment methods:
-- [Apple's Device Enrollment Program (DEP)](device-enrollment-program-enroll-macos.md): Organizations can purchase macOS devices through Apple's Device Enrollment Program (DEP). DEP lets you deploy an enrollment profile "over the air" to bring devices into management.
+- [Apple's Automated Device Enrollment (ADE)](device-enrollment-program-enroll-macos.md): Organizations can purchase macOS devices through ADE. ADE lets you deploy an enrollment profile "over the air" to bring devices into management.
 - [Device enrollment manager (DEM)](device-enrollment-manager-enroll.md): You can use a DEM account to enroll up to 1,000 devices.
 
 ## Block macOS enrollment

memdocs/intune/enrollment/troubleshoot-device-enrollment-in-intune.md

@@ -290,9 +290,9 @@ To fix the issue, users must select the **Set up** button, which is to the right
 Once enrolled, the devices return to a healthy state and regain access to company resources.
 
 ### Verify WS-Trust 1.3 is enabled
-**Issue** Device Enrollment Program (DEP) iOS/iPadOS devices can't be enrolled
+**Issue** Automated Device Enrollment (ADE) iOS/iPadOS devices can't be enrolled
 
-Enrolling DEP devices with user affinity requires WS-Trust 1.3 Username/Mixed endpoint to be enabled to request user tokens. Active Directory enables this endpoint by default. To get a list of enabled endpoints, use the Get-AdfsEndpoint PowerShell cmdlet and looking for the trust/13/UsernameMixed endpoint. For example:
+Enrolling ADE devices with user affinity requires WS-Trust 1.3 Username/Mixed endpoint to be enabled to request user tokens. Active Directory enables this endpoint by default. To get a list of enabled endpoints, use the Get-AdfsEndpoint PowerShell cmdlet and looking for the trust/13/UsernameMixed endpoint. For example:
 
       Get-AdfsEndpoint -AddressPath "/adfs/services/trust/13/UsernameMixed"
 

memdocs/intune/enrollment/troubleshoot-ios-enrollment-errors.md

@@ -44,7 +44,7 @@ Collect the following information about the problem:
 - How many users are affected? Are all users affected or just some?
 - How many devices are affected? Are all devices affected or just some?
 - What is the MDM authority?
-- How is enrollment being performed? Is it "Bring your own device" (BYOD) or Apple Device Enrollment Program (DEP) with enrollment profiles?
+- How is enrollment being performed? Is it "Bring your own device" (BYOD) or Apple Automated Device Enrollment (ADE) with enrollment profiles?
 
 ## Error messages
 
@@ -207,7 +207,7 @@ Renew the APNs certificate, and then re-enroll the device.
 
 ### XPC_TYPE_ERROR Connection invalid
 
-When you turn on a DEP-managed device that is assigned an enrollment profile, enrollment fails, and you receive the following error message:
+When you turn on a ADE-managed device that is assigned an enrollment profile, enrollment fails, and you receive the following error message:
 
 ```
 asciidoc
@@ -217,28 +217,28 @@ iPhone com.apple.accessibility.AccessibilityUIServer(MobileAsset)[288] <Notice>:
 iPhone mobileassetd[83] <Notice>: 0x1a49aebc0 Client connection: XPC_TYPE_ERROR Connection invalid <error: 0x1a49aebc0> { count = 1, transaction: 0, voucher = 0x0, contents = "XPCErrorDescription" => <string: 0x1a49aee18> { length = 18, contents = "Connection invalid" }
 ```
 
-**Cause:** There's a connection issue between the device and the Apple DEP service.
+**Cause:** There's a connection issue between the device and the Apple ADE service.
 
 #### Resolution
 Fix the connection issue, or use a different network connection to enroll the device. You may also have to contact Apple if the issue persists.
 
 
 ## Other issues
 
-### DEP enrollment doesn't start
-When you turn on a DEP-managed device that is assigned an enrollment profile, the Intune enrollment process isn't initiated.
+### ADE enrollment doesn't start
+When you turn on a ADE-managed device that is assigned an enrollment profile, the Intune enrollment process isn't initiated.
 
-**Cause:** The enrollment profile is created before the DEP token is uploaded to Intune.
+**Cause:** The enrollment profile is created before the ADE token is uploaded to Intune.
 
 #### Resolution
 
 1. Edit the enrollment profile. You can make any change to the profile. The purpose is to update the modification time of the profile.
-2. Synchronize DEP-managed devices: In the [Microsoft Endpoint Manager Admin Center](https://go.microsoft.com/fwlink/?linkid=2109431), choose **Devices** > **iOS** > **iOS enrollment** > **Enrollment program tokens** > choose a token > **Sync now**. A sync request is sent to Apple.
+2. Synchronize ADE-managed devices: In the [Microsoft Endpoint Manager Admin Center](https://go.microsoft.com/fwlink/?linkid=2109431), choose **Devices** > **iOS** > **iOS enrollment** > **Enrollment program tokens** > choose a token > **Sync now**. A sync request is sent to Apple.
 
-### DEP enrollment stuck at user login
-When you turn on a DEP-managed device that is assigned an enrollment profile, the initial setup sticks after you enter credentials.
+### ADE enrollment stuck at user login
+When you turn on a ADE-managed device that is assigned an enrollment profile, the initial setup sticks after you enter credentials.
 
-**Cause:** Multi-Factor authentication (MFA) is enabled. Currently MFA doesn't work during enrollment on DEP devices.
+**Cause:** Multi-Factor authentication (MFA) is enabled. Currently MFA doesn't work during enrollment on ADE devices.
 
 #### Resolution
 Disable MFA, and then re-enroll the device.

memdocs/intune/enrollment/troubleshoot-windows-enrollment-errors.md

@@ -44,7 +44,7 @@ Collect the following information about the problem:
 - How many users are affected? Are all users affected or just some?
 - How many devices are affected? Are all devices affected or just some?
 - What is the MDM authority?
-- How is enrollment being performed? Is it "Bring your own device" (BYOD) or Apple Device Enrollment Program (DEP) with enrollment profiles?
+- How is enrollment being performed? Is it "Bring your own device" (BYOD) or Apple Automated Device Enrollment (ADE) with enrollment profiles?
 
 ## Error messages
 

memdocs/intune/enrollment/tutorial-use-device-enrollment-program-enroll-ios.md

@@ -39,17 +39,17 @@ If you don’t have an Intune subscription, [sign up for a free trial account](.
 ## Get an Apple Device Enrollment token
 Before enrolling iOS/iPadOS devices with Apple's corporate enrollment features, you need an Apple Device Enrollment token (.pem) file. This token lets Intune sync information about Apple devices that your corporation owns. It also permits Intune to upload enrollment profiles to Apple and to assign devices to those profiles.
 
-You use the ABM or DEP portal to create a Device Enrollment token. You also use the portals to assign devices to Intune for management.
+You use the Apple portal to create a Device Enrollment token. You also use the portals to assign devices to Intune for management.
 
 1. In the [Microsoft Endpoint Manager Admin Center](https://go.microsoft.com/fwlink/?linkid=2109431), choose **Devices** > **iOS** > **iOS enrollment** > **Enrollment Program Tokens** > **Add**.
 
 2. Grant permission to Microsoft to send user and device information to Apple by selecting **I agree**.
 
    ![Screenshot of Enrollment Program Token pane in Apple Certificates workspace to download public key.](./media/tutorial-use-device-enrollment-program-enroll-ios/add-enrollment-program-token-pane.png)
 
-3. Choose **Download your public key** to download and save the encryption key (.pem) file locally. The .pem file is used to request a trust-relationship certificate from the ABM or DEP portal.
+3. Choose **Download your public key** to download and save the encryption key (.pem) file locally. The .pem file is used to request a trust-relationship certificate from the Apple portal.
 
-4. Choose **Create a token for Apple's Device Enrollment Program** to open Apple's Deployment Program portal, and sign in with your company Apple ID. You can use this Apple ID to renew your DEP token.
+4. Choose **Create a token for Apple's Device Enrollment Program** to open Apple's Deployment Program portal, and sign in with your company Apple ID. You can use this Apple ID to renew your token.
 
 5. In Apple's [Deployment Programs portal](https://deploy.apple.com), choose **Get Started** for **Device Enrollment Program**. Your process may be slightly different than the following steps in [Apple Business Manager](https://business.apple.com).
 
@@ -81,7 +81,7 @@ Now that you've installed your token, you can create an enrollment profile for c
 
 2. Select the token you just installed, choose **Profiles** > **Create profile**.
 
-3. Under **Create Profile**, enter *TestDEPProfile* for **Name** and *Testing DEP for iOS/iPadOS devices* for **Description**. Users do not see these details.
+3. Under **Create Profile**, enter *TestProfile* for **Name** and *Testing ADE for iOS/iPadOS devices* for **Description**. Users do not see these details.
 
 4. Choose **iOS** under **Platform**.
 
@@ -113,28 +113,28 @@ Now that you've installed your token, you can create an enrollment profile for c
 
 ## Sync managed devices to Intune
 
-After you set up an enrollment program token with the ABM, ASM, or DEP portal and assign devices there to the MDM server, you can wait for these devices to sync to the Intune service, or manually push a sync. Without a manual sync, devices may take up to 24 hours to show up in the Azure portal.
+After you set up an enrollment program token with the ABM, ASM, or ADE portal and assign devices there to the MDM server, you can wait for these devices to sync to the Intune service, or manually push a sync. Without a manual sync, devices may take up to 24 hours to show up in the Azure portal.
 
 1. In the [Microsoft Endpoint Manager Admin Center](https://go.microsoft.com/fwlink/?linkid=2109431), choose **Devices** > **iOS** > **iOS enrollment** > **Enrollment Program Tokens** > choose a token in the list > **Devices** > **Sync**.
 
 ## Assign an enrollment profile to iOS/iPadOS devices
 
-You must assign an enrollment program profile to devices before they can enroll. These devices are synced to Intune from Apple, and must be assigned to the proper MDM server token in the ABM, ASM, or DEP portal.
+You must assign an enrollment program profile to devices before they can enroll. These devices are synced to Intune from Apple, and must be assigned to the proper MDM server token in the ABM, ASM, or ADE portal.
 
 1. In the [Microsoft Endpoint Manager Admin Center](https://go.microsoft.com/fwlink/?linkid=2109431), choose **Devices** > **iOS** > **iOS enrollment** > **Enrollment Program Tokens** > choose your token in the list.
 2. Choose **Devices** > choose devices in the list > **Assign profile**.
 3. Under **Assign profile**, choose a profile for the devices > **Assign**.
 
 ## Distribute devices to users
 
-You've set up management and syncing between Apple and Intune, and assigned a profile to let your DEP devices enroll. You can now distribute devices to users. Devices with user affinity require each user be assigned an Intune license.
+You've set up management and syncing between Apple and Intune, and assigned a profile to let your ADE devices enroll. You can now distribute devices to users. Devices with user affinity require each user be assigned an Intune license.
 
 ## Next steps
 
 You can find more information about other options available for enrolling iOS/iPadOS devices.
 
 > [!div class="nextstepaction"]
-> [In-depth iOS/iPadOS DEP enrollment article](device-enrollment-program-enroll-ios.md)
+> [In-depth iOS/iPadOS ADE enrollment article](device-enrollment-program-enroll-ios.md)
 
 <!--commenting out because inaccurate>
 ## Clean up resources