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

education/windows/deploy-windows-10-in-a-school-district.md

@@ -627,7 +627,7 @@ Now that you have created your new Office 365 Education subscription, add the do
 
 To make it easier for faculty and students to join your Office 365 Education subscription (or *tenant*), allow them to automatically sign up to your tenant (*automatic tenant join*). In automatic tenant join, when a faculty member or student signs up for Office 365, Office 365 automatically adds (joins) the user to your Office 365 tenant.
 
->**Note**  By default, automatic tenant join is enabled in Office 365 Education, with the exception of certain areas in Europe, the Middle East, and Africa. These countries require opt-in steps to add new users to existing Office 365 tenants. Check your country requirements to determine the automatic tenant join default configuration. Also, if you use Azure AD Connect, then automatic tenant join is disabled. For more information, see [Office 365 Education Self-Sign up: Technical FAQ](https://support.office.com/en-us/article/Office-365-Education-Self-Sign-up-Technical-FAQ-7fb1b2f9-94c2-4cbb-b01e-a6eca34261d6?ui=en-US&rs=en-US&ad=US&WT.mc_id=eml_CXM__33537_MOD_EDU_Student_Advantage_Rush).
+>**Note**  By default, automatic tenant join is enabled in Office 365 Education, with the exception of certain areas in Europe, the Middle East, and Africa. These countries/regions require opt-in steps to add new users to existing Office 365 tenants. Check your country/region requirements to determine the automatic tenant join default configuration. Also, if you use Azure AD Connect, then automatic tenant join is disabled. For more information, see [Office 365 Education Self-Sign up: Technical FAQ](https://support.office.com/en-us/article/Office-365-Education-Self-Sign-up-Technical-FAQ-7fb1b2f9-94c2-4cbb-b01e-a6eca34261d6?ui=en-US&rs=en-US&ad=US&WT.mc_id=eml_CXM__33537_MOD_EDU_Student_Advantage_Rush).
 
 Office 365 uses the domain portion of the user’s email address to know which Office 365 tenant to join. For example, if a faculty member or student provides an email address of user@contoso.edu, then Office 365 automatically performs one of the following tasks:
 

education/windows/windows-10-pro-to-pro-edu-upgrade.md

@@ -131,19 +131,19 @@ Now the device is Azure AD joined to the company’s subscription.
 
 1.  Go to **Settings > Accounts > Access work or school**, as illustrated in **Figure 9**.
 
-    <img src="images/win-10-connect-to-work-or-school.png" alt="Connect to work or school configuration" />
+    <img src="images/win10-connect-to-work-or-school.png" alt="Connect to work or school configuration" />
 
     **Figure 9** - Connect to work or school configuration in Settings
 
 2.  In **Set up a work or school account**, click **Join this device to Azure Active Directory**, as illustrated in **Figure 10**.
 
-    <img src="images/win-10-set-up-work-or-school.png" alt="Set up a work or school account" />
+    <img src="images/win10-set-up-work-or-school.png" alt="Set up a work or school account" />
 
     **Figure 10** - Set up a work or school account
 
 3.  On the **Let’s get you signed in** page, enter the Azure AD credentials, and then click **Sign in**, as illustrated in **Figure 11**.
 
-    <img src="images/win-10-lets-get-2.png" alt="Let's get you signed in - dialog box" />
+    <img src="images/win10-lets-get-2.png" alt="Let's get you signed in - dialog box" />
 
     **Figure 11** - The “Let’s get you signed in” dialog box
 

windows/keep-secure/interactive-logon-display-user-information-when-the-session-is-locked.md

@@ -35,7 +35,7 @@ When a session is locked in a Windows operating system (meaning the user at the
 
 -   Blank.
 
-    Default setting. This translates to “Not defined,” but it will display the user’s full name in the same manner as the **User display name, domain and user names** option. When an option is set, you cannot reset this policy to blank, or not defined.
+    Default setting. This translates to “Not defined,” but it will display the user’s full name in the same manner as the **User display name** option. When an option is set, you cannot reset this policy to blank, or not defined.
 
 ### Best practices
 

windows/keep-secure/requirements-to-use-applocker.md

@@ -33,12 +33,10 @@ The following table show the on which operating systems AppLocker features are s
 
 | Version | Can be configured | Can be enforced | Available rules | Notes |
 | - | - | - | - | - |
-| Windows 10| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL| You can use the [AppLocker CSP](http://msdn.microsoft.com/library/windows/hardware/dn920019.aspx) to configure AppLocker policies on any edition of Windows 10. You can only manage AppLocker with Group Policy on devices running Windows 10 Enterprise and Windows Server 2016. |
+| Windows 10| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL| You can use the [AppLocker CSP](http://msdn.microsoft.com/library/windows/hardware/dn920019.aspx) to configure AppLocker policies on any edition of Windows 10. You can only manage AppLocker with Group Policy on devices running Windows 10 Enterprise, Windows 10 Education, and Windows Server 2016. |
-| Windows Server 2012 R2| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL| | 
+| Windows Server 2016<br/>Windows Server 2012 R2<br/>Windows Server 2012| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL| | 
 | Windows 8.1| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL| Only the Enterprise edition supports AppLocker| 
 | Windows RT 8.1| No| No| N/A||  
-| Windows Server 2012 Standard| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL||
-| Windows Server 2012 Datacenter| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL||  
 | Windows 8 Pro| No| No| N/A||
 | Windows 8 Enterprise| Yes| Yes| Packaged apps<br/>Executable<br/>Windows Installer<br/>Script<br/>DLL||  
 | Windows RT| No| No| N/A| |  

windows/manage/customize-windows-10-start-screens-by-using-group-policy.md

@@ -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).

windows/manage/waas-manage-updates-wsus.md

@@ -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

windows/manage/windows-store-for-business-overview.md

@@ -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>

windows/plan/windows-10-infrastructure-requirements.md

@@ -94,10 +94,12 @@ Windows 10 volume license editions of Windows 10 will continue to support all
 | Windows 10                             | None                                                                                        |
 | Windows Server 2012 R2 and Windows 8.1 | [https://support.microsoft.com/kb/3058168](https://go.microsoft.com/fwlink/p/?LinkId=625087) |
 | Windows Server 2012 and Windows 8      | [https://support.microsoft.com/kb/3058168](https://go.microsoft.com/fwlink/p/?LinkId=625087) |
-| Windows Server 2008 R2 and Windows 7   | Available by October 2015                                                                   |
+| Windows Server 2008 R2 and Windows 7   | [https://support.microsoft.com/kb/3079821](https://support.microsoft.com/kb/3079821)                                                                   |
 
  
 
+Also see: [Windows Server 2016 Volume Activation Tips](https://blogs.technet.microsoft.com/askcore/2016/10/19/windows-server-2016-volume-activation-tips/)
+
 Additionally, new product keys will be needed for all types of volume license activation (KMS, MAK, and AD-based Activation); these keys are available on the Volume Licensing Service Center (VLSC) for customers with rights to the Windows 10 operating system. To find the needed keys:
 
 -   Sign into the [Volume Licensing Service Center (VLSC)](https://go.microsoft.com/fwlink/p/?LinkId=625088) at with a Microsoft account that has appropriate rights.
@@ -112,10 +114,8 @@ Note that Windows 10 Enterprise and Windows 10 Enterprise LTSB installations u
 
 
 [Windows 10 servicing options](windows-10-servicing-options.md)
-
+<BR>[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
-[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
+<BR>[Windows 10 compatibility](windows-10-compatibility.md)
-
-[Windows 10 compatibility](windows-10-compatibility.md)