deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-17 11:23:45 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov

Browse Source 
# Conflicts:
#	education/windows/TOC.md
This commit is contained in:
jdeckerMS
2016-06-10 12:44:58 -07:00
parent 9ecbd4f138 8623311edd
commit c3707d3728
25 changed files with 409 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
windows/deploy/TOC.md
View File

@ -1,5 +1,3 @@
# [What's new in Windows 10](../whats-new/index.md)
# [Plan for Windows 10 deployment](../plan/index.md)
# [Deploy Windows 10](index.md)
## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
@ -137,6 +135,4 @@
###### [Recognized Environment Variables](usmt-recognized-environment-variables.md)
###### [XML Elements Library](usmt-xml-elements-library.md)
##### [Offline Migration Reference](offline-migration-reference.md)
## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)
# [Keep Windows 10 secure](../keep-secure/index.md)
# [Manage and update Windows 10](../manage/index.md)
## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)

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.
For Windows 10 current version numbers by servicing option see: [Windows 10 release information](https://technet.microsoft.com/en-us/windows/mt679505.aspx).
**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.
 

14
windows/manage/troubleshoot-windows-store-for-business.md
View File

@ -32,24 +32,28 @@ The private store for your organization is a page in the Windows Store app that
1. Click the people icon in Windows Store app, and click **Sign in**.
![](images/wsfb-wsappsignin.png)
![Sign in to Store app with a different account](images/wsfb-wsappsignin.png)
2. Click **Add account**, and then click **Work or school account**.
![](images/wsfb-wsappaddacct.png)
![Choose an account to use](images/wsfb-wsappaddacct.png)
3. Type the email account and password, and click **Sign in**.
![](images/wsfb-wsappworkacct.png)
![Sign in for work or school account](images/wsfb-wsappworkacct.png)
4. You should see the private store for your organization. In our example, the page is named **Contoso publishing**.
![](images/wsfb-wsappprivatestore.png)
![Private store with name highlighted](images/wsfb-wsappprivatestore.png)
Click the private store to see apps in your private store.
![](images/wsfb-privatestoreapps.png)
![Private store for Contoso publishing](images/wsfb-privatestoreapps.png)
## Still having trouble?
If you are still having trouble using WSfB or installing the app, you can get more help on our [Support page](http://go.microsoft.com/fwlink/?LinkID=799757).
 
 

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.
 
Table 7. Windows 10 Mobile hardware restrictions
| Setting | Description |
|--------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
| Allow NFC | Whether the NFC radio is enabled |
@ -1058,7 +1059,7 @@ Table 20. Windows 10 Mobile Enterprise update management settings
</tr>
<tr class="odd">
<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 class="even">
<td align="left">Pause update deferrals</td>