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

Merge branch 'main' into wufbr-edits

Browse Source
This commit is contained in:
Meghan Stewart 2022-11-07 14:00:07 -08:00 committed by GitHub
commit 3a8f0ef325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.openpublishing.redirection.json
View File

@ -1197,7 +1197,7 @@
},
{
"source_path": "windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-available-settings.md",
"redirect_url": "hhttps://docs.microsoft.com/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings",
"redirect_url": "/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-available-settings",
"redirect_document_id": false
},
{
@ -6827,7 +6827,7 @@
},
{
"source_path": "windows/manage/waas-wufb-intune.md",
"redirect_url": "/windows/deployment/update/waas-wufb-intune.md",
"redirect_url": "/windows/deployment/update/waas-wufb-intune",
"redirect_document_id": false
},
{
@ -7277,7 +7277,7 @@
},
{
"source_path": "windows/manage/application-development-for-windows-as-a-service.md",
"redirect_url": "https://msdn.microsoft.com/windows/uwp/get-started/application-development-for-windows-as-a-service",
"redirect_url": "windows/uwp/updates-and-versions/application-development-for-windows-as-a-service",
"redirect_document_id": false
},
{
@ -7457,7 +7457,7 @@
},
{
"source_path": "windows/plan/chromebook-migration-guide.md",
"redirect_url": "edu/windows/chromebook-migration-guide",
"redirect_url": "education/windows/chromebook-migration-guide",
"redirect_document_id": false
},
{
@ -14412,12 +14412,12 @@
},
{
"source_path": "windows/manage/sign-up-windows-store-for-business.md",
"redirect_url": "/microsoft-store/index.md",
"redirect_url": "/microsoft-store/index",
"redirect_document_id": false
},
{
"source_path": "store-for-business/sign-up-windows-store-for-business.md",
"redirect_url": "/microsoft-store/index.md",
"redirect_url": "/microsoft-store/index",
"redirect_document_id": false
},
{
@ -19442,8 +19442,8 @@
},
{
"source_path": "windows/security/threat-protection/intelligence/rootkits-malware.md",
"redirect_url": "/microsoft-365/security/intelligence/rootkits-malware.md",
"redirect_document_id": false
"redirect_url": "/microsoft-365/security/intelligence/rootkits-malware",
"redirect_document_id": false
},
{
"source_path": "windows/security/threat-protection/intelligence/safety-scanner-download.md",

4
windows/client-management/mdm/policy-csp-deviceguard.md
View File

@ -74,7 +74,7 @@ Secure Launch configuration:
- 1 - Enables Secure Launch if supported by hardware
- 2 - Disables Secure Launch.
For more information about System Guard, see [Introducing Windows Defender System Guard runtime attestation](https://cloudblogs.microsoft.com/microsoftsecure/2018/04/19/introducing-windows-defender-system-guard-runtime-attestation/) and [How a hardware-based root of trust helps protect Windows 10](/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows).
For more information about System Guard, see [Introducing Windows Defender System Guard runtime attestation](https://www.microsoft.com/security/blog/2018/04/19/introducing-windows-defender-system-guard-runtime-attestation) and [How a hardware-based root of trust helps protect Windows 10](/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows).
<!--/Description-->
<!--ADMXMapped-->
@ -256,4 +256,4 @@ The following list shows the supported values:
## Related topics
[Policy configuration service provider](policy-configuration-service-provider.md)
[Policy configuration service provider](policy-configuration-service-provider.md)

2
windows/security/information-protection/tpm/tpm-recommendations.md
View File

@ -56,7 +56,7 @@ TPM 2.0 products and systems have important security advantages over TPM 1.2, in
- For the list of algorithms that Windows supports in the platform cryptographic storage provider, see [CNG Cryptographic Algorithm Providers](/windows/win32/seccertenroll/cng-cryptographic-algorithm-providers).
- TPM 2.0 achieved ISO standardization ([ISO/IEC 11889:2015](https://blogs.microsoft.com/cybertrust/2015/06/29/governments-recognize-the-importance-of-tpm-2-0-through-iso-adoption/)).
- TPM 2.0 achieved ISO standardization ([ISO/IEC 11889:2015](https://www.microsoft.com/security/blog/2015/06/29/governments-recognize-the-importance-of-tpm-2-0-through-iso-adoption).
- Use of TPM 2.0 may help eliminate the need for OEMs to make exception to standard configurations for certain countries and regions.