Skip to content

Commit e19647f

Browse files
authored
Merge pull request #16226 from MicrosoftDocs/main
Publish main to live, Thursday 3:30PM PDT, 09/26
2 parents b10fb96 + f0ea787 commit e19647f

File tree

51 files changed

+93
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+93
-108
lines changed

autopilot/device-preparation/requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ To provide needed Microsoft Entra ID and MDM functionality, including automatic
200200
201201
> [!NOTE]
202202
>
203-
> When a Microsoft 365 subscription is used, licenses still need to be assigned to users so they can enroll device in Intune. For more information, see [assign licenses to users so they can enroll devices in Intune](/intune/fundamentals/licenses-assign).
203+
> When a Microsoft 365 subscription is used, licenses still need to be assigned to users so they can enroll device in Intune. For more information, see [assign licenses to users so they can enroll devices in Intune](/mem/intune/fundamentals/licenses-assign).
204204
205205
Additionally, the following are also recommended, but not required:
206206

autopilot/dfci-management.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ See the following figure:
5555

5656
- A currently supported version of Windows and a supported UEFI is required.
5757
- The device manufacturer must have DFCI added to their UEFI firmware in the manufacturing process, or as a firmware update that can be installed. Work with the device vendors to determine the [manufacturers that support DFCI](#oems-that-support-dfci), or the firmware version needed to use DFCI.
58-
- The device must be managed with Microsoft Intune. For more information, see [Enroll Windows devices in Intune using Windows Autopilot](/intune/enrollment/enrollment-autopilot).
58+
- The device must be managed with Microsoft Intune. For more information, see [Enroll Windows devices in Intune using Windows Autopilot](/mem/intune/enrollment/enrollment-autopilot).
5959
- The device must be registered for Windows Autopilot by a [Microsoft Cloud Solution Provider (CSP) partner](https://partner.microsoft.com/membership/cloud-solution-provider), or registered directly by the OEM. For Surface devices, Microsoft registration support is available at [Microsoft Devices Autopilot Support](https://prod.support.services.microsoft.com/supportrequestform/0d8bf192-cab7-6d39-143d-5a17840b9f5f).
6060

6161
> [!IMPORTANT]
6262
>
63-
> Devices manually registered for Autopilot (such as by [importing from a CSV file](/intune/enrollment/enrollment-autopilot#add-devices)) aren't allowed to use DFCI. By design, DFCI management requires external attestation of the device's commercial acquisition through an OEM or a Microsoft CSP partner registration to Windows Autopilot. When the device is registered, its serial number is displayed in the list of Windows Autopilot devices.
63+
> Devices manually registered for Autopilot (such as by [importing from a CSV file](/mem/intune/enrollment/enrollment-autopilot#add-devices)) aren't allowed to use DFCI. By design, DFCI management requires external attestation of the device's commercial acquisition through an OEM or a Microsoft CSP partner registration to Windows Autopilot. When the device is registered, its serial number is displayed in the list of Windows Autopilot devices.
6464
6565
## Managing DFCI profile with Windows Autopilot
6666

@@ -71,9 +71,9 @@ There are four basic steps in managing DFCI profile with Windows Autopilot:
7171
1. Create a DFCI profile
7272
1. Assign the profiles
7373

74-
See [Create the profiles](/intune/configuration/device-firmware-configuration-interface-windows#create-the-profiles) and [Assign the profiles, and reboot](/intune/configuration/device-firmware-configuration-interface-windows#assign-the-profiles-and-reboot) for details.
74+
See [Create the profiles](/mem/intune/configuration/device-firmware-configuration-interface-windows#create-the-profiles) and [Assign the profiles, and reboot](/mem/intune/configuration/device-firmware-configuration-interface-windows#assign-the-profiles-and-reboot) for details.
7575

76-
The existing [DFCI settings](/intune/configuration/device-firmware-configuration-interface-windows#update-existing-dfci-settings) can also be changed on devices that are in use. In the existing DFCI profile, change the settings and save the changes. Since the profile is already assigned, the new DFCI settings take effect when next time the device syncs or the device reboots.
76+
The existing [DFCI settings](/mem/intune/configuration/device-firmware-configuration-interface-windows#update-existing-dfci-settings) can also be changed on devices that are in use. In the existing DFCI profile, change the settings and save the changes. Since the profile is already assigned, the new DFCI settings take effect when next time the device syncs or the device reboots.
7777

7878
To identify whether a device is DFCI ready, the following Intune Graph API call can be used:
7979

autopilot/enrollment-status.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ An administrator can deploy ESP profiles to a licensed Intune user and configure
3333
- Allow users to collect troubleshooting logs.
3434
- Specify what a user can do if device setup fails.
3535

36-
For more information, see [Set up the Enrollment Status Page](/intune/windows-enrollment-status).
36+
For more information, see [Set up the Enrollment Status Page](/mem/intune/enrollment/windows-enrollment-status).
3737

3838
:::image type="content" source="images/enrollment-status-page.png" alt-text="Screenshot that shows Enrollment Status Page":::
3939

autopilot/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,5 @@ For a tutorial with detailed instructions on configuring Windows Autopilot, see
8484

8585
## Related content
8686

87-
- [Enroll Windows devices in Intune by using Windows Autopilot](/intune/enrollment-autopilot).
87+
- [Enroll Windows devices in Intune by using Windows Autopilot](enrollment-autopilot.md).
8888
- [Windows Autopilot scenarios and capabilities](windows-autopilot-scenarios.md).

autopilot/requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ To provide needed Microsoft Entra ID and MDM functionality, including automatic
239239
240240
> [!NOTE]
241241
>
242-
> When a Microsoft 365 subscription is used, licenses still need to be assigned to users so they can enroll device in Intune. For more information, see [assign licenses to users so they can enroll devices in Intune](/intune/fundamentals/licenses-assign).
242+
> When a Microsoft 365 subscription is used, licenses still need to be assigned to users so they can enroll device in Intune. For more information, see [assign licenses to users so they can enroll devices in Intune](/mem/intune/fundamentals/licenses-assign).
243243
244244
Additionally, the following are also recommended (but not required):
245245

autopilot/windows-autopilot-reset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ On the device where the local Windows Autopilot reset is being performed:
123123

124124
An MDM service such a Microsoft Intune can be used to start the remote Windows Autopilot reset process. Resetting in this way avoids the need for IT staff to visit each machine to start the process.
125125

126-
To enable a device for a remote Windows Autopilot Reset, the device must be MDM managed and joined to Microsoft Entra ID. Additionally, for Intune, the Intune Service Administrator role is required for remote Windows Autopilot Reset. For more information, see [Add users and grant administrative permission to Intune](/intune/users-add).
126+
To enable a device for a remote Windows Autopilot Reset, the device must be MDM managed and joined to Microsoft Entra ID. Additionally, for Intune, the Intune Service Administrator role is required for remote Windows Autopilot Reset. For more information, see [Add users and grant administrative permission to Intune](/mem/intune/fundamentals/users-add).
127127

128128
### Triggering a remote Windows Autopilot Reset
129129

memdocs/analytics/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can enroll devices via Configuration Manager or Microsoft Intune.
4545
- Pro, Pro Education, Enterprise, or Education. Home and long-term servicing channel (LTSC) aren't supported.
4646
- Windows devices must be Microsoft Entra joined or Microsoft Entra hybrid joined. Workplace joined or Microsoft Entra registered devices aren't supported.
4747
- Network connectivity from devices to the Microsoft public cloud. For more information, see [endpoints](troubleshoot.md#bkmk_endpoints).
48-
- The [Intune Service Administrator role](/intune/fundamentals/role-based-access-control) is required to [start gathering data](enroll-intune.md#bkmk_onboard).
48+
- The [Intune Service Administrator role](/mem/intune/fundamentals/role-based-access-control) is required to [start gathering data](enroll-intune.md#bkmk_onboard).
4949
- After the administrator selects **Start** for gathering data, other read-only roles can view the data.
5050

5151
### <a name="bkmk_cm_prereq"></a> How to enroll devices via Configuration Manager

memdocs/configmgr/apps/deploy-use/link-users-and-devices-with-user-device-affinity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,4 @@ When you disable the client setting to **Automatically configure user device aff
140140

141141
## Next steps
142142

143-
You can also use Microsoft Intune to find the primary use of an enrolled device. For more information, see [Find the primary user of an Intune device](/intune/find-primary-user) in the Intune documentation.
143+
You can also use Microsoft Intune to find the primary use of an enrolled device. For more information, see [Find the primary user of an Intune device](/mem/intune/remote-actions/find-primary-user) in the Intune documentation.

memdocs/configmgr/comanage/how-to-monitor.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ There are hundreds of possible errors. The following table lists the most common
9393

9494
| Error | Description |
9595
|---------|---------|
96-
| 2147549183 (0x8000FFFF) | MDM enrollment hasn't been configured yet on Microsoft Entra ID, or the enrollment URL isn't expected.<br><br>[Enable automatic enrollment](/intune/windows-enroll#enable-windows-automatic-enrollment) |
97-
| 2149056536 (0x80180018)<br>MENROLL_E_USERLICENSE | License of user is in bad state blocking enrollment<br><br>[Assign licenses to users](/intune/licenses-assign) |
96+
| 2147549183 (0x8000FFFF) | MDM enrollment hasn't been configured yet on Microsoft Entra ID, or the enrollment URL isn't expected.<br><br>[Enable automatic enrollment](/mem/intune/enrollment/windows-enroll#enable-windows-automatic-enrollment) |
97+
| 2149056536 (0x80180018)<br>MENROLL_E_USERLICENSE | License of user is in bad state blocking enrollment<br><br>[Assign licenses to users](/mem/intune/fundamentals/licenses-assign) |
9898
| 2149056555 (0x8018002B)<br>MENROLL_E_MDM_NOT_CONFIGURED | When trying to automatically enroll to Intune, but the Microsoft Entra configuration isn't fully applied. This issue should be transient, as the device retries after a short time. |
9999
| 2149056554 (0x‭8018002A‬)<br>&nbsp; | The user canceled the operation<br><br>If MDM enrollment requires multi-factor authentication, and the user hasn't signed in with a supported second factor, Windows displays a toast notification to the user to enroll. If the user doesn't respond to toast notification, this error occurs. This issue should be transient, as Configuration Manager will retry and prompt the user. Users should use multi-factor authentication when they sign in to Windows. Also educate them to expect this behavior, and if prompted, take action. |
100100
| 2149056532 (0x80180014)<br>MENROLL_E_DEVICENOTSUPPORTED | Mobile device management isn't supported. Check device restrictions. |

memdocs/configmgr/compliance/deploy-use/upgrade-windows-version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ If the following error appears in **DcmWmiProvider.log** on the client, check th
102102

103103
- [Windows 10 edition upgrade](/windows/deployment/upgrade/windows-10-edition-upgrades)
104104

105-
- [Upgrade Windows 10 editions or switch out of S mode on devices using Microsoft Intune](/intune/edition-upgrade-configure-windows-10)
105+
- [Upgrade Windows 10 editions or switch out of S mode on devices using Microsoft Intune](/mem/intune/configuration/edition-upgrade-configure-windows-10)

0 commit comments

Comments
 (0)