From 18cfbea96905943c3e99c8f470957150b0fbf37f Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:44:15 -0400 Subject: [PATCH] updates --- windows/security/introduction/index.md | 4 +++- .../security-features-edition-requirements.md | 2 +- ...ity-features-licensing-requirements-edu.md | 19 ------------------- ...ecurity-features-licensing-requirements.md | 2 +- 4 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 windows/security/introduction/security-features-licensing-requirements-edu.md diff --git a/windows/security/introduction/index.md b/windows/security/introduction/index.md index b955feffb8..f84afefa03 100644 --- a/windows/security/introduction/index.md +++ b/windows/security/introduction/index.md @@ -3,6 +3,8 @@ title: Introduction to Windows security description: System security book. ms.date: 04/10/2023 ms.topic: tutorial +ms.author: paoloma +author: paolomatarazzo appliesto: - ✅ Windows 11 --- @@ -41,7 +43,7 @@ In Windows 11, hardware and software work together to protect the operating syst To help keep personal and business information protected and private, Windows 11 has multiple layers of application security that safeguard critical data and code integrity. Application isolation and controls, code integrity, privacy controls, and least-privilege principles enable developers to build in security and privacy from the ground up. This integrated security protects against breaches and malware, helps keep data private, and gives IT administrators the controls they need. -In Windows 11, [Microsoft Defender Application Guard](https://docs.microsoft.com/windows-hardware/design/device-experiences/oem-app-guard) [\[2\]](#note2) uses Hyper-V virtualization technology to isolate untrusted websites and Microsoft Office files in containers, separate from and unable to access the host operating system and enterprise data. To protect privacy, Windows 11 also provides more controls over which apps and features can collect and use data such as the device's location, or access resources like camera and microphone. +In Windows 11, [Microsoft Defender Application Guard](/windows-hardware/design/device-experiences/oem-app-guard) [\[2\]](#note2) uses Hyper-V virtualization technology to isolate untrusted websites and Microsoft Office files in containers, separate from and unable to access the host operating system and enterprise data. To protect privacy, Windows 11 also provides more controls over which apps and features can collect and use data such as the device's location, or access resources like camera and microphone. ## Secured identities diff --git a/windows/security/introduction/security-features-edition-requirements.md b/windows/security/introduction/security-features-edition-requirements.md index 8e934ddbdf..41ca2cf5ee 100644 --- a/windows/security/introduction/security-features-edition-requirements.md +++ b/windows/security/introduction/security-features-edition-requirements.md @@ -16,4 +16,4 @@ ms.technology: itpro-security # Security features Windows edition requirements -[!INCLUDE [_commercial](../../whats-new/licensing/includes/_edition-requirements.md)] \ No newline at end of file +[!INCLUDE [_edition-requirements](../../../includes/licensing/security/_edition-requirements.md)] \ No newline at end of file diff --git a/windows/security/introduction/security-features-licensing-requirements-edu.md b/windows/security/introduction/security-features-licensing-requirements-edu.md deleted file mode 100644 index c209c60a6d..0000000000 --- a/windows/security/introduction/security-features-licensing-requirements-edu.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Windows security licensing requirements for Education -description: Learn about Windows features and licensing requirements for the feature included in Windows (Education). -ms.prod: windows-client -author: paolomatarazzo -ms.author: paoloma -manager: aaroncz -ms.collection: -- tier3 -ms.topic: conceptual -ms.date: 03/12/2023 -appliesto: -- ✅ Windows 11 -ms.technology: itpro-security ---- - -# Windows security licensing requirements for Education - -[!INCLUDE [_licensing-requirements](../../whats-new/licensing/includes/_licensing-requirements-edu.md)] \ No newline at end of file diff --git a/windows/security/introduction/security-features-licensing-requirements.md b/windows/security/introduction/security-features-licensing-requirements.md index faad9c9fab..676b071fa0 100644 --- a/windows/security/introduction/security-features-licensing-requirements.md +++ b/windows/security/introduction/security-features-licensing-requirements.md @@ -16,4 +16,4 @@ ms.technology: itpro-security # Windows security licensing requirements -[!INCLUDE [_licensing-requirements](../../whats-new/licensing/includes/_licensing-requirements.md)] \ No newline at end of file +[!INCLUDE [_licensing-requirements](../../../includes/licensing/security/_licensing-requirements.md)] \ No newline at end of file