Merge branch 'master' of https://cpubwin.visualstudio.com/_git/it-client into FromPrivateRepo

education/trial-in-a-box/itadmin-tib-get-started.md

@@ -115,7 +115,7 @@ If you've previously used Set up School PCs to provision student devices, you ca
 
 8. **Add recommended apps** lets you choose from a set of recommended Microsoft Store apps to provision. 
 
-    ![Recommended apps in Set up School PCs package configuration](images/suspc_configure_recommended_apps.png)
+    ![Recommended apps in Set up School PCs package configuration](images/suspc_configure_recommendedapps_v2.png)
 
     The recommended apps include the following:
     * **Office 365 for Windows 10 S (Education Preview)** - This is optional, but works well for the Trial in a Box PCs. If you try to install this app on other editions of Windows 10, setup will fail. Also note that if you select **Office 365 for Windows 10 S (Education Preview)**, it will take about 30-45 minutes longer for Set up School PCs to create the provisioning package as the app downloads Office 365 for Windows 10 S (Education Preview) from the Microsoft Store.

windows/client-management/mdm/TOC.md

@@ -2,6 +2,7 @@
 ## [What's new in MDM enrollment and management](new-in-windows-mdm-enrollment-management.md)
 ## [Mobile device enrollment](mobile-device-enrollment.md)
 ### [MDM enrollment of Windows devices](mdm-enrollment-of-windows-devices.md)
+#### [Azure AD and Microsoft Intune: Automatic MDM enrollment in the new Portal](azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md)
 ### [Enroll a Windows 10 device automatically using Group Policy](enroll-a-windows-10-device-automatically-using-group-policy.md)
 ### [Federated authentication device enrollment](federated-authentication-device-enrollment.md)
 ### [Certificate authentication device enrollment](certificate-authentication-device-enrollment.md)

windows/client-management/mdm/azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md

@@ -1,3 +1,14 @@
+---
+title: Azure AD and Microsoft Intune - Automatic MDM enrollment in the new Portal
+description: Azure AD and Microsoft Intune - Automatic MDM enrollment in the new Portal
+ms.author: maricia
+ms.topic: article
+ms.prod: w10
+ms.technology: windows
+author: nickbrower
+ms.date: 01/17/2018
+---
+
 # Azure AD and Microsoft Intune: Automatic MDM enrollment in the new Portal 
 
 Go to your Azure AD Blade, select the Mobility (MDM and MAM) and there should be the Microsoft Intune "App" Visible, select the Microsoft Intune and configure the Blade 

windows/client-management/mdm/enable-admx-backed-policies-in-mdm.md

@@ -233,6 +233,7 @@ Summary of steps to enable a policy:
                <Target>
                 <LocURI>./Device/Vendor/MSFT/Policy/Config/AppVirtualization/PublishingAllowServer2</LocURI>
                </Target>
+               <Data>
                <![CDATA[<enabled/><data id="Publishing_Server2_Name_Prompt" value="name prompt"/><data 
                  id="Publishing_Server_URL_Prompt" value="URL prompt"/><data 
                  id="Global_Publishing_Refresh_Options" value="1"/><data 
@@ -243,6 +244,7 @@ Summary of steps to enable a policy:
                  id="User_Refresh_OnLogon_Options" value="0"/><data 
                  id="User_Refresh_Interval_Prompt" value="15"/><data 
                  id="User_Refresh_Unit_Options" value="1"/>]]>
+               </Data>
              </Item>
            </Replace>
            <Final/>

windows/deployment/upgrade/windows-10-edition-upgrades.md

@@ -8,7 +8,7 @@ ms.localizationpriority: high
 ms.sitesec: library
 ms.pagetype: mobile
 author: greg-lindsay
-ms.date: 10/17/2017
+ms.date: 01/18/2018
 ---
 
 # Windows 10 edition upgrade
@@ -63,7 +63,7 @@ X = unsupported <BR>
 | **Mobile > Mobile Enterprise** | ![supported, no reboot](../images/check_blu.png) |![supported, no reboot](../images/check_blu.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) | ![not supported](../images/x_blk.png) |
 
 > [!NOTE]
-> Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods.
+> Each desktop edition in the table also has an N and KN SKU. These editions have had media-related functionality removed. Devices with N or KN SKUs installed can be upgraded to corresponding N or KN SKUs using the same methods.
 
 
 ## Upgrade using mobile device management (MDM)

windows/deployment/upgrade/windows-10-upgrade-paths.md

@@ -7,7 +7,7 @@ ms.sitesec: library
 ms.localizationpriority: high
 ms.pagetype: mobile
 author: greg-lindsay
-ms.date: 10/16/2017
+ms.date: 01/18/2018
 ---
 
 # Windows 10 upgrade paths
@@ -22,7 +22,7 @@ This topic provides a summary of available upgrade paths to Windows 10. You can
 
 >**Windows 10 LTSB**: The upgrade paths displayed below do not apply to Windows 10 LTSB. In-place upgrade from Windows 7 or Windows 8.1 to Windows 10 LTSB is not supported.  (Note that Windows 10 LTSB 2015 did not block this upgrade path.  This was corrected in the Windows 10 LTSB 2016 release, which will now only allow data-only and clean install options.)
 
->**Windows N/KN**: Windows "N" and "KN" editions follow the same upgrade paths shown below. If the pre-upgrade and post-upgrade editions are not the same type (e.g. Windows 8.1 Pro N to Windows 10 Pro), personal data will be kept but applications and settings will be removed during the upgrade process.
+>**Windows N/KN**: Windows "N" and "KN" SKUs follow the same upgrade paths shown below. If the pre-upgrade and post-upgrade editions are not the same type (e.g. Windows 8.1 Pro N to Windows 10 Pro), personal data will be kept but applications and settings will be removed during the upgrade process.
 
 ✔ = Full upgrade is supported including personal data, settings, and applications.<BR>
 D = Edition downgrade; personal data is maintained, applications and settings are removed.