From b208588bbb8f4654884a6b822e647f5ae1e70db6 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:34:39 -0400 Subject: [PATCH] updates --- .../Access-Control-ACLsSCALS.md} | 2 +- .../Account-Lockout-Policy.md} | 2 +- .../Always-On-VPN.md} | 2 +- .../{applocker.md => security/AppLocker.md} | 2 +- .../Assigned-Access-kiosk-mode.md} | 2 +- .../Attack-surface-reduction-ASR.md} | 2 +- ...-Azure-AD-join-with-single-sign-on-SSO.md} | 2 +- .../{bitlocker.md => security/BitLocker.md} | 2 +- ...ooth-pairing-and-connection-protection.md} | 2 +- .../Common-Criteria-certifications.md} | 2 +- .../Controlled-folder-access.md} | 2 +- .../Device-health-attestation-service.md} | 2 +- .../Direct-Access.md} | 2 +- .../Email-Encryption-SMIME.md} | 2 +- .../Encrypted-hard-drive.md} | 2 +- .../licensing/security/Endpoint-Analytics.md | 22 ++++++++++++ ...d-phishing-protection-with-SmartScreen.md} | 2 +- .../Exploit-protection.md} | 2 +- ...ast-Identity-Online-FIDO2-security-key.md} | 2 +- ...rocessing-Standard-FIPS-140-validation.md} | 2 +- .../Federated-sign-in.md} | 2 +- .../Hardware-enforced-stack-protection.md} | 2 +- ...pervisor-protected-Code-Integrity-HVCI.md} | 2 +- ...el-Direct-Memory-Access-DMA-protection.md} | 2 +- .../Local-Administrator-Password-Solution.md} | 2 +- ...ocal-Security-Authority-LSA-Protection.md} | 2 +- ...Device-Management-MDM-and-group-policy.md} | 2 +- .../Measured-boot.md} | 2 +- .../Microsoft-Defender-Antivirus.md} | 2 +- ...plication-Guard-MDAG-configure-via-MDM.md} | 2 +- ...erprise-mode-and-enterprise-management.md} | 2 +- ...on-Guard-MDAG-for-Edge-standalone-mode.md} | 2 +- ...cation-Guard-MDAG-for-Microsoft-Office.md} | 2 +- ...der-Application-Guard-MDAG-public-APIs.md} | 2 +- .../Microsoft-Defender-SmartScreen.md} | 2 +- .../Microsoft-Defender-for-Endpoint.md} | 2 +- .../Microsoft-Pluton-security-processor.md} | 2 +- .../Microsoft-Vulnerable-Driver-Blocklist.md} | 2 +- .../Opportunistic-Wireless-Encryption-OWE.md} | 2 +- .../Personal-data-encryption-PDE.md} | 2 +- .../Privacy-Resource-Usage.md} | 2 +- .../Privacy-Transparency-and-Controls.md} | 2 +- .../Remote-wipe-Autopilot-reset.md} | 2 +- .../Secure-Boot-and-Trusted-Boot.md} | 2 +- .../Secured-core-PC.md} | 2 +- .../Secured-core-configuration-lock.md} | 2 +- .../Security-baselines-with-Intune.md} | 2 +- ...Server-Message-Block-Direct-SMB-Direct.md} | 2 +- .../Server-Message-Block-SMB-file-service.md} | 2 +- .../Smart-App-Control.md} | 2 +- .../Smart-Cards-for-Windows-Service.md} | 2 +- .../Tamper-protection-settings-for-MDE.md} | 2 +- .../Transport-layer-security-TLS.md} | 2 +- .../Trusted-Platform-Module-TPM-20.md} | 2 +- .../Universal-Print.md} | 2 +- .../User-Account-Control-UAC.md} | 2 +- .../Virtual-Private-Network-VPN.md} | 2 +- .../Virtualization-based-security-VBS.md} | 2 +- .../WiFi-Security.md} | 2 +- .../Windows-Autopatch.md} | 2 +- .../Windows-Autopilot.md} | 2 +- ...dows-Defender-Application-Control-WDAC.md} | 2 +- .../Windows-Defender-Credential-Guard.md} | 2 +- ...ndows-Defender-Remote-Credential-Guard.md} | 2 +- .../Windows-Defender-System-Guard.md} | 2 +- .../Windows-Firewall.md} | 2 +- ...-Business-Enhanced-Security-Sign-in-ESS.md | 22 ++++++++++++ .../Windows-Hello-for-Business.md} | 2 +- .../Windows-Sandbox.md} | 2 +- ...-Security-policy-settings-and-auditing.md} | 2 +- .../security/Windows-Update-for-Business.md | 22 ++++++++++++ .../Windows-containers.md} | 2 +- ...eature-and-expedite-updates-with-Intune.md | 22 ++++++++++++ .../Windows-presence-sensing.md} | 2 +- .../{ => security}/_edition-requirements.md | 34 ++++++++++--------- .../{ => security}/_licensing-requirements.md | 32 +++++++++-------- ...business-enhanced-security-sign-in-ess-.md | 22 ------------ 77 files changed, 193 insertions(+), 123 deletions(-) rename includes/licensing/{access-control-aclsscals.md => security/Access-Control-ACLsSCALS.md} (97%) rename includes/licensing/{account-lockout-policy.md => security/Account-Lockout-Policy.md} (97%) rename includes/licensing/{always-on-vpn.md => security/Always-On-VPN.md} (97%) rename includes/licensing/{applocker.md => security/AppLocker.md} (97%) rename includes/licensing/{assigned-access-kiosk-mode.md => security/Assigned-Access-kiosk-mode.md} (97%) rename includes/licensing/{attack-surface-reduction-asr.md => security/Attack-surface-reduction-ASR.md} (97%) rename includes/licensing/{azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md => security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md} (97%) rename includes/licensing/{bitlocker.md => security/BitLocker.md} (97%) rename includes/licensing/{bluetooth-pairing-and-connection-protection.md => security/Bluetooth-pairing-and-connection-protection.md} (97%) rename includes/licensing/{common-criteria-certifications.md => security/Common-Criteria-certifications.md} (97%) rename includes/licensing/{controlled-folder-access.md => security/Controlled-folder-access.md} (97%) rename includes/licensing/{device-health-attestation-service.md => security/Device-health-attestation-service.md} (97%) rename includes/licensing/{direct-access.md => security/Direct-Access.md} (97%) rename includes/licensing/{email-encryption-smime.md => security/Email-Encryption-SMIME.md} (97%) rename includes/licensing/{encrypted-hard-drive.md => security/Encrypted-hard-drive.md} (97%) create mode 100644 includes/licensing/security/Endpoint-Analytics.md rename includes/licensing/{enhanced-phishing-protection-with-smartscreen.md => security/Enhanced-phishing-protection-with-SmartScreen.md} (97%) rename includes/licensing/{exploit-protection.md => security/Exploit-protection.md} (97%) rename includes/licensing/{fast-identity-online-fido2-security-key.md => security/Fast-Identity-Online-FIDO2-security-key.md} (97%) rename includes/licensing/{federal-information-processing-standard-fips-140-validation.md => security/Federal-Information-Processing-Standard-FIPS-140-validation.md} (97%) rename includes/licensing/{federated-sign-in.md => security/Federated-sign-in.md} (97%) rename includes/licensing/{hardware-enforced-stack-protection.md => security/Hardware-enforced-stack-protection.md} (97%) rename includes/licensing/{hypervisor-protected-code-integrity-hvci.md => security/Hypervisor-protected-Code-Integrity-HVCI.md} (97%) rename includes/licensing/{kernel-direct-memory-access-dma-protection.md => security/Kernel-Direct-Memory-Access-DMA-protection.md} (97%) rename includes/licensing/{local-administrator-password-solution.md => security/Local-Administrator-Password-Solution.md} (97%) rename includes/licensing/{local-security-authority-lsa-protection.md => security/Local-Security-Authority-LSA-Protection.md} (97%) rename includes/licensing/{manage-by-mobile-device-management-mdm-and-group-policy.md => security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md} (97%) rename includes/licensing/{measured-boot.md => security/Measured-boot.md} (97%) rename includes/licensing/{microsoft-defender-antivirus.md => security/Microsoft-Defender-Antivirus.md} (97%) rename includes/licensing/{microsoft-defender-application-guard-mdag-configure-via-mdm.md => security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md} (97%) rename includes/licensing/{microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md => security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md} (97%) rename includes/licensing/{microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md => security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md} (97%) rename includes/licensing/{microsoft-defender-application-guard-mdag-for-microsoft-office.md => security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md} (97%) rename includes/licensing/{microsoft-defender-application-guard-mdag-public-apis.md => security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md} (97%) rename includes/licensing/{microsoft-defender-smartscreen.md => security/Microsoft-Defender-SmartScreen.md} (97%) rename includes/licensing/{microsoft-defender-for-endpoint.md => security/Microsoft-Defender-for-Endpoint.md} (97%) rename includes/licensing/{microsoft-pluton-security-processor.md => security/Microsoft-Pluton-security-processor.md} (97%) rename includes/licensing/{microsoft-vulnerable-driver-blocklist.md => security/Microsoft-Vulnerable-Driver-Blocklist.md} (97%) rename includes/licensing/{opportunistic-wireless-encryption-owe.md => security/Opportunistic-Wireless-Encryption-OWE.md} (97%) rename includes/licensing/{personal-data-encryption-pde.md => security/Personal-data-encryption-PDE.md} (97%) rename includes/licensing/{privacy-resource-usage.md => security/Privacy-Resource-Usage.md} (97%) rename includes/licensing/{privacy-transparency-and-controls.md => security/Privacy-Transparency-and-Controls.md} (97%) rename includes/licensing/{remote-wipe-autopilot-reset.md => security/Remote-wipe-Autopilot-reset.md} (97%) rename includes/licensing/{secure-boot-and-trusted-boot.md => security/Secure-Boot-and-Trusted-Boot.md} (97%) rename includes/licensing/{secured-core-pc.md => security/Secured-core-PC.md} (97%) rename includes/licensing/{secured-core-configuration-lock.md => security/Secured-core-configuration-lock.md} (97%) rename includes/licensing/{security-baselines-with-intune.md => security/Security-baselines-with-Intune.md} (97%) rename includes/licensing/{server-message-block-direct-smb-direct.md => security/Server-Message-Block-Direct-SMB-Direct.md} (97%) rename includes/licensing/{server-message-block-smb-file-service.md => security/Server-Message-Block-SMB-file-service.md} (97%) rename includes/licensing/{smart-app-control.md => security/Smart-App-Control.md} (97%) rename includes/licensing/{smart-cards-for-windows-service.md => security/Smart-Cards-for-Windows-Service.md} (97%) rename includes/licensing/{tamper-protection-settings-for-mde.md => security/Tamper-protection-settings-for-MDE.md} (97%) rename includes/licensing/{transport-layer-security-tls.md => security/Transport-layer-security-TLS.md} (97%) rename includes/licensing/{trusted-platform-module-tpm-20.md => security/Trusted-Platform-Module-TPM-20.md} (97%) rename includes/licensing/{universal-print.md => security/Universal-Print.md} (97%) rename includes/licensing/{user-account-control-uac.md => security/User-Account-Control-UAC.md} (97%) rename includes/licensing/{virtual-private-network-vpn.md => security/Virtual-Private-Network-VPN.md} (97%) rename includes/licensing/{virtualization-based-security-vbs.md => security/Virtualization-based-security-VBS.md} (97%) rename includes/licensing/{wifi-security.md => security/WiFi-Security.md} (97%) rename includes/licensing/{windows-autopatch.md => security/Windows-Autopatch.md} (97%) rename includes/licensing/{windows-autopilot.md => security/Windows-Autopilot.md} (97%) rename includes/licensing/{windows-defender-application-control-wdac.md => security/Windows-Defender-Application-Control-WDAC.md} (97%) rename includes/licensing/{windows-defender-credential-guard.md => security/Windows-Defender-Credential-Guard.md} (97%) rename includes/licensing/{windows-defender-remote-credential-guard.md => security/Windows-Defender-Remote-Credential-Guard.md} (97%) rename includes/licensing/{windows-defender-system-guard.md => security/Windows-Defender-System-Guard.md} (97%) rename includes/licensing/{windows-firewall.md => security/Windows-Firewall.md} (97%) create mode 100644 includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md rename includes/licensing/{windows-hello-for-business.md => security/Windows-Hello-for-Business.md} (97%) rename includes/licensing/{windows-sandbox.md => security/Windows-Sandbox.md} (97%) rename includes/licensing/{windows-security-policy-settings-and-auditing.md => security/Windows-Security-policy-settings-and-auditing.md} (97%) create mode 100644 includes/licensing/security/Windows-Update-for-Business.md rename includes/licensing/{windows-containers.md => security/Windows-containers.md} (97%) create mode 100644 includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md rename includes/licensing/{windows-presence-sensing.md => security/Windows-presence-sensing.md} (97%) rename includes/licensing/{ => security}/_edition-requirements.md (75%) rename includes/licensing/{ => security}/_licensing-requirements.md (76%) delete mode 100644 includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md diff --git a/includes/licensing/access-control-aclsscals.md b/includes/licensing/security/Access-Control-ACLsSCALS.md similarity index 97% rename from includes/licensing/access-control-aclsscals.md rename to includes/licensing/security/Access-Control-ACLsSCALS.md index b61af93fa8..0364fa5804 100644 --- a/includes/licensing/access-control-aclsscals.md +++ b/includes/licensing/security/Access-Control-ACLsSCALS.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/account-lockout-policy.md b/includes/licensing/security/Account-Lockout-Policy.md similarity index 97% rename from includes/licensing/account-lockout-policy.md rename to includes/licensing/security/Account-Lockout-Policy.md index 8b18a6b661..df33653d30 100644 --- a/includes/licensing/account-lockout-policy.md +++ b/includes/licensing/security/Account-Lockout-Policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/always-on-vpn.md b/includes/licensing/security/Always-On-VPN.md similarity index 97% rename from includes/licensing/always-on-vpn.md rename to includes/licensing/security/Always-On-VPN.md index 81d7029add..0dc04a9527 100644 --- a/includes/licensing/always-on-vpn.md +++ b/includes/licensing/security/Always-On-VPN.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/applocker.md b/includes/licensing/security/AppLocker.md similarity index 97% rename from includes/licensing/applocker.md rename to includes/licensing/security/AppLocker.md index 2fff9e6ab8..ba9a2131d6 100644 --- a/includes/licensing/applocker.md +++ b/includes/licensing/security/AppLocker.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/assigned-access-kiosk-mode.md b/includes/licensing/security/Assigned-Access-kiosk-mode.md similarity index 97% rename from includes/licensing/assigned-access-kiosk-mode.md rename to includes/licensing/security/Assigned-Access-kiosk-mode.md index a82316265b..29e6639e12 100644 --- a/includes/licensing/assigned-access-kiosk-mode.md +++ b/includes/licensing/security/Assigned-Access-kiosk-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/attack-surface-reduction-asr.md b/includes/licensing/security/Attack-surface-reduction-ASR.md similarity index 97% rename from includes/licensing/attack-surface-reduction-asr.md rename to includes/licensing/security/Attack-surface-reduction-ASR.md index 3a5d744e92..b9fcdbbbec 100644 --- a/includes/licensing/attack-surface-reduction-asr.md +++ b/includes/licensing/security/Attack-surface-reduction-ASR.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md b/includes/licensing/security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md similarity index 97% rename from includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md rename to includes/licensing/security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md index 8617927b9e..98caba3406 100644 --- a/includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md +++ b/includes/licensing/security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/bitlocker.md b/includes/licensing/security/BitLocker.md similarity index 97% rename from includes/licensing/bitlocker.md rename to includes/licensing/security/BitLocker.md index 94fd275f1b..bb61941f20 100644 --- a/includes/licensing/bitlocker.md +++ b/includes/licensing/security/BitLocker.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/bluetooth-pairing-and-connection-protection.md b/includes/licensing/security/Bluetooth-pairing-and-connection-protection.md similarity index 97% rename from includes/licensing/bluetooth-pairing-and-connection-protection.md rename to includes/licensing/security/Bluetooth-pairing-and-connection-protection.md index 1e9b048129..452c4e8579 100644 --- a/includes/licensing/bluetooth-pairing-and-connection-protection.md +++ b/includes/licensing/security/Bluetooth-pairing-and-connection-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/common-criteria-certifications.md b/includes/licensing/security/Common-Criteria-certifications.md similarity index 97% rename from includes/licensing/common-criteria-certifications.md rename to includes/licensing/security/Common-Criteria-certifications.md index c79ce326be..fbcc3a78f3 100644 --- a/includes/licensing/common-criteria-certifications.md +++ b/includes/licensing/security/Common-Criteria-certifications.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/controlled-folder-access.md b/includes/licensing/security/Controlled-folder-access.md similarity index 97% rename from includes/licensing/controlled-folder-access.md rename to includes/licensing/security/Controlled-folder-access.md index 2a61948725..18accb297d 100644 --- a/includes/licensing/controlled-folder-access.md +++ b/includes/licensing/security/Controlled-folder-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/device-health-attestation-service.md b/includes/licensing/security/Device-health-attestation-service.md similarity index 97% rename from includes/licensing/device-health-attestation-service.md rename to includes/licensing/security/Device-health-attestation-service.md index 6a665ad462..385963b2a3 100644 --- a/includes/licensing/device-health-attestation-service.md +++ b/includes/licensing/security/Device-health-attestation-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/direct-access.md b/includes/licensing/security/Direct-Access.md similarity index 97% rename from includes/licensing/direct-access.md rename to includes/licensing/security/Direct-Access.md index 8b51088d50..ba0ab0da50 100644 --- a/includes/licensing/direct-access.md +++ b/includes/licensing/security/Direct-Access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/email-encryption-smime.md b/includes/licensing/security/Email-Encryption-SMIME.md similarity index 97% rename from includes/licensing/email-encryption-smime.md rename to includes/licensing/security/Email-Encryption-SMIME.md index 4927db3ddc..e73e64f50b 100644 --- a/includes/licensing/email-encryption-smime.md +++ b/includes/licensing/security/Email-Encryption-SMIME.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/encrypted-hard-drive.md b/includes/licensing/security/Encrypted-hard-drive.md similarity index 97% rename from includes/licensing/encrypted-hard-drive.md rename to includes/licensing/security/Encrypted-hard-drive.md index bed3785662..35b83298ce 100644 --- a/includes/licensing/encrypted-hard-drive.md +++ b/includes/licensing/security/Encrypted-hard-drive.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/security/Endpoint-Analytics.md b/includes/licensing/security/Endpoint-Analytics.md new file mode 100644 index 0000000000..428534c57d --- /dev/null +++ b/includes/licensing/security/Endpoint-Analytics.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/21/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Endpoint Analytics: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Endpoint Analytics license entitlements are granted by the following licenses: + +|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|:---:|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md b/includes/licensing/security/Enhanced-phishing-protection-with-SmartScreen.md similarity index 97% rename from includes/licensing/enhanced-phishing-protection-with-smartscreen.md rename to includes/licensing/security/Enhanced-phishing-protection-with-SmartScreen.md index a686eedfa0..ac0579fb14 100644 --- a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md +++ b/includes/licensing/security/Enhanced-phishing-protection-with-SmartScreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/exploit-protection.md b/includes/licensing/security/Exploit-protection.md similarity index 97% rename from includes/licensing/exploit-protection.md rename to includes/licensing/security/Exploit-protection.md index 79075680e1..5f38d31dc2 100644 --- a/includes/licensing/exploit-protection.md +++ b/includes/licensing/security/Exploit-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/fast-identity-online-fido2-security-key.md b/includes/licensing/security/Fast-Identity-Online-FIDO2-security-key.md similarity index 97% rename from includes/licensing/fast-identity-online-fido2-security-key.md rename to includes/licensing/security/Fast-Identity-Online-FIDO2-security-key.md index b77f7bcdda..be5c9e5a7f 100644 --- a/includes/licensing/fast-identity-online-fido2-security-key.md +++ b/includes/licensing/security/Fast-Identity-Online-FIDO2-security-key.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/federal-information-processing-standard-fips-140-validation.md b/includes/licensing/security/Federal-Information-Processing-Standard-FIPS-140-validation.md similarity index 97% rename from includes/licensing/federal-information-processing-standard-fips-140-validation.md rename to includes/licensing/security/Federal-Information-Processing-Standard-FIPS-140-validation.md index c69f77ad4d..c628b32b6f 100644 --- a/includes/licensing/federal-information-processing-standard-fips-140-validation.md +++ b/includes/licensing/security/Federal-Information-Processing-Standard-FIPS-140-validation.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/security/Federated-sign-in.md similarity index 97% rename from includes/licensing/federated-sign-in.md rename to includes/licensing/security/Federated-sign-in.md index dd7843efd2..98e24a8a1c 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/security/Federated-sign-in.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/hardware-enforced-stack-protection.md b/includes/licensing/security/Hardware-enforced-stack-protection.md similarity index 97% rename from includes/licensing/hardware-enforced-stack-protection.md rename to includes/licensing/security/Hardware-enforced-stack-protection.md index 78d7aeec9a..e80f671329 100644 --- a/includes/licensing/hardware-enforced-stack-protection.md +++ b/includes/licensing/security/Hardware-enforced-stack-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/hypervisor-protected-code-integrity-hvci.md b/includes/licensing/security/Hypervisor-protected-Code-Integrity-HVCI.md similarity index 97% rename from includes/licensing/hypervisor-protected-code-integrity-hvci.md rename to includes/licensing/security/Hypervisor-protected-Code-Integrity-HVCI.md index 7e61d752bb..afc25a3761 100644 --- a/includes/licensing/hypervisor-protected-code-integrity-hvci.md +++ b/includes/licensing/security/Hypervisor-protected-Code-Integrity-HVCI.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/kernel-direct-memory-access-dma-protection.md b/includes/licensing/security/Kernel-Direct-Memory-Access-DMA-protection.md similarity index 97% rename from includes/licensing/kernel-direct-memory-access-dma-protection.md rename to includes/licensing/security/Kernel-Direct-Memory-Access-DMA-protection.md index 279343b746..7616cce432 100644 --- a/includes/licensing/kernel-direct-memory-access-dma-protection.md +++ b/includes/licensing/security/Kernel-Direct-Memory-Access-DMA-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/local-administrator-password-solution.md b/includes/licensing/security/Local-Administrator-Password-Solution.md similarity index 97% rename from includes/licensing/local-administrator-password-solution.md rename to includes/licensing/security/Local-Administrator-Password-Solution.md index f3755e26ef..f2e7e52112 100644 --- a/includes/licensing/local-administrator-password-solution.md +++ b/includes/licensing/security/Local-Administrator-Password-Solution.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/local-security-authority-lsa-protection.md b/includes/licensing/security/Local-Security-Authority-LSA-Protection.md similarity index 97% rename from includes/licensing/local-security-authority-lsa-protection.md rename to includes/licensing/security/Local-Security-Authority-LSA-Protection.md index d73f52dbb0..57b8046bab 100644 --- a/includes/licensing/local-security-authority-lsa-protection.md +++ b/includes/licensing/security/Local-Security-Authority-LSA-Protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md b/includes/licensing/security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md similarity index 97% rename from includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md rename to includes/licensing/security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md index 0f451c84a3..1b35f363cd 100644 --- a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md +++ b/includes/licensing/security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/measured-boot.md b/includes/licensing/security/Measured-boot.md similarity index 97% rename from includes/licensing/measured-boot.md rename to includes/licensing/security/Measured-boot.md index 6ef4375480..3734f132f2 100644 --- a/includes/licensing/measured-boot.md +++ b/includes/licensing/security/Measured-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-antivirus.md b/includes/licensing/security/Microsoft-Defender-Antivirus.md similarity index 97% rename from includes/licensing/microsoft-defender-antivirus.md rename to includes/licensing/security/Microsoft-Defender-Antivirus.md index 9c1be50238..fe7c31a35f 100644 --- a/includes/licensing/microsoft-defender-antivirus.md +++ b/includes/licensing/security/Microsoft-Defender-Antivirus.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md similarity index 97% rename from includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md rename to includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md index 51a3ed00c4..d8db86399a 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md similarity index 97% rename from includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md rename to includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md index e54c7297e5..c0a5aad999 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md similarity index 97% rename from includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md rename to includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md index 63209d39a9..f98c67144f 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md +++ b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md similarity index 97% rename from includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md rename to includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md index ddf7f5724f..be2ed700a1 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md similarity index 97% rename from includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md rename to includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md index 8013ede707..b18edb8fc7 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ b/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-smartscreen.md b/includes/licensing/security/Microsoft-Defender-SmartScreen.md similarity index 97% rename from includes/licensing/microsoft-defender-smartscreen.md rename to includes/licensing/security/Microsoft-Defender-SmartScreen.md index 79341e2f69..ace8bc007a 100644 --- a/includes/licensing/microsoft-defender-smartscreen.md +++ b/includes/licensing/security/Microsoft-Defender-SmartScreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/security/Microsoft-Defender-for-Endpoint.md similarity index 97% rename from includes/licensing/microsoft-defender-for-endpoint.md rename to includes/licensing/security/Microsoft-Defender-for-Endpoint.md index 64f94347cb..8858cb9ecf 100644 --- a/includes/licensing/microsoft-defender-for-endpoint.md +++ b/includes/licensing/security/Microsoft-Defender-for-Endpoint.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-pluton-security-processor.md b/includes/licensing/security/Microsoft-Pluton-security-processor.md similarity index 97% rename from includes/licensing/microsoft-pluton-security-processor.md rename to includes/licensing/security/Microsoft-Pluton-security-processor.md index a829864982..f702340492 100644 --- a/includes/licensing/microsoft-pluton-security-processor.md +++ b/includes/licensing/security/Microsoft-Pluton-security-processor.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-vulnerable-driver-blocklist.md b/includes/licensing/security/Microsoft-Vulnerable-Driver-Blocklist.md similarity index 97% rename from includes/licensing/microsoft-vulnerable-driver-blocklist.md rename to includes/licensing/security/Microsoft-Vulnerable-Driver-Blocklist.md index 5e8d7d0619..9fc3e71120 100644 --- a/includes/licensing/microsoft-vulnerable-driver-blocklist.md +++ b/includes/licensing/security/Microsoft-Vulnerable-Driver-Blocklist.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/opportunistic-wireless-encryption-owe.md b/includes/licensing/security/Opportunistic-Wireless-Encryption-OWE.md similarity index 97% rename from includes/licensing/opportunistic-wireless-encryption-owe.md rename to includes/licensing/security/Opportunistic-Wireless-Encryption-OWE.md index 329b98a56f..dd25a92e7e 100644 --- a/includes/licensing/opportunistic-wireless-encryption-owe.md +++ b/includes/licensing/security/Opportunistic-Wireless-Encryption-OWE.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/personal-data-encryption-pde.md b/includes/licensing/security/Personal-data-encryption-PDE.md similarity index 97% rename from includes/licensing/personal-data-encryption-pde.md rename to includes/licensing/security/Personal-data-encryption-PDE.md index 17db0c0d9b..bfb8905cf0 100644 --- a/includes/licensing/personal-data-encryption-pde.md +++ b/includes/licensing/security/Personal-data-encryption-PDE.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/privacy-resource-usage.md b/includes/licensing/security/Privacy-Resource-Usage.md similarity index 97% rename from includes/licensing/privacy-resource-usage.md rename to includes/licensing/security/Privacy-Resource-Usage.md index 1912cef847..2685ed854c 100644 --- a/includes/licensing/privacy-resource-usage.md +++ b/includes/licensing/security/Privacy-Resource-Usage.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/privacy-transparency-and-controls.md b/includes/licensing/security/Privacy-Transparency-and-Controls.md similarity index 97% rename from includes/licensing/privacy-transparency-and-controls.md rename to includes/licensing/security/Privacy-Transparency-and-Controls.md index 423adcfba8..c8e3ecbddb 100644 --- a/includes/licensing/privacy-transparency-and-controls.md +++ b/includes/licensing/security/Privacy-Transparency-and-Controls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/remote-wipe-autopilot-reset.md b/includes/licensing/security/Remote-wipe-Autopilot-reset.md similarity index 97% rename from includes/licensing/remote-wipe-autopilot-reset.md rename to includes/licensing/security/Remote-wipe-Autopilot-reset.md index d4c0bc571a..0994f56a85 100644 --- a/includes/licensing/remote-wipe-autopilot-reset.md +++ b/includes/licensing/security/Remote-wipe-Autopilot-reset.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/secure-boot-and-trusted-boot.md b/includes/licensing/security/Secure-Boot-and-Trusted-Boot.md similarity index 97% rename from includes/licensing/secure-boot-and-trusted-boot.md rename to includes/licensing/security/Secure-Boot-and-Trusted-Boot.md index fd57393232..85dc0feba8 100644 --- a/includes/licensing/secure-boot-and-trusted-boot.md +++ b/includes/licensing/security/Secure-Boot-and-Trusted-Boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/secured-core-pc.md b/includes/licensing/security/Secured-core-PC.md similarity index 97% rename from includes/licensing/secured-core-pc.md rename to includes/licensing/security/Secured-core-PC.md index cd335f6263..c6b3f79578 100644 --- a/includes/licensing/secured-core-pc.md +++ b/includes/licensing/security/Secured-core-PC.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/secured-core-configuration-lock.md b/includes/licensing/security/Secured-core-configuration-lock.md similarity index 97% rename from includes/licensing/secured-core-configuration-lock.md rename to includes/licensing/security/Secured-core-configuration-lock.md index 282eefbd8f..e64c67ca74 100644 --- a/includes/licensing/secured-core-configuration-lock.md +++ b/includes/licensing/security/Secured-core-configuration-lock.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/security-baselines-with-intune.md b/includes/licensing/security/Security-baselines-with-Intune.md similarity index 97% rename from includes/licensing/security-baselines-with-intune.md rename to includes/licensing/security/Security-baselines-with-Intune.md index bc9a0ca9c2..c2d8d272a6 100644 --- a/includes/licensing/security-baselines-with-intune.md +++ b/includes/licensing/security/Security-baselines-with-Intune.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/server-message-block-direct-smb-direct.md b/includes/licensing/security/Server-Message-Block-Direct-SMB-Direct.md similarity index 97% rename from includes/licensing/server-message-block-direct-smb-direct.md rename to includes/licensing/security/Server-Message-Block-Direct-SMB-Direct.md index 4b468b65a6..e1e6dea11a 100644 --- a/includes/licensing/server-message-block-direct-smb-direct.md +++ b/includes/licensing/security/Server-Message-Block-Direct-SMB-Direct.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/server-message-block-smb-file-service.md b/includes/licensing/security/Server-Message-Block-SMB-file-service.md similarity index 97% rename from includes/licensing/server-message-block-smb-file-service.md rename to includes/licensing/security/Server-Message-Block-SMB-file-service.md index 1e1f9fc40a..d1c3090375 100644 --- a/includes/licensing/server-message-block-smb-file-service.md +++ b/includes/licensing/security/Server-Message-Block-SMB-file-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/smart-app-control.md b/includes/licensing/security/Smart-App-Control.md similarity index 97% rename from includes/licensing/smart-app-control.md rename to includes/licensing/security/Smart-App-Control.md index 6ea29fbfb6..232c73dcb7 100644 --- a/includes/licensing/smart-app-control.md +++ b/includes/licensing/security/Smart-App-Control.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/smart-cards-for-windows-service.md b/includes/licensing/security/Smart-Cards-for-Windows-Service.md similarity index 97% rename from includes/licensing/smart-cards-for-windows-service.md rename to includes/licensing/security/Smart-Cards-for-Windows-Service.md index 803b2af86c..4f8931fa0c 100644 --- a/includes/licensing/smart-cards-for-windows-service.md +++ b/includes/licensing/security/Smart-Cards-for-Windows-Service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/tamper-protection-settings-for-mde.md b/includes/licensing/security/Tamper-protection-settings-for-MDE.md similarity index 97% rename from includes/licensing/tamper-protection-settings-for-mde.md rename to includes/licensing/security/Tamper-protection-settings-for-MDE.md index 28cbc5ff70..4d9c90a617 100644 --- a/includes/licensing/tamper-protection-settings-for-mde.md +++ b/includes/licensing/security/Tamper-protection-settings-for-MDE.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/transport-layer-security-tls.md b/includes/licensing/security/Transport-layer-security-TLS.md similarity index 97% rename from includes/licensing/transport-layer-security-tls.md rename to includes/licensing/security/Transport-layer-security-TLS.md index 43104ded20..862c656964 100644 --- a/includes/licensing/transport-layer-security-tls.md +++ b/includes/licensing/security/Transport-layer-security-TLS.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/trusted-platform-module-tpm-20.md b/includes/licensing/security/Trusted-Platform-Module-TPM-20.md similarity index 97% rename from includes/licensing/trusted-platform-module-tpm-20.md rename to includes/licensing/security/Trusted-Platform-Module-TPM-20.md index 60a46d1917..6dd2f782e6 100644 --- a/includes/licensing/trusted-platform-module-tpm-20.md +++ b/includes/licensing/security/Trusted-Platform-Module-TPM-20.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/universal-print.md b/includes/licensing/security/Universal-Print.md similarity index 97% rename from includes/licensing/universal-print.md rename to includes/licensing/security/Universal-Print.md index a346b3ff35..8edd1830a1 100644 --- a/includes/licensing/universal-print.md +++ b/includes/licensing/security/Universal-Print.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/user-account-control-uac.md b/includes/licensing/security/User-Account-Control-UAC.md similarity index 97% rename from includes/licensing/user-account-control-uac.md rename to includes/licensing/security/User-Account-Control-UAC.md index 41276ad062..887d3a908f 100644 --- a/includes/licensing/user-account-control-uac.md +++ b/includes/licensing/security/User-Account-Control-UAC.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/virtual-private-network-vpn.md b/includes/licensing/security/Virtual-Private-Network-VPN.md similarity index 97% rename from includes/licensing/virtual-private-network-vpn.md rename to includes/licensing/security/Virtual-Private-Network-VPN.md index ea1d783bc4..7c00cca450 100644 --- a/includes/licensing/virtual-private-network-vpn.md +++ b/includes/licensing/security/Virtual-Private-Network-VPN.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/virtualization-based-security-vbs.md b/includes/licensing/security/Virtualization-based-security-VBS.md similarity index 97% rename from includes/licensing/virtualization-based-security-vbs.md rename to includes/licensing/security/Virtualization-based-security-VBS.md index 25e88ae0f7..65016d71b3 100644 --- a/includes/licensing/virtualization-based-security-vbs.md +++ b/includes/licensing/security/Virtualization-based-security-VBS.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/wifi-security.md b/includes/licensing/security/WiFi-Security.md similarity index 97% rename from includes/licensing/wifi-security.md rename to includes/licensing/security/WiFi-Security.md index 64cd094090..73a23e84a4 100644 --- a/includes/licensing/wifi-security.md +++ b/includes/licensing/security/WiFi-Security.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/security/Windows-Autopatch.md similarity index 97% rename from includes/licensing/windows-autopatch.md rename to includes/licensing/security/Windows-Autopatch.md index 5befd266fd..015bbc1455 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/security/Windows-Autopatch.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-autopilot.md b/includes/licensing/security/Windows-Autopilot.md similarity index 97% rename from includes/licensing/windows-autopilot.md rename to includes/licensing/security/Windows-Autopilot.md index 864a70420d..57ca063e7e 100644 --- a/includes/licensing/windows-autopilot.md +++ b/includes/licensing/security/Windows-Autopilot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-application-control-wdac.md b/includes/licensing/security/Windows-Defender-Application-Control-WDAC.md similarity index 97% rename from includes/licensing/windows-defender-application-control-wdac.md rename to includes/licensing/security/Windows-Defender-Application-Control-WDAC.md index e24df8d22d..197986a72d 100644 --- a/includes/licensing/windows-defender-application-control-wdac.md +++ b/includes/licensing/security/Windows-Defender-Application-Control-WDAC.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-credential-guard.md b/includes/licensing/security/Windows-Defender-Credential-Guard.md similarity index 97% rename from includes/licensing/windows-defender-credential-guard.md rename to includes/licensing/security/Windows-Defender-Credential-Guard.md index f8de73da86..122f5a02ba 100644 --- a/includes/licensing/windows-defender-credential-guard.md +++ b/includes/licensing/security/Windows-Defender-Credential-Guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-remote-credential-guard.md b/includes/licensing/security/Windows-Defender-Remote-Credential-Guard.md similarity index 97% rename from includes/licensing/windows-defender-remote-credential-guard.md rename to includes/licensing/security/Windows-Defender-Remote-Credential-Guard.md index 427cb21ad5..01fab46e8d 100644 --- a/includes/licensing/windows-defender-remote-credential-guard.md +++ b/includes/licensing/security/Windows-Defender-Remote-Credential-Guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-system-guard.md b/includes/licensing/security/Windows-Defender-System-Guard.md similarity index 97% rename from includes/licensing/windows-defender-system-guard.md rename to includes/licensing/security/Windows-Defender-System-Guard.md index b41b5fe127..a4b2994d2a 100644 --- a/includes/licensing/windows-defender-system-guard.md +++ b/includes/licensing/security/Windows-Defender-System-Guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-firewall.md b/includes/licensing/security/Windows-Firewall.md similarity index 97% rename from includes/licensing/windows-firewall.md rename to includes/licensing/security/Windows-Firewall.md index f315039fc8..946a1000ca 100644 --- a/includes/licensing/windows-firewall.md +++ b/includes/licensing/security/Windows-Firewall.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md b/includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md new file mode 100644 index 0000000000..ec3c3e65cc --- /dev/null +++ b/includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/21/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Hello for Business Enhanced Security Sign-in (ESS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Hello for Business Enhanced Security Sign-in (ESS) license entitlements are granted by the following licenses: + +|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|:---:|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/windows-hello-for-business.md b/includes/licensing/security/Windows-Hello-for-Business.md similarity index 97% rename from includes/licensing/windows-hello-for-business.md rename to includes/licensing/security/Windows-Hello-for-Business.md index 04670f3262..ed78c5c3a7 100644 --- a/includes/licensing/windows-hello-for-business.md +++ b/includes/licensing/security/Windows-Hello-for-Business.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-sandbox.md b/includes/licensing/security/Windows-Sandbox.md similarity index 97% rename from includes/licensing/windows-sandbox.md rename to includes/licensing/security/Windows-Sandbox.md index 7b4226f716..9745ec4edd 100644 --- a/includes/licensing/windows-sandbox.md +++ b/includes/licensing/security/Windows-Sandbox.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/windows-security-policy-settings-and-auditing.md b/includes/licensing/security/Windows-Security-policy-settings-and-auditing.md similarity index 97% rename from includes/licensing/windows-security-policy-settings-and-auditing.md rename to includes/licensing/security/Windows-Security-policy-settings-and-auditing.md index d366e1660e..ae5e26d298 100644 --- a/includes/licensing/windows-security-policy-settings-and-auditing.md +++ b/includes/licensing/security/Windows-Security-policy-settings-and-auditing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/security/Windows-Update-for-Business.md b/includes/licensing/security/Windows-Update-for-Business.md new file mode 100644 index 0000000000..0b154d8618 --- /dev/null +++ b/includes/licensing/security/Windows-Update-for-Business.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/21/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Update for Business: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Update for Business license entitlements are granted by the following licenses: + +|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|:---:|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/windows-containers.md b/includes/licensing/security/Windows-containers.md similarity index 97% rename from includes/licensing/windows-containers.md rename to includes/licensing/security/Windows-containers.md index 4a4dfb57ff..89c14bb938 100644 --- a/includes/licensing/windows-containers.md +++ b/includes/licensing/security/Windows-containers.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md b/includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md new file mode 100644 index 0000000000..2f213e36ef --- /dev/null +++ b/includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/21/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows feature and expedite updates with Intune: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows feature and expedite updates with Intune license entitlements are granted by the following licenses: + +|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|:---:|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/windows-presence-sensing.md b/includes/licensing/security/Windows-presence-sensing.md similarity index 97% rename from includes/licensing/windows-presence-sensing.md rename to includes/licensing/security/Windows-presence-sensing.md index b86eea0301..04bdc00300 100644 --- a/includes/licensing/windows-presence-sensing.md +++ b/includes/licensing/security/Windows-presence-sensing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/security/_edition-requirements.md similarity index 75% rename from includes/licensing/_edition-requirements.md rename to includes/licensing/security/_edition-requirements.md index ceb1113e19..07d24e4f5e 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/security/_edition-requirements.md @@ -1,51 +1,52 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- The following table lists the security features that are available in Windows, and the Windows editions that support them: -|Feature name|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +| Feature name | Windows Pro | Windows Enterprise | Windows Pro Education/SE | Windows Education | |:---:|:---:|:---:|:---:|:---:| |**[Access Control (ACLs/SCALS)](/windows/security/identity-protection/access-control/access-control)**|Yes|Yes|Yes|Yes| |**[Account Lockout Policy](/windows/security/threat-protection/security-policy-settings/account-lockout-policy)**|Yes|Yes|Yes|Yes| -|**[Always On VPN](/en-us/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes| +|**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes| |**[AppLocker](/windows/security/threat-protection/windows-defender-application-control/applocker/applocker-overview)**|Yes|Yes|Yes|Yes| |**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|Yes|Yes|Yes|Yes| -|**[Attack surface reduction (ASR)](/en-us/microsoft-365/security/defender-endpoint/overview-attack-surface-reduction)**|Yes|Yes|Yes|Yes| +|**[Attack surface reduction (ASR)](/microsoft-365/security/defender-endpoint/overview-attack-surface-reduction)**|Yes|Yes|Yes|Yes| |**[Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO)](/azure/active-directory/devices/concept-azure-ad-join)**|Yes|Yes|Yes|Yes| |**[BitLocker](/windows/security/information-protection/bitlocker/bitlocker-overview)**|Yes|Yes|Yes|Yes| |**Bluetooth pairing and connection protection**|Yes|Yes|Yes|Yes| |**[Common Criteria certifications](/windows/security/threat-protection/windows-platform-common-criteria)**|Yes|Yes|Yes|Yes| -|**[Controlled folder access](/en-us/microsoft-365/security/defender-endpoint/controlled-folders)**|Yes|Yes|Yes|Yes| +|**[Controlled folder access](/microsoft-365/security/defender-endpoint/controlled-folders)**|Yes|Yes|Yes|Yes| |**[Device health attestation service](/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices)**|Yes|Yes|Yes|Yes| |**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|No|Yes|No|Yes| |**[Email Encryption (S/MIME)](/windows/security/identity-protection/configure-s-mime)**|Yes|Yes|Yes|Yes| |**[Encrypted hard drive](/windows/security/information-protection/encrypted-hard-drive)**|Yes|Yes|Yes|Yes| +|**[Endpoint Analytics](/mem/analytics/overview)**|Yes|Yes|Yes|Yes| |**[Enhanced phishing protection with SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen)**|Yes|Yes|Yes|Yes| |**[Exploit protection](/microsoft-365/security/defender-endpoint/exploit-protection)**|Yes|Yes|Yes|Yes| -|**[Fast Identity Online (FIDO2) security key](/en-us/azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=%2Fwindows%2Fsecurity%2Fcontext%2Fcontext)**|Yes|Yes|Yes|Yes| +|**[Fast Identity Online (FIDO2) security key](/azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=%2Fwindows%2Fsecurity%2Fcontext%2Fcontext)**|Yes|Yes|Yes|Yes| |**[Federal Information Processing Standard (FIPS) 140 validation](/windows/security/threat-protection/fips-140-validation)**|Yes|Yes|Yes|Yes| |**[Federated sign-in](/education/windows/federated-sign-in)**|No|No|Yes|Yes| |**[Hardware-enforced stack protection](https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815)**|Yes|Yes|Yes|Yes| |**[Hypervisor-protected Code Integrity (HVCI)](/windows-hardware/design/device-experiences/oem-hvci-enablement)**|Yes|Yes|Yes|Yes| -|**[Kernel Direct Memory Access (DMA) protection](/en-us/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes| +|**[Kernel Direct Memory Access (DMA) protection](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes| |**Local Administrator Password Solution**|Yes|Yes|Yes|Yes| -|**[Local Security Authority (LSA) Protection](/en-us/windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=%2Fwindows%2Fsecurity%2Ftoc.json&bc=%2Fwindows%2Fsecurity%2Fbreadcrumb%2Ftoc.json)**|Yes|Yes|Yes|Yes| +|**[Local Security Authority (LSA) Protection](/windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=%2Fwindows%2Fsecurity%2Ftoc.json&bc=%2Fwindows%2Fsecurity%2Fbreadcrumb%2Ftoc.json)**|Yes|Yes|Yes|Yes| |**[Manage by Mobile Device Management (MDM) and group policy](/windows/client-management/mdm/mdm-overview)**|Yes|Yes|Yes|Yes| |**[Measured boot](/windows/compatibility/measured-boot)**|Yes|Yes|Yes|Yes| -|**[Microsoft Defender Antivirus](/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)**|Yes|Yes|Yes|Yes| +|**[Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)**|Yes|Yes|Yes|Yes| |**[Microsoft Defender Application Guard (MDAG) configure via MDM](/windows/client-management/mdm/windowsdefenderapplicationguard-csp)**|No|Yes|No|Yes| |**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|No|Yes|No|Yes| |**[Microsoft Defender Application Guard (MDAG) for Edge standalone mode](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview)**|Yes|Yes|Yes|Yes| -|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/en-us/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|No|Yes|No|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|No|Yes|No|Yes| |**Microsoft Defender Application Guard (MDAG) public APIs**|No|Yes|No|Yes| |**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|Yes|Yes|Yes| |**[Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview)**|Yes|Yes|Yes|Yes| |**[Microsoft Pluton security processor](/windows/security/information-protection/pluton/microsoft-pluton-security-processor)**|Yes|Yes|Yes|Yes| -|**[Microsoft Vulnerable Driver Blocklist](/en-us/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules%23microsoft-vulnerable-driver-blocklist)**|Yes|Yes|Yes|Yes| +|**[Microsoft Vulnerable Driver Blocklist](/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules%23microsoft-vulnerable-driver-blocklist)**|Yes|Yes|Yes|Yes| |**Opportunistic Wireless Encryption (OWE)**|Yes|Yes|Yes|Yes| |**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|No|Yes|No|Yes| |**Privacy Resource Usage**|Yes|Yes|Yes|Yes| @@ -59,25 +60,26 @@ The following table lists the security features that are available in Windows, a |**[Server Message Block Direct (SMB Direct)](/windows-server/storage/file-server/smb-direct)**|Yes|Yes|Yes|Yes| |**[Smart App Control](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control)**|Yes|Yes|Yes|Yes| |**[Smart Cards for Windows Service](/windows/security/identity-protection/smart-cards/smart-card-smart-cards-for-windows-service)**|Yes|Yes|Yes|Yes| -|**[Tamper protection settings for MDE](/en-us/microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection)**|Yes|Yes|Yes|Yes| +|**[Tamper protection settings for MDE](/microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection)**|Yes|Yes|Yes|Yes| |**[Transport layer security (TLS)](/windows-server/security/tls/tls-ssl-schannel-ssp-overview)**|Yes|Yes|Yes|Yes| |**[Trusted Platform Module (TPM) 2.0](/windows/security/information-protection/tpm/trusted-platform-module-overview)**|Yes|Yes|Yes|Yes| |**[Universal Print](/universal-print/)**|Yes|Yes|Yes|Yes| |**[User Account Control (UAC)](/indows/security/identity-protection/user-account-control/user-account-control-overview)**|Yes|Yes|Yes|Yes| |**[Virtual Private Network (VPN)](/windows/security/identity-protection/vpn/vpn-guide)**|Yes|Yes|Yes|Yes| -|**[Virtualization-based security (VBS)](/en-us/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes| +|**[Virtualization-based security (VBS)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes| |**WiFi Security**|Yes|Yes|Yes|Yes| -|**[Windows Autopatch](/en-us/windows/deployment/windows-autopatch/)**|No|Yes|No|Yes| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|No|Yes|No|Yes| |**[Windows Autopilot](/windows/deployment/windows-autopilot)**|Yes|Yes|Yes|Yes| |**[Windows containers](/virtualization/windowscontainers/about/)**|Yes|Yes|Yes|Yes| |**[Windows Defender Application Control (WDAC)](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control)**|Yes|Yes|Yes|Yes| |**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|Yes|Yes|Yes|Yes| |**[Windows Defender Remote Credential Guard](/windows/security/identity-protection/remote-credential-guard)**|Yes|Yes|Yes|Yes| |**[Windows Defender System Guard](/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows)**|Yes|Yes|Yes|Yes| +|**[Windows feature and expedite updates with Intune](/mem/intune/protect/windows-10-feature-updates)**|Yes|Yes|Yes|Yes| |**[Windows Firewall](/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security)**|Yes|Yes|Yes|Yes| |**[Windows Hello for Business](/windows/security/identity-protection/hello-for-business)**|Yes|Yes|Yes|Yes| -|**[Windows Hello for Business Enhanced Security Sign-in (ESS) ](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security)**|Yes|Yes|Yes|Yes| +|**[Windows Hello for Business Enhanced Security Sign-in (ESS)](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security)**|Yes|Yes|Yes|Yes| |**[Windows presence sensing](https://support.microsoft.com/windows/wake-your-windows-11-pc-when-you-approach-82285c93-440c-4e15-9081-c9e38c1290bb)**|Yes|Yes|Yes|Yes| |**[Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview)**|Yes|Yes|Yes|Yes| |**[Windows Security policy settings and auditing](/windows/security/threat-protection/security-policy-settings/security-policy-settings)**|Yes|Yes|Yes|Yes| - +|**[Windows Update for Business](/windows/deployment/update/waas-manage-updates-wufb)**|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/security/_licensing-requirements.md similarity index 76% rename from includes/licensing/_licensing-requirements.md rename to includes/licensing/security/_licensing-requirements.md index ed1bc471ae..93e8f47c54 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/security/_licensing-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/20/2023 +ms.date: 04/21/2023 ms.topic: include --- @@ -11,41 +11,42 @@ The following table lists the security features that are available in Windows, a |:---:|:---:|:---:|:---:|:---:|:---:| |**[Access Control (ACLs/SCALS)](/windows/security/identity-protection/access-control/access-control)**|Yes|Yes|Yes|Yes|Yes| |**[Account Lockout Policy](/windows/security/threat-protection/security-policy-settings/account-lockout-policy)**|Yes|Yes|Yes|Yes|Yes| -|**[Always On VPN](/en-us/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes|Yes| +|**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes|Yes| |**[AppLocker](/windows/security/threat-protection/windows-defender-application-control/applocker/applocker-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|Yes|Yes|Yes|Yes|Yes| -|**[Attack surface reduction (ASR)](/en-us/microsoft-365/security/defender-endpoint/overview-attack-surface-reduction)**|Yes|Yes|Yes|Yes|Yes| +|**[Attack surface reduction (ASR)](/microsoft-365/security/defender-endpoint/overview-attack-surface-reduction)**|Yes|Yes|Yes|Yes|Yes| |**[Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO)](/azure/active-directory/devices/concept-azure-ad-join)**|Yes|Yes|Yes|Yes|Yes| |**[BitLocker](/windows/security/information-protection/bitlocker/bitlocker-overview)**|Yes|Yes|Yes|Yes|Yes| |**Bluetooth pairing and connection protection**|Yes|Yes|Yes|Yes|Yes| |**[Common Criteria certifications](/windows/security/threat-protection/windows-platform-common-criteria)**|Yes|Yes|Yes|Yes|Yes| -|**[Controlled folder access](/en-us/microsoft-365/security/defender-endpoint/controlled-folders)**|Yes|Yes|Yes|Yes|Yes| +|**[Controlled folder access](/microsoft-365/security/defender-endpoint/controlled-folders)**|Yes|Yes|Yes|Yes|Yes| |**[Device health attestation service](/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices)**|Yes|Yes|Yes|Yes|Yes| |**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|No|Yes|Yes|Yes|Yes| |**[Email Encryption (S/MIME)](/windows/security/identity-protection/configure-s-mime)**|Yes|Yes|Yes|Yes|Yes| |**[Encrypted hard drive](/windows/security/information-protection/encrypted-hard-drive)**|Yes|Yes|Yes|Yes|Yes| +|**[Endpoint Analytics](/mem/analytics/overview)**|Yes|Yes|Yes|Yes|Yes| |**[Enhanced phishing protection with SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen)**|Yes|Yes|Yes|Yes|Yes| |**[Exploit protection](/microsoft-365/security/defender-endpoint/exploit-protection)**|Yes|Yes|Yes|Yes|Yes| -|**[Fast Identity Online (FIDO2) security key](/en-us/azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=%2Fwindows%2Fsecurity%2Fcontext%2Fcontext)**|Yes|Yes|Yes|Yes|Yes| +|**[Fast Identity Online (FIDO2) security key](/azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=%2Fwindows%2Fsecurity%2Fcontext%2Fcontext)**|Yes|Yes|Yes|Yes|Yes| |**[Federal Information Processing Standard (FIPS) 140 validation](/windows/security/threat-protection/fips-140-validation)**|Yes|Yes|Yes|Yes|Yes| |**[Federated sign-in](/education/windows/federated-sign-in)**|No|No|No|Yes|Yes| |**[Hardware-enforced stack protection](https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815)**|Yes|Yes|Yes|Yes|Yes| |**[Hypervisor-protected Code Integrity (HVCI)](/windows-hardware/design/device-experiences/oem-hvci-enablement)**|Yes|Yes|Yes|Yes|Yes| -|**[Kernel Direct Memory Access (DMA) protection](/en-us/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes|Yes| +|**[Kernel Direct Memory Access (DMA) protection](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes|Yes| |**Local Administrator Password Solution**|Yes|Yes|Yes|Yes|Yes| -|**[Local Security Authority (LSA) Protection](/en-us/windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=%2Fwindows%2Fsecurity%2Ftoc.json&bc=%2Fwindows%2Fsecurity%2Fbreadcrumb%2Ftoc.json)**|Yes|Yes|Yes|Yes|Yes| +|**[Local Security Authority (LSA) Protection](/windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=%2Fwindows%2Fsecurity%2Ftoc.json&bc=%2Fwindows%2Fsecurity%2Fbreadcrumb%2Ftoc.json)**|Yes|Yes|Yes|Yes|Yes| |**[Manage by Mobile Device Management (MDM) and group policy](/windows/client-management/mdm/mdm-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Measured boot](/windows/compatibility/measured-boot)**|Yes|Yes|Yes|Yes|Yes| -|**[Microsoft Defender Antivirus](/en-us/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)**|Yes|Yes|Yes|Yes|Yes| +|**[Microsoft Defender Antivirus](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)**|Yes|Yes|Yes|Yes|Yes| |**[Microsoft Defender Application Guard (MDAG) configure via MDM](/windows/client-management/mdm/windowsdefenderapplicationguard-csp)**|No|Yes|Yes|Yes|Yes| |**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|No|Yes|Yes|Yes|Yes| |**[Microsoft Defender Application Guard (MDAG) for Edge standalone mode](/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview)**|Yes|Yes|Yes|Yes|Yes| -|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/en-us/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|No|No|No|No|No| +|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|No|No|No|No|No| |**Microsoft Defender Application Guard (MDAG) public APIs**|No|Yes|Yes|Yes|Yes| |**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|No|Yes|No|Yes| |**[Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Microsoft Pluton security processor](/windows/security/information-protection/pluton/microsoft-pluton-security-processor)**|Yes|Yes|Yes|Yes|Yes| -|**[Microsoft Vulnerable Driver Blocklist](/en-us/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules%23microsoft-vulnerable-driver-blocklist)**|Yes|Yes|Yes|Yes|Yes| +|**[Microsoft Vulnerable Driver Blocklist](/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules%23microsoft-vulnerable-driver-blocklist)**|Yes|Yes|Yes|Yes|Yes| |**Opportunistic Wireless Encryption (OWE)**|Yes|Yes|Yes|Yes|Yes| |**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|No|Yes|Yes|Yes|Yes| |**Privacy Resource Usage**|Yes|Yes|Yes|Yes|Yes| @@ -59,25 +60,26 @@ The following table lists the security features that are available in Windows, a |**[Server Message Block Direct (SMB Direct)](/windows-server/storage/file-server/smb-direct)**|Yes|Yes|Yes|Yes|Yes| |**[Smart App Control](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control)**|Yes|Yes|Yes|Yes|Yes| |**[Smart Cards for Windows Service](/windows/security/identity-protection/smart-cards/smart-card-smart-cards-for-windows-service)**|Yes|Yes|Yes|Yes|Yes| -|**[Tamper protection settings for MDE](/en-us/microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection)**|Yes|Yes|Yes|Yes|Yes| +|**[Tamper protection settings for MDE](/microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection)**|Yes|Yes|Yes|Yes|Yes| |**[Transport layer security (TLS)](/windows-server/security/tls/tls-ssl-schannel-ssp-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Trusted Platform Module (TPM) 2.0](/windows/security/information-protection/tpm/trusted-platform-module-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Universal Print](/universal-print/)**|Yes|Yes|Yes|Yes|Yes| |**[User Account Control (UAC)](/indows/security/identity-protection/user-account-control/user-account-control-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Virtual Private Network (VPN)](/windows/security/identity-protection/vpn/vpn-guide)**|Yes|Yes|Yes|Yes|Yes| -|**[Virtualization-based security (VBS)](/en-us/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes|Yes| +|**[Virtualization-based security (VBS)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes|Yes| |**WiFi Security**|Yes|Yes|Yes|Yes|Yes| -|**[Windows Autopatch](/en-us/windows/deployment/windows-autopatch/)**|No|Yes|Yes|No|No| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|No|Yes|Yes|No|No| |**[Windows Autopilot](/windows/deployment/windows-autopilot)**|Yes|Yes|Yes|Yes|Yes| |**[Windows containers](/virtualization/windowscontainers/about/)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Defender Application Control (WDAC)](/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Defender Remote Credential Guard](/windows/security/identity-protection/remote-credential-guard)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Defender System Guard](/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows)**|Yes|Yes|Yes|Yes|Yes| +|**[Windows feature and expedite updates with Intune](/mem/intune/protect/windows-10-feature-updates)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Firewall](/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Hello for Business](/windows/security/identity-protection/hello-for-business)**|Yes|Yes|Yes|Yes|Yes| -|**[Windows Hello for Business Enhanced Security Sign-in (ESS) ](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security)**|Yes|Yes|Yes|Yes|Yes| +|**[Windows Hello for Business Enhanced Security Sign-in (ESS)](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security)**|Yes|Yes|Yes|Yes|Yes| |**[Windows presence sensing](https://support.microsoft.com/windows/wake-your-windows-11-pc-when-you-approach-82285c93-440c-4e15-9081-c9e38c1290bb)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Sandbox](/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview)**|Yes|Yes|Yes|Yes|Yes| |**[Windows Security policy settings and auditing](/windows/security/threat-protection/security-policy-settings/security-policy-settings)**|Yes|Yes|Yes|Yes|Yes| - +|**[Windows Update for Business](/windows/deployment/update/waas-manage-updates-wufb)**|Yes|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md b/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md deleted file mode 100644 index 050a888208..0000000000 --- a/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/20/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Hello for Business Enhanced Security Sign-in (ESS) : - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Hello for Business Enhanced Security Sign-in (ESS) license entitlements are granted by the following licenses: - -|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| -|:---:|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com).