Merge branch 'master' into v-lamoyn-working

education/docfx.json

@@ -28,6 +28,7 @@
       "audience": "windows-education",
       "ms.topic": "article",
       "ms.technology": "windows",
+      "manager": "laurawi",
       "audience": "ITPro",
       "breadcrumb_path": "/education/breadcrumb/toc.json",
       "ms.date": "05/09/2017",

education/get-started/get-started-with-microsoft-education.md

@@ -5,7 +5,7 @@ keywords: education, Microsoft Education, full cloud IT solution, school, deploy
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
-ms.topic: hero-article
+ms.topic: article
 ms.localizationpriority: medium
 ms.pagetype: edu
 author: levinec

education/windows/s-mode-switch-to-edu.md

@@ -42,7 +42,7 @@ S mode is an enhanced security mode of Windows 10 – streamlined for security a
 |Credential Guard | | | | X |
 |Device Guard | | | | X |
 
-###  Windows 10 in S mode is safe, secure, and fast.  
+### Windows 10 in S mode is safe, secure, and fast.  
 However, in some limited scenarios, you might need to switch to Windows 10 Education. You can switch devices running Windows 10, version 1709 or later. Use the following information to switch to Windows 10 Pro through the Microsoft Store. 
 
 ## How to switch

education/windows/set-up-windows-10.md

@@ -20,9 +20,9 @@ manager: dansimp
 -   Windows 10 
 
 You have two tools to choose from to set up PCs for your classroom: 
-  * Set up School PCs 
-  * Windows Configuration Designer
-  
+* Set up School PCs 
+* Windows Configuration Designer
+
 Choose the tool that is appropriate for how your students will sign in (Active Directory, Azure Active Directory, or no account). 
 
 You can use the following diagram to compare the tools.