diff --git a/windows/client-management/mdm/configuration-service-provider-reference.md b/windows/client-management/mdm/configuration-service-provider-reference.md index 9faccd5f60..8f8ef0ecd3 100644 --- a/windows/client-management/mdm/configuration-service-provider-reference.md +++ b/windows/client-management/mdm/configuration-service-provider-reference.md @@ -2672,7 +2672,7 @@ The following list shows the configuration service providers supported in Window | Configuration service provider | Windows Holographic edition | Windows Holographic for Business edition | |--------|--------|------------| | [AccountManagement CSP](accountmanagement-csp.md) |  | 4 | -| [Accounts CSP](accounts-csp) |  |  +| [Accounts CSP](accounts-csp.md) |  |  | [AppLocker CSP](applocker-csp.md) |  |  | | [AssignedAccess CSP](assignedaccess-csp.md) |  | 4 | | [CertificateStore CSP](certificatestore-csp.md) |  | | diff --git a/windows/client-management/mdm/policy-configuration-service-provider.md b/windows/client-management/mdm/policy-configuration-service-provider.md index b24b2e6b11..00d74b6472 100644 --- a/windows/client-management/mdm/policy-configuration-service-provider.md +++ b/windows/client-management/mdm/policy-configuration-service-provider.md @@ -5030,7 +5030,7 @@ The following diagram shows the Policy configuration service provider in tree fo - [Update/ScheduledInstallDay​](#update-scheduledinstallday) - [Update/ScheduledInstallTime](#update-scheduledinstalltime) - [Update/UpdateServiceUrl](#update-updateserviceurl) -- [Wifi/AllowManualWiFiConfiguration](policy-csp-wifi#wifi-allowmanualwificonfiguration) +- [Wifi/AllowManualWiFiConfiguration](policy-csp-wifi.md#wifi-allowmanualwificonfiguration) ## Policies supported by Windows Holographic @@ -5076,7 +5076,7 @@ The following diagram shows the Policy configuration service provider in tree fo - [Update/ScheduledInstallTime](#update-scheduledinstalltime) - [Update/UpdateServiceUrl](#update-updateserviceurl) - [Update/RequireDeferUpgrade](#update-requiredeferupgrade) -- [Wifi/AllowManualWiFiConfiguration](policy-csp-wifi#wifi-allowmanualwificonfiguration) +- [Wifi/AllowManualWiFiConfiguration](policy-csp-wifi.md#wifi-allowmanualwificonfiguration) diff --git a/windows/deployment/windows-autopilot/TOC.md b/windows/deployment/windows-autopilot/TOC.md index 32da345a29..35cd9c6cba 100644 --- a/windows/deployment/windows-autopilot/TOC.md +++ b/windows/deployment/windows-autopilot/TOC.md @@ -13,14 +13,15 @@ ### [Windows Autopilot Reset](windows-autopilot-reset.md) #### [Remote reset](windows-autopilot-reset-remote.md) #### [Local reset](windows-autopilot-reset-local.md) -## Administering Autopilot +## [Administering Autopilot](administer.md) ### [Configuring](configure-autopilot.md) #### [Adding devices](add-devices.md) #### [Creating profiles](profiles.md) #### [Enrollment status page](enrollment-status.md) #### [BitLocker encryption](bitlocker.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 Partner Center](https://docs.microsoft.com/en-us/partner-center/autopilot) ### [Administering Autopilot via Microsoft Intune](https://docs.microsoft.com/intune/enrollment-autopilot) +### [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 365 Business & Office 365 Admin portal](https://support.office.com/article/Create-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa) ## Getting started ### [Demonstrate Autopilot deployment on a VM](demonstrate-deployment-on-vm.md) diff --git a/windows/deployment/windows-autopilot/administer.md b/windows/deployment/windows-autopilot/administer.md new file mode 100644 index 0000000000..e82f02ae16 --- /dev/null +++ b/windows/deployment/windows-autopilot/administer.md @@ -0,0 +1,66 @@ +--- +title: Administering Autopilot +description: A short description of methods for configuring Autopilot +keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune +ms.prod: w10 +ms.mktglfcycl: deploy +ms.localizationpriority: low +ms.sitesec: library +ms.pagetype: deploy +author: greg-lindsay +ms.author: greg-lindsay +--- + +# Administering Autopilot + +**Applies to: Windows 10** + +Several platforms are available to register devices with Windows Autopilot. A summary of each platform's capabilities is provided below. + +
Platform/Portal + | Register devices? + | Create/Assign profile + | Acceptable DeviceID + |
OEM Direct API | +YES - 1000 at a time max | +NO | +Tuple or PKID | +
Partner Center | +YES - 1000 at a time max\* | +YES | +Tuple or PKID or 4K HH | +
Intune | +YES - 175 at a time max | +YES\* | +4K HH | +
Microsoft Store for Business | +YES - 1000 at a time max | +YES | +4K HH | +
Microsoft Business 365 | +YES - 1000 at a time max | +YES | +4K HH | +