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

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

Browse Source
This commit is contained in:
jdeckerMS 2017-06-12 14:11:54 -07:00
commit 54de692cfb
10 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windows/access-protection/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha"
},
"fileMetadata": {},
"template": [],

4
windows/application-management/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "elizapo"
},
"fileMetadata": {},
"template": [],

4
windows/client-management/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "dongill"
},
"fileMetadata": {},
"template": [],

4
windows/configuration/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "jdecker"
},
"fileMetadata": {},
"template": [],

4
windows/deployment/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "greglin"
},
"fileMetadata": {},
"template": [],

4
windows/device-security/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha"
},
"fileMetadata": {},
"template": [],

4
windows/device-security/tpm/tpm-recommendations.md
View File

@ -100,8 +100,8 @@ The following table defines which Windows features require TPM support.
| Windows Features | Windows 10 TPM 1.2 | Windows 10 TPM 2.0 | Details |
|-------------------------|----------------------|----------------------|----------|
| Measured Boot | Required | Required | Measured boot requires TPM 1.2 or 2.0 and UEFI Secure boot. |
| Bitlocker | Required | Required | TPM 1.2 or later required or a removable USB memory device such as a flash drive. |
| Measured Boot | Required | Required | Measured boot requires TPM 1.2 or 2.0 and UEFI Secure Boot. |
| Bitlocker | Required | Required | TPM 1.2 or later required or a removable USB memory device such as a flash drive. Please note that TPM 2.0 requires UEFI Secure Boot in order for BitLocker to work properly. |
| Passport: Domain AADJ Join | Required | Required | Supports both versions of TPM, but requires TPM with HMAC and EK certificate for key attestation support. |
| Passport: MSA or Local Account | Required | Required | TPM 2.0 is required with HMAC and EK certificate for key attestation support. |
| Device Encryption | Not Applicable | Required | TPM 2.0 is required for all InstantGo devices. |

4
windows/hub/docfx.json
View File

@ -35,7 +35,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "brianlic"
},
"fileMetadata": {},
"template": [],

4
windows/threat-protection/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "justinha"
},
"fileMetadata": {},
"template": [],

4
windows/whats-new/docfx.json
View File

@ -33,7 +33,9 @@
"globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/windows/windows-10/breadcrumb/toc.json",
"ms.technology": "windows"
"ms.technology": "windows",
"ms.topic": "article",
"ms.author": "trudyha"
},
"fileMetadata": {},
"template": [],