Merge remote-tracking branch 'refs/remotes/origin/master' into sfb-10181319

This commit is contained in:
Trudy Hakala 2017-01-04 12:31:16 -08:00
commit 5d85a4deb9
3 changed files with 6 additions and 6 deletions

View File

@ -49,7 +49,7 @@ Three features enable Start and taskbar layout control:
- [You can modify the Start .xml file](configure-windows-10-taskbar.md) to include `<CustomTaskbarLayoutCollection>` or create an .xml file just for the taskbar configuration.
- In Group Policy, you use the **Start Layout** settings for the **Start Menu and Taskbar** administrative template to set a Start and taskbar layout from an .xml file when the policy is applied.
- In Group Policy, you use the **Start Layout** settings for the **Start Menu and Taskbar** administrative template to set a Start and taskbar layout from an .xml file when the policy is applied. The Group Policy object doesn't support an empty tile layout, so the default tile layout for Windows is loaded in that case.
>[!NOTE]  
>To learn how customize Start to include your line-of-business apps when you deploy Windows 10, see [Customize the Windows 10 Start layout]( https://go.microsoft.com/fwlink/p/?LinkId=620863).

View File

@ -29,7 +29,7 @@ To be able to use WSUS to manage and deploy Windows 10 feature updates, you must
## WSUS scalability
To use WSUS to manage all Windows updates, some organizations may need access to WSUS from a demilitarized zone, or they might have some other complex scenario. WSUS is highly scalable and configurable for organizations of any size or site layout. For specific information about scaling WSUS, including upstream and downstream server configuration, branch offices, WSUS load balancing, and other complex scenarios, see [Choose a Type of WSUS Deployment](https://technet.microsoft.com/library/cc720448%28v=ws.10%29.aspx).
To use WSUS to manage all Windows updates, some organizations may need access to WSUS from a perimeter network, or they might have some other complex scenario. WSUS is highly scalable and configurable for organizations of any size or site layout. For specific information about scaling WSUS, including upstream and downstream server configuration, branch offices, WSUS load balancing, and other complex scenarios, see [Choose a Type of WSUS Deployment](https://technet.microsoft.com/library/cc720448%28v=ws.10%29.aspx).
## Express Installation Files

View File

@ -238,7 +238,7 @@ Store for Business is currently available in these markets.
<li>Bulgaria</li>
<li>Cameroon</li>
<li>Canada</li>
<li>Cape Verde</li>
<li>Republic of Cabo Verde</li>
<li>Cayman Islands</li>
<li>Chile</li>
<li>Colombia</li>
@ -267,7 +267,7 @@ Store for Business is currently available in these markets.
<li>Greece</li>
<li>Guatemala</li>
<li>Honduras</li>
<li>Hong Kong</li>
<li>Hong Kong SAR</li>
<li>Hungary</li>
<li>Iceland</li>
<li>Indonesia</li>
@ -304,7 +304,7 @@ Store for Business is currently available in these markets.
<li>Norway</li>
<li>Oman</li>
<li>Pakistan</li>
<li>Palestinian Territory</li>
<li>Palestinian Authority</li>
<li>Panama</li>
<li>Paraguay</li>
<li>Peru</li>