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

education/windows/TOC.md

@@ -2,6 +2,9 @@
 ## [Change history for Windows 10 for Education](change-history-edu.md)
 ## [Use the Set up School PCs app (Preview)](use-set-up-school-pcs-app.md)
 ## [Technical reference for the Set up School PCs app (Preview)](set-up-school-pcs-technical.md)
+## [Get Minecraft Education Edition](get-minecraft-for-education.md)
+### [For teachers: get Minecraft Education Edition](teacher-get-minecraft.md)
+### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md)
 ## [Take tests in Windows 10 (Preview)](take-tests-in-windows-10.md)
 ### [Set up Take a Test on a single PC (Preview)](take-a-test-single-pc.md)
 ### [Set up Take a Test on multiple PCs (Preview)](take-a-test-multiple-pcs.md)

education/windows/get-minecraft-for-education.md

@@ -0,0 +1,42 @@
+---
+title: Get Minecraft Education Edition
+description: Learn how to get and distribute Minecraft Education Edition.
+keywords: school
+ms.prod: W10
+ms.mktglfcycl: plan
+ms.sitesec: library
+author: jdeckerMS
+---
+
+# Get Minecraft Education Edition
+
+**Applies to:**
+
+-   Windows 10  
+
+
+[Minecraft: Education Edition](http://education.minecraft.net/) is built for learning. Watch this video to learn more about Minecraft.
+
+<iframe width="501" height="282" src="https://www.youtube.com/embed/hl9ZQiektJE" frameborder="0" allowfullscreen></iframe>
+
+Teachers and IT administrators can now get early access to **Minecraft Education Edition** and add it their Microsoft Store for Business for distribution. 
+
+![education.minecraft.net](images/minecraft.png)
+
+## Prerequisites
+
+- **Minecraft Education Edition** requires Windows 10.
+- Early access to **Minecraft Education Edition** is offered to education tenants that are managed by Azure Active Directory (Azure AD).
+    - If your school doesn't have an Azure AD tenant, the [IT administrator can set one up](school-get-minecraft.md) as part of the process of getting **Minecraft Education Edition**.
+    * Office 365, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/en-us/academic/office-365-education-plan)
+    * If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](https://msdn.microsoft.com/en-us/library/windows/hardware/mt703369%28v=vs.85%29.aspx)
+
+![teacher](images/teacher.png) 
+
+[Learn how teachers can get and distribute **Minecraft Education Edition**](teacher-get-minecraft.md)
+
+  
+![IT administrator](images/school.png)
+
+[Learn how IT administrators can get and distribute **Minecraft Education Edition**](school-get-minecraft.md), and how to manage permissions for Minecraft.
+

education/windows/school-get-minecraft.md

@@ -0,0 +1,206 @@
+---
+title: For IT administrators get Minecraft Education Edition
+description: Learn how IT admins can get and distribute Minecraft in their schools.
+keywords: ["school"]
+ms.prod: W10
+ms.mktglfcycl: plan
+ms.sitesec: library
+author: jdeckerMS
+---
+
+# For IT administrators: get Minecraft Education Edition
+
+**Applies to:**
+
+-   Windows 10  
+
+When you sign up for early access to [Minecraft Education Edition](http://education.minecraft.net), Minecraft will be added to the inventory in your Windows Store for Business, a private version of Windows Store associated with your Azure Active Directory (Azure AD) tenant. Your Store for Business is only displayed to members of your organization.
+
+> **Note**: If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 subscription when you request Minecraft Education Edition.
+
+## Add Minecraft to your Windows Store for Business 
+
+1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **Get the app**.
+
+    ![Click Get the app](images/it-get-app.png) 
+
+2. Enter your email address.
+
+    ![Enter school email address](images/enter-email.png)
+    
+    - If your email address isn't associated to an Azure AD or Office 365 tenant, you'll be asked to fill in a form. The information will be used to create an Office 365 subscription for your school.  
+    
+3. Select **Get the app**. This will take you to the Windows Store for Business to download the app. You will also receive an email with instructions and a link to the Store.
+
+    ![You can get the app now](images/get-the-app.png)
+
+4. Sign in to Windows Store for Business with your email address.
+
+5. Read and accept the Windows Store for Business Service Agreement, and then select **Next**.
+
+6. **Minecraft Education Edition** opens in the Windows Store for Business. Select **Get the app**. This places **Minecraft: Education Edition** in your Store inventory.
+
+    ![Get Minecraft app in Store](images/minecraft-get-the-app.png)
+
+## Distribute Minecraft
+
+After Minecraft Education Edition is added to your Windows Store for Business, you have three options:
+
+- You can install the app on your PC.
+- You can assign the app to others.  
+- You can download the app to distribute. 
+
+![App distribution options](images/mc-install-for-me-admin.png)
+
+### Install for me
+You can install the app on your PC. This gives you a chance to test the app and know how you might help others in your organization use the app.   
+
+1. Sign in to Windows Store for Business. 
+2. Click **Manage**, and then click **Install for me**.
+
+    ![Minecraft Education Edition product page](images/mc-install-for-me-admin.png)
+
+3. Click **Install**.  
+
+### Assign to others
+Enter email addresses for your students, and each student will get an email with a link to install the app. This option is best for older, more tech-savvy students who will always use the same PC at school. You can assign the app to individuals, groups, or add it to your private store, where students and teachers in your organization can 
+
+**To assign to others**
+1. Sign in to Windows Store for Business. 
+2. Click **Manage**.
+
+    ![Minecraft Education Edition product page](images/minecraft-assign-to-others.png)
+4. Click **Assign to people**.
+ 
+    ![Assign to people](images/minecraft-assign-to-people.png)
+5. Type the name, or email address of the student you want to assign the app to, and then click **Assign**.
+
+    You can only assign the app to students with work or school accounts. If you don't find the student, you might need to add a work or school account for the student.
+    
+    ![Assign to people showing student name](images/minecraft-assign-to-people-name.png)
+
+**To finish Minecraft install (for students)**
+
+Students will receive an email with a link that will install the app on their PC.
+
+![Email with Get the app link](images/minecraft-student-install-email.png)
+
+1. Click **Get the app** to start the app install in Windows Store app. 
+2. In Windows Store app, click **Install**. 
+
+     ![Windows Store app with Minecraft page](images/minecraft-in-windows-store-app.png)
+
+After installing the app, students can find Minecraft: Education Edition in Windows Store app under **My Library**.
+
+![Windows Store app showing access to My Library](images/minecraft-private-store.png) 
+
+When students click **My Libarary** they'll find apps assigned to them.
+
+![My Library for example student](images/minecraft-my-library.png) 
+
+### Download for others
+Download for others allows teachers or IT admins to download a packages that they can install on student PCs. This will install Minecraft: Education Edition on the PC, and allows anyone with a Windows account to use the app on that PC. This option is best for younger students, and for shared computers. Choose this option when:
+- You have administrative permissions to install apps on the PC. 
+- You want to install this app on each of your student's Windows 10 (at least version 1511) PCs. 
+- Your students share Windows 10 computers, but sign in with their own Windows account. 
+
+**Requirements**
+- Administrative permissions are required on the PC. If you don't have the correct permissions, you won't be able to install the app. 
+- Windows 10 (at least version 1511) is required for PCs running Minecraft: Education Edition.
+
+**Check for updates**</br>
+Minecraft: Education Edition will not install if there are updates pending for other apps on the PC. Before installing Minecraft, check to see if there are pending updates for Windows Store apps. 
+
+**To check for app updates**
+1. Start Windows Store app on the PC (click **Start**, and type **Store**).
+2. Click the account button, and then click **Downloads and updates**.
+
+      ![Windows Store app showing access to My Library](images/minecraft-private-store.png)
+      
+3. Click **Check for updates**, and install all available updates. 
+
+      ![Windows Store app showing access to My Library](images/mc-check-for-updates.png)
+      
+4. Restart the computer before installing Minecraft: Education Edition.  
+
+**To download for others**</br>
+You'll download a .zip file, extract the files, and then use one of the files to install Minecraft: Education Edition on each PC. 
+
+1. **Download Minecraft Education Edition.zip**. From the **Minecraft: Education Edition** page, click **Download for others** tab, and then click **Download**.
+
+    ![Windows Store app showing access to My Library](images/mc-dnld-others-admin.png)
+ 
+2. **Extract files**. Find the .zip file that you downloaded and extract the files. This is usually your **Downloads** folder, unless you chose to save the .zip file to a different location. Right-click the file and choose **Extract all**.
+3. **Save to USB drive**. After you've extracted the files, save the Minecraft: Education Edition folder to a USB drive, or to a network location that you can access from each PC.  
+4. **Install app**. Use the USB drive to copy the Minecraft folder to each Windows 10 PC where you want to install Minecraft: Education Edition. Open Minecraft: Education Edition folder, right-click **InstallMinecraftEducationEdition.bat** and click **Run as administrator**. 
+5. **Quick check**. The install program checks the PC to make sure it can run Minecraft: Education Edition. If your PC passes this test, the app will automatically install.
+6. **Restart**. Once installation is complete, restart each PC. Minecraft: Education Edition app is now ready for any student to use.
+
+
+## Manage Minecraft Education Edition
+
+### Access to Windows Store for Business
+By default, when a teacher with a work or school account in your edu tenant acquires Minecraft: Education Edition, they are automatically signed up for Window Store for Business, and the **Basic Purchaser** role is assigned to them. **Basic Purchaser** role allows teachers to acquire Minecraft: Education Edition and to distribute it to students. 
+
+However, tenant admins can control whether or not teachers automatically sign up for Windows Store for Business, and get the **Basic Purachaser** role. You can configure this with the **Allow educators in my organization to sign up for the Windows Store for Business.** You'll find this on the **Permissions** page. 
+
+To prevent educators from automatically signing up for Windows Store for Business
+1.  In Windows Store for Business, click **Settings**, and then click **Permissions**. 
+
+    ![Permission page for Windows Store for Business](images/minecraft-admin-permissions.png)
+
+2. Click **Allow educators in my organization to sign up for the Windows Store for Business.**
+
+### Roles and permissions
+Minecraft: Education Edition adds a new role for teachers: **Basic Purchaser**. When a teacher has been granted this role, they can:
+- View the Minecraft product description page 
+- Acquire and manage the app
+- Info on Support page (including links to documentation and access to support through customer service)
+
+![assign roles to manage Minecraft permissions](images/minecraft-perms.png)
+
+**To assign Basic Purchaser role**
+
+1. Sign in to Store for Business
+
+    **Note**</br>
+    You need to be a Global Administrator, or have the Store for Business Admin role to access the Permissions page.
+
+2. Click **Settings**, and then choose **Permissions**.
+
+    ![Permission page for Windows Store for Business](images/minecraft-admin-permissions.png)
+
+3. Click **Add people**, type a name, select the correct person, choose the role you want to assign, and click **Save**.
+
+    ![Permission page for Windows Store for Business](images/minecraft-assign-roles.png)
+    
+    Windows Store for Business updates the list of people and permissions. 
+    
+    ![Permission page for Windows Store for Business](images/minecraft-assign-roles-2.png)
+
+## Private store
+
+When you create you Windows Store for Business account, you'll have a set of apps included for free in your private store. Apps in your private store are available for all people in your organization to install and use. 
+
+These apps will automatically be in your private store:
+- Word mobile
+- Excel mobile
+- PowerPoint mobile
+- OneNote
+- Sway
+- Fresh Paint
+- Minecraft: Education Edition
+
+As an admin, you can remove any of these apps from the private store if you'd prefer to control how apps are distributed. 
+
+## Learn more
+
+[Roles and permissions in Windows Store for Business](https://technet.microsoft.com/itpro/windows/manage/roles-and-permissions-windows-store-for-business)
+
+[Troubleshoot Windows Store for Business](https://technet.microsoft.com/itpro/windows/manage/troubleshoot-windows-store-for-business)
+
+## Related topics
+
+[Get Minecraft Education Edition](get-minecraft-for-education.md)
+
+[For teachers get Minecraft Education Edition](teacher-get-minecraft.md)

education/windows/teacher-get-minecraft.md

@@ -0,0 +1,147 @@
+---
+title: For teachers get Minecraft Education Edition
+description: Learn how teachers can get and distribute Minecraft.
+keywords: ["school"]
+ms.prod: W10
+ms.mktglfcycl: plan
+ms.sitesec: library
+author: jdeckerMS
+---
+
+# For teachers: get Minecraft Education Edition
+
+**Applies to:**
+
+-   Windows 10 
+
+Learn how teachers can get and distribute Minecraft: Education Edition.
+
+## Add Minecraft to your Windows Store for Business 
+
+1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **Get the app**.
+
+    ![Click Get the app](images/teacher-get-app.png) 
+
+2. Enter your email address.
+
+    ![Enter school email address](images/enter-email.png)
+    
+3. Select **Get the app**. This will take you to the Windows Store for Business to download the app. You will also receive an email with instructions and a link to the Store.
+
+    ![You can get the app now](images/get-the-app.png)
+
+4. Sign in to Windows Store for Business with your email address.
+
+5. Read and accept the Windows Store for Business Service Agreement, and then select **Next**.
+
+6. **Minecraft Education Edition** opens in the Windows Store for Business. Select **Get the app**. This places **Minecraft Education Edition** in your Store inventory.
+
+    ![Get Minecraft app in Store](images/minecraft-get-the-app.png)
+    
+## Distribute Minecraft
+
+After Minecraft Education Edition is added to your Windows Store for Business, you have three options:
+
+- You can install the app on your PC.
+- You can assign the app to others.  
+- You can download the app to distribute. 
+
+![App distribution options](images/mc-install-for-me-teacher.png)
+
+### Install for me
+You can install the app on your PC. This gives you a chance to work with the app before using it with your students.   
+
+1. Sign in to Windows Store for Business. 
+2. Click **Manage**, and then click **Install for me**.
+
+    ![Minecraft Education Edition product page](images/mc-install-for-me-teacher.png)
+
+3. Click **Install**. 
+
+### Assign to others
+Enter email addresses for your students, and each student will get an email with a link to install the app. This option is best for older, more tech-savvy students who will always use the same PC at school. 
+
+**To assign to others**
+1. Sign in to Windows Store for Business. 
+2. Click **Manage**.
+
+    ![Minecraft Education Edition product page](images/mc-assign-to-others-teacher.png)
+
+3. Click **Assign to people**.
+ 
+    ![Assign to people](images/minecraft-assign-to-people.png)
+    
+4. Type the name, or email address of the student you want to assign the app to, and then click **Assign**.
+
+   You can only assign the app to students with work or school accounts. If you don't find the student, contact your IT admin to add a work or school account for the student.
+
+    ![Assign to people showing student name](images/minecraft-assign-to-people-name.png)
+
+**To finish Minecraft install (for students)**
+
+Students will receive an email with a link that will install the app on their PC.
+
+![Email with Get the app link](images/minecraft-student-install-email.png)
+
+1. Click **Get the app** to start the app install in Windows Store app. 
+2. In Windows Store app, click **Install**. 
+
+     ![Windows Store app with Minecraft page](images/minecraft-in-windows-store-app.png)
+
+      After installing the app, students can find Minecraft: Education Edition in Windows Store app under **My Library**.
+
+    ![Windows Store app showing access to My Library](images/minecraft-private-store.png) 
+
+      When students click **My Libarary** they'll find apps assigned to them.
+
+    ![My Library for example student](images/minecraft-my-library.png)  
+
+### Download for others
+Download for others allows teachers or IT admins to download a packages that they can install on student PCs. This will install Minecraft: Education Edition on the PC, and allows anyone with a Windows account to use the app on that PC. This option is best for younger students, and for shared computers. Choose this option when:
+- You have administrative permissions to install apps on the PC. 
+- You want to install this app on each of your student's Windows 10 (at least version 1511) PCs. 
+- Your students share Windows 10 computers, but sign in with their own Windows account. 
+
+**Requirements**
+- Administrative permissions are required on the PC. If you don't have the correct permissions, you won't be able to install the app. 
+- Windows 10 (at least version 1511) is required for PCs running Minecraft: Education Edition.
+
+**Check for updates**</br>
+Minecraft: Education Edition will not install if there are updates pending for other apps on the PC. Before installing Minecraft, check to see if there are pending updates for Windows Store apps. 
+
+**To check for app updates**
+1. Start Windows Store app on the PC (click **Start**, and type **Store**).
+2. Click the account button, and then click **Downloads and updates**.
+
+      ![Windows Store app showing access to My Library](images/minecraft-private-store.png)
+      
+3. Click **Check for updates**, and install all available updates. 
+
+      ![Windows Store app showing access to My Library](images/mc-check-for-updates.png)
+      
+4. Restart the computer before installing Minecraft: Education Edition. 
+   
+**To download for others**</br>
+You'll download a .zip file, extract the files, and then use one of the files to install Minecraft: Education Edition on each PC. 
+
+1. **Download Minecraft Education Edition.zip**. From the **Minecraft: Education Edition** page, click **Download for others** tab, and then click **Download**.
+
+    ![Windows Store app showing access to My Library](images/mc-dnld-others-teacher.png)
+ 
+
+2. **Extract files**. Find the .zip file that you downloaded and extract the files. This is usually your **Downloads** folder, unless you chose to save the .zip file to a different location. Right-click the file and choose **Extract all**.
+3. **Save to USB drive**. After you've extracted the files, save the Minecraft: Education Edition folder to a USB drive, or to a network location that you can access from each PC.  
+4. **Install app**. Use the USB drive to copy the Minecraft folder to each Windows 10 PC where you want to install Minecraft: Education Edition. Open Minecraft: Education Edition folder, right-click **InstallMinecraftEducationEdition.bat** and click **Run as administrator**. 
+5. **Quick check**. The install program checks the PC to make sure it can run Minecraft: Education Edition. If your PC passes this test, the app will automatically install.
+6. **Restart**. Once installation is complete, restart each PC. Minecraft: Education Edition app is now ready for any student to use.
+
+**Note**:</br>
+If Minecraft: Education Edition does not install, you may need to update other Windows Store apps on your computer before you can install Minecraft: Education Edition. To do this, open the Windows Store for Business and select the Account button in the top right corner of your screen (next to Search.) Select Check for updates and install all available updates. Now Minecraft should install.
+
+## Related topics
+
+[Get Minecraft Education Edition](get-minecraft-for-education.md)
+
+[For IT admins: get Minecraft Education Edition](school-get-minecraft.md)
+
+

windows/deploy/TOC.md

@@ -1,5 +1,3 @@
-# [What's new in Windows 10](../whats-new/index.md)
-# [Plan for Windows 10 deployment](../plan/index.md)
 # [Deploy Windows 10](index.md)
 ## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md)
 ## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md)
@@ -136,6 +134,4 @@
 ###### [Recognized Environment Variables](usmt-recognized-environment-variables.md)
 ###### [XML Elements Library](usmt-xml-elements-library.md)
 ##### [Offline Migration Reference](offline-migration-reference.md)
-## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)
-# [Keep Windows 10 secure](../keep-secure/index.md)
-# [Manage and update Windows 10](../manage/index.md)
+## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md)

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

@@ -32,24 +32,28 @@ The private store for your organization is a page in the Windows Store app that
 
 1.  Click the people icon in Windows Store app, and click **Sign in**.
 
-    ![](images/wsfb-wsappsignin.png)
+    ![Sign in to Store app with a different account](images/wsfb-wsappsignin.png)
 
 2.  Click **Add account**, and then click **Work or school account**.
 
-    ![](images/wsfb-wsappaddacct.png)
+    ![Choose an account to use](images/wsfb-wsappaddacct.png)
 
 3.  Type the email account and password, and click **Sign in**.
 
-    ![](images/wsfb-wsappworkacct.png)
+    ![Sign in for work or school account](images/wsfb-wsappworkacct.png)
 
 4.  You should see the private store for your organization. In our example, the page is named **Contoso publishing**.
 
-    ![](images/wsfb-wsappprivatestore.png)
+    ![Private store with name highlighted](images/wsfb-wsappprivatestore.png)
 
     Click the private store to see apps in your private store.
 
-    ![](images/wsfb-privatestoreapps.png)
+    ![Private store for Contoso publishing](images/wsfb-privatestoreapps.png)
 
+## Still having trouble?
+
+If you are still having trouble using WSfB or installing the app, you can get more help on our [Support page](http://go.microsoft.com/fwlink/?LinkID=799757).
+