mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-05-14 14:27:22 +00:00
Merge pull request #5215 from MicrosoftDocs/v-gmoor-fix-pr-5131
Various fixes for PR 5131
This commit is contained in:
Gary Moore
GitHub
commit
ab06bc8e09
@ -14,7 +14,7 @@ ms.date: 06/26/2017
|
||||
|
||||
# Certificate authentication device enrollment
|
||||
|
||||
This section provides an example of the mobile device enrollment protocol using certificate authentication policy. For details about the Microsoft mobile device enrollment protocol for Windows 10, see [\[MS-MDE2\]: Mobile Device Enrollment Protocol Version 2]( https://go.microsoft.com/fwlink/p/?LinkId=619347).
|
||||
This section provides an example of the mobile device enrollment protocol using certificate authentication policy. For details about the Microsoft mobile device enrollment protocol for Windows 10, see [\[MS-MDE2\]: Mobile Device Enrollment Protocol Version 2](https://go.microsoft.com/fwlink/p/?LinkId=619347).
|
||||
|
||||
> [!Note]
|
||||
> To set up devices to use certificate authentication for enrollment, you should create a provisioning package. For more information about provisioning packages, see [Build and apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-create-package).
|
||||
@ -31,7 +31,7 @@ For the list of enrollment scenarios not supported in Windows 10, see [Enrollme
|
||||
|
||||
The following example shows the discovery service request.
|
||||
|
||||
``` syntax
|
||||
```xml
|
||||
POST /EnrollmentServer/Discovery.svc HTTP/1.1
|
||||
Content-Type: application/soap+xml; charset=utf-8
|
||||
User-Agent: Windows Enrollment Client
|
||||
@ -71,7 +71,7 @@ Cache-Control: no-cache
|
||||
|
||||
The following example shows the discovery service response.
|
||||
|
||||
```
|
||||
```xml
|
||||
HTTP/1.1 200 OK
|
||||
Content-Length: 865
|
||||
Content-Type: application/soap+xml; charset=utf-8
|
||||
@ -111,7 +111,7 @@ http://schemas.microsoft.com/windows/management/2012/01/enrollment/IDiscoverySer
|
||||
|
||||
The following example shows the policy web service request.
|
||||
|
||||
```
|
||||
```xml
|
||||
POST /ENROLLMENTSERVER/DEVICEENROLLMENTWEBSERVICE.SVC HTTP/1.1
|
||||
Content-Type: application/soap+xml; charset=utf-8
|
||||
User-Agent: Windows Enrollment Client
|
||||
@ -183,7 +183,7 @@ Cache-Control: no-cache
|
||||
|
||||
The following snippet shows the policy web service response.
|
||||
|
||||
```
|
||||
```xml
|
||||
HTTP/1.1 200 OK
|
||||
Date: Fri, 03 Aug 2012 20:00:00 GMT
|
||||
Server: <server name here>
|
||||
@ -261,7 +261,7 @@ Content-Length: xxxx
|
||||
|
||||
The following example shows the enrollment web service request.
|
||||
|
||||
```
|
||||
```xml
|
||||
POST /EnrollmentServer/DeviceEnrollmentWebService.svc HTTP/1.1
|
||||
Content-Type: application/soap+xml; charset=utf-8
|
||||
User-Agent: Windows Enrollment Client
|
||||
@ -369,7 +369,7 @@ http://schemas.microsoft.com/5.0.0.0/ConfigurationManager/Enrollment/DeviceEnrol
|
||||
|
||||
The following example shows the enrollment web service response.
|
||||
|
||||
```
|
||||
```xml
|
||||
HTTP/1.1 200 OK
|
||||
Cache-Control: private
|
||||
Content-Length: 10231
|
||||
@ -422,7 +422,7 @@ Date: Fri, 03 Aug 2012 00:32:59 GMT
|
||||
|
||||
The following example shows the encoded provisioning XML.
|
||||
|
||||
```
|
||||
```xml
|
||||
<wap-provisioningdoc version="1.1">
|
||||
<characteristic type="CertificateStore">
|
||||
<characteristic type="Root">
|
||||
|
||||
@ -26,9 +26,13 @@ With Windows 10, you can quickly upgrade from one edition of Windows 10 to ano
|
||||
|
||||
For a list of operating systems that qualify for the Windows 10 Pro Upgrade or Windows 10 Enterprise Upgrade through Microsoft Volume Licensing, see [Windows 10 Qualifying Operating Systems](https://download.microsoft.com/download/2/d/1/2d14fe17-66c2-4d4c-af73-e122930b60f6/Windows10-QOS.pdf).
|
||||
|
||||
The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer. **Note**: The reboot requirement for upgrading from Pro to Enterprise was removed in version 1607.
|
||||
The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer.
|
||||
|
||||
Note: Although it isn't displayed yet in the table, edition upgrade is also possible using [edition upgrade policy](/configmgr/compliance/deploy-use/upgrade-windows-version) in Microsoft Endpoint Configuration Manager.
|
||||
> [!NOTE]
|
||||
> The reboot requirement for upgrading from Pro to Enterprise was removed in version 1607.
|
||||
|
||||
> [!TIP]
|
||||
> Although it isn't displayed yet in the table, edition upgrade is also possible using [edition upgrade policy](/configmgr/compliance/deploy-use/upgrade-windows-version) in Microsoft Endpoint Configuration Manager.
|
||||
|
||||
 (X) = not supported</br>
|
||||
 (green checkmark) = supported, reboot required</br>
|
||||
@ -83,7 +87,7 @@ Use Windows Configuration Designer to create a provisioning package to upgrade a
|
||||
- To create a provisioning package for upgrading mobile editions of Windows 10, go to **Runtime settings > EditionUpgrade > UpgradeEditionWithLicense** in the **Available customizations** panel in Windows ICD and enter the product key for the upgraded edition.
|
||||
|
||||
For more info about Windows Configuration Designer, see these topics:
|
||||
- [Create a provisioining package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package)
|
||||
- [Create a provisioning package for Windows 10](/windows/configuration/provisioning-packages/provisioning-create-package)
|
||||
- [Apply a provisioning package](/windows/configuration/provisioning-packages/provisioning-apply-package)
|
||||
|
||||
|
||||
@ -121,7 +125,8 @@ If you do not have a product key, you can upgrade your edition of Windows 10 th
|
||||
|
||||
3. Follow the on-screen instructions.
|
||||
|
||||
**Note**<br>If you are a Windows 10 Home N or Windows 10 Home KN user and have trouble finding your applicable upgrade in the Microsoft Store, click [here](ms-windows-store://windowsupgrade/).
|
||||
> [!NOTE]
|
||||
> If you are a Windows 10 Home N or Windows 10 Home KN user and have trouble finding your applicable upgrade in the Microsoft Store, click [here](ms-windows-store://windowsupgrade/).
|
||||
|
||||
## License expiration
|
||||
|
||||
@ -129,7 +134,8 @@ Volume license customers whose license has expired will need to change the editi
|
||||
|
||||
Downgrading from any edition of Windows 10 to Windows 7, 8, or 8.1 by entering a different product key is not supported. You also cannot downgrade from a later version to an earlier version of the same edition (Ex: Windows 10 Pro 1709 to 1703) unless the rollback process is used. This topic does not discuss version downgrades.
|
||||
|
||||
Note: If you are using [Windows 10 Enterprise Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation) and a license expires, devices will automatically revert to the original edition when the grace period expires.
|
||||
> [!NOTE]
|
||||
> If you are using [Windows 10 Enterprise Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation) and a license expires, devices will automatically revert to the original edition when the grace period expires.
|
||||
|
||||
### Scenario example
|
||||
|
||||
@ -149,21 +155,21 @@ You can move directly from Enterprise to any valid destination edition. In this
|
||||
<br>
|
||||
<table border="0" cellpadding="1">
|
||||
<tr>
|
||||
<td colspan="10" align="center">Destination edition</td>
|
||||
<th colspan="10" align="center">Destination edition</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td></td>
|
||||
<td>Home</td>
|
||||
<td>Pro</td>
|
||||
<td>Pro for Workstations</td>
|
||||
<td>Pro Education</td>
|
||||
<td>Education</td>
|
||||
<td>Enterprise LTSC</td>
|
||||
<td>Enterprise</td>
|
||||
<th> </th>
|
||||
<th> </th>
|
||||
<th>Home</th>
|
||||
<th>Pro</th>
|
||||
<th>Pro for Workstations</th>
|
||||
<th>Pro Education</th>
|
||||
<th>Education</th>
|
||||
<th>Enterprise LTSC</th>
|
||||
<th>Enterprise</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="9" nowrap="nowrap" valign="middle">Starting edition</td>
|
||||
<th rowspan="9" nowrap="nowrap" valign="middle">Starting edition</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Home</td>
|
||||
|
||||
@ -43,16 +43,17 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
|
||||
<table border="0" cellpadding="1">
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td></td>
|
||||
<td>Windows 10 Home</td>
|
||||
<td>Windows 10 Pro</td>
|
||||
<td>Windows 10 Pro Education</td>
|
||||
<td>Windows 10 Education</td>
|
||||
<td>Windows 10 Enterprise</td>
|
||||
<td>Windows 10 Mobile</td>
|
||||
<td> </td>
|
||||
<th>Windows 10 Home</th>
|
||||
<th>Windows 10 Pro</th>
|
||||
<th>Windows 10 Pro Education</th>
|
||||
<th>Windows 10 Education</th>
|
||||
<th>Windows 10 Enterprise</th>
|
||||
<th>Windows 10 Mobile</th>
|
||||
<th>Windows 10 Mobile Enterprise</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="7" nowrap="nowrap">Windows 7</td>
|
||||
<th rowspan="7" nowrap="nowrap">Windows 7</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Starter</td>
|
||||
@ -115,7 +116,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="10" nowrap="nowrap">Windows 8.1</td>
|
||||
<th rowspan="10" nowrap="nowrap">Windows 8.1</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>(Core)</td>
|
||||
@ -208,7 +209,7 @@ D = Edition downgrade; personal data is maintained, applications and settings ar
|
||||
<td>✔</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="8" nowrap="nowrap">Windows 10</td>
|
||||
<th rowspan="8" nowrap="nowrap">Windows 10</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Home</td>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user