diff --git a/education/windows/windows-automatic-redeployment.md b/education/windows/windows-automatic-redeployment.md index 39491d7afb..cbd112c228 100644 --- a/education/windows/windows-automatic-redeployment.md +++ b/education/windows/windows-automatic-redeployment.md @@ -72,7 +72,7 @@ Windows Automatic Redeployment is a two-step process: trigger it and then authen After reset, the device: - Sets the region, language, and keyboard. - Connects to Wi-Fi. - - Applies the provisioning package, if you created one, and replies this to the device. This includes re-installing any apps that are part of the provisioning package. + - If you provided a provisioning package when Windows Automatic Redeployment is triggered, the system will apply this new provisioning package. Otherwise, the system will re-apply the original provisioning package on the device. - Is returned to a known good managed state, connected to Azure AD and MDM. ![Notification that provisioning is complete](images/windows-automatic-redeployment-provisioningcomplete.png) diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md index e98e9e3167..5d76a400ab 100644 --- a/windows/deployment/upgrade/windows-10-edition-upgrades.md +++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md @@ -24,7 +24,7 @@ X = unsupported
✔ (green) = supported; reboot required
✔ (blue) = supported; no reboot required - + + +| Edition upgrade | Using mobile device management (MDM) | Using a provisioning package | Using a command-line tool | Using Microsoft Store for Business or PC | Entering a product key manually | Purchasing a license from the Microsoft Store | +|-----------------|--------------------------------------|------------------------------|---------------------------|---------------------------------------|-------------------------------------|-----------------------------------------------| +| **Home > Pro** | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | +| **Home > Pro for Advanced PCs** | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | +| **Home > Pro Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **Home > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **S > Pro** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | [not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | +| **S > Pro for Advanced PCs** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | [not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | +| **S > Pro Education** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | [not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | [not supported](../images/x_blk.png) | +| **S > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **S > Enterprise** | ![supported, no reboot](../images/check_blu.png) (version 1709) | ![supported, no reboot](../images/check_blu.png) (version 1709) | [not supported](../images/x_blk.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) (version 1709) | [not supported](../images/x_blk.png) | +| **Pro > Pro for Advanced PCs** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (MSfB) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | +| **Pro > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **Pro > Enterprise** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro for Advanced PCs > Pro Education** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro for Advanced PCs > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **Pro for Advanced PCs > Enterprise** | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) | ![supported, no reboot](../images/check_blu.png) (version 1703 - PC), (version 1709 - MSfB) | ![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | +| **Pro Education > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **Enterprise > Education** | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png) | ![supported, reboot required](../images/check_grn.png)) (MSfB) | ![supported, reboot required](../images/check_grn.png) | [not supported](../images/x_blk.png) | +| **Mobile > Mobile Enterprise** | ![supported, no reboot](../images/check_blu.png) |![supported, no reboot](../images/check_blu.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | [not supported](../images/x_blk.png) | + +> [!NOTE] +> Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods. ->**Note**: Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods. ## Upgrade using mobile device management (MDM) - To upgrade desktop editions of Windows 10 using MDM, you'll need to enter the product key for the upgraded edition in the **UpgradeEditionWithProductKey** policy setting of the **WindowsLicensing** CSP. For more info, see [WindowsLicensing CSP](https://go.microsoft.com/fwlink/p/?LinkID=690907).