deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-13 05:47:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox

Browse Source
This commit is contained in:
jdeckerMS 2016-06-20 12:45:28 -07:00
commit f888686486
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
education/windows/set-up-school-pcs-technical.md
View File

@ -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**<br/>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**\*<br/>The apps students need are pinned to Start, and unnecessary apps are removed. | X | X | X | X |
| **Custom Start experience**<br/>The apps students need are pinned to Start, and unnecessary apps are removed. | X | X | X | X |
| **Temporary access, no sign-in required**<br/>This option sets up computers for common use. Anyone can use the computer without an account. | X | X | X | X |
| **School policies**\*<br/>Settings specific to education create a useful learning environment and the best computer performance. | X | X | X | X |
| **School policies**<br/>Settings specific to education create a useful learning environment and the best computer performance. | X | X | X | X |
| **Azure AD Join**<br/>The computers are joined to your Azure AD or Office 365 subscription for centralized management. | | X | X | X |
| **Single sign-on to Office 365**<br/>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**<br/>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.

2
education/windows/take-a-test-multiple-pcs.md
View File

@ -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

2
education/windows/take-a-test-single-pc.md
View File

@ -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

1
education/windows/take-tests-in-windows-10.md
View File

@ -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

4
windows/keep-secure/credential-guard.md
View File

@ -80,7 +80,7 @@ The PC must meet the following hardware and software requirements to use Credent
</tr>
<tr class="even">
<td align="left"><p>Trusted Platform Module (TPM) version 1.2 or 2.0</p></td>
<td align="left"><p>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.</p>
<td align="left"><p>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.</p>
<table>
<th>OS version</th>
<th>Required TPM</th>
@ -94,7 +94,7 @@ The PC must meet the following hardware and software requirements to use Credent
</tr>
</table>
<div class="alert">
<strong>Note</strong>  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.
<strong>Note</strong>  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.
</div>
</td>
</tr>