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

This commit is contained in:
LizRoss 2016-06-09 10:00:22 -07:00
commit 3f47bde93f

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>