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

2025-05-12 13:27:23 +00:00 · 2016-06-13 12:10:02 -07:00 · 2016-06-13 12:10:02 -07:00 · cb706d59fb
commit cb706d59fb
parent a6e9c10ea8 91082c751d
22 changed files with 31 additions and 16 deletions
--- a/education/windows/change-history-edu.md
+++ b/education/windows/change-history-edu.md
@ -12,6 +12,12 @@ author: jdeckerMS

 This topic lists new and updated topics in the [Windows 10 for Education](index.md) documentation.

+## June 2016
+
+| New or changed topic | Description |
+|----------------------|-------------|
+| [Get Minecraft Education Edition](get-minecraft-for-education.md) </br> [For teachers: get Minecraft Education Edition](teacher-get-minecraft.md) </br> [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md) | New |
+
 ## May 2016

 | New or changed topic | Description |
--- a/education/windows/index.md
+++ b/education/windows/index.md
@ -19,6 +19,7 @@ author: jdeckerMS
 |------|------------|
 | [Use the Set up School PCs app (Preview)](use-set-up-school-pcs-app.md) | Learn how the Set up School PCs app works and how to use it.  |
 | [Technical reference for the Set up School PCs app (Preview)](set-up-school-pcs-technical.md) | See the changes that the Set up School PCs app makes to a PC.  |
+| [Get Minecraft Education Edition](get-minecraft-for-education.md) | Learn how to get early access to **Minecraft Education Edition**. |
 | [Take tests in Windows 10](take-tests-in-windows-10.md) | Learn how to configure and use the **Take a Test** app in Windows 10 |
 | [Deploy Windows 10 in a school](deploy-windows-10-in-a-school.md) | Learn how to deploy Windows 10 in classrooms; integrate the school environment with Microsoft Office 365, Active Directory Domain Services (AD DS), and Microsoft Azure Active Directory (Azure AD); and deploy Windows 10 and your apps to new devices or upgrade existing devices to Windows 10. |
 | [Chromebook migration guide](chromebook-migration-guide.md) | Learn how to migrate a Google Chromebook-based learning environment to a Windows 10-based learning environment. |
--- a/education/windows/take-a-test-multiple-pcs.md
+++ b/education/windows/take-a-test-multiple-pcs.md
@ -28,7 +28,7 @@ Many schools use online testing for formative and summative assessments. It's cr
 - Cortana is turned off.


