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

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/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)
-
-[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
-
-[Windows 10 compatibility](windows-10-compatibility.md)
+<BR>[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
+<BR>[Windows 10 compatibility](windows-10-compatibility.md)