Skip to content

Commit 12d291c

Browse files
committed
fix merge conflict
2 parents 2cebb6d + 82de875 commit 12d291c

2,781 files changed

Lines changed: 18857 additions & 17946 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.

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ 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

2020
## Autopilot automatic device diagnostics collection
2121
<!--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 and logs may include user identifiable information such as user name 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.
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.
2323

2424
For more information, see [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md).
2525

memdocs/configmgr/compliance/deploy-use/browser-profiles.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
title: Configure Microsoft Edge settings
33
titleSuffix: Configuration Manager
44
description: Configure settings for the Microsoft Edge Legacy web browser on Windows 10 clients
5-
author: mestew
6-
ms.author: mstewart
7-
manager: dougeby
5+
author: sheetg09
6+
ms.author: sheetg
7+
manager: apoorvseth
88
ms.date: 03/02/2021
99
ms.topic: how-to
1010
ms.prod: configuration-manager
1111
ms.technology: configmgr-compliance
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aczechowski
1315
---
1416

1517
# Configure Microsoft Edge Legacy settings in Configuration Manager

memdocs/configmgr/compliance/deploy-use/create-child-configuration-items.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 05/07/2019
66
ms.prod: configuration-manager
77
ms.technology: configmgr-compliance
88
ms.topic: conceptual
9-
author: mestew
10-
manager: dougeby
11-
ms.author: mstewart
9+
author: sheetg09
10+
manager: apoorvseth
11+
ms.author: sheetg
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aczechowski
1315
---
1416
# How to create child configuration items in Configuration Manager
1517

memdocs/configmgr/compliance/deploy-use/create-configuration-baselines.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 03/10/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-compliance
88
ms.topic: conceptual
9-
author: mestew
10-
manager: dougeby
11-
ms.author: mstewart
9+
author: sheetg09
10+
manager: apoorvseth
11+
ms.author: sheetg
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aczechowski
1315
---
1416
# Create configuration baselines in Configuration Manager
1517

memdocs/configmgr/compliance/deploy-use/create-configuration-items-for-mac-os-x-devices-managed-with-the-client.md

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

1517
# Create configuration items for macOS X devices

memdocs/configmgr/compliance/deploy-use/create-configuration-items-for-windows-10-devices-managed-with-the-client.md

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

1517
# Create configuration items for Windows 10 or later devices

memdocs/configmgr/compliance/deploy-use/create-configuration-items.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 10/05/2021
66
ms.prod: configuration-manager
77
ms.technology: configmgr-compliance
88
ms.topic: conceptual
9-
author: mestew
10-
manager: dougeby
11-
ms.author: mstewart
9+
author: sheetg09
10+
manager: apoorvseth
11+
ms.author: sheetg
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aczechowski
1315
---
1416
# Create configuration items in Configuration Manager
1517

memdocs/configmgr/compliance/deploy-use/create-custom-configuration-items-for-windows-desktop-and-server-computers-managed-with-the-client.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ ms.date: 08/12/2022
66
ms.prod: configuration-manager
77
ms.technology: configmgr-compliance
88
ms.topic: conceptual
9-
author: mestew
10-
ms.author: mstewart
11-
manager: dougeby
9+
author: sheetg09
10+
ms.author: sheetg
11+
manager: apoorvseth
1212
ms.localizationpriority: medium
13+
ms.collection: tier3
14+
ms.reviewer: mstewart,aczechowski
1315
---
1416

1517
# Create custom configuration items for Windows desktop and server computers managed with the Configuration Manager client

memdocs/configmgr/compliance/deploy-use/create-remote-connection-profiles.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ ms.date: 01/06/2020
66
ms.prod: configuration-manager
77
ms.technology: configmgr-compliance
88
ms.topic: conceptual
9-
author: mestew
10-
manager: dougeby
11-
ms.author: mstewart
9+
ms.author: banreetkaur
10+
author: banreet
1211
ms.localizationpriority: medium
12+
ms.collection: tier3
13+
ms.reviewer: mstewart,aczechowski
1314
---
1415

1516
# Remote connection profiles in Configuration Manager

0 commit comments

Comments
 (0)