From f32a68e118fef2279669c37a19eade76275c692e Mon Sep 17 00:00:00 2001 From: Diana Hanson Date: Wed, 8 Dec 2021 10:53:35 -0700 Subject: [PATCH 1/5] Fix links --- windows/security/threat-protection/index.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md index 7cf2f166da..0c47bc6855 100644 --- a/windows/security/threat-protection/index.md +++ b/windows/security/threat-protection/index.md @@ -29,18 +29,18 @@ In Windows client, hardware and software work together to help protect you from See the following articles to learn more about the different areas of Windows threat protection: -- [Application Control](/windows-defender-application-control/windows-defender-application-control.md) +- [Application Control](/windows-defender-application-control/windows-defender-application-control) - [Attack Surface Reduction Rules](/microsoft-365/security/defender-endpoint/attack-surface-reduction) - [Controlled Folder Access](/microsoft-365/security/defender-endpoint/controlled-folders) - [Exploit Protection](/microsoft-365/security/defender-endpoint/exploit-protection) -- [Microsoft Defender Application Guard](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md) -- [Microsoft Defender Device Guard](device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md) -- [Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md) +- [Microsoft Defender Application Guard](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview) +- [Microsoft Defender Device Guard](device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control) +- [Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview) - [Network Protection](/microsoft-365/security/defender-endpoint/network-protection) -- [Virtualization-Based Protection of Code Integrity](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md) +- [Virtualization-Based Protection of Code Integrity](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity) - [Web Protection](/microsoft-365/security/defender-endpoint/web-protection-overview) -- [Windows Firewall](windows-firewall/windows-firewall-with-advanced-security.md) -- [Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md) +- [Windows Firewall](windows-firewall/windows-firewall-with-advanced-security) +- [Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview) ### Next-generation protection Next-generation protection is designed to identify and block new and emerging threats. Powered by the cloud and machine learning, Microsoft Defender Antivirus can help stop attacks in real-time. From 5cfe05b067d4caca50c9710ba349cc7b27681f34 Mon Sep 17 00:00:00 2001 From: Diana Hanson Date: Wed, 8 Dec 2021 11:00:08 -0700 Subject: [PATCH 2/5] Apply suggestions from code review --- windows/security/threat-protection/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md index 0c47bc6855..0fd6528273 100644 --- a/windows/security/threat-protection/index.md +++ b/windows/security/threat-protection/index.md @@ -34,12 +34,12 @@ See the following articles to learn more about the different areas of Windows th - [Controlled Folder Access](/microsoft-365/security/defender-endpoint/controlled-folders) - [Exploit Protection](/microsoft-365/security/defender-endpoint/exploit-protection) - [Microsoft Defender Application Guard](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview) -- [Microsoft Defender Device Guard](device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control) +- [Microsoft Defender Device Guard](device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md) - [Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview) - [Network Protection](/microsoft-365/security/defender-endpoint/network-protection) - [Virtualization-Based Protection of Code Integrity](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity) - [Web Protection](/microsoft-365/security/defender-endpoint/web-protection-overview) -- [Windows Firewall](windows-firewall/windows-firewall-with-advanced-security) +- [Windows Firewall](windows-firewall/windows-firewall-with-advanced-security.md) - [Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview) ### Next-generation protection From 022a3375abfe9b873b71343025641becab5a57c1 Mon Sep 17 00:00:00 2001 From: Diana Hanson Date: Wed, 8 Dec 2021 11:14:22 -0700 Subject: [PATCH 3/5] Update windows/security/threat-protection/index.md --- windows/security/threat-protection/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md index 0fd6528273..63927cafc8 100644 --- a/windows/security/threat-protection/index.md +++ b/windows/security/threat-protection/index.md @@ -29,7 +29,7 @@ In Windows client, hardware and software work together to help protect you from See the following articles to learn more about the different areas of Windows threat protection: -- [Application Control](/windows-defender-application-control/windows-defender-application-control) +- [Application Control](/security/threat-protection/windows-defender-application-control/windows-defender-application-control) - [Attack Surface Reduction Rules](/microsoft-365/security/defender-endpoint/attack-surface-reduction) - [Controlled Folder Access](/microsoft-365/security/defender-endpoint/controlled-folders) - [Exploit Protection](/microsoft-365/security/defender-endpoint/exploit-protection) From 7b8742d63a912db4cc23ce07a8163b5ab2bc3e92 Mon Sep 17 00:00:00 2001 From: Diana Hanson Date: Wed, 8 Dec 2021 11:19:29 -0700 Subject: [PATCH 4/5] Update windows/security/threat-protection/index.md --- windows/security/threat-protection/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md index 63927cafc8..c76ead4afc 100644 --- a/windows/security/threat-protection/index.md +++ b/windows/security/threat-protection/index.md @@ -29,7 +29,7 @@ In Windows client, hardware and software work together to help protect you from See the following articles to learn more about the different areas of Windows threat protection: -- [Application Control](/security/threat-protection/windows-defender-application-control/windows-defender-application-control) +- [Application Control](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control) - [Attack Surface Reduction Rules](/microsoft-365/security/defender-endpoint/attack-surface-reduction) - [Controlled Folder Access](/microsoft-365/security/defender-endpoint/controlled-folders) - [Exploit Protection](/microsoft-365/security/defender-endpoint/exploit-protection) From 36fd33e7dced43454db3b8d0a627de9d1cbad708 Mon Sep 17 00:00:00 2001 From: Daniel Simpson Date: Wed, 8 Dec 2021 11:22:37 -0800 Subject: [PATCH 5/5] sync w security book --- windows/hub/index.yml | 8 ++++---- windows/security/identity.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/hub/index.yml b/windows/hub/index.yml index 23a3c69aae..cd0a734c01 100644 --- a/windows/hub/index.yml +++ b/windows/hub/index.yml @@ -179,9 +179,6 @@ conceptualContent: - url: /windows/security/index itemType: overview text: Windows Enterprise Security - - url: /windows/privacy/index - itemType: overview - text: Windows Privacy - url: /windows/security/hardware itemType: overview text: Hardware security @@ -193,10 +190,13 @@ conceptualContent: text: Application security - url: /windows/security/identity itemType: overview - text: User and identity security + text: Identity and privacy - url: /windows/security/cloud itemType: overview text: Cloud services + - url: /windows/privacy/index + itemType: overview + text: Windows Privacy # additionalContent section (optional) # Card with summary style diff --git a/windows/security/identity.md b/windows/security/identity.md index 0cfa07beba..7e2e8ca4b9 100644 --- a/windows/security/identity.md +++ b/windows/security/identity.md @@ -13,7 +13,7 @@ ms.prod: m365-security ms.technology: windows-sec --- -# Windows identity and user security +# Windows identity and privacy Malicious actors launch millions of password attacks every day. Weak passwords, password spraying, and phishing are the entry point for many attacks. Knowing that the right user is accessing the right device and the right data is critical to keeping your business, family, and self, safe and secure. Windows Hello, Windows Hello for Business, and Credential Guard enable customers to move to passwordless multifactor authentication (MFA). MFA can reduce the risk of compromise in organizations.