diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 78189003c5..e8aa9bae33 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -13891,6 +13891,11 @@
"redirect_document_id": true
},
{
+"source_path": "windows/deployment/windows-autopilot/windows-10-autopilot.md",
+"redirect_url": "/windows/deployment/windows-autopilot/windows-autopilot",
+"redirect_document_id": true
+},
+{
"source_path": "windows/privacy/manage-windows-endpoints.md",
"redirect_url": "/windows/privacy/manage-windows-1809-endpoints",
"redirect_document_id": true
diff --git a/windows/deployment/index.yml b/windows/deployment/index.yml
index 0161bd05b1..826492af20 100644
--- a/windows/deployment/index.yml
+++ b/windows/deployment/index.yml
@@ -60,7 +60,7 @@ sections:
Windows 10 upgrade options are discussed and information is provided about planning, testing, and managing your production deployment.
Topic | Description | |||||||
[Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md) | Windows Autopilot deployment is a new cloud service from Microsoft that provides a zero touch experience for deploying Windows 10 devices. | +|||||||
[Overview of Windows Autopilot](windows-autopilot/windows-autopilot.md) | Windows Autopilot deployment is a new cloud service from Microsoft that provides a zero touch experience for deploying Windows 10 devices. | |||||||
[Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) | This topic provides information about support for upgrading directly to Windows 10 from a previous operating system. | |||||||
[Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) | This topic provides information about support for upgrading from one edition of Windows 10 to another. | |||||||
[Windows 10 volume license media](windows-10-media.md) | This topic provides information about media available in the Microsoft Volume Licensing Service Center. | diff --git a/windows/deployment/windows-autopilot/TOC.md b/windows/deployment/windows-autopilot/TOC.md index e16013f4db..dd630b65e0 100644 --- a/windows/deployment/windows-autopilot/TOC.md +++ b/windows/deployment/windows-autopilot/TOC.md @@ -1,16 +1,15 @@ # [Windows Autopilot](windows-autopilot.md) ## [Requirements](windows-autopilot-requirements.md) ### [Configuration requirements](windows-autopilot-requirements-configuration.md) +#### [Intune Connector (preview)](intune-connector.md) ### [Network requirements](windows-autopilot-requirements-network.md) ### [Licensing requirements](windows-autopilot-requirements-licensing.md) -### [Intune Connector (preview)](intune-connector.md) ## [Scenarios and Capabilities](windows-autopilot-scenarios.md) ### [Support for existing devices](existing-devices.md) ### [User-driven mode](user-driven.md) #### [Azure Active Directory joined](user-driven-aad.md) #### [Hybrid Azure Active Directory joined](user-driven-hybrid.md) ### [Self-deploying mode](self-deploying.md) -### [Enrollment status page](enrollment-status.md) ### [Windows Autopilot Reset](windows-autopilot-reset.md) #### [Remote reset](windows-autopilot-reset-remote.md) #### [Local reset](windows-autopilot-reset-local.md) @@ -18,6 +17,7 @@ ### [Configuring](configure-autopilot.md) #### [Adding devices](add-devices.md) #### [Creating profiles](profiles.md) +#### [Enrollment status page](enrollment-status.md) ### [Administering Autopilot via Microsoft Store for Business](https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles) ### [Administering Autopilot via Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot) ### [Administering Autopilot via Microsoft 365 Business & Office 365 Admin portal](https://support.office.com/article/Create-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa) diff --git a/windows/deployment/windows-autopilot/configure-autopilot.md b/windows/deployment/windows-autopilot/configure-autopilot.md index 7444e0b565..1913e60393 100644 --- a/windows/deployment/windows-autopilot/configure-autopilot.md +++ b/windows/deployment/windows-autopilot/configure-autopilot.md @@ -26,7 +26,10 @@ When deploying new devices using Windows Autopilot, a common set of steps are re 2. [Assign a profile of settings to each device](profiles.md), specifying how the device should be deployed and what user experience should be presented. -3. Boot the device. When the device is connected to a network with internet access, it will contact the Windows Autopilot deployment service to see if the device is registered, and if it is, it will download the profile settings which are used to customize the end user experience. +3. Boot the device. When the device is connected to a network with internet access, it will contact the Windows Autopilot deployment service to see if the device is registered, and if it is, it will download profile settings such as the [Enrollment Status page](enrollment-status.md), which are used to customize the end user experience.|||||||
Show error when installation takes longer than specified number of minutes | Specify the number of minutes to wait for installation to complete. A default value of 60 minutes is entered. | |||||||
Show custom message when an error occurs | A text box is provided where you can specify a custom message to display in case of an installation error. | The default message is displayed: Oh no! Something didn't do what it was supposed to. Please contact your IT department. Allow users to collect logs about installation errors | If there is an installation error, a Collect logs button is displayed. | If the user clicks this button they are asked to choose a location to save the log file MDMDiagReport.cab The Collect logs button is not displayed if there is an installation error.
+ | Block device use until these required apps are installed if they are assigned to the user/device | Choose All or Selected. | If Selected is chosen, a Select apps button is displayed that enables you to choose which apps must be installed prior to enabling device use. |