deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-12 21:37:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7825061

Browse Source
This commit is contained in:
LizRoss 2016-06-10 09:03:58 -07:00
commit 9081e8ecba
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
windows/manage/introduction-to-windows-10-servicing.md
View File

@ -18,6 +18,8 @@ author: greg-lindsay
This article describes the new servicing options available in Windows 10 and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles. This article describes the new servicing options available in Windows 10 and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles.
For Windows 10 current version numbers by servicing option see: [Windows 10 release information](https://technet.microsoft.com/en-us/windows/mt679505.aspx).
**Note**   **Note**  
Several of the figures in this article show multiple feature upgrades of Windows being released by Microsoft over time. Be aware that these figures were created with dates that were chosen for illustrative clarity, not for release roadmap accuracy, and should not be used for planning purposes. Several of the figures in this article show multiple feature upgrades of Windows being released by Microsoft over time. Be aware that these figures were created with dates that were chosen for illustrative clarity, not for release roadmap accuracy, and should not be used for planning purposes.
   

3
windows/manage/windows-10-mobile-and-mdm.md
View File

@ -373,6 +373,7 @@ Windows 10 Mobile devices use state-of-the-art technology that includes popular
>**Note:**  Some of these hardware restrictions provide connectivity and assist in data protection. Enterprise data protection is currently being tested in select customer evaluation programs. >**Note:**  Some of these hardware restrictions provide connectivity and assist in data protection. Enterprise data protection is currently being tested in select customer evaluation programs.
   
Table 7. Windows 10 Mobile hardware restrictions Table 7. Windows 10 Mobile hardware restrictions
| Setting | Description | | Setting | Description |
|--------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------| |--------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
| Allow NFC | Whether the NFC radio is enabled | | Allow NFC | Whether the NFC radio is enabled |
@ -1058,7 +1059,7 @@ Table 20. Windows 10 Mobile Enterprise update management settings
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td align="left">Nonsecurity upgrades deferred</td> <td align="left">Nonsecurity upgrades deferred</td>
<td align="left">Whether nonsecurity upgrades are deferred (You can defer upgrades up to 8 months.)</td> <td align="left">Whether nonsecurity upgrades are deferred (You can defer upgrades up to 4 weeks.)</td>
</tr> </tr>
<tr class="even"> <tr class="even">
<td align="left">Pause update deferrals</td> <td align="left">Pause update deferrals</td>