Skip to content

Commit 5196bcd

Browse files
committed
Conflict due to Merging Main
2 parents e40736e + 94fa0b7 commit 5196bcd

3,244 files changed

Lines changed: 21060 additions & 19695 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1216,6 +1216,11 @@
12161216
"source_path": "memdocs/analytics/productivity-score.md",
12171217
"redirect_url": "/mem/analytics/adoption-score",
12181218
"redirect_document_id": false
1219-
}
1219+
},
1220+
{
1221+
"source_path": "memdocs/intune/fundamentals/multi-admin-approval.md",
1222+
"redirect_url": "/mem/intune/fundamentals/whats-new",
1223+
"redirect_document_id": false
1224+
}
12201225
]
12211226
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ We **want and encourage contributions** from our community (users, customers, pa
1515

1616
* **Use your browser**: There are two options:
1717

18-
**Option 1: Edit directly from Microsoft Docs**
18+
**Option 1: Edit directly from Microsoft Learn**
1919

2020
1. Browse to the [InTune](/mem/intune) article you want to edit.
2121
2. Select **Edit** (top right). This shows the markdown file in the GitHub repository.

memdocs/autopilot/autopilot-mbr.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
---
22
title: Windows Autopilot motherboard replacement
3-
description: Windows Autopilot deployment Motherboard Replacement (MBR) scenarios
4-
keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
5-
ms.prod: w10
6-
ms.mktglfcycl: deploy
3+
description: Understand how Windows Autopilot deployments function when you replace the motherboard on a device.
4+
ms.prod: windows-client
5+
ms.technology: itpro-deploy
76
ms.localizationpriority: medium
8-
ms.sitesec: library
9-
ms.pagetype: deploy
10-
audience: itpro
117
author: aczechowski
128
ms.author: aaroncz
139
ms.reviewer: jubaptis
1410
manager: dougeby
15-
ms.date: 10/10/2021
11+
ms.date: 09/23/2022
1612
ms.collection: M365-modern-desktop
1713
ms.topic: how-to
1814
---
@@ -24,17 +20,17 @@ ms.topic: how-to
2420
- Windows 11
2521
- Windows 10
2622

27-
This document offers guidance for Windows Autopilot device repair scenarios that Microsoft partners can use in Motherboard Replacement (MBR) situations, and other servicing scenarios.
23+
This document offers guidance for Windows Autopilot device repair scenarios that Microsoft partners can use in motherboard replacement (MBR) situations, and other servicing scenarios.
2824

2925
Repairing Autopilot enrolled devices is complex, as it tries to balance OEM requirements with Windows Autopilot requirements. Specifically, OEM requirements include strict uniqueness across motherboards, MAC addresses, and so on. Windows Autopilot requires strict uniqueness at the hardware hash level for each device to enable successful registration. The hardware hash doesn't always accommodate all the OEM hardware component requirements. So these requirements are sometimes at odds, causing issues with some repair scenarios. The hardware hash is also known as the hardware ID.
3026

31-
**Motherboard Replacement (MBR)**
27+
Starting in the September 2022 release of Intune (2209), if a motherboard is replaced on an Autopilot registered device, and it goes back to the same tenant without an OS reset, Autopilot will attempt to register the new hardware components. In Intune, you'll see the profile status **Fix pending**. If the OEM resets the OS, you need to re-register the device. If the new hardware components are registered, the device status goes back to the assigned profile. If it's not, you'll see the profile status **Attention required**.
3228

3329
If a motherboard replacement is needed on a Windows Autopilot device, the following process is recommended:
3430

35-
1. [Deregister the device](#deregister-the-autopilot-device-from-the-autopilot-program) from Windows Autopilot
31+
1. If the device isn't going back to the original tenant, [deregister it from Windows Autopilot](#deregister-the-autopilot-device-from-the-autopilot-program). If it's going back to the same tenant, you don't need to deregister it.
3632
2. [Replace the motherboard](#replace-the-motherboard)
37-
3. [Capture a new device ID (4K HH)](#capture-a-new-autopilot-device-id-4k-hh-from-the-device)
33+
3. If the device needs to be re-registered because of a re-image or will be used by a new tenant, [capture a new device ID (4K HH)](#capture-a-new-autopilot-device-id-4k-hh-from-the-device).
3834
4. [Reregister the device](#reregister-the-repaired-device-using-the-new-device-id) with Windows Autopilot
3935
5. [Reset the device](#reset-the-device)
4036
6. [Return the device](#return-the-repaired-device-to-the-customer)

memdocs/autopilot/registration-overview.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
---
22
title: Windows Autopilot registration overview
33
description: Overview of Windows Autopilot device registration
4-
keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
5-
ms.prod: w10
6-
ms.mktglfcycl: deploy
4+
ms.prod: windows-client
5+
ms.technology: itpro-deploy
76
ms.localizationpriority: medium
8-
ms.sitesec: library
9-
ms.pagetype: deploy
10-
audience: itpro
117
author: aczechowski
128
ms.author: aaroncz
139
ms.reviewer: jubaptis
@@ -44,6 +40,16 @@ Registration can also be performed within your organization by collecting the ha
4440
- [Automatic registration](automatic-registration.md)
4541
- [Manual registration](manual-registration.md)
4642

43+
When you register an Autopilot device, it automatically creates an Azure AD object. The Autopilot deployment process needs this object to identify the device before the user signs in. If you delete this object, the device can fail to enroll through Autopilot. If the device is registered and not enrolled after 180 days, you'll need to re-register the device to complete a successful deployment.
44+
45+
> [!NOTE]
46+
> Don't register to Autopilot the following types of devices:
47+
>
48+
> - [Azure AD registered](/azure/active-directory/devices/concept-azure-ad-register), also known as "workplace joined"
49+
> - [Intune MDM-only enrollment](/mem/intune/enrollment/windows-enrollment-methods#user-self-enrollment-in-intune)
50+
>
51+
> These options are intended for users to join personally-owned devices to their organization's network.
52+
4753
Once a device is registered in Autopilot if a profile is not assigned, it will receive the default Autopilot profile. If you do not want a device to go through Autopilot, you must remove the Autopilot registration.
4854

4955
## Terms

memdocs/autopilot/troubleshooting.md

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ ms.localizationpriority: medium
99
ms.sitesec: library
1010
ms.pagetype: deploy
1111
audience: itpro
12-
author: aczechowski
13-
ms.author: aaroncz
12+
author: frankroj
13+
ms.author: frankroj
1414
ms.reviewer: jubaptis
15-
manager: dougeby
16-
ms.date: 02/09/2022
15+
manager: aczechowski
16+
ms.date: 10/03/2022
1717
ms.collection: M365-modern-desktop
1818
ms.topic: troubleshooting
1919
---
@@ -33,7 +33,7 @@ Windows Autopilot is designed to simplify all parts of the Windows device lifecy
3333
- [Key activities](#key-troubleshooting-activities) to perform during troubleshooting
3434

3535
## Windows Autopilot diagnostics page
36-
On Windows 11, you can open the Autopilot diagnostic page to view additional detailed troubleshooting information about the Autopilot provisioning process. The diagnostics page can be enabled by going to the ESP profile and selecting **Yes** to **Turn on log collection and diagnostics page for end users**. Once it is enabled you can select the **View Diagnostics button** or the keyboard shortcut Ctrl+Shift+D to access any diagnostic information. The diagnostics page is currently supported for commercial OOBE, and Autopilot user-driven mode.
36+
On Windows 11, you can open the Autopilot diagnostic page to view additional detailed troubleshooting information about the Autopilot provisioning process. The diagnostics page can be enabled by going to the ESP profile and selecting **Yes** to **Turn on log collection and diagnostics page for end users**. Once it is enabled, you can select the **View Diagnostics button**, or the keyboard shortcut Ctrl+Shift+D to access any diagnostic information. The diagnostics page is currently supported for commercial OOBE, and Autopilot user-driven mode.
3737

3838
## Windows Autopilot flow
3939

@@ -48,21 +48,30 @@ Whether you're performing user-driven or self-deploying device deployments, the
4848

4949
## Profile download
5050

51-
When an Internet-connected Windows device boots up, it will attempt to connect to the Autopilot service and download an Autopilot profile. Note: It's important that a profile exists at this stage so that a blank profile isn't cached locally on the PC. To remove the currently cached local profile in Windows 10 version 1803 and earlier, it's necessary to re-generalize the OS using **sysprep /generalize /oobe**, reinstall the OS, or re-image the PC. In Windows 10 version 1809 and later, you can retrieve a new profile by rebooting the PC.
51+
When an Internet-connected Windows device boots up, it will attempt to connect to the Autopilot service and download an Autopilot profile. The Autopilot profile is downloaded as soon as possible, and again after each reboot.
5252

53-
When a profile is downloaded depends upon the version of Windows client that is running on the PC. See the following table.
53+
> [!NOTE]
54+
> At this stage, it's important that an Autopilot profile exists in the tenant so that a blank profile isn't cached locally on the device. If necessary, you can retrieve a new Autopilot profile by rebooting the device.
55+
>
56+
> If you need to reboot a computer during OOBE to retrieve a new Autopilot profile:
57+
> 1. Press Shift-F10 on the keyboard to open a command prompt window.
58+
> 2. In the command prompt window, enter one of the following two options:
59+
> 1. Enter `shutdown.exe /r /t 0` to **restart** immediately.
60+
> 2. Enter `shutdown.exe /s /t 0` to **shut down** immediately.
61+
>
62+
> For more information, see [Windows Setup Command-Line Options](/windows-hardware/manufacture/desktop/windows-setup-command-line-options).
63+
64+
<!-- To remove the currently cached local profile in Windows 10 version 1803 and earlier, it's necessary to re-generalize the OS using **sysprep /generalize /oobe**, reinstall the OS, or re-image the PC. -->
65+
66+
<!-- In Windows 10 version 1809 and later, -->
67+
68+
<!-- When a profile is downloaded depends upon the version of Windows client that is running on the PC. See the following table.
5469
5570
| Windows 10 version | Profile download behavior |
5671
| --- | --- |
5772
| 1709 | The profile is downloaded after the OOBE network connection page. This page isn't displayed when using a wired connection. In this case, the profile is downloaded before the EULA screen. |
5873
| 1803 | The profile is downloaded as soon as possible. If wired, it's downloaded at the start of OOBE. If wireless, it's downloaded after the network connection page. |
59-
| 1809 | The profile is downloaded as soon as possible (same as 1803), and again after each reboot. |
60-
61-
If you need to reboot a computer during OOBE:
62-
- Press Shift-F10 to open a command prompt.
63-
- Enter **shutdown /r /t 0** to restart immediately, or **shutdown /s /t 0** to shut down immediately.
64-
65-
For more information, see [Windows Setup Command-Line Options](/windows-hardware/manufacture/desktop/windows-setup-command-line-options).
74+
| 1809 | The profile is downloaded as soon as possible (same as 1803), and again after each reboot. | -->
6675

6776
## Key troubleshooting activities
6877

@@ -73,15 +82,17 @@ For troubleshooting, key activities to perform are:
7382
- Autopilot out-of-box experience (OOBE) behavior: Are the [expected OOBE](troubleshoot-oobe.md) screens displayed? Is the Azure AD credentials page customized with organization-specific details as expected?
7483
- Azure AD join issues: Is the device able to [join Azure Active Directory](troubleshoot-aad-join.md)?
7584
- MDM enrollment issues: IS the device able to [enroll in Microsoft Intune](troubleshoot-device-enrollment.md) (or an equivalent MDM service)?
85+
- Review logs that are automatically collected upon Autopilot failure. For more information, see [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md). <!--1895390-->
7686

7787
## Next steps
7888

79-
See the following topics for help troubleshooting specific issues:
89+
See the following topics for help with troubleshooting specific issues:
8090

8191
- [Troubleshoot device enrollment](troubleshoot-device-enrollment.md)
8292
- [Troubleshoot OOBE issues](troubleshoot-oobe.md)
8393
- [Troubleshoot AAD join issues](troubleshoot-aad-join.md)
8494
- [Policy conflicts](policy-conflicts.md)
95+
- [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md)
8596
- [Known issues](known-issues.md)
8697

8798
## Related topics

memdocs/autopilot/windows-autopilot-whats-new.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@ description: News and resources about the latest updates and past versions of Wi
44
ms.prod: w10
55
ms.technology: windows
66
ms.localizationpriority: medium
7-
author: aczechowski
8-
ms.author: aaroncz
9-
manager: dougeby
7+
author: frankroj
8+
ms.author: frankroj
9+
manager: aczechowski
1010
ms.reviewer: jubaptis
11-
ms.date: 08/02/2022
11+
ms.date: 09/22/2022
1212
ms.collection:
1313
- M365-modern-desktop
1414
- highpri
15-
ms.topic: article
15+
ms.topic: article
1616
---
1717

1818
# Windows Autopilot: What's new
1919

20+
## Autopilot automatic device diagnostics collection
21+
<!--1895390-->
22+
Starting with Intune 2209, Intune will automatically capture diagnostics when devices experience a failure during the Autopilot process on Windows 10 version 1909 or later and with Windows 11. When logs are finished processing on a failed device, they will be automatically captured and uploaded to Intune. Diagnostics may include user identifiable information such as user or device name. If the logs are not available in Intune, check if the device is powered-on and has access to the internet. Diagnostics are available for 28 days before they are removed.
23+
24+
For more information, see [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md).
25+
2026
## Updates to Autopilot device targeting infrastructure
2127

2228
With Intune 2208 we are updating the Autopilot infrastructure to ensure that the profiles and applications assigned are consistently ready when the devices are deployed. This change reduces the amount of data that needs to be synchronized per-Autopilot device and leverages device lifecycle change events to reduce the amount of time that it takes to recover from device resets for Azure AD and Hybrid Azure AD joined devices. No action is needed to enable this change, it will be rolling out to all clients starting August 2022.

memdocs/configmgr/apps/deploy-use/app-approval.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ author: baladelli
1010
ms.author: baladell
1111
manager: apoorvseth
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aaroncz
1315
---
1416

1517
# Approve applications in Configuration Manager

memdocs/configmgr/apps/deploy-use/check-for-running-executable-files.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 04/05/2021
66
ms.prod: configuration-manager
77
ms.technology: configmgr-app
88
ms.topic: how-to
9-
author: aczechowski
10-
ms.author: aaroncz
11-
manager: dougeby
9+
author: baladelli
10+
ms.author: baladell
11+
manager: apoorvseth
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aaroncz
1315
---
1416

1517
# Check for running executable files

memdocs/configmgr/apps/deploy-use/create-app-groups.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 03/11/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-app
88
ms.topic: how-to
9-
author: aczechowski
10-
ms.author: aaroncz
11-
manager: dougeby
9+
author: baladelli
10+
ms.author: baladell
11+
manager: apoorvseth
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aaroncz
1315
---
1416

1517
# Create application groups

memdocs/configmgr/apps/deploy-use/create-app-v-virtual-environments.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 10/06/2016
66
ms.prod: configuration-manager
77
ms.technology: configmgr-app
88
ms.topic: conceptual
9-
author: aczechowski
10-
ms.author: aaroncz
11-
manager: dougeby
9+
author: baladelli
10+
ms.author: baladell
11+
manager: apoorvseth
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aaroncz
1315
---
1416
# Create App-V virtual environments in Configuration Manager
1517

0 commit comments

Comments
 (0)