mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-06-15 02:13:43 +00:00
Merge branch 'master' of https://cpubwin.visualstudio.com/_git/it-client into replaceplaceholder
This commit is contained in:
jaimeo
@ -20,7 +20,7 @@
|
||||
## [Deploy Windows 10](deploy.md)
|
||||
|
||||
### [Overview of Windows Autopilot](windows-autopilot/windows-10-autopilot.md)
|
||||
|
||||
### [Windows 10 in S mode](windows-10-pro-in-s-mode.md)
|
||||
### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md)
|
||||
#### [Windows 10 downgrade paths](upgrade/windows-10-downgrade-paths.md)
|
||||
### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md)
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.pagetype: mdt
|
||||
ms.sitesec: library
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 10/16/2017
|
||||
---
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ ms.prod: w10
|
||||
ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.pagetype: mdt
|
||||
ms.date: 10/16/2017
|
||||
---
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.prod: w10
|
||||
ms.localizationpriority: high
|
||||
ms.mktglfcycl: deploy
|
||||
ms.sitesec: library
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mdt
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
@ -169,7 +169,6 @@ Figure 32. The ready-made task sequence.
|
||||
|
||||
[Use the MDT database to stage Windows 10 deployment information](use-the-mdt-database-to-stage-windows-10-deployment-information.md)
|
||||
|
||||
|
||||
[Assign applications using roles in MDT](assign-applications-using-roles-in-mdt.md)
|
||||
|
||||
[Use web services in MDT](use-web-services-in-mdt.md)
|
||||
|
||||
@ -8,7 +8,7 @@ ms.prod: w10
|
||||
ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.mktglfcycl: deploy
|
||||
ms.localizationpriority: high
|
||||
ms.pagetype: mdt
|
||||
ms.sitesec: library
|
||||
author: mtniehaus
|
||||
author: greg-lindsay
|
||||
ms.date: 07/27/2017
|
||||
---
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ ms.localizationpriority: high
|
||||
ms.sitesec: library
|
||||
ms.pagetype: mobile
|
||||
author: greg-lindsay
|
||||
ms.date: 02/9/2018
|
||||
ms.date: 04/30/2018
|
||||
---
|
||||
|
||||
# Windows 10 edition upgrade
|
||||
@ -46,11 +46,11 @@ X = unsupported <BR>
|
||||
| **Home > Pro for Workstations** |  |  |  |  |  |  |
|
||||
| **Home > Pro Education** |  |  |  |  |  |  |
|
||||
| **Home > Education** |  |  |  |  |  |  |
|
||||
| **S > Pro** |  <br>(1709) |  <br>(1709) |  |  |  <br>(1709) |  <br>(1709) |
|
||||
<!-- | **S > Pro** |  <br>(1709) |  <br>(1709) |  |  |  <br>(1709) |  <br>(1709) |
|
||||
| **S > Pro for Workstations** |  <br>(1709) |  <br>(1709) |  |  |  <br>(1709) |  <br>(1709) |
|
||||
| **S > Pro Education** |  <br>(1709) |  <br>(1709) |  |  <br>(1709 - MSfB) |  <br>(1709) |  |
|
||||
| **S > Education** |  |  |  |  <br>(MSfB) |  |  |
|
||||
| **S > Enterprise** |  <br>(1709) |  <br>(1709) |  |  <br>(1703 - PC)<br>(1709 - MSfB) |  <br>(1709) |  |
|
||||
| **S > Enterprise** |  <br>(1709) |  <br>(1709) |  |  <br>(1703 - PC)<br>(1709 - MSfB) |  <br>(1709) |  | -->
|
||||
| **Pro > Pro for Workstations** |  |  |  |  <br>(MSfB) |  |  |
|
||||
| **Pro > Pro Education** |  |  |  |  <br>(MSfB) |  |  |
|
||||
| **Pro > Education** |  |  |  |  <br>(MSfB) |  |  |
|
||||
@ -65,9 +65,10 @@ X = unsupported <BR>
|
||||
| **Mobile > Mobile Enterprise** |  | |  |  |  |  |
|
||||
|
||||
> [!NOTE]
|
||||
> Each desktop edition in the table also has an N and KN SKU. These editions have had media-related functionality removed. Devices with N or KN SKUs installed can be upgraded to corresponding N or KN SKUs using the same methods.
|
||||
> - For information about upgrade paths in Windows 10 in S mode (for Pro or Education), check out [Windows 10 Pro/Enterprise in S mode](../windows-10-pro-in-s-mode.md)
|
||||
> - Each desktop edition in the table also has an N and KN SKU. These editions have had media-related functionality removed. Devices with N or KN SKUs installed can be upgraded to corresponding N or KN SKUs using the same methods.
|
||||
> <br>
|
||||
> <br>Due to [naming changes](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#naming-changes) the term LTSB might still be displayed in some products. This name will change to LTSC with subsequent feature updates.
|
||||
> - Due to [naming changes](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#naming-changes) the term LTSB might still be displayed in some products. This name will change to LTSC with subsequent feature updates.
|
||||
|
||||
## 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).
|
||||
|
||||
@ -23,6 +23,7 @@ With Windows 10 version 1703 (also known as the Creator’s Update), both Window
|
||||
Organizations that have an Enterprise agreement can also benefit from the new service, using traditional Active Directory-joined devices. In this scenario, the Active Directory user that signs in on their device must be synchronized with Azure AD using [Azure AD Connect Sync](https://docs.microsoft.com/en-us/azure/active-directory/connect/active-directory-aadconnectsync-whatis).
|
||||
|
||||
See the following topics in this article:
|
||||
- [Inherited Activation](#inherited-activation): Description of a new feature available in Windows 10, version 1803 and later.
|
||||
- [The evolution of Windows 10 deployment](#the-evolution-of-deployment): A short history of Windows deployment.
|
||||
- [Requirements](#requirements): Prerequisites to use the Windows 10 Enterprise subscription model.
|
||||
- [Benefits](#benefits): Advantages of Windows 10 Enterprise + subscription-based licensing.
|
||||
@ -31,6 +32,14 @@ See the following topics in this article:
|
||||
|
||||
For information on how to deploy Windows 10 Enterprise licenses, see [Deploy Windows 10 Enterprise licenses](deploy-enterprise-licenses.md).
|
||||
|
||||
## Inherited Activation
|
||||
|
||||
Inherited Activation is a new feature available in Windows 10, version 1803 that allows Windows 10 virtual machines to inherit activation state from their Windows 10 host.
|
||||
|
||||
When a user with Windows 10 E3 or E5 license assigned creates a new Windows 10 virtual machine (VM) using a Windows 10 local host, the VM inherits the activation state from a host machine independent of whether user signs on with a local account or using an Azure Active Directory (AAD) account on a VM.
|
||||
|
||||
To support Inherited Activation, both the host computer and the VM must be running Windows 10, version 1803 or later.
|
||||
|
||||
## The evolution of deployment
|
||||
|
||||
>The original version of this section can be found at [Changing between Windows SKUs](https://blogs.technet.microsoft.com/mniehaus/2017/10/09/changing-between-windows-skus/).
|
||||
|
||||
@ -730,7 +730,7 @@ The second Windows Server 2012 R2 VHD needs to be expanded in size from 40GB to
|
||||
|
||||
Ignore any warnings that are displayed. The computer will automatically reboot upon completion.
|
||||
|
||||
9. When the reboot has completed, reconnect to DC1, sign in using the CONTOSO\Administrator account, open an elevated Windows PowerShell prompt, and use the following commands to add a reverse lookup zone for the PoC network, add the DHCP Server role, authorize DHCP in Active Directory, and supress the post-DHCP-install alert:
|
||||
9. When the reboot has completed, reconnect to DC1, sign in using the CONTOSO\Administrator account, open an elevated Windows PowerShell prompt, and use the following commands to add a reverse lookup zone for the PoC network, add the DHCP Server role, authorize DHCP in Active Directory, and suppress the post-DHCP-install alert:
|
||||
|
||||
<pre style="overflow-y: visible">
|
||||
Add-DnsServerPrimaryZone -NetworkID "192.168.0.0/24" -ReplicationScope Forest
|
||||
|
||||
Reference in New Issue
Block a user