From 5fa98450c82219418998d05a3cac058a1a5c4626 Mon Sep 17 00:00:00 2001 From: "J. Decker" Date: Fri, 17 Jun 2016 13:00:08 -0700 Subject: [PATCH 1/5] remove skus --- education/windows/set-up-school-pcs-technical.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 8d23068d40..16ad861b5d 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -26,14 +26,14 @@ The following table tells you what you get using the **Set up School PCs** app i | Feature | No Internet | Azure AD | Office 365 | Azure AD Premium | | --- | :---: | :---: | :---: | :---: | | **Fast sign-in**
Each student can sign in and start using the computer in less than a minute, even on their first sign-in. | X | X | X | X | -| **Custom Start experience**\*
The apps students need are pinned to Start, and unnecessary apps are removed. | X | X | X | X | +| **Custom Start experience**
The apps students need are pinned to Start, and unnecessary apps are removed. | X | X | X | X | | **Temporary access, no sign-in required**
This option sets up computers for common use. Anyone can use the computer without an account. | X | X | X | X | -| **School policies**\*
Settings specific to education create a useful learning environment and the best computer performance. | X | X | X | X | +| **School policies**
Settings specific to education create a useful learning environment and the best computer performance. | X | X | X | X | | **Azure AD Join**
The computers are joined to your Azure AD or Office 365 subscription for centralized management. | | X | X | X | | **Single sign-on to Office 365**
By signing on with student IDs, students have fast access to Office 365 web apps. | | | X | X | | **[Settings roaming](https://azure.microsoft.com/en-us/documentation/articles/active-directory-windows-enterprise-state-roaming-overview/) via Azure AD**
Student user and application settings data can be synchronized across devices for a personalized experience. | | | | X | | | | | | | -\* Feature applies to Windows 10 Pro, Windows 10 Pro for Education, Windows 10 Enterprise, and Windows 10 Enterprise for EDU + > **Note**: If your school uses Active Directory, use Windows Imaging and Configuration Designer to configure your PCs to join the domain. You can only use the **Set up School PCs** app to set up PCs that are not connected to your traditional domain. From 3314d864bdce1a2afde6a013d9463737027e058c Mon Sep 17 00:00:00 2001 From: "J. Decker" Date: Fri, 17 Jun 2016 13:00:47 -0700 Subject: [PATCH 2/5] remove skus --- education/windows/take-tests-in-windows-10.md | 1 - 1 file changed, 1 deletion(-) diff --git a/education/windows/take-tests-in-windows-10.md b/education/windows/take-tests-in-windows-10.md index bfac8bcc33..9e881238b6 100644 --- a/education/windows/take-tests-in-windows-10.md +++ b/education/windows/take-tests-in-windows-10.md @@ -28,7 +28,6 @@ Many schools use online testing for formative and summative assessments. It's cr - Cortana is turned off. -**Take a Test** is included in version 1607 of Windows 10 Pro, Pro Education, Education and Enterprise. ## How you use Take a Test From e7e30456b2aaef589ec3cacc999f96bc0400dbdc Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Fri, 17 Jun 2016 13:18:39 -0700 Subject: [PATCH 3/5] remove sku --- education/windows/take-a-test-multiple-pcs.md | 2 +- education/windows/take-a-test-single-pc.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/education/windows/take-a-test-multiple-pcs.md b/education/windows/take-a-test-multiple-pcs.md index e4ba7eb6ed..7ab6d68a18 100644 --- 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 version 1607 of Windows 10 Pro, Pro Education, Education and Enterprise. + ## How you use Take a Test diff --git a/education/windows/take-a-test-single-pc.md b/education/windows/take-a-test-single-pc.md index f0d2f288c7..a1fa849959 100644 --- 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 version 1607 of Windows 10 Pro, Pro Education, Education and Enterprise. + ## How you use Take a Test From 1aaa34e6d07b440ce053824b5d440f49e6f2c970 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 20 Jun 2016 11:37:49 -0700 Subject: [PATCH 4/5] Update credential-guard.md --- windows/keep-secure/credential-guard.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/credential-guard.md b/windows/keep-secure/credential-guard.md index f82c2815c0..0b86b95323 100644 --- a/windows/keep-secure/credential-guard.md +++ b/windows/keep-secure/credential-guard.md @@ -80,7 +80,7 @@ The PC must meet the following hardware and software requirements to use Credent

Trusted Platform Module (TPM) version 1.2 or 2.0

-

TPM 1.2 and 2.0 provides protection for encryption keys that are stored in the firmware and are used by Credential Guard. See the following table to determine which TPM versions are supported on your OS.

+

TPM 1.2 and 2.0 provides protection for encryption keys used by virtualization-based security to protect Credential Guard storage where all other keys are stored. See the following table to determine which TPM versions are supported on your OS.

@@ -94,7 +94,7 @@ The PC must meet the following hardware and software requirements to use Credent
OS version Required TPM
-Note  If you don't have a TPM installed, Credential Guard will still be enabled, but the keys used to encrypt Credential Guard will not be protected by the TPM. +Note  If you don't have a TPM installed, Credential Guard will still be enabled, but the virtualization-based security keys used to protect Credential Guard storage will not bound to the TPM. Instead, the keys will be protected in a UEFI Boot Service variable.
From bfd92397ca03b671e61943509f2cd29dc3515f0f Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 20 Jun 2016 11:48:48 -0700 Subject: [PATCH 5/5] Update credential-guard.md --- windows/keep-secure/credential-guard.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/keep-secure/credential-guard.md b/windows/keep-secure/credential-guard.md index 0b86b95323..acf87038bb 100644 --- a/windows/keep-secure/credential-guard.md +++ b/windows/keep-secure/credential-guard.md @@ -80,7 +80,7 @@ The PC must meet the following hardware and software requirements to use Credent

Trusted Platform Module (TPM) version 1.2 or 2.0

-

TPM 1.2 and 2.0 provides protection for encryption keys used by virtualization-based security to protect Credential Guard storage where all other keys are stored. See the following table to determine which TPM versions are supported on your OS.

+

TPM 1.2 and 2.0 provides protection for encryption keys used by virtualization-based security to protect Credential Guard secrets where all other keys are stored. See the following table to determine which TPM versions are supported on your OS.

@@ -94,7 +94,7 @@ The PC must meet the following hardware and software requirements to use Credent
OS version Required TPM
-Note  If you don't have a TPM installed, Credential Guard will still be enabled, but the virtualization-based security keys used to protect Credential Guard storage will not bound to the TPM. Instead, the keys will be protected in a UEFI Boot Service variable. +Note  If you don't have a TPM installed, Credential Guard will still be enabled, but the virtualization-based security keys used to protect Credential Guard secrets will not bound to the TPM. Instead, the keys will be protected in a UEFI Boot Service variable.