-**Take a Test** is included in Windows 10 Education. To add **Take a Test** to other editions of Windows 10, see [Add the Take a Test app to Windows 10](take-tests-in-windows-10.md#add-the-take-a-test-app-to-windows-10)
+**Take a Test** is included in version 1607 of Windows 10 Pro, Pro Education, Education and Enterprise. 

 ## How you use Take a Test

@ -68,7 +68,7 @@ To configure a dedicated test account on multiple PCs, you can use:
 4. Create a policy that associates the assessment URL to the account, using the following values:

    - **Custom OMA-DM URI** = ./Vendor/MSFT/SecureAssessment/TesterAccount
-    - **String value** = Enter the account that you created in step 2, using the same account format.
+    - **String value** = Enter the account that you specified in step 2, using the same account format.
    
 5. To take the test, the student signs in to the test account.

--- a/education/windows/take-a-test-single-pc.md
+++ b/education/windows/take-a-test-single-pc.md
@ -30,7 +30,7 @@ The **Take a Test** app in Windows 10, Version 1607, creates the right environme
 > **Tip!**
 > To exit **Take a Test**, press Ctrl+Alt+Delete. 

-**Take a Test** is included in Windows 10 Education. To add **Take a Test** to other editions of Windows 10, see [Add the Take a Test app to Windows 10](take-tests-in-windows-10.md#add-the-take-a-test-app-to-windows-10)
+**Take a Test** is included in version 1607 of Windows 10 Pro, Pro Education, Education and Enterprise. 

 ## How you use Take a Test

@ -47,8 +47,8 @@ The **Take a Test** app in Windows 10, Version 1607, creates the right environme


 1. Sign into the device with an administrator account.
-2. Go to **Settings** > **Accounts** > **Work or school access** (final name needs to be updated, still TBD) > **Set up an account for taking tests**.
-3. Select an account to use as the dedicated testing account.
+2. Go to **Settings** > **Accounts** > **Work or school access** > **Set up an account for taking tests**.
+3. Select an existing account to use as the dedicated testing account.
    >**Note**: If you don't have an account on the device, you can create a new account. To do this, go to **Settings** > **Accounts** > **Other Users** > **Add someone else to this PC** > **I don’t have this person’s sign-in information** > **Add a user without a Microsoft account**.
 4. Specify an assessment URL.  

--- a/windows/deploy/sideload-apps-in-windows-10.md
+++ b/windows/deploy/sideload-apps-in-windows-10.md
@ -5,6 +5,7 @@ ms.assetid: C46B27D0-375B-4F7A-800E-21595CF1D53D
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
+ms.pagetype: mobile
 author: greg-lindsay
 ---

--- a/windows/deploy/update-windows-10-images-with-provisioning-packages.md
+++ b/windows/deploy/update-windows-10-images-with-provisioning-packages.md
@ -6,6 +6,7 @@ keywords: provisioning, bulk deployment, image
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
+ms.pagetype: mobile
 author: jdeckerMS
 ---

--- a/windows/deploy/windows-10-edition-upgrades.md
+++ b/windows/deploy/windows-10-edition-upgrades.md
@ -5,6 +5,7 @@ ms.assetid: A7642E90-A3E7-4A25-8044-C4E402DC462A
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
+ms.pagetype: mobile
 author: greg-lindsay
 ---

--- a/windows/keep-secure/manage-identity-verification-using-microsoft-passport.md
+++ b/windows/keep-secure/manage-identity-verification-using-microsoft-passport.md
@ -6,7 +6,7 @@ keywords: identity, PIN, biometric, Hello
 ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
-ms.pagetype: security
+ms.pagetype: security, mobile
 author: jdeckerMS
 ---
 # Manage identity verification using Microsoft Passport
--- a/windows/manage/configure-devices-without-mdm.md
+++ b/windows/manage/configure-devices-without-mdm.md
@ -2,10 +2,11 @@
 title: Configure devices without MDM (Windows 10)
 description: Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10. 
 ms.assetid: 66D14E97-E116-4218-8924-E2A326C9367E
-keywords: ["runtime provisioning", "provisioning package"]
+keywords: runtime provisioning, provisioning package
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+ms.pagetype: mobile, devices
 author: jdeckerMS
 ---

--- a/windows/manage/manage-wifi-sense-in-enterprise.md
+++ b/windows/manage/manage-wifi-sense-in-enterprise.md
@ -6,6 +6,7 @@ keywords: ["WiFi Sense", "automatically connect to wi-fi", "wi-fi hotspot connec
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+ms.pagetype: mobile
 author: eross-msft
 ---

--- a/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
+++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md
@ -2,7 +2,7 @@
 title: Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise (Windows 10)
 description: A device in kiosk mode runs a specified app with no access to other device functions, menus, or settings.
 ms.assetid: 35EC82D8-D9E8-45C3-84E9-B0C8C167BFF7
-keywords: ["kiosk", "lockdown", "assigned access"]
+keywords: kiosk, lockdown, assigned access
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
--- a/windows/manage/stop-employees-from-using-the-windows-store.md
+++ b/windows/manage/stop-employees-from-using-the-windows-store.md
@ -5,6 +5,7 @@ ms.assetid: 7AA60D3D-2A69-45E7-AAB0-B8AFC29C2E97
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
+ms.pagetype: store, mobile
 author: TrudyHa
 ---

--- a/windows/whats-new/applocker.md
+++ b/windows/whats-new/applocker.md
@ -2,7 +2,7 @@
 title: What's new in AppLocker (Windows 10)
 description: AppLocker helps you control which apps and files users can run. These include executable files, scripts, Windows Installer files, dynamic-link libraries (DLLs), packaged apps, and packaged app installers.
 ms.assetid: 6F836FF6-7794-4E7B-89AA-1EABA1BF183F
-ms.pagetype: security
+ms.pagetype: security, mobile
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
--- a/windows/whats-new/bitlocker.md
+++ b/windows/whats-new/bitlocker.md
@ -5,7 +5,7 @@ ms.assetid: 3F2DE365-68A1-4CDB-AB5F-C65574684C7B
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
-ms.pagetype: security
+ms.pagetype: security, mobile
 author: brianlic-msft
 ---

--- a/windows/whats-new/device-guard-overview.md
+++ b/windows/whats-new/device-guard-overview.md
@ -2,7 +2,7 @@
 title: Device Guard overview (Windows 10)
 description: Device Guard is a combination of enterprise-related hardware and software security features that, when configured together, will lock a device down so that it can only run trusted applications.
 ms.assetid: FFE244EE-5804-4CE8-A2A9-48F49DC3AEF2
-ms.pagetype: security
+ms.pagetype: mobile, security
 keywords: Device Guard
 ms.prod: w10
 ms.mktglfcycl: explore
--- a/windows/whats-new/edge-ie11-whats-new-overview.md
+++ b/windows/whats-new/edge-ie11-whats-new-overview.md
@ -5,6 +5,7 @@ ms.assetid: e986f903-69ad-4145-9d24-0c6d04b3e489
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
+ms.pagetype: mobile
 author: eross-msft
 ---

--- a/windows/whats-new/edp-whats-new-overview.md
+++ b/windows/whats-new/edp-whats-new-overview.md
@ -6,7 +6,7 @@ keywords: EDP Overview, EDP
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
-ms.pagetype: security
+ms.pagetype: mobile, security
 author: eross-msft
 ---

--- a/windows/whats-new/microsoft-passport.md
+++ b/windows/whats-new/microsoft-passport.md
@ -6,7 +6,7 @@ keywords: password, hello, fingerprint, iris, biometric
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
-ms.pagetype: security
+ms.pagetype: mobile, security
 author: jdeckerMS
 ---

--- a/windows/whats-new/new-provisioning-packages.md
+++ b/windows/whats-new/new-provisioning-packages.md
@ -5,6 +5,7 @@ ms.assetid: 287706E5-063F-4AB5-902C-A0DF6D0730BC
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
+ms.pagetype: mobile
 author: jdeckerMS
 ---

--- a/windows/whats-new/security-auditing.md
+++ b/windows/whats-new/security-auditing.md
@ -6,7 +6,7 @@ ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
 author: brianlic-msft
-ms.pagetype: security
+ms.pagetype: security, mobile
 ---

 # What's new in security auditing?
--- a/windows/whats-new/trusted-platform-module.md
+++ b/windows/whats-new/trusted-platform-module.md
@ -5,7 +5,7 @@ ms.assetid: CE8BBC2A-EE2D-4DFA-958E-2A178F2E6C44
 ms.prod: w10
 ms.mktglfcycl: explore
 ms.sitesec: library
-ms.pagetype: security
+ms.pagetype: security, mobile
 author: brianlic-msft
 ---

--- a/windows/whats-new/windows-store-for-business-overview.md
+++ b/windows/whats-new/windows-store-for-business-overview.md
@ -3,7 +3,7 @@ title: Windows Store for Business overview (Windows 10)
 description: With the new Windows Store for Business, organizations can make volume purchases of Windows apps.
 ms.assetid: 9DA71F6B-654D-4121-9A40-D473CC654A1C
 ms.prod: w10
-ms.pagetype: store
+ms.pagetype: store, mobile
 ms.mktglfcycl: manage
 ms.sitesec: library
 author: TrudyHa