From 3cff584f8bafbb92de0b95867b4e441296af2cbe Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 20 Apr 2023 11:27:09 -0400 Subject: [PATCH 01/65] initial import --- includes/intune/intune-custom-settings-1.md | 13 +++ includes/intune/intune-custom-settings-2.md | 9 ++ .../intune/intune-custom-settings-info.md | 6 ++ includes/licensing/_edition-requirements.md | 83 +++++++++++++++++++ includes/licensing/_licensing-requirements.md | 83 +++++++++++++++++++ .../licensing/access-control-aclsscals.md | 22 +++++ includes/licensing/account-lockout-policy.md | 22 +++++ includes/licensing/always-on-vpn.md | 22 +++++ includes/licensing/applocker.md | 22 +++++ .../licensing/assigned-access-kiosk-mode.md | 22 +++++ .../licensing/attack-surface-reduction-asr.md | 22 +++++ ...d-azure-ad-join-with-single-sign-on-sso.md | 22 +++++ includes/licensing/bitlocker.md | 22 +++++ ...tooth-pairing-and-connection-protection.md | 22 +++++ .../common-criteria-certifications.md | 22 +++++ .../licensing/controlled-folder-access.md | 22 +++++ .../device-health-attestation-service.md | 22 +++++ includes/licensing/direct-access.md | 22 +++++ includes/licensing/email-encryption-smime.md | 22 +++++ includes/licensing/encrypted-hard-drive.md | 22 +++++ ...ed-phishing-protection-with-smartscreen.md | 22 +++++ includes/licensing/exploit-protection.md | 22 +++++ ...fast-identity-online-fido2-security-key.md | 22 +++++ ...processing-standard-fips-140-validation.md | 22 +++++ includes/licensing/federated-sign-in.md | 22 +++++ .../hardware-enforced-stack-protection.md | 22 +++++ ...ypervisor-protected-code-integrity-hvci.md | 22 +++++ ...nel-direct-memory-access-dma-protection.md | 22 +++++ .../local-administrator-password-solution.md | 22 +++++ ...local-security-authority-lsa-protection.md | 22 +++++ ...-device-management-mdm-and-group-policy.md | 22 +++++ includes/licensing/measured-boot.md | 22 +++++ .../licensing/microsoft-defender-antivirus.md | 22 +++++ ...pplication-guard-mdag-configure-via-mdm.md | 22 +++++ ...terprise-mode-and-enterprise-management.md | 22 +++++ ...ion-guard-mdag-for-edge-standalone-mode.md | 22 +++++ ...ication-guard-mdag-for-microsoft-office.md | 22 +++++ ...nder-application-guard-mdag-public-apis.md | 22 +++++ .../microsoft-defender-for-endpoint.md | 22 +++++ .../microsoft-defender-smartscreen.md | 22 +++++ .../microsoft-pluton-security-processor.md | 22 +++++ .../microsoft-vulnerable-driver-blocklist.md | 22 +++++ .../opportunistic-wireless-encryption-owe.md | 22 +++++ .../licensing/personal-data-encryption-pde.md | 22 +++++ includes/licensing/privacy-resource-usage.md | 22 +++++ .../privacy-transparency-and-controls.md | 22 +++++ .../licensing/remote-wipe-autopilot-reset.md | 22 +++++ .../licensing/secure-boot-and-trusted-boot.md | 22 +++++ .../secured-core-configuration-lock.md | 22 +++++ includes/licensing/secured-core-pc.md | 22 +++++ .../security-baselines-with-intune.md | 22 +++++ .../server-message-block-direct-smb-direct.md | 22 +++++ .../server-message-block-smb-file-service.md | 22 +++++ includes/licensing/smart-app-control.md | 22 +++++ .../smart-cards-for-windows-service.md | 22 +++++ .../tamper-protection-settings-for-mde.md | 22 +++++ .../licensing/transport-layer-security-tls.md | 22 +++++ .../trusted-platform-module-tpm-20.md | 22 +++++ includes/licensing/universal-print.md | 22 +++++ .../licensing/user-account-control-uac.md | 22 +++++ .../licensing/virtual-private-network-vpn.md | 22 +++++ .../virtualization-based-security-vbs.md | 22 +++++ includes/licensing/wifi-security.md | 22 +++++ includes/licensing/windows-autopatch.md | 22 +++++ includes/licensing/windows-autopilot.md | 22 +++++ includes/licensing/windows-containers.md | 22 +++++ ...ndows-defender-application-control-wdac.md | 22 +++++ .../windows-defender-credential-guard.md | 22 +++++ ...indows-defender-remote-credential-guard.md | 22 +++++ .../windows-defender-system-guard.md | 22 +++++ includes/licensing/windows-firewall.md | 22 +++++ ...business-enhanced-security-sign-in-ess-.md | 22 +++++ .../licensing/windows-hello-for-business.md | 22 +++++ .../licensing/windows-presence-sensing.md | 22 +++++ includes/licensing/windows-sandbox.md | 22 +++++ ...s-security-policy-settings-and-auditing.md | 22 +++++ 76 files changed, 1756 insertions(+) create mode 100644 includes/intune/intune-custom-settings-1.md create mode 100644 includes/intune/intune-custom-settings-2.md create mode 100644 includes/intune/intune-custom-settings-info.md create mode 100644 includes/licensing/_edition-requirements.md create mode 100644 includes/licensing/_licensing-requirements.md create mode 100644 includes/licensing/access-control-aclsscals.md create mode 100644 includes/licensing/account-lockout-policy.md create mode 100644 includes/licensing/always-on-vpn.md create mode 100644 includes/licensing/applocker.md create mode 100644 includes/licensing/assigned-access-kiosk-mode.md create mode 100644 includes/licensing/attack-surface-reduction-asr.md create mode 100644 includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md create mode 100644 includes/licensing/bitlocker.md create mode 100644 includes/licensing/bluetooth-pairing-and-connection-protection.md create mode 100644 includes/licensing/common-criteria-certifications.md create mode 100644 includes/licensing/controlled-folder-access.md create mode 100644 includes/licensing/device-health-attestation-service.md create mode 100644 includes/licensing/direct-access.md create mode 100644 includes/licensing/email-encryption-smime.md create mode 100644 includes/licensing/encrypted-hard-drive.md create mode 100644 includes/licensing/enhanced-phishing-protection-with-smartscreen.md create mode 100644 includes/licensing/exploit-protection.md create mode 100644 includes/licensing/fast-identity-online-fido2-security-key.md create mode 100644 includes/licensing/federal-information-processing-standard-fips-140-validation.md create mode 100644 includes/licensing/federated-sign-in.md create mode 100644 includes/licensing/hardware-enforced-stack-protection.md create mode 100644 includes/licensing/hypervisor-protected-code-integrity-hvci.md create mode 100644 includes/licensing/kernel-direct-memory-access-dma-protection.md create mode 100644 includes/licensing/local-administrator-password-solution.md create mode 100644 includes/licensing/local-security-authority-lsa-protection.md create mode 100644 includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md create mode 100644 includes/licensing/measured-boot.md create mode 100644 includes/licensing/microsoft-defender-antivirus.md create mode 100644 includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md create mode 100644 includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md create mode 100644 includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md create mode 100644 includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md create mode 100644 includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md create mode 100644 includes/licensing/microsoft-defender-for-endpoint.md create mode 100644 includes/licensing/microsoft-defender-smartscreen.md create mode 100644 includes/licensing/microsoft-pluton-security-processor.md create mode 100644 includes/licensing/microsoft-vulnerable-driver-blocklist.md create mode 100644 includes/licensing/opportunistic-wireless-encryption-owe.md create mode 100644 includes/licensing/personal-data-encryption-pde.md create mode 100644 includes/licensing/privacy-resource-usage.md create mode 100644 includes/licensing/privacy-transparency-and-controls.md create mode 100644 includes/licensing/remote-wipe-autopilot-reset.md create mode 100644 includes/licensing/secure-boot-and-trusted-boot.md create mode 100644 includes/licensing/secured-core-configuration-lock.md create mode 100644 includes/licensing/secured-core-pc.md create mode 100644 includes/licensing/security-baselines-with-intune.md create mode 100644 includes/licensing/server-message-block-direct-smb-direct.md create mode 100644 includes/licensing/server-message-block-smb-file-service.md create mode 100644 includes/licensing/smart-app-control.md create mode 100644 includes/licensing/smart-cards-for-windows-service.md create mode 100644 includes/licensing/tamper-protection-settings-for-mde.md create mode 100644 includes/licensing/transport-layer-security-tls.md create mode 100644 includes/licensing/trusted-platform-module-tpm-20.md create mode 100644 includes/licensing/universal-print.md create mode 100644 includes/licensing/user-account-control-uac.md create mode 100644 includes/licensing/virtual-private-network-vpn.md create mode 100644 includes/licensing/virtualization-based-security-vbs.md create mode 100644 includes/licensing/wifi-security.md create mode 100644 includes/licensing/windows-autopatch.md create mode 100644 includes/licensing/windows-autopilot.md create mode 100644 includes/licensing/windows-containers.md create mode 100644 includes/licensing/windows-defender-application-control-wdac.md create mode 100644 includes/licensing/windows-defender-credential-guard.md create mode 100644 includes/licensing/windows-defender-remote-credential-guard.md create mode 100644 includes/licensing/windows-defender-system-guard.md create mode 100644 includes/licensing/windows-firewall.md create mode 100644 includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md create mode 100644 includes/licensing/windows-hello-for-business.md create mode 100644 includes/licensing/windows-presence-sensing.md create mode 100644 includes/licensing/windows-sandbox.md create mode 100644 includes/licensing/windows-security-policy-settings-and-auditing.md diff --git a/includes/intune/intune-custom-settings-1.md b/includes/intune/intune-custom-settings-1.md new file mode 100644 index 0000000000..d911751e75 --- /dev/null +++ b/includes/intune/intune-custom-settings-1.md @@ -0,0 +1,13 @@ +--- +ms.date: 02/22/2022 +ms.topic: include +--- + +To configure devices with Microsoft Intune, use a custom policy: + +1. Go to the Microsoft Intune admin center +2. Select **Devices > Configuration profiles > Create profile** +3. Select **Platform > Windows 10 and later** and **Profile type > Templates > Custom** +4. Select **Create** +5. Specify a **Name** and, optionally, a **Description > Next** +6. Add the following settings: \ No newline at end of file diff --git a/includes/intune/intune-custom-settings-2.md b/includes/intune/intune-custom-settings-2.md new file mode 100644 index 0000000000..1a601acaa7 --- /dev/null +++ b/includes/intune/intune-custom-settings-2.md @@ -0,0 +1,9 @@ +--- +ms.date: 11/08/2022 +ms.topic: include +--- + +7. Select **Next** +8. Assign the policy to a security group that contains as members the devices or users that you want to configure > **Next** +9. Under **Applicability Rules**, select **Next** +10. Review the policy configuration and select **Create** \ No newline at end of file diff --git a/includes/intune/intune-custom-settings-info.md b/includes/intune/intune-custom-settings-info.md new file mode 100644 index 0000000000..8ff9da4294 --- /dev/null +++ b/includes/intune/intune-custom-settings-info.md @@ -0,0 +1,6 @@ +--- +ms.date: 11/08/2022 +ms.topic: include +--- + +For more information about how to create custom settings using Intune, see [Use custom settings for Windows devices in Intune](/mem/intune/configuration/custom-settings-windows-10). \ No newline at end of file diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md new file mode 100644 index 0000000000..ceb1113e19 --- /dev/null +++ b/includes/licensing/_edition-requirements.md @@ -0,0 +1,83 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/20/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| +|:---:|:---:|:---:|:---:|:---:| +|**[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| +|**[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| +|**[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| +|**[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| +|**[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| +|**[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| +|**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| +|**[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 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) 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| +|**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| +|**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes| +|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes| +|**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes| +|**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes| +|**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes| +|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes| +|**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes| +|**[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| +|**[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| +|**WiFi Security**|Yes|Yes|Yes|Yes| +|**[Windows Autopatch](/en-us/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 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 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| + diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md new file mode 100644 index 0000000000..ed1bc471ae --- /dev/null +++ b/includes/licensing/_licensing-requirements.md @@ -0,0 +1,83 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/20/2023 +ms.topic: include +--- + +The following table lists the security features that are available in Windows, and the licensing requirements to use them: + +|Feature name|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|:---:|:---:|:---:|:---:|:---:|:---:| +|**[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| +|**[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| +|**[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| +|**[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| +|**[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| +|**[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| +|**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| +|**[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 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) 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| +|**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| +|**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes|Yes| +|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes|Yes| +|**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes|Yes| +|**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes|Yes| +|**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes|Yes| +|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes|Yes| +|**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes|Yes| +|**[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| +|**[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| +|**WiFi Security**|Yes|Yes|Yes|Yes|Yes| +|**[Windows Autopatch](/en-us/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 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 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| + diff --git a/includes/licensing/access-control-aclsscals.md b/includes/licensing/access-control-aclsscals.md new file mode 100644 index 0000000000..b61af93fa8 --- /dev/null +++ b/includes/licensing/access-control-aclsscals.md @@ -0,0 +1,22 @@ +--- +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 Access Control (ACLs/SCALS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Access Control (ACLs/SCALS) 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/account-lockout-policy.md b/includes/licensing/account-lockout-policy.md new file mode 100644 index 0000000000..8b18a6b661 --- /dev/null +++ b/includes/licensing/account-lockout-policy.md @@ -0,0 +1,22 @@ +--- +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 Account Lockout Policy: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Account Lockout Policy 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/always-on-vpn.md b/includes/licensing/always-on-vpn.md new file mode 100644 index 0000000000..81d7029add --- /dev/null +++ b/includes/licensing/always-on-vpn.md @@ -0,0 +1,22 @@ +--- +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 Always On VPN: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Always On VPN 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/applocker.md b/includes/licensing/applocker.md new file mode 100644 index 0000000000..2fff9e6ab8 --- /dev/null +++ b/includes/licensing/applocker.md @@ -0,0 +1,22 @@ +--- +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 AppLocker: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +AppLocker 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/assigned-access-kiosk-mode.md b/includes/licensing/assigned-access-kiosk-mode.md new file mode 100644 index 0000000000..a82316265b --- /dev/null +++ b/includes/licensing/assigned-access-kiosk-mode.md @@ -0,0 +1,22 @@ +--- +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 Assigned Access (kiosk mode): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Assigned Access (kiosk mode) 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/attack-surface-reduction-asr.md b/includes/licensing/attack-surface-reduction-asr.md new file mode 100644 index 0000000000..3a5d744e92 --- /dev/null +++ b/includes/licensing/attack-surface-reduction-asr.md @@ -0,0 +1,22 @@ +--- +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 Attack surface reduction (ASR): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Attack surface reduction (ASR) 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/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md b/includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md new file mode 100644 index 0000000000..8617927b9e --- /dev/null +++ b/includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md @@ -0,0 +1,22 @@ +--- +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 Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO) 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/bitlocker.md b/includes/licensing/bitlocker.md new file mode 100644 index 0000000000..94fd275f1b --- /dev/null +++ b/includes/licensing/bitlocker.md @@ -0,0 +1,22 @@ +--- +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 BitLocker: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +BitLocker 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/bluetooth-pairing-and-connection-protection.md b/includes/licensing/bluetooth-pairing-and-connection-protection.md new file mode 100644 index 0000000000..1e9b048129 --- /dev/null +++ b/includes/licensing/bluetooth-pairing-and-connection-protection.md @@ -0,0 +1,22 @@ +--- +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 Bluetooth pairing and connection protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Bluetooth pairing and connection protection 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/common-criteria-certifications.md b/includes/licensing/common-criteria-certifications.md new file mode 100644 index 0000000000..c79ce326be --- /dev/null +++ b/includes/licensing/common-criteria-certifications.md @@ -0,0 +1,22 @@ +--- +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 Common Criteria certifications: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Common Criteria certifications 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/controlled-folder-access.md b/includes/licensing/controlled-folder-access.md new file mode 100644 index 0000000000..2a61948725 --- /dev/null +++ b/includes/licensing/controlled-folder-access.md @@ -0,0 +1,22 @@ +--- +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 Controlled folder access: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Controlled folder access 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/device-health-attestation-service.md b/includes/licensing/device-health-attestation-service.md new file mode 100644 index 0000000000..6a665ad462 --- /dev/null +++ b/includes/licensing/device-health-attestation-service.md @@ -0,0 +1,22 @@ +--- +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 Device health attestation service: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Device health attestation service 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/direct-access.md b/includes/licensing/direct-access.md new file mode 100644 index 0000000000..8b51088d50 --- /dev/null +++ b/includes/licensing/direct-access.md @@ -0,0 +1,22 @@ +--- +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 Direct Access: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Direct Access 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/email-encryption-smime.md b/includes/licensing/email-encryption-smime.md new file mode 100644 index 0000000000..4927db3ddc --- /dev/null +++ b/includes/licensing/email-encryption-smime.md @@ -0,0 +1,22 @@ +--- +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 Email Encryption (S/MIME): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Email Encryption (S/MIME) 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/encrypted-hard-drive.md b/includes/licensing/encrypted-hard-drive.md new file mode 100644 index 0000000000..bed3785662 --- /dev/null +++ b/includes/licensing/encrypted-hard-drive.md @@ -0,0 +1,22 @@ +--- +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 Encrypted hard drive: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Encrypted hard drive 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/enhanced-phishing-protection-with-smartscreen.md new file mode 100644 index 0000000000..a686eedfa0 --- /dev/null +++ b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md @@ -0,0 +1,22 @@ +--- +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 Enhanced phishing protection with SmartScreen: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Enhanced phishing protection with SmartScreen 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/exploit-protection.md b/includes/licensing/exploit-protection.md new file mode 100644 index 0000000000..79075680e1 --- /dev/null +++ b/includes/licensing/exploit-protection.md @@ -0,0 +1,22 @@ +--- +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 Exploit protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Exploit protection 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/fast-identity-online-fido2-security-key.md b/includes/licensing/fast-identity-online-fido2-security-key.md new file mode 100644 index 0000000000..b77f7bcdda --- /dev/null +++ b/includes/licensing/fast-identity-online-fido2-security-key.md @@ -0,0 +1,22 @@ +--- +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 Fast Identity Online (FIDO2) security key: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Fast Identity Online (FIDO2) security key 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/federal-information-processing-standard-fips-140-validation.md b/includes/licensing/federal-information-processing-standard-fips-140-validation.md new file mode 100644 index 0000000000..c69f77ad4d --- /dev/null +++ b/includes/licensing/federal-information-processing-standard-fips-140-validation.md @@ -0,0 +1,22 @@ +--- +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 Federal Information Processing Standard (FIPS) 140 validation: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Federal Information Processing Standard (FIPS) 140 validation 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/federated-sign-in.md b/includes/licensing/federated-sign-in.md new file mode 100644 index 0000000000..dd7843efd2 --- /dev/null +++ b/includes/licensing/federated-sign-in.md @@ -0,0 +1,22 @@ +--- +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 Federated sign-in: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|No|Yes|Yes| + +Federated sign-in 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| +|:---:|:---:|:---:|:---:|:---:| +|No|No|No|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/hardware-enforced-stack-protection.md b/includes/licensing/hardware-enforced-stack-protection.md new file mode 100644 index 0000000000..78d7aeec9a --- /dev/null +++ b/includes/licensing/hardware-enforced-stack-protection.md @@ -0,0 +1,22 @@ +--- +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 Hardware-enforced stack protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Hardware-enforced stack protection 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/hypervisor-protected-code-integrity-hvci.md b/includes/licensing/hypervisor-protected-code-integrity-hvci.md new file mode 100644 index 0000000000..7e61d752bb --- /dev/null +++ b/includes/licensing/hypervisor-protected-code-integrity-hvci.md @@ -0,0 +1,22 @@ +--- +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 Hypervisor-protected Code Integrity (HVCI): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Hypervisor-protected Code Integrity (HVCI) 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/kernel-direct-memory-access-dma-protection.md b/includes/licensing/kernel-direct-memory-access-dma-protection.md new file mode 100644 index 0000000000..279343b746 --- /dev/null +++ b/includes/licensing/kernel-direct-memory-access-dma-protection.md @@ -0,0 +1,22 @@ +--- +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 Kernel Direct Memory Access (DMA) protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Kernel Direct Memory Access (DMA) protection 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/local-administrator-password-solution.md b/includes/licensing/local-administrator-password-solution.md new file mode 100644 index 0000000000..f3755e26ef --- /dev/null +++ b/includes/licensing/local-administrator-password-solution.md @@ -0,0 +1,22 @@ +--- +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 Local Administrator Password Solution: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Local Administrator Password Solution 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/local-security-authority-lsa-protection.md b/includes/licensing/local-security-authority-lsa-protection.md new file mode 100644 index 0000000000..d73f52dbb0 --- /dev/null +++ b/includes/licensing/local-security-authority-lsa-protection.md @@ -0,0 +1,22 @@ +--- +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 Local Security Authority (LSA) Protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Local Security Authority (LSA) Protection 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/manage-by-mobile-device-management-mdm-and-group-policy.md b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md new file mode 100644 index 0000000000..0f451c84a3 --- /dev/null +++ b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md @@ -0,0 +1,22 @@ +--- +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 Manage by Mobile Device Management (MDM) and group policy: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Manage by Mobile Device Management (MDM) and group policy 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/measured-boot.md b/includes/licensing/measured-boot.md new file mode 100644 index 0000000000..6ef4375480 --- /dev/null +++ b/includes/licensing/measured-boot.md @@ -0,0 +1,22 @@ +--- +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 Measured boot: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Measured boot 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/microsoft-defender-antivirus.md b/includes/licensing/microsoft-defender-antivirus.md new file mode 100644 index 0000000000..9c1be50238 --- /dev/null +++ b/includes/licensing/microsoft-defender-antivirus.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender Antivirus: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender Antivirus 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/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md new file mode 100644 index 0000000000..51a3ed00c4 --- /dev/null +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender Application Guard (MDAG) configure via MDM: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) configure via MDM 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md new file mode 100644 index 0000000000..e54c7297e5 --- /dev/null +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md new file mode 100644 index 0000000000..63209d39a9 --- /dev/null +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender Application Guard (MDAG) for Edge standalone mode: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender Application Guard (MDAG) for Edge standalone mode 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/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md new file mode 100644 index 0000000000..ddf7f5724f --- /dev/null +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender Application Guard (MDAG) for Microsoft Office: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) for Microsoft Office 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| +|:---:|:---:|:---:|:---:|:---:| +|No|No|No|No|No| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md new file mode 100644 index 0000000000..8013ede707 --- /dev/null +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender Application Guard (MDAG) public APIs: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) public APIs 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md new file mode 100644 index 0000000000..64f94347cb --- /dev/null +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender for Endpoint: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender for Endpoint 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|No|Yes|No|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/microsoft-defender-smartscreen.md b/includes/licensing/microsoft-defender-smartscreen.md new file mode 100644 index 0000000000..79341e2f69 --- /dev/null +++ b/includes/licensing/microsoft-defender-smartscreen.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Defender SmartScreen: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender SmartScreen 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/microsoft-pluton-security-processor.md b/includes/licensing/microsoft-pluton-security-processor.md new file mode 100644 index 0000000000..a829864982 --- /dev/null +++ b/includes/licensing/microsoft-pluton-security-processor.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Pluton security processor: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Pluton security processor 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/microsoft-vulnerable-driver-blocklist.md b/includes/licensing/microsoft-vulnerable-driver-blocklist.md new file mode 100644 index 0000000000..5e8d7d0619 --- /dev/null +++ b/includes/licensing/microsoft-vulnerable-driver-blocklist.md @@ -0,0 +1,22 @@ +--- +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 Microsoft Vulnerable Driver Blocklist: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Vulnerable Driver Blocklist 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/opportunistic-wireless-encryption-owe.md b/includes/licensing/opportunistic-wireless-encryption-owe.md new file mode 100644 index 0000000000..329b98a56f --- /dev/null +++ b/includes/licensing/opportunistic-wireless-encryption-owe.md @@ -0,0 +1,22 @@ +--- +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 Opportunistic Wireless Encryption (OWE): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Opportunistic Wireless Encryption (OWE) 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/personal-data-encryption-pde.md b/includes/licensing/personal-data-encryption-pde.md new file mode 100644 index 0000000000..17db0c0d9b --- /dev/null +++ b/includes/licensing/personal-data-encryption-pde.md @@ -0,0 +1,22 @@ +--- +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 Personal data encryption (PDE): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Personal data encryption (PDE) 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/privacy-resource-usage.md b/includes/licensing/privacy-resource-usage.md new file mode 100644 index 0000000000..1912cef847 --- /dev/null +++ b/includes/licensing/privacy-resource-usage.md @@ -0,0 +1,22 @@ +--- +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 Privacy Resource Usage: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Privacy Resource Usage 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/privacy-transparency-and-controls.md b/includes/licensing/privacy-transparency-and-controls.md new file mode 100644 index 0000000000..423adcfba8 --- /dev/null +++ b/includes/licensing/privacy-transparency-and-controls.md @@ -0,0 +1,22 @@ +--- +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 Privacy Transparency and Controls: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Privacy Transparency and Controls 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/remote-wipe-autopilot-reset.md b/includes/licensing/remote-wipe-autopilot-reset.md new file mode 100644 index 0000000000..d4c0bc571a --- /dev/null +++ b/includes/licensing/remote-wipe-autopilot-reset.md @@ -0,0 +1,22 @@ +--- +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 Remote wipe (Autopilot reset): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Remote wipe (Autopilot reset) 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/secure-boot-and-trusted-boot.md b/includes/licensing/secure-boot-and-trusted-boot.md new file mode 100644 index 0000000000..fd57393232 --- /dev/null +++ b/includes/licensing/secure-boot-and-trusted-boot.md @@ -0,0 +1,22 @@ +--- +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 Secure Boot and Trusted Boot: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Secure Boot and Trusted Boot 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/secured-core-configuration-lock.md b/includes/licensing/secured-core-configuration-lock.md new file mode 100644 index 0000000000..282eefbd8f --- /dev/null +++ b/includes/licensing/secured-core-configuration-lock.md @@ -0,0 +1,22 @@ +--- +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 Secured-core configuration lock: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Secured-core configuration lock 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/secured-core-pc.md b/includes/licensing/secured-core-pc.md new file mode 100644 index 0000000000..cd335f6263 --- /dev/null +++ b/includes/licensing/secured-core-pc.md @@ -0,0 +1,22 @@ +--- +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 Secured-core PC: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Secured-core PC 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/security-baselines-with-intune.md b/includes/licensing/security-baselines-with-intune.md new file mode 100644 index 0000000000..bc9a0ca9c2 --- /dev/null +++ b/includes/licensing/security-baselines-with-intune.md @@ -0,0 +1,22 @@ +--- +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 Security baselines with Intune: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Security baselines 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/server-message-block-direct-smb-direct.md b/includes/licensing/server-message-block-direct-smb-direct.md new file mode 100644 index 0000000000..4b468b65a6 --- /dev/null +++ b/includes/licensing/server-message-block-direct-smb-direct.md @@ -0,0 +1,22 @@ +--- +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 Server Message Block Direct (SMB Direct): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Server Message Block Direct (SMB Direct) 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/server-message-block-smb-file-service.md b/includes/licensing/server-message-block-smb-file-service.md new file mode 100644 index 0000000000..1e1f9fc40a --- /dev/null +++ b/includes/licensing/server-message-block-smb-file-service.md @@ -0,0 +1,22 @@ +--- +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 Server Message Block (SMB) file service: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Server Message Block (SMB) file service 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/smart-app-control.md b/includes/licensing/smart-app-control.md new file mode 100644 index 0000000000..6ea29fbfb6 --- /dev/null +++ b/includes/licensing/smart-app-control.md @@ -0,0 +1,22 @@ +--- +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 Smart App Control: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Smart App Control 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/smart-cards-for-windows-service.md b/includes/licensing/smart-cards-for-windows-service.md new file mode 100644 index 0000000000..803b2af86c --- /dev/null +++ b/includes/licensing/smart-cards-for-windows-service.md @@ -0,0 +1,22 @@ +--- +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 Smart Cards for Windows Service: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Smart Cards for Windows Service 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/tamper-protection-settings-for-mde.md b/includes/licensing/tamper-protection-settings-for-mde.md new file mode 100644 index 0000000000..28cbc5ff70 --- /dev/null +++ b/includes/licensing/tamper-protection-settings-for-mde.md @@ -0,0 +1,22 @@ +--- +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 Tamper protection settings for MDE: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Tamper protection settings for MDE 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/transport-layer-security-tls.md b/includes/licensing/transport-layer-security-tls.md new file mode 100644 index 0000000000..43104ded20 --- /dev/null +++ b/includes/licensing/transport-layer-security-tls.md @@ -0,0 +1,22 @@ +--- +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 Transport layer security (TLS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Transport layer security (TLS) 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/trusted-platform-module-tpm-20.md b/includes/licensing/trusted-platform-module-tpm-20.md new file mode 100644 index 0000000000..60a46d1917 --- /dev/null +++ b/includes/licensing/trusted-platform-module-tpm-20.md @@ -0,0 +1,22 @@ +--- +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 Trusted Platform Module (TPM) 2.0: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Trusted Platform Module (TPM) 2.0 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/universal-print.md b/includes/licensing/universal-print.md new file mode 100644 index 0000000000..a346b3ff35 --- /dev/null +++ b/includes/licensing/universal-print.md @@ -0,0 +1,22 @@ +--- +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 Universal Print: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Universal Print 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/user-account-control-uac.md b/includes/licensing/user-account-control-uac.md new file mode 100644 index 0000000000..41276ad062 --- /dev/null +++ b/includes/licensing/user-account-control-uac.md @@ -0,0 +1,22 @@ +--- +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 User Account Control (UAC): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +User Account Control (UAC) 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/virtual-private-network-vpn.md b/includes/licensing/virtual-private-network-vpn.md new file mode 100644 index 0000000000..ea1d783bc4 --- /dev/null +++ b/includes/licensing/virtual-private-network-vpn.md @@ -0,0 +1,22 @@ +--- +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 Virtual Private Network (VPN): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Virtual Private Network (VPN) 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/virtualization-based-security-vbs.md b/includes/licensing/virtualization-based-security-vbs.md new file mode 100644 index 0000000000..25e88ae0f7 --- /dev/null +++ b/includes/licensing/virtualization-based-security-vbs.md @@ -0,0 +1,22 @@ +--- +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 Virtualization-based security (VBS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Virtualization-based security (VBS) 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/wifi-security.md b/includes/licensing/wifi-security.md new file mode 100644 index 0000000000..64cd094090 --- /dev/null +++ b/includes/licensing/wifi-security.md @@ -0,0 +1,22 @@ +--- +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 WiFi Security: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +WiFi Security 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-autopatch.md b/includes/licensing/windows-autopatch.md new file mode 100644 index 0000000000..5befd266fd --- /dev/null +++ b/includes/licensing/windows-autopatch.md @@ -0,0 +1,22 @@ +--- +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 Autopatch: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Windows Autopatch 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|No|No| + +For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). diff --git a/includes/licensing/windows-autopilot.md b/includes/licensing/windows-autopilot.md new file mode 100644 index 0000000000..864a70420d --- /dev/null +++ b/includes/licensing/windows-autopilot.md @@ -0,0 +1,22 @@ +--- +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 Autopilot: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Autopilot 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/windows-containers.md new file mode 100644 index 0000000000..4a4dfb57ff --- /dev/null +++ b/includes/licensing/windows-containers.md @@ -0,0 +1,22 @@ +--- +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 containers: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows containers 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-defender-application-control-wdac.md b/includes/licensing/windows-defender-application-control-wdac.md new file mode 100644 index 0000000000..e24df8d22d --- /dev/null +++ b/includes/licensing/windows-defender-application-control-wdac.md @@ -0,0 +1,22 @@ +--- +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 Defender Application Control (WDAC): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender Application Control (WDAC) 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-defender-credential-guard.md b/includes/licensing/windows-defender-credential-guard.md new file mode 100644 index 0000000000..f8de73da86 --- /dev/null +++ b/includes/licensing/windows-defender-credential-guard.md @@ -0,0 +1,22 @@ +--- +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 Defender Credential Guard: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender Credential Guard 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-defender-remote-credential-guard.md b/includes/licensing/windows-defender-remote-credential-guard.md new file mode 100644 index 0000000000..427cb21ad5 --- /dev/null +++ b/includes/licensing/windows-defender-remote-credential-guard.md @@ -0,0 +1,22 @@ +--- +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 Defender Remote Credential Guard: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender Remote Credential Guard 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-defender-system-guard.md b/includes/licensing/windows-defender-system-guard.md new file mode 100644 index 0000000000..b41b5fe127 --- /dev/null +++ b/includes/licensing/windows-defender-system-guard.md @@ -0,0 +1,22 @@ +--- +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 Defender System Guard: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender System Guard 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-firewall.md b/includes/licensing/windows-firewall.md new file mode 100644 index 0000000000..f315039fc8 --- /dev/null +++ b/includes/licensing/windows-firewall.md @@ -0,0 +1,22 @@ +--- +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 Firewall: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Firewall 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-enhanced-security-sign-in-ess-.md b/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md new file mode 100644 index 0000000000..050a888208 --- /dev/null +++ b/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess-.md @@ -0,0 +1,22 @@ +--- +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). diff --git a/includes/licensing/windows-hello-for-business.md b/includes/licensing/windows-hello-for-business.md new file mode 100644 index 0000000000..04670f3262 --- /dev/null +++ b/includes/licensing/windows-hello-for-business.md @@ -0,0 +1,22 @@ +--- +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: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Hello 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-presence-sensing.md b/includes/licensing/windows-presence-sensing.md new file mode 100644 index 0000000000..b86eea0301 --- /dev/null +++ b/includes/licensing/windows-presence-sensing.md @@ -0,0 +1,22 @@ +--- +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 presence sensing: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows presence sensing 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-sandbox.md b/includes/licensing/windows-sandbox.md new file mode 100644 index 0000000000..7b4226f716 --- /dev/null +++ b/includes/licensing/windows-sandbox.md @@ -0,0 +1,22 @@ +--- +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 Sandbox: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Sandbox 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-security-policy-settings-and-auditing.md b/includes/licensing/windows-security-policy-settings-and-auditing.md new file mode 100644 index 0000000000..d366e1660e --- /dev/null +++ b/includes/licensing/windows-security-policy-settings-and-auditing.md @@ -0,0 +1,22 @@ +--- +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 Security policy settings and auditing: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Security policy settings and auditing 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). From 09033a677518ab23999dc9630c9ef6da90f8fbac Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 20 Apr 2023 12:56:26 -0400 Subject: [PATCH 02/65] changes --- education/windows/federated-sign-in.md | 2 + .../hello-for-business/hello-overview.md | 2 + .../security/introduction/chip-to-cloud.svg | 3 + windows/security/introduction/index.md | 57 +++++++ .../security-features-edition-requirements.md | 19 +++ ...ity-features-licensing-requirements-edu.md | 19 +++ ...ecurity-features-licensing-requirements.md | 19 +++ windows/whats-new/windows-licensing.md | 157 ++++++++++++++++++ 8 files changed, 278 insertions(+) create mode 100644 windows/security/introduction/chip-to-cloud.svg create mode 100644 windows/security/introduction/index.md create mode 100644 windows/security/introduction/security-features-edition-requirements.md create mode 100644 windows/security/introduction/security-features-licensing-requirements-edu.md create mode 100644 windows/security/introduction/security-features-licensing-requirements.md create mode 100644 windows/whats-new/windows-licensing.md diff --git a/education/windows/federated-sign-in.md b/education/windows/federated-sign-in.md index 326c71ca59..6f2f8963c2 100644 --- a/education/windows/federated-sign-in.md +++ b/education/windows/federated-sign-in.md @@ -53,6 +53,8 @@ To use federated sign-in, the devices must have Internet access. This feature wo > - provisioning packages (PPKG) > - Windows Autopilot self-deploying mode +[!INCLUDE [federated-sign-in](../../includes/licensing/security/federated-sign-in.md)] + ### System requirements Federated sign-in is supported on the following Windows SKUs and versions: diff --git a/windows/security/identity-protection/hello-for-business/hello-overview.md b/windows/security/identity-protection/hello-for-business/hello-overview.md index 005fb6c685..f4c5e4f7a1 100644 --- a/windows/security/identity-protection/hello-for-business/hello-overview.md +++ b/windows/security/identity-protection/hello-for-business/hello-overview.md @@ -65,6 +65,8 @@ Imagine that someone is looking over your shoulder as you get money from an ATM Windows Hello helps protect user identities and user credentials. Because the user doesn't enter a password (except during provisioning), it helps circumvent phishing and brute force attacks. It also helps prevent server breaches because Windows Hello credentials are an asymmetric key pair, which helps prevent replay attacks when these keys are protected by TPMs. +[!INCLUDE [windows-hello-for-business](../../../../includes/licensing/security/windows-hello-for-business.md)] + ## How Windows Hello for Business works: key points - Windows Hello credentials are based on certificate or asymmetrical key pair. Windows Hello credentials can be bound to the device, and the token that is obtained using the credential is also bound to the device. diff --git a/windows/security/introduction/chip-to-cloud.svg b/windows/security/introduction/chip-to-cloud.svg new file mode 100644 index 0000000000..62f4230955 --- /dev/null +++ b/windows/security/introduction/chip-to-cloud.svg @@ -0,0 +1,3 @@ + + +
Hardware
(Chip)
Hardware...
Hardware Root-of-Trust

TPM 2.0
Microsoft Puton Security Processor
Hardware Root-of-Trust...
Silicon Assisted Security

Secure Kernel (HVCI enabled by default)
Hardware Enforced Stack Protection
Secured-Core PCs
Firmware Protection
Silicon Assisted Security...
Operating
System
Operating...
Encryption and Data Protection

BitLocker
Encrypted Hard Drive
Personal Data Encryption
Email Encryption
Encryption and Data Protection...
System Security
System Security
Trusted Boot
Cryptography
Certificates
Trusted Boot...
Code Signing
Code Integrity
Device Health Attestation
Code Signing...
Windows Security Policy Setting and Auditing
Windows Security App
Windows Security Policy Setting and Audit...
Network Security

Transport Layer Security (TLS)
DNS Security
Bluetooth protection
Secured Wi-Fi
Windows Defender Firewall
VPN
SMB File Services
Network Security...
Virus an Threat Protection

Microsoft Defender Antivirus
Local Security Authority
Attack Surface Reduction
Tamper Protection
Vulnerable Driver Blocklist
Controlled Folder Access
Exploit Protection
Enhanced Phishing Protection
Microsoft Defender for Endpoint
Virus an Threat Protection...Text is not SVG - cannot display \ No newline at end of file diff --git a/windows/security/introduction/index.md b/windows/security/introduction/index.md new file mode 100644 index 0000000000..b955feffb8 --- /dev/null +++ b/windows/security/introduction/index.md @@ -0,0 +1,57 @@ +--- +title: Introduction to Windows security +description: System security book. +ms.date: 04/10/2023 +ms.topic: tutorial +appliesto: + - ✅ Windows 11 +--- + +# Introduction to Windows security + +The acceleration of digital transformation and the expansion of both remote and hybrid workplaces brings new opportunities to organizations, communities, and individuals. Our work styles have transformed. And now more than ever, employees need simple, intuitive user experiences to collaborate and stay productive, wherever work happens. But the expansion of access and ability to work anywhere has also introduced new threats and risks. According to data from the Microsoft commissioned Security Signals report, 75% of security decision-makers at the vice-president level and above feel the move to hybrid work leaves their organization more vulnerable to security threats. And [Microsoft's 2022 Work Trend Index](https://www.microsoft.com/security/blog/2022/04/05/new-security-features-for-windows-11-will-help-protect-hybrid-work/) shows "cybersecurity issues and risks" are top concerns for business decisions makers, who worry about issues like malware, stolen credentials, devices that lack security updates, and physical attacks on lost or stolen devices. + +:::image type="content" source="chip-to-cloud.svg" lightbox="chip-to-cloud.svg" alt-text="chip to cloud diagram"::: + +## How Windows 11 enables zero-trust protection + +A zero-trust security model gives the right people the right access at the right time. Zero-trust security is based on three principles: + +1. Reduce risk by explicitly verifying data points such as user identity, location, and device health for every access request, without exception +2. When verified, give people and devices access to only necessary resources for the necessary amount of time +3. Use continuous analytics to drive threat detection and improve defenses + +You should continue to strengthen your zero-trust posture as well. To improve threat detection and defenses, verify end-to-end encryption and use analytics to gain visibility. + +For Windows 11, the zero-trust principle of *verify explicitly* applies to risks introduced by both devices and people. Windows 11 provides chip-to-cloud security, enabling IT administrators to implement strong authorization and authentication processes with tools such as our premier solution Windows Hello for Business. IT administrators also gain attestation and measurements for determining if a device meets requirements and can be trusted. In addition, Windows 11 works out-of-the-box with Microsoft Endpoint Manager and Azure Active Directory, so access decisions and enforcement are seamless. Plus, IT administrators can easily customize Windows 11 to meet specific user and policy requirements for access, privacy, compliance, and more. + +Individual users also benefit from powerful safeguards including new standards for hardware-based security and passwordless protection that help safeguard data and privacy. + +## Security, by default + +Nearly 90% of security decision makers surveyed say outdated hardware leaves organizations more open to attacks and using modern hardware would help protect against future threats. Building on the innovations of Windows 10, we've worked with our manufacturer and silicon partners to provide additional hardware security capabilities to meet the evolving threat landscape and enable hybrid work and learning. The new set of hardware security requirements that comes with Windows 11 supports new ways of working with a foundation that is even stronger and more resilient to attacks. + +## Enhanced hardware and operating system security + +With hardware-based isolation security that begins at the chip, Windows 11 stores sensitive data behind additional barriers separated from the operating system. As a result, information including encryption keys and user credentials are protected from unauthorized access and tampering. + +In Windows 11, hardware and software work together to protect the operating system. For example, new devices come with virtualization-based security (VBS) and Secure Boot built-in and enabled by default to contain and limit malware exploits. [\[1\]](#note1) + +## Robust application security and privacy controls + +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. + +## Secured identities + +Passwords have been an important part of digital security for a long time, and they're also a top target for cybercriminals. Windows 11 provides powerful protection against credential theft with chip-level hardware security. Credentials are protected by layers of hardware and software security such as TPM 2.0, VBS, and/or Windows Defender Credential Guard, making it harder for attackers to steal credentials from a device. And with Windows Hello, users can quickly sign in with face, fingerprint, or PIN for passwordless protection. [\[3\]](#note3) + +## Connecting to cloud services + +Microsoft offers comprehensive cloud services for identity, storage, and access management in addition to the tools needed to attest that Windows 11 devices connecting to your network are trustworthy. You can also enforce compliance and conditional access with a modern device management (MDM) service such as Microsoft Endpoint Manager, which works with Azure Active Directory and Microsoft Azure Attestation to control access to applications and data through the cloud. [\[4\]](#note4) + +[1] Hypervisor-protected coder integrity, which activates virtualization-based security, is enabled by default on clean installations only.\ +[2] Windows 10 Pro and above support Application Guard protection for Microsoft Edge. Microsoft Defender Application Guard for Office requires Windows 10 Enterprise, and Microsoft 365 E5 or Microsoft 365 E5 Security.\ +[3] Windows Hello supports multi-factor authentication including facial recognition, fingerprint, and PIN. Requires specialized hardware such as fingerprint reader, illuminated IT sensor or other biometric sensors and capable devices.\ +[4] Microsoft Endpoint Manager and Microsoft Azure Active Directory subscriptions sold separately.\ diff --git a/windows/security/introduction/security-features-edition-requirements.md b/windows/security/introduction/security-features-edition-requirements.md new file mode 100644 index 0000000000..8e934ddbdf --- /dev/null +++ b/windows/security/introduction/security-features-edition-requirements.md @@ -0,0 +1,19 @@ +--- +title: Windows edition requirements +description: Learn about Windows edition requirements for the feature included in Windows. +ms.prod: windows-client +author: paolomatarazzo +ms.author: paoloma +manager: aaroncz +ms.collection: +- tier3 +ms.topic: conceptual +ms.date: 04/03/2023 +appliesto: +- ✅ Windows 11 +ms.technology: itpro-security +--- + +# Security features Windows edition requirements + +[!INCLUDE [_commercial](../../whats-new/licensing/includes/_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 new file mode 100644 index 0000000000..c209c60a6d --- /dev/null +++ b/windows/security/introduction/security-features-licensing-requirements-edu.md @@ -0,0 +1,19 @@ +--- +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 new file mode 100644 index 0000000000..faad9c9fab --- /dev/null +++ b/windows/security/introduction/security-features-licensing-requirements.md @@ -0,0 +1,19 @@ +--- +title: Windows security licensing requirements +description: Learn about Windows features and licensing requirements for the feature included in Windows. +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 + +[!INCLUDE [_licensing-requirements](../../whats-new/licensing/includes/_licensing-requirements.md)] \ No newline at end of file diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md new file mode 100644 index 0000000000..e14bbefe13 --- /dev/null +++ b/windows/whats-new/windows-licensing.md @@ -0,0 +1,157 @@ +--- +title: Windows 11 commercial licensing overview +description: Learn about licensing requirements to use the features included in the Windows operating system. +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 11 commercial licensing overview + +Microsoft Commercial Licensing solutions provide the most flexible and cost-effective way to give your organization access to the latest Windows Desktop technologies. Whether you want to upgrade your devices to Windows 11, gain access to exclusive offerings such as Windows 11 Enterprise edition, or use Windows with greater flexibility, there's a Commercial Licensing option that's right for your organization. + +This document provides an overview of the products and use rights available through Commercial Licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. + +> [!NOTE] +> This content is not meant to replace or override other licensing documentation, such as the Windows 11 End User License Agreement or Commercial Licensing Product Terms. + +## Windows 11 editions + +There's an edition of Windows software designed to meet the needs of every organization, from a small, growing business to a multinational enterprise. The following table lists the editions of Windows 11 available through each Microsoft distribution channel. + +| Full Packaged Product (Retail) | Preinstalled on device (OEM)|Commercial Licensing| +|-|-|-| +|Windows 11 Pro
Windows 11 Home|Windows 11 Pro
Windows 11 Home|Windows 11 Pro
Windows 11 Enterprise
Windows 11 Enterprise LTSC| + +## Windows desktop offerings available through Commercial Licensing + +The following offerings are available for purchase through Microsoft Commercial Licensing: + +|Product|Description| +|-|-| +|Windows 11 Pro Upgrade |Windows 11 Pro is designed for small and medium businesses and enables organizations to manage their devices and apps, protect their business data, facilitate remote and mobile scenarios, and take advantage of the cloud technologies for their organizations. Windows 11 Pro devices are a good choice for organizations that support *choose your own device (CYOD)* programs and *prosumer* customers. The Windows 11 Pro Upgrade in Commercial Licensing upgrades a device from a previous version of Windows Pro| +|Windows 11 Enterprise E3|Windows 11 Enterprise E3 is a per user subscription available in Commercial Licensing programs, and is intended for large and medium sized organizations. It includes Windows Enterprise edition with cloud-powered capabilities and subscription use rights. Examples include advanced identity protection, the broadest range of options for operating system deployment, update control, and device management. Windows Enterprise E3 is licensed through Commercial Licensing programs and requires Windows Pro as qualifying operating systems. +|Windows 11 Enterprise E5|Windows 11 Enterprise E5 is for organizations that want to take advantage of everything in Windows 11 Enterprise E3 with the addition of **Microsoft Defender for Endpoint Plan 2**, a service that helps enterprises detect, investigate, and respond to advanced cybersecurity attacks on their endpoints and networks. Windows 11 Enterprise E5 is available per user in Commercial Licensing programs| +|Windows 10 Enterprise LTSC |Windows 10 Enterprise LTSC is designed for PC systems that have strict change-management policies with only security and critical bug fixes. By using a Long-Term Servicing Channel edition, you can apply monthly Windows 10 security updates for specialized devices while holding back new-feature updates for an extended period of time, up to 5 years. Windows Enterprise LTSC is available in the per user or per device model depending on the Volume Licensing program through witch it is acquired| +|Windows Virtual Desktop Access (VDA) Subscription License|The Windows VDA subscription license provides the right to access virtual Windows desktop environments from devices that aren't covered by a Commercial Licensing offer that includes VDA rights, such as thin clients. Windows VDA is available on a per device or per user basis| + +## Windows 11 Enterprise + +There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. Each of these can be purchased on a **per-user basis**, and are available only through **Commercial Licensing**, including the **Cloud Solution Provider** program. For more details about Windows Enterprise, see [per device check out this section of this guide](*TO ADD*) + +### Windows 11 Enterprise E3 + +Windows 11 Enterprise E3 is a per-user subscription, intended for organizations. It includes **Windows Enterprise edition** with cloud-powered capabilities and subscription use rights. +Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced features designed to address the needs of large and mid-size organizations. Examples include advanced protection against modern security threats, the broadest range of options for operating system deployment and update, and comprehensive device and app management. Organizations with devices running Windows 11 Enterprise will can take advantage of the latest security and feature updates on an ongoing basis, while having the ability to choose the pace at which they adopt new technology. + +Windows 11 Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. + +### Windows 11 Enterprise E3 OS features + +With Windows 11 Enterprise E3, you can take advantage of the following OS features: + +| OS feature | Description | +|-|-| +|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard-requirements)**|Protects against user credential harvesting and pass-the-hash attacks or pass the token attacks, enabled by default| +|**Managed Microsoft Defender Application Guard for Microsoft Edge**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your company while employees browse the Internet| +|**Personal Data Encryption**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials| +|**Direct Access & Always-On VPN device tunnel**|Connect remote users to the organization network without the need for traditional VPN connections with DirectAccess or benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN (device tunnel)| +|**Application Management GPOs**|Prevents unverified apps from executing and endangering your safe zone| +|**Windows UI customization (CSP)**|Locks down the user experience of frontline workers devices or public kiosks| + +### Windows 11 Enterprise E3 cloud services + +With Windows 11 Enterprise E3, you can take advantage of the following cloud services: + +|Cloud-based service | Description | +|-|-| +|**Cloud-based BitLocker Management**|Allows you to eliminate on-premises tools to trigger, monitor and support recovery scenarios| +|**[Windows subscription activation](/windows/deployment/windows-10-subscription-activation)**|Enables you to *step-up* from **Windows Pro edition** to **Enterprise edition** in an instant. You can eliminate license key management or deployment of Enterprise edition images| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/overview/windows-autopatch-overview)**|Cloud service that puts Microsoft in control of automating updates to Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams| +|**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|This cloud service gives you the control over the approval, scheduling, and safeguarding of quality, feature upgrades, and driver updates delivered from Windows Update| +|**[Universal Print](/universal-print/)**|Removes the need for on-premises print servers and enables any endpoint to print to cloud registered printers| +|Microsoft Connected Cache|A software-only solution that caches app and OS updates on the local network to save internet bandwidth in locations with limited connectivity| +|**Endpoint analytics proactive remediation**|Helps you fix common support issues before end-users notice issues| +|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|Keeps employees informed with organizational messages directly inserted in Windows UI surfaces| +|**Windows release health**|Gives you essential information about monthly quality and feature updates in the Microsoft 365 admin center| +|**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Provides per-device information about compatibility risks that are associated with an upgrade or update to a chosen version of Windows| +|**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Provides a summary view of the top compatibility risks, so you understand which compatibility risks impact the greatest number of devices in your organization| + +### Windows 11 Enterprise E3 licensing use rights + +With Windows 11 Enterprise E3, you can take advantage of the following licensing use rights: + +|Licensing use rights|Description| +|-|-| +|**Five Windows Instances per licensed user**|Allows your employees to simultaneously use a Windows laptop, a cloud PC and a specialized device with Windows LTSC, and more| +|**36 months (3 years) support on annual feature releases**|Get extra time to deploy feature releases| +|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible workstyles and smarter work with the included best-in-class virtualization access rights| +|**Windows LTSC Enterprise**|Intended for highly specialized devices that require limited changes due to regulations and certification| +|**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Help improve compatibility and management, reduce support costs, improve asset management, and improve policy control| + +Learn more about [Windows 11 Enterprise E3]() + +### Windows 11 Enterprise E5 + +Windows 11 Enterprise E5 is for organizations that want to take advantage of everything in Windows 11 Enterprise E3 with the addition of **Microsoft Defender for Endpoint Plan 2**, a cloud service that helps enterprises detect, investigate, and respond to advanced cybersecurity attacks on their endpoints and networks. Windows 11 Enterprise E5 is available per user in Commercial Licensing programs. + +Learn more about [Windows 11 Enterprise E5]() + +### Windows Enterprise E3 in Microsoft 365 F3 + +Windows Enterprise E3 in Microsoft 365 F3 is only sold as part of the full F3 suite, and has all the OS features, and most of the cloud services and use rights included with regular Windows Enterprise E3. + +Windows Enterprise E3 in Microsoft 365 F3 doesn't include the following use rights that are included in the regular E3 user subscription license: + +- Microsoft Desktop Optimization Pack (MDOP) +- Windows LTSC Enterprise +- Windows Autopatch + +## Use a Windows Pro device with the Windows Enterprise user subscription license + +In most cases, the Windows Pro edition comes pre-installed on a business-class device. Microsoft recommends upgrading your Windows Pro devices to Enterprise edition when you have acquired a user subscription licenses for Windows. However, there are cases that require to keep devices on the Pro edition and not upgrade them to Enterprise edition. With Windows 11 Enterprise E3, you can take advantage of features, services and use rights not licensed to the Windows Pro license bound to the device. It includes Windows Enterprise edition with cloud-powered capabilities and subscription use rights, and these capabilities are not always technically enforced. Some scenarios that may require to not upgrade to Windows Enterprise edition: + +- Devices not properly provisioned that don't automatically upgrade to Windows Enterprise edition +- Devices may have been acquired for a business process that was not under control of a central IT department or outside of the IT department's knowledge +- A developer that is developing applications that must be tested and certified on Pro, as that is how it will be delivered to customers + +In these cases, you want the PC to be configured, secured, monitored, and updated with the enterprise management and security tools that come with the Windows Enterprise user subscription. Your Windows Enterprise E3 subscriptions does not block these scenarios. + +The following table lists the Windows 11 Enterprise E3 features, services and use rights and their applicability to Windows Pro and Enterprise editions: + +|Feature, service or use right|Windows Pro|Windows Enterprise| +|-|-|-| +|**Windows Defender Credential Guard**||Yes| +|**Managed Microsoft Defender Application Guard for Microsoft Edge**|Yes|Yes| +|**Cloud-based BitLocker Management**|Yes|Yes| +|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**||Yes| +|**Direct Access**|Yes|Yes| +|**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes [\[1\]](#Note1)|Yes| +|**Application Management GPOs**||Yes| +|**Windows UI customization (CSP to manage)**||Yes| +|**Windows Subscription Activation**|Yes|Yes| +|**Windows Autopatch**|Yes|Yes| +|**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|Yes|Yes| +|**[Universal Print](/universal-print/)**|Yes|Yes| +|**[Microsoft Connected Cache](/windows/deployment/do/waas-microsoft-connected-cache)**|Yes|Yes| +|**Endpoint analytics proactive remediation**|Yes|Yes| +|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**||Yes| +|**Feature release support period**| 24 months | 36 months| +|**Windows feature update device readiness report** [\[2\]](#Note2)|Yes|Yes| +|**Windows feature update compatibility risk report** [\[2\]](#Note2)|Yes|Yes| +|**Microsoft Desktop Optimization Pack (MDOP)**|Yes|Yes| + +[1] Device Tunnel requires Enterprise edition. +[2] Intune license required. + +## Next steps + +To learn more about Windows 11 Enterprise E3 and E5, see [Windows 11 Enterprise E3 and E5](/windows/deployment/windows-11-enterprise-e3-e5). \ No newline at end of file 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 03/65] 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). 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 04/65] 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 From 2911a858bdb1bc421fbfb8e152246508c3a701f3 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:01:16 -0400 Subject: [PATCH 05/65] table layout update --- includes/licensing/security/_edition-requirements.md | 2 +- includes/licensing/security/_licensing-requirements.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/licensing/security/_edition-requirements.md b/includes/licensing/security/_edition-requirements.md index 07d24e4f5e..545a567d4b 100644 --- a/includes/licensing/security/_edition-requirements.md +++ b/includes/licensing/security/_edition-requirements.md @@ -8,7 +8,7 @@ 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 | -|:---:|:---:|:---:|:---:|:---:| +|:---|:---:|:---:|:---:|:---:| |**[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](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/security/_licensing-requirements.md b/includes/licensing/security/_licensing-requirements.md index 93e8f47c54..733e73a885 100644 --- a/includes/licensing/security/_licensing-requirements.md +++ b/includes/licensing/security/_licensing-requirements.md @@ -8,7 +8,7 @@ ms.topic: include The following table lists the security features that are available in Windows, and the licensing requirements to use them: |Feature name|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| -|:---:|:---:|:---:|:---:|:---:|:---:| +|:---|:---:|:---:|:---:|:---:|:---:| |**[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](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes|Yes| From 306c140a10aad8fb04f53c4d3c31d8c606a290a2 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 24 Apr 2023 07:44:27 -0400 Subject: [PATCH 06/65] update to include files --- education/windows/federated-sign-in.md | 8 ++++---- .../licensing/{security => }/_edition-requirements.md | 4 ++-- .../licensing/{security => }/_licensing-requirements.md | 4 ++-- ...s-Control-ACLsSCALS.md => access-control-aclsscals.md} | 4 ++-- ...ccount-Lockout-Policy.md => account-lockout-policy.md} | 4 ++-- .../{security/Always-On-VPN.md => always-on-vpn.md} | 4 ++-- .../licensing/{security/AppLocker.md => applocker.md} | 4 ++-- ...Access-kiosk-mode.md => assigned-access-kiosk-mode.md} | 4 ++-- ...e-reduction-ASR.md => attack-surface-reduction-asr.md} | 4 ++-- ...n-and-hybrid-azure-ad-join-with-single-sign-on-sso.md} | 4 ++-- .../licensing/{security/BitLocker.md => bitlocker.md} | 4 ++-- ....md => bluetooth-pairing-and-connection-protection.md} | 4 ++-- ...ertifications.md => common-criteria-certifications.md} | 4 ++-- ...olled-folder-access.md => controlled-folder-access.md} | 4 ++-- ...on-service.md => device-health-attestation-service.md} | 4 ++-- .../{security/Direct-Access.md => direct-access.md} | 4 ++-- ...mail-Encryption-SMIME.md => email-encryption-smime.md} | 4 ++-- .../Encrypted-hard-drive.md => encrypted-hard-drive.md} | 4 ++-- .../Endpoint-Analytics.md => endpoint-analytics.md} | 4 ++-- ...d => enhanced-phishing-protection-with-smartscreen.md} | 4 ++-- .../Exploit-protection.md => exploit-protection.md} | 4 ++-- ...-key.md => fast-identity-online-fido2-security-key.md} | 4 ++-- ...nformation-processing-standard-fips-140-validation.md} | 4 ++-- .../Federated-sign-in.md => federated-sign-in.md} | 4 ++-- ...rotection.md => hardware-enforced-stack-protection.md} | 4 ++-- ...VCI.md => hypervisor-protected-code-integrity-hvci.md} | 4 ++-- ...n.md => kernel-direct-memory-access-dma-protection.md} | 4 ++-- ...lution.md => local-administrator-password-solution.md} | 4 ++-- ...tion.md => local-security-authority-lsa-protection.md} | 4 ++-- ...e-by-mobile-device-management-mdm-and-group-policy.md} | 4 ++-- .../{security/Measured-boot.md => measured-boot.md} | 4 ++-- ...ender-Antivirus.md => microsoft-defender-antivirus.md} | 4 ++-- ...-defender-application-guard-mdag-configure-via-mdm.md} | 4 ++-- ...for-edge-enterprise-mode-and-enterprise-management.md} | 4 ++-- ...er-application-guard-mdag-for-edge-standalone-mode.md} | 4 ++-- ...fender-application-guard-mdag-for-microsoft-office.md} | 4 ++-- ...rosoft-defender-application-guard-mdag-public-apis.md} | 4 ++-- ...for-Endpoint.md => microsoft-defender-for-endpoint.md} | 4 ++-- ...r-SmartScreen.md => microsoft-defender-smartscreen.md} | 4 ++-- ...rocessor.md => microsoft-pluton-security-processor.md} | 4 ++-- ...cklist.md => microsoft-vulnerable-driver-blocklist.md} | 4 ++-- ...on-OWE.md => opportunistic-wireless-encryption-owe.md} | 4 ++-- ...-encryption-PDE.md => personal-data-encryption-pde.md} | 4 ++-- ...rivacy-Resource-Usage.md => privacy-resource-usage.md} | 4 ++-- ...d-Controls.md => privacy-transparency-and-controls.md} | 4 ++-- ...-Autopilot-reset.md => remote-wipe-autopilot-reset.md} | 4 ++-- ...nd-Trusted-Boot.md => secure-boot-and-trusted-boot.md} | 4 ++-- ...uration-lock.md => secured-core-configuration-lock.md} | 4 ++-- .../{security/Secured-core-PC.md => secured-core-pc.md} | 4 ++-- ...s-with-Intune.md => security-baselines-with-intune.md} | 4 ++-- ...irect.md => server-message-block-direct-smb-direct.md} | 4 ++-- ...ervice.md => server-message-block-smb-file-service.md} | 4 ++-- .../Smart-App-Control.md => smart-app-control.md} | 4 ++-- ...dows-Service.md => smart-cards-for-windows-service.md} | 4 ++-- ...s-for-MDE.md => tamper-protection-settings-for-mde.md} | 4 ++-- ...er-security-TLS.md => transport-layer-security-tls.md} | 4 ++-- ...Module-TPM-20.md => trusted-platform-module-tpm-20.md} | 4 ++-- .../{security/Universal-Print.md => universal-print.md} | 4 ++-- ...Account-Control-UAC.md => user-account-control-uac.md} | 4 ++-- ...vate-Network-VPN.md => virtual-private-network-vpn.md} | 4 ++-- ...curity-VBS.md => virtualization-based-security-vbs.md} | 4 ++-- .../{security/WiFi-Security.md => wifi-security.md} | 4 ++-- .../Windows-Autopatch.md => windows-autopatch.md} | 4 ++-- .../Windows-Autopilot.md => windows-autopilot.md} | 4 ++-- .../Windows-containers.md => windows-containers.md} | 4 ++-- ...AC.md => windows-defender-application-control-wdac.md} | 4 ++-- ...tial-Guard.md => windows-defender-credential-guard.md} | 4 ++-- ...ard.md => windows-defender-remote-credential-guard.md} | 4 ++-- ...r-System-Guard.md => windows-defender-system-guard.md} | 4 ++-- ...> windows-feature-and-expedite-updates-with-intune.md} | 4 ++-- .../{security/Windows-Firewall.md => windows-firewall.md} | 4 ++-- ...s-hello-for-business-enhanced-security-sign-in-ess.md} | 4 ++-- ...ello-for-Business.md => windows-hello-for-business.md} | 4 ++-- ...ws-presence-sensing.md => windows-presence-sensing.md} | 4 ++-- .../{security/Windows-Sandbox.md => windows-sandbox.md} | 4 ++-- ...d => windows-security-policy-settings-and-auditing.md} | 4 ++-- ...ate-for-Business.md => windows-update-for-business.md} | 4 ++-- 77 files changed, 156 insertions(+), 156 deletions(-) rename includes/licensing/{security => }/_edition-requirements.md (99%) rename includes/licensing/{security => }/_licensing-requirements.md (99%) rename includes/licensing/{security/Access-Control-ACLsSCALS.md => access-control-aclsscals.md} (77%) rename includes/licensing/{security/Account-Lockout-Policy.md => account-lockout-policy.md} (77%) rename includes/licensing/{security/Always-On-VPN.md => always-on-vpn.md} (76%) rename includes/licensing/{security/AppLocker.md => applocker.md} (76%) rename includes/licensing/{security/Assigned-Access-kiosk-mode.md => assigned-access-kiosk-mode.md} (77%) rename includes/licensing/{security/Attack-surface-reduction-ASR.md => attack-surface-reduction-asr.md} (77%) rename includes/licensing/{security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md => azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md} (81%) rename includes/licensing/{security/BitLocker.md => bitlocker.md} (76%) rename includes/licensing/{security/Bluetooth-pairing-and-connection-protection.md => bluetooth-pairing-and-connection-protection.md} (78%) rename includes/licensing/{security/Common-Criteria-certifications.md => common-criteria-certifications.md} (77%) rename includes/licensing/{security/Controlled-folder-access.md => controlled-folder-access.md} (77%) rename includes/licensing/{security/Device-health-attestation-service.md => device-health-attestation-service.md} (78%) rename includes/licensing/{security/Direct-Access.md => direct-access.md} (76%) rename includes/licensing/{security/Email-Encryption-SMIME.md => email-encryption-smime.md} (77%) rename includes/licensing/{security/Encrypted-hard-drive.md => encrypted-hard-drive.md} (77%) rename includes/licensing/{security/Endpoint-Analytics.md => endpoint-analytics.md} (77%) rename includes/licensing/{security/Enhanced-phishing-protection-with-SmartScreen.md => enhanced-phishing-protection-with-smartscreen.md} (78%) rename includes/licensing/{security/Exploit-protection.md => exploit-protection.md} (77%) rename includes/licensing/{security/Fast-Identity-Online-FIDO2-security-key.md => fast-identity-online-fido2-security-key.md} (78%) rename includes/licensing/{security/Federal-Information-Processing-Standard-FIPS-140-validation.md => federal-information-processing-standard-fips-140-validation.md} (79%) rename includes/licensing/{security/Federated-sign-in.md => federated-sign-in.md} (77%) rename includes/licensing/{security/Hardware-enforced-stack-protection.md => hardware-enforced-stack-protection.md} (78%) rename includes/licensing/{security/Hypervisor-protected-Code-Integrity-HVCI.md => hypervisor-protected-code-integrity-hvci.md} (78%) rename includes/licensing/{security/Kernel-Direct-Memory-Access-DMA-protection.md => kernel-direct-memory-access-dma-protection.md} (78%) rename includes/licensing/{security/Local-Administrator-Password-Solution.md => local-administrator-password-solution.md} (78%) rename includes/licensing/{security/Local-Security-Authority-LSA-Protection.md => local-security-authority-lsa-protection.md} (78%) rename includes/licensing/{security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md => manage-by-mobile-device-management-mdm-and-group-policy.md} (79%) rename includes/licensing/{security/Measured-boot.md => measured-boot.md} (76%) rename includes/licensing/{security/Microsoft-Defender-Antivirus.md => microsoft-defender-antivirus.md} (77%) rename includes/licensing/{security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md => microsoft-defender-application-guard-mdag-configure-via-mdm.md} (79%) rename includes/licensing/{security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md => microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md} (81%) rename includes/licensing/{security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md => microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md} (79%) rename includes/licensing/{security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md => microsoft-defender-application-guard-mdag-for-microsoft-office.md} (79%) rename includes/licensing/{security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md => microsoft-defender-application-guard-mdag-public-apis.md} (79%) rename includes/licensing/{security/Microsoft-Defender-for-Endpoint.md => microsoft-defender-for-endpoint.md} (77%) rename includes/licensing/{security/Microsoft-Defender-SmartScreen.md => microsoft-defender-smartscreen.md} (77%) rename includes/licensing/{security/Microsoft-Pluton-security-processor.md => microsoft-pluton-security-processor.md} (78%) rename includes/licensing/{security/Microsoft-Vulnerable-Driver-Blocklist.md => microsoft-vulnerable-driver-blocklist.md} (78%) rename includes/licensing/{security/Opportunistic-Wireless-Encryption-OWE.md => opportunistic-wireless-encryption-owe.md} (78%) rename includes/licensing/{security/Personal-data-encryption-PDE.md => personal-data-encryption-pde.md} (77%) rename includes/licensing/{security/Privacy-Resource-Usage.md => privacy-resource-usage.md} (77%) rename includes/licensing/{security/Privacy-Transparency-and-Controls.md => privacy-transparency-and-controls.md} (78%) rename includes/licensing/{security/Remote-wipe-Autopilot-reset.md => remote-wipe-autopilot-reset.md} (77%) rename includes/licensing/{security/Secure-Boot-and-Trusted-Boot.md => secure-boot-and-trusted-boot.md} (77%) rename includes/licensing/{security/Secured-core-configuration-lock.md => secured-core-configuration-lock.md} (78%) rename includes/licensing/{security/Secured-core-PC.md => secured-core-pc.md} (77%) rename includes/licensing/{security/Security-baselines-with-Intune.md => security-baselines-with-intune.md} (77%) rename includes/licensing/{security/Server-Message-Block-Direct-SMB-Direct.md => server-message-block-direct-smb-direct.md} (78%) rename includes/licensing/{security/Server-Message-Block-SMB-file-service.md => server-message-block-smb-file-service.md} (78%) rename includes/licensing/{security/Smart-App-Control.md => smart-app-control.md} (77%) rename includes/licensing/{security/Smart-Cards-for-Windows-Service.md => smart-cards-for-windows-service.md} (78%) rename includes/licensing/{security/Tamper-protection-settings-for-MDE.md => tamper-protection-settings-for-mde.md} (78%) rename includes/licensing/{security/Transport-layer-security-TLS.md => transport-layer-security-tls.md} (77%) rename includes/licensing/{security/Trusted-Platform-Module-TPM-20.md => trusted-platform-module-tpm-20.md} (78%) rename includes/licensing/{security/Universal-Print.md => universal-print.md} (77%) rename includes/licensing/{security/User-Account-Control-UAC.md => user-account-control-uac.md} (77%) rename includes/licensing/{security/Virtual-Private-Network-VPN.md => virtual-private-network-vpn.md} (77%) rename includes/licensing/{security/Virtualization-based-security-VBS.md => virtualization-based-security-vbs.md} (78%) rename includes/licensing/{security/WiFi-Security.md => wifi-security.md} (76%) rename includes/licensing/{security/Windows-Autopatch.md => windows-autopatch.md} (77%) rename includes/licensing/{security/Windows-Autopilot.md => windows-autopilot.md} (77%) rename includes/licensing/{security/Windows-containers.md => windows-containers.md} (77%) rename includes/licensing/{security/Windows-Defender-Application-Control-WDAC.md => windows-defender-application-control-wdac.md} (78%) rename includes/licensing/{security/Windows-Defender-Credential-Guard.md => windows-defender-credential-guard.md} (78%) rename includes/licensing/{security/Windows-Defender-Remote-Credential-Guard.md => windows-defender-remote-credential-guard.md} (78%) rename includes/licensing/{security/Windows-Defender-System-Guard.md => windows-defender-system-guard.md} (77%) rename includes/licensing/{security/Windows-feature-and-expedite-updates-with-Intune.md => windows-feature-and-expedite-updates-with-intune.md} (78%) rename includes/licensing/{security/Windows-Firewall.md => windows-firewall.md} (77%) rename includes/licensing/{security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md => windows-hello-for-business-enhanced-security-sign-in-ess.md} (79%) rename includes/licensing/{security/Windows-Hello-for-Business.md => windows-hello-for-business.md} (77%) rename includes/licensing/{security/Windows-presence-sensing.md => windows-presence-sensing.md} (77%) rename includes/licensing/{security/Windows-Sandbox.md => windows-sandbox.md} (77%) rename includes/licensing/{security/Windows-Security-policy-settings-and-auditing.md => windows-security-policy-settings-and-auditing.md} (78%) rename includes/licensing/{security/Windows-Update-for-Business.md => windows-update-for-business.md} (77%) diff --git a/education/windows/federated-sign-in.md b/education/windows/federated-sign-in.md index 6f2f8963c2..b587dca55d 100644 --- a/education/windows/federated-sign-in.md +++ b/education/windows/federated-sign-in.md @@ -1,7 +1,7 @@ --- title: Configure federated sign-in for Windows devices description: Description of federated sign-in feature for the Education SKUs of Windows 11 and how to configure it via Intune or provisioning packages. -ms.date: 04/11/2023 +ms.date: 04/24/2023 ms.topic: how-to appliesto: - ✅ Windows 11 @@ -53,11 +53,11 @@ To use federated sign-in, the devices must have Internet access. This feature wo > - provisioning packages (PPKG) > - Windows Autopilot self-deploying mode -[!INCLUDE [federated-sign-in](../../includes/licensing/security/federated-sign-in.md)] +[!INCLUDE [federated-sign-in](../../includes/licensing/federated-sign-in.md)] -### System requirements +## System requirements -Federated sign-in is supported on the following Windows SKUs and versions: +Federated sign-in is supported on the following Windows editions and versions: - Windows 11 SE, version 22H2 and later - Windows 11 Pro Edu/Education, version 22H2 with [KB5022913][KB-1] diff --git a/includes/licensing/security/_edition-requirements.md b/includes/licensing/_edition-requirements.md similarity index 99% rename from includes/licensing/security/_edition-requirements.md rename to includes/licensing/_edition-requirements.md index 545a567d4b..d250f005e9 100644 --- a/includes/licensing/security/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -1,14 +1,14 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/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 | -|:---|:---:|:---:|:---:|:---:| +|:---:|:---:|:---:|:---:|:---:| |**[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](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/security/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md similarity index 99% rename from includes/licensing/security/_licensing-requirements.md rename to includes/licensing/_licensing-requirements.md index 733e73a885..48a9565913 100644 --- a/includes/licensing/security/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -1,14 +1,14 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- The following table lists the security features that are available in Windows, and the licensing requirements to use them: |Feature name|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| -|:---|:---:|:---:|:---:|:---:|:---:| +|:---:|:---:|:---:|:---:|:---:|:---:| |**[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](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/security/Access-Control-ACLsSCALS.md b/includes/licensing/access-control-aclsscals.md similarity index 77% rename from includes/licensing/security/Access-Control-ACLsSCALS.md rename to includes/licensing/access-control-aclsscals.md index 0364fa5804..704b5aa0dc 100644 --- a/includes/licensing/security/Access-Control-ACLsSCALS.md +++ b/includes/licensing/access-control-aclsscals.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Access Control (ACLs/SCALS) license entitlements are granted by the following li |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Account-Lockout-Policy.md b/includes/licensing/account-lockout-policy.md similarity index 77% rename from includes/licensing/security/Account-Lockout-Policy.md rename to includes/licensing/account-lockout-policy.md index df33653d30..bafcc9a9dd 100644 --- a/includes/licensing/security/Account-Lockout-Policy.md +++ b/includes/licensing/account-lockout-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Account Lockout Policy license entitlements are granted by the following license |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Always-On-VPN.md b/includes/licensing/always-on-vpn.md similarity index 76% rename from includes/licensing/security/Always-On-VPN.md rename to includes/licensing/always-on-vpn.md index 0dc04a9527..3fbcaf2e8d 100644 --- a/includes/licensing/security/Always-On-VPN.md +++ b/includes/licensing/always-on-vpn.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Always On VPN license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/AppLocker.md b/includes/licensing/applocker.md similarity index 76% rename from includes/licensing/security/AppLocker.md rename to includes/licensing/applocker.md index ba9a2131d6..c5dc28e7ec 100644 --- a/includes/licensing/security/AppLocker.md +++ b/includes/licensing/applocker.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ AppLocker license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Assigned-Access-kiosk-mode.md b/includes/licensing/assigned-access-kiosk-mode.md similarity index 77% rename from includes/licensing/security/Assigned-Access-kiosk-mode.md rename to includes/licensing/assigned-access-kiosk-mode.md index 29e6639e12..b60587b44b 100644 --- a/includes/licensing/security/Assigned-Access-kiosk-mode.md +++ b/includes/licensing/assigned-access-kiosk-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Assigned Access (kiosk mode) license entitlements are granted by the following l |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Attack-surface-reduction-ASR.md b/includes/licensing/attack-surface-reduction-asr.md similarity index 77% rename from includes/licensing/security/Attack-surface-reduction-ASR.md rename to includes/licensing/attack-surface-reduction-asr.md index b9fcdbbbec..3cfd8467bf 100644 --- a/includes/licensing/security/Attack-surface-reduction-ASR.md +++ b/includes/licensing/attack-surface-reduction-asr.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Attack surface reduction (ASR) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md b/includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md similarity index 81% rename from includes/licensing/security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md rename to includes/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md index 98caba3406..45aae2ee7a 100644 --- a/includes/licensing/security/Azure-AD-join-Active-Directory-domain-join-and-Hybrid-Azure-AD-join-with-single-sign-on-SSO.md +++ b/includes/licensing/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/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Azure AD join, Active Directory domain join, and Hybrid Azure AD join with singl |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/BitLocker.md b/includes/licensing/bitlocker.md similarity index 76% rename from includes/licensing/security/BitLocker.md rename to includes/licensing/bitlocker.md index bb61941f20..f3d0d21557 100644 --- a/includes/licensing/security/BitLocker.md +++ b/includes/licensing/bitlocker.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ BitLocker license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Bluetooth-pairing-and-connection-protection.md b/includes/licensing/bluetooth-pairing-and-connection-protection.md similarity index 78% rename from includes/licensing/security/Bluetooth-pairing-and-connection-protection.md rename to includes/licensing/bluetooth-pairing-and-connection-protection.md index 452c4e8579..60df6fef19 100644 --- a/includes/licensing/security/Bluetooth-pairing-and-connection-protection.md +++ b/includes/licensing/bluetooth-pairing-and-connection-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Bluetooth pairing and connection protection license entitlements are granted by |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Common-Criteria-certifications.md b/includes/licensing/common-criteria-certifications.md similarity index 77% rename from includes/licensing/security/Common-Criteria-certifications.md rename to includes/licensing/common-criteria-certifications.md index fbcc3a78f3..14b48a174b 100644 --- a/includes/licensing/security/Common-Criteria-certifications.md +++ b/includes/licensing/common-criteria-certifications.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Common Criteria certifications license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Controlled-folder-access.md b/includes/licensing/controlled-folder-access.md similarity index 77% rename from includes/licensing/security/Controlled-folder-access.md rename to includes/licensing/controlled-folder-access.md index 18accb297d..cc49648e38 100644 --- a/includes/licensing/security/Controlled-folder-access.md +++ b/includes/licensing/controlled-folder-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Controlled folder access license entitlements are granted by the following licen |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Device-health-attestation-service.md b/includes/licensing/device-health-attestation-service.md similarity index 78% rename from includes/licensing/security/Device-health-attestation-service.md rename to includes/licensing/device-health-attestation-service.md index 385963b2a3..7bf1846bec 100644 --- a/includes/licensing/security/Device-health-attestation-service.md +++ b/includes/licensing/device-health-attestation-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Device health attestation service license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Direct-Access.md b/includes/licensing/direct-access.md similarity index 76% rename from includes/licensing/security/Direct-Access.md rename to includes/licensing/direct-access.md index ba0ab0da50..7e6fe07896 100644 --- a/includes/licensing/security/Direct-Access.md +++ b/includes/licensing/direct-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Direct Access license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Email-Encryption-SMIME.md b/includes/licensing/email-encryption-smime.md similarity index 77% rename from includes/licensing/security/Email-Encryption-SMIME.md rename to includes/licensing/email-encryption-smime.md index e73e64f50b..4c9095ff51 100644 --- a/includes/licensing/security/Email-Encryption-SMIME.md +++ b/includes/licensing/email-encryption-smime.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Email Encryption (S/MIME) license entitlements are granted by the following lice |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Encrypted-hard-drive.md b/includes/licensing/encrypted-hard-drive.md similarity index 77% rename from includes/licensing/security/Encrypted-hard-drive.md rename to includes/licensing/encrypted-hard-drive.md index 35b83298ce..7534d36dd9 100644 --- a/includes/licensing/security/Encrypted-hard-drive.md +++ b/includes/licensing/encrypted-hard-drive.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Encrypted hard drive license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Endpoint-Analytics.md b/includes/licensing/endpoint-analytics.md similarity index 77% rename from includes/licensing/security/Endpoint-Analytics.md rename to includes/licensing/endpoint-analytics.md index 428534c57d..dc6e851ba9 100644 --- a/includes/licensing/security/Endpoint-Analytics.md +++ b/includes/licensing/endpoint-analytics.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Endpoint Analytics license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Enhanced-phishing-protection-with-SmartScreen.md b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md similarity index 78% rename from includes/licensing/security/Enhanced-phishing-protection-with-SmartScreen.md rename to includes/licensing/enhanced-phishing-protection-with-smartscreen.md index ac0579fb14..bf0b837d8a 100644 --- a/includes/licensing/security/Enhanced-phishing-protection-with-SmartScreen.md +++ b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Enhanced phishing protection with SmartScreen license entitlements are granted b |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Exploit-protection.md b/includes/licensing/exploit-protection.md similarity index 77% rename from includes/licensing/security/Exploit-protection.md rename to includes/licensing/exploit-protection.md index 5f38d31dc2..1d7c765c26 100644 --- a/includes/licensing/security/Exploit-protection.md +++ b/includes/licensing/exploit-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Exploit protection license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Fast-Identity-Online-FIDO2-security-key.md b/includes/licensing/fast-identity-online-fido2-security-key.md similarity index 78% rename from includes/licensing/security/Fast-Identity-Online-FIDO2-security-key.md rename to includes/licensing/fast-identity-online-fido2-security-key.md index be5c9e5a7f..987af1177a 100644 --- a/includes/licensing/security/Fast-Identity-Online-FIDO2-security-key.md +++ b/includes/licensing/fast-identity-online-fido2-security-key.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Fast Identity Online (FIDO2) security key license entitlements are granted by th |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Federal-Information-Processing-Standard-FIPS-140-validation.md b/includes/licensing/federal-information-processing-standard-fips-140-validation.md similarity index 79% rename from includes/licensing/security/Federal-Information-Processing-Standard-FIPS-140-validation.md rename to includes/licensing/federal-information-processing-standard-fips-140-validation.md index c628b32b6f..05a456d4c1 100644 --- a/includes/licensing/security/Federal-Information-Processing-Standard-FIPS-140-validation.md +++ b/includes/licensing/federal-information-processing-standard-fips-140-validation.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Federal Information Processing Standard (FIPS) 140 validation license entitlemen |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Federated-sign-in.md b/includes/licensing/federated-sign-in.md similarity index 77% rename from includes/licensing/security/Federated-sign-in.md rename to includes/licensing/federated-sign-in.md index 98e24a8a1c..cdad5469cb 100644 --- a/includes/licensing/security/Federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Federated sign-in license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |No|No|No|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Hardware-enforced-stack-protection.md b/includes/licensing/hardware-enforced-stack-protection.md similarity index 78% rename from includes/licensing/security/Hardware-enforced-stack-protection.md rename to includes/licensing/hardware-enforced-stack-protection.md index e80f671329..bbfaeed1ad 100644 --- a/includes/licensing/security/Hardware-enforced-stack-protection.md +++ b/includes/licensing/hardware-enforced-stack-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Hardware-enforced stack protection license entitlements are granted by the follo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Hypervisor-protected-Code-Integrity-HVCI.md b/includes/licensing/hypervisor-protected-code-integrity-hvci.md similarity index 78% rename from includes/licensing/security/Hypervisor-protected-Code-Integrity-HVCI.md rename to includes/licensing/hypervisor-protected-code-integrity-hvci.md index afc25a3761..bc49edbe6b 100644 --- a/includes/licensing/security/Hypervisor-protected-Code-Integrity-HVCI.md +++ b/includes/licensing/hypervisor-protected-code-integrity-hvci.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Hypervisor-protected Code Integrity (HVCI) license entitlements are granted by t |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Kernel-Direct-Memory-Access-DMA-protection.md b/includes/licensing/kernel-direct-memory-access-dma-protection.md similarity index 78% rename from includes/licensing/security/Kernel-Direct-Memory-Access-DMA-protection.md rename to includes/licensing/kernel-direct-memory-access-dma-protection.md index 7616cce432..787eb73309 100644 --- a/includes/licensing/security/Kernel-Direct-Memory-Access-DMA-protection.md +++ b/includes/licensing/kernel-direct-memory-access-dma-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Kernel Direct Memory Access (DMA) protection license entitlements are granted by |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Local-Administrator-Password-Solution.md b/includes/licensing/local-administrator-password-solution.md similarity index 78% rename from includes/licensing/security/Local-Administrator-Password-Solution.md rename to includes/licensing/local-administrator-password-solution.md index f2e7e52112..d79edc2723 100644 --- a/includes/licensing/security/Local-Administrator-Password-Solution.md +++ b/includes/licensing/local-administrator-password-solution.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Local Administrator Password Solution license entitlements are granted by the fo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Local-Security-Authority-LSA-Protection.md b/includes/licensing/local-security-authority-lsa-protection.md similarity index 78% rename from includes/licensing/security/Local-Security-Authority-LSA-Protection.md rename to includes/licensing/local-security-authority-lsa-protection.md index 57b8046bab..9ed8145f05 100644 --- a/includes/licensing/security/Local-Security-Authority-LSA-Protection.md +++ b/includes/licensing/local-security-authority-lsa-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Local Security Authority (LSA) Protection license entitlements are granted by th |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md similarity index 79% rename from includes/licensing/security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md rename to includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md index 1b35f363cd..8463963509 100644 --- a/includes/licensing/security/Manage-by-Mobile-Device-Management-MDM-and-group-policy.md +++ b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Manage by Mobile Device Management (MDM) and group policy license entitlements a |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Measured-boot.md b/includes/licensing/measured-boot.md similarity index 76% rename from includes/licensing/security/Measured-boot.md rename to includes/licensing/measured-boot.md index 3734f132f2..02269cc179 100644 --- a/includes/licensing/security/Measured-boot.md +++ b/includes/licensing/measured-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Measured boot license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-Antivirus.md b/includes/licensing/microsoft-defender-antivirus.md similarity index 77% rename from includes/licensing/security/Microsoft-Defender-Antivirus.md rename to includes/licensing/microsoft-defender-antivirus.md index fe7c31a35f..a4b9d4fa96 100644 --- a/includes/licensing/security/Microsoft-Defender-Antivirus.md +++ b/includes/licensing/microsoft-defender-antivirus.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender Antivirus license entitlements are granted by the following l |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md similarity index 79% rename from includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md rename to includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md index d8db86399a..b6ee63ae70 100644 --- a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-configure-via-MDM.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) configure via MDM license entitlemen |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md similarity index 81% rename from includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md rename to includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md index c0a5aad999..b86e777777 100644 --- a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/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/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterpr |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md similarity index 79% rename from includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md rename to includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md index f98c67144f..67b3dc3bac 100644 --- a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Edge-standalone-mode.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) for Edge standalone mode license ent |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md similarity index 79% rename from includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md rename to includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index be2ed700a1..22d7f0bc39 100644 --- a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-for-Microsoft-Office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) for Microsoft Office license entitle |:---:|:---:|:---:|:---:|:---:| |No|No|No|No|No| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md similarity index 79% rename from includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md rename to includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md index b18edb8fc7..afb6cfe684 100644 --- a/includes/licensing/security/Microsoft-Defender-Application-Guard-MDAG-public-APIs.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) public APIs license entitlements are |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-for-Endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md similarity index 77% rename from includes/licensing/security/Microsoft-Defender-for-Endpoint.md rename to includes/licensing/microsoft-defender-for-endpoint.md index 8858cb9ecf..8c58751525 100644 --- a/includes/licensing/security/Microsoft-Defender-for-Endpoint.md +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender for Endpoint license entitlements are granted by the followin |:---:|:---:|:---:|:---:|:---:| |Yes|No|Yes|No|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Defender-SmartScreen.md b/includes/licensing/microsoft-defender-smartscreen.md similarity index 77% rename from includes/licensing/security/Microsoft-Defender-SmartScreen.md rename to includes/licensing/microsoft-defender-smartscreen.md index ace8bc007a..bc4723b34b 100644 --- a/includes/licensing/security/Microsoft-Defender-SmartScreen.md +++ b/includes/licensing/microsoft-defender-smartscreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Defender SmartScreen license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Pluton-security-processor.md b/includes/licensing/microsoft-pluton-security-processor.md similarity index 78% rename from includes/licensing/security/Microsoft-Pluton-security-processor.md rename to includes/licensing/microsoft-pluton-security-processor.md index f702340492..aac93b3784 100644 --- a/includes/licensing/security/Microsoft-Pluton-security-processor.md +++ b/includes/licensing/microsoft-pluton-security-processor.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Pluton security processor license entitlements are granted by the foll |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Microsoft-Vulnerable-Driver-Blocklist.md b/includes/licensing/microsoft-vulnerable-driver-blocklist.md similarity index 78% rename from includes/licensing/security/Microsoft-Vulnerable-Driver-Blocklist.md rename to includes/licensing/microsoft-vulnerable-driver-blocklist.md index 9fc3e71120..cad86c5577 100644 --- a/includes/licensing/security/Microsoft-Vulnerable-Driver-Blocklist.md +++ b/includes/licensing/microsoft-vulnerable-driver-blocklist.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Microsoft Vulnerable Driver Blocklist license entitlements are granted by the fo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Opportunistic-Wireless-Encryption-OWE.md b/includes/licensing/opportunistic-wireless-encryption-owe.md similarity index 78% rename from includes/licensing/security/Opportunistic-Wireless-Encryption-OWE.md rename to includes/licensing/opportunistic-wireless-encryption-owe.md index dd25a92e7e..32b8e63c1a 100644 --- a/includes/licensing/security/Opportunistic-Wireless-Encryption-OWE.md +++ b/includes/licensing/opportunistic-wireless-encryption-owe.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Opportunistic Wireless Encryption (OWE) license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Personal-data-encryption-PDE.md b/includes/licensing/personal-data-encryption-pde.md similarity index 77% rename from includes/licensing/security/Personal-data-encryption-PDE.md rename to includes/licensing/personal-data-encryption-pde.md index bfb8905cf0..4da66fc8c8 100644 --- a/includes/licensing/security/Personal-data-encryption-PDE.md +++ b/includes/licensing/personal-data-encryption-pde.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Personal data encryption (PDE) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Privacy-Resource-Usage.md b/includes/licensing/privacy-resource-usage.md similarity index 77% rename from includes/licensing/security/Privacy-Resource-Usage.md rename to includes/licensing/privacy-resource-usage.md index 2685ed854c..926b33907a 100644 --- a/includes/licensing/security/Privacy-Resource-Usage.md +++ b/includes/licensing/privacy-resource-usage.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Privacy Resource Usage license entitlements are granted by the following license |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Privacy-Transparency-and-Controls.md b/includes/licensing/privacy-transparency-and-controls.md similarity index 78% rename from includes/licensing/security/Privacy-Transparency-and-Controls.md rename to includes/licensing/privacy-transparency-and-controls.md index c8e3ecbddb..2b84a4262a 100644 --- a/includes/licensing/security/Privacy-Transparency-and-Controls.md +++ b/includes/licensing/privacy-transparency-and-controls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Privacy Transparency and Controls license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Remote-wipe-Autopilot-reset.md b/includes/licensing/remote-wipe-autopilot-reset.md similarity index 77% rename from includes/licensing/security/Remote-wipe-Autopilot-reset.md rename to includes/licensing/remote-wipe-autopilot-reset.md index 0994f56a85..ef260da96d 100644 --- a/includes/licensing/security/Remote-wipe-Autopilot-reset.md +++ b/includes/licensing/remote-wipe-autopilot-reset.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Remote wipe (Autopilot reset) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Secure-Boot-and-Trusted-Boot.md b/includes/licensing/secure-boot-and-trusted-boot.md similarity index 77% rename from includes/licensing/security/Secure-Boot-and-Trusted-Boot.md rename to includes/licensing/secure-boot-and-trusted-boot.md index 85dc0feba8..2a73f44f39 100644 --- a/includes/licensing/security/Secure-Boot-and-Trusted-Boot.md +++ b/includes/licensing/secure-boot-and-trusted-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Secure Boot and Trusted Boot license entitlements are granted by the following l |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Secured-core-configuration-lock.md b/includes/licensing/secured-core-configuration-lock.md similarity index 78% rename from includes/licensing/security/Secured-core-configuration-lock.md rename to includes/licensing/secured-core-configuration-lock.md index e64c67ca74..61e443115c 100644 --- a/includes/licensing/security/Secured-core-configuration-lock.md +++ b/includes/licensing/secured-core-configuration-lock.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Secured-core configuration lock license entitlements are granted by the followin |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Secured-core-PC.md b/includes/licensing/secured-core-pc.md similarity index 77% rename from includes/licensing/security/Secured-core-PC.md rename to includes/licensing/secured-core-pc.md index c6b3f79578..b8cb91b4b8 100644 --- a/includes/licensing/security/Secured-core-PC.md +++ b/includes/licensing/secured-core-pc.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Secured-core PC license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Security-baselines-with-Intune.md b/includes/licensing/security-baselines-with-intune.md similarity index 77% rename from includes/licensing/security/Security-baselines-with-Intune.md rename to includes/licensing/security-baselines-with-intune.md index c2d8d272a6..56bf824d77 100644 --- a/includes/licensing/security/Security-baselines-with-Intune.md +++ b/includes/licensing/security-baselines-with-intune.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Security baselines with Intune license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Server-Message-Block-Direct-SMB-Direct.md b/includes/licensing/server-message-block-direct-smb-direct.md similarity index 78% rename from includes/licensing/security/Server-Message-Block-Direct-SMB-Direct.md rename to includes/licensing/server-message-block-direct-smb-direct.md index e1e6dea11a..1d9cf90830 100644 --- a/includes/licensing/security/Server-Message-Block-Direct-SMB-Direct.md +++ b/includes/licensing/server-message-block-direct-smb-direct.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Server Message Block Direct (SMB Direct) license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Server-Message-Block-SMB-file-service.md b/includes/licensing/server-message-block-smb-file-service.md similarity index 78% rename from includes/licensing/security/Server-Message-Block-SMB-file-service.md rename to includes/licensing/server-message-block-smb-file-service.md index d1c3090375..e43140a213 100644 --- a/includes/licensing/security/Server-Message-Block-SMB-file-service.md +++ b/includes/licensing/server-message-block-smb-file-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Server Message Block (SMB) file service license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Smart-App-Control.md b/includes/licensing/smart-app-control.md similarity index 77% rename from includes/licensing/security/Smart-App-Control.md rename to includes/licensing/smart-app-control.md index 232c73dcb7..e7936151a9 100644 --- a/includes/licensing/security/Smart-App-Control.md +++ b/includes/licensing/smart-app-control.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Smart App Control license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Smart-Cards-for-Windows-Service.md b/includes/licensing/smart-cards-for-windows-service.md similarity index 78% rename from includes/licensing/security/Smart-Cards-for-Windows-Service.md rename to includes/licensing/smart-cards-for-windows-service.md index 4f8931fa0c..63a55e3fe7 100644 --- a/includes/licensing/security/Smart-Cards-for-Windows-Service.md +++ b/includes/licensing/smart-cards-for-windows-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Smart Cards for Windows Service license entitlements are granted by the followin |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Tamper-protection-settings-for-MDE.md b/includes/licensing/tamper-protection-settings-for-mde.md similarity index 78% rename from includes/licensing/security/Tamper-protection-settings-for-MDE.md rename to includes/licensing/tamper-protection-settings-for-mde.md index 4d9c90a617..2360237f91 100644 --- a/includes/licensing/security/Tamper-protection-settings-for-MDE.md +++ b/includes/licensing/tamper-protection-settings-for-mde.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Tamper protection settings for MDE license entitlements are granted by the follo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Transport-layer-security-TLS.md b/includes/licensing/transport-layer-security-tls.md similarity index 77% rename from includes/licensing/security/Transport-layer-security-TLS.md rename to includes/licensing/transport-layer-security-tls.md index 862c656964..fac4e27a34 100644 --- a/includes/licensing/security/Transport-layer-security-TLS.md +++ b/includes/licensing/transport-layer-security-tls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Transport layer security (TLS) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Trusted-Platform-Module-TPM-20.md b/includes/licensing/trusted-platform-module-tpm-20.md similarity index 78% rename from includes/licensing/security/Trusted-Platform-Module-TPM-20.md rename to includes/licensing/trusted-platform-module-tpm-20.md index 6dd2f782e6..1c2698fe69 100644 --- a/includes/licensing/security/Trusted-Platform-Module-TPM-20.md +++ b/includes/licensing/trusted-platform-module-tpm-20.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Trusted Platform Module (TPM) 2.0 license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Universal-Print.md b/includes/licensing/universal-print.md similarity index 77% rename from includes/licensing/security/Universal-Print.md rename to includes/licensing/universal-print.md index 8edd1830a1..91d81c256a 100644 --- a/includes/licensing/security/Universal-Print.md +++ b/includes/licensing/universal-print.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Universal Print license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/User-Account-Control-UAC.md b/includes/licensing/user-account-control-uac.md similarity index 77% rename from includes/licensing/security/User-Account-Control-UAC.md rename to includes/licensing/user-account-control-uac.md index 887d3a908f..fcebe3a04f 100644 --- a/includes/licensing/security/User-Account-Control-UAC.md +++ b/includes/licensing/user-account-control-uac.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ User Account Control (UAC) license entitlements are granted by the following lic |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Virtual-Private-Network-VPN.md b/includes/licensing/virtual-private-network-vpn.md similarity index 77% rename from includes/licensing/security/Virtual-Private-Network-VPN.md rename to includes/licensing/virtual-private-network-vpn.md index 7c00cca450..63c5f759be 100644 --- a/includes/licensing/security/Virtual-Private-Network-VPN.md +++ b/includes/licensing/virtual-private-network-vpn.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Virtual Private Network (VPN) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Virtualization-based-security-VBS.md b/includes/licensing/virtualization-based-security-vbs.md similarity index 78% rename from includes/licensing/security/Virtualization-based-security-VBS.md rename to includes/licensing/virtualization-based-security-vbs.md index 65016d71b3..bf7877eecf 100644 --- a/includes/licensing/security/Virtualization-based-security-VBS.md +++ b/includes/licensing/virtualization-based-security-vbs.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Virtualization-based security (VBS) license entitlements are granted by the foll |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/WiFi-Security.md b/includes/licensing/wifi-security.md similarity index 76% rename from includes/licensing/security/WiFi-Security.md rename to includes/licensing/wifi-security.md index 73a23e84a4..60244b96fa 100644 --- a/includes/licensing/security/WiFi-Security.md +++ b/includes/licensing/wifi-security.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ WiFi Security license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Autopatch.md b/includes/licensing/windows-autopatch.md similarity index 77% rename from includes/licensing/security/Windows-Autopatch.md rename to includes/licensing/windows-autopatch.md index 015bbc1455..0aa6b3322b 100644 --- a/includes/licensing/security/Windows-Autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Autopatch license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|No|No| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Autopilot.md b/includes/licensing/windows-autopilot.md similarity index 77% rename from includes/licensing/security/Windows-Autopilot.md rename to includes/licensing/windows-autopilot.md index 57ca063e7e..20a4f93681 100644 --- a/includes/licensing/security/Windows-Autopilot.md +++ b/includes/licensing/windows-autopilot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Autopilot license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-containers.md b/includes/licensing/windows-containers.md similarity index 77% rename from includes/licensing/security/Windows-containers.md rename to includes/licensing/windows-containers.md index 89c14bb938..65bf288051 100644 --- a/includes/licensing/security/Windows-containers.md +++ b/includes/licensing/windows-containers.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows containers license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Defender-Application-Control-WDAC.md b/includes/licensing/windows-defender-application-control-wdac.md similarity index 78% rename from includes/licensing/security/Windows-Defender-Application-Control-WDAC.md rename to includes/licensing/windows-defender-application-control-wdac.md index 197986a72d..c92e8fbb39 100644 --- a/includes/licensing/security/Windows-Defender-Application-Control-WDAC.md +++ b/includes/licensing/windows-defender-application-control-wdac.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Defender Application Control (WDAC) license entitlements are granted by |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Defender-Credential-Guard.md b/includes/licensing/windows-defender-credential-guard.md similarity index 78% rename from includes/licensing/security/Windows-Defender-Credential-Guard.md rename to includes/licensing/windows-defender-credential-guard.md index 122f5a02ba..db77789d7b 100644 --- a/includes/licensing/security/Windows-Defender-Credential-Guard.md +++ b/includes/licensing/windows-defender-credential-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Defender Credential Guard license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Defender-Remote-Credential-Guard.md b/includes/licensing/windows-defender-remote-credential-guard.md similarity index 78% rename from includes/licensing/security/Windows-Defender-Remote-Credential-Guard.md rename to includes/licensing/windows-defender-remote-credential-guard.md index 01fab46e8d..d55ab4048f 100644 --- a/includes/licensing/security/Windows-Defender-Remote-Credential-Guard.md +++ b/includes/licensing/windows-defender-remote-credential-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Defender Remote Credential Guard license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Defender-System-Guard.md b/includes/licensing/windows-defender-system-guard.md similarity index 77% rename from includes/licensing/security/Windows-Defender-System-Guard.md rename to includes/licensing/windows-defender-system-guard.md index a4b2994d2a..d6f28be164 100644 --- a/includes/licensing/security/Windows-Defender-System-Guard.md +++ b/includes/licensing/windows-defender-system-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Defender System Guard license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md b/includes/licensing/windows-feature-and-expedite-updates-with-intune.md similarity index 78% rename from includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md rename to includes/licensing/windows-feature-and-expedite-updates-with-intune.md index 2f213e36ef..f3e01d0e8e 100644 --- a/includes/licensing/security/Windows-feature-and-expedite-updates-with-Intune.md +++ b/includes/licensing/windows-feature-and-expedite-updates-with-intune.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows feature and expedite updates with Intune license entitlements are grante |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Firewall.md b/includes/licensing/windows-firewall.md similarity index 77% rename from includes/licensing/security/Windows-Firewall.md rename to includes/licensing/windows-firewall.md index 946a1000ca..2622f2782b 100644 --- a/includes/licensing/security/Windows-Firewall.md +++ b/includes/licensing/windows-firewall.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Firewall license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md b/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md similarity index 79% rename from includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md rename to includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md index ec3c3e65cc..8121879c76 100644 --- a/includes/licensing/security/Windows-Hello-for-Business-Enhanced-Security-Sign-in-ESS.md +++ b/includes/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Hello for Business Enhanced Security Sign-in (ESS) license entitlements |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Hello-for-Business.md b/includes/licensing/windows-hello-for-business.md similarity index 77% rename from includes/licensing/security/Windows-Hello-for-Business.md rename to includes/licensing/windows-hello-for-business.md index ed78c5c3a7..dda17d2fa2 100644 --- a/includes/licensing/security/Windows-Hello-for-Business.md +++ b/includes/licensing/windows-hello-for-business.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Hello for Business license entitlements are granted by the following lic |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-presence-sensing.md b/includes/licensing/windows-presence-sensing.md similarity index 77% rename from includes/licensing/security/Windows-presence-sensing.md rename to includes/licensing/windows-presence-sensing.md index 04bdc00300..8989dd23d8 100644 --- a/includes/licensing/security/Windows-presence-sensing.md +++ b/includes/licensing/windows-presence-sensing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows presence sensing license entitlements are granted by the following licen |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Sandbox.md b/includes/licensing/windows-sandbox.md similarity index 77% rename from includes/licensing/security/Windows-Sandbox.md rename to includes/licensing/windows-sandbox.md index 9745ec4edd..ab64cdb816 100644 --- a/includes/licensing/security/Windows-Sandbox.md +++ b/includes/licensing/windows-sandbox.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Sandbox license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Security-policy-settings-and-auditing.md b/includes/licensing/windows-security-policy-settings-and-auditing.md similarity index 78% rename from includes/licensing/security/Windows-Security-policy-settings-and-auditing.md rename to includes/licensing/windows-security-policy-settings-and-auditing.md index ae5e26d298..462d337d74 100644 --- a/includes/licensing/security/Windows-Security-policy-settings-and-auditing.md +++ b/includes/licensing/windows-security-policy-settings-and-auditing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Security policy settings and auditing license entitlements are granted b |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). diff --git a/includes/licensing/security/Windows-Update-for-Business.md b/includes/licensing/windows-update-for-business.md similarity index 77% rename from includes/licensing/security/Windows-Update-for-Business.md rename to includes/licensing/windows-update-for-business.md index 0b154d8618..5cfa8990d0 100644 --- a/includes/licensing/security/Windows-Update-for-Business.md +++ b/includes/licensing/windows-update-for-business.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/21/2023 +ms.date: 04/24/2023 ms.topic: include --- @@ -19,4 +19,4 @@ Windows Update for Business license entitlements are granted by the following li |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows 11 licensing overview](https://learn.microsoft.com). +For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). From 6017c492bea8ef92b25410c66e7a370ba919bae0 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:28:14 -0400 Subject: [PATCH 07/65] updates --- windows/whats-new/windows-licensing.md | 57 +++++++++++++++----------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index e14bbefe13..2543add9a9 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -1,39 +1,37 @@ --- -title: Windows 11 commercial licensing overview -description: Learn about licensing requirements to use the features included in the Windows operating system. +title: Windows commercial licensing overview +description: Learn about products and use rights available through Windows commercial licensing. ms.prod: windows-client author: paolomatarazzo ms.author: paoloma manager: aaroncz ms.collection: -- tier3 +- tier2 ms.topic: conceptual -ms.date: 03/12/2023 +ms.date: 04/24/2023 appliesto: - ✅ Windows 11 ms.technology: itpro-security --- -# Windows 11 commercial licensing overview +# Windows commercial licensing overview -Microsoft Commercial Licensing solutions provide the most flexible and cost-effective way to give your organization access to the latest Windows Desktop technologies. Whether you want to upgrade your devices to Windows 11, gain access to exclusive offerings such as Windows 11 Enterprise edition, or use Windows with greater flexibility, there's a Commercial Licensing option that's right for your organization. - -This document provides an overview of the products and use rights available through Commercial Licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. +This document provides an overview of the products and use rights available through commercial licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. > [!NOTE] -> This content is not meant to replace or override other licensing documentation, such as the Windows 11 End User License Agreement or Commercial Licensing Product Terms. +> This content is not meant to replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](http://www.microsoft.com/licensing/product-licensing/products.aspx). -## Windows 11 editions +## Windows 11 editions -There's an edition of Windows software designed to meet the needs of every organization, from a small, growing business to a multinational enterprise. The following table lists the editions of Windows 11 available through each Microsoft distribution channel. +The following table lists the editions of Windows 11 available through each Microsoft distribution channel. | Full Packaged Product (Retail) | Preinstalled on device (OEM)|Commercial Licensing| |-|-|-| -|Windows 11 Pro
Windows 11 Home|Windows 11 Pro
Windows 11 Home|Windows 11 Pro
Windows 11 Enterprise
Windows 11 Enterprise LTSC| +|Windows 11 Home
Windows 11 Pro|Windows 11 Home
Windows 11 Pro|Windows 11 Pro
Windows 11 Enterprise
Windows 11 Enterprise LTSC| ## Windows desktop offerings available through Commercial Licensing -The following offerings are available for purchase through Microsoft Commercial Licensing: +The following offerings are available for purchase through [Microsoft Commercial Licensing](https://www.microsoft.com/licensing): |Product|Description| |-|-| @@ -43,29 +41,38 @@ The following offerings are available for purchase through Microsoft Commercial |Windows 10 Enterprise LTSC |Windows 10 Enterprise LTSC is designed for PC systems that have strict change-management policies with only security and critical bug fixes. By using a Long-Term Servicing Channel edition, you can apply monthly Windows 10 security updates for specialized devices while holding back new-feature updates for an extended period of time, up to 5 years. Windows Enterprise LTSC is available in the per user or per device model depending on the Volume Licensing program through witch it is acquired| |Windows Virtual Desktop Access (VDA) Subscription License|The Windows VDA subscription license provides the right to access virtual Windows desktop environments from devices that aren't covered by a Commercial Licensing offer that includes VDA rights, such as thin clients. Windows VDA is available on a per device or per user basis| +## Windows 11 Pro Upgrade license + +Windows 11 Pro is designed for small and medium businesses. Windows 11 Pro enables you to manage your devices and apps, protect your business data, facilitate remote and mobile scenarios, and take advantage of the cloud technologies for your organization. + +The Windows 11 Pro Upgrade license is recommended if you want to: + +- Upgrade a Windows 10 Pro device to Windows 11 Pro +- Upgrade Windows 7/8/8.1 Pro devices to Windows 10 Pro + ## Windows 11 Enterprise -There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. Each of these can be purchased on a **per-user basis**, and are available only through **Commercial Licensing**, including the **Cloud Solution Provider** program. For more details about Windows Enterprise, see [per device check out this section of this guide](*TO ADD*) +There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. Each of these can be purchased on a **per-user basis**, and are available only through **Commercial Licensing**, including the **Cloud Solution Provider** program. For details about Windows Enterprise per device, see [per device check out this section of this guide](*TO ADD*) ### Windows 11 Enterprise E3 -Windows 11 Enterprise E3 is a per-user subscription, intended for organizations. It includes **Windows Enterprise edition** with cloud-powered capabilities and subscription use rights. -Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced features designed to address the needs of large and mid-size organizations. Examples include advanced protection against modern security threats, the broadest range of options for operating system deployment and update, and comprehensive device and app management. Organizations with devices running Windows 11 Enterprise will can take advantage of the latest security and feature updates on an ongoing basis, while having the ability to choose the pace at which they adopt new technology. +Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced features designed to address the needs of large and mid-size organizations. Examples include advanced protection against modern security threats, the broadest range of options for operating system deployment and update, and comprehensive device and app management. Windows 11 Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. ### Windows 11 Enterprise E3 OS features -With Windows 11 Enterprise E3, you can take advantage of the following OS features: +Here's an overview of the unique Windows Enterprise edition features, cloud powered capabilities, and use rights. -| OS feature | Description | +| Windows Enterprise edition OS based functionality | Description | |-|-| -|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard-requirements)**|Protects against user credential harvesting and pass-the-hash attacks or pass the token attacks, enabled by default| -|**Managed Microsoft Defender Application Guard for Microsoft Edge**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your company while employees browse the Internet| -|**Personal Data Encryption**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials| -|**Direct Access & Always-On VPN device tunnel**|Connect remote users to the organization network without the need for traditional VPN connections with DirectAccess or benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN (device tunnel)| -|**Application Management GPOs**|Prevents unverified apps from executing and endangering your safe zone| -|**Windows UI customization (CSP)**|Locks down the user experience of frontline workers devices or public kiosks| +|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard-requirements)**|Protects against user credential harvesting and pass-the-hash attacks or pass the token attacks.| +|**[Managed Microsoft Defender Application Guard for Microsoft Edge](https://learn.microsoft.com/deployedge/microsoft-edge-security-windows-defender-application-guard)**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your organization while users browse the Internet.| +|**[Modern BitLocker Management](https://learn.microsoft.com/windows/security/information-protection/bitlocker/bitlocker-overview)** | Allows you to eliminate on-premises tools to monitor and support BitLocker recovery scenarios. | +|**[Personal Data Encryption](https://learn.microsoft.com/windows/security/information-protection/personal-data-encryption/overview-pde)**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials.| +|**[Direct Access](https://learn.microsoft.com/windows-server/remote/remote-access/directaccess/directaccess)**|Connect remote users to the organization network without the need for traditional VPN connections.| +|**[Always-On VPN device tunnel](https://learn.microsoft.com/en-us/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN device tunnel.| +|**[Windows UI customization (CSP)](https://learn.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience)**|Locks down the user experience of frontline workers devices or public kiosks.| ### Windows 11 Enterprise E3 cloud services @@ -73,7 +80,7 @@ With Windows 11 Enterprise E3, you can take advantage of the following cloud ser |Cloud-based service | Description | |-|-| -|**Cloud-based BitLocker Management**|Allows you to eliminate on-premises tools to trigger, monitor and support recovery scenarios| +|**Cloud-based BitLocker Management**|Allows you to eliminate on-premises tools to monitor and support recovery scenarios| |**[Windows subscription activation](/windows/deployment/windows-10-subscription-activation)**|Enables you to *step-up* from **Windows Pro edition** to **Enterprise edition** in an instant. You can eliminate license key management or deployment of Enterprise edition images| |**[Windows Autopatch](/windows/deployment/windows-autopatch/overview/windows-autopatch-overview)**|Cloud service that puts Microsoft in control of automating updates to Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams| |**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|This cloud service gives you the control over the approval, scheduling, and safeguarding of quality, feature upgrades, and driver updates delivered from Windows Update| From 9f1b5376f3e22380f6b7ddc244b8e29ce551fb45 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 24 Apr 2023 09:06:58 -0400 Subject: [PATCH 08/65] updates --- includes/licensing/access-control-aclsscals.md | 2 +- includes/licensing/account-lockout-policy.md | 2 +- includes/licensing/always-on-vpn.md | 2 +- includes/licensing/applocker.md | 2 +- includes/licensing/assigned-access-kiosk-mode.md | 2 +- includes/licensing/attack-surface-reduction-asr.md | 2 +- ...d-hybrid-azure-ad-join-with-single-sign-on-sso.md | 2 +- includes/licensing/bitlocker.md | 2 +- .../bluetooth-pairing-and-connection-protection.md | 2 +- includes/licensing/common-criteria-certifications.md | 2 +- includes/licensing/controlled-folder-access.md | 2 +- .../licensing/device-health-attestation-service.md | 2 +- includes/licensing/direct-access.md | 2 +- includes/licensing/email-encryption-smime.md | 2 +- includes/licensing/encrypted-hard-drive.md | 2 +- includes/licensing/endpoint-analytics.md | 2 +- .../enhanced-phishing-protection-with-smartscreen.md | 2 +- includes/licensing/exploit-protection.md | 2 +- .../fast-identity-online-fido2-security-key.md | 2 +- ...mation-processing-standard-fips-140-validation.md | 2 +- includes/licensing/federated-sign-in.md | 2 +- .../licensing/hardware-enforced-stack-protection.md | 2 +- .../hypervisor-protected-code-integrity-hvci.md | 2 +- .../kernel-direct-memory-access-dma-protection.md | 2 +- .../local-administrator-password-solution.md | 2 +- .../local-security-authority-lsa-protection.md | 2 +- ...-mobile-device-management-mdm-and-group-policy.md | 2 +- includes/licensing/measured-boot.md | 2 +- includes/licensing/microsoft-defender-antivirus.md | 2 +- ...ender-application-guard-mdag-configure-via-mdm.md | 2 +- ...edge-enterprise-mode-and-enterprise-management.md | 2 +- ...pplication-guard-mdag-for-edge-standalone-mode.md | 2 +- ...er-application-guard-mdag-for-microsoft-office.md | 2 +- ...ft-defender-application-guard-mdag-public-apis.md | 2 +- .../licensing/microsoft-defender-for-endpoint.md | 2 +- includes/licensing/microsoft-defender-smartscreen.md | 2 +- .../licensing/microsoft-pluton-security-processor.md | 2 +- .../microsoft-vulnerable-driver-blocklist.md | 2 +- .../opportunistic-wireless-encryption-owe.md | 2 +- includes/licensing/personal-data-encryption-pde.md | 2 +- includes/licensing/privacy-resource-usage.md | 2 +- .../licensing/privacy-transparency-and-controls.md | 2 +- includes/licensing/remote-wipe-autopilot-reset.md | 2 +- includes/licensing/secure-boot-and-trusted-boot.md | 2 +- .../licensing/secured-core-configuration-lock.md | 2 +- includes/licensing/secured-core-pc.md | 2 +- includes/licensing/security-baselines-with-intune.md | 2 +- .../server-message-block-direct-smb-direct.md | 2 +- .../server-message-block-smb-file-service.md | 2 +- includes/licensing/smart-app-control.md | 2 +- .../licensing/smart-cards-for-windows-service.md | 2 +- .../licensing/tamper-protection-settings-for-mde.md | 2 +- includes/licensing/transport-layer-security-tls.md | 2 +- includes/licensing/trusted-platform-module-tpm-20.md | 2 +- includes/licensing/universal-print.md | 2 +- includes/licensing/user-account-control-uac.md | 2 +- includes/licensing/virtual-private-network-vpn.md | 2 +- .../licensing/virtualization-based-security-vbs.md | 2 +- includes/licensing/wifi-security.md | 2 +- includes/licensing/windows-autopatch.md | 2 +- includes/licensing/windows-autopilot.md | 2 +- includes/licensing/windows-containers.md | 2 +- .../windows-defender-application-control-wdac.md | 2 +- .../licensing/windows-defender-credential-guard.md | 2 +- .../windows-defender-remote-credential-guard.md | 2 +- includes/licensing/windows-defender-system-guard.md | 2 +- ...ndows-feature-and-expedite-updates-with-intune.md | 2 +- includes/licensing/windows-firewall.md | 2 +- ...llo-for-business-enhanced-security-sign-in-ess.md | 2 +- includes/licensing/windows-hello-for-business.md | 2 +- includes/licensing/windows-presence-sensing.md | 2 +- includes/licensing/windows-sandbox.md | 2 +- .../windows-security-policy-settings-and-auditing.md | 2 +- includes/licensing/windows-update-for-business.md | 2 +- windows/security/TOC.yml | 12 ++++++++++-- .../hello-for-business/hello-overview.md | 8 ++++---- windows/security/introduction/chip-to-cloud.svg | 3 --- .../security-features-edition-requirements.md | 2 +- .../security-features-licensing-requirements.md | 4 ++-- 79 files changed, 91 insertions(+), 86 deletions(-) delete mode 100644 windows/security/introduction/chip-to-cloud.svg diff --git a/includes/licensing/access-control-aclsscals.md b/includes/licensing/access-control-aclsscals.md index 704b5aa0dc..1e7eb6a0db 100644 --- a/includes/licensing/access-control-aclsscals.md +++ b/includes/licensing/access-control-aclsscals.md @@ -19,4 +19,4 @@ Access Control (ACLs/SCALS) license entitlements are granted by the following li |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/account-lockout-policy.md b/includes/licensing/account-lockout-policy.md index bafcc9a9dd..12dcc49ff8 100644 --- a/includes/licensing/account-lockout-policy.md +++ b/includes/licensing/account-lockout-policy.md @@ -19,4 +19,4 @@ Account Lockout Policy license entitlements are granted by the following license |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/always-on-vpn.md b/includes/licensing/always-on-vpn.md index 3fbcaf2e8d..2b8f7aee3b 100644 --- a/includes/licensing/always-on-vpn.md +++ b/includes/licensing/always-on-vpn.md @@ -19,4 +19,4 @@ Always On VPN license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/applocker.md b/includes/licensing/applocker.md index c5dc28e7ec..be5b604415 100644 --- a/includes/licensing/applocker.md +++ b/includes/licensing/applocker.md @@ -19,4 +19,4 @@ AppLocker license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/assigned-access-kiosk-mode.md b/includes/licensing/assigned-access-kiosk-mode.md index b60587b44b..5f14b61a00 100644 --- a/includes/licensing/assigned-access-kiosk-mode.md +++ b/includes/licensing/assigned-access-kiosk-mode.md @@ -19,4 +19,4 @@ Assigned Access (kiosk mode) license entitlements are granted by the following l |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/attack-surface-reduction-asr.md b/includes/licensing/attack-surface-reduction-asr.md index 3cfd8467bf..0e3933d81d 100644 --- a/includes/licensing/attack-surface-reduction-asr.md +++ b/includes/licensing/attack-surface-reduction-asr.md @@ -19,4 +19,4 @@ Attack surface reduction (ASR) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). 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/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md index 45aae2ee7a..e13b6a640a 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/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md @@ -19,4 +19,4 @@ Azure AD join, Active Directory domain join, and Hybrid Azure AD join with singl |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/bitlocker.md b/includes/licensing/bitlocker.md index f3d0d21557..9bf2d9c6d7 100644 --- a/includes/licensing/bitlocker.md +++ b/includes/licensing/bitlocker.md @@ -19,4 +19,4 @@ BitLocker license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/bluetooth-pairing-and-connection-protection.md b/includes/licensing/bluetooth-pairing-and-connection-protection.md index 60df6fef19..06958f780c 100644 --- a/includes/licensing/bluetooth-pairing-and-connection-protection.md +++ b/includes/licensing/bluetooth-pairing-and-connection-protection.md @@ -19,4 +19,4 @@ Bluetooth pairing and connection protection license entitlements are granted by |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/common-criteria-certifications.md b/includes/licensing/common-criteria-certifications.md index 14b48a174b..e53d1744e5 100644 --- a/includes/licensing/common-criteria-certifications.md +++ b/includes/licensing/common-criteria-certifications.md @@ -19,4 +19,4 @@ Common Criteria certifications license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/controlled-folder-access.md b/includes/licensing/controlled-folder-access.md index cc49648e38..b6be3c1f48 100644 --- a/includes/licensing/controlled-folder-access.md +++ b/includes/licensing/controlled-folder-access.md @@ -19,4 +19,4 @@ Controlled folder access license entitlements are granted by the following licen |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/device-health-attestation-service.md b/includes/licensing/device-health-attestation-service.md index 7bf1846bec..1c6e31f416 100644 --- a/includes/licensing/device-health-attestation-service.md +++ b/includes/licensing/device-health-attestation-service.md @@ -19,4 +19,4 @@ Device health attestation service license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/direct-access.md b/includes/licensing/direct-access.md index 7e6fe07896..b8fc0e111b 100644 --- a/includes/licensing/direct-access.md +++ b/includes/licensing/direct-access.md @@ -19,4 +19,4 @@ Direct Access license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/email-encryption-smime.md b/includes/licensing/email-encryption-smime.md index 4c9095ff51..28a80e6a6f 100644 --- a/includes/licensing/email-encryption-smime.md +++ b/includes/licensing/email-encryption-smime.md @@ -19,4 +19,4 @@ Email Encryption (S/MIME) license entitlements are granted by the following lice |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/encrypted-hard-drive.md b/includes/licensing/encrypted-hard-drive.md index 7534d36dd9..c27a213efe 100644 --- a/includes/licensing/encrypted-hard-drive.md +++ b/includes/licensing/encrypted-hard-drive.md @@ -19,4 +19,4 @@ Encrypted hard drive license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/endpoint-analytics.md b/includes/licensing/endpoint-analytics.md index dc6e851ba9..a48f4aa305 100644 --- a/includes/licensing/endpoint-analytics.md +++ b/includes/licensing/endpoint-analytics.md @@ -19,4 +19,4 @@ Endpoint Analytics license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md index bf0b837d8a..f2ab4fadb5 100644 --- a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md +++ b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md @@ -19,4 +19,4 @@ Enhanced phishing protection with SmartScreen license entitlements are granted b |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/exploit-protection.md b/includes/licensing/exploit-protection.md index 1d7c765c26..6c3097eed1 100644 --- a/includes/licensing/exploit-protection.md +++ b/includes/licensing/exploit-protection.md @@ -19,4 +19,4 @@ Exploit protection license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/fast-identity-online-fido2-security-key.md b/includes/licensing/fast-identity-online-fido2-security-key.md index 987af1177a..f9ab563138 100644 --- a/includes/licensing/fast-identity-online-fido2-security-key.md +++ b/includes/licensing/fast-identity-online-fido2-security-key.md @@ -19,4 +19,4 @@ Fast Identity Online (FIDO2) security key license entitlements are granted by th |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/federal-information-processing-standard-fips-140-validation.md b/includes/licensing/federal-information-processing-standard-fips-140-validation.md index 05a456d4c1..6d0fe1073e 100644 --- a/includes/licensing/federal-information-processing-standard-fips-140-validation.md +++ b/includes/licensing/federal-information-processing-standard-fips-140-validation.md @@ -19,4 +19,4 @@ Federal Information Processing Standard (FIPS) 140 validation license entitlemen |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index cdad5469cb..c7fae240e9 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -19,4 +19,4 @@ Federated sign-in license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |No|No|No|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/hardware-enforced-stack-protection.md b/includes/licensing/hardware-enforced-stack-protection.md index bbfaeed1ad..03b7d58bec 100644 --- a/includes/licensing/hardware-enforced-stack-protection.md +++ b/includes/licensing/hardware-enforced-stack-protection.md @@ -19,4 +19,4 @@ Hardware-enforced stack protection license entitlements are granted by the follo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/hypervisor-protected-code-integrity-hvci.md b/includes/licensing/hypervisor-protected-code-integrity-hvci.md index bc49edbe6b..54ba02daf3 100644 --- a/includes/licensing/hypervisor-protected-code-integrity-hvci.md +++ b/includes/licensing/hypervisor-protected-code-integrity-hvci.md @@ -19,4 +19,4 @@ Hypervisor-protected Code Integrity (HVCI) license entitlements are granted by t |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/kernel-direct-memory-access-dma-protection.md b/includes/licensing/kernel-direct-memory-access-dma-protection.md index 787eb73309..144db7a0e2 100644 --- a/includes/licensing/kernel-direct-memory-access-dma-protection.md +++ b/includes/licensing/kernel-direct-memory-access-dma-protection.md @@ -19,4 +19,4 @@ Kernel Direct Memory Access (DMA) protection license entitlements are granted by |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/local-administrator-password-solution.md b/includes/licensing/local-administrator-password-solution.md index d79edc2723..e3722c8252 100644 --- a/includes/licensing/local-administrator-password-solution.md +++ b/includes/licensing/local-administrator-password-solution.md @@ -19,4 +19,4 @@ Local Administrator Password Solution license entitlements are granted by the fo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/local-security-authority-lsa-protection.md b/includes/licensing/local-security-authority-lsa-protection.md index 9ed8145f05..0f79870132 100644 --- a/includes/licensing/local-security-authority-lsa-protection.md +++ b/includes/licensing/local-security-authority-lsa-protection.md @@ -19,4 +19,4 @@ Local Security Authority (LSA) Protection license entitlements are granted by th |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md index 8463963509..4701881ed3 100644 --- a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md +++ b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md @@ -19,4 +19,4 @@ Manage by Mobile Device Management (MDM) and group policy license entitlements a |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/measured-boot.md b/includes/licensing/measured-boot.md index 02269cc179..94b7d51eba 100644 --- a/includes/licensing/measured-boot.md +++ b/includes/licensing/measured-boot.md @@ -19,4 +19,4 @@ Measured boot license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-antivirus.md b/includes/licensing/microsoft-defender-antivirus.md index a4b9d4fa96..28524e3540 100644 --- a/includes/licensing/microsoft-defender-antivirus.md +++ b/includes/licensing/microsoft-defender-antivirus.md @@ -19,4 +19,4 @@ Microsoft Defender Antivirus license entitlements are granted by the following l |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md index b6ee63ae70..7e96c9d671 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) configure via MDM license entitlemen |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md index b86e777777..ce29877baf 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterpr |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md index 67b3dc3bac..610e7bb63a 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) for Edge standalone mode license ent |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index 22d7f0bc39..472914659e 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) for Microsoft Office license entitle |:---:|:---:|:---:|:---:|:---:| |No|No|No|No|No| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md index afb6cfe684..a80d9499b3 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -19,4 +19,4 @@ Microsoft Defender Application Guard (MDAG) public APIs license entitlements are |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md index 8c58751525..a1e6da35dc 100644 --- a/includes/licensing/microsoft-defender-for-endpoint.md +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -19,4 +19,4 @@ Microsoft Defender for Endpoint license entitlements are granted by the followin |:---:|:---:|:---:|:---:|:---:| |Yes|No|Yes|No|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-smartscreen.md b/includes/licensing/microsoft-defender-smartscreen.md index bc4723b34b..ec626ac07a 100644 --- a/includes/licensing/microsoft-defender-smartscreen.md +++ b/includes/licensing/microsoft-defender-smartscreen.md @@ -19,4 +19,4 @@ Microsoft Defender SmartScreen license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-pluton-security-processor.md b/includes/licensing/microsoft-pluton-security-processor.md index aac93b3784..58bc9363a0 100644 --- a/includes/licensing/microsoft-pluton-security-processor.md +++ b/includes/licensing/microsoft-pluton-security-processor.md @@ -19,4 +19,4 @@ Microsoft Pluton security processor license entitlements are granted by the foll |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-vulnerable-driver-blocklist.md b/includes/licensing/microsoft-vulnerable-driver-blocklist.md index cad86c5577..2dcc3fb136 100644 --- a/includes/licensing/microsoft-vulnerable-driver-blocklist.md +++ b/includes/licensing/microsoft-vulnerable-driver-blocklist.md @@ -19,4 +19,4 @@ Microsoft Vulnerable Driver Blocklist license entitlements are granted by the fo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/opportunistic-wireless-encryption-owe.md b/includes/licensing/opportunistic-wireless-encryption-owe.md index 32b8e63c1a..b2919a0d31 100644 --- a/includes/licensing/opportunistic-wireless-encryption-owe.md +++ b/includes/licensing/opportunistic-wireless-encryption-owe.md @@ -19,4 +19,4 @@ Opportunistic Wireless Encryption (OWE) license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/personal-data-encryption-pde.md b/includes/licensing/personal-data-encryption-pde.md index 4da66fc8c8..f8cf940fc8 100644 --- a/includes/licensing/personal-data-encryption-pde.md +++ b/includes/licensing/personal-data-encryption-pde.md @@ -19,4 +19,4 @@ Personal data encryption (PDE) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/privacy-resource-usage.md b/includes/licensing/privacy-resource-usage.md index 926b33907a..6ee4c2b844 100644 --- a/includes/licensing/privacy-resource-usage.md +++ b/includes/licensing/privacy-resource-usage.md @@ -19,4 +19,4 @@ Privacy Resource Usage license entitlements are granted by the following license |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/privacy-transparency-and-controls.md b/includes/licensing/privacy-transparency-and-controls.md index 2b84a4262a..4a1ea93b6f 100644 --- a/includes/licensing/privacy-transparency-and-controls.md +++ b/includes/licensing/privacy-transparency-and-controls.md @@ -19,4 +19,4 @@ Privacy Transparency and Controls license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/remote-wipe-autopilot-reset.md b/includes/licensing/remote-wipe-autopilot-reset.md index ef260da96d..7448bbca80 100644 --- a/includes/licensing/remote-wipe-autopilot-reset.md +++ b/includes/licensing/remote-wipe-autopilot-reset.md @@ -19,4 +19,4 @@ Remote wipe (Autopilot reset) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/secure-boot-and-trusted-boot.md b/includes/licensing/secure-boot-and-trusted-boot.md index 2a73f44f39..66486b3820 100644 --- a/includes/licensing/secure-boot-and-trusted-boot.md +++ b/includes/licensing/secure-boot-and-trusted-boot.md @@ -19,4 +19,4 @@ Secure Boot and Trusted Boot license entitlements are granted by the following l |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/secured-core-configuration-lock.md b/includes/licensing/secured-core-configuration-lock.md index 61e443115c..1bf49404f9 100644 --- a/includes/licensing/secured-core-configuration-lock.md +++ b/includes/licensing/secured-core-configuration-lock.md @@ -19,4 +19,4 @@ Secured-core configuration lock license entitlements are granted by the followin |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/secured-core-pc.md b/includes/licensing/secured-core-pc.md index b8cb91b4b8..49111cf0e9 100644 --- a/includes/licensing/secured-core-pc.md +++ b/includes/licensing/secured-core-pc.md @@ -19,4 +19,4 @@ Secured-core PC license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/security-baselines-with-intune.md b/includes/licensing/security-baselines-with-intune.md index 56bf824d77..d1bbd124cd 100644 --- a/includes/licensing/security-baselines-with-intune.md +++ b/includes/licensing/security-baselines-with-intune.md @@ -19,4 +19,4 @@ Security baselines with Intune license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/server-message-block-direct-smb-direct.md b/includes/licensing/server-message-block-direct-smb-direct.md index 1d9cf90830..4f550f7615 100644 --- a/includes/licensing/server-message-block-direct-smb-direct.md +++ b/includes/licensing/server-message-block-direct-smb-direct.md @@ -19,4 +19,4 @@ Server Message Block Direct (SMB Direct) license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/server-message-block-smb-file-service.md b/includes/licensing/server-message-block-smb-file-service.md index e43140a213..949799af17 100644 --- a/includes/licensing/server-message-block-smb-file-service.md +++ b/includes/licensing/server-message-block-smb-file-service.md @@ -19,4 +19,4 @@ Server Message Block (SMB) file service license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/smart-app-control.md b/includes/licensing/smart-app-control.md index e7936151a9..ec15bdb692 100644 --- a/includes/licensing/smart-app-control.md +++ b/includes/licensing/smart-app-control.md @@ -19,4 +19,4 @@ Smart App Control license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/smart-cards-for-windows-service.md b/includes/licensing/smart-cards-for-windows-service.md index 63a55e3fe7..65d38875b0 100644 --- a/includes/licensing/smart-cards-for-windows-service.md +++ b/includes/licensing/smart-cards-for-windows-service.md @@ -19,4 +19,4 @@ Smart Cards for Windows Service license entitlements are granted by the followin |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/tamper-protection-settings-for-mde.md b/includes/licensing/tamper-protection-settings-for-mde.md index 2360237f91..11a2824f53 100644 --- a/includes/licensing/tamper-protection-settings-for-mde.md +++ b/includes/licensing/tamper-protection-settings-for-mde.md @@ -19,4 +19,4 @@ Tamper protection settings for MDE license entitlements are granted by the follo |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/transport-layer-security-tls.md b/includes/licensing/transport-layer-security-tls.md index fac4e27a34..dceb1635ec 100644 --- a/includes/licensing/transport-layer-security-tls.md +++ b/includes/licensing/transport-layer-security-tls.md @@ -19,4 +19,4 @@ Transport layer security (TLS) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/trusted-platform-module-tpm-20.md b/includes/licensing/trusted-platform-module-tpm-20.md index 1c2698fe69..eae4c2e538 100644 --- a/includes/licensing/trusted-platform-module-tpm-20.md +++ b/includes/licensing/trusted-platform-module-tpm-20.md @@ -19,4 +19,4 @@ Trusted Platform Module (TPM) 2.0 license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/universal-print.md b/includes/licensing/universal-print.md index 91d81c256a..9a952fc23f 100644 --- a/includes/licensing/universal-print.md +++ b/includes/licensing/universal-print.md @@ -19,4 +19,4 @@ Universal Print license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/user-account-control-uac.md b/includes/licensing/user-account-control-uac.md index fcebe3a04f..4e28d74263 100644 --- a/includes/licensing/user-account-control-uac.md +++ b/includes/licensing/user-account-control-uac.md @@ -19,4 +19,4 @@ User Account Control (UAC) license entitlements are granted by the following lic |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/virtual-private-network-vpn.md b/includes/licensing/virtual-private-network-vpn.md index 63c5f759be..6ca8c3ddd5 100644 --- a/includes/licensing/virtual-private-network-vpn.md +++ b/includes/licensing/virtual-private-network-vpn.md @@ -19,4 +19,4 @@ Virtual Private Network (VPN) license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/virtualization-based-security-vbs.md b/includes/licensing/virtualization-based-security-vbs.md index bf7877eecf..73f9b4ae28 100644 --- a/includes/licensing/virtualization-based-security-vbs.md +++ b/includes/licensing/virtualization-based-security-vbs.md @@ -19,4 +19,4 @@ Virtualization-based security (VBS) license entitlements are granted by the foll |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/wifi-security.md b/includes/licensing/wifi-security.md index 60244b96fa..528d3e8873 100644 --- a/includes/licensing/wifi-security.md +++ b/includes/licensing/wifi-security.md @@ -19,4 +19,4 @@ WiFi Security license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/windows-autopatch.md index 0aa6b3322b..c9d890fb98 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -19,4 +19,4 @@ Windows Autopatch license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |No|Yes|Yes|No|No| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-autopilot.md b/includes/licensing/windows-autopilot.md index 20a4f93681..d0ea1ecca1 100644 --- a/includes/licensing/windows-autopilot.md +++ b/includes/licensing/windows-autopilot.md @@ -19,4 +19,4 @@ Windows Autopilot license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-containers.md b/includes/licensing/windows-containers.md index 65bf288051..e9df23b0f1 100644 --- a/includes/licensing/windows-containers.md +++ b/includes/licensing/windows-containers.md @@ -19,4 +19,4 @@ Windows containers license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-application-control-wdac.md b/includes/licensing/windows-defender-application-control-wdac.md index c92e8fbb39..7b029709ad 100644 --- a/includes/licensing/windows-defender-application-control-wdac.md +++ b/includes/licensing/windows-defender-application-control-wdac.md @@ -19,4 +19,4 @@ Windows Defender Application Control (WDAC) license entitlements are granted by |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-credential-guard.md b/includes/licensing/windows-defender-credential-guard.md index db77789d7b..ea360fa645 100644 --- a/includes/licensing/windows-defender-credential-guard.md +++ b/includes/licensing/windows-defender-credential-guard.md @@ -19,4 +19,4 @@ Windows Defender Credential Guard license entitlements are granted by the follow |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-remote-credential-guard.md b/includes/licensing/windows-defender-remote-credential-guard.md index d55ab4048f..fa718760d4 100644 --- a/includes/licensing/windows-defender-remote-credential-guard.md +++ b/includes/licensing/windows-defender-remote-credential-guard.md @@ -19,4 +19,4 @@ Windows Defender Remote Credential Guard license entitlements are granted by the |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-system-guard.md b/includes/licensing/windows-defender-system-guard.md index d6f28be164..3e6515de2c 100644 --- a/includes/licensing/windows-defender-system-guard.md +++ b/includes/licensing/windows-defender-system-guard.md @@ -19,4 +19,4 @@ Windows Defender System Guard license entitlements are granted by the following |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-feature-and-expedite-updates-with-intune.md b/includes/licensing/windows-feature-and-expedite-updates-with-intune.md index f3e01d0e8e..4a0982992b 100644 --- a/includes/licensing/windows-feature-and-expedite-updates-with-intune.md +++ b/includes/licensing/windows-feature-and-expedite-updates-with-intune.md @@ -19,4 +19,4 @@ Windows feature and expedite updates with Intune license entitlements are grante |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-firewall.md b/includes/licensing/windows-firewall.md index 2622f2782b..7dff38b793 100644 --- a/includes/licensing/windows-firewall.md +++ b/includes/licensing/windows-firewall.md @@ -19,4 +19,4 @@ Windows Firewall license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). 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 index 8121879c76..71e43b05c6 100644 --- 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 @@ -19,4 +19,4 @@ Windows Hello for Business Enhanced Security Sign-in (ESS) license entitlements |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-hello-for-business.md b/includes/licensing/windows-hello-for-business.md index dda17d2fa2..6ff15f6184 100644 --- a/includes/licensing/windows-hello-for-business.md +++ b/includes/licensing/windows-hello-for-business.md @@ -19,4 +19,4 @@ Windows Hello for Business license entitlements are granted by the following lic |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-presence-sensing.md b/includes/licensing/windows-presence-sensing.md index 8989dd23d8..ce8d58277f 100644 --- a/includes/licensing/windows-presence-sensing.md +++ b/includes/licensing/windows-presence-sensing.md @@ -19,4 +19,4 @@ Windows presence sensing license entitlements are granted by the following licen |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-sandbox.md b/includes/licensing/windows-sandbox.md index ab64cdb816..b08403f118 100644 --- a/includes/licensing/windows-sandbox.md +++ b/includes/licensing/windows-sandbox.md @@ -19,4 +19,4 @@ Windows Sandbox license entitlements are granted by the following licenses: |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-security-policy-settings-and-auditing.md b/includes/licensing/windows-security-policy-settings-and-auditing.md index 462d337d74..4fbac14e8e 100644 --- a/includes/licensing/windows-security-policy-settings-and-auditing.md +++ b/includes/licensing/windows-security-policy-settings-and-auditing.md @@ -19,4 +19,4 @@ Windows Security policy settings and auditing license entitlements are granted b |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-update-for-business.md b/includes/licensing/windows-update-for-business.md index 5cfa8990d0..7df9965759 100644 --- a/includes/licensing/windows-update-for-business.md +++ b/includes/licensing/windows-update-for-business.md @@ -19,4 +19,4 @@ Windows Update for Business license entitlements are granted by the following li |:---:|:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes|Yes| -For more information about Windows licensing, see [Windows licensing overview](https://learn.microsoft.com/windows/whats-new/windows-licensing.md). +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 4984e4e28e..1bd19e107d 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -1,9 +1,17 @@ - name: Windows security href: index.yml -- name: Zero Trust and Windows - href: zero-trust-windows-device-health.md expanded: true +- name: Introduction + items: + - name: Zero Trust and Windows + href: zero-trust-windows-device-health.md + - name: Windows security overview + href: introduction/index.md + - name: Security features edition requirements + href: introduction/security-features-edition-requirements.md + - name: Security features licensing requirements + href: introduction/security-features-licensing-requirements.md - name: Hardware security items: - name: Overview diff --git a/windows/security/identity-protection/hello-for-business/hello-overview.md b/windows/security/identity-protection/hello-for-business/hello-overview.md index f4c5e4f7a1..84acf6b19c 100644 --- a/windows/security/identity-protection/hello-for-business/hello-overview.md +++ b/windows/security/identity-protection/hello-for-business/hello-overview.md @@ -1,11 +1,11 @@ --- -title: Windows Hello for Business Overview (Windows) -description: Learn how Windows Hello for Business replaces passwords with strong two-factor authentication on PCs and mobile devices in Windows 10 and Windows 11. +title: Windows Hello for Business Overview +description: Learn how Windows Hello for Business replaces passwords with strong two-factor authentication on Windows devices. ms.collection: - highpri - tier1 ms.topic: conceptual -ms.date: 12/31/2017 +ms.date: 04/24/2023 --- # Windows Hello for Business Overview @@ -65,7 +65,7 @@ Imagine that someone is looking over your shoulder as you get money from an ATM Windows Hello helps protect user identities and user credentials. Because the user doesn't enter a password (except during provisioning), it helps circumvent phishing and brute force attacks. It also helps prevent server breaches because Windows Hello credentials are an asymmetric key pair, which helps prevent replay attacks when these keys are protected by TPMs. -[!INCLUDE [windows-hello-for-business](../../../../includes/licensing/security/windows-hello-for-business.md)] +[!INCLUDE [windows-hello-for-business](../../../../includes/licensing/windows-hello-for-business.md)] ## How Windows Hello for Business works: key points diff --git a/windows/security/introduction/chip-to-cloud.svg b/windows/security/introduction/chip-to-cloud.svg deleted file mode 100644 index 62f4230955..0000000000 --- a/windows/security/introduction/chip-to-cloud.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
Hardware
(Chip)
Hardware...
Hardware Root-of-Trust

TPM 2.0
Microsoft Puton Security Processor
Hardware Root-of-Trust...
Silicon Assisted Security

Secure Kernel (HVCI enabled by default)
Hardware Enforced Stack Protection
Secured-Core PCs
Firmware Protection
Silicon Assisted Security...
Operating
System
Operating...
Encryption and Data Protection

BitLocker
Encrypted Hard Drive
Personal Data Encryption
Email Encryption
Encryption and Data Protection...
System Security
System Security
Trusted Boot
Cryptography
Certificates
Trusted Boot...
Code Signing
Code Integrity
Device Health Attestation
Code Signing...
Windows Security Policy Setting and Auditing
Windows Security App
Windows Security Policy Setting and Audit...
Network Security

Transport Layer Security (TLS)
DNS Security
Bluetooth protection
Secured Wi-Fi
Windows Defender Firewall
VPN
SMB File Services
Network Security...
Virus an Threat Protection

Microsoft Defender Antivirus
Local Security Authority
Attack Surface Reduction
Tamper Protection
Vulnerable Driver Blocklist
Controlled Folder Access
Exploit Protection
Enhanced Phishing Protection
Microsoft Defender for Endpoint
Virus an Threat Protection...Text is not SVG - cannot display \ No newline at end of file diff --git a/windows/security/introduction/security-features-edition-requirements.md b/windows/security/introduction/security-features-edition-requirements.md index 41ca2cf5ee..78f752d813 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 [_edition-requirements](../../../includes/licensing/security/_edition-requirements.md)] \ No newline at end of file +[!INCLUDE [_edition-requirements](../../../includes/licensing/_edition-requirements.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 676b071fa0..d75b32a689 100644 --- a/windows/security/introduction/security-features-licensing-requirements.md +++ b/windows/security/introduction/security-features-licensing-requirements.md @@ -8,7 +8,7 @@ manager: aaroncz ms.collection: - tier3 ms.topic: conceptual -ms.date: 03/12/2023 +ms.date: 04/24/2023 appliesto: - ✅ Windows 11 ms.technology: itpro-security @@ -16,4 +16,4 @@ ms.technology: itpro-security # Windows security licensing requirements -[!INCLUDE [_licensing-requirements](../../../includes/licensing/security/_licensing-requirements.md)] \ No newline at end of file +[!INCLUDE [_licensing-requirements](../../../includes/licensing/_licensing-requirements.md)] \ No newline at end of file From 68119a975fa7246a899234a25a99eff3bd2baa72 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 24 Apr 2023 09:32:04 -0400 Subject: [PATCH 09/65] updates to relative links --- includes/licensing/_edition-requirements.md | 2 +- includes/licensing/_licensing-requirements.md | 2 +- windows/security/introduction/index.md | 4 +--- windows/whats-new/windows-licensing.md | 14 +++++++------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md index d250f005e9..ab8bd9523f 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -8,7 +8,7 @@ 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 | -|:---:|:---:|:---:|:---:|:---:| +|:---|:---:|:---:|:---:|:---:| |**[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](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md index 48a9565913..dbdbf770cb 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -8,7 +8,7 @@ ms.topic: include The following table lists the security features that are available in Windows, and the licensing requirements to use them: |Feature name|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| -|:---:|:---:|:---:|:---:|:---:|:---:| +|:---|:---:|:---:|:---:|:---:|:---:| |**[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](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes|Yes|Yes|Yes| diff --git a/windows/security/introduction/index.md b/windows/security/introduction/index.md index f84afefa03..913a477cf1 100644 --- a/windows/security/introduction/index.md +++ b/windows/security/introduction/index.md @@ -1,7 +1,7 @@ --- title: Introduction to Windows security description: System security book. -ms.date: 04/10/2023 +ms.date: 04/24/2023 ms.topic: tutorial ms.author: paoloma author: paolomatarazzo @@ -13,8 +13,6 @@ appliesto: The acceleration of digital transformation and the expansion of both remote and hybrid workplaces brings new opportunities to organizations, communities, and individuals. Our work styles have transformed. And now more than ever, employees need simple, intuitive user experiences to collaborate and stay productive, wherever work happens. But the expansion of access and ability to work anywhere has also introduced new threats and risks. According to data from the Microsoft commissioned Security Signals report, 75% of security decision-makers at the vice-president level and above feel the move to hybrid work leaves their organization more vulnerable to security threats. And [Microsoft's 2022 Work Trend Index](https://www.microsoft.com/security/blog/2022/04/05/new-security-features-for-windows-11-will-help-protect-hybrid-work/) shows "cybersecurity issues and risks" are top concerns for business decisions makers, who worry about issues like malware, stolen credentials, devices that lack security updates, and physical attacks on lost or stolen devices. -:::image type="content" source="chip-to-cloud.svg" lightbox="chip-to-cloud.svg" alt-text="chip to cloud diagram"::: - ## How Windows 11 enables zero-trust protection A zero-trust security model gives the right people the right access at the right time. Zero-trust security is based on three principles: diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index 2543add9a9..777660223b 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -19,7 +19,7 @@ ms.technology: itpro-security This document provides an overview of the products and use rights available through commercial licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. > [!NOTE] -> This content is not meant to replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](http://www.microsoft.com/licensing/product-licensing/products.aspx). +> This content is not meant to replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](https://www.microsoft.com/licensing/product-licensing/products.aspx). ## Windows 11 editions @@ -67,12 +67,12 @@ Here's an overview of the unique Windows Enterprise edition features, cloud powe | Windows Enterprise edition OS based functionality | Description | |-|-| |**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard-requirements)**|Protects against user credential harvesting and pass-the-hash attacks or pass the token attacks.| -|**[Managed Microsoft Defender Application Guard for Microsoft Edge](https://learn.microsoft.com/deployedge/microsoft-edge-security-windows-defender-application-guard)**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your organization while users browse the Internet.| -|**[Modern BitLocker Management](https://learn.microsoft.com/windows/security/information-protection/bitlocker/bitlocker-overview)** | Allows you to eliminate on-premises tools to monitor and support BitLocker recovery scenarios. | -|**[Personal Data Encryption](https://learn.microsoft.com/windows/security/information-protection/personal-data-encryption/overview-pde)**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials.| -|**[Direct Access](https://learn.microsoft.com/windows-server/remote/remote-access/directaccess/directaccess)**|Connect remote users to the organization network without the need for traditional VPN connections.| -|**[Always-On VPN device tunnel](https://learn.microsoft.com/en-us/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN device tunnel.| -|**[Windows UI customization (CSP)](https://learn.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience)**|Locks down the user experience of frontline workers devices or public kiosks.| +|**[Managed Microsoft Defender Application Guard for Microsoft Edge](/deployedge/microsoft-edge-security-windows-defender-application-guard)**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your organization while users browse the Internet.| +|**[Modern BitLocker Management](h/windows/security/information-protection/bitlocker/bitlocker-overview)** | Allows you to eliminate on-premises tools to monitor and support BitLocker recovery scenarios. | +|**[Personal Data Encryption](/windows/security/information-protection/personal-data-encryption/overview-pde)**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials.| +|**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|Connect remote users to the organization network without the need for traditional VPN connections.| +|**[Always-On VPN device tunnel](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN device tunnel.| +|**[Windows UI customization (CSP)](/windows/client-management/mdm/policy-csp-experience)**|Locks down the user experience of frontline workers devices or public kiosks.| ### Windows 11 Enterprise E3 cloud services From 1c8bc9b4dfbd7c4195e0ae4d4fa7e14688848bd5 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 24 Apr 2023 09:43:25 -0400 Subject: [PATCH 10/65] updates --- includes/licensing/federated-sign-in.md | 2 +- windows/whats-new/TOC.yml | 2 ++ windows/whats-new/windows-licensing.md | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index c7fae240e9..199b442cb7 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -15,7 +15,7 @@ The following table lists the Windows editions that support Federated sign-in: Federated sign-in 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| +|Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| |No|No|No|Yes|Yes| diff --git a/windows/whats-new/TOC.yml b/windows/whats-new/TOC.yml index 0e145097a8..20df997f4f 100644 --- a/windows/whats-new/TOC.yml +++ b/windows/whats-new/TOC.yml @@ -1,5 +1,7 @@ - name: What's new in Windows href: index.yml +- name: Windows commercial licensing overview + href: windows-licensing.md - name: Windows 11 expanded: true items: diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index 777660223b..aa5e10d6d9 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -68,7 +68,7 @@ Here's an overview of the unique Windows Enterprise edition features, cloud powe |-|-| |**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard-requirements)**|Protects against user credential harvesting and pass-the-hash attacks or pass the token attacks.| |**[Managed Microsoft Defender Application Guard for Microsoft Edge](/deployedge/microsoft-edge-security-windows-defender-application-guard)**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your organization while users browse the Internet.| -|**[Modern BitLocker Management](h/windows/security/information-protection/bitlocker/bitlocker-overview)** | Allows you to eliminate on-premises tools to monitor and support BitLocker recovery scenarios. | +|**[Modern BitLocker Management](/windows/security/information-protection/bitlocker/bitlocker-overview)** | Allows you to eliminate on-premises tools to monitor and support BitLocker recovery scenarios. | |**[Personal Data Encryption](/windows/security/information-protection/personal-data-encryption/overview-pde)**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials.| |**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|Connect remote users to the organization network without the need for traditional VPN connections.| |**[Always-On VPN device tunnel](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN device tunnel.| From db6bc1b8fc9f31a81a6ad9ddc1fe0ba1563a9832 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 24 Apr 2023 18:03:48 -0400 Subject: [PATCH 11/65] licensing doc updates --- includes/licensing/federated-sign-in.md | 2 +- windows/whats-new/windows-licensing.md | 49 ++++++++++++------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index 199b442cb7..ec70299404 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -17,6 +17,6 @@ Federated sign-in license entitlements are granted by the following licenses: |Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|No|No|No|Yes|Yes| +|Yes|No|No|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index aa5e10d6d9..de738845cb 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -16,15 +16,15 @@ ms.technology: itpro-security # Windows commercial licensing overview -This document provides an overview of the products and use rights available through commercial licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. +This document provides an overview of the products and use rights available through Microsoft commercial licensing. Information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization are also included. > [!NOTE] -> This content is not meant to replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](https://www.microsoft.com/licensing/product-licensing/products.aspx). +> The content of this article doesn't replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](https://www.microsoft.com/licensing/product-licensing/products.aspx). ## Windows 11 editions -The following table lists the editions of Windows 11 available through each Microsoft distribution channel. - +The following table lists the editions of Windows 11 available through each Microsoft distribution channel: + | Full Packaged Product (Retail) | Preinstalled on device (OEM)|Commercial Licensing| |-|-|-| |Windows 11 Home
Windows 11 Pro|Windows 11 Home
Windows 11 Pro|Windows 11 Pro
Windows 11 Enterprise
Windows 11 Enterprise LTSC| @@ -33,13 +33,13 @@ The following table lists the editions of Windows 11 available through each Micr The following offerings are available for purchase through [Microsoft Commercial Licensing](https://www.microsoft.com/licensing): -|Product|Description| -|-|-| -|Windows 11 Pro Upgrade |Windows 11 Pro is designed for small and medium businesses and enables organizations to manage their devices and apps, protect their business data, facilitate remote and mobile scenarios, and take advantage of the cloud technologies for their organizations. Windows 11 Pro devices are a good choice for organizations that support *choose your own device (CYOD)* programs and *prosumer* customers. The Windows 11 Pro Upgrade in Commercial Licensing upgrades a device from a previous version of Windows Pro| -|Windows 11 Enterprise E3|Windows 11 Enterprise E3 is a per user subscription available in Commercial Licensing programs, and is intended for large and medium sized organizations. It includes Windows Enterprise edition with cloud-powered capabilities and subscription use rights. Examples include advanced identity protection, the broadest range of options for operating system deployment, update control, and device management. Windows Enterprise E3 is licensed through Commercial Licensing programs and requires Windows Pro as qualifying operating systems. -|Windows 11 Enterprise E5|Windows 11 Enterprise E5 is for organizations that want to take advantage of everything in Windows 11 Enterprise E3 with the addition of **Microsoft Defender for Endpoint Plan 2**, a service that helps enterprises detect, investigate, and respond to advanced cybersecurity attacks on their endpoints and networks. Windows 11 Enterprise E5 is available per user in Commercial Licensing programs| -|Windows 10 Enterprise LTSC |Windows 10 Enterprise LTSC is designed for PC systems that have strict change-management policies with only security and critical bug fixes. By using a Long-Term Servicing Channel edition, you can apply monthly Windows 10 security updates for specialized devices while holding back new-feature updates for an extended period of time, up to 5 years. Windows Enterprise LTSC is available in the per user or per device model depending on the Volume Licensing program through witch it is acquired| -|Windows Virtual Desktop Access (VDA) Subscription License|The Windows VDA subscription license provides the right to access virtual Windows desktop environments from devices that aren't covered by a Commercial Licensing offer that includes VDA rights, such as thin clients. Windows VDA is available on a per device or per user basis| +|Product|Description|Availability| +|-|-|-| +|Windows 11 Pro Upgrade |Windows 11 Pro is designed for small and medium businesses. Windows 11 Pro enables organizations to manage devices and apps, protect their data, facilitate remote and mobile scenarios, while taking advantage of the cloud technologies that support their business. Windows 11 Pro devices are a good choice for organizations that support *choose your own device (CYOD)* programs and *prosumer* customers. | The Windows 11 Pro Upgrade in Commercial Licensing upgrades a device from a previous version of Windows Pro.| +|Windows 11 Enterprise E3|Windows 11 Enterprise E3 is intended for large and medium-sized organizations. It includes Windows Enterprise edition with cloud-powered capabilities and subscription use rights. Examples include advanced identity protection, the broadest range of options for operating system deployment, update control, and device management. |Windows 11 Enterprise E3 is available **per-user** in Commercial Licensing programs. It requires Windows Pro as qualifying operating systems.| +|Windows 11 Enterprise E5|Windows 11 Enterprise E5 is for organizations that want to take advantage of everything in Windows 11 Enterprise E3 with the addition of **Microsoft Defender for Endpoint Plan 2**, a service that helps enterprises detect, investigate, and respond to advanced cybersecurity attacks on their endpoints and networks.| Windows 11 Enterprise E5 is available **per-user** in Commercial Licensing programs. It requires Windows Pro as qualifying operating systems.| +|Windows 10 Enterprise LTSC |Windows 10 Enterprise LTSC is designed for devices that have strict change-management policies with only security and critical bug fixes. By using a Long-Term Servicing Channel edition, you can apply monthly Windows 10 security updates for specialized devices while holding back new-feature updates for an extended period of time, up to five years. | Windows Enterprise LTSC is available in the **per-user** and **per-device** model, depending on the Volume Licensing program through which it's acquired.| +|Windows Virtual Desktop Access (VDA) Subscription License|The Windows VDA subscription license provides the right to access virtual Windows desktop environments from devices that aren't covered by a Commercial Licensing offer that includes VDA rights, such as thin clients. |Windows VDA is available on a **per-device** and **per-user** basis.| ## Windows 11 Pro Upgrade license @@ -52,7 +52,7 @@ The Windows 11 Pro Upgrade license is recommended if you want to: ## Windows 11 Enterprise -There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. Each of these can be purchased on a **per-user basis**, and are available only through **Commercial Licensing**, including the **Cloud Solution Provider** program. For details about Windows Enterprise per device, see [per device check out this section of this guide](*TO ADD*) +There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. These offers can be purchased on a **per-user basis**, and are only available through **Commercial Licensing**, including the **Cloud Solution Provider** program. For details about Windows Enterprise per-device, see [per device check out this section of this guide](*TO ADD*) ### Windows 11 Enterprise E3 @@ -60,7 +60,7 @@ Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced featur Windows 11 Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. -### Windows 11 Enterprise E3 OS features +### Windows 11 Enterprise E3 features Here's an overview of the unique Windows Enterprise edition features, cloud powered capabilities, and use rights. @@ -100,7 +100,7 @@ With Windows 11 Enterprise E3, you can take advantage of the following licensing |-|-| |**Five Windows Instances per licensed user**|Allows your employees to simultaneously use a Windows laptop, a cloud PC and a specialized device with Windows LTSC, and more| |**36 months (3 years) support on annual feature releases**|Get extra time to deploy feature releases| -|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible workstyles and smarter work with the included best-in-class virtualization access rights| +|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible work styles and smarter work with the included best-in-class virtualization access rights| |**Windows LTSC Enterprise**|Intended for highly specialized devices that require limited changes due to regulations and certification| |**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Help improve compatibility and management, reduce support costs, improve asset management, and improve policy control| @@ -136,27 +136,26 @@ The following table lists the Windows 11 Enterprise E3 features, services and us |Feature, service or use right|Windows Pro|Windows Enterprise| |-|-|-| -|**Windows Defender Credential Guard**||Yes| -|**Managed Microsoft Defender Application Guard for Microsoft Edge**|Yes|Yes| -|**Cloud-based BitLocker Management**|Yes|Yes| -|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**||Yes| -|**Direct Access**|Yes|Yes| +|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|No|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|Yes|Yes| +|**[Cloud-based BitLocker Management](/windows/security/information-protection/bitlocker/bitlocker-overview)**|Yes|Yes| +|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|No|Yes| +|**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|Yes|Yes| |**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes [\[1\]](#Note1)|Yes| -|**Application Management GPOs**||Yes| -|**Windows UI customization (CSP to manage)**||Yes| +|**Windows UI customization (CSP to manage)**|No|Yes| |**Windows Subscription Activation**|Yes|Yes| -|**Windows Autopatch**|Yes|Yes| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|Yes|Yes| |**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|Yes|Yes| |**[Universal Print](/universal-print/)**|Yes|Yes| |**[Microsoft Connected Cache](/windows/deployment/do/waas-microsoft-connected-cache)**|Yes|Yes| -|**Endpoint analytics proactive remediation**|Yes|Yes| -|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**||Yes| +|**[Endpoint analytics proactive remediation](/mem/analytics/overview)**|Yes|Yes| +|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|No|Yes| |**Feature release support period**| 24 months | 36 months| |**Windows feature update device readiness report** [\[2\]](#Note2)|Yes|Yes| |**Windows feature update compatibility risk report** [\[2\]](#Note2)|Yes|Yes| |**Microsoft Desktop Optimization Pack (MDOP)**|Yes|Yes| -[1] Device Tunnel requires Enterprise edition. +[1] Device Tunnel requires Enterprise edition.\ [2] Intune license required. ## Next steps From 0205e5e98d62f69573b8f54b17f3ff5321c850a5 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 07:56:25 -0400 Subject: [PATCH 12/65] updated guidance for marketing --- windows/whats-new/windows-licensing.md | 113 ++++++++++++++----------- 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index de738845cb..6ca18ce0bc 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -16,7 +16,7 @@ ms.technology: itpro-security # Windows commercial licensing overview -This document provides an overview of the products and use rights available through Microsoft commercial licensing. Information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization are also included. +This document provides an overview of the products and use rights available through Microsoft commercial licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. > [!NOTE] > The content of this article doesn't replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](https://www.microsoft.com/licensing/product-licensing/products.aspx). @@ -24,7 +24,7 @@ This document provides an overview of the products and use rights available thro ## Windows 11 editions The following table lists the editions of Windows 11 available through each Microsoft distribution channel: - + | Full Packaged Product (Retail) | Preinstalled on device (OEM)|Commercial Licensing| |-|-|-| |Windows 11 Home
Windows 11 Pro|Windows 11 Home
Windows 11 Pro|Windows 11 Pro
Windows 11 Enterprise
Windows 11 Enterprise LTSC| @@ -52,71 +52,73 @@ The Windows 11 Pro Upgrade license is recommended if you want to: ## Windows 11 Enterprise -There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. These offers can be purchased on a **per-user basis**, and are only available through **Commercial Licensing**, including the **Cloud Solution Provider** program. For details about Windows Enterprise per-device, see [per device check out this section of this guide](*TO ADD*) +There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** and **Windows 11 Enterprise E5**. These offers can be purchased on a **per-user basis**, and are only available through **Commercial Licensing**, including the **Cloud Solution Provider** program. ### Windows 11 Enterprise E3 Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced features designed to address the needs of large and mid-size organizations. Examples include advanced protection against modern security threats, the broadest range of options for operating system deployment and update, and comprehensive device and app management. -Windows 11 Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. +> [!NOTE] +> Windows 11 Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. -### Windows 11 Enterprise E3 features +#### Windows 11 Enterprise features -Here's an overview of the unique Windows Enterprise edition features, cloud powered capabilities, and use rights. +Here's an overview of the unique Windows Enterprise edition features: -| Windows Enterprise edition OS based functionality | Description | +| OS-based feature | Description | |-|-| |**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard-requirements)**|Protects against user credential harvesting and pass-the-hash attacks or pass the token attacks.| |**[Managed Microsoft Defender Application Guard for Microsoft Edge](/deployedge/microsoft-edge-security-windows-defender-application-guard)**| Isolates enterprise-defined untrusted sites with virtualization-based security from Windows, protecting your organization while users browse the Internet.| |**[Modern BitLocker Management](/windows/security/information-protection/bitlocker/bitlocker-overview)** | Allows you to eliminate on-premises tools to monitor and support BitLocker recovery scenarios. | |**[Personal Data Encryption](/windows/security/information-protection/personal-data-encryption/overview-pde)**|Encrypts individual's content using Windows Hello for Business to link the encryption keys to user credentials.| |**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|Connect remote users to the organization network without the need for traditional VPN connections.| -|**[Always-On VPN device tunnel](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Benefit from advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection with Always-On VPN device tunnel.| -|**[Windows UI customization (CSP)](/windows/client-management/mdm/policy-csp-experience)**|Locks down the user experience of frontline workers devices or public kiosks.| +|**[Always-On VPN device tunnel](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Advanced security capabilities to restrict the type of traffic and which applications can use the VPN connection.| +|**[Windows Experience customization](/windows/client-management/mdm/policy-csp-experience)**|Settings to lock down the user experience of corporate desktops and Shell Launcher with Unified Write Filter for frontline workers devices or public kiosks.| -### Windows 11 Enterprise E3 cloud services +#### Windows 11 Enterprise cloud-based capabilities -With Windows 11 Enterprise E3, you can take advantage of the following cloud services: +Here's an overview of the unique Windows Enterprise edition cloud-based features: -|Cloud-based service | Description | +|Cloud-based feature | Description | |-|-| -|**Cloud-based BitLocker Management**|Allows you to eliminate on-premises tools to monitor and support recovery scenarios| -|**[Windows subscription activation](/windows/deployment/windows-10-subscription-activation)**|Enables you to *step-up* from **Windows Pro edition** to **Enterprise edition** in an instant. You can eliminate license key management or deployment of Enterprise edition images| -|**[Windows Autopatch](/windows/deployment/windows-autopatch/overview/windows-autopatch-overview)**|Cloud service that puts Microsoft in control of automating updates to Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams| -|**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|This cloud service gives you the control over the approval, scheduling, and safeguarding of quality, feature upgrades, and driver updates delivered from Windows Update| -|**[Universal Print](/universal-print/)**|Removes the need for on-premises print servers and enables any endpoint to print to cloud registered printers| -|Microsoft Connected Cache|A software-only solution that caches app and OS updates on the local network to save internet bandwidth in locations with limited connectivity| -|**Endpoint analytics proactive remediation**|Helps you fix common support issues before end-users notice issues| -|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|Keeps employees informed with organizational messages directly inserted in Windows UI surfaces| -|**Windows release health**|Gives you essential information about monthly quality and feature updates in the Microsoft 365 admin center| -|**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Provides per-device information about compatibility risks that are associated with an upgrade or update to a chosen version of Windows| -|**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Provides a summary view of the top compatibility risks, so you understand which compatibility risks impact the greatest number of devices in your organization| +|**[Windows subscription activation](/windows/deployment/windows-10-subscription-activation)**|Enables you to *step-up* from **Windows Pro edition** to **Enterprise edition**. You can eliminate license key management and the deployment of Enterprise edition images.| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/overview/windows-autopatch-overview)**|Cloud service that puts Microsoft in control of automating updates to Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams.| +|**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|This cloud service gives you the control over the approval, scheduling, and safeguarding of quality, feature upgrades, and driver updates delivered from Windows Update.| +|**[Universal Print](/universal-print/)**|Removes the need for on-premises print servers and enables any endpoint to print to cloud registered printers.| +|**[Microsoft Connected Cache](/windows/deployment/do/waas-delivery-optimization)**|A software solution that caches app and OS updates on the local network to save Internet bandwidth in locations with limited connectivity.| +|**[Endpoint analytics proactive remediation](/mem/analytics/proactive-remediations)**|Helps you fix common support issues before end-users notice them.| +|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|Keeps employees informed with organizational messages directly inserted in Windows UI surfaces.| -### Windows 11 Enterprise E3 licensing use rights +#### Windows 11 Enterprise licensing use rights -With Windows 11 Enterprise E3, you can take advantage of the following licensing use rights: +Here's a list of the Windows Enterprise licensing use rights: |Licensing use rights|Description| |-|-| -|**Five Windows Instances per licensed user**|Allows your employees to simultaneously use a Windows laptop, a cloud PC and a specialized device with Windows LTSC, and more| -|**36 months (3 years) support on annual feature releases**|Get extra time to deploy feature releases| -|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible work styles and smarter work with the included best-in-class virtualization access rights| -|**Windows LTSC Enterprise**|Intended for highly specialized devices that require limited changes due to regulations and certification| -|**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Help improve compatibility and management, reduce support costs, improve asset management, and improve policy control| +|**[Five Windows instances per licensed user](https://www.microsoft.com/licensing/terms/productoffering/WindowsDesktopOperatingSystem/EAEAS)**|Allows your employees to simultaneously use a Windows laptop, a cloud PC and a specialized device with Windows LTSC, and more.| +|**[36 months (3 years) support on annual feature releases](/windows/release-health/supported-versions-windows-client#enterprise-and-iot-enterprise-ltsbltsc-editions)**|Get extra time to deploy feature releases.| +|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible work styles and smarter work with the included virtualization access rights.| +|**[Windows release health in the Microsoft 365 admin center](https://aka.ms/WindowsReleaseHealthinM365)**|Gives you essential information about monthly quality and feature updates in the Microsoft 365 admin center.| +|**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Provides per-device information about compatibility risks that are associated with an upgrade or update to a chosen version of Windows.| +|**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Provides a summary view of the top compatibility risks, so you understand which compatibility risks impact the greatest number of devices in your organization.| +|**[Windows LTSC Enterprise](windows/whats-new/ltsc/)**|Intended for highly specialized devices that require limited changes due to regulations and certification| +|**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Help improve compatibility and management, reduce support costs, improve asset management, and improve policy control.| -Learn more about [Windows 11 Enterprise E3]() +Learn more about [Windows 11 Enterprise E3](https://windows.com/enterprise). ### Windows 11 Enterprise E5 -Windows 11 Enterprise E5 is for organizations that want to take advantage of everything in Windows 11 Enterprise E3 with the addition of **Microsoft Defender for Endpoint Plan 2**, a cloud service that helps enterprises detect, investigate, and respond to advanced cybersecurity attacks on their endpoints and networks. Windows 11 Enterprise E5 is available per user in Commercial Licensing programs. +Windows 11 Enterprise E5 is for organizations that want to take advantage of everything in Windows 11 Enterprise E3 with the addition of **Microsoft Defender for Endpoint Plan 2**, a cloud service that helps enterprises detect, investigate, and respond to advanced cybersecurity attacks on their endpoints and networks. -Learn more about [Windows 11 Enterprise E5]() +Building on the existing security defenses in Windows 11, Microsoft Defender for Device provides a post-breach layer of protection to the Windows 11 security stack. With a combination of client technology built into Windows 11 and a robust cloud service, it can help detect threats that have made it past other defenses, provide enterprises with information to investigate the breach across endpoints, and offer response recommendations. + +> [!NOTE] +> Windows 11 Enterprise E5 is available per user in Commercial Licensing programs. ### Windows Enterprise E3 in Microsoft 365 F3 -Windows Enterprise E3 in Microsoft 365 F3 is only sold as part of the full F3 suite, and has all the OS features, and most of the cloud services and use rights included with regular Windows Enterprise E3. - -Windows Enterprise E3 in Microsoft 365 F3 doesn't include the following use rights that are included in the regular E3 user subscription license: +Windows Enterprise E3 subscription license in Microsoft 365 F3 has all the OS features, and most of the cloud services and use rights, included with regular Windows Enterprise E3. +Windows Enterprise E3 in Microsoft 365 F3 does not include some use rights previously included in Software Assurance benefits that come with the regular E3 user subscription license. F3 does not come with: - Microsoft Desktop Optimization Pack (MDOP) - Windows LTSC Enterprise @@ -134,30 +136,43 @@ In these cases, you want the PC to be configured, secured, monitored, and update The following table lists the Windows 11 Enterprise E3 features, services and use rights and their applicability to Windows Pro and Enterprise editions: -|Feature, service or use right|Windows Pro|Windows Enterprise| +| OS-based feature |Windows Pro|Windows Enterprise| |-|-|-| |**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|No|Yes| -|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|Yes|Yes| -|**[Cloud-based BitLocker Management](/windows/security/information-protection/bitlocker/bitlocker-overview)**|Yes|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Microsoft Edge](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|Yes|Yes| +|**[Modern BitLocker Management](/windows/security/information-protection/bitlocker/bitlocker-overview)**|Yes|Yes| |**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|No|Yes| |**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|Yes|Yes| -|**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes [\[1\]](#Note1)|Yes| -|**Windows UI customization (CSP to manage)**|No|Yes| -|**Windows Subscription Activation**|Yes|Yes| +|**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes| +|**[Windows Experience customization](/windows/client-management/mdm/policy-csp-experience)**|No|Yes| + +| Cloud-based feature |Windows Pro|Windows Enterprise| +|-|-|-| +|**[Windows subscription activation](/windows/deployment/windows-10-subscription-activation)**|Yes|Yes| |**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|Yes|Yes| |**[Windows Update For Business deployment service](/windows/deployment/update/deployment-service-overview)**|Yes|Yes| |**[Universal Print](/universal-print/)**|Yes|Yes| |**[Microsoft Connected Cache](/windows/deployment/do/waas-microsoft-connected-cache)**|Yes|Yes| |**[Endpoint analytics proactive remediation](/mem/analytics/overview)**|Yes|Yes| |**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|No|Yes| -|**Feature release support period**| 24 months | 36 months| -|**Windows feature update device readiness report** [\[2\]](#Note2)|Yes|Yes| -|**Windows feature update compatibility risk report** [\[2\]](#Note2)|Yes|Yes| -|**Microsoft Desktop Optimization Pack (MDOP)**|Yes|Yes| -[1] Device Tunnel requires Enterprise edition.\ -[2] Intune license required. +|Licensing use rights|Windows Pro|Windows Enterprise| +|-|-|-| +|**[Five Windows instances per licensed user](https://www.microsoft.com/licensing/terms/productoffering/WindowsDesktopOperatingSystem/EAEAS)**|n/a|n/a| +|**[36 months (3 years) support on annual feature releases](/windows/release-health/supported-versions-windows-client#enterprise-and-iot-enterprise-ltsbltsc-editions)**|No|Yes| +|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|n/a|n/a| +|**[Windows release health in the Microsoft 365 admin center](https://aka.ms/WindowsReleaseHealthinM365)**|n/a|n/a| +|**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Yes|Yes| +|**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Yes|Yes| +|**[Windows LTSC Enterprise](windows/whats-new/ltsc/)**|n/a|n/a| +|**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Yes|Yes| ## Next steps -To learn more about Windows 11 Enterprise E3 and E5, see [Windows 11 Enterprise E3 and E5](/windows/deployment/windows-11-enterprise-e3-e5). \ No newline at end of file +To learn more about Windows 11 Enterprise E3 and E5 licensing, download the [Windows 11 licensing guide](https://aka.ms/WindowsLicensingGuide). The guide provides additional information to complement the information in this article, including: + +- Description of qualifying operating systems +- Availability of Windows desktop operating system products in licensing programs +- Deciding between per-device and per-user licensing +- Windows 11 downgrade rights +- Volume license activation methods From a1b6031f68daa528eacce9176861c28d2374a2b6 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 07:58:55 -0400 Subject: [PATCH 13/65] updated guidance for marketing --- windows/whats-new/windows-licensing.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index 6ca18ce0bc..c051375040 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -14,9 +14,9 @@ appliesto: ms.technology: itpro-security --- -# Windows commercial licensing overview +# Windows Commercial Licensing overview -This document provides an overview of the products and use rights available through Microsoft commercial licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. +This document provides an overview of the products and use rights available through Microsoft Commercial Licensing, information about the products that are eligible for upgrades, and the key choices you have for using Windows in your organization. > [!NOTE] > The content of this article doesn't replace or override other licensing documentation, such as the Windows 11 End User License Agreement or [Commercial Licensing Product Terms](https://www.microsoft.com/licensing/product-licensing/products.aspx). @@ -176,3 +176,5 @@ To learn more about Windows 11 Enterprise E3 and E5 licensing, download the [Win - Deciding between per-device and per-user licensing - Windows 11 downgrade rights - Volume license activation methods +- How to acquire licenses through Commercial Licensing + From c1cc14a073f11231b5150a2763132c5141c3c6e6 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:14:57 -0400 Subject: [PATCH 14/65] TOC updates --- windows/whats-new/TOC.yml | 4 ++-- windows/whats-new/index.yml | 2 ++ windows/whats-new/windows-licensing.md | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/windows/whats-new/TOC.yml b/windows/whats-new/TOC.yml index 20df997f4f..b3ff701a34 100644 --- a/windows/whats-new/TOC.yml +++ b/windows/whats-new/TOC.yml @@ -1,7 +1,5 @@ - name: What's new in Windows href: index.yml -- name: Windows commercial licensing overview - href: windows-licensing.md - name: Windows 11 expanded: true items: @@ -26,6 +24,8 @@ href: whats-new-windows-10-version-21H1.md - name: What's new in Windows 10, version 20H2 href: whats-new-windows-10-version-20H2.md +- name: Windows commercial licensing overview + href: windows-licensing.md - name: Deprecated and removed Windows features expanded: false items: diff --git a/windows/whats-new/index.yml b/windows/whats-new/index.yml index c988c8ebb4..f11b6dbc0c 100644 --- a/windows/whats-new/index.yml +++ b/windows/whats-new/index.yml @@ -32,6 +32,8 @@ landingContent: url: windows-11-plan.md - text: Prepare for Windows 11 url: windows-11-prepare.md + - text: Windows commercial licensing overview + url: windows-licensing.md - title: Windows 10 linkLists: diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index c051375040..e9a0732e66 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -101,7 +101,7 @@ Here's a list of the Windows Enterprise licensing use rights: |**[Windows release health in the Microsoft 365 admin center](https://aka.ms/WindowsReleaseHealthinM365)**|Gives you essential information about monthly quality and feature updates in the Microsoft 365 admin center.| |**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Provides per-device information about compatibility risks that are associated with an upgrade or update to a chosen version of Windows.| |**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Provides a summary view of the top compatibility risks, so you understand which compatibility risks impact the greatest number of devices in your organization.| -|**[Windows LTSC Enterprise](windows/whats-new/ltsc/)**|Intended for highly specialized devices that require limited changes due to regulations and certification| +|**[Windows LTSC Enterprise](/windows/whats-new/ltsc/)**|Intended for highly specialized devices that require limited changes due to regulations and certification| |**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Help improve compatibility and management, reduce support costs, improve asset management, and improve policy control.| Learn more about [Windows 11 Enterprise E3](https://windows.com/enterprise). @@ -164,7 +164,7 @@ The following table lists the Windows 11 Enterprise E3 features, services and us |**[Windows release health in the Microsoft 365 admin center](https://aka.ms/WindowsReleaseHealthinM365)**|n/a|n/a| |**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Yes|Yes| |**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Yes|Yes| -|**[Windows LTSC Enterprise](windows/whats-new/ltsc/)**|n/a|n/a| +|**[Windows LTSC Enterprise](/windows/whats-new/ltsc/)**|n/a|n/a| |**[Microsoft Desktop Optimization Pack (MDOP) ](/microsoft-desktop-optimization-pack)**|Yes|Yes| ## Next steps From d349f7962ca2017467bf83953ccc9c35ffab732b Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:14:36 -0400 Subject: [PATCH 15/65] updates --- windows/whats-new/windows-licensing.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index e9a0732e66..5081043db0 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -63,7 +63,7 @@ Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced featur #### Windows 11 Enterprise features -Here's an overview of the unique Windows Enterprise edition features: +The following table describes the unique Windows Enterprise edition features: | OS-based feature | Description | |-|-| @@ -77,7 +77,7 @@ Here's an overview of the unique Windows Enterprise edition features: #### Windows 11 Enterprise cloud-based capabilities -Here's an overview of the unique Windows Enterprise edition cloud-based features: +The following table describes the unique Windows Enterprise cloud-based features: |Cloud-based feature | Description | |-|-| @@ -91,7 +91,7 @@ Here's an overview of the unique Windows Enterprise edition cloud-based features #### Windows 11 Enterprise licensing use rights -Here's a list of the Windows Enterprise licensing use rights: +The following table describes the Windows Enterprise licensing use rights: |Licensing use rights|Description| |-|-| @@ -134,7 +134,7 @@ In most cases, the Windows Pro edition comes pre-installed on a business-class d In these cases, you want the PC to be configured, secured, monitored, and updated with the enterprise management and security tools that come with the Windows Enterprise user subscription. Your Windows Enterprise E3 subscriptions does not block these scenarios. -The following table lists the Windows 11 Enterprise E3 features, services and use rights and their applicability to Windows Pro and Enterprise editions: +The following table lists the Windows 11 Enterprise features and their applicability to Windows Pro and Enterprise editions: | OS-based feature |Windows Pro|Windows Enterprise| |-|-|-| @@ -146,6 +146,8 @@ The following table lists the Windows 11 Enterprise E3 features, services and us |**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes| |**[Windows Experience customization](/windows/client-management/mdm/policy-csp-experience)**|No|Yes| +The following table lists the Windows 11 Enterprise cloud-based features and their applicability to Windows Pro and Enterprise editions: + | Cloud-based feature |Windows Pro|Windows Enterprise| |-|-|-| |**[Windows subscription activation](/windows/deployment/windows-10-subscription-activation)**|Yes|Yes| @@ -156,6 +158,8 @@ The following table lists the Windows 11 Enterprise E3 features, services and us |**[Endpoint analytics proactive remediation](/mem/analytics/overview)**|Yes|Yes| |**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|No|Yes| +The following table lists the Windows 11 Enterprise E3 licensing use rights and their applicability to Windows Pro and Enterprise editions: + |Licensing use rights|Windows Pro|Windows Enterprise| |-|-|-| |**[Five Windows instances per licensed user](https://www.microsoft.com/licensing/terms/productoffering/WindowsDesktopOperatingSystem/EAEAS)**|n/a|n/a| @@ -177,4 +181,3 @@ To learn more about Windows 11 Enterprise E3 and E5 licensing, download the [Win - Windows 11 downgrade rights - Volume license activation methods - How to acquire licenses through Commercial Licensing - From 4170bb09584922762af2a26608a204c2b9fe2afb Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:39:54 -0400 Subject: [PATCH 16/65] upload new include files --- includes/licensing/_edition-requirements.md | 10 +++------ includes/licensing/_licensing-requirements.md | 10 +++------ .../licensing/access-control-aclsscals.md | 2 +- includes/licensing/account-lockout-policy.md | 2 +- ...-vpn.md => always-on-vpn-device-tunnel.md} | 10 ++++----- includes/licensing/applocker.md | 22 ------------------- .../licensing/assigned-access-kiosk-mode.md | 2 +- .../licensing/attack-surface-reduction-asr.md | 2 +- ...d-azure-ad-join-with-single-sign-on-sso.md | 2 +- includes/licensing/bitlocker.md | 2 +- ...tooth-pairing-and-connection-protection.md | 2 +- .../common-criteria-certifications.md | 2 +- .../licensing/controlled-folder-access.md | 2 +- .../device-health-attestation-service.md | 2 +- includes/licensing/direct-access.md | 2 +- includes/licensing/email-encryption-smime.md | 2 +- includes/licensing/encrypted-hard-drive.md | 2 +- includes/licensing/endpoint-analytics.md | 22 ------------------- ...ed-phishing-protection-with-smartscreen.md | 2 +- includes/licensing/exploit-protection.md | 2 +- ...fast-identity-online-fido2-security-key.md | 2 +- ...processing-standard-fips-140-validation.md | 2 +- includes/licensing/federated-sign-in.md | 2 +- .../hardware-enforced-stack-protection.md | 2 +- ...ypervisor-protected-code-integrity-hvci.md | 2 +- ...nel-direct-memory-access-dma-protection.md | 2 +- .../local-administrator-password-solution.md | 2 +- ...local-security-authority-lsa-protection.md | 2 +- ...-device-management-mdm-and-group-policy.md | 2 +- includes/licensing/measured-boot.md | 2 +- .../licensing/microsoft-defender-antivirus.md | 2 +- ...pplication-guard-mdag-configure-via-mdm.md | 2 +- ...terprise-mode-and-enterprise-management.md | 2 +- ...ion-guard-mdag-for-edge-standalone-mode.md | 2 +- ...ication-guard-mdag-for-microsoft-office.md | 2 +- ...nder-application-guard-mdag-public-apis.md | 2 +- .../microsoft-defender-for-endpoint.md | 2 +- .../microsoft-defender-smartscreen.md | 2 +- .../microsoft-pluton-security-processor.md | 2 +- .../microsoft-vulnerable-driver-blocklist.md | 2 +- .../opportunistic-wireless-encryption-owe.md | 2 +- .../licensing/personal-data-encryption-pde.md | 2 +- includes/licensing/privacy-resource-usage.md | 2 +- .../privacy-transparency-and-controls.md | 2 +- .../licensing/remote-wipe-autopilot-reset.md | 2 +- .../licensing/secure-boot-and-trusted-boot.md | 2 +- .../secured-core-configuration-lock.md | 2 +- includes/licensing/secured-core-pc.md | 2 +- .../security-baselines-with-intune.md | 2 +- .../server-message-block-direct-smb-direct.md | 2 +- .../server-message-block-smb-file-service.md | 2 +- includes/licensing/smart-app-control.md | 2 +- .../smart-cards-for-windows-service.md | 2 +- .../tamper-protection-settings-for-mde.md | 2 +- .../licensing/transport-layer-security-tls.md | 2 +- .../trusted-platform-module-tpm-20.md | 2 +- includes/licensing/universal-print.md | 2 +- .../licensing/user-account-control-uac.md | 2 +- .../licensing/virtual-private-network-vpn.md | 2 +- .../virtualization-based-security-vbs.md | 2 +- includes/licensing/wifi-security.md | 2 +- includes/licensing/windows-autopatch.md | 2 +- includes/licensing/windows-autopilot.md | 2 +- includes/licensing/windows-containers.md | 2 +- ...ndows-defender-application-control-wdac.md | 2 +- .../windows-defender-credential-guard.md | 6 ++--- ...indows-defender-remote-credential-guard.md | 2 +- .../windows-defender-system-guard.md | 2 +- ...eature-and-expedite-updates-with-intune.md | 22 ------------------- includes/licensing/windows-firewall.md | 2 +- ...-business-enhanced-security-sign-in-ess.md | 2 +- .../licensing/windows-hello-for-business.md | 2 +- .../licensing/windows-presence-sensing.md | 2 +- includes/licensing/windows-sandbox.md | 2 +- ...s-security-policy-settings-and-auditing.md | 2 +- .../licensing/windows-update-for-business.md | 22 ------------------- 76 files changed, 82 insertions(+), 178 deletions(-) rename includes/licensing/{always-on-vpn.md => always-on-vpn-device-tunnel.md} (76%) delete mode 100644 includes/licensing/applocker.md delete mode 100644 includes/licensing/endpoint-analytics.md delete mode 100644 includes/licensing/windows-feature-and-expedite-updates-with-intune.md delete mode 100644 includes/licensing/windows-update-for-business.md diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md index ab8bd9523f..44babf0f4d 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- @@ -11,8 +11,7 @@ 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| |**[Account Lockout Policy](/windows/security/threat-protection/security-policy-settings/account-lockout-policy)**|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| +|**[Always On VPN (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|No|Yes|No|Yes| |**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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| @@ -24,7 +23,6 @@ The following table lists the security features that are available in Windows, a |**[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](/azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=%2Fwindows%2Fsecurity%2Fcontext%2Fcontext)**|Yes|Yes|Yes|Yes| @@ -72,14 +70,12 @@ The following table lists the security features that are available in Windows, a |**[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 Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|No|Yes|No|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 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/_licensing-requirements.md index dbdbf770cb..540d341e79 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- @@ -11,8 +11,7 @@ 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](/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| +|**[Always On VPN (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|No|Yes|Yes|Yes|Yes| |**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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| @@ -24,7 +23,6 @@ The following table lists the security features that are available in Windows, a |**[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](/azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=%2Fwindows%2Fsecurity%2Fcontext%2Fcontext)**|Yes|Yes|Yes|Yes|Yes| @@ -72,14 +70,12 @@ The following table lists the security features that are available in Windows, a |**[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 Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|No|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 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/access-control-aclsscals.md b/includes/licensing/access-control-aclsscals.md index 1e7eb6a0db..028929c987 100644 --- a/includes/licensing/access-control-aclsscals.md +++ b/includes/licensing/access-control-aclsscals.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/account-lockout-policy.md b/includes/licensing/account-lockout-policy.md index 12dcc49ff8..9d28314c22 100644 --- a/includes/licensing/account-lockout-policy.md +++ b/includes/licensing/account-lockout-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/always-on-vpn.md b/includes/licensing/always-on-vpn-device-tunnel.md similarity index 76% rename from includes/licensing/always-on-vpn.md rename to includes/licensing/always-on-vpn-device-tunnel.md index 2b8f7aee3b..165e3355ce 100644 --- a/includes/licensing/always-on-vpn.md +++ b/includes/licensing/always-on-vpn-device-tunnel.md @@ -1,22 +1,22 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- ## Windows edition and licensing requirements -The following table lists the Windows editions that support Always On VPN: +The following table lists the Windows editions that support Always On VPN (device tunnel): |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| +|No|Yes|No|Yes| -Always On VPN license entitlements are granted by the following licenses: +Always On VPN (device tunnel) 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/applocker.md b/includes/licensing/applocker.md deleted file mode 100644 index be5b604415..0000000000 --- a/includes/licensing/applocker.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/24/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support AppLocker: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -AppLocker 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/assigned-access-kiosk-mode.md b/includes/licensing/assigned-access-kiosk-mode.md index 5f14b61a00..0aacfd0d54 100644 --- a/includes/licensing/assigned-access-kiosk-mode.md +++ b/includes/licensing/assigned-access-kiosk-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/attack-surface-reduction-asr.md b/includes/licensing/attack-surface-reduction-asr.md index 0e3933d81d..bdfa84be11 100644 --- a/includes/licensing/attack-surface-reduction-asr.md +++ b/includes/licensing/attack-surface-reduction-asr.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/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/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md index e13b6a640a..a2348b9f96 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/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/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/bitlocker.md b/includes/licensing/bitlocker.md index 9bf2d9c6d7..e1d0482a14 100644 --- a/includes/licensing/bitlocker.md +++ b/includes/licensing/bitlocker.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/bluetooth-pairing-and-connection-protection.md b/includes/licensing/bluetooth-pairing-and-connection-protection.md index 06958f780c..ea7d847692 100644 --- a/includes/licensing/bluetooth-pairing-and-connection-protection.md +++ b/includes/licensing/bluetooth-pairing-and-connection-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/common-criteria-certifications.md b/includes/licensing/common-criteria-certifications.md index e53d1744e5..67da2eaa80 100644 --- a/includes/licensing/common-criteria-certifications.md +++ b/includes/licensing/common-criteria-certifications.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/controlled-folder-access.md b/includes/licensing/controlled-folder-access.md index b6be3c1f48..6e8429962d 100644 --- a/includes/licensing/controlled-folder-access.md +++ b/includes/licensing/controlled-folder-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/device-health-attestation-service.md b/includes/licensing/device-health-attestation-service.md index 1c6e31f416..180599b676 100644 --- a/includes/licensing/device-health-attestation-service.md +++ b/includes/licensing/device-health-attestation-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/direct-access.md b/includes/licensing/direct-access.md index b8fc0e111b..32f1858423 100644 --- a/includes/licensing/direct-access.md +++ b/includes/licensing/direct-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/email-encryption-smime.md b/includes/licensing/email-encryption-smime.md index 28a80e6a6f..1e613f7ea7 100644 --- a/includes/licensing/email-encryption-smime.md +++ b/includes/licensing/email-encryption-smime.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/encrypted-hard-drive.md b/includes/licensing/encrypted-hard-drive.md index c27a213efe..7f8eabb4fc 100644 --- a/includes/licensing/encrypted-hard-drive.md +++ b/includes/licensing/encrypted-hard-drive.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/endpoint-analytics.md b/includes/licensing/endpoint-analytics.md deleted file mode 100644 index a48f4aa305..0000000000 --- a/includes/licensing/endpoint-analytics.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/24/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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md index f2ab4fadb5..c050417d86 100644 --- a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md +++ b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/exploit-protection.md b/includes/licensing/exploit-protection.md index 6c3097eed1..ee0105c7aa 100644 --- a/includes/licensing/exploit-protection.md +++ b/includes/licensing/exploit-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/fast-identity-online-fido2-security-key.md b/includes/licensing/fast-identity-online-fido2-security-key.md index f9ab563138..1fac120af3 100644 --- a/includes/licensing/fast-identity-online-fido2-security-key.md +++ b/includes/licensing/fast-identity-online-fido2-security-key.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/federal-information-processing-standard-fips-140-validation.md b/includes/licensing/federal-information-processing-standard-fips-140-validation.md index 6d0fe1073e..4f43d3d758 100644 --- a/includes/licensing/federal-information-processing-standard-fips-140-validation.md +++ b/includes/licensing/federal-information-processing-standard-fips-140-validation.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index ec70299404..c1d9f41946 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/hardware-enforced-stack-protection.md b/includes/licensing/hardware-enforced-stack-protection.md index 03b7d58bec..7d197bf299 100644 --- a/includes/licensing/hardware-enforced-stack-protection.md +++ b/includes/licensing/hardware-enforced-stack-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/hypervisor-protected-code-integrity-hvci.md b/includes/licensing/hypervisor-protected-code-integrity-hvci.md index 54ba02daf3..659a1e1a0f 100644 --- a/includes/licensing/hypervisor-protected-code-integrity-hvci.md +++ b/includes/licensing/hypervisor-protected-code-integrity-hvci.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/kernel-direct-memory-access-dma-protection.md b/includes/licensing/kernel-direct-memory-access-dma-protection.md index 144db7a0e2..c07f32a3f1 100644 --- a/includes/licensing/kernel-direct-memory-access-dma-protection.md +++ b/includes/licensing/kernel-direct-memory-access-dma-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/local-administrator-password-solution.md b/includes/licensing/local-administrator-password-solution.md index e3722c8252..a7f5eb6aba 100644 --- a/includes/licensing/local-administrator-password-solution.md +++ b/includes/licensing/local-administrator-password-solution.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/local-security-authority-lsa-protection.md b/includes/licensing/local-security-authority-lsa-protection.md index 0f79870132..f6b948f1a1 100644 --- a/includes/licensing/local-security-authority-lsa-protection.md +++ b/includes/licensing/local-security-authority-lsa-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md index 4701881ed3..d0c8d30dd4 100644 --- a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md +++ b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/measured-boot.md b/includes/licensing/measured-boot.md index 94b7d51eba..873dd51db8 100644 --- a/includes/licensing/measured-boot.md +++ b/includes/licensing/measured-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-antivirus.md b/includes/licensing/microsoft-defender-antivirus.md index 28524e3540..08df5e0218 100644 --- a/includes/licensing/microsoft-defender-antivirus.md +++ b/includes/licensing/microsoft-defender-antivirus.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md index 7e96c9d671..e754997c7a 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/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/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md index ce29877baf..9dc9d2c111 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/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/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md index 610e7bb63a..fe5677e4eb 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index 472914659e..3cbb70aa69 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md index a80d9499b3..eeaf93367e 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md index a1e6da35dc..312be13a46 100644 --- a/includes/licensing/microsoft-defender-for-endpoint.md +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-smartscreen.md b/includes/licensing/microsoft-defender-smartscreen.md index ec626ac07a..ff95861177 100644 --- a/includes/licensing/microsoft-defender-smartscreen.md +++ b/includes/licensing/microsoft-defender-smartscreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-pluton-security-processor.md b/includes/licensing/microsoft-pluton-security-processor.md index 58bc9363a0..d0f93bcb7c 100644 --- a/includes/licensing/microsoft-pluton-security-processor.md +++ b/includes/licensing/microsoft-pluton-security-processor.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-vulnerable-driver-blocklist.md b/includes/licensing/microsoft-vulnerable-driver-blocklist.md index 2dcc3fb136..98dd69ad55 100644 --- a/includes/licensing/microsoft-vulnerable-driver-blocklist.md +++ b/includes/licensing/microsoft-vulnerable-driver-blocklist.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/opportunistic-wireless-encryption-owe.md b/includes/licensing/opportunistic-wireless-encryption-owe.md index b2919a0d31..953cb81211 100644 --- a/includes/licensing/opportunistic-wireless-encryption-owe.md +++ b/includes/licensing/opportunistic-wireless-encryption-owe.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/personal-data-encryption-pde.md b/includes/licensing/personal-data-encryption-pde.md index f8cf940fc8..5626b57d96 100644 --- a/includes/licensing/personal-data-encryption-pde.md +++ b/includes/licensing/personal-data-encryption-pde.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/privacy-resource-usage.md b/includes/licensing/privacy-resource-usage.md index 6ee4c2b844..2bea08f5e1 100644 --- a/includes/licensing/privacy-resource-usage.md +++ b/includes/licensing/privacy-resource-usage.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/privacy-transparency-and-controls.md b/includes/licensing/privacy-transparency-and-controls.md index 4a1ea93b6f..2fec75d8c4 100644 --- a/includes/licensing/privacy-transparency-and-controls.md +++ b/includes/licensing/privacy-transparency-and-controls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/remote-wipe-autopilot-reset.md b/includes/licensing/remote-wipe-autopilot-reset.md index 7448bbca80..c68c8ad2ed 100644 --- a/includes/licensing/remote-wipe-autopilot-reset.md +++ b/includes/licensing/remote-wipe-autopilot-reset.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/secure-boot-and-trusted-boot.md b/includes/licensing/secure-boot-and-trusted-boot.md index 66486b3820..53b48d99cc 100644 --- a/includes/licensing/secure-boot-and-trusted-boot.md +++ b/includes/licensing/secure-boot-and-trusted-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/secured-core-configuration-lock.md b/includes/licensing/secured-core-configuration-lock.md index 1bf49404f9..dddf8843a4 100644 --- a/includes/licensing/secured-core-configuration-lock.md +++ b/includes/licensing/secured-core-configuration-lock.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/secured-core-pc.md b/includes/licensing/secured-core-pc.md index 49111cf0e9..8fca64cb2c 100644 --- a/includes/licensing/secured-core-pc.md +++ b/includes/licensing/secured-core-pc.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/security-baselines-with-intune.md b/includes/licensing/security-baselines-with-intune.md index d1bbd124cd..43b5f384ab 100644 --- a/includes/licensing/security-baselines-with-intune.md +++ b/includes/licensing/security-baselines-with-intune.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/server-message-block-direct-smb-direct.md b/includes/licensing/server-message-block-direct-smb-direct.md index 4f550f7615..1b76968707 100644 --- a/includes/licensing/server-message-block-direct-smb-direct.md +++ b/includes/licensing/server-message-block-direct-smb-direct.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/server-message-block-smb-file-service.md b/includes/licensing/server-message-block-smb-file-service.md index 949799af17..f39db20a54 100644 --- a/includes/licensing/server-message-block-smb-file-service.md +++ b/includes/licensing/server-message-block-smb-file-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/smart-app-control.md b/includes/licensing/smart-app-control.md index ec15bdb692..cfb6c198a6 100644 --- a/includes/licensing/smart-app-control.md +++ b/includes/licensing/smart-app-control.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/smart-cards-for-windows-service.md b/includes/licensing/smart-cards-for-windows-service.md index 65d38875b0..b7a9d46f11 100644 --- a/includes/licensing/smart-cards-for-windows-service.md +++ b/includes/licensing/smart-cards-for-windows-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/tamper-protection-settings-for-mde.md b/includes/licensing/tamper-protection-settings-for-mde.md index 11a2824f53..06a01236ec 100644 --- a/includes/licensing/tamper-protection-settings-for-mde.md +++ b/includes/licensing/tamper-protection-settings-for-mde.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/transport-layer-security-tls.md b/includes/licensing/transport-layer-security-tls.md index dceb1635ec..d0f2b933b2 100644 --- a/includes/licensing/transport-layer-security-tls.md +++ b/includes/licensing/transport-layer-security-tls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/trusted-platform-module-tpm-20.md b/includes/licensing/trusted-platform-module-tpm-20.md index eae4c2e538..4b5197dd74 100644 --- a/includes/licensing/trusted-platform-module-tpm-20.md +++ b/includes/licensing/trusted-platform-module-tpm-20.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/universal-print.md b/includes/licensing/universal-print.md index 9a952fc23f..46f0afd2c6 100644 --- a/includes/licensing/universal-print.md +++ b/includes/licensing/universal-print.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/user-account-control-uac.md b/includes/licensing/user-account-control-uac.md index 4e28d74263..dca8cb0915 100644 --- a/includes/licensing/user-account-control-uac.md +++ b/includes/licensing/user-account-control-uac.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/virtual-private-network-vpn.md b/includes/licensing/virtual-private-network-vpn.md index 6ca8c3ddd5..61de672ee8 100644 --- a/includes/licensing/virtual-private-network-vpn.md +++ b/includes/licensing/virtual-private-network-vpn.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/virtualization-based-security-vbs.md b/includes/licensing/virtualization-based-security-vbs.md index 73f9b4ae28..de05ea5d8e 100644 --- a/includes/licensing/virtualization-based-security-vbs.md +++ b/includes/licensing/virtualization-based-security-vbs.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/wifi-security.md b/includes/licensing/wifi-security.md index 528d3e8873..9507a7618a 100644 --- a/includes/licensing/wifi-security.md +++ b/includes/licensing/wifi-security.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/windows-autopatch.md index c9d890fb98..f67e2b5216 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-autopilot.md b/includes/licensing/windows-autopilot.md index d0ea1ecca1..9c57cdb899 100644 --- a/includes/licensing/windows-autopilot.md +++ b/includes/licensing/windows-autopilot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-containers.md b/includes/licensing/windows-containers.md index e9df23b0f1..0e4df6dcb8 100644 --- a/includes/licensing/windows-containers.md +++ b/includes/licensing/windows-containers.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-application-control-wdac.md b/includes/licensing/windows-defender-application-control-wdac.md index 7b029709ad..3f81db1b61 100644 --- a/includes/licensing/windows-defender-application-control-wdac.md +++ b/includes/licensing/windows-defender-application-control-wdac.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-credential-guard.md b/includes/licensing/windows-defender-credential-guard.md index ea360fa645..d55e33af47 100644 --- a/includes/licensing/windows-defender-credential-guard.md +++ b/includes/licensing/windows-defender-credential-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Windows Defender Cre |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| +|No|Yes|No|Yes| Windows Defender Credential Guard 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-remote-credential-guard.md b/includes/licensing/windows-defender-remote-credential-guard.md index fa718760d4..51feb6043b 100644 --- a/includes/licensing/windows-defender-remote-credential-guard.md +++ b/includes/licensing/windows-defender-remote-credential-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-system-guard.md b/includes/licensing/windows-defender-system-guard.md index 3e6515de2c..b4f7577506 100644 --- a/includes/licensing/windows-defender-system-guard.md +++ b/includes/licensing/windows-defender-system-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-feature-and-expedite-updates-with-intune.md b/includes/licensing/windows-feature-and-expedite-updates-with-intune.md deleted file mode 100644 index 4a0982992b..0000000000 --- a/includes/licensing/windows-feature-and-expedite-updates-with-intune.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/24/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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-firewall.md b/includes/licensing/windows-firewall.md index 7dff38b793..12b7254fb9 100644 --- a/includes/licensing/windows-firewall.md +++ b/includes/licensing/windows-firewall.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- 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 index 71e43b05c6..0b8095a9f8 100644 --- 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 @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-hello-for-business.md b/includes/licensing/windows-hello-for-business.md index 6ff15f6184..cb8ec101ad 100644 --- a/includes/licensing/windows-hello-for-business.md +++ b/includes/licensing/windows-hello-for-business.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-presence-sensing.md b/includes/licensing/windows-presence-sensing.md index ce8d58277f..25eda4a8de 100644 --- a/includes/licensing/windows-presence-sensing.md +++ b/includes/licensing/windows-presence-sensing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-sandbox.md b/includes/licensing/windows-sandbox.md index b08403f118..1b23c6f198 100644 --- a/includes/licensing/windows-sandbox.md +++ b/includes/licensing/windows-sandbox.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-security-policy-settings-and-auditing.md b/includes/licensing/windows-security-policy-settings-and-auditing.md index 4fbac14e8e..0fabeddb20 100644 --- a/includes/licensing/windows-security-policy-settings-and-auditing.md +++ b/includes/licensing/windows-security-policy-settings-and-auditing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/24/2023 +ms.date: 04/25/2023 ms.topic: include --- diff --git a/includes/licensing/windows-update-for-business.md b/includes/licensing/windows-update-for-business.md deleted file mode 100644 index 7df9965759..0000000000 --- a/includes/licensing/windows-update-for-business.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/24/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 licensing overview](/windows/whats-new/windows-licensing). From f5d01400445851410d5665b868ae03caa57ea194 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 13:15:49 -0400 Subject: [PATCH 17/65] format update --- includes/licensing/_edition-requirements.md | 20 ++++++++--------- includes/licensing/_licensing-requirements.md | 22 +++++++++---------- .../licensing/always-on-vpn-device-tunnel.md | 4 ++-- includes/licensing/direct-access.md | 4 ++-- includes/licensing/federated-sign-in.md | 4 ++-- ...pplication-guard-mdag-configure-via-mdm.md | 4 ++-- ...terprise-mode-and-enterprise-management.md | 4 ++-- ...ication-guard-mdag-for-microsoft-office.md | 4 ++-- ...nder-application-guard-mdag-public-apis.md | 4 ++-- .../microsoft-defender-for-endpoint.md | 2 +- .../licensing/personal-data-encryption-pde.md | 4 ++-- includes/licensing/windows-autopatch.md | 4 ++-- .../windows-defender-credential-guard.md | 4 ++-- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md index 44babf0f4d..60fe9f1bd2 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -11,7 +11,7 @@ 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| |**[Account Lockout Policy](/windows/security/threat-protection/security-policy-settings/account-lockout-policy)**|Yes|Yes|Yes|Yes| -|**[Always On VPN (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|No|Yes|No|Yes| +|**[Always On VPN (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|❌|Yes|❌|Yes| |**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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| @@ -20,14 +20,14 @@ The following table lists the security features that are available in Windows, a |**[Common Criteria certifications](/windows/security/threat-protection/windows-platform-common-criteria)**|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| +|**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|❌|Yes|❌|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| |**[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](/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| +|**[Federated sign-in](/education/windows/federated-sign-in)**|❌|❌|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](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes| @@ -36,17 +36,17 @@ The following table lists the security features that are available in Windows, a |**[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](/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) configure via MDM](/windows/client-management/mdm/windowsdefenderapplicationguard-csp)**|❌|Yes|❌|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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| -|**[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 Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|Yes|❌|Yes| +|**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|❌|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](/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| +|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|❌|Yes|❌|Yes| |**Privacy Resource Usage**|Yes|Yes|Yes|Yes| |**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes| |**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes| @@ -66,11 +66,11 @@ The following table lists the security features that are available in Windows, a |**[Virtual Private Network (VPN)](/windows/security/identity-protection/vpn/vpn-guide)**|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](/windows/deployment/windows-autopatch/)**|No|Yes|No|Yes| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|❌|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)**|No|Yes|No|Yes| +|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|❌|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 Firewall](/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security)**|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md index 540d341e79..f4993ac7f8 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -11,7 +11,7 @@ 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 (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|No|Yes|Yes|Yes|Yes| +|**[Always On VPN (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|❌|Yes|Yes|Yes|Yes| |**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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| @@ -20,14 +20,14 @@ The following table lists the security features that are available in Windows, a |**[Common Criteria certifications](/windows/security/threat-protection/windows-platform-common-criteria)**|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| +|**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|❌|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| |**[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](/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| +|**[Federated sign-in](/education/windows/federated-sign-in)**|❌|❌|❌|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](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes|Yes| @@ -36,17 +36,17 @@ The following table lists the security features that are available in Windows, a |**[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](/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) configure via MDM](/windows/client-management/mdm/windowsdefenderapplicationguard-csp)**|❌|Yes|Yes|Yes|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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/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 Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|❌|❌|❌|❌| +|**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|Yes|Yes|Yes| +|**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|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](/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| +|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|❌|Yes|Yes|Yes|Yes| |**Privacy Resource Usage**|Yes|Yes|Yes|Yes|Yes| |**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes|Yes| |**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes|Yes| @@ -66,11 +66,11 @@ The following table lists the security features that are available in Windows, a |**[Virtual Private Network (VPN)](/windows/security/identity-protection/vpn/vpn-guide)**|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](/windows/deployment/windows-autopatch/)**|No|Yes|Yes|No|No| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|❌| |**[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)**|No|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|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 Firewall](/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security)**|Yes|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/always-on-vpn-device-tunnel.md b/includes/licensing/always-on-vpn-device-tunnel.md index 165e3355ce..6336201fd4 100644 --- a/includes/licensing/always-on-vpn-device-tunnel.md +++ b/includes/licensing/always-on-vpn-device-tunnel.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Always On VPN (devic |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Always On VPN (device tunnel) 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/direct-access.md b/includes/licensing/direct-access.md index 32f1858423..ad70e4321c 100644 --- a/includes/licensing/direct-access.md +++ b/includes/licensing/direct-access.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Direct Access: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Direct Access 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index c1d9f41946..ef41008133 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Federated sign-in: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|No|Yes|Yes| +|❌|No|Yes|Yes| Federated sign-in license entitlements are granted by the following licenses: |Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|No|No|Yes|Yes| +|Yes|❌|No|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md index e754997c7a..436c958aa9 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Microsoft Defender Application Guard (MDAG) configure via MDM 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md index 9dc9d2c111..e1996f0eef 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index 3cbb70aa69..ea16496e09 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Microsoft Defender Application Guard (MDAG) for Microsoft Office 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| |:---:|:---:|:---:|:---:|:---:| -|No|No|No|No|No| +|❌|No|❌|No|❌| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md index eeaf93367e..3759b415b9 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Microsoft Defender Application Guard (MDAG) public APIs 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md index 312be13a46..4f80436cf4 100644 --- a/includes/licensing/microsoft-defender-for-endpoint.md +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -17,6 +17,6 @@ Microsoft Defender for Endpoint license entitlements are granted by the followin |Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|No|Yes|No|Yes| +|Yes|❌|Yes|❌|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/personal-data-encryption-pde.md b/includes/licensing/personal-data-encryption-pde.md index 5626b57d96..ce50e8b2d6 100644 --- a/includes/licensing/personal-data-encryption-pde.md +++ b/includes/licensing/personal-data-encryption-pde.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Personal data encryp |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Personal data encryption (PDE) 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/windows-autopatch.md index f67e2b5216..b036c82c49 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Windows Autopatch: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Windows Autopatch 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|No|No| +|❌|Yes|Yes|❌|No| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-credential-guard.md b/includes/licensing/windows-defender-credential-guard.md index d55e33af47..5a03742498 100644 --- a/includes/licensing/windows-defender-credential-guard.md +++ b/includes/licensing/windows-defender-credential-guard.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Windows Defender Cre |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| +|❌|Yes|❌|Yes| Windows Defender Credential Guard 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| |:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| +|❌|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). From 3e949d6b054ef9eb6b0348fcaf83926e28636f76 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 13:20:07 -0400 Subject: [PATCH 18/65] format update --- includes/licensing/federated-sign-in.md | 4 ++-- ...ft-defender-application-guard-mdag-for-microsoft-office.md | 2 +- includes/licensing/windows-autopatch.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index ef41008133..15103a6ab6 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Federated sign-in: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|No|Yes|Yes| +|❌|❌|Yes|Yes| Federated sign-in license entitlements are granted by the following licenses: |Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|❌|No|Yes|Yes| +|Yes|❌|❌|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index ea16496e09..e038536107 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -17,6 +17,6 @@ Microsoft Defender Application Guard (MDAG) for Microsoft Office license entitle |Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|❌|No|❌|No|❌| +|❌|❌|❌|❌|❌| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/windows-autopatch.md index b036c82c49..8a00190c02 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -17,6 +17,6 @@ Windows Autopatch 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|❌|No| +|❌|Yes|Yes|❌|❌| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). From b37c379f72b8d1d62f48fed26b52ebfba9b45a3e Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:08:22 -0400 Subject: [PATCH 19/65] updated tables --- includes/licensing/_edition-requirements.md | 2 +- includes/licensing/_licensing-requirements.md | 6 +++--- includes/licensing/always-on-vpn-device-tunnel.md | 4 ++-- includes/licensing/direct-access.md | 4 ++-- includes/licensing/federated-sign-in.md | 6 +++--- ...oft-defender-application-guard-mdag-configure-via-mdm.md | 4 ++-- ...ag-for-edge-enterprise-mode-and-enterprise-management.md | 4 ++-- ...-defender-application-guard-mdag-for-microsoft-office.md | 4 ++-- ...microsoft-defender-application-guard-mdag-public-apis.md | 4 ++-- includes/licensing/microsoft-defender-for-endpoint.md | 2 +- includes/licensing/personal-data-encryption-pde.md | 4 ++-- includes/licensing/windows-autopatch.md | 4 ++-- includes/licensing/windows-defender-credential-guard.md | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md index 60fe9f1bd2..5f6391baad 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -27,7 +27,7 @@ The following table lists the security features that are available in Windows, a |**[Exploit protection](/microsoft-365/security/defender-endpoint/exploit-protection)**|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)**|❌|❌|Yes|Yes| +|**[Federated sign-in](/education/windows/federated-sign-in)**|❌|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](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes| diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md index f4993ac7f8..2d3f2f34d8 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -27,7 +27,7 @@ The following table lists the security features that are available in Windows, a |**[Exploit protection](/microsoft-365/security/defender-endpoint/exploit-protection)**|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)**|❌|❌|❌|Yes|Yes| +|**[Federated sign-in](/education/windows/federated-sign-in)**|❌|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](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes|Yes| @@ -39,7 +39,7 @@ The following table lists the security features that are available in Windows, a |**[Microsoft Defender Application Guard (MDAG) configure via MDM](/windows/client-management/mdm/windowsdefenderapplicationguard-csp)**|❌|Yes|Yes|Yes|Yes| |**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|❌|❌|❌|❌| +|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|No|❌|No|❌| |**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|Yes|Yes|Yes| |**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|Yes| |**[Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview)**|Yes|Yes|Yes|Yes|Yes| @@ -66,7 +66,7 @@ The following table lists the security features that are available in Windows, a |**[Virtual Private Network (VPN)](/windows/security/identity-protection/vpn/vpn-guide)**|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](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|❌| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|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| diff --git a/includes/licensing/always-on-vpn-device-tunnel.md b/includes/licensing/always-on-vpn-device-tunnel.md index 6336201fd4..165e3355ce 100644 --- a/includes/licensing/always-on-vpn-device-tunnel.md +++ b/includes/licensing/always-on-vpn-device-tunnel.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Always On VPN (devic |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Always On VPN (device tunnel) 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/direct-access.md b/includes/licensing/direct-access.md index ad70e4321c..32f1858423 100644 --- a/includes/licensing/direct-access.md +++ b/includes/licensing/direct-access.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Direct Access: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Direct Access 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index 15103a6ab6..080274363c 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Federated sign-in: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|❌|Yes|Yes| +|No|No|Yes|Yes| Federated sign-in license entitlements are granted by the following licenses: -|Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|❌|❌|Yes|Yes| +|No|No|No|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md index 436c958aa9..e754997c7a 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Microsoft Defender Application Guard (MDAG) configure via MDM 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md index e1996f0eef..9dc9d2c111 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index e038536107..3cbb70aa69 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Microsoft Defender Application Guard (MDAG) for Microsoft Office 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| |:---:|:---:|:---:|:---:|:---:| -|❌|❌|❌|❌|❌| +|No|No|No|No|No| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md index 3759b415b9..eeaf93367e 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Microsoft Defender A |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Microsoft Defender Application Guard (MDAG) public APIs 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md index 4f80436cf4..312be13a46 100644 --- a/includes/licensing/microsoft-defender-for-endpoint.md +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -17,6 +17,6 @@ Microsoft Defender for Endpoint license entitlements are granted by the followin |Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|❌|Yes|❌|Yes| +|Yes|No|Yes|No|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/personal-data-encryption-pde.md b/includes/licensing/personal-data-encryption-pde.md index ce50e8b2d6..5626b57d96 100644 --- a/includes/licensing/personal-data-encryption-pde.md +++ b/includes/licensing/personal-data-encryption-pde.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Personal data encryp |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Personal data encryption (PDE) 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/windows-autopatch.md index 8a00190c02..f67e2b5216 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Windows Autopatch: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Windows Autopatch 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|❌|❌| +|No|Yes|Yes|No|No| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-defender-credential-guard.md b/includes/licensing/windows-defender-credential-guard.md index 5a03742498..d55e33af47 100644 --- a/includes/licensing/windows-defender-credential-guard.md +++ b/includes/licensing/windows-defender-credential-guard.md @@ -11,12 +11,12 @@ The following table lists the Windows editions that support Windows Defender Cre |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| -|❌|Yes|❌|Yes| +|No|Yes|No|Yes| Windows Defender Credential Guard 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). From 368cadb75f48b908fe2e5013e385af50bd7db9e9 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 18:07:47 -0400 Subject: [PATCH 20/65] updates --- windows/security/TOC.yml | 99 +---------------- .../additional-mitigations.md | 1 - windows/security/identity-protection/toc.yml | 102 ++++++++++++++++++ 3 files changed, 103 insertions(+), 99 deletions(-) create mode 100644 windows/security/identity-protection/toc.yml diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 1bd19e107d..73cbaf7b9b 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -327,104 +327,7 @@ - name: Windows Credential Theft Mitigation Guide Abstract href: identity-protection\windows-credential-theft-mitigation-guide-abstract.md - name: User security and secured identity - items: - - name: Overview - href: identity.md - - name: Windows credential theft mitigation guide - href: identity-protection/windows-credential-theft-mitigation-guide-abstract.md - - name: Passwordless - items: - - name: Windows Hello for Business ⇒ - href: identity-protection/hello-for-business/index.yml - - name: FIDO 2 security keys - href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key?context=/windows/security/context/context - - name: Local Administrator Password Solution (LAPS) - href: /windows-server/identity/laps/laps-overview?context=/windows/security/context/context - - name: Enterprise Certificate Pinning - href: identity-protection/enterprise-certificate-pinning.md - - name: Credential Guard - items: - - name: Protect derived domain credentials with Credential Guard - href: identity-protection/credential-guard/credential-guard.md - - name: How Credential Guard works - href: identity-protection/credential-guard/credential-guard-how-it-works.md - - name: Requirements - href: identity-protection/credential-guard/credential-guard-requirements.md - - name: Manage Credential Guard - href: identity-protection/credential-guard/credential-guard-manage.md - - name: Credential Guard protection limits - href: identity-protection/credential-guard/credential-guard-protection-limits.md - - name: Considerations when using Credential Guard - href: identity-protection/credential-guard/credential-guard-considerations.md - - name: Additional mitigations - href: identity-protection/credential-guard/additional-mitigations.md - - name: Known issues - href: identity-protection/credential-guard/credential-guard-known-issues.md - - name: Remote Credential Guard - href: identity-protection/remote-credential-guard.md - - name: Configuring LSA Protection - href: /windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=/windows/security/toc.json&bc=/windows/security/breadcrumb/toc.json - - name: Technical support policy for lost or forgotten passwords - href: identity-protection/password-support-policy.md - - name: Access Control - items: - - name: Overview - href: identity-protection/access-control/access-control.md - - name: Local Accounts - href: identity-protection/access-control/local-accounts.md - - name: User Account Control (UAC) - items: - - name: Overview - href: identity-protection/user-account-control/user-account-control-overview.md - - name: How User Account Control works - href: identity-protection/user-account-control/how-user-account-control-works.md - - name: User Account Control security policy settings - href: identity-protection/user-account-control/user-account-control-security-policy-settings.md - - name: User Account Control Group Policy and registry key settings - href: identity-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md - - name: Smart Cards - href: identity-protection/smart-cards/smart-card-windows-smart-card-technical-reference.md - items: - - name: How Smart Card Sign-in Works in Windows - href: identity-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md - items: - - name: Smart Card Architecture - href: identity-protection/smart-cards/smart-card-architecture.md - - name: Certificate Requirements and Enumeration - href: identity-protection/smart-cards/smart-card-certificate-requirements-and-enumeration.md - - name: Smart Card and Remote Desktop Services - href: identity-protection/smart-cards/smart-card-and-remote-desktop-services.md - - name: Smart Cards for Windows Service - href: identity-protection/smart-cards/smart-card-smart-cards-for-windows-service.md - - name: Certificate Propagation Service - href: identity-protection/smart-cards/smart-card-certificate-propagation-service.md - - name: Smart Card Removal Policy Service - href: identity-protection/smart-cards/smart-card-removal-policy-service.md - - name: Smart Card Tools and Settings - href: identity-protection/smart-cards/smart-card-tools-and-settings.md - items: - - name: Smart Cards Debugging Information - href: identity-protection/smart-cards/smart-card-debugging-information.md - - name: Smart Card Group Policy and Registry Settings - href: identity-protection/smart-cards/smart-card-group-policy-and-registry-settings.md - - name: Smart Card Events - href: identity-protection/smart-cards/smart-card-events.md - - name: Virtual smart cards - href: identity-protection/virtual-smart-cards/virtual-smart-card-overview.md - items: - - name: Understand and evaluate virtual smart cards - href: identity-protection/virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md - items: - - name: Get started with virtual smart cards - href: identity-protection/virtual-smart-cards/virtual-smart-card-get-started.md - - name: Use virtual smart cards - href: identity-protection/virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md - - name: Deploy virtual smart cards - href: identity-protection/virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md - - name: Evaluate virtual smart card security - href: identity-protection/virtual-smart-cards/virtual-smart-card-evaluate-security.md - - name: Tpmvscmgr - href: identity-protection/virtual-smart-cards/virtual-smart-card-tpmvscmgr.md + href: identity-protection/toc.yml - name: Cloud services items: - name: Overview diff --git a/windows/security/identity-protection/credential-guard/additional-mitigations.md b/windows/security/identity-protection/credential-guard/additional-mitigations.md index ca9c7acd52..32967fd8b7 100644 --- a/windows/security/identity-protection/credential-guard/additional-mitigations.md +++ b/windows/security/identity-protection/credential-guard/additional-mitigations.md @@ -18,7 +18,6 @@ Credential theft attacks allow the attacker to steal secrets from one device and Kerberos armoring is part of RFC 6113. When a device supports Kerberos armoring, its TGT is used to protect the user's proof of possession which can mitigate offline dictionary attacks. Kerberos armoring also provides the additional benefit of signed KDC errors this mitigates tampering which can result in things such as downgrade attacks. **To enable Kerberos armoring for restricting domain users to specific domain-joined devices** - - Users need to be in domains that are running Windows Server 2012 R2 or higher - All the domain controllers in these domains must be configured to support Kerberos armoring. Set the **KDC support for claims, compound authentication, and Kerberos armoring** Group Policy setting to either **Supported** or **Always provide claims**. - All the devices with Windows Defender Credential Guard that the users will be restricted to must be configured to support Kerberos armoring. Enable the **Kerberos client support for claims, compound authentication and Kerberos armoring** Group Policy settings under **Computer Configuration** -> **Administrative Templates** -> **System** -> **Kerberos**. diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml new file mode 100644 index 0000000000..316d992db0 --- /dev/null +++ b/windows/security/identity-protection/toc.yml @@ -0,0 +1,102 @@ +items: + - name: Overview + href: ../identity.md + - name: Windows credential theft mitigation guide + href: ../windows-credential-theft-mitigation-guide-abstract.md + - name: Passwordless + items: + - name: Windows Hello for Business ⇒ + href: hello-for-business/index.yml + - name: FIDO 2 security keys ⇒ + href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key + - name: Local Administrator Password Solution (LAPS) + items: + - name: Windows LAPS licensing and requirements + href: ../../../includes/licensing/windows-defender-credential-guard.md + - name: Windows LAPS overview + href: /windows-server/identity/laps/laps-overview + - name: Enterprise Certificate Pinning + href: enterprise-certificate-pinning.md + - name: Credential Guard + items: + - name: Protect derived domain credentials with Credential Guard + href: credential-guard/credential-guard.md + - name: How Credential Guard works + href: credential-guard/credential-guard-how-it-works.md + - name: Requirements + href: credential-guard/credential-guard-requirements.md + - name: Manage Credential Guard + href: credential-guard/credential-guard-manage.md + - name: Credential Guard protection limits + href: credential-guard/credential-guard-protection-limits.md + - name: Considerations when using Credential Guard + href: credential-guard/credential-guard-considerations.md + - name: Additional mitigations + href: credential-guard/additional-mitigations.md + - name: Known issues + href: credential-guard/credential-guard-known-issues.md + - name: Remote Credential Guard + href: remote-credential-guard.md + - name: Configuring LSA Protection + href: /windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=/windows/security/toc.json&bc=/windows/security/breadcrumb/toc.json + - name: Technical support policy for lost or forgotten passwords + href: password-support-policy.md + - name: Access Control + items: + - name: Overview + href: access-control/access-control.md + - name: Local Accounts + href: access-control/local-accounts.md + - name: User Account Control (UAC) + items: + - name: Overview + href: user-account-control/user-account-control-overview.md + - name: How User Account Control works + href: user-account-control/how-user-account-control-works.md + - name: User Account Control security policy settings + href: user-account-control/user-account-control-security-policy-settings.md + - name: User Account Control Group Policy and registry key settings + href: user-account-control/user-account-control-group-policy-and-registry-key-settings.md + - name: Smart Cards + href: smart-cards/smart-card-windows-smart-card-technical-reference.md + items: + - name: How Smart Card Sign-in Works in Windows + href: smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md + items: + - name: Smart Card Architecture + href: smart-cards/smart-card-architecture.md + - name: Certificate Requirements and Enumeration + href: smart-cards/smart-card-certificate-requirements-and-enumeration.md + - name: Smart Card and Remote Desktop Services + href: smart-cards/smart-card-and-remote-desktop-services.md + - name: Smart Cards for Windows Service + href: smart-cards/smart-card-smart-cards-for-windows-service.md + - name: Certificate Propagation Service + href: smart-cards/smart-card-certificate-propagation-service.md + - name: Smart Card Removal Policy Service + href: smart-cards/smart-card-removal-policy-service.md + - name: Smart Card Tools and Settings + href: smart-cards/smart-card-tools-and-settings.md + items: + - name: Smart Cards Debugging Information + href: smart-cards/smart-card-debugging-information.md + - name: Smart Card Group Policy and Registry Settings + href: smart-cards/smart-card-group-policy-and-registry-settings.md + - name: Smart Card Events + href: smart-cards/smart-card-events.md + - name: Virtual smart cards + href: virtual-smart-cards/virtual-smart-card-overview.md + items: + - name: Understand and evaluate virtual smart cards + href: virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md + items: + - name: Get started with virtual smart cards + href: virtual-smart-cards/virtual-smart-card-get-started.md + - name: Use virtual smart cards + href: virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md + - name: Deploy virtual smart cards + href: virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md + - name: Evaluate virtual smart card security + href: virtual-smart-cards/virtual-smart-card-evaluate-security.md + - name: Tpmvscmgr + href: virtual-smart-cards/virtual-smart-card-tpmvscmgr.md \ No newline at end of file From 7ec6016d2f415164cac1887dc7f0938fd2e031d2 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 25 Apr 2023 18:25:14 -0400 Subject: [PATCH 21/65] updates --- windows/security/identity-protection/toc.yml | 26 +++--- .../licensing/_edition-requirements.md | 81 +++++++++++++++++++ .../licensing/_licensing-requirements.md | 81 +++++++++++++++++++ .../licensing/access-control-aclsscals.md | 22 +++++ .../licensing/account-lockout-policy.md | 22 +++++ .../licensing/always-on-vpn-device-tunnel.md | 22 +++++ .../licensing/assigned-access-kiosk-mode.md | 22 +++++ .../licensing/attack-surface-reduction-asr.md | 22 +++++ ...d-azure-ad-join-with-single-sign-on-sso.md | 22 +++++ windows/security/licensing/bitlocker.md | 22 +++++ ...tooth-pairing-and-connection-protection.md | 22 +++++ .../common-criteria-certifications.md | 22 +++++ .../licensing/controlled-folder-access.md | 22 +++++ .../device-health-attestation-service.md | 22 +++++ windows/security/licensing/direct-access.md | 22 +++++ .../licensing/email-encryption-smime.md | 22 +++++ .../licensing/encrypted-hard-drive.md | 22 +++++ ...ed-phishing-protection-with-smartscreen.md | 22 +++++ .../security/licensing/exploit-protection.md | 22 +++++ ...fast-identity-online-fido2-security-key.md | 22 +++++ ...processing-standard-fips-140-validation.md | 22 +++++ .../security/licensing/federated-sign-in.md | 22 +++++ .../hardware-enforced-stack-protection.md | 22 +++++ ...ypervisor-protected-code-integrity-hvci.md | 22 +++++ ...nel-direct-memory-access-dma-protection.md | 22 +++++ .../local-administrator-password-solution.md | 22 +++++ ...local-security-authority-lsa-protection.md | 22 +++++ ...-device-management-mdm-and-group-policy.md | 22 +++++ windows/security/licensing/measured-boot.md | 22 +++++ .../licensing/microsoft-defender-antivirus.md | 22 +++++ ...pplication-guard-mdag-configure-via-mdm.md | 22 +++++ ...terprise-mode-and-enterprise-management.md | 22 +++++ ...ion-guard-mdag-for-edge-standalone-mode.md | 22 +++++ ...ication-guard-mdag-for-microsoft-office.md | 22 +++++ ...nder-application-guard-mdag-public-apis.md | 22 +++++ .../microsoft-defender-for-endpoint.md | 22 +++++ .../microsoft-defender-smartscreen.md | 22 +++++ .../microsoft-pluton-security-processor.md | 22 +++++ .../microsoft-vulnerable-driver-blocklist.md | 22 +++++ .../opportunistic-wireless-encryption-owe.md | 22 +++++ .../licensing/personal-data-encryption-pde.md | 22 +++++ .../licensing/privacy-resource-usage.md | 22 +++++ .../privacy-transparency-and-controls.md | 22 +++++ .../licensing/remote-wipe-autopilot-reset.md | 22 +++++ .../licensing/secure-boot-and-trusted-boot.md | 22 +++++ .../secured-core-configuration-lock.md | 22 +++++ windows/security/licensing/secured-core-pc.md | 22 +++++ .../security-baselines-with-intune.md | 22 +++++ .../server-message-block-direct-smb-direct.md | 22 +++++ .../server-message-block-smb-file-service.md | 22 +++++ .../security/licensing/smart-app-control.md | 22 +++++ .../smart-cards-for-windows-service.md | 22 +++++ .../tamper-protection-settings-for-mde.md | 22 +++++ .../licensing/transport-layer-security-tls.md | 22 +++++ .../trusted-platform-module-tpm-20.md | 22 +++++ windows/security/licensing/universal-print.md | 22 +++++ .../licensing/user-account-control-uac.md | 22 +++++ .../licensing/virtual-private-network-vpn.md | 22 +++++ .../virtualization-based-security-vbs.md | 22 +++++ windows/security/licensing/wifi-security.md | 22 +++++ .../security/licensing/windows-autopatch.md | 22 +++++ .../security/licensing/windows-autopilot.md | 22 +++++ .../security/licensing/windows-containers.md | 22 +++++ ...ndows-defender-application-control-wdac.md | 22 +++++ .../windows-defender-credential-guard.md | 22 +++++ ...indows-defender-remote-credential-guard.md | 22 +++++ .../windows-defender-system-guard.md | 22 +++++ .../security/licensing/windows-firewall.md | 22 +++++ ...-business-enhanced-security-sign-in-ess.md | 22 +++++ .../licensing/windows-hello-for-business.md | 22 +++++ .../licensing/windows-presence-sensing.md | 22 +++++ windows/security/licensing/windows-sandbox.md | 22 +++++ ...s-security-policy-settings-and-auditing.md | 22 +++++ 73 files changed, 1719 insertions(+), 9 deletions(-) create mode 100644 windows/security/licensing/_edition-requirements.md create mode 100644 windows/security/licensing/_licensing-requirements.md create mode 100644 windows/security/licensing/access-control-aclsscals.md create mode 100644 windows/security/licensing/account-lockout-policy.md create mode 100644 windows/security/licensing/always-on-vpn-device-tunnel.md create mode 100644 windows/security/licensing/assigned-access-kiosk-mode.md create mode 100644 windows/security/licensing/attack-surface-reduction-asr.md create mode 100644 windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md create mode 100644 windows/security/licensing/bitlocker.md create mode 100644 windows/security/licensing/bluetooth-pairing-and-connection-protection.md create mode 100644 windows/security/licensing/common-criteria-certifications.md create mode 100644 windows/security/licensing/controlled-folder-access.md create mode 100644 windows/security/licensing/device-health-attestation-service.md create mode 100644 windows/security/licensing/direct-access.md create mode 100644 windows/security/licensing/email-encryption-smime.md create mode 100644 windows/security/licensing/encrypted-hard-drive.md create mode 100644 windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md create mode 100644 windows/security/licensing/exploit-protection.md create mode 100644 windows/security/licensing/fast-identity-online-fido2-security-key.md create mode 100644 windows/security/licensing/federal-information-processing-standard-fips-140-validation.md create mode 100644 windows/security/licensing/federated-sign-in.md create mode 100644 windows/security/licensing/hardware-enforced-stack-protection.md create mode 100644 windows/security/licensing/hypervisor-protected-code-integrity-hvci.md create mode 100644 windows/security/licensing/kernel-direct-memory-access-dma-protection.md create mode 100644 windows/security/licensing/local-administrator-password-solution.md create mode 100644 windows/security/licensing/local-security-authority-lsa-protection.md create mode 100644 windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md create mode 100644 windows/security/licensing/measured-boot.md create mode 100644 windows/security/licensing/microsoft-defender-antivirus.md create mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md create mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md create mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md create mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md create mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md create mode 100644 windows/security/licensing/microsoft-defender-for-endpoint.md create mode 100644 windows/security/licensing/microsoft-defender-smartscreen.md create mode 100644 windows/security/licensing/microsoft-pluton-security-processor.md create mode 100644 windows/security/licensing/microsoft-vulnerable-driver-blocklist.md create mode 100644 windows/security/licensing/opportunistic-wireless-encryption-owe.md create mode 100644 windows/security/licensing/personal-data-encryption-pde.md create mode 100644 windows/security/licensing/privacy-resource-usage.md create mode 100644 windows/security/licensing/privacy-transparency-and-controls.md create mode 100644 windows/security/licensing/remote-wipe-autopilot-reset.md create mode 100644 windows/security/licensing/secure-boot-and-trusted-boot.md create mode 100644 windows/security/licensing/secured-core-configuration-lock.md create mode 100644 windows/security/licensing/secured-core-pc.md create mode 100644 windows/security/licensing/security-baselines-with-intune.md create mode 100644 windows/security/licensing/server-message-block-direct-smb-direct.md create mode 100644 windows/security/licensing/server-message-block-smb-file-service.md create mode 100644 windows/security/licensing/smart-app-control.md create mode 100644 windows/security/licensing/smart-cards-for-windows-service.md create mode 100644 windows/security/licensing/tamper-protection-settings-for-mde.md create mode 100644 windows/security/licensing/transport-layer-security-tls.md create mode 100644 windows/security/licensing/trusted-platform-module-tpm-20.md create mode 100644 windows/security/licensing/universal-print.md create mode 100644 windows/security/licensing/user-account-control-uac.md create mode 100644 windows/security/licensing/virtual-private-network-vpn.md create mode 100644 windows/security/licensing/virtualization-based-security-vbs.md create mode 100644 windows/security/licensing/wifi-security.md create mode 100644 windows/security/licensing/windows-autopatch.md create mode 100644 windows/security/licensing/windows-autopilot.md create mode 100644 windows/security/licensing/windows-containers.md create mode 100644 windows/security/licensing/windows-defender-application-control-wdac.md create mode 100644 windows/security/licensing/windows-defender-credential-guard.md create mode 100644 windows/security/licensing/windows-defender-remote-credential-guard.md create mode 100644 windows/security/licensing/windows-defender-system-guard.md create mode 100644 windows/security/licensing/windows-firewall.md create mode 100644 windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md create mode 100644 windows/security/licensing/windows-hello-for-business.md create mode 100644 windows/security/licensing/windows-presence-sensing.md create mode 100644 windows/security/licensing/windows-sandbox.md create mode 100644 windows/security/licensing/windows-security-policy-settings-and-auditing.md diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index 316d992db0..dfcb41d432 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -2,18 +2,26 @@ items: - name: Overview href: ../identity.md - name: Windows credential theft mitigation guide - href: ../windows-credential-theft-mitigation-guide-abstract.md - - name: Passwordless + href: windows-credential-theft-mitigation-guide-abstract.md + - name: Passwordless sign-in items: - - name: Windows Hello for Business ⇒ - href: hello-for-business/index.yml - - name: FIDO 2 security keys ⇒ - href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key + - name: Windows Hello for Business + items: + - name: Windows edition and licensing requirements + href: ../licensing/windows-hello-for-business.md + - name: Windows Hello for Business overview ⇒ + href: hello-for-business/index.yml + - name: FIDO 2 security keys + items: + - name: Windows edition and licensing requirements + href: ../licensing/fast-identity-online-fido2-security-key.md + - name: FIDO 2 security keys overview ⇒ + href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key - name: Local Administrator Password Solution (LAPS) items: - - name: Windows LAPS licensing and requirements - href: ../../../includes/licensing/windows-defender-credential-guard.md - - name: Windows LAPS overview + - name: Windows edition and licensing requirements + href: ../licensing/local-administrator-password-solution.md + - name: Windows LAPS overview ⇒ href: /windows-server/identity/laps/laps-overview - name: Enterprise Certificate Pinning href: enterprise-certificate-pinning.md diff --git a/windows/security/licensing/_edition-requirements.md b/windows/security/licensing/_edition-requirements.md new file mode 100644 index 0000000000..5f6391baad --- /dev/null +++ b/windows/security/licensing/_edition-requirements.md @@ -0,0 +1,81 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/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 | +|:---|:---:|:---:|:---:|:---:| +|**[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 (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|❌|Yes|❌|Yes| +|**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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](/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)**|❌|Yes|❌|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| +|**[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](/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|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](/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](/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](/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)**|❌|Yes|❌|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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| +|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|Yes|❌|Yes| +|**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|❌|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](/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)**|❌|Yes|❌|Yes| +|**Privacy Resource Usage**|Yes|Yes|Yes|Yes| +|**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes| +|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes| +|**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes| +|**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes| +|**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes| +|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes| +|**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes| +|**[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](/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes| +|**WiFi Security**|Yes|Yes|Yes|Yes| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|❌|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| +|**[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 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 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| diff --git a/windows/security/licensing/_licensing-requirements.md b/windows/security/licensing/_licensing-requirements.md new file mode 100644 index 0000000000..2d3f2f34d8 --- /dev/null +++ b/windows/security/licensing/_licensing-requirements.md @@ -0,0 +1,81 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +The following table lists the security features that are available in Windows, and the licensing requirements to use them: + +|Feature name|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|:---|:---:|:---:|:---:|:---:|:---:| +|**[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 (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|❌|Yes|Yes|Yes|Yes| +|**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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](/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)**|❌|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| +|**[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](/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|❌|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](/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](/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](/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)**|❌|Yes|Yes|Yes|Yes| +|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|No|❌|No|❌| +|**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|Yes|Yes|Yes| +|**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|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](/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)**|❌|Yes|Yes|Yes|Yes| +|**Privacy Resource Usage**|Yes|Yes|Yes|Yes|Yes| +|**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes|Yes| +|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes|Yes| +|**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes|Yes| +|**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes|Yes| +|**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes|Yes| +|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes|Yes| +|**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes|Yes| +|**[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](/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes|Yes| +|**WiFi Security**|Yes|Yes|Yes|Yes|Yes| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|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| +|**[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 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 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| diff --git a/windows/security/licensing/access-control-aclsscals.md b/windows/security/licensing/access-control-aclsscals.md new file mode 100644 index 0000000000..028929c987 --- /dev/null +++ b/windows/security/licensing/access-control-aclsscals.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Access Control (ACLs/SCALS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Access Control (ACLs/SCALS) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/account-lockout-policy.md b/windows/security/licensing/account-lockout-policy.md new file mode 100644 index 0000000000..9d28314c22 --- /dev/null +++ b/windows/security/licensing/account-lockout-policy.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Account Lockout Policy: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Account Lockout Policy 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/always-on-vpn-device-tunnel.md b/windows/security/licensing/always-on-vpn-device-tunnel.md new file mode 100644 index 0000000000..165e3355ce --- /dev/null +++ b/windows/security/licensing/always-on-vpn-device-tunnel.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Always On VPN (device tunnel): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Always On VPN (device tunnel) 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/assigned-access-kiosk-mode.md b/windows/security/licensing/assigned-access-kiosk-mode.md new file mode 100644 index 0000000000..0aacfd0d54 --- /dev/null +++ b/windows/security/licensing/assigned-access-kiosk-mode.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Assigned Access (kiosk mode): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Assigned Access (kiosk mode) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/attack-surface-reduction-asr.md b/windows/security/licensing/attack-surface-reduction-asr.md new file mode 100644 index 0000000000..bdfa84be11 --- /dev/null +++ b/windows/security/licensing/attack-surface-reduction-asr.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Attack surface reduction (ASR): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Attack surface reduction (ASR) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md b/windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md new file mode 100644 index 0000000000..a2348b9f96 --- /dev/null +++ b/windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/bitlocker.md b/windows/security/licensing/bitlocker.md new file mode 100644 index 0000000000..e1d0482a14 --- /dev/null +++ b/windows/security/licensing/bitlocker.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support BitLocker: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +BitLocker 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/bluetooth-pairing-and-connection-protection.md b/windows/security/licensing/bluetooth-pairing-and-connection-protection.md new file mode 100644 index 0000000000..ea7d847692 --- /dev/null +++ b/windows/security/licensing/bluetooth-pairing-and-connection-protection.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Bluetooth pairing and connection protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Bluetooth pairing and connection protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/common-criteria-certifications.md b/windows/security/licensing/common-criteria-certifications.md new file mode 100644 index 0000000000..67da2eaa80 --- /dev/null +++ b/windows/security/licensing/common-criteria-certifications.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Common Criteria certifications: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Common Criteria certifications 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/controlled-folder-access.md b/windows/security/licensing/controlled-folder-access.md new file mode 100644 index 0000000000..6e8429962d --- /dev/null +++ b/windows/security/licensing/controlled-folder-access.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Controlled folder access: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Controlled folder access 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/device-health-attestation-service.md b/windows/security/licensing/device-health-attestation-service.md new file mode 100644 index 0000000000..180599b676 --- /dev/null +++ b/windows/security/licensing/device-health-attestation-service.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Device health attestation service: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Device health attestation service 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/direct-access.md b/windows/security/licensing/direct-access.md new file mode 100644 index 0000000000..32f1858423 --- /dev/null +++ b/windows/security/licensing/direct-access.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Direct Access: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Direct Access 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/email-encryption-smime.md b/windows/security/licensing/email-encryption-smime.md new file mode 100644 index 0000000000..1e613f7ea7 --- /dev/null +++ b/windows/security/licensing/email-encryption-smime.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Email Encryption (S/MIME): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Email Encryption (S/MIME) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/encrypted-hard-drive.md b/windows/security/licensing/encrypted-hard-drive.md new file mode 100644 index 0000000000..7f8eabb4fc --- /dev/null +++ b/windows/security/licensing/encrypted-hard-drive.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Encrypted hard drive: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Encrypted hard drive 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md b/windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md new file mode 100644 index 0000000000..c050417d86 --- /dev/null +++ b/windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Enhanced phishing protection with SmartScreen: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Enhanced phishing protection with SmartScreen 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/exploit-protection.md b/windows/security/licensing/exploit-protection.md new file mode 100644 index 0000000000..ee0105c7aa --- /dev/null +++ b/windows/security/licensing/exploit-protection.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Exploit protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Exploit protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/fast-identity-online-fido2-security-key.md b/windows/security/licensing/fast-identity-online-fido2-security-key.md new file mode 100644 index 0000000000..1fac120af3 --- /dev/null +++ b/windows/security/licensing/fast-identity-online-fido2-security-key.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Fast Identity Online (FIDO2) security key: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Fast Identity Online (FIDO2) security key 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/federal-information-processing-standard-fips-140-validation.md b/windows/security/licensing/federal-information-processing-standard-fips-140-validation.md new file mode 100644 index 0000000000..4f43d3d758 --- /dev/null +++ b/windows/security/licensing/federal-information-processing-standard-fips-140-validation.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Federal Information Processing Standard (FIPS) 140 validation: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Federal Information Processing Standard (FIPS) 140 validation 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/federated-sign-in.md b/windows/security/licensing/federated-sign-in.md new file mode 100644 index 0000000000..080274363c --- /dev/null +++ b/windows/security/licensing/federated-sign-in.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Federated sign-in: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|No|Yes|Yes| + +Federated sign-in 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| +|:---:|:---:|:---:|:---:|:---:| +|No|No|No|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/hardware-enforced-stack-protection.md b/windows/security/licensing/hardware-enforced-stack-protection.md new file mode 100644 index 0000000000..7d197bf299 --- /dev/null +++ b/windows/security/licensing/hardware-enforced-stack-protection.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Hardware-enforced stack protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Hardware-enforced stack protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/hypervisor-protected-code-integrity-hvci.md b/windows/security/licensing/hypervisor-protected-code-integrity-hvci.md new file mode 100644 index 0000000000..659a1e1a0f --- /dev/null +++ b/windows/security/licensing/hypervisor-protected-code-integrity-hvci.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Hypervisor-protected Code Integrity (HVCI): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Hypervisor-protected Code Integrity (HVCI) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/kernel-direct-memory-access-dma-protection.md b/windows/security/licensing/kernel-direct-memory-access-dma-protection.md new file mode 100644 index 0000000000..c07f32a3f1 --- /dev/null +++ b/windows/security/licensing/kernel-direct-memory-access-dma-protection.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Kernel Direct Memory Access (DMA) protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Kernel Direct Memory Access (DMA) protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/local-administrator-password-solution.md b/windows/security/licensing/local-administrator-password-solution.md new file mode 100644 index 0000000000..a7f5eb6aba --- /dev/null +++ b/windows/security/licensing/local-administrator-password-solution.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Local Administrator Password Solution: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Local Administrator Password Solution 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/local-security-authority-lsa-protection.md b/windows/security/licensing/local-security-authority-lsa-protection.md new file mode 100644 index 0000000000..f6b948f1a1 --- /dev/null +++ b/windows/security/licensing/local-security-authority-lsa-protection.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Local Security Authority (LSA) Protection: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Local Security Authority (LSA) Protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md b/windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md new file mode 100644 index 0000000000..d0c8d30dd4 --- /dev/null +++ b/windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Manage by Mobile Device Management (MDM) and group policy: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Manage by Mobile Device Management (MDM) and group policy 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/measured-boot.md b/windows/security/licensing/measured-boot.md new file mode 100644 index 0000000000..873dd51db8 --- /dev/null +++ b/windows/security/licensing/measured-boot.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Measured boot: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Measured boot 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-antivirus.md b/windows/security/licensing/microsoft-defender-antivirus.md new file mode 100644 index 0000000000..08df5e0218 --- /dev/null +++ b/windows/security/licensing/microsoft-defender-antivirus.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender Antivirus: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender Antivirus 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md new file mode 100644 index 0000000000..e754997c7a --- /dev/null +++ b/windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) configure via MDM: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) configure via MDM 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md new file mode 100644 index 0000000000..9dc9d2c111 --- /dev/null +++ b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md new file mode 100644 index 0000000000..fe5677e4eb --- /dev/null +++ b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) for Edge standalone mode: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender Application Guard (MDAG) for Edge standalone mode 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md new file mode 100644 index 0000000000..3cbb70aa69 --- /dev/null +++ b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) for Microsoft Office: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) for Microsoft Office 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| +|:---:|:---:|:---:|:---:|:---:| +|No|No|No|No|No| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md new file mode 100644 index 0000000000..eeaf93367e --- /dev/null +++ b/windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) public APIs: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Microsoft Defender Application Guard (MDAG) public APIs 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-for-endpoint.md b/windows/security/licensing/microsoft-defender-for-endpoint.md new file mode 100644 index 0000000000..312be13a46 --- /dev/null +++ b/windows/security/licensing/microsoft-defender-for-endpoint.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender for Endpoint: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender for Endpoint 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|No|Yes|No|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-smartscreen.md b/windows/security/licensing/microsoft-defender-smartscreen.md new file mode 100644 index 0000000000..ff95861177 --- /dev/null +++ b/windows/security/licensing/microsoft-defender-smartscreen.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Defender SmartScreen: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Defender SmartScreen 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-pluton-security-processor.md b/windows/security/licensing/microsoft-pluton-security-processor.md new file mode 100644 index 0000000000..d0f93bcb7c --- /dev/null +++ b/windows/security/licensing/microsoft-pluton-security-processor.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Pluton security processor: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Pluton security processor 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-vulnerable-driver-blocklist.md b/windows/security/licensing/microsoft-vulnerable-driver-blocklist.md new file mode 100644 index 0000000000..98dd69ad55 --- /dev/null +++ b/windows/security/licensing/microsoft-vulnerable-driver-blocklist.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Microsoft Vulnerable Driver Blocklist: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Microsoft Vulnerable Driver Blocklist 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/opportunistic-wireless-encryption-owe.md b/windows/security/licensing/opportunistic-wireless-encryption-owe.md new file mode 100644 index 0000000000..953cb81211 --- /dev/null +++ b/windows/security/licensing/opportunistic-wireless-encryption-owe.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Opportunistic Wireless Encryption (OWE): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Opportunistic Wireless Encryption (OWE) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/personal-data-encryption-pde.md b/windows/security/licensing/personal-data-encryption-pde.md new file mode 100644 index 0000000000..5626b57d96 --- /dev/null +++ b/windows/security/licensing/personal-data-encryption-pde.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Personal data encryption (PDE): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Personal data encryption (PDE) 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/privacy-resource-usage.md b/windows/security/licensing/privacy-resource-usage.md new file mode 100644 index 0000000000..2bea08f5e1 --- /dev/null +++ b/windows/security/licensing/privacy-resource-usage.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Privacy Resource Usage: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Privacy Resource Usage 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/privacy-transparency-and-controls.md b/windows/security/licensing/privacy-transparency-and-controls.md new file mode 100644 index 0000000000..2fec75d8c4 --- /dev/null +++ b/windows/security/licensing/privacy-transparency-and-controls.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Privacy Transparency and Controls: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Privacy Transparency and Controls 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/remote-wipe-autopilot-reset.md b/windows/security/licensing/remote-wipe-autopilot-reset.md new file mode 100644 index 0000000000..c68c8ad2ed --- /dev/null +++ b/windows/security/licensing/remote-wipe-autopilot-reset.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Remote wipe (Autopilot reset): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Remote wipe (Autopilot reset) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/secure-boot-and-trusted-boot.md b/windows/security/licensing/secure-boot-and-trusted-boot.md new file mode 100644 index 0000000000..53b48d99cc --- /dev/null +++ b/windows/security/licensing/secure-boot-and-trusted-boot.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Secure Boot and Trusted Boot: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Secure Boot and Trusted Boot 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/secured-core-configuration-lock.md b/windows/security/licensing/secured-core-configuration-lock.md new file mode 100644 index 0000000000..dddf8843a4 --- /dev/null +++ b/windows/security/licensing/secured-core-configuration-lock.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Secured-core configuration lock: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Secured-core configuration lock 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/secured-core-pc.md b/windows/security/licensing/secured-core-pc.md new file mode 100644 index 0000000000..8fca64cb2c --- /dev/null +++ b/windows/security/licensing/secured-core-pc.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Secured-core PC: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Secured-core PC 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/security-baselines-with-intune.md b/windows/security/licensing/security-baselines-with-intune.md new file mode 100644 index 0000000000..43b5f384ab --- /dev/null +++ b/windows/security/licensing/security-baselines-with-intune.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Security baselines with Intune: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Security baselines 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/server-message-block-direct-smb-direct.md b/windows/security/licensing/server-message-block-direct-smb-direct.md new file mode 100644 index 0000000000..1b76968707 --- /dev/null +++ b/windows/security/licensing/server-message-block-direct-smb-direct.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Server Message Block Direct (SMB Direct): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Server Message Block Direct (SMB Direct) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/server-message-block-smb-file-service.md b/windows/security/licensing/server-message-block-smb-file-service.md new file mode 100644 index 0000000000..f39db20a54 --- /dev/null +++ b/windows/security/licensing/server-message-block-smb-file-service.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Server Message Block (SMB) file service: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Server Message Block (SMB) file service 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/smart-app-control.md b/windows/security/licensing/smart-app-control.md new file mode 100644 index 0000000000..cfb6c198a6 --- /dev/null +++ b/windows/security/licensing/smart-app-control.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Smart App Control: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Smart App Control 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/smart-cards-for-windows-service.md b/windows/security/licensing/smart-cards-for-windows-service.md new file mode 100644 index 0000000000..b7a9d46f11 --- /dev/null +++ b/windows/security/licensing/smart-cards-for-windows-service.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Smart Cards for Windows Service: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Smart Cards for Windows Service 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/tamper-protection-settings-for-mde.md b/windows/security/licensing/tamper-protection-settings-for-mde.md new file mode 100644 index 0000000000..06a01236ec --- /dev/null +++ b/windows/security/licensing/tamper-protection-settings-for-mde.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Tamper protection settings for MDE: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Tamper protection settings for MDE 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/transport-layer-security-tls.md b/windows/security/licensing/transport-layer-security-tls.md new file mode 100644 index 0000000000..d0f2b933b2 --- /dev/null +++ b/windows/security/licensing/transport-layer-security-tls.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Transport layer security (TLS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Transport layer security (TLS) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/trusted-platform-module-tpm-20.md b/windows/security/licensing/trusted-platform-module-tpm-20.md new file mode 100644 index 0000000000..4b5197dd74 --- /dev/null +++ b/windows/security/licensing/trusted-platform-module-tpm-20.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Trusted Platform Module (TPM) 2.0: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Trusted Platform Module (TPM) 2.0 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/universal-print.md b/windows/security/licensing/universal-print.md new file mode 100644 index 0000000000..46f0afd2c6 --- /dev/null +++ b/windows/security/licensing/universal-print.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Universal Print: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Universal Print 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/user-account-control-uac.md b/windows/security/licensing/user-account-control-uac.md new file mode 100644 index 0000000000..dca8cb0915 --- /dev/null +++ b/windows/security/licensing/user-account-control-uac.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support User Account Control (UAC): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +User Account Control (UAC) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/virtual-private-network-vpn.md b/windows/security/licensing/virtual-private-network-vpn.md new file mode 100644 index 0000000000..61de672ee8 --- /dev/null +++ b/windows/security/licensing/virtual-private-network-vpn.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Virtual Private Network (VPN): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Virtual Private Network (VPN) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/virtualization-based-security-vbs.md b/windows/security/licensing/virtualization-based-security-vbs.md new file mode 100644 index 0000000000..de05ea5d8e --- /dev/null +++ b/windows/security/licensing/virtualization-based-security-vbs.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Virtualization-based security (VBS): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Virtualization-based security (VBS) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/wifi-security.md b/windows/security/licensing/wifi-security.md new file mode 100644 index 0000000000..9507a7618a --- /dev/null +++ b/windows/security/licensing/wifi-security.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support WiFi Security: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +WiFi Security 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-autopatch.md b/windows/security/licensing/windows-autopatch.md new file mode 100644 index 0000000000..f67e2b5216 --- /dev/null +++ b/windows/security/licensing/windows-autopatch.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Autopatch: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Windows Autopatch 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|No|No| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-autopilot.md b/windows/security/licensing/windows-autopilot.md new file mode 100644 index 0000000000..9c57cdb899 --- /dev/null +++ b/windows/security/licensing/windows-autopilot.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Autopilot: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Autopilot 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-containers.md b/windows/security/licensing/windows-containers.md new file mode 100644 index 0000000000..0e4df6dcb8 --- /dev/null +++ b/windows/security/licensing/windows-containers.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows containers: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows containers 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-application-control-wdac.md b/windows/security/licensing/windows-defender-application-control-wdac.md new file mode 100644 index 0000000000..3f81db1b61 --- /dev/null +++ b/windows/security/licensing/windows-defender-application-control-wdac.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Defender Application Control (WDAC): + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender Application Control (WDAC) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-credential-guard.md b/windows/security/licensing/windows-defender-credential-guard.md new file mode 100644 index 0000000000..d55e33af47 --- /dev/null +++ b/windows/security/licensing/windows-defender-credential-guard.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Defender Credential Guard: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|No|Yes|No|Yes| + +Windows Defender Credential Guard 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| +|:---:|:---:|:---:|:---:|:---:| +|No|Yes|Yes|Yes|Yes| + +For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-remote-credential-guard.md b/windows/security/licensing/windows-defender-remote-credential-guard.md new file mode 100644 index 0000000000..51feb6043b --- /dev/null +++ b/windows/security/licensing/windows-defender-remote-credential-guard.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Defender Remote Credential Guard: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender Remote Credential Guard 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-system-guard.md b/windows/security/licensing/windows-defender-system-guard.md new file mode 100644 index 0000000000..b4f7577506 --- /dev/null +++ b/windows/security/licensing/windows-defender-system-guard.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Defender System Guard: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Defender System Guard 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-firewall.md b/windows/security/licensing/windows-firewall.md new file mode 100644 index 0000000000..12b7254fb9 --- /dev/null +++ b/windows/security/licensing/windows-firewall.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Firewall: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Firewall 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md b/windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md new file mode 100644 index 0000000000..0b8095a9f8 --- /dev/null +++ b/windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-hello-for-business.md b/windows/security/licensing/windows-hello-for-business.md new file mode 100644 index 0000000000..cb8ec101ad --- /dev/null +++ b/windows/security/licensing/windows-hello-for-business.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Hello for Business: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Hello 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-presence-sensing.md b/windows/security/licensing/windows-presence-sensing.md new file mode 100644 index 0000000000..25eda4a8de --- /dev/null +++ b/windows/security/licensing/windows-presence-sensing.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows presence sensing: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows presence sensing 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-sandbox.md b/windows/security/licensing/windows-sandbox.md new file mode 100644 index 0000000000..1b23c6f198 --- /dev/null +++ b/windows/security/licensing/windows-sandbox.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Sandbox: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Sandbox 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-security-policy-settings-and-auditing.md b/windows/security/licensing/windows-security-policy-settings-and-auditing.md new file mode 100644 index 0000000000..0fabeddb20 --- /dev/null +++ b/windows/security/licensing/windows-security-policy-settings-and-auditing.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/25/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows Security policy settings and auditing: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows Security policy settings and auditing 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 licensing overview](/windows/whats-new/windows-licensing). From d2a2129b2e1db90d239b14904de29584ddc786a3 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:42:40 -0400 Subject: [PATCH 22/65] reverted mockup changes --- ...ur-arch-diagram.png => ur-arch-diagram.png | Bin .../hello-for-business/hello-overview.md | 2 + windows/security/identity-protection/toc.yml | 24 ++---- .../licensing/_edition-requirements.md | 81 ------------------ .../licensing/_licensing-requirements.md | 81 ------------------ .../licensing/access-control-aclsscals.md | 22 ----- .../licensing/account-lockout-policy.md | 22 ----- .../licensing/always-on-vpn-device-tunnel.md | 22 ----- .../licensing/assigned-access-kiosk-mode.md | 22 ----- .../licensing/attack-surface-reduction-asr.md | 22 ----- ...d-azure-ad-join-with-single-sign-on-sso.md | 22 ----- windows/security/licensing/bitlocker.md | 22 ----- ...tooth-pairing-and-connection-protection.md | 22 ----- .../common-criteria-certifications.md | 22 ----- .../licensing/controlled-folder-access.md | 22 ----- .../device-health-attestation-service.md | 22 ----- windows/security/licensing/direct-access.md | 22 ----- .../licensing/email-encryption-smime.md | 22 ----- .../licensing/encrypted-hard-drive.md | 22 ----- ...ed-phishing-protection-with-smartscreen.md | 22 ----- .../security/licensing/exploit-protection.md | 22 ----- ...fast-identity-online-fido2-security-key.md | 22 ----- ...processing-standard-fips-140-validation.md | 22 ----- .../security/licensing/federated-sign-in.md | 22 ----- .../hardware-enforced-stack-protection.md | 22 ----- ...ypervisor-protected-code-integrity-hvci.md | 22 ----- ...nel-direct-memory-access-dma-protection.md | 22 ----- .../local-administrator-password-solution.md | 22 ----- ...local-security-authority-lsa-protection.md | 22 ----- ...-device-management-mdm-and-group-policy.md | 22 ----- windows/security/licensing/measured-boot.md | 22 ----- .../licensing/microsoft-defender-antivirus.md | 22 ----- ...pplication-guard-mdag-configure-via-mdm.md | 22 ----- ...terprise-mode-and-enterprise-management.md | 22 ----- ...ion-guard-mdag-for-edge-standalone-mode.md | 22 ----- ...ication-guard-mdag-for-microsoft-office.md | 22 ----- ...nder-application-guard-mdag-public-apis.md | 22 ----- .../microsoft-defender-for-endpoint.md | 22 ----- .../microsoft-defender-smartscreen.md | 22 ----- .../microsoft-pluton-security-processor.md | 22 ----- .../microsoft-vulnerable-driver-blocklist.md | 22 ----- .../opportunistic-wireless-encryption-owe.md | 22 ----- .../licensing/personal-data-encryption-pde.md | 22 ----- .../licensing/privacy-resource-usage.md | 22 ----- .../privacy-transparency-and-controls.md | 22 ----- .../licensing/remote-wipe-autopilot-reset.md | 22 ----- .../licensing/secure-boot-and-trusted-boot.md | 22 ----- .../secured-core-configuration-lock.md | 22 ----- windows/security/licensing/secured-core-pc.md | 22 ----- .../security-baselines-with-intune.md | 22 ----- .../server-message-block-direct-smb-direct.md | 22 ----- .../server-message-block-smb-file-service.md | 22 ----- .../security/licensing/smart-app-control.md | 22 ----- .../smart-cards-for-windows-service.md | 22 ----- .../tamper-protection-settings-for-mde.md | 22 ----- .../licensing/transport-layer-security-tls.md | 22 ----- .../trusted-platform-module-tpm-20.md | 22 ----- windows/security/licensing/universal-print.md | 22 ----- .../licensing/user-account-control-uac.md | 22 ----- .../licensing/virtual-private-network-vpn.md | 22 ----- .../virtualization-based-security-vbs.md | 22 ----- windows/security/licensing/wifi-security.md | 22 ----- .../security/licensing/windows-autopatch.md | 22 ----- .../security/licensing/windows-autopilot.md | 22 ----- .../security/licensing/windows-containers.md | 22 ----- ...ndows-defender-application-control-wdac.md | 22 ----- .../windows-defender-credential-guard.md | 22 ----- ...indows-defender-remote-credential-guard.md | 22 ----- .../windows-defender-system-guard.md | 22 ----- .../security/licensing/windows-firewall.md | 22 ----- ...-business-enhanced-security-sign-in-ess.md | 22 ----- .../licensing/windows-hello-for-business.md | 22 ----- .../licensing/windows-presence-sensing.md | 22 ----- windows/security/licensing/windows-sandbox.md | 22 ----- ...s-security-policy-settings-and-auditing.md | 22 ----- 75 files changed, 8 insertions(+), 1720 deletions(-) rename windows/deployment/images/ur-arch-diagram.png => ur-arch-diagram.png (100%) delete mode 100644 windows/security/licensing/_edition-requirements.md delete mode 100644 windows/security/licensing/_licensing-requirements.md delete mode 100644 windows/security/licensing/access-control-aclsscals.md delete mode 100644 windows/security/licensing/account-lockout-policy.md delete mode 100644 windows/security/licensing/always-on-vpn-device-tunnel.md delete mode 100644 windows/security/licensing/assigned-access-kiosk-mode.md delete mode 100644 windows/security/licensing/attack-surface-reduction-asr.md delete mode 100644 windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md delete mode 100644 windows/security/licensing/bitlocker.md delete mode 100644 windows/security/licensing/bluetooth-pairing-and-connection-protection.md delete mode 100644 windows/security/licensing/common-criteria-certifications.md delete mode 100644 windows/security/licensing/controlled-folder-access.md delete mode 100644 windows/security/licensing/device-health-attestation-service.md delete mode 100644 windows/security/licensing/direct-access.md delete mode 100644 windows/security/licensing/email-encryption-smime.md delete mode 100644 windows/security/licensing/encrypted-hard-drive.md delete mode 100644 windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md delete mode 100644 windows/security/licensing/exploit-protection.md delete mode 100644 windows/security/licensing/fast-identity-online-fido2-security-key.md delete mode 100644 windows/security/licensing/federal-information-processing-standard-fips-140-validation.md delete mode 100644 windows/security/licensing/federated-sign-in.md delete mode 100644 windows/security/licensing/hardware-enforced-stack-protection.md delete mode 100644 windows/security/licensing/hypervisor-protected-code-integrity-hvci.md delete mode 100644 windows/security/licensing/kernel-direct-memory-access-dma-protection.md delete mode 100644 windows/security/licensing/local-administrator-password-solution.md delete mode 100644 windows/security/licensing/local-security-authority-lsa-protection.md delete mode 100644 windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md delete mode 100644 windows/security/licensing/measured-boot.md delete mode 100644 windows/security/licensing/microsoft-defender-antivirus.md delete mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md delete mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md delete mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md delete mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md delete mode 100644 windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md delete mode 100644 windows/security/licensing/microsoft-defender-for-endpoint.md delete mode 100644 windows/security/licensing/microsoft-defender-smartscreen.md delete mode 100644 windows/security/licensing/microsoft-pluton-security-processor.md delete mode 100644 windows/security/licensing/microsoft-vulnerable-driver-blocklist.md delete mode 100644 windows/security/licensing/opportunistic-wireless-encryption-owe.md delete mode 100644 windows/security/licensing/personal-data-encryption-pde.md delete mode 100644 windows/security/licensing/privacy-resource-usage.md delete mode 100644 windows/security/licensing/privacy-transparency-and-controls.md delete mode 100644 windows/security/licensing/remote-wipe-autopilot-reset.md delete mode 100644 windows/security/licensing/secure-boot-and-trusted-boot.md delete mode 100644 windows/security/licensing/secured-core-configuration-lock.md delete mode 100644 windows/security/licensing/secured-core-pc.md delete mode 100644 windows/security/licensing/security-baselines-with-intune.md delete mode 100644 windows/security/licensing/server-message-block-direct-smb-direct.md delete mode 100644 windows/security/licensing/server-message-block-smb-file-service.md delete mode 100644 windows/security/licensing/smart-app-control.md delete mode 100644 windows/security/licensing/smart-cards-for-windows-service.md delete mode 100644 windows/security/licensing/tamper-protection-settings-for-mde.md delete mode 100644 windows/security/licensing/transport-layer-security-tls.md delete mode 100644 windows/security/licensing/trusted-platform-module-tpm-20.md delete mode 100644 windows/security/licensing/universal-print.md delete mode 100644 windows/security/licensing/user-account-control-uac.md delete mode 100644 windows/security/licensing/virtual-private-network-vpn.md delete mode 100644 windows/security/licensing/virtualization-based-security-vbs.md delete mode 100644 windows/security/licensing/wifi-security.md delete mode 100644 windows/security/licensing/windows-autopatch.md delete mode 100644 windows/security/licensing/windows-autopilot.md delete mode 100644 windows/security/licensing/windows-containers.md delete mode 100644 windows/security/licensing/windows-defender-application-control-wdac.md delete mode 100644 windows/security/licensing/windows-defender-credential-guard.md delete mode 100644 windows/security/licensing/windows-defender-remote-credential-guard.md delete mode 100644 windows/security/licensing/windows-defender-system-guard.md delete mode 100644 windows/security/licensing/windows-firewall.md delete mode 100644 windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md delete mode 100644 windows/security/licensing/windows-hello-for-business.md delete mode 100644 windows/security/licensing/windows-presence-sensing.md delete mode 100644 windows/security/licensing/windows-sandbox.md delete mode 100644 windows/security/licensing/windows-security-policy-settings-and-auditing.md diff --git a/windows/deployment/images/ur-arch-diagram.png b/ur-arch-diagram.png similarity index 100% rename from windows/deployment/images/ur-arch-diagram.png rename to ur-arch-diagram.png diff --git a/windows/security/identity-protection/hello-for-business/hello-overview.md b/windows/security/identity-protection/hello-for-business/hello-overview.md index 84acf6b19c..7ed1ecc9b5 100644 --- a/windows/security/identity-protection/hello-for-business/hello-overview.md +++ b/windows/security/identity-protection/hello-for-business/hello-overview.md @@ -48,6 +48,8 @@ Windows stores biometric data that is used to implement Windows Hello securely o - *Windows Hello for Business*, which is configured by group policy or mobile device management (MDM) policy, always uses key-based or certificate-based authentication. This behavior makes it more secure than *Windows Hello convenience PIN*. +[!INCLUDE [windows-hello-for-business](../../../../includes/licensing/windows-hello-for-business.md)] + ## Benefits of Windows Hello Reports of identity theft and large-scale hacking are frequent headlines. Nobody wants to be notified that their user name and password have been exposed. diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index dfcb41d432..edc7841f47 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -5,24 +5,12 @@ items: href: windows-credential-theft-mitigation-guide-abstract.md - name: Passwordless sign-in items: - - name: Windows Hello for Business - items: - - name: Windows edition and licensing requirements - href: ../licensing/windows-hello-for-business.md - - name: Windows Hello for Business overview ⇒ - href: hello-for-business/index.yml - - name: FIDO 2 security keys - items: - - name: Windows edition and licensing requirements - href: ../licensing/fast-identity-online-fido2-security-key.md - - name: FIDO 2 security keys overview ⇒ - href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key - - name: Local Administrator Password Solution (LAPS) - items: - - name: Windows edition and licensing requirements - href: ../licensing/local-administrator-password-solution.md - - name: Windows LAPS overview ⇒ - href: /windows-server/identity/laps/laps-overview + - name: Windows Hello for Business ⇒ + href: hello-for-business/index.yml + - name: FIDO 2 security keys ⇒ + href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key + - name: Windows LAPS (Local Administrator Password Solution) ⇒ + href: /windows-server/identity/laps/laps-overview - name: Enterprise Certificate Pinning href: enterprise-certificate-pinning.md - name: Credential Guard diff --git a/windows/security/licensing/_edition-requirements.md b/windows/security/licensing/_edition-requirements.md deleted file mode 100644 index 5f6391baad..0000000000 --- a/windows/security/licensing/_edition-requirements.md +++ /dev/null @@ -1,81 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/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 | -|:---|:---:|:---:|:---:|:---:| -|**[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 (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|❌|Yes|❌|Yes| -|**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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](/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)**|❌|Yes|❌|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| -|**[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](/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|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](/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](/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](/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)**|❌|Yes|❌|Yes| -|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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| -|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|Yes|❌|Yes| -|**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|❌|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](/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)**|❌|Yes|❌|Yes| -|**Privacy Resource Usage**|Yes|Yes|Yes|Yes| -|**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes| -|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes| -|**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes| -|**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes| -|**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes| -|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes| -|**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes| -|**[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](/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes| -|**WiFi Security**|Yes|Yes|Yes|Yes| -|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|❌|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| -|**[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 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 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| diff --git a/windows/security/licensing/_licensing-requirements.md b/windows/security/licensing/_licensing-requirements.md deleted file mode 100644 index 2d3f2f34d8..0000000000 --- a/windows/security/licensing/_licensing-requirements.md +++ /dev/null @@ -1,81 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -The following table lists the security features that are available in Windows, and the licensing requirements to use them: - -|Feature name|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| -|:---|:---:|:---:|:---:|:---:|:---:| -|**[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 (device tunnel)](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|❌|Yes|Yes|Yes|Yes| -|**[Assigned Access (kiosk mode)](/windows/configuration/kiosk-methods)**|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](/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)**|❌|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| -|**[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](/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|❌|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](/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](/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](/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)**|❌|Yes|Yes|Yes|Yes| -|**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|No|❌|No|❌| -|**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|Yes|Yes|Yes| -|**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|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](/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)**|❌|Yes|Yes|Yes|Yes| -|**Privacy Resource Usage**|Yes|Yes|Yes|Yes|Yes| -|**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes|Yes| -|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes|Yes| -|**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes|Yes| -|**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes|Yes| -|**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes|Yes| -|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes|Yes| -|**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes|Yes| -|**[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](/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes|Yes| -|**WiFi Security**|Yes|Yes|Yes|Yes|Yes| -|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|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| -|**[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 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 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| diff --git a/windows/security/licensing/access-control-aclsscals.md b/windows/security/licensing/access-control-aclsscals.md deleted file mode 100644 index 028929c987..0000000000 --- a/windows/security/licensing/access-control-aclsscals.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Access Control (ACLs/SCALS): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Access Control (ACLs/SCALS) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/account-lockout-policy.md b/windows/security/licensing/account-lockout-policy.md deleted file mode 100644 index 9d28314c22..0000000000 --- a/windows/security/licensing/account-lockout-policy.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Account Lockout Policy: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Account Lockout Policy 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/always-on-vpn-device-tunnel.md b/windows/security/licensing/always-on-vpn-device-tunnel.md deleted file mode 100644 index 165e3355ce..0000000000 --- a/windows/security/licensing/always-on-vpn-device-tunnel.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Always On VPN (device tunnel): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Always On VPN (device tunnel) 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/assigned-access-kiosk-mode.md b/windows/security/licensing/assigned-access-kiosk-mode.md deleted file mode 100644 index 0aacfd0d54..0000000000 --- a/windows/security/licensing/assigned-access-kiosk-mode.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Assigned Access (kiosk mode): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Assigned Access (kiosk mode) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/attack-surface-reduction-asr.md b/windows/security/licensing/attack-surface-reduction-asr.md deleted file mode 100644 index bdfa84be11..0000000000 --- a/windows/security/licensing/attack-surface-reduction-asr.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Attack surface reduction (ASR): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Attack surface reduction (ASR) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md b/windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md deleted file mode 100644 index a2348b9f96..0000000000 --- a/windows/security/licensing/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Azure AD join, Active Directory domain join, and Hybrid Azure AD join with single sign-on (SSO) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/bitlocker.md b/windows/security/licensing/bitlocker.md deleted file mode 100644 index e1d0482a14..0000000000 --- a/windows/security/licensing/bitlocker.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support BitLocker: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -BitLocker 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/bluetooth-pairing-and-connection-protection.md b/windows/security/licensing/bluetooth-pairing-and-connection-protection.md deleted file mode 100644 index ea7d847692..0000000000 --- a/windows/security/licensing/bluetooth-pairing-and-connection-protection.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Bluetooth pairing and connection protection: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Bluetooth pairing and connection protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/common-criteria-certifications.md b/windows/security/licensing/common-criteria-certifications.md deleted file mode 100644 index 67da2eaa80..0000000000 --- a/windows/security/licensing/common-criteria-certifications.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Common Criteria certifications: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Common Criteria certifications 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/controlled-folder-access.md b/windows/security/licensing/controlled-folder-access.md deleted file mode 100644 index 6e8429962d..0000000000 --- a/windows/security/licensing/controlled-folder-access.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Controlled folder access: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Controlled folder access 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/device-health-attestation-service.md b/windows/security/licensing/device-health-attestation-service.md deleted file mode 100644 index 180599b676..0000000000 --- a/windows/security/licensing/device-health-attestation-service.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Device health attestation service: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Device health attestation service 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/direct-access.md b/windows/security/licensing/direct-access.md deleted file mode 100644 index 32f1858423..0000000000 --- a/windows/security/licensing/direct-access.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Direct Access: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Direct Access 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/email-encryption-smime.md b/windows/security/licensing/email-encryption-smime.md deleted file mode 100644 index 1e613f7ea7..0000000000 --- a/windows/security/licensing/email-encryption-smime.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Email Encryption (S/MIME): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Email Encryption (S/MIME) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/encrypted-hard-drive.md b/windows/security/licensing/encrypted-hard-drive.md deleted file mode 100644 index 7f8eabb4fc..0000000000 --- a/windows/security/licensing/encrypted-hard-drive.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Encrypted hard drive: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Encrypted hard drive 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md b/windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md deleted file mode 100644 index c050417d86..0000000000 --- a/windows/security/licensing/enhanced-phishing-protection-with-smartscreen.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Enhanced phishing protection with SmartScreen: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Enhanced phishing protection with SmartScreen 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/exploit-protection.md b/windows/security/licensing/exploit-protection.md deleted file mode 100644 index ee0105c7aa..0000000000 --- a/windows/security/licensing/exploit-protection.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Exploit protection: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Exploit protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/fast-identity-online-fido2-security-key.md b/windows/security/licensing/fast-identity-online-fido2-security-key.md deleted file mode 100644 index 1fac120af3..0000000000 --- a/windows/security/licensing/fast-identity-online-fido2-security-key.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Fast Identity Online (FIDO2) security key: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Fast Identity Online (FIDO2) security key 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/federal-information-processing-standard-fips-140-validation.md b/windows/security/licensing/federal-information-processing-standard-fips-140-validation.md deleted file mode 100644 index 4f43d3d758..0000000000 --- a/windows/security/licensing/federal-information-processing-standard-fips-140-validation.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Federal Information Processing Standard (FIPS) 140 validation: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Federal Information Processing Standard (FIPS) 140 validation 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/federated-sign-in.md b/windows/security/licensing/federated-sign-in.md deleted file mode 100644 index 080274363c..0000000000 --- a/windows/security/licensing/federated-sign-in.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Federated sign-in: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|No|Yes|Yes| - -Federated sign-in 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| -|:---:|:---:|:---:|:---:|:---:| -|No|No|No|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/hardware-enforced-stack-protection.md b/windows/security/licensing/hardware-enforced-stack-protection.md deleted file mode 100644 index 7d197bf299..0000000000 --- a/windows/security/licensing/hardware-enforced-stack-protection.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Hardware-enforced stack protection: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Hardware-enforced stack protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/hypervisor-protected-code-integrity-hvci.md b/windows/security/licensing/hypervisor-protected-code-integrity-hvci.md deleted file mode 100644 index 659a1e1a0f..0000000000 --- a/windows/security/licensing/hypervisor-protected-code-integrity-hvci.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Hypervisor-protected Code Integrity (HVCI): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Hypervisor-protected Code Integrity (HVCI) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/kernel-direct-memory-access-dma-protection.md b/windows/security/licensing/kernel-direct-memory-access-dma-protection.md deleted file mode 100644 index c07f32a3f1..0000000000 --- a/windows/security/licensing/kernel-direct-memory-access-dma-protection.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Kernel Direct Memory Access (DMA) protection: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Kernel Direct Memory Access (DMA) protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/local-administrator-password-solution.md b/windows/security/licensing/local-administrator-password-solution.md deleted file mode 100644 index a7f5eb6aba..0000000000 --- a/windows/security/licensing/local-administrator-password-solution.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Local Administrator Password Solution: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Local Administrator Password Solution 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/local-security-authority-lsa-protection.md b/windows/security/licensing/local-security-authority-lsa-protection.md deleted file mode 100644 index f6b948f1a1..0000000000 --- a/windows/security/licensing/local-security-authority-lsa-protection.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Local Security Authority (LSA) Protection: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Local Security Authority (LSA) Protection 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md b/windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md deleted file mode 100644 index d0c8d30dd4..0000000000 --- a/windows/security/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Manage by Mobile Device Management (MDM) and group policy: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Manage by Mobile Device Management (MDM) and group policy 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/measured-boot.md b/windows/security/licensing/measured-boot.md deleted file mode 100644 index 873dd51db8..0000000000 --- a/windows/security/licensing/measured-boot.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Measured boot: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Measured boot 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-antivirus.md b/windows/security/licensing/microsoft-defender-antivirus.md deleted file mode 100644 index 08df5e0218..0000000000 --- a/windows/security/licensing/microsoft-defender-antivirus.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender Antivirus: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Microsoft Defender Antivirus 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md deleted file mode 100644 index e754997c7a..0000000000 --- a/windows/security/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) configure via MDM: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Microsoft Defender Application Guard (MDAG) configure via MDM 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md deleted file mode 100644 index 9dc9d2c111..0000000000 --- a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md deleted file mode 100644 index fe5677e4eb..0000000000 --- a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) for Edge standalone mode: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Microsoft Defender Application Guard (MDAG) for Edge standalone mode 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md deleted file mode 100644 index 3cbb70aa69..0000000000 --- a/windows/security/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) for Microsoft Office: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Microsoft Defender Application Guard (MDAG) for Microsoft Office 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| -|:---:|:---:|:---:|:---:|:---:| -|No|No|No|No|No| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md deleted file mode 100644 index eeaf93367e..0000000000 --- a/windows/security/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender Application Guard (MDAG) public APIs: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Microsoft Defender Application Guard (MDAG) public APIs 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-for-endpoint.md b/windows/security/licensing/microsoft-defender-for-endpoint.md deleted file mode 100644 index 312be13a46..0000000000 --- a/windows/security/licensing/microsoft-defender-for-endpoint.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender for Endpoint: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Microsoft Defender for Endpoint 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|No|Yes|No|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-defender-smartscreen.md b/windows/security/licensing/microsoft-defender-smartscreen.md deleted file mode 100644 index ff95861177..0000000000 --- a/windows/security/licensing/microsoft-defender-smartscreen.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Defender SmartScreen: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Microsoft Defender SmartScreen 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-pluton-security-processor.md b/windows/security/licensing/microsoft-pluton-security-processor.md deleted file mode 100644 index d0f93bcb7c..0000000000 --- a/windows/security/licensing/microsoft-pluton-security-processor.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Pluton security processor: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Microsoft Pluton security processor 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/microsoft-vulnerable-driver-blocklist.md b/windows/security/licensing/microsoft-vulnerable-driver-blocklist.md deleted file mode 100644 index 98dd69ad55..0000000000 --- a/windows/security/licensing/microsoft-vulnerable-driver-blocklist.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Microsoft Vulnerable Driver Blocklist: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Microsoft Vulnerable Driver Blocklist 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/opportunistic-wireless-encryption-owe.md b/windows/security/licensing/opportunistic-wireless-encryption-owe.md deleted file mode 100644 index 953cb81211..0000000000 --- a/windows/security/licensing/opportunistic-wireless-encryption-owe.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Opportunistic Wireless Encryption (OWE): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Opportunistic Wireless Encryption (OWE) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/personal-data-encryption-pde.md b/windows/security/licensing/personal-data-encryption-pde.md deleted file mode 100644 index 5626b57d96..0000000000 --- a/windows/security/licensing/personal-data-encryption-pde.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Personal data encryption (PDE): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Personal data encryption (PDE) 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/privacy-resource-usage.md b/windows/security/licensing/privacy-resource-usage.md deleted file mode 100644 index 2bea08f5e1..0000000000 --- a/windows/security/licensing/privacy-resource-usage.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Privacy Resource Usage: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Privacy Resource Usage 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/privacy-transparency-and-controls.md b/windows/security/licensing/privacy-transparency-and-controls.md deleted file mode 100644 index 2fec75d8c4..0000000000 --- a/windows/security/licensing/privacy-transparency-and-controls.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Privacy Transparency and Controls: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Privacy Transparency and Controls 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/remote-wipe-autopilot-reset.md b/windows/security/licensing/remote-wipe-autopilot-reset.md deleted file mode 100644 index c68c8ad2ed..0000000000 --- a/windows/security/licensing/remote-wipe-autopilot-reset.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Remote wipe (Autopilot reset): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Remote wipe (Autopilot reset) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/secure-boot-and-trusted-boot.md b/windows/security/licensing/secure-boot-and-trusted-boot.md deleted file mode 100644 index 53b48d99cc..0000000000 --- a/windows/security/licensing/secure-boot-and-trusted-boot.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Secure Boot and Trusted Boot: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Secure Boot and Trusted Boot 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/secured-core-configuration-lock.md b/windows/security/licensing/secured-core-configuration-lock.md deleted file mode 100644 index dddf8843a4..0000000000 --- a/windows/security/licensing/secured-core-configuration-lock.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Secured-core configuration lock: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Secured-core configuration lock 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/secured-core-pc.md b/windows/security/licensing/secured-core-pc.md deleted file mode 100644 index 8fca64cb2c..0000000000 --- a/windows/security/licensing/secured-core-pc.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Secured-core PC: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Secured-core PC 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/security-baselines-with-intune.md b/windows/security/licensing/security-baselines-with-intune.md deleted file mode 100644 index 43b5f384ab..0000000000 --- a/windows/security/licensing/security-baselines-with-intune.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Security baselines with Intune: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Security baselines 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/server-message-block-direct-smb-direct.md b/windows/security/licensing/server-message-block-direct-smb-direct.md deleted file mode 100644 index 1b76968707..0000000000 --- a/windows/security/licensing/server-message-block-direct-smb-direct.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Server Message Block Direct (SMB Direct): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Server Message Block Direct (SMB Direct) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/server-message-block-smb-file-service.md b/windows/security/licensing/server-message-block-smb-file-service.md deleted file mode 100644 index f39db20a54..0000000000 --- a/windows/security/licensing/server-message-block-smb-file-service.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Server Message Block (SMB) file service: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Server Message Block (SMB) file service 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/smart-app-control.md b/windows/security/licensing/smart-app-control.md deleted file mode 100644 index cfb6c198a6..0000000000 --- a/windows/security/licensing/smart-app-control.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Smart App Control: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Smart App Control 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/smart-cards-for-windows-service.md b/windows/security/licensing/smart-cards-for-windows-service.md deleted file mode 100644 index b7a9d46f11..0000000000 --- a/windows/security/licensing/smart-cards-for-windows-service.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Smart Cards for Windows Service: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Smart Cards for Windows Service 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/tamper-protection-settings-for-mde.md b/windows/security/licensing/tamper-protection-settings-for-mde.md deleted file mode 100644 index 06a01236ec..0000000000 --- a/windows/security/licensing/tamper-protection-settings-for-mde.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Tamper protection settings for MDE: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Tamper protection settings for MDE 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/transport-layer-security-tls.md b/windows/security/licensing/transport-layer-security-tls.md deleted file mode 100644 index d0f2b933b2..0000000000 --- a/windows/security/licensing/transport-layer-security-tls.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Transport layer security (TLS): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Transport layer security (TLS) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/trusted-platform-module-tpm-20.md b/windows/security/licensing/trusted-platform-module-tpm-20.md deleted file mode 100644 index 4b5197dd74..0000000000 --- a/windows/security/licensing/trusted-platform-module-tpm-20.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Trusted Platform Module (TPM) 2.0: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Trusted Platform Module (TPM) 2.0 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/universal-print.md b/windows/security/licensing/universal-print.md deleted file mode 100644 index 46f0afd2c6..0000000000 --- a/windows/security/licensing/universal-print.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Universal Print: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Universal Print 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/user-account-control-uac.md b/windows/security/licensing/user-account-control-uac.md deleted file mode 100644 index dca8cb0915..0000000000 --- a/windows/security/licensing/user-account-control-uac.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support User Account Control (UAC): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -User Account Control (UAC) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/virtual-private-network-vpn.md b/windows/security/licensing/virtual-private-network-vpn.md deleted file mode 100644 index 61de672ee8..0000000000 --- a/windows/security/licensing/virtual-private-network-vpn.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Virtual Private Network (VPN): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Virtual Private Network (VPN) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/virtualization-based-security-vbs.md b/windows/security/licensing/virtualization-based-security-vbs.md deleted file mode 100644 index de05ea5d8e..0000000000 --- a/windows/security/licensing/virtualization-based-security-vbs.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Virtualization-based security (VBS): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Virtualization-based security (VBS) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/wifi-security.md b/windows/security/licensing/wifi-security.md deleted file mode 100644 index 9507a7618a..0000000000 --- a/windows/security/licensing/wifi-security.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support WiFi Security: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -WiFi Security 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-autopatch.md b/windows/security/licensing/windows-autopatch.md deleted file mode 100644 index f67e2b5216..0000000000 --- a/windows/security/licensing/windows-autopatch.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Autopatch: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Windows Autopatch 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|No|No| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-autopilot.md b/windows/security/licensing/windows-autopilot.md deleted file mode 100644 index 9c57cdb899..0000000000 --- a/windows/security/licensing/windows-autopilot.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Autopilot: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Autopilot 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-containers.md b/windows/security/licensing/windows-containers.md deleted file mode 100644 index 0e4df6dcb8..0000000000 --- a/windows/security/licensing/windows-containers.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows containers: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows containers 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-application-control-wdac.md b/windows/security/licensing/windows-defender-application-control-wdac.md deleted file mode 100644 index 3f81db1b61..0000000000 --- a/windows/security/licensing/windows-defender-application-control-wdac.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Defender Application Control (WDAC): - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Defender Application Control (WDAC) 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-credential-guard.md b/windows/security/licensing/windows-defender-credential-guard.md deleted file mode 100644 index d55e33af47..0000000000 --- a/windows/security/licensing/windows-defender-credential-guard.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Defender Credential Guard: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|No|Yes|No|Yes| - -Windows Defender Credential Guard 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| -|:---:|:---:|:---:|:---:|:---:| -|No|Yes|Yes|Yes|Yes| - -For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-remote-credential-guard.md b/windows/security/licensing/windows-defender-remote-credential-guard.md deleted file mode 100644 index 51feb6043b..0000000000 --- a/windows/security/licensing/windows-defender-remote-credential-guard.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Defender Remote Credential Guard: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Defender Remote Credential Guard 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-defender-system-guard.md b/windows/security/licensing/windows-defender-system-guard.md deleted file mode 100644 index b4f7577506..0000000000 --- a/windows/security/licensing/windows-defender-system-guard.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Defender System Guard: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Defender System Guard 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-firewall.md b/windows/security/licensing/windows-firewall.md deleted file mode 100644 index 12b7254fb9..0000000000 --- a/windows/security/licensing/windows-firewall.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Firewall: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Firewall 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md b/windows/security/licensing/windows-hello-for-business-enhanced-security-sign-in-ess.md deleted file mode 100644 index 0b8095a9f8..0000000000 --- a/windows/security/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/25/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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-hello-for-business.md b/windows/security/licensing/windows-hello-for-business.md deleted file mode 100644 index cb8ec101ad..0000000000 --- a/windows/security/licensing/windows-hello-for-business.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Hello for Business: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Hello 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-presence-sensing.md b/windows/security/licensing/windows-presence-sensing.md deleted file mode 100644 index 25eda4a8de..0000000000 --- a/windows/security/licensing/windows-presence-sensing.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows presence sensing: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows presence sensing 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-sandbox.md b/windows/security/licensing/windows-sandbox.md deleted file mode 100644 index 1b23c6f198..0000000000 --- a/windows/security/licensing/windows-sandbox.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Sandbox: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Sandbox 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/windows/security/licensing/windows-security-policy-settings-and-auditing.md b/windows/security/licensing/windows-security-policy-settings-and-auditing.md deleted file mode 100644 index 0fabeddb20..0000000000 --- a/windows/security/licensing/windows-security-policy-settings-and-auditing.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Windows Security policy settings and auditing: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Windows Security policy settings and auditing 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 licensing overview](/windows/whats-new/windows-licensing). From 7c7d66df4b0ce21d2a4b31adf3dc0036e89ce774 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Wed, 26 Apr 2023 17:11:53 -0400 Subject: [PATCH 23/65] updates --- windows/security/TOC.yml | 78 ++++++++-------- .../hello-for-business/hello-overview.md | 2 - windows/security/identity-protection/toc.yml | 90 ++++++++++--------- 3 files changed, 87 insertions(+), 83 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 73cbaf7b9b..c52f738f8f 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -14,43 +14,47 @@ href: introduction/security-features-licensing-requirements.md - name: Hardware security items: - - name: Overview - href: hardware.md - - name: Microsoft Pluton security processor - items: - - name: Microsoft Pluton overview - href: information-protection/pluton/microsoft-pluton-security-processor.md - - name: Microsoft Pluton as TPM - href: information-protection/pluton/pluton-as-tpm.md - - name: Trusted Platform Module - href: information-protection/tpm/trusted-platform-module-top-node.md - items: - - name: Trusted Platform Module overview - href: information-protection/tpm/trusted-platform-module-overview.md - - name: TPM fundamentals - href: information-protection/tpm/tpm-fundamentals.md - - name: How Windows uses the TPM - href: information-protection/tpm/how-windows-uses-the-tpm.md - - name: TPM Group Policy settings - href: information-protection/tpm/trusted-platform-module-services-group-policy-settings.md - - name: Back up the TPM recovery information to AD DS - href: information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md - - name: View status, clear, or troubleshoot the TPM - href: information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md - - name: Understanding PCR banks on TPM 2.0 devices - href: information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md - - name: TPM recommendations - href: information-protection/tpm/tpm-recommendations.md - - name: Hardware-based root of trust - href: threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md - - name: System Guard Secure Launch and SMM protection - href: threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md - - name: Enable virtualization-based protection of code integrity - href: threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md - - name: Kernel DMA Protection - href: information-protection/kernel-dma-protection-for-thunderbolt.md - - name: Windows secured-core devices - href: /windows-hardware/design/device-experiences/oem-highly-secure + - name: Overview + href: hardware.md + - name: Hardware root of trust + items: + - name: Windows Defender System Guard + href: threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md + - name: Trusted Platform Module + href: information-protection/tpm/trusted-platform-module-top-node.md + items: + - name: Trusted Platform Module overview + href: information-protection/tpm/trusted-platform-module-overview.md + - name: TPM fundamentals + href: information-protection/tpm/tpm-fundamentals.md + - name: How Windows uses the TPM + href: information-protection/tpm/how-windows-uses-the-tpm.md + - name: TPM Group Policy settings + href: information-protection/tpm/trusted-platform-module-services-group-policy-settings.md + - name: Back up the TPM recovery information to AD DS + href: information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md + - name: View status, clear, or troubleshoot the TPM + href: information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md + - name: Understanding PCR banks on TPM 2.0 devices + href: information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md + - name: TPM recommendations + href: information-protection/tpm/tpm-recommendations.md + - name: Microsoft Pluton security processor + items: + - name: Microsoft Pluton overview + href: information-protection/pluton/microsoft-pluton-security-processor.md + - name: Microsoft Pluton as TPM + href: information-protection/pluton/pluton-as-tpm.md + - name: Silicon assisted security + items: + - name: System Guard Secure Launch and SMM protection + href: threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md + - name: Enable virtualization-based protection of code integrity + href: threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md + - name: Kernel DMA Protection + href: information-protection/kernel-dma-protection-for-thunderbolt.md + - name: Windows secured-core devices + href: /windows-hardware/design/device-experiences/oem-highly-secure - name: Operating system security items: - name: Overview diff --git a/windows/security/identity-protection/hello-for-business/hello-overview.md b/windows/security/identity-protection/hello-for-business/hello-overview.md index 7ed1ecc9b5..84acf6b19c 100644 --- a/windows/security/identity-protection/hello-for-business/hello-overview.md +++ b/windows/security/identity-protection/hello-for-business/hello-overview.md @@ -48,8 +48,6 @@ Windows stores biometric data that is used to implement Windows Hello securely o - *Windows Hello for Business*, which is configured by group policy or mobile device management (MDM) policy, always uses key-based or certificate-based authentication. This behavior makes it more secure than *Windows Hello convenience PIN*. -[!INCLUDE [windows-hello-for-business](../../../../includes/licensing/windows-hello-for-business.md)] - ## Benefits of Windows Hello Reports of identity theft and large-scale hacking are frequent headlines. Nobody wants to be notified that their user name and password have been exposed. diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index edc7841f47..55be6bbf33 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -7,8 +7,53 @@ items: items: - name: Windows Hello for Business ⇒ href: hello-for-business/index.yml + - name: Windows presence sensing + href: https://support.microsoft.com/windows/wake-your-windows-11-pc-when-you-approach-82285c93-440c-4e15-9081-c9e38c1290bb - name: FIDO 2 security keys ⇒ href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key + - name: Smart Cards + href: smart-cards/smart-card-windows-smart-card-technical-reference.md + items: + - name: How Smart Card Sign-in Works in Windows + href: smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md + items: + - name: Smart Card Architecture + href: smart-cards/smart-card-architecture.md + - name: Certificate Requirements and Enumeration + href: smart-cards/smart-card-certificate-requirements-and-enumeration.md + - name: Smart Card and Remote Desktop Services + href: smart-cards/smart-card-and-remote-desktop-services.md + - name: Smart Cards for Windows Service + href: smart-cards/smart-card-smart-cards-for-windows-service.md + - name: Certificate Propagation Service + href: smart-cards/smart-card-certificate-propagation-service.md + - name: Smart Card Removal Policy Service + href: smart-cards/smart-card-removal-policy-service.md + - name: Smart Card Tools and Settings + href: smart-cards/smart-card-tools-and-settings.md + items: + - name: Smart Cards Debugging Information + href: smart-cards/smart-card-debugging-information.md + - name: Smart Card Group Policy and Registry Settings + href: smart-cards/smart-card-group-policy-and-registry-settings.md + - name: Smart Card Events + href: smart-cards/smart-card-events.md + - name: Virtual smart cards + href: virtual-smart-cards/virtual-smart-card-overview.md + items: + - name: Understand and evaluate virtual smart cards + href: virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md + items: + - name: Get started with virtual smart cards + href: virtual-smart-cards/virtual-smart-card-get-started.md + - name: Use virtual smart cards + href: virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md + - name: Deploy virtual smart cards + href: virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md + - name: Evaluate virtual smart card security + href: virtual-smart-cards/virtual-smart-card-evaluate-security.md + - name: Tpmvscmgr + href: virtual-smart-cards/virtual-smart-card-tpmvscmgr.md - name: Windows LAPS (Local Administrator Password Solution) ⇒ href: /windows-server/identity/laps/laps-overview - name: Enterprise Certificate Pinning @@ -52,47 +97,4 @@ items: - name: User Account Control security policy settings href: user-account-control/user-account-control-security-policy-settings.md - name: User Account Control Group Policy and registry key settings - href: user-account-control/user-account-control-group-policy-and-registry-key-settings.md - - name: Smart Cards - href: smart-cards/smart-card-windows-smart-card-technical-reference.md - items: - - name: How Smart Card Sign-in Works in Windows - href: smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md - items: - - name: Smart Card Architecture - href: smart-cards/smart-card-architecture.md - - name: Certificate Requirements and Enumeration - href: smart-cards/smart-card-certificate-requirements-and-enumeration.md - - name: Smart Card and Remote Desktop Services - href: smart-cards/smart-card-and-remote-desktop-services.md - - name: Smart Cards for Windows Service - href: smart-cards/smart-card-smart-cards-for-windows-service.md - - name: Certificate Propagation Service - href: smart-cards/smart-card-certificate-propagation-service.md - - name: Smart Card Removal Policy Service - href: smart-cards/smart-card-removal-policy-service.md - - name: Smart Card Tools and Settings - href: smart-cards/smart-card-tools-and-settings.md - items: - - name: Smart Cards Debugging Information - href: smart-cards/smart-card-debugging-information.md - - name: Smart Card Group Policy and Registry Settings - href: smart-cards/smart-card-group-policy-and-registry-settings.md - - name: Smart Card Events - href: smart-cards/smart-card-events.md - - name: Virtual smart cards - href: virtual-smart-cards/virtual-smart-card-overview.md - items: - - name: Understand and evaluate virtual smart cards - href: virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md - items: - - name: Get started with virtual smart cards - href: virtual-smart-cards/virtual-smart-card-get-started.md - - name: Use virtual smart cards - href: virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md - - name: Deploy virtual smart cards - href: virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md - - name: Evaluate virtual smart card security - href: virtual-smart-cards/virtual-smart-card-evaluate-security.md - - name: Tpmvscmgr - href: virtual-smart-cards/virtual-smart-card-tpmvscmgr.md \ No newline at end of file + href: user-account-control/user-account-control-group-policy-and-registry-key-settings.md \ No newline at end of file From 29740a45677ce0962e55412a6358ca313143a9b4 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 07:37:14 -0400 Subject: [PATCH 24/65] toc updates - hardware security --- windows/security/TOC.yml | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 567b65e81d..695f89defa 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -51,16 +51,28 @@ href: information-protection/pluton/microsoft-pluton-security-processor.md - name: Microsoft Pluton as TPM href: information-protection/pluton/pluton-as-tpm.md - - name: Silicon assisted security - items: - - name: System Guard Secure Launch and SMM protection - href: threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md - - name: Enable virtualization-based protection of code integrity - href: threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md - - name: Kernel DMA Protection - href: information-protection/kernel-dma-protection-for-thunderbolt.md - - name: Windows secured-core devices - href: /windows-hardware/design/device-experiences/oem-highly-secure + - name: Silicon assisted security + items: + - name: Virtualization-based security (VBS) + href: /windows-hardware/design/device-experiences/oem-vbs + - name: Memory integrity (HVCI) + href: threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md + - name: Memory integrity and VBS enablement + href: /windows-hardware/design/device-experiences/oem-hvci-enablement + - name: Hardware-enforced stack protection + href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 + - name: Secured-core PC + href: /windows-hardware/design/device-experiences/oem-highly-secure-11 + - name: Kernel Direct Memory Access (DMA) protection + href: information-protection/kernel-dma-protection-for-thunderbolt.md + - name: Secure Boot and Trusted Boot + href: trusted-boot.md + - name: Measured Boot + href: /windows/compatibility/measured-boot + - name: Device health attestation service + href: threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md + - name: System Guard Secure Launch + href: threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md - name: Operating system security items: - name: Overview @@ -69,8 +81,6 @@ items: - name: Secure the Windows boot process href: information-protection/secure-the-windows-10-boot-process.md - - name: Trusted Boot - href: trusted-boot.md - name: Cryptography and certificate management href: cryptography-certificate-mgmt.md - name: The Windows Security app From 7cb591447255d031da6806da00fe32ea7eb29d22 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 08:27:59 -0400 Subject: [PATCH 25/65] System security TOC --- windows/security/TOC.yml | 79 ++++------------------ windows/security/hardware-security/toc.yml | 54 +++++++++++++++ 2 files changed, 69 insertions(+), 64 deletions(-) create mode 100644 windows/security/hardware-security/toc.yml diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 695f89defa..bc8331d8e0 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -13,66 +13,7 @@ - name: Security features licensing requirements href: introduction/security-features-licensing-requirements.md - name: Hardware security - items: - - name: Overview - href: hardware.md - - name: Hardware root of trust - items: - - name: Windows Defender System Guard - href: threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md - - name: Trusted Platform Module - href: information-protection/tpm/trusted-platform-module-top-node.md - items: - - name: Trusted Platform Module overview - href: information-protection/tpm/trusted-platform-module-overview.md - - name: TPM fundamentals - href: information-protection/tpm/tpm-fundamentals.md - - name: How Windows uses the TPM - href: information-protection/tpm/how-windows-uses-the-tpm.md - - name: Manage TPM commands - href: information-protection/tpm/manage-tpm-commands.md - - name: Manager TPM Lockout - href: information-protection/tpm/manage-tpm-lockout.md - - name: Change the TPM password - href: information-protection/tpm/change-the-tpm-owner-password.md - - name: TPM Group Policy settings - href: information-protection/tpm/trusted-platform-module-services-group-policy-settings.md - - name: Back up the TPM recovery information to AD DS - href: information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md - - name: View status, clear, or troubleshoot the TPM - href: information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md - - name: Understanding PCR banks on TPM 2.0 devices - href: information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md - - name: TPM recommendations - href: information-protection/tpm/tpm-recommendations.md - - name: Microsoft Pluton security processor - items: - - name: Microsoft Pluton overview - href: information-protection/pluton/microsoft-pluton-security-processor.md - - name: Microsoft Pluton as TPM - href: information-protection/pluton/pluton-as-tpm.md - - name: Silicon assisted security - items: - - name: Virtualization-based security (VBS) - href: /windows-hardware/design/device-experiences/oem-vbs - - name: Memory integrity (HVCI) - href: threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md - - name: Memory integrity and VBS enablement - href: /windows-hardware/design/device-experiences/oem-hvci-enablement - - name: Hardware-enforced stack protection - href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 - - name: Secured-core PC - href: /windows-hardware/design/device-experiences/oem-highly-secure-11 - - name: Kernel Direct Memory Access (DMA) protection - href: information-protection/kernel-dma-protection-for-thunderbolt.md - - name: Secure Boot and Trusted Boot - href: trusted-boot.md - - name: Measured Boot - href: /windows/compatibility/measured-boot - - name: Device health attestation service - href: threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md - - name: System Guard Secure Launch - href: threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md + href: hardware-security/toc.yml - name: Operating system security items: - name: Overview @@ -81,6 +22,12 @@ items: - name: Secure the Windows boot process href: information-protection/secure-the-windows-10-boot-process.md + - name: Secure Boot and Trusted Boot + href: trusted-boot.md + - name: Measured Boot + href: /windows/compatibility/measured-boot + - name: Device health attestation service + href: threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md - name: Cryptography and certificate management href: cryptography-certificate-mgmt.md - name: The Windows Security app @@ -100,10 +47,8 @@ href: threat-protection\windows-defender-security-center\wdsc-device-performance-health.md - name: Family options href: threat-protection\windows-defender-security-center\wdsc-family-options.md - - name: Security policy settings - href: threat-protection/security-policy-settings/security-policy-settings.md - - name: Security auditing - href: threat-protection/auditing/security-auditing-overview.md + - name: Virus and threat protection + items: - name: Encryption and data protection href: encryption-data-protection.md items: @@ -207,6 +152,12 @@ href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - name: Configure S/MIME for Windows href: identity-protection/configure-s-mime.md + - name: Device management + items: + - name: Security policy settings + href: threat-protection/security-policy-settings/security-policy-settings.md + - name: Security auditing + href: threat-protection/auditing/security-auditing-overview.md - name: Network security items: - name: VPN technical guide diff --git a/windows/security/hardware-security/toc.yml b/windows/security/hardware-security/toc.yml new file mode 100644 index 0000000000..ea8046d653 --- /dev/null +++ b/windows/security/hardware-security/toc.yml @@ -0,0 +1,54 @@ +items: + - name: Overview + href: ../hardware.md + - name: Hardware root of trust + items: + - name: Windows Defender System Guard + href: ../threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md + - name: Trusted Platform Module + href: ../information-protection/tpm/trusted-platform-module-top-node.md + items: + - name: Trusted Platform Module overview + href: ../information-protection/tpm/trusted-platform-module-overview.md + - name: TPM fundamentals + href: ../information-protection/tpm/tpm-fundamentals.md + - name: How Windows uses the TPM + href: ../information-protection/tpm/how-windows-uses-the-tpm.md + - name: Manage TPM commands + href: ../information-protection/tpm/manage-tpm-commands.md + - name: Manager TPM Lockout + href: ../information-protection/tpm/manage-tpm-lockout.md + - name: Change the TPM password + href: ../information-protection/tpm/change-the-tpm-owner-password.md + - name: TPM Group Policy settings + href: ../information-protection/tpm/trusted-platform-module-services-group-policy-settings.md + - name: Back up the TPM recovery information to AD DS + href: ../information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md + - name: View status, clear, or troubleshoot the TPM + href: ../information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md + - name: Understanding PCR banks on TPM 2.0 devices + href: ../information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md + - name: TPM recommendations + href: ../information-protection/tpm/tpm-recommendations.md + - name: Microsoft Pluton security processor + items: + - name: Microsoft Pluton overview + href: ../information-protection/pluton/microsoft-pluton-security-processor.md + - name: Microsoft Pluton as TPM + href: ../information-protection/pluton/pluton-as-tpm.md + - name: Silicon assisted security + items: + - name: Virtualization-based security (VBS) + href: /windows-hardware/design/device-experiences/oem-vbs + - name: Memory integrity (HVCI) + href: ../threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md + - name: Memory integrity and VBS enablement + href: /windows-hardware/design/device-experiences/oem-hvci-enablement + - name: Hardware-enforced stack protection + href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 + - name: Secured-core PC + href: /windows-hardware/design/device-experiences/oem-highly-secure-11 + - name: Kernel Direct Memory Access (DMA) protection + href: ../information-protection/kernel-dma-protection-for-thunderbolt.md + - name: System Guard Secure Launch + href: ../threat-protection/windows-defender-system-guard/system-guard-secure-launch-and-smm-protection.md \ No newline at end of file From 1aa76bf2e87ed79b076f31a5385d61949278234d Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 10:30:19 -0400 Subject: [PATCH 26/65] nested TOCs --- windows/security/TOC.yml | 105 +++++++++--------- .../data-protection/toc.yml | 4 + .../modern-device-management/toc.yml | 4 + .../network-security/toc.yml | 4 + .../system-security/toc.yml | 28 +++++ .../operating-system-security/toc.yml | 13 +++ .../virus-and-threat-protection/toc.yml | 19 ++++ 7 files changed, 124 insertions(+), 53 deletions(-) create mode 100644 windows/security/operating-system-security/data-protection/toc.yml create mode 100644 windows/security/operating-system-security/modern-device-management/toc.yml create mode 100644 windows/security/operating-system-security/network-security/toc.yml create mode 100644 windows/security/operating-system-security/system-security/toc.yml create mode 100644 windows/security/operating-system-security/toc.yml create mode 100644 windows/security/operating-system-security/virus-and-threat-protection/toc.yml diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index bc8331d8e0..2df32bf045 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -15,6 +15,8 @@ - name: Hardware security href: hardware-security/toc.yml - name: Operating system security + href: operating-system-security/toc.yml +- name: Operating system security (OLD) items: - name: Overview href: operating-system.md @@ -49,6 +51,53 @@ href: threat-protection\windows-defender-security-center\wdsc-family-options.md - name: Virus and threat protection items: + - name: Overview + href: threat-protection/index.md + - name: Microsoft Defender Antivirus + href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows + - name: Attack surface reduction (ASR) + href: /microsoft-365/security/defender-endpoint/attack-surface-reduction + - name: Tamper protection for MDE + href: /microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection + - name: Microsoft Vulnerable Driver Blocklist + href: threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md + - name: Controlled folder access + href: /microsoft-365/security/defender-endpoint/controlled-folders + - name: Exploit protection + href: /microsoft-365/security/defender-endpoint/exploit-protection + - name: Microsoft Defender SmartScreen + href: threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md + - name: Microsoft Defender for Endpoint + href: /microsoft-365/security/defender-endpoint + - name: Network security + items: + - name: VPN technical guide + href: identity-protection/vpn/vpn-guide.md + items: + - name: VPN connection types + href: identity-protection/vpn/vpn-connection-type.md + - name: VPN routing decisions + href: identity-protection/vpn/vpn-routing.md + - name: VPN authentication options + href: identity-protection/vpn/vpn-authentication.md + - name: VPN and conditional access + href: identity-protection/vpn/vpn-conditional-access.md + - name: VPN name resolution + href: identity-protection/vpn/vpn-name-resolution.md + - name: VPN auto-triggered profile options + href: identity-protection/vpn/vpn-auto-trigger-profile.md + - name: VPN security features + href: identity-protection/vpn/vpn-security-features.md + - name: VPN profile options + href: identity-protection/vpn/vpn-profile-options.md + - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections + href: identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md + - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections + href: identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md + - name: Optimizing Office 365 traffic with the Windows VPN client + href: identity-protection/vpn/vpn-office-365-optimization.md + - name: Windows Defender Firewall + href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md - name: Encryption and data protection href: encryption-data-protection.md items: @@ -158,35 +207,6 @@ href: threat-protection/security-policy-settings/security-policy-settings.md - name: Security auditing href: threat-protection/auditing/security-auditing-overview.md - - name: Network security - items: - - name: VPN technical guide - href: identity-protection/vpn/vpn-guide.md - items: - - name: VPN connection types - href: identity-protection/vpn/vpn-connection-type.md - - name: VPN routing decisions - href: identity-protection/vpn/vpn-routing.md - - name: VPN authentication options - href: identity-protection/vpn/vpn-authentication.md - - name: VPN and conditional access - href: identity-protection/vpn/vpn-conditional-access.md - - name: VPN name resolution - href: identity-protection/vpn/vpn-name-resolution.md - - name: VPN auto-triggered profile options - href: identity-protection/vpn/vpn-auto-trigger-profile.md - - name: VPN security features - href: identity-protection/vpn/vpn-security-features.md - - name: VPN profile options - href: identity-protection/vpn/vpn-profile-options.md - - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections - href: identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md - - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections - href: identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md - - name: Optimizing Office 365 traffic with the Windows VPN client - href: identity-protection/vpn/vpn-office-365-optimization.md - - name: Windows Defender Firewall - href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md - name: Windows security baselines href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md items: @@ -196,24 +216,6 @@ href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) href: threat-protection/mbsa-removal-and-guidance.md - - name: Virus & threat protection - items: - - name: Overview - href: threat-protection/index.md - - name: Microsoft Defender Antivirus - href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows - - name: Attack surface reduction rules - href: /microsoft-365/security/defender-endpoint/attack-surface-reduction - - name: Tamper protection - href: /microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection - - name: Network protection - href: /microsoft-365/security/defender-endpoint/network-protection - - name: Controlled folder access - href: /microsoft-365/security/defender-endpoint/controlled-folders - - name: Exploit protection - href: /microsoft-365/security/defender-endpoint/exploit-protection - - name: Microsoft Defender for Endpoint - href: /microsoft-365/security/defender-endpoint - name: More Windows security items: - name: Override Process Mitigation Options to help enforce app-related security policies @@ -288,11 +290,8 @@ href: threat-protection/windows-sandbox/windows-sandbox-architecture.md - name: Windows Sandbox configuration href: threat-protection/windows-sandbox/windows-sandbox-configure-using-wsb-file.md - - name: Microsoft Defender SmartScreen overview - href: threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md - items: - - name: Enhanced Phishing Protection in Microsoft Defender SmartScreen - href: threat-protection\microsoft-defender-smartscreen\phishing-protection-microsoft-defender-smartscreen.md + - name: Enhanced Phishing Protection in Microsoft Defender SmartScreen + href: threat-protection\microsoft-defender-smartscreen\phishing-protection-microsoft-defender-smartscreen.md - name: Configure S/MIME for Windows href: identity-protection\configure-s-mime.md - name: Windows Credential Theft Mitigation Guide Abstract @@ -320,4 +319,4 @@ - name: Common Criteria Certifications href: threat-protection/windows-platform-common-criteria.md - name: Windows Privacy - href: /windows/privacy/windows-10-and-privacy-compliance + href: /windows/privacy/windows-10-and-privacy-compliance \ No newline at end of file diff --git a/windows/security/operating-system-security/data-protection/toc.yml b/windows/security/operating-system-security/data-protection/toc.yml new file mode 100644 index 0000000000..92a175b806 --- /dev/null +++ b/windows/security/operating-system-security/data-protection/toc.yml @@ -0,0 +1,4 @@ +items: + - name: Overview + href: ../hardware.md + - name: Hardware root of trust \ No newline at end of file diff --git a/windows/security/operating-system-security/modern-device-management/toc.yml b/windows/security/operating-system-security/modern-device-management/toc.yml new file mode 100644 index 0000000000..92a175b806 --- /dev/null +++ b/windows/security/operating-system-security/modern-device-management/toc.yml @@ -0,0 +1,4 @@ +items: + - name: Overview + href: ../hardware.md + - name: Hardware root of trust \ No newline at end of file diff --git a/windows/security/operating-system-security/network-security/toc.yml b/windows/security/operating-system-security/network-security/toc.yml new file mode 100644 index 0000000000..92a175b806 --- /dev/null +++ b/windows/security/operating-system-security/network-security/toc.yml @@ -0,0 +1,4 @@ +items: + - name: Overview + href: ../hardware.md + - name: Hardware root of trust \ No newline at end of file diff --git a/windows/security/operating-system-security/system-security/toc.yml b/windows/security/operating-system-security/system-security/toc.yml new file mode 100644 index 0000000000..86abf54e55 --- /dev/null +++ b/windows/security/operating-system-security/system-security/toc.yml @@ -0,0 +1,28 @@ +items: +- name: Secure the Windows boot process + href: ../../information-protection/secure-the-windows-10-boot-process.md +- name: Secure Boot and Trusted Boot + href: ../../trusted-boot.md +- name: Measured Boot + href: /windows/compatibility/measured-boot +- name: Device health attestation service + href: ../../threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md +- name: Cryptography and certificate management + href: ../../cryptography-certificate-mgmt.md +- name: The Windows Security app + href: ../../threat-protection/windows-defender-security-center/windows-defender-security-center.md + items: + - name: Virus & threat protection + href: ../../threat-protection\windows-defender-security-center\wdsc-virus-threat-protection.md + - name: Account protection + href: ../../threat-protection\windows-defender-security-center\wdsc-account-protection.md + - name: Firewall & network protection + href: ../../threat-protection\windows-defender-security-center\wdsc-firewall-network-protection.md + - name: App & browser control + href: ../../threat-protection\windows-defender-security-center\wdsc-app-browser-control.md + - name: Device security + href: ../../threat-protection\windows-defender-security-center\wdsc-device-security.md + - name: Device performance & health + href: ../../threat-protection\windows-defender-security-center\wdsc-device-performance-health.md + - name: Family options + href: ../../threat-protection\windows-defender-security-center\wdsc-family-options.md \ No newline at end of file diff --git a/windows/security/operating-system-security/toc.yml b/windows/security/operating-system-security/toc.yml new file mode 100644 index 0000000000..5f56835eeb --- /dev/null +++ b/windows/security/operating-system-security/toc.yml @@ -0,0 +1,13 @@ +items: + - name: Overview + href: ../operating-system.md + - name: System security + href: system-security/toc.yml + - name: Virus and threat protection + href: virus-and-threat-protection/toc.yml + - name: Network security + href: network-security/toc.yml + - name: Data protection + href: data-protection/toc.yml + - name: Modern device management + href: modern-device-management/toc.yml \ No newline at end of file diff --git a/windows/security/operating-system-security/virus-and-threat-protection/toc.yml b/windows/security/operating-system-security/virus-and-threat-protection/toc.yml new file mode 100644 index 0000000000..0649858634 --- /dev/null +++ b/windows/security/operating-system-security/virus-and-threat-protection/toc.yml @@ -0,0 +1,19 @@ +items: +- name: Overview + href: ../../threat-protection/index.md +- name: Microsoft Defender Antivirus + href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows +- name: Attack surface reduction (ASR) + href: /microsoft-365/security/defender-endpoint/attack-surface-reduction +- name: Tamper protection for MDE + href: /microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection +- name: Microsoft Vulnerable Driver Blocklist + href: ../../threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md +- name: Controlled folder access + href: /microsoft-365/security/defender-endpoint/controlled-folders +- name: Exploit protection + href: /microsoft-365/security/defender-endpoint/exploit-protection +- name: Microsoft Defender SmartScreen + href: ../../threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md +- name: Microsoft Defender for Endpoint + href: /microsoft-365/security/defender-endpoint \ No newline at end of file From 70ff169ce936503e16bcb52f1df4dcbdc2f04c0b Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:09:04 -0400 Subject: [PATCH 27/65] TOC updates --- windows/security/TOC.yml | 242 ++++++------------ .../toc.yml | 0 .../network-security/toc.yml | 42 ++- .../operating-system-security/toc.yml | 2 +- 4 files changed, 121 insertions(+), 165 deletions(-) rename windows/security/operating-system-security/{modern-device-management => device-management}/toc.yml (100%) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 2df32bf045..ab55949d3a 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -18,166 +18,86 @@ href: operating-system-security/toc.yml - name: Operating system security (OLD) items: - - name: Overview - href: operating-system.md - - name: System security + - name: Encryption and data protection + href: encryption-data-protection.md + items: + - name: Encrypted Hard Drive + href: information-protection/encrypted-hard-drive.md + - name: BitLocker + href: information-protection/bitlocker/bitlocker-overview.md items: - - name: Secure the Windows boot process - href: information-protection/secure-the-windows-10-boot-process.md - - name: Secure Boot and Trusted Boot - href: trusted-boot.md - - name: Measured Boot - href: /windows/compatibility/measured-boot - - name: Device health attestation service - href: threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md - - name: Cryptography and certificate management - href: cryptography-certificate-mgmt.md - - name: The Windows Security app - href: threat-protection/windows-defender-security-center/windows-defender-security-center.md + - name: Overview of BitLocker Device Encryption in Windows + href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md + - name: BitLocker frequently asked questions (FAQ) + href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml items: - - name: Virus & threat protection - href: threat-protection\windows-defender-security-center\wdsc-virus-threat-protection.md - - name: Account protection - href: threat-protection\windows-defender-security-center\wdsc-account-protection.md - - name: Firewall & network protection - href: threat-protection\windows-defender-security-center\wdsc-firewall-network-protection.md - - name: App & browser control - href: threat-protection\windows-defender-security-center\wdsc-app-browser-control.md - - name: Device security - href: threat-protection\windows-defender-security-center\wdsc-device-security.md - - name: Device performance & health - href: threat-protection\windows-defender-security-center\wdsc-device-performance-health.md - - name: Family options - href: threat-protection\windows-defender-security-center\wdsc-family-options.md - - name: Virus and threat protection - items: - - name: Overview - href: threat-protection/index.md - - name: Microsoft Defender Antivirus - href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows - - name: Attack surface reduction (ASR) - href: /microsoft-365/security/defender-endpoint/attack-surface-reduction - - name: Tamper protection for MDE - href: /microsoft-365/security/defender-endpoint/prevent-changes-to-security-settings-with-tamper-protection - - name: Microsoft Vulnerable Driver Blocklist - href: threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md - - name: Controlled folder access - href: /microsoft-365/security/defender-endpoint/controlled-folders - - name: Exploit protection - href: /microsoft-365/security/defender-endpoint/exploit-protection - - name: Microsoft Defender SmartScreen - href: threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md - - name: Microsoft Defender for Endpoint - href: /microsoft-365/security/defender-endpoint - - name: Network security - items: - - name: VPN technical guide - href: identity-protection/vpn/vpn-guide.md + - name: Overview and requirements + href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml + - name: Upgrading + href: information-protection/bitlocker/bitlocker-upgrading-faq.yml + - name: Deployment and administration + href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml + - name: Key management + href: information-protection/bitlocker/bitlocker-key-management-faq.yml + - name: BitLocker To Go + href: information-protection/bitlocker/bitlocker-to-go-faq.yml + - name: Active Directory Domain Services + href: information-protection/bitlocker/bitlocker-and-adds-faq.yml + - name: Security + href: information-protection/bitlocker/bitlocker-security-faq.yml + - name: BitLocker Network Unlock + href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml + - name: General + href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml + - name: "Prepare your organization for BitLocker: Planning and policies" + href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md + - name: BitLocker deployment comparison + href: information-protection/bitlocker/bitlocker-deployment-comparison.md + - name: BitLocker basic deployment + href: information-protection/bitlocker/bitlocker-basic-deployment.md + - name: Deploy BitLocker on Windows Server 2012 and later + href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md + - name: BitLocker management for enterprises + href: information-protection/bitlocker/bitlocker-management-for-enterprises.md + - name: Enable Network Unlock with BitLocker + href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md + - name: Use BitLocker Drive Encryption Tools to manage BitLocker + href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md + - name: Use BitLocker Recovery Password Viewer + href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md + - name: BitLocker Group Policy settings + href: information-protection/bitlocker/bitlocker-group-policy-settings.md + - name: BCD settings and BitLocker + href: information-protection/bitlocker/bcd-settings-and-bitlocker.md + - name: BitLocker Recovery Guide + href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md + - name: BitLocker Countermeasures + href: information-protection/bitlocker/bitlocker-countermeasures.md + - name: Protecting cluster shared volumes and storage area networks with BitLocker + href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md + - name: Troubleshoot BitLocker items: - - name: VPN connection types - href: identity-protection/vpn/vpn-connection-type.md - - name: VPN routing decisions - href: identity-protection/vpn/vpn-routing.md - - name: VPN authentication options - href: identity-protection/vpn/vpn-authentication.md - - name: VPN and conditional access - href: identity-protection/vpn/vpn-conditional-access.md - - name: VPN name resolution - href: identity-protection/vpn/vpn-name-resolution.md - - name: VPN auto-triggered profile options - href: identity-protection/vpn/vpn-auto-trigger-profile.md - - name: VPN security features - href: identity-protection/vpn/vpn-security-features.md - - name: VPN profile options - href: identity-protection/vpn/vpn-profile-options.md - - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections - href: identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md - - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections - href: identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md - - name: Optimizing Office 365 traffic with the Windows VPN client - href: identity-protection/vpn/vpn-office-365-optimization.md - - name: Windows Defender Firewall - href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md - - name: Encryption and data protection - href: encryption-data-protection.md - items: - - name: Encrypted Hard Drive - href: information-protection/encrypted-hard-drive.md - - name: BitLocker - href: information-protection/bitlocker/bitlocker-overview.md - items: - - name: Overview of BitLocker Device Encryption in Windows - href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md - - name: BitLocker frequently asked questions (FAQ) - href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml - items: - - name: Overview and requirements - href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml - - name: Upgrading - href: information-protection/bitlocker/bitlocker-upgrading-faq.yml - - name: Deployment and administration - href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml - - name: Key management - href: information-protection/bitlocker/bitlocker-key-management-faq.yml - - name: BitLocker To Go - href: information-protection/bitlocker/bitlocker-to-go-faq.yml - - name: Active Directory Domain Services - href: information-protection/bitlocker/bitlocker-and-adds-faq.yml - - name: Security - href: information-protection/bitlocker/bitlocker-security-faq.yml - - name: BitLocker Network Unlock - href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml - - name: General - href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml - - name: "Prepare your organization for BitLocker: Planning and policies" - href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md - - name: BitLocker deployment comparison - href: information-protection/bitlocker/bitlocker-deployment-comparison.md - - name: BitLocker basic deployment - href: information-protection/bitlocker/bitlocker-basic-deployment.md - - name: Deploy BitLocker on Windows Server 2012 and later - href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md - - name: BitLocker management for enterprises - href: information-protection/bitlocker/bitlocker-management-for-enterprises.md - - name: Enable Network Unlock with BitLocker - href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md - - name: Use BitLocker Drive Encryption Tools to manage BitLocker - href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md - - name: Use BitLocker Recovery Password Viewer - href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md - - name: BitLocker Group Policy settings - href: information-protection/bitlocker/bitlocker-group-policy-settings.md - - name: BCD settings and BitLocker - href: information-protection/bitlocker/bcd-settings-and-bitlocker.md - - name: BitLocker Recovery Guide - href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md - - name: BitLocker Countermeasures - href: information-protection/bitlocker/bitlocker-countermeasures.md - - name: Protecting cluster shared volumes and storage area networks with BitLocker - href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md - - name: Troubleshoot BitLocker - items: - - name: Troubleshoot BitLocker - href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting - - name: "BitLocker cannot encrypt a drive: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues - - name: "Enforcing BitLocker policies by using Intune: known issues" - href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues - - name: "BitLocker Network Unlock: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues - - name: "BitLocker recovery: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues - - name: "BitLocker configuration: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues - - name: Troubleshoot BitLocker and TPM issues - items: - - name: "BitLocker cannot encrypt a drive: known TPM issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues - - name: "BitLocker and TPM: other known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues - - name: Decode Measured Boot logs to track PCR changes - href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes - - name: Personal Data Encryption (PDE) + - name: Troubleshoot BitLocker + href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting + - name: "BitLocker cannot encrypt a drive: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues + - name: "Enforcing BitLocker policies by using Intune: known issues" + href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues + - name: "BitLocker Network Unlock: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues + - name: "BitLocker recovery: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues + - name: "BitLocker configuration: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues + - name: Troubleshoot BitLocker and TPM issues + items: + - name: "BitLocker cannot encrypt a drive: known TPM issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues + - name: "BitLocker and TPM: other known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues + - name: Decode Measured Boot logs to track PCR changes + href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes + - name: Personal Data Encryption (PDE) items: - name: Personal Data Encryption (PDE) overview href: information-protection/personal-data-encryption/overview-pde.md @@ -199,15 +119,15 @@ href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - - name: Configure S/MIME for Windows + - name: Configure S/MIME for Windows href: identity-protection/configure-s-mime.md - - name: Device management + - name: Device management items: - name: Security policy settings href: threat-protection/security-policy-settings/security-policy-settings.md - name: Security auditing href: threat-protection/auditing/security-auditing-overview.md - - name: Windows security baselines + - name: Windows security baselines href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md items: - name: Security Compliance Toolkit @@ -216,7 +136,7 @@ href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) href: threat-protection/mbsa-removal-and-guidance.md - - name: More Windows security + - name: More Windows security items: - name: Override Process Mitigation Options to help enforce app-related security policies href: threat-protection/override-mitigation-options-for-app-related-security-policies.md diff --git a/windows/security/operating-system-security/modern-device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml similarity index 100% rename from windows/security/operating-system-security/modern-device-management/toc.yml rename to windows/security/operating-system-security/device-management/toc.yml diff --git a/windows/security/operating-system-security/network-security/toc.yml b/windows/security/operating-system-security/network-security/toc.yml index 92a175b806..af372280a4 100644 --- a/windows/security/operating-system-security/network-security/toc.yml +++ b/windows/security/operating-system-security/network-security/toc.yml @@ -1,4 +1,40 @@ items: - - name: Overview - href: ../hardware.md - - name: Hardware root of trust \ No newline at end of file +- name: Transport layer security (TLS) + href: /windows-server/security/tls/tls-ssl-schannel-ssp-overview +- name: WiFi Security + href: https://support.microsoft.com/windows/faster-and-more-secure-wi-fi-in-windows-26177a28-38ed-1a8e-7eca-66f24dc63f09 +- name: Windows Firewall + href: ../../threat-protection/windows-firewall/windows-firewall-with-advanced-security.md +- name: Virtual Private Network (VPN) + href: ../../identity-protection/vpn/vpn-guide.md + items: + - name: VPN connection types + href: ../../identity-protection/vpn/vpn-connection-type.md + - name: VPN routing decisions + href: ../../identity-protection/vpn/vpn-routing.md + - name: VPN authentication options + href: ../../identity-protection/vpn/vpn-authentication.md + - name: VPN and conditional access + href: ../../identity-protection/vpn/vpn-conditional-access.md + - name: VPN name resolution + href: ../../identity-protection/vpn/vpn-name-resolution.md + - name: VPN auto-triggered profile options + href: ../../identity-protection/vpn/vpn-auto-trigger-profile.md + - name: VPN security features + href: ../../identity-protection/vpn/vpn-security-features.md + - name: VPN profile options + href: ../../identity-protection/vpn/vpn-profile-options.md + - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections + href: ../../identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md + - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections + href: ../../identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md + - name: Optimizing Office 365 traffic with the Windows VPN client + href: ../../identity-protection/vpn/vpn-office-365-optimization.md +- name: Always On VPN + href: /windows-server/remote/remote-access/vpn/always-on-vpn/ +- name: Direct Access + href: /windows-server/remote/remote-access/directaccess/directaccess +- name: Server Message Block (SMB) file service + href: /windows-server/storage/file-server/file-server-smb-overview +- name: Server Message Block Direct (SMB Direct) + href: /windows-server/storage/file-server/smb-direct \ No newline at end of file diff --git a/windows/security/operating-system-security/toc.yml b/windows/security/operating-system-security/toc.yml index 5f56835eeb..d5b5e71a52 100644 --- a/windows/security/operating-system-security/toc.yml +++ b/windows/security/operating-system-security/toc.yml @@ -10,4 +10,4 @@ items: - name: Data protection href: data-protection/toc.yml - name: Modern device management - href: modern-device-management/toc.yml \ No newline at end of file + href: device-management/toc.yml \ No newline at end of file From 8f6fddec3811a254482f9e3edf611d0bad87ef6e Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:11:37 -0400 Subject: [PATCH 28/65] updates --- windows/security/TOC.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index ab55949d3a..35e668eb8d 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -31,24 +31,24 @@ - name: BitLocker frequently asked questions (FAQ) href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml items: - - name: Overview and requirements - href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml - - name: Upgrading - href: information-protection/bitlocker/bitlocker-upgrading-faq.yml - - name: Deployment and administration - href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml - - name: Key management - href: information-protection/bitlocker/bitlocker-key-management-faq.yml - - name: BitLocker To Go - href: information-protection/bitlocker/bitlocker-to-go-faq.yml - - name: Active Directory Domain Services - href: information-protection/bitlocker/bitlocker-and-adds-faq.yml - - name: Security - href: information-protection/bitlocker/bitlocker-security-faq.yml - - name: BitLocker Network Unlock - href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml - - name: General - href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml + - name: Overview and requirements + href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml + - name: Upgrading + href: information-protection/bitlocker/bitlocker-upgrading-faq.yml + - name: Deployment and administration + href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml + - name: Key management + href: information-protection/bitlocker/bitlocker-key-management-faq.yml + - name: BitLocker To Go + href: information-protection/bitlocker/bitlocker-to-go-faq.yml + - name: Active Directory Domain Services + href: information-protection/bitlocker/bitlocker-and-adds-faq.yml + - name: Security + href: information-protection/bitlocker/bitlocker-security-faq.yml + - name: BitLocker Network Unlock + href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml + - name: General + href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml - name: "Prepare your organization for BitLocker: Planning and policies" href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md - name: BitLocker deployment comparison From 705752a57917276936328244f6955172490a7509 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:19:51 -0400 Subject: [PATCH 29/65] updates --- windows/security/TOC.yml | 177 ------------------ .../data-protection/toc.yml | 106 ++++++++++- .../device-management/toc.yml | 75 +++++++- 3 files changed, 175 insertions(+), 183 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 35e668eb8d..bcaab2b498 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -16,183 +16,6 @@ href: hardware-security/toc.yml - name: Operating system security href: operating-system-security/toc.yml -- name: Operating system security (OLD) - items: - - name: Encryption and data protection - href: encryption-data-protection.md - items: - - name: Encrypted Hard Drive - href: information-protection/encrypted-hard-drive.md - - name: BitLocker - href: information-protection/bitlocker/bitlocker-overview.md - items: - - name: Overview of BitLocker Device Encryption in Windows - href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md - - name: BitLocker frequently asked questions (FAQ) - href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml - items: - - name: Overview and requirements - href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml - - name: Upgrading - href: information-protection/bitlocker/bitlocker-upgrading-faq.yml - - name: Deployment and administration - href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml - - name: Key management - href: information-protection/bitlocker/bitlocker-key-management-faq.yml - - name: BitLocker To Go - href: information-protection/bitlocker/bitlocker-to-go-faq.yml - - name: Active Directory Domain Services - href: information-protection/bitlocker/bitlocker-and-adds-faq.yml - - name: Security - href: information-protection/bitlocker/bitlocker-security-faq.yml - - name: BitLocker Network Unlock - href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml - - name: General - href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml - - name: "Prepare your organization for BitLocker: Planning and policies" - href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md - - name: BitLocker deployment comparison - href: information-protection/bitlocker/bitlocker-deployment-comparison.md - - name: BitLocker basic deployment - href: information-protection/bitlocker/bitlocker-basic-deployment.md - - name: Deploy BitLocker on Windows Server 2012 and later - href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md - - name: BitLocker management for enterprises - href: information-protection/bitlocker/bitlocker-management-for-enterprises.md - - name: Enable Network Unlock with BitLocker - href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md - - name: Use BitLocker Drive Encryption Tools to manage BitLocker - href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md - - name: Use BitLocker Recovery Password Viewer - href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md - - name: BitLocker Group Policy settings - href: information-protection/bitlocker/bitlocker-group-policy-settings.md - - name: BCD settings and BitLocker - href: information-protection/bitlocker/bcd-settings-and-bitlocker.md - - name: BitLocker Recovery Guide - href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md - - name: BitLocker Countermeasures - href: information-protection/bitlocker/bitlocker-countermeasures.md - - name: Protecting cluster shared volumes and storage area networks with BitLocker - href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md - - name: Troubleshoot BitLocker - items: - - name: Troubleshoot BitLocker - href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting - - name: "BitLocker cannot encrypt a drive: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues - - name: "Enforcing BitLocker policies by using Intune: known issues" - href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues - - name: "BitLocker Network Unlock: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues - - name: "BitLocker recovery: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues - - name: "BitLocker configuration: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues - - name: Troubleshoot BitLocker and TPM issues - items: - - name: "BitLocker cannot encrypt a drive: known TPM issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues - - name: "BitLocker and TPM: other known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues - - name: Decode Measured Boot logs to track PCR changes - href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes - - name: Personal Data Encryption (PDE) - items: - - name: Personal Data Encryption (PDE) overview - href: information-protection/personal-data-encryption/overview-pde.md - - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) - href: information-protection/personal-data-encryption/faq-pde.yml - - name: Configure Personal Data Encryption (PDE) in Intune - items: - - name: Configure Personal Data Encryption (PDE) in Intune - href: information-protection/personal-data-encryption/configure-pde-in-intune.md - - name: Enable Personal Data Encryption (PDE) - href: information-protection/personal-data-encryption/pde-in-intune/intune-enable-pde.md - - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-arso.md - - name: Disable kernel-mode crash dumps and live dumps for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-memory-dumps.md - - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-wer.md - - name: Disable hibernation for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md - - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - - name: Configure S/MIME for Windows - href: identity-protection/configure-s-mime.md - - name: Device management - items: - - name: Security policy settings - href: threat-protection/security-policy-settings/security-policy-settings.md - - name: Security auditing - href: threat-protection/auditing/security-auditing-overview.md - - name: Windows security baselines - href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md - items: - - name: Security Compliance Toolkit - href: threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md - - name: Get support - href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md - - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) - href: threat-protection/mbsa-removal-and-guidance.md - - name: More Windows security - items: - - name: Override Process Mitigation Options to help enforce app-related security policies - href: threat-protection/override-mitigation-options-for-app-related-security-policies.md - - name: Use Windows Event Forwarding to help with intrusion detection - href: threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md - - name: Block untrusted fonts in an enterprise - href: threat-protection/block-untrusted-fonts-in-enterprise.md - - name: Windows Information Protection (WIP) - href: information-protection/windows-information-protection/protect-enterprise-data-using-wip.md - items: - - name: Create a WIP policy using Microsoft Intune - href: information-protection/windows-information-protection/overview-create-wip-policy.md - items: - - name: Create a WIP policy in Microsoft Intune - href: information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md - items: - - name: Deploy your WIP policy in Microsoft Intune - href: information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md - - name: Associate and deploy a VPN policy for WIP in Microsoft Intune - href: information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md - - name: Create and verify an EFS Data Recovery Agent (DRA) certificate - href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md - - name: Determine the enterprise context of an app running in WIP - href: information-protection/windows-information-protection/wip-app-enterprise-context.md - - name: Create a WIP policy using Microsoft Configuration Manager - href: information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md - items: - - name: Create and deploy a WIP policy in Configuration Manager - href: information-protection/windows-information-protection/create-wip-policy-using-configmgr.md - - name: Create and verify an EFS Data Recovery Agent (DRA) certificate - href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md - - name: Determine the enterprise context of an app running in WIP - href: information-protection/windows-information-protection/wip-app-enterprise-context.md - - name: Mandatory tasks and settings required to turn on WIP - href: information-protection/windows-information-protection/mandatory-settings-for-wip.md - - name: Testing scenarios for WIP - href: information-protection/windows-information-protection/testing-scenarios-for-wip.md - - name: Limitations while using WIP - href: information-protection/windows-information-protection/limitations-with-wip.md - - name: How to collect WIP audit event logs - href: information-protection/windows-information-protection/collect-wip-audit-event-logs.md - - name: General guidance and best practices for WIP - href: information-protection/windows-information-protection/guidance-and-best-practices-wip.md - items: - - name: Enlightened apps for use with WIP - href: information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md - - name: Unenlightened and enlightened app behavior while using WIP - href: information-protection/windows-information-protection/app-behavior-with-wip.md - - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP - href: information-protection/windows-information-protection/recommended-network-definitions-for-wip.md - - name: Using Outlook Web Access with WIP - href: information-protection/windows-information-protection/using-owa-with-wip.md - - name: Fine-tune WIP Learning - href: information-protection/windows-information-protection/wip-learning.md - - name: Disable WIP - href: information-protection/windows-information-protection/how-to-disable-wip.md - name: Application security items: - name: Overview diff --git a/windows/security/operating-system-security/data-protection/toc.yml b/windows/security/operating-system-security/data-protection/toc.yml index 92a175b806..f78505b3b7 100644 --- a/windows/security/operating-system-security/data-protection/toc.yml +++ b/windows/security/operating-system-security/data-protection/toc.yml @@ -1,4 +1,104 @@ items: - - name: Overview - href: ../hardware.md - - name: Hardware root of trust \ No newline at end of file + - name: Encryption and data protection + href: encryption-data-protection.md + items: + - name: Encrypted Hard Drive + href: information-protection/encrypted-hard-drive.md + - name: BitLocker + href: information-protection/bitlocker/bitlocker-overview.md + items: + - name: Overview of BitLocker Device Encryption in Windows + href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md + - name: BitLocker frequently asked questions (FAQ) + href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml + items: + - name: Overview and requirements + href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml + - name: Upgrading + href: information-protection/bitlocker/bitlocker-upgrading-faq.yml + - name: Deployment and administration + href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml + - name: Key management + href: information-protection/bitlocker/bitlocker-key-management-faq.yml + - name: BitLocker To Go + href: information-protection/bitlocker/bitlocker-to-go-faq.yml + - name: Active Directory Domain Services + href: information-protection/bitlocker/bitlocker-and-adds-faq.yml + - name: Security + href: information-protection/bitlocker/bitlocker-security-faq.yml + - name: BitLocker Network Unlock + href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml + - name: General + href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml + - name: "Prepare your organization for BitLocker: Planning and policies" + href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md + - name: BitLocker deployment comparison + href: information-protection/bitlocker/bitlocker-deployment-comparison.md + - name: BitLocker basic deployment + href: information-protection/bitlocker/bitlocker-basic-deployment.md + - name: Deploy BitLocker on Windows Server 2012 and later + href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md + - name: BitLocker management for enterprises + href: information-protection/bitlocker/bitlocker-management-for-enterprises.md + - name: Enable Network Unlock with BitLocker + href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md + - name: Use BitLocker Drive Encryption Tools to manage BitLocker + href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md + - name: Use BitLocker Recovery Password Viewer + href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md + - name: BitLocker Group Policy settings + href: information-protection/bitlocker/bitlocker-group-policy-settings.md + - name: BCD settings and BitLocker + href: information-protection/bitlocker/bcd-settings-and-bitlocker.md + - name: BitLocker Recovery Guide + href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md + - name: BitLocker Countermeasures + href: information-protection/bitlocker/bitlocker-countermeasures.md + - name: Protecting cluster shared volumes and storage area networks with BitLocker + href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md + - name: Troubleshoot BitLocker + items: + - name: Troubleshoot BitLocker + href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting + - name: "BitLocker cannot encrypt a drive: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues + - name: "Enforcing BitLocker policies by using Intune: known issues" + href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues + - name: "BitLocker Network Unlock: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues + - name: "BitLocker recovery: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues + - name: "BitLocker configuration: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues + - name: Troubleshoot BitLocker and TPM issues + items: + - name: "BitLocker cannot encrypt a drive: known TPM issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues + - name: "BitLocker and TPM: other known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues + - name: Decode Measured Boot logs to track PCR changes + href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes + - name: Personal Data Encryption (PDE) + items: + - name: Personal Data Encryption (PDE) overview + href: information-protection/personal-data-encryption/overview-pde.md + - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) + href: information-protection/personal-data-encryption/faq-pde.yml + - name: Configure Personal Data Encryption (PDE) in Intune + items: + - name: Configure Personal Data Encryption (PDE) in Intune + href: information-protection/personal-data-encryption/configure-pde-in-intune.md + - name: Enable Personal Data Encryption (PDE) + href: information-protection/personal-data-encryption/pde-in-intune/intune-enable-pde.md + - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE + href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-arso.md + - name: Disable kernel-mode crash dumps and live dumps for PDE + href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-memory-dumps.md + - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE + href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-wer.md + - name: Disable hibernation for PDE + href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md + - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE + href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md + - name: Configure S/MIME for Windows + href: identity-protection/configure-s-mime.md \ No newline at end of file diff --git a/windows/security/operating-system-security/device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml index 92a175b806..06f1c70e75 100644 --- a/windows/security/operating-system-security/device-management/toc.yml +++ b/windows/security/operating-system-security/device-management/toc.yml @@ -1,4 +1,73 @@ items: - - name: Overview - href: ../hardware.md - - name: Hardware root of trust \ No newline at end of file + - name: Device management + items: + - name: Security policy settings + href: threat-protection/security-policy-settings/security-policy-settings.md + - name: Security auditing + href: threat-protection/auditing/security-auditing-overview.md + - name: Windows security baselines + href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md + items: + - name: Security Compliance Toolkit + href: threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md + - name: Get support + href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md + - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) + href: threat-protection/mbsa-removal-and-guidance.md + - name: More Windows security + items: + - name: Override Process Mitigation Options to help enforce app-related security policies + href: threat-protection/override-mitigation-options-for-app-related-security-policies.md + - name: Use Windows Event Forwarding to help with intrusion detection + href: threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md + - name: Block untrusted fonts in an enterprise + href: threat-protection/block-untrusted-fonts-in-enterprise.md + - name: Windows Information Protection (WIP) + href: information-protection/windows-information-protection/protect-enterprise-data-using-wip.md + items: + - name: Create a WIP policy using Microsoft Intune + href: information-protection/windows-information-protection/overview-create-wip-policy.md + items: + - name: Create a WIP policy in Microsoft Intune + href: information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md + items: + - name: Deploy your WIP policy in Microsoft Intune + href: information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md + - name: Associate and deploy a VPN policy for WIP in Microsoft Intune + href: information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md + - name: Create and verify an EFS Data Recovery Agent (DRA) certificate + href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md + - name: Determine the enterprise context of an app running in WIP + href: information-protection/windows-information-protection/wip-app-enterprise-context.md + - name: Create a WIP policy using Microsoft Configuration Manager + href: information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md + items: + - name: Create and deploy a WIP policy in Configuration Manager + href: information-protection/windows-information-protection/create-wip-policy-using-configmgr.md + - name: Create and verify an EFS Data Recovery Agent (DRA) certificate + href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md + - name: Determine the enterprise context of an app running in WIP + href: information-protection/windows-information-protection/wip-app-enterprise-context.md + - name: Mandatory tasks and settings required to turn on WIP + href: information-protection/windows-information-protection/mandatory-settings-for-wip.md + - name: Testing scenarios for WIP + href: information-protection/windows-information-protection/testing-scenarios-for-wip.md + - name: Limitations while using WIP + href: information-protection/windows-information-protection/limitations-with-wip.md + - name: How to collect WIP audit event logs + href: information-protection/windows-information-protection/collect-wip-audit-event-logs.md + - name: General guidance and best practices for WIP + href: information-protection/windows-information-protection/guidance-and-best-practices-wip.md + items: + - name: Enlightened apps for use with WIP + href: information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md + - name: Unenlightened and enlightened app behavior while using WIP + href: information-protection/windows-information-protection/app-behavior-with-wip.md + - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP + href: information-protection/windows-information-protection/recommended-network-definitions-for-wip.md + - name: Using Outlook Web Access with WIP + href: information-protection/windows-information-protection/using-owa-with-wip.md + - name: Fine-tune WIP Learning + href: information-protection/windows-information-protection/wip-learning.md + - name: Disable WIP + href: information-protection/windows-information-protection/how-to-disable-wip.md \ No newline at end of file From 05fb8141a86cfd16b36706b1944743cfcd1dd64a Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:26:29 -0400 Subject: [PATCH 30/65] updates --- .../data-protection/toc.yml | 198 +++++++++--------- .../device-management/toc.yml | 140 ++++++------- 2 files changed, 169 insertions(+), 169 deletions(-) diff --git a/windows/security/operating-system-security/data-protection/toc.yml b/windows/security/operating-system-security/data-protection/toc.yml index f78505b3b7..8d511a2659 100644 --- a/windows/security/operating-system-security/data-protection/toc.yml +++ b/windows/security/operating-system-security/data-protection/toc.yml @@ -1,104 +1,104 @@ items: - - name: Encryption and data protection - href: encryption-data-protection.md +- name: Encryption and data protection + href: ../../encryption-data-protection.md + items: + - name: Encrypted Hard Drive + href: ../../information-protection/encrypted-hard-drive.md + - name: BitLocker + href: ../../information-protection/bitlocker/bitlocker-overview.md items: - - name: Encrypted Hard Drive - href: information-protection/encrypted-hard-drive.md - - name: BitLocker - href: information-protection/bitlocker/bitlocker-overview.md + - name: Overview of BitLocker Device Encryption in Windows + href: ../../information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md + - name: BitLocker frequently asked questions (FAQ) + href: ../../information-protection/bitlocker/bitlocker-frequently-asked-questions.yml items: - - name: Overview of BitLocker Device Encryption in Windows - href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md - - name: BitLocker frequently asked questions (FAQ) - href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml - items: - - name: Overview and requirements - href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml - - name: Upgrading - href: information-protection/bitlocker/bitlocker-upgrading-faq.yml - - name: Deployment and administration - href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml - - name: Key management - href: information-protection/bitlocker/bitlocker-key-management-faq.yml - - name: BitLocker To Go - href: information-protection/bitlocker/bitlocker-to-go-faq.yml - - name: Active Directory Domain Services - href: information-protection/bitlocker/bitlocker-and-adds-faq.yml - - name: Security - href: information-protection/bitlocker/bitlocker-security-faq.yml - - name: BitLocker Network Unlock - href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml - - name: General - href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml - - name: "Prepare your organization for BitLocker: Planning and policies" - href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md - - name: BitLocker deployment comparison - href: information-protection/bitlocker/bitlocker-deployment-comparison.md - - name: BitLocker basic deployment - href: information-protection/bitlocker/bitlocker-basic-deployment.md - - name: Deploy BitLocker on Windows Server 2012 and later - href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md - - name: BitLocker management for enterprises - href: information-protection/bitlocker/bitlocker-management-for-enterprises.md - - name: Enable Network Unlock with BitLocker - href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md - - name: Use BitLocker Drive Encryption Tools to manage BitLocker - href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md - - name: Use BitLocker Recovery Password Viewer - href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md - - name: BitLocker Group Policy settings - href: information-protection/bitlocker/bitlocker-group-policy-settings.md - - name: BCD settings and BitLocker - href: information-protection/bitlocker/bcd-settings-and-bitlocker.md - - name: BitLocker Recovery Guide - href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md - - name: BitLocker Countermeasures - href: information-protection/bitlocker/bitlocker-countermeasures.md - - name: Protecting cluster shared volumes and storage area networks with BitLocker - href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md - - name: Troubleshoot BitLocker - items: - - name: Troubleshoot BitLocker - href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting - - name: "BitLocker cannot encrypt a drive: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues - - name: "Enforcing BitLocker policies by using Intune: known issues" - href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues - - name: "BitLocker Network Unlock: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues - - name: "BitLocker recovery: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues - - name: "BitLocker configuration: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues - - name: Troubleshoot BitLocker and TPM issues - items: - - name: "BitLocker cannot encrypt a drive: known TPM issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues - - name: "BitLocker and TPM: other known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues - - name: Decode Measured Boot logs to track PCR changes - href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes - - name: Personal Data Encryption (PDE) + - name: Overview and requirements + href: ../../information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml + - name: Upgrading + href: ../../information-protection/bitlocker/bitlocker-upgrading-faq.yml + - name: Deployment and administration + href: ../../information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml + - name: Key management + href: ../../information-protection/bitlocker/bitlocker-key-management-faq.yml + - name: BitLocker To Go + href: ../../information-protection/bitlocker/bitlocker-to-go-faq.yml + - name: Active Directory Domain Services + href: ../../information-protection/bitlocker/bitlocker-and-adds-faq.yml + - name: Security + href: ../../information-protection/bitlocker/bitlocker-security-faq.yml + - name: BitLocker Network Unlock + href: ../../information-protection/bitlocker/bitlocker-network-unlock-faq.yml + - name: General + href: ../../information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml + - name: "Prepare your organization for BitLocker: Planning and policies" + href: ../../information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md + - name: BitLocker deployment comparison + href: ../../information-protection/bitlocker/bitlocker-deployment-comparison.md + - name: BitLocker basic deployment + href: ../../information-protection/bitlocker/bitlocker-basic-deployment.md + - name: Deploy BitLocker on Windows Server 2012 and later + href: ../../information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md + - name: BitLocker management for enterprises + href: ../../information-protection/bitlocker/bitlocker-management-for-enterprises.md + - name: Enable Network Unlock with BitLocker + href: ../../information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md + - name: Use BitLocker Drive Encryption Tools to manage BitLocker + href: ../../information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md + - name: Use BitLocker Recovery Password Viewer + href: ../../information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md + - name: BitLocker Group Policy settings + href: ../../information-protection/bitlocker/bitlocker-group-policy-settings.md + - name: BCD settings and BitLocker + href: ../../information-protection/bitlocker/bcd-settings-and-bitlocker.md + - name: BitLocker Recovery Guide + href: ../../information-protection/bitlocker/bitlocker-recovery-guide-plan.md + - name: BitLocker Countermeasures + href: ../../information-protection/bitlocker/bitlocker-countermeasures.md + - name: Protecting cluster shared volumes and storage area networks with BitLocker + href: ../../information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md + - name: Troubleshoot BitLocker + items: + - name: Troubleshoot BitLocker + href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting + - name: "BitLocker cannot encrypt a drive: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues + - name: "Enforcing BitLocker policies by using Intune: known issues" + href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues + - name: "BitLocker Network Unlock: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues + - name: "BitLocker recovery: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues + - name: "BitLocker configuration: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues + - name: Troubleshoot BitLocker and TPM issues + items: + - name: "BitLocker cannot encrypt a drive: known TPM issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues + - name: "BitLocker and TPM: other known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues + - name: Decode Measured Boot logs to track PCR changes + href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes + - name: Personal Data Encryption (PDE) + items: + - name: Personal Data Encryption (PDE) overview + href: ../../information-protection/personal-data-encryption/overview-pde.md + - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) + href: ../../information-protection/personal-data-encryption/faq-pde.yml + - name: Configure Personal Data Encryption (PDE) in Intune items: - - name: Personal Data Encryption (PDE) overview - href: information-protection/personal-data-encryption/overview-pde.md - - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) - href: information-protection/personal-data-encryption/faq-pde.yml - name: Configure Personal Data Encryption (PDE) in Intune - items: - - name: Configure Personal Data Encryption (PDE) in Intune - href: information-protection/personal-data-encryption/configure-pde-in-intune.md - - name: Enable Personal Data Encryption (PDE) - href: information-protection/personal-data-encryption/pde-in-intune/intune-enable-pde.md - - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-arso.md - - name: Disable kernel-mode crash dumps and live dumps for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-memory-dumps.md - - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-wer.md - - name: Disable hibernation for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md - - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE - href: information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - - name: Configure S/MIME for Windows - href: identity-protection/configure-s-mime.md \ No newline at end of file + href: ../../information-protection/personal-data-encryption/configure-pde-in-intune.md + - name: Enable Personal Data Encryption (PDE) + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-enable-pde.md + - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-arso.md + - name: Disable kernel-mode crash dumps and live dumps for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-memory-dumps.md + - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-wer.md + - name: Disable hibernation for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md + - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md + - name: Configure S/MIME for Windows + href: ../../identity-protection/configure-s-mime.md \ No newline at end of file diff --git a/windows/security/operating-system-security/device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml index 06f1c70e75..154075b5f4 100644 --- a/windows/security/operating-system-security/device-management/toc.yml +++ b/windows/security/operating-system-security/device-management/toc.yml @@ -1,73 +1,73 @@ items: - - name: Device management +- name: Device management + items: + - name: Security policy settings + href: ../../threat-protection/security-policy-settings/security-policy-settings.md + - name: Security auditing + href: ../../threat-protection/auditing/security-auditing-overview.md +- name: Windows security baselines + href: ../../threat-protection/windows-security-configuration-framework/windows-security-baselines.md + items: + - name: Security Compliance Toolkit + href: ../../threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md + - name: Get support + href: ../../threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md + - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) + href: ../../threat-protection/mbsa-removal-and-guidance.md +- name: More Windows security + items: + - name: Override Process Mitigation Options to help enforce app-related security policies + href: ../../threat-protection/override-mitigation-options-for-app-related-security-policies.md + - name: Use Windows Event Forwarding to help with intrusion detection + href: ../../threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md + - name: Block untrusted fonts in an enterprise + href: ../../threat-protection/block-untrusted-fonts-in-enterprise.md + - name: Windows Information Protection (WIP) + href: ../../information-protection/windows-information-protection/protect-enterprise-data-using-wip.md items: - - name: Security policy settings - href: threat-protection/security-policy-settings/security-policy-settings.md - - name: Security auditing - href: threat-protection/auditing/security-auditing-overview.md - - name: Windows security baselines - href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md - items: - - name: Security Compliance Toolkit - href: threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md - - name: Get support - href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md - - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) - href: threat-protection/mbsa-removal-and-guidance.md - - name: More Windows security - items: - - name: Override Process Mitigation Options to help enforce app-related security policies - href: threat-protection/override-mitigation-options-for-app-related-security-policies.md - - name: Use Windows Event Forwarding to help with intrusion detection - href: threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md - - name: Block untrusted fonts in an enterprise - href: threat-protection/block-untrusted-fonts-in-enterprise.md - - name: Windows Information Protection (WIP) - href: information-protection/windows-information-protection/protect-enterprise-data-using-wip.md - items: - - name: Create a WIP policy using Microsoft Intune - href: information-protection/windows-information-protection/overview-create-wip-policy.md + - name: Create a WIP policy using Microsoft Intune + href: ../../information-protection/windows-information-protection/overview-create-wip-policy.md + items: + - name: Create a WIP policy in Microsoft Intune + href: ../../information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md items: - - name: Create a WIP policy in Microsoft Intune - href: information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md - items: - - name: Deploy your WIP policy in Microsoft Intune - href: information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md - - name: Associate and deploy a VPN policy for WIP in Microsoft Intune - href: information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md - - name: Create and verify an EFS Data Recovery Agent (DRA) certificate - href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md - - name: Determine the enterprise context of an app running in WIP - href: information-protection/windows-information-protection/wip-app-enterprise-context.md - - name: Create a WIP policy using Microsoft Configuration Manager - href: information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md - items: - - name: Create and deploy a WIP policy in Configuration Manager - href: information-protection/windows-information-protection/create-wip-policy-using-configmgr.md - - name: Create and verify an EFS Data Recovery Agent (DRA) certificate - href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md - - name: Determine the enterprise context of an app running in WIP - href: information-protection/windows-information-protection/wip-app-enterprise-context.md - - name: Mandatory tasks and settings required to turn on WIP - href: information-protection/windows-information-protection/mandatory-settings-for-wip.md - - name: Testing scenarios for WIP - href: information-protection/windows-information-protection/testing-scenarios-for-wip.md - - name: Limitations while using WIP - href: information-protection/windows-information-protection/limitations-with-wip.md - - name: How to collect WIP audit event logs - href: information-protection/windows-information-protection/collect-wip-audit-event-logs.md - - name: General guidance and best practices for WIP - href: information-protection/windows-information-protection/guidance-and-best-practices-wip.md - items: - - name: Enlightened apps for use with WIP - href: information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md - - name: Unenlightened and enlightened app behavior while using WIP - href: information-protection/windows-information-protection/app-behavior-with-wip.md - - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP - href: information-protection/windows-information-protection/recommended-network-definitions-for-wip.md - - name: Using Outlook Web Access with WIP - href: information-protection/windows-information-protection/using-owa-with-wip.md - - name: Fine-tune WIP Learning - href: information-protection/windows-information-protection/wip-learning.md - - name: Disable WIP - href: information-protection/windows-information-protection/how-to-disable-wip.md \ No newline at end of file + - name: Deploy your WIP policy in Microsoft Intune + href: ../../information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md + - name: Associate and deploy a VPN policy for WIP in Microsoft Intune + href: ../../information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md + - name: Create and verify an EFS Data Recovery Agent (DRA) certificate + href: ../../information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md + - name: Determine the enterprise context of an app running in WIP + href: ../../information-protection/windows-information-protection/wip-app-enterprise-context.md + - name: Create a WIP policy using Microsoft Configuration Manager + href: ../../information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md + items: + - name: Create and deploy a WIP policy in Configuration Manager + href: ../../information-protection/windows-information-protection/create-wip-policy-using-configmgr.md + - name: Create and verify an EFS Data Recovery Agent (DRA) certificate + href: ../../information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md + - name: Determine the enterprise context of an app running in WIP + href: ../../information-protection/windows-information-protection/wip-app-enterprise-context.md + - name: Mandatory tasks and settings required to turn on WIP + href: ../../information-protection/windows-information-protection/mandatory-settings-for-wip.md + - name: Testing scenarios for WIP + href: ../../information-protection/windows-information-protection/testing-scenarios-for-wip.md + - name: Limitations while using WIP + href: ../../information-protection/windows-information-protection/limitations-with-wip.md + - name: How to collect WIP audit event logs + href: ../../information-protection/windows-information-protection/collect-wip-audit-event-logs.md + - name: General guidance and best practices for WIP + href: ../../information-protection/windows-information-protection/guidance-and-best-practices-wip.md + items: + - name: Enlightened apps for use with WIP + href: ../../information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md + - name: Unenlightened and enlightened app behavior while using WIP + href: ../../information-protection/windows-information-protection/app-behavior-with-wip.md + - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP + href: ../../information-protection/windows-information-protection/recommended-network-definitions-for-wip.md + - name: Using Outlook Web Access with WIP + href: ../../information-protection/windows-information-protection/using-owa-with-wip.md + - name: Fine-tune WIP Learning + href: ../../information-protection/windows-information-protection/wip-learning.md + - name: Disable WIP + href: ../../information-protection/windows-information-protection/how-to-disable-wip.md \ No newline at end of file From 3a67ba0fb821c075843d081d7c1c6f893cbba944 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:45:28 -0400 Subject: [PATCH 31/65] Data protection TOC --- .../data-protection/toc.yml | 191 +++++++++--------- .../operating-system-security/toc.yml | 24 +-- 2 files changed, 107 insertions(+), 108 deletions(-) diff --git a/windows/security/operating-system-security/data-protection/toc.yml b/windows/security/operating-system-security/data-protection/toc.yml index 8d511a2659..bd47960568 100644 --- a/windows/security/operating-system-security/data-protection/toc.yml +++ b/windows/security/operating-system-security/data-protection/toc.yml @@ -1,104 +1,103 @@ items: -- name: Encryption and data protection +- name: Overview href: ../../encryption-data-protection.md +- name: BitLocker + href: ../../information-protection/bitlocker/bitlocker-overview.md items: - - name: Encrypted Hard Drive - href: ../../information-protection/encrypted-hard-drive.md - - name: BitLocker - href: ../../information-protection/bitlocker/bitlocker-overview.md + - name: Overview of BitLocker Device Encryption in Windows + href: ../../information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md + - name: BitLocker frequently asked questions (FAQ) + href: ../../information-protection/bitlocker/bitlocker-frequently-asked-questions.yml items: - - name: Overview of BitLocker Device Encryption in Windows - href: ../../information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md - - name: BitLocker frequently asked questions (FAQ) - href: ../../information-protection/bitlocker/bitlocker-frequently-asked-questions.yml - items: - - name: Overview and requirements - href: ../../information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml - - name: Upgrading - href: ../../information-protection/bitlocker/bitlocker-upgrading-faq.yml - - name: Deployment and administration - href: ../../information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml - - name: Key management - href: ../../information-protection/bitlocker/bitlocker-key-management-faq.yml - - name: BitLocker To Go - href: ../../information-protection/bitlocker/bitlocker-to-go-faq.yml - - name: Active Directory Domain Services - href: ../../information-protection/bitlocker/bitlocker-and-adds-faq.yml - - name: Security - href: ../../information-protection/bitlocker/bitlocker-security-faq.yml - - name: BitLocker Network Unlock - href: ../../information-protection/bitlocker/bitlocker-network-unlock-faq.yml - - name: General - href: ../../information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml - - name: "Prepare your organization for BitLocker: Planning and policies" - href: ../../information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md - - name: BitLocker deployment comparison - href: ../../information-protection/bitlocker/bitlocker-deployment-comparison.md - - name: BitLocker basic deployment - href: ../../information-protection/bitlocker/bitlocker-basic-deployment.md - - name: Deploy BitLocker on Windows Server 2012 and later - href: ../../information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md - - name: BitLocker management for enterprises - href: ../../information-protection/bitlocker/bitlocker-management-for-enterprises.md - - name: Enable Network Unlock with BitLocker - href: ../../information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md - - name: Use BitLocker Drive Encryption Tools to manage BitLocker - href: ../../information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md - - name: Use BitLocker Recovery Password Viewer - href: ../../information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md - - name: BitLocker Group Policy settings - href: ../../information-protection/bitlocker/bitlocker-group-policy-settings.md - - name: BCD settings and BitLocker - href: ../../information-protection/bitlocker/bcd-settings-and-bitlocker.md - - name: BitLocker Recovery Guide - href: ../../information-protection/bitlocker/bitlocker-recovery-guide-plan.md - - name: BitLocker Countermeasures - href: ../../information-protection/bitlocker/bitlocker-countermeasures.md - - name: Protecting cluster shared volumes and storage area networks with BitLocker - href: ../../information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md - - name: Troubleshoot BitLocker - items: - - name: Troubleshoot BitLocker - href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting - - name: "BitLocker cannot encrypt a drive: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues - - name: "Enforcing BitLocker policies by using Intune: known issues" - href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues - - name: "BitLocker Network Unlock: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues - - name: "BitLocker recovery: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues - - name: "BitLocker configuration: known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues - - name: Troubleshoot BitLocker and TPM issues - items: - - name: "BitLocker cannot encrypt a drive: known TPM issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues - - name: "BitLocker and TPM: other known issues" - href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues - - name: Decode Measured Boot logs to track PCR changes - href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes - - name: Personal Data Encryption (PDE) + - name: Overview and requirements + href: ../../information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml + - name: Upgrading + href: ../../information-protection/bitlocker/bitlocker-upgrading-faq.yml + - name: Deployment and administration + href: ../../information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml + - name: Key management + href: ../../information-protection/bitlocker/bitlocker-key-management-faq.yml + - name: BitLocker To Go + href: ../../information-protection/bitlocker/bitlocker-to-go-faq.yml + - name: Active Directory Domain Services + href: ../../information-protection/bitlocker/bitlocker-and-adds-faq.yml + - name: Security + href: ../../information-protection/bitlocker/bitlocker-security-faq.yml + - name: BitLocker Network Unlock + href: ../../information-protection/bitlocker/bitlocker-network-unlock-faq.yml + - name: General + href: ../../information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml + - name: "Prepare your organization for BitLocker: Planning and policies" + href: ../../information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md + - name: BitLocker deployment comparison + href: ../../information-protection/bitlocker/bitlocker-deployment-comparison.md + - name: BitLocker basic deployment + href: ../../information-protection/bitlocker/bitlocker-basic-deployment.md + - name: Deploy BitLocker on Windows Server 2012 and later + href: ../../information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md + - name: BitLocker management for enterprises + href: ../../information-protection/bitlocker/bitlocker-management-for-enterprises.md + - name: Enable Network Unlock with BitLocker + href: ../../information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md + - name: Use BitLocker Drive Encryption Tools to manage BitLocker + href: ../../information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md + - name: Use BitLocker Recovery Password Viewer + href: ../../information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md + - name: BitLocker Group Policy settings + href: ../../information-protection/bitlocker/bitlocker-group-policy-settings.md + - name: BCD settings and BitLocker + href: ../../information-protection/bitlocker/bcd-settings-and-bitlocker.md + - name: BitLocker Recovery Guide + href: ../../information-protection/bitlocker/bitlocker-recovery-guide-plan.md + - name: BitLocker Countermeasures + href: ../../information-protection/bitlocker/bitlocker-countermeasures.md + - name: Protecting cluster shared volumes and storage area networks with BitLocker + href: ../../information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md + - name: Troubleshoot BitLocker + items: + - name: Troubleshoot BitLocker + href: /troubleshoot/windows-client/windows-security/bitlocker-issues-troubleshooting + - name: "BitLocker cannot encrypt a drive: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-issues + - name: "Enforcing BitLocker policies by using Intune: known issues" + href: /troubleshoot/windows-client/windows-security/enforcing-bitlocker-policies-by-using-intune-known-issues + - name: "BitLocker Network Unlock: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-network-unlock-known-issues + - name: "BitLocker recovery: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-recovery-known-issues + - name: "BitLocker configuration: known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-configuration-known-issues + - name: Troubleshoot BitLocker and TPM issues + items: + - name: "BitLocker cannot encrypt a drive: known TPM issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-cannot-encrypt-a-drive-known-tpm-issues + - name: "BitLocker and TPM: other known issues" + href: /troubleshoot/windows-client/windows-security/bitlocker-and-tpm-other-known-issues + - name: Decode Measured Boot logs to track PCR changes + href: /troubleshoot/windows-client/windows-security/decode-measured-boot-logs-to-track-pcr-changes +- name: Encrypted Hard Drive + href: ../../information-protection/encrypted-hard-drive.md +- name: Personal Data Encryption (PDE) + items: + - name: Personal Data Encryption (PDE) overview + href: ../../information-protection/personal-data-encryption/overview-pde.md + - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) + href: ../../information-protection/personal-data-encryption/faq-pde.yml + - name: Configure Personal Data Encryption (PDE) in Intune items: - - name: Personal Data Encryption (PDE) overview - href: ../../information-protection/personal-data-encryption/overview-pde.md - - name: Personal Data Encryption (PDE) frequently asked questions (FAQ) - href: ../../information-protection/personal-data-encryption/faq-pde.yml - name: Configure Personal Data Encryption (PDE) in Intune - items: - - name: Configure Personal Data Encryption (PDE) in Intune - href: ../../information-protection/personal-data-encryption/configure-pde-in-intune.md - - name: Enable Personal Data Encryption (PDE) - href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-enable-pde.md - - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE - href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-arso.md - - name: Disable kernel-mode crash dumps and live dumps for PDE - href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-memory-dumps.md - - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE - href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-wer.md - - name: Disable hibernation for PDE - href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md - - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE - href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md + href: ../../information-protection/personal-data-encryption/configure-pde-in-intune.md + - name: Enable Personal Data Encryption (PDE) + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-enable-pde.md + - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-arso.md + - name: Disable kernel-mode crash dumps and live dumps for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-memory-dumps.md + - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-wer.md + - name: Disable hibernation for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-hibernation.md + - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE + href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - name: Configure S/MIME for Windows href: ../../identity-protection/configure-s-mime.md \ No newline at end of file diff --git a/windows/security/operating-system-security/toc.yml b/windows/security/operating-system-security/toc.yml index d5b5e71a52..e89ccbd235 100644 --- a/windows/security/operating-system-security/toc.yml +++ b/windows/security/operating-system-security/toc.yml @@ -1,13 +1,13 @@ items: - - name: Overview - href: ../operating-system.md - - name: System security - href: system-security/toc.yml - - name: Virus and threat protection - href: virus-and-threat-protection/toc.yml - - name: Network security - href: network-security/toc.yml - - name: Data protection - href: data-protection/toc.yml - - name: Modern device management - href: device-management/toc.yml \ No newline at end of file +- name: Overview + href: ../operating-system.md +- name: System security + href: system-security/toc.yml +- name: Virus and threat protection + href: virus-and-threat-protection/toc.yml +- name: Network security + href: network-security/toc.yml +- name: Data protection + href: data-protection/toc.yml +- name: Modern device management + href: device-management/toc.yml \ No newline at end of file From c07cf27c7145d5289dcf89f935dfe03876471816 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:19:41 -0400 Subject: [PATCH 32/65] TOC update --- windows/security/TOC.yml | 53 +++-------------- .../application-control/toc.yml | 25 ++++++++ .../application-isolation/toc.yml | 12 ++++ windows/security/application-security/toc.yml | 8 +++ windows/security/cloud-security/toc.yml | 18 ++++++ windows/security/hardware-security/toc.yml | 4 +- windows/security/identity-protection/toc.yml | 56 +++++++++--------- .../data-protection/toc.yml | 51 ++++++++++++++++- .../device-management/toc.yml | 57 ++----------------- .../virus-and-threat-protection/toc.yml | 2 + .../certification/toc.yml | 5 ++ windows/security/security-foundations/toc.yml | 7 +++ 12 files changed, 171 insertions(+), 127 deletions(-) create mode 100644 windows/security/application-security/application-control/toc.yml create mode 100644 windows/security/application-security/application-isolation/toc.yml create mode 100644 windows/security/application-security/toc.yml create mode 100644 windows/security/cloud-security/toc.yml create mode 100644 windows/security/security-foundations/certification/toc.yml create mode 100644 windows/security/security-foundations/toc.yml diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index bcaab2b498..1a28b4a916 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -17,49 +17,14 @@ - name: Operating system security href: operating-system-security/toc.yml - name: Application security - items: - - name: Overview - href: apps.md - - name: Windows Defender Application Control and virtualization-based protection of code integrity - href: threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md - - name: Windows Defender Application Control - href: threat-protection\windows-defender-application-control\windows-defender-application-control.md - - name: Microsoft Defender Application Guard - href: threat-protection\microsoft-defender-application-guard\md-app-guard-overview.md - - name: Windows Sandbox - href: threat-protection/windows-sandbox/windows-sandbox-overview.md - items: - - name: Windows Sandbox architecture - href: threat-protection/windows-sandbox/windows-sandbox-architecture.md - - name: Windows Sandbox configuration - href: threat-protection/windows-sandbox/windows-sandbox-configure-using-wsb-file.md - - name: Enhanced Phishing Protection in Microsoft Defender SmartScreen - href: threat-protection\microsoft-defender-smartscreen\phishing-protection-microsoft-defender-smartscreen.md - - name: Configure S/MIME for Windows - href: identity-protection\configure-s-mime.md - - name: Windows Credential Theft Mitigation Guide Abstract - href: identity-protection\windows-credential-theft-mitigation-guide-abstract.md -- name: User security and secured identity + href: application-security/toc.yml +- name: Identity protection href: identity-protection/toc.yml -- name: Cloud services - items: - - name: Overview - href: cloud.md - - name: Mobile device management - href: /windows/client-management/mdm/ - - name: Windows 365 Cloud PCs - href: /windows-365/overview - - name: Azure Virtual Desktop - href: /azure/virtual-desktop/ -- name: Security foundations - items: - - name: Overview - href: security-foundations.md - - name: Microsoft Security Development Lifecycle - href: threat-protection/msft-security-dev-lifecycle.md - - name: FIPS 140-2 Validation - href: threat-protection/fips-140-validation.md - - name: Common Criteria Certifications - href: threat-protection/windows-platform-common-criteria.md - name: Windows Privacy - href: /windows/privacy/windows-10-and-privacy-compliance \ No newline at end of file + href: /windows/privacy/windows-10-and-privacy-compliance +- name: Security foundations + href: security-foundations/toc.yml +- name: Cloud services + href: cloud-services/toc.yml +- name: Security policy settings + href: /windows/security/threat-protection/security-policy-settings \ No newline at end of file diff --git a/windows/security/application-security/application-control/toc.yml b/windows/security/application-security/application-control/toc.yml new file mode 100644 index 0000000000..05774f9405 --- /dev/null +++ b/windows/security/application-security/application-control/toc.yml @@ -0,0 +1,25 @@ +items: +- name: User Account Control (UAC) + items: + - name: Overview + href: ../../identity-protection/user-account-control/user-account-control-overview.md + - name: How User Account Control works + href: ../../identity-protection/user-account-control/how-user-account-control-works.md + - name: User Account Control security policy settings + href: ../../identity-protection/user-account-control/user-account-control-security-policy-settings.md + - name: User Account Control Group Policy and registry key settings + href: ../../identity-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md + - name: Windows Defender Application Control and virtualization-based protection of code integrity + href: ../../threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md + - name: Windows Defender Application Control + href: ../../threat-protection/windows-defender-application-control/windows-defender-application-control.md + - name: Smart App Control + href: ../../threat-protection/windows-defender-application-control/windows-defender-application-control.md + - name: Microsoft Defender Application Guard (MDAG) for Edge standalone mode + href: ../../threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md + - name: Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management + href: /deployedge/microsoft-edge-security-windows-defender-application-guard + - name: Microsoft Defender Application Guard (MDAG) for Microsoft Office + href: https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46 + - name: Microsoft Defender Application Guard (MDAG) configure via MDM + href: /windows/client-management/mdm/windowsdefenderapplicationguard-csp diff --git a/windows/security/application-security/application-isolation/toc.yml b/windows/security/application-security/application-isolation/toc.yml new file mode 100644 index 0000000000..5d2361090b --- /dev/null +++ b/windows/security/application-security/application-isolation/toc.yml @@ -0,0 +1,12 @@ +items: +- name: Microsoft Defender Application Guard + href: ../../threat-protection\microsoft-defender-application-guard\md-app-guard-overview.md +- name: Windows containers + href: /virtualization/windowscontainers/about +- name: Windows Sandbox + href: ../../threat-protection/windows-sandbox/windows-sandbox-overview.md + items: + - name: Windows Sandbox architecture + href: ../../threat-protection/windows-sandbox/windows-sandbox-architecture.md + - name: Windows Sandbox configuration + href: ../../threat-protection/windows-sandbox/windows-sandbox-configure-using-wsb-file.md \ No newline at end of file diff --git a/windows/security/application-security/toc.yml b/windows/security/application-security/toc.yml new file mode 100644 index 0000000000..5e2bd70284 --- /dev/null +++ b/windows/security/application-security/toc.yml @@ -0,0 +1,8 @@ +items: +- name: Overview + href: ../apps.md +- name: Application Control + href: application-control/toc.yml +- name: Application Isolation + href: application-isolation/toc.yml + diff --git a/windows/security/cloud-security/toc.yml b/windows/security/cloud-security/toc.yml new file mode 100644 index 0000000000..87f69eadc0 --- /dev/null +++ b/windows/security/cloud-security/toc.yml @@ -0,0 +1,18 @@ +items: +- name: Overview + href: ../../cloud.md +- name: Join Active Directory and Azure AD with single sign-on (SSO) ⇒ + href: /azure/active-directory/devices/concept-azure-ad-join +- name: Security baselines with Intune ⇒ + href: /mem/intune/protect/security-baselines +- name: Remote wipe (Autopilot reset) ⇒ + href: /windows/client-management/mdm/remotewipe-csp +- name: Mobile Device Management (MDM) ⇒ + href: /windows/client-management/mdm/ +- name: Universal Print ⇒ + href: /universal-print +- name: Windows Autopatch ⇒ + href: /windows/deployment/windows-autopatch +- name: Windows Autopilot ⇒ + href: /windows/deployment/windows-autopilot + diff --git a/windows/security/hardware-security/toc.yml b/windows/security/hardware-security/toc.yml index ea8046d653..a812a513d8 100644 --- a/windows/security/hardware-security/toc.yml +++ b/windows/security/hardware-security/toc.yml @@ -42,11 +42,11 @@ items: href: /windows-hardware/design/device-experiences/oem-vbs - name: Memory integrity (HVCI) href: ../threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md - - name: Memory integrity and VBS enablement + - name: Memory integrity and VBS enablement ⇒ href: /windows-hardware/design/device-experiences/oem-hvci-enablement - name: Hardware-enforced stack protection href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 - - name: Secured-core PC + - name: Secured-core PC ⇒ href: /windows-hardware/design/device-experiences/oem-highly-secure-11 - name: Kernel Direct Memory Access (DMA) protection href: ../information-protection/kernel-dma-protection-for-thunderbolt.md diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index 55be6bbf33..16b2a51847 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -7,10 +7,14 @@ items: items: - name: Windows Hello for Business ⇒ href: hello-for-business/index.yml - - name: Windows presence sensing + - name: Windows presence sensing ⇒ href: https://support.microsoft.com/windows/wake-your-windows-11-pc-when-you-approach-82285c93-440c-4e15-9081-c9e38c1290bb - - name: FIDO 2 security keys ⇒ + - name: Windows Hello for Business Enhanced Security Sign-in (ESS) ⇒ + href: /windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security + - name: FIDO 2 security key ⇒ href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key + - name: Federated sign-in ⇒ + href: /education/windows/federated-sign-in - name: Smart Cards href: smart-cards/smart-card-windows-smart-card-technical-reference.md items: @@ -54,12 +58,26 @@ items: href: virtual-smart-cards/virtual-smart-card-evaluate-security.md - name: Tpmvscmgr href: virtual-smart-cards/virtual-smart-card-tpmvscmgr.md - - name: Windows LAPS (Local Administrator Password Solution) ⇒ - href: /windows-server/identity/laps/laps-overview - - name: Enterprise Certificate Pinning - href: enterprise-certificate-pinning.md - - name: Credential Guard + - name: Windows LAPS (Local Administrator Password Solution) ⇒ + href: /windows-server/identity/laps/laps-overview + - name: Enterprise Certificate Pinning + href: enterprise-certificate-pinning.md + - name: Advanced credential protection items: + - name: Account Lockout Policy + href: ../threat-protection/security-policy-settings/account-lockout-policy.md + - name: Technical support policy for lost or forgotten passwords + href: password-support-policy.md + - name: Enhanced Phishing Protection in Microsoft Defender SmartScreen + href: ../threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md + - name: Access Control + items: + - name: Overview + href: access-control/access-control.md + - name: Local Accounts + href: access-control/local-accounts.md + - name: Windows Defender Credential Guard + items: - name: Protect derived domain credentials with Credential Guard href: credential-guard/credential-guard.md - name: How Credential Guard works @@ -76,25 +94,5 @@ items: href: credential-guard/additional-mitigations.md - name: Known issues href: credential-guard/credential-guard-known-issues.md - - name: Remote Credential Guard - href: remote-credential-guard.md - - name: Configuring LSA Protection - href: /windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=/windows/security/toc.json&bc=/windows/security/breadcrumb/toc.json - - name: Technical support policy for lost or forgotten passwords - href: password-support-policy.md - - name: Access Control - items: - - name: Overview - href: access-control/access-control.md - - name: Local Accounts - href: access-control/local-accounts.md - - name: User Account Control (UAC) - items: - - name: Overview - href: user-account-control/user-account-control-overview.md - - name: How User Account Control works - href: user-account-control/how-user-account-control-works.md - - name: User Account Control security policy settings - href: user-account-control/user-account-control-security-policy-settings.md - - name: User Account Control Group Policy and registry key settings - href: user-account-control/user-account-control-group-policy-and-registry-key-settings.md \ No newline at end of file + - name: Windows Defender Remote Credential Guard + href: remote-credential-guard.md \ No newline at end of file diff --git a/windows/security/operating-system-security/data-protection/toc.yml b/windows/security/operating-system-security/data-protection/toc.yml index bd47960568..bd7afea8da 100644 --- a/windows/security/operating-system-security/data-protection/toc.yml +++ b/windows/security/operating-system-security/data-protection/toc.yml @@ -100,4 +100,53 @@ items: - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE href: ../../information-protection/personal-data-encryption/pde-in-intune/intune-disable-password-connected-standby.md - name: Configure S/MIME for Windows - href: ../../identity-protection/configure-s-mime.md \ No newline at end of file + href: ../../identity-protection/configure-s-mime.md +- name: Windows Information Protection (WIP) + href: ../../information-protection/windows-information-protection/protect-enterprise-data-using-wip.md + items: + - name: Create a WIP policy using Microsoft Intune + href: ../../information-protection/windows-information-protection/overview-create-wip-policy.md + items: + - name: Create a WIP policy in Microsoft Intune + href: ../../information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md + items: + - name: Deploy your WIP policy in Microsoft Intune + href: ../../information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md + - name: Associate and deploy a VPN policy for WIP in Microsoft Intune + href: ../../information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md + - name: Create and verify an EFS Data Recovery Agent (DRA) certificate + href: ../../information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md + - name: Determine the enterprise context of an app running in WIP + href: ../../information-protection/windows-information-protection/wip-app-enterprise-context.md + - name: Create a WIP policy using Microsoft Configuration Manager + href: ../../information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md + items: + - name: Create and deploy a WIP policy in Configuration Manager + href: ../../information-protection/windows-information-protection/create-wip-policy-using-configmgr.md + - name: Create and verify an EFS Data Recovery Agent (DRA) certificate + href: ../../information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md + - name: Determine the enterprise context of an app running in WIP + href: ../../information-protection/windows-information-protection/wip-app-enterprise-context.md + - name: Mandatory tasks and settings required to turn on WIP + href: ../../information-protection/windows-information-protection/mandatory-settings-for-wip.md + - name: Testing scenarios for WIP + href: ../../information-protection/windows-information-protection/testing-scenarios-for-wip.md + - name: Limitations while using WIP + href: ../../information-protection/windows-information-protection/limitations-with-wip.md + - name: How to collect WIP audit event logs + href: ../../information-protection/windows-information-protection/collect-wip-audit-event-logs.md + - name: General guidance and best practices for WIP + href: ../../information-protection/windows-information-protection/guidance-and-best-practices-wip.md + items: + - name: Enlightened apps for use with WIP + href: ../../information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md + - name: Unenlightened and enlightened app behavior while using WIP + href: ../../information-protection/windows-information-protection/app-behavior-with-wip.md + - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP + href: ../../information-protection/windows-information-protection/recommended-network-definitions-for-wip.md + - name: Using Outlook Web Access with WIP + href: ../../information-protection/windows-information-protection/using-owa-with-wip.md + - name: Fine-tune WIP Learning + href: ../../information-protection/windows-information-protection/wip-learning.md + - name: Disable WIP + href: ../../information-protection/windows-information-protection/how-to-disable-wip.md \ No newline at end of file diff --git a/windows/security/operating-system-security/device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml index 154075b5f4..b52d3b78a7 100644 --- a/windows/security/operating-system-security/device-management/toc.yml +++ b/windows/security/operating-system-security/device-management/toc.yml @@ -5,7 +5,11 @@ items: href: ../../threat-protection/security-policy-settings/security-policy-settings.md - name: Security auditing href: ../../threat-protection/auditing/security-auditing-overview.md -- name: Windows security baselines + - name: Secured-core configuration lock + href: ../../../client-management/config-lock + - name: Assigned Access (kiosk mode) + href: ../../../configuration/kiosk-methods +- name: Security baselines href: ../../threat-protection/windows-security-configuration-framework/windows-security-baselines.md items: - name: Security Compliance Toolkit @@ -21,53 +25,4 @@ items: - name: Use Windows Event Forwarding to help with intrusion detection href: ../../threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md - name: Block untrusted fonts in an enterprise - href: ../../threat-protection/block-untrusted-fonts-in-enterprise.md - - name: Windows Information Protection (WIP) - href: ../../information-protection/windows-information-protection/protect-enterprise-data-using-wip.md - items: - - name: Create a WIP policy using Microsoft Intune - href: ../../information-protection/windows-information-protection/overview-create-wip-policy.md - items: - - name: Create a WIP policy in Microsoft Intune - href: ../../information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md - items: - - name: Deploy your WIP policy in Microsoft Intune - href: ../../information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md - - name: Associate and deploy a VPN policy for WIP in Microsoft Intune - href: ../../information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md - - name: Create and verify an EFS Data Recovery Agent (DRA) certificate - href: ../../information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md - - name: Determine the enterprise context of an app running in WIP - href: ../../information-protection/windows-information-protection/wip-app-enterprise-context.md - - name: Create a WIP policy using Microsoft Configuration Manager - href: ../../information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md - items: - - name: Create and deploy a WIP policy in Configuration Manager - href: ../../information-protection/windows-information-protection/create-wip-policy-using-configmgr.md - - name: Create and verify an EFS Data Recovery Agent (DRA) certificate - href: ../../information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md - - name: Determine the enterprise context of an app running in WIP - href: ../../information-protection/windows-information-protection/wip-app-enterprise-context.md - - name: Mandatory tasks and settings required to turn on WIP - href: ../../information-protection/windows-information-protection/mandatory-settings-for-wip.md - - name: Testing scenarios for WIP - href: ../../information-protection/windows-information-protection/testing-scenarios-for-wip.md - - name: Limitations while using WIP - href: ../../information-protection/windows-information-protection/limitations-with-wip.md - - name: How to collect WIP audit event logs - href: ../../information-protection/windows-information-protection/collect-wip-audit-event-logs.md - - name: General guidance and best practices for WIP - href: ../../information-protection/windows-information-protection/guidance-and-best-practices-wip.md - items: - - name: Enlightened apps for use with WIP - href: ../../information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md - - name: Unenlightened and enlightened app behavior while using WIP - href: ../../information-protection/windows-information-protection/app-behavior-with-wip.md - - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP - href: ../../information-protection/windows-information-protection/recommended-network-definitions-for-wip.md - - name: Using Outlook Web Access with WIP - href: ../../information-protection/windows-information-protection/using-owa-with-wip.md - - name: Fine-tune WIP Learning - href: ../../information-protection/windows-information-protection/wip-learning.md - - name: Disable WIP - href: ../../information-protection/windows-information-protection/how-to-disable-wip.md \ No newline at end of file + href: ../../threat-protection/block-untrusted-fonts-in-enterprise.md \ No newline at end of file diff --git a/windows/security/operating-system-security/virus-and-threat-protection/toc.yml b/windows/security/operating-system-security/virus-and-threat-protection/toc.yml index 0649858634..a8c5cdf1e5 100644 --- a/windows/security/operating-system-security/virus-and-threat-protection/toc.yml +++ b/windows/security/operating-system-security/virus-and-threat-protection/toc.yml @@ -3,6 +3,8 @@ items: href: ../../threat-protection/index.md - name: Microsoft Defender Antivirus href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows +- name: Configuring LSA Protection + href: /windows-server/security/credentials-protection-and-management/configuring-additional-lsa-protection?toc=/windows/security/toc.json&bc=/windows/security/breadcrumb/toc.json - name: Attack surface reduction (ASR) href: /microsoft-365/security/defender-endpoint/attack-surface-reduction - name: Tamper protection for MDE diff --git a/windows/security/security-foundations/certification/toc.yml b/windows/security/security-foundations/certification/toc.yml new file mode 100644 index 0000000000..70d9d800b8 --- /dev/null +++ b/windows/security/security-foundations/certification/toc.yml @@ -0,0 +1,5 @@ +items: +- name: FIPS 140-2 Validation + href: ../../threat-protection/fips-140-validation.md +- name: Common Criteria Certifications + href: ../../threat-protection/windows-platform-common-criteria.md \ No newline at end of file diff --git a/windows/security/security-foundations/toc.yml b/windows/security/security-foundations/toc.yml new file mode 100644 index 0000000000..d52c477387 --- /dev/null +++ b/windows/security/security-foundations/toc.yml @@ -0,0 +1,7 @@ +items: +- name: Overview + href: ../security-foundations.md +- name: Microsoft Security Development Lifecycle + href: ../threat-protection/msft-security-dev-lifecycle.md +- name: Certification + href: certification/toc.yml \ No newline at end of file From 414ea1e795d3d990b1f40951e18c748ced86297a Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:29:07 -0400 Subject: [PATCH 33/65] TOC update --- .../deployment/images/ur-arch-diagram.png | Bin windows/security/cloud-security/toc.yml | 2 +- .../device-management/toc.yml | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename ur-arch-diagram.png => windows/deployment/images/ur-arch-diagram.png (100%) diff --git a/ur-arch-diagram.png b/windows/deployment/images/ur-arch-diagram.png similarity index 100% rename from ur-arch-diagram.png rename to windows/deployment/images/ur-arch-diagram.png diff --git a/windows/security/cloud-security/toc.yml b/windows/security/cloud-security/toc.yml index 87f69eadc0..7eaefc2acd 100644 --- a/windows/security/cloud-security/toc.yml +++ b/windows/security/cloud-security/toc.yml @@ -1,6 +1,6 @@ items: - name: Overview - href: ../../cloud.md + href: ../cloud.md - name: Join Active Directory and Azure AD with single sign-on (SSO) ⇒ href: /azure/active-directory/devices/concept-azure-ad-join - name: Security baselines with Intune ⇒ diff --git a/windows/security/operating-system-security/device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml index b52d3b78a7..01419872b2 100644 --- a/windows/security/operating-system-security/device-management/toc.yml +++ b/windows/security/operating-system-security/device-management/toc.yml @@ -6,9 +6,9 @@ items: - name: Security auditing href: ../../threat-protection/auditing/security-auditing-overview.md - name: Secured-core configuration lock - href: ../../../client-management/config-lock + href: /windows/client-management/config-lock - name: Assigned Access (kiosk mode) - href: ../../../configuration/kiosk-methods + href: /windows/configuration/kiosk-methods - name: Security baselines href: ../../threat-protection/windows-security-configuration-framework/windows-security-baselines.md items: From 27d3815bb3552df2bd8782d6cb76912dd158d1f4 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:33:51 -0400 Subject: [PATCH 34/65] updates --- windows/security/TOC.yml | 4 +-- .../device-management/toc.yml | 36 +++++++++---------- .../operating-system-security/toc.yml | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 1a28b4a916..538d6ddff5 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -24,7 +24,7 @@ href: /windows/privacy/windows-10-and-privacy-compliance - name: Security foundations href: security-foundations/toc.yml -- name: Cloud services - href: cloud-services/toc.yml +- name: Cloud security + href: cloud-security/toc.yml - name: Security policy settings href: /windows/security/threat-protection/security-policy-settings \ No newline at end of file diff --git a/windows/security/operating-system-security/device-management/toc.yml b/windows/security/operating-system-security/device-management/toc.yml index 01419872b2..239b2eb2a6 100644 --- a/windows/security/operating-system-security/device-management/toc.yml +++ b/windows/security/operating-system-security/device-management/toc.yml @@ -1,6 +1,4 @@ items: -- name: Device management - items: - name: Security policy settings href: ../../threat-protection/security-policy-settings/security-policy-settings.md - name: Security auditing @@ -9,20 +7,20 @@ items: href: /windows/client-management/config-lock - name: Assigned Access (kiosk mode) href: /windows/configuration/kiosk-methods -- name: Security baselines - href: ../../threat-protection/windows-security-configuration-framework/windows-security-baselines.md - items: - - name: Security Compliance Toolkit - href: ../../threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md - - name: Get support - href: ../../threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md - - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) - href: ../../threat-protection/mbsa-removal-and-guidance.md -- name: More Windows security - items: - - name: Override Process Mitigation Options to help enforce app-related security policies - href: ../../threat-protection/override-mitigation-options-for-app-related-security-policies.md - - name: Use Windows Event Forwarding to help with intrusion detection - href: ../../threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md - - name: Block untrusted fonts in an enterprise - href: ../../threat-protection/block-untrusted-fonts-in-enterprise.md \ No newline at end of file + - name: Security baselines + href: ../../threat-protection/windows-security-configuration-framework/windows-security-baselines.md + items: + - name: Security Compliance Toolkit + href: ../../threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md + - name: Get support + href: ../../threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.md + - name: Guide to removing Microsoft Baseline Security Analyzer (MBSA) + href: ../../threat-protection/mbsa-removal-and-guidance.md + - name: More Windows security + items: + - name: Override Process Mitigation Options to help enforce app-related security policies + href: ../../threat-protection/override-mitigation-options-for-app-related-security-policies.md + - name: Use Windows Event Forwarding to help with intrusion detection + href: ../../threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md + - name: Block untrusted fonts in an enterprise + href: ../../threat-protection/block-untrusted-fonts-in-enterprise.md \ No newline at end of file diff --git a/windows/security/operating-system-security/toc.yml b/windows/security/operating-system-security/toc.yml index e89ccbd235..a0ee50c4bb 100644 --- a/windows/security/operating-system-security/toc.yml +++ b/windows/security/operating-system-security/toc.yml @@ -9,5 +9,5 @@ items: href: network-security/toc.yml - name: Data protection href: data-protection/toc.yml -- name: Modern device management +- name: Device management href: device-management/toc.yml \ No newline at end of file From bac85dd5c35d249ac2494607b88721bae477fffe Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:50:31 -0400 Subject: [PATCH 35/65] updates --- windows/security/TOC.yml | 4 +--- windows/security/identity-protection/toc.yml | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 538d6ddff5..595706d1a1 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -25,6 +25,4 @@ - name: Security foundations href: security-foundations/toc.yml - name: Cloud security - href: cloud-security/toc.yml -- name: Security policy settings - href: /windows/security/threat-protection/security-policy-settings \ No newline at end of file + href: cloud-security/toc.yml \ No newline at end of file diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index 16b2a51847..f292d2822d 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -64,7 +64,7 @@ items: href: enterprise-certificate-pinning.md - name: Advanced credential protection items: - - name: Account Lockout Policy + - name: Account Lockout Policy ⇒ href: ../threat-protection/security-policy-settings/account-lockout-policy.md - name: Technical support policy for lost or forgotten passwords href: password-support-policy.md @@ -76,6 +76,8 @@ items: href: access-control/access-control.md - name: Local Accounts href: access-control/local-accounts.md + - name: Security policy settings ⇒ + href: ../threat-protection/security-policy-settings/security-policy-settings.md - name: Windows Defender Credential Guard items: - name: Protect derived domain credentials with Credential Guard From 3dd83e97f6dc51fe8187faa6cf84e97e4744ef4a Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:15:34 -0400 Subject: [PATCH 36/65] updates --- windows/security/TOC.yml | 4 ++-- .../application-control/toc.yml | 20 ++++++------------- .../application-isolation/toc.yml | 8 ++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 595706d1a1..1a29e97d24 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -20,8 +20,8 @@ href: application-security/toc.yml - name: Identity protection href: identity-protection/toc.yml -- name: Windows Privacy - href: /windows/privacy/windows-10-and-privacy-compliance +- name: Windows Privacy ⇒ + href: /windows/privacy - name: Security foundations href: security-foundations/toc.yml - name: Cloud security diff --git a/windows/security/application-security/application-control/toc.yml b/windows/security/application-security/application-control/toc.yml index 05774f9405..5cea979d61 100644 --- a/windows/security/application-security/application-control/toc.yml +++ b/windows/security/application-security/application-control/toc.yml @@ -9,17 +9,9 @@ items: href: ../../identity-protection/user-account-control/user-account-control-security-policy-settings.md - name: User Account Control Group Policy and registry key settings href: ../../identity-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md - - name: Windows Defender Application Control and virtualization-based protection of code integrity - href: ../../threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md - - name: Windows Defender Application Control - href: ../../threat-protection/windows-defender-application-control/windows-defender-application-control.md - - name: Smart App Control - href: ../../threat-protection/windows-defender-application-control/windows-defender-application-control.md - - name: Microsoft Defender Application Guard (MDAG) for Edge standalone mode - href: ../../threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md - - name: Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management - href: /deployedge/microsoft-edge-security-windows-defender-application-guard - - name: Microsoft Defender Application Guard (MDAG) for Microsoft Office - href: https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46 - - name: Microsoft Defender Application Guard (MDAG) configure via MDM - href: /windows/client-management/mdm/windowsdefenderapplicationguard-csp +- name: Windows Defender Application Control and virtualization-based protection of code integrity + href: ../../threat-protection/device-guard/introduction-to-device-guard-virtualization-based-security-and-windows-defender-application-control.md +- name: Windows Defender Application Control + href: ../../threat-protection/windows-defender-application-control/windows-defender-application-control.md +- name: Smart App Control + href: ../../threat-protection/windows-defender-application-control/windows-defender-application-control.md \ No newline at end of file diff --git a/windows/security/application-security/application-isolation/toc.yml b/windows/security/application-security/application-isolation/toc.yml index 5d2361090b..cd0be21954 100644 --- a/windows/security/application-security/application-isolation/toc.yml +++ b/windows/security/application-security/application-isolation/toc.yml @@ -1,6 +1,14 @@ items: - name: Microsoft Defender Application Guard href: ../../threat-protection\microsoft-defender-application-guard\md-app-guard-overview.md +- name: Microsoft Defender Application Guard (MDAG) for Edge standalone mode + href: ../../threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md +- name: Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management + href: /deployedge/microsoft-edge-security-windows-defender-application-guard +- name: Microsoft Defender Application Guard (MDAG) for Microsoft Office + href: https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46 +- name: Microsoft Defender Application Guard (MDAG) configure via MDM + href: /windows/client-management/mdm/windowsdefenderapplicationguard-csp - name: Windows containers href: /virtualization/windowscontainers/about - name: Windows Sandbox From a0c655227c4e37c719b5297efef254fbe2fcb0c4 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:26:16 -0400 Subject: [PATCH 37/65] updates --- .../application-isolation/toc.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/security/application-security/application-isolation/toc.yml b/windows/security/application-security/application-isolation/toc.yml index cd0be21954..fd649d5204 100644 --- a/windows/security/application-security/application-isolation/toc.yml +++ b/windows/security/application-security/application-isolation/toc.yml @@ -1,15 +1,15 @@ items: -- name: Microsoft Defender Application Guard +- name: Microsoft Defender Application Guard (MDAG) href: ../../threat-protection\microsoft-defender-application-guard\md-app-guard-overview.md -- name: Microsoft Defender Application Guard (MDAG) for Edge standalone mode +- name: MDAG for Edge standalone mode href: ../../threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md -- name: Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management +- name: MDAG for Edge enterprise mode and enterprise management ⇒ href: /deployedge/microsoft-edge-security-windows-defender-application-guard -- name: Microsoft Defender Application Guard (MDAG) for Microsoft Office +- name: MDAG for Microsoft Office href: https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46 -- name: Microsoft Defender Application Guard (MDAG) configure via MDM +- name: MDAG configure via MDM ⇒ href: /windows/client-management/mdm/windowsdefenderapplicationguard-csp -- name: Windows containers +- name: Windows containers ⇒ href: /virtualization/windowscontainers/about - name: Windows Sandbox href: ../../threat-protection/windows-sandbox/windows-sandbox-overview.md From 235b631eb81a2ba9bcf4b560ef69e9eaf4818373 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:59:40 -0400 Subject: [PATCH 38/65] =?UTF-8?q?update=20TOC=20with=20=F0=9F=94=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- windows/security/TOC.yml | 2 +- .../application-isolation/toc.yml | 6 +++--- windows/security/cloud-security/toc.yml | 14 +++++++------- windows/security/hardware-security/toc.yml | 4 ++-- windows/security/identity-protection/toc.yml | 16 ++++++++-------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml index 1a29e97d24..fb69d549ce 100644 --- a/windows/security/TOC.yml +++ b/windows/security/TOC.yml @@ -20,7 +20,7 @@ href: application-security/toc.yml - name: Identity protection href: identity-protection/toc.yml -- name: Windows Privacy ⇒ +- name: Windows Privacy 🔗 href: /windows/privacy - name: Security foundations href: security-foundations/toc.yml diff --git a/windows/security/application-security/application-isolation/toc.yml b/windows/security/application-security/application-isolation/toc.yml index fd649d5204..8c17971749 100644 --- a/windows/security/application-security/application-isolation/toc.yml +++ b/windows/security/application-security/application-isolation/toc.yml @@ -3,13 +3,13 @@ items: href: ../../threat-protection\microsoft-defender-application-guard\md-app-guard-overview.md - name: MDAG for Edge standalone mode href: ../../threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md -- name: MDAG for Edge enterprise mode and enterprise management ⇒ +- name: MDAG for Edge enterprise mode and enterprise management 🔗 href: /deployedge/microsoft-edge-security-windows-defender-application-guard - name: MDAG for Microsoft Office href: https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46 -- name: MDAG configure via MDM ⇒ +- name: MDAG configure via MDM 🔗 href: /windows/client-management/mdm/windowsdefenderapplicationguard-csp -- name: Windows containers ⇒ +- name: Windows containers 🔗 href: /virtualization/windowscontainers/about - name: Windows Sandbox href: ../../threat-protection/windows-sandbox/windows-sandbox-overview.md diff --git a/windows/security/cloud-security/toc.yml b/windows/security/cloud-security/toc.yml index 7eaefc2acd..a927cf5384 100644 --- a/windows/security/cloud-security/toc.yml +++ b/windows/security/cloud-security/toc.yml @@ -1,18 +1,18 @@ items: - name: Overview href: ../cloud.md -- name: Join Active Directory and Azure AD with single sign-on (SSO) ⇒ +- name: Join Active Directory and Azure AD with single sign-on (SSO) 🔗 href: /azure/active-directory/devices/concept-azure-ad-join -- name: Security baselines with Intune ⇒ +- name: Security baselines with Intune 🔗 href: /mem/intune/protect/security-baselines -- name: Remote wipe (Autopilot reset) ⇒ +- name: Remote wipe (Autopilot reset) 🔗 href: /windows/client-management/mdm/remotewipe-csp -- name: Mobile Device Management (MDM) ⇒ +- name: Mobile Device Management (MDM) 🔗 href: /windows/client-management/mdm/ -- name: Universal Print ⇒ +- name: Universal Print 🔗 href: /universal-print -- name: Windows Autopatch ⇒ +- name: Windows Autopatch 🔗 href: /windows/deployment/windows-autopatch -- name: Windows Autopilot ⇒ +- name: Windows Autopilot 🔗 href: /windows/deployment/windows-autopilot diff --git a/windows/security/hardware-security/toc.yml b/windows/security/hardware-security/toc.yml index a812a513d8..6cd5d10c39 100644 --- a/windows/security/hardware-security/toc.yml +++ b/windows/security/hardware-security/toc.yml @@ -42,11 +42,11 @@ items: href: /windows-hardware/design/device-experiences/oem-vbs - name: Memory integrity (HVCI) href: ../threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity.md - - name: Memory integrity and VBS enablement ⇒ + - name: Memory integrity and VBS enablement 🔗 href: /windows-hardware/design/device-experiences/oem-hvci-enablement - name: Hardware-enforced stack protection href: https://techcommunity.microsoft.com/t5/windows-os-platform-blog/understanding-hardware-enforced-stack-protection/ba-p/1247815 - - name: Secured-core PC ⇒ + - name: Secured-core PC 🔗 href: /windows-hardware/design/device-experiences/oem-highly-secure-11 - name: Kernel Direct Memory Access (DMA) protection href: ../information-protection/kernel-dma-protection-for-thunderbolt.md diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index f292d2822d..27c8a6dad3 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -5,15 +5,15 @@ items: href: windows-credential-theft-mitigation-guide-abstract.md - name: Passwordless sign-in items: - - name: Windows Hello for Business ⇒ + - name: Windows Hello for Business 🔗 href: hello-for-business/index.yml - - name: Windows presence sensing ⇒ + - name: Windows presence sensing 🔗 href: https://support.microsoft.com/windows/wake-your-windows-11-pc-when-you-approach-82285c93-440c-4e15-9081-c9e38c1290bb - - name: Windows Hello for Business Enhanced Security Sign-in (ESS) ⇒ + - name: Windows Hello for Business Enhanced Security Sign-in (ESS) 🔗 href: /windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security - - name: FIDO 2 security key ⇒ + - name: FIDO 2 security key 🔗 href: /azure/active-directory/authentication/howto-authentication-passwordless-security-key - - name: Federated sign-in ⇒ + - name: Federated sign-in 🔗 href: /education/windows/federated-sign-in - name: Smart Cards href: smart-cards/smart-card-windows-smart-card-technical-reference.md @@ -58,13 +58,13 @@ items: href: virtual-smart-cards/virtual-smart-card-evaluate-security.md - name: Tpmvscmgr href: virtual-smart-cards/virtual-smart-card-tpmvscmgr.md - - name: Windows LAPS (Local Administrator Password Solution) ⇒ + - name: Windows LAPS (Local Administrator Password Solution) 🔗 href: /windows-server/identity/laps/laps-overview - name: Enterprise Certificate Pinning href: enterprise-certificate-pinning.md - name: Advanced credential protection items: - - name: Account Lockout Policy ⇒ + - name: Account Lockout Policy 🔗 href: ../threat-protection/security-policy-settings/account-lockout-policy.md - name: Technical support policy for lost or forgotten passwords href: password-support-policy.md @@ -76,7 +76,7 @@ items: href: access-control/access-control.md - name: Local Accounts href: access-control/local-accounts.md - - name: Security policy settings ⇒ + - name: Security policy settings 🔗 href: ../threat-protection/security-policy-settings/security-policy-settings.md - name: Windows Defender Credential Guard items: From 9965066fd661026fe945bd75d4488362e3e37cf0 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 18:28:52 -0400 Subject: [PATCH 39/65] updated includes --- includes/licensing/_edition-requirements.md | 14 ++++++------ includes/licensing/_licensing-requirements.md | 18 +++++++-------- includes/licensing/federated-sign-in.md | 4 ++-- includes/licensing/windows-laps.md | 22 +++++++++++++++++++ 4 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 includes/licensing/windows-laps.md diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md index 5f6391baad..8f7e70b8b4 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 04/27/2023 ms.topic: include --- @@ -25,14 +25,13 @@ The following table lists the security features that are available in Windows, a |**[Encrypted hard drive](/windows/security/information-protection/encrypted-hard-drive)**|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](/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)**|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|Yes|Yes| +|**[Federated sign-in](/education/windows/federated-sign-in)**|❌|❌|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](/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](/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**|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](/microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows)**|Yes|Yes|Yes|Yes| @@ -62,10 +61,10 @@ The following table lists the security features that are available in Windows, a |**[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| +|**[User Account Control (UAC)](/windows/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes| -|**WiFi Security**|Yes|Yes|Yes|Yes| +|**[WiFi Security](https://support.microsoft.com/windows/faster-and-more-secure-wi-fi-in-windows-26177a28-38ed-1a8e-7eca-66f24dc63f09)**|Yes|Yes|Yes|Yes| |**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|❌|Yes| |**[Windows Autopilot](/windows/deployment/windows-autopilot)**|Yes|Yes|Yes|Yes| |**[Windows containers](/virtualization/windowscontainers/about/)**|Yes|Yes|Yes|Yes| @@ -76,6 +75,7 @@ The following table lists the security features that are available in Windows, a |**[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 LAPS](/windows-server/identity/laps/laps-overview)**|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| diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md index 2d3f2f34d8..9e822cdbe0 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 04/27/2023 ms.topic: include --- @@ -25,21 +25,20 @@ The following table lists the security features that are available in Windows, a |**[Encrypted hard drive](/windows/security/information-protection/encrypted-hard-drive)**|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](/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)**|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|❌|Yes|Yes| +|**[Federated sign-in](/education/windows/federated-sign-in)**|❌|❌|❌|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](/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](/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**|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](/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)**|❌|Yes|Yes|Yes|Yes| |**[Microsoft Defender Application Guard (MDAG) for Edge enterprise mode and enterprise management](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|❌|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/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|No|❌|No|❌| +|**[Microsoft Defender Application Guard (MDAG) for Microsoft Office](https://support.microsoft.com/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|❌|❌|❌|❌| |**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|Yes|Yes|Yes| |**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|Yes| |**[Microsoft Defender SmartScreen](/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview)**|Yes|Yes|Yes|Yes|Yes| @@ -62,11 +61,11 @@ The following table lists the security features that are available in Windows, a |**[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| +|**[User Account Control (UAC)](/windows/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes|Yes| -|**WiFi Security**|Yes|Yes|Yes|Yes|Yes| -|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|No| +|**[WiFi Security](https://support.microsoft.com/windows/faster-and-more-secure-wi-fi-in-windows-26177a28-38ed-1a8e-7eca-66f24dc63f09)**|Yes|Yes|Yes|Yes|Yes| +|**[Windows Autopatch](/windows/deployment/windows-autopatch/)**|❌|Yes|Yes|❌|❌| |**[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| @@ -76,6 +75,7 @@ The following table lists the security features that are available in Windows, a |**[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 LAPS](/windows-server/identity/laps/laps-overview)**|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| diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index 080274363c..c1d9f41946 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -15,8 +15,8 @@ The following table lists the Windows editions that support Federated sign-in: Federated sign-in 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| +|Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|No|No|No|Yes|Yes| +|Yes|No|No|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/windows-laps.md b/includes/licensing/windows-laps.md new file mode 100644 index 0000000000..dd378de2be --- /dev/null +++ b/includes/licensing/windows-laps.md @@ -0,0 +1,22 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.date: 04/27/2023 +ms.topic: include +--- + +## Windows edition and licensing requirements + +The following table lists the Windows editions that support Windows LAPS: + +|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| +|:---:|:---:|:---:|:---:| +|Yes|Yes|Yes|Yes| + +Windows LAPS 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 licensing overview](/windows/whats-new/windows-licensing). From 74966a80bd1df69288213d4a9c086dc00e6c3aa4 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 27 Apr 2023 18:45:37 -0400 Subject: [PATCH 40/65] batch licensing requirements --- .../pluton/microsoft-pluton-security-processor.md | 4 +++- .../tpm/trusted-platform-module-overview.md | 2 ++ ...rdware-based-root-of-trust-helps-protect-windows.md | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md b/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md index 5274334565..d2d8321257 100644 --- a/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md +++ b/windows/security/information-protection/pluton/microsoft-pluton-security-processor.md @@ -18,7 +18,7 @@ ms.technology: itpro-security Microsoft Pluton security processor is a chip-to-cloud security technology built with [Zero Trust](/security/zero-trust/zero-trust-overview) principles at the core. Microsoft Pluton provides hardware-based root of trust, secure identity, secure attestation, and cryptographic services. Pluton technology is a combination of a secure subsystem which is part of the System on Chip (SoC) and Microsoft authored software that runs on this integrated secure subsystem. -Microsoft Pluton is currently available on devices with Ryzen 6000 and Qualcomm Snapdragon® 8cx Gen 3 series processors. Microsoft Pluton can be enabled on devices with Pluton capable processors running Windows 11, version 22H2. +Microsoft Pluton is currently available on devices with Ryzen 6000 and Qualcomm Snapdragon® 8cx Gen 3 series processors. Microsoft Pluton can be enabled on devices with Pluton capable processors running Windows 11, version 22H2. ## What is Microsoft Pluton? @@ -46,6 +46,8 @@ When the system boots, Pluton hardware initialization is performed by loading th ![Diagram showing the Microsoft Pluton Firmware load flow](../images/pluton/pluton-firmware-load.png) +[!INCLUDE [microsoft-pluton-security-processor](../../../../includes/licensing/microsoft-pluton-security-processor.md)] + ## Related topics [Microsoft Pluton as TPM](pluton-as-tpm.md) diff --git a/windows/security/information-protection/tpm/trusted-platform-module-overview.md b/windows/security/information-protection/tpm/trusted-platform-module-overview.md index 2c2f23d5cb..d3a0a6e2b7 100644 --- a/windows/security/information-protection/tpm/trusted-platform-module-overview.md +++ b/windows/security/information-protection/tpm/trusted-platform-module-overview.md @@ -50,6 +50,8 @@ Anti-malware software can use the boot measurements of the operating system star The TPM has several Group Policy settings that might be useful in certain enterprise scenarios. For more info, see [TPM Group Policy Settings](trusted-platform-module-services-group-policy-settings.md). +[!INCLUDE [trusted-platform-module-tpm-20](../../../../includes/licensing/trusted-platform-module-tpm-20.md)] + ## New and changed functionality For more info on new and changed functionality for Trusted Platform Module in Windows, see [What's new in Trusted Platform Module?](/windows/whats-new/whats-new-windows-10-version-1507-and-1511#trusted-platform-module) diff --git a/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md b/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md index 10b4f41000..74e332cb87 100644 --- a/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md +++ b/windows/security/threat-protection/windows-defender-system-guard/how-hardware-based-root-of-trust-helps-protect-windows.md @@ -30,7 +30,7 @@ With Windows 7, one of the means attackers would use to persist and evade detect This malicious software would start before Windows started, or during the boot process itself, enabling it to start with the highest level of privilege. With Windows 10 running on modern hardware (that is, Windows 8-certified or greater) a hardware-based root of trust helps ensure that no unauthorized firmware or software (such as a bootkit) can start before the Windows bootloader. -This hardware-based root of trust comes from the device’s Secure Boot feature, which is part of the Unified Extensible Firmware Interface (UEFI). +This hardware-based root of trust comes from the device's Secure Boot feature, which is part of the Unified Extensible Firmware Interface (UEFI). This technique of measuring the static early boot UEFI components is called the Static Root of Trust for Measurement (SRTM). As there are thousands of PC vendors that produce many models with different UEFI BIOS versions, there becomes an incredibly large number of SRTM measurements upon bootup. @@ -69,18 +69,20 @@ Paging protection can be implemented to lock certain code tables to be read-only A hardware-enforced processor feature known as a supervisor SMI handler can monitor the SMM and make sure it doesn't access any part of the address space that it isn't supposed to. SMM protection is built on top of the Secure Launch technology and requires it to function. -In the future, Windows 10 will also measure this SMI Handler’s behavior and attest that no OS-owned memory has been tampered with. +In the future, Windows 10 will also measure this SMI Handler's behavior and attest that no OS-owned memory has been tampered with. ## Validating platform integrity after Windows is running (run time) -While Windows Defender System Guard provides advanced protection that will help protect and maintain the integrity of the platform during boot and at run time, the reality is that we must apply an "assume breach" mentality to even our most sophisticated security technologies. We can trust that the technologies are successfully doing their jobs, but we also need the ability to verify that they were successful in achieving their goals. For platform integrity, we can’t just trust the platform, which potentially could be compromised, to self-attest to its security state. So Windows Defender System Guard includes a series of technologies that enable remote analysis of the device’s integrity. +While Windows Defender System Guard provides advanced protection that will help protect and maintain the integrity of the platform during boot and at run time, the reality is that we must apply an "assume breach" mentality to even our most sophisticated security technologies. We can trust that the technologies are successfully doing their jobs, but we also need the ability to verify that they were successful in achieving their goals. For platform integrity, we can't just trust the platform, which potentially could be compromised, to self-attest to its security state. So Windows Defender System Guard includes a series of technologies that enable remote analysis of the device's integrity. -As Windows 10 boots, a series of integrity measurements are taken by Windows Defender System Guard using the device’s Trusted Platform Module 2.0 (TPM 2.0). System Guard Secure Launch won't support earlier TPM versions, such as TPM 1.2. This process and data are hardware-isolated away from Windows to help ensure that the measurement data isn't subject to the type of tampering that could happen if the platform was compromised. From here, the measurements can be used to determine the integrity of the device’s firmware, hardware configuration state, and Windows boot-related components, just to name a few. +As Windows 10 boots, a series of integrity measurements are taken by Windows Defender System Guard using the device's Trusted Platform Module 2.0 (TPM 2.0). System Guard Secure Launch won't support earlier TPM versions, such as TPM 1.2. This process and data are hardware-isolated away from Windows to help ensure that the measurement data isn't subject to the type of tampering that could happen if the platform was compromised. From here, the measurements can be used to determine the integrity of the device's firmware, hardware configuration state, and Windows boot-related components, just to name a few. ![Boot time integrity.](images/windows-defender-system-guard-boot-time-integrity.png) After the system boots, Windows Defender System Guard signs and seals these measurements using the TPM. Upon request, a management system like Intune or Microsoft Configuration Manager can acquire them for remote analysis. If Windows Defender System Guard indicates that the device lacks integrity, the management system can take a series of actions, such as denying the device access to resources. +[!INCLUDE [windows-defender-system-guard](../../../../includes/licensing/windows-defender-system-guard.md)] + ## System requirements for System Guard This feature is available for the following processors: From 5468c14b648ca127bfb442a5f20bd45245c8a492 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 1 May 2023 09:16:11 -0400 Subject: [PATCH 41/65] added licensing info --- .../identity-protection/credential-guard/credential-guard.md | 2 ++ .../md-app-guard-overview.md | 4 +++- .../windows-defender-application-control.md | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/windows/security/identity-protection/credential-guard/credential-guard.md b/windows/security/identity-protection/credential-guard/credential-guard.md index af00a1aef1..d8fd5081a5 100644 --- a/windows/security/identity-protection/credential-guard/credential-guard.md +++ b/windows/security/identity-protection/credential-guard/credential-guard.md @@ -21,6 +21,8 @@ By enabling Windows Defender Credential Guard, the following features and soluti > [!NOTE] > As of Windows 11, version 22H2, Windows Defender Credential Guard has been enabled by default on all devices which meet the minimum requirements as specified in the [Default Enablement](credential-guard-manage.md#default-enablement) section. For information about known issues related to default enablement, see [Credential Guard: Known Issues](credential-guard-known-issues.md#known-issue-single-sign-on-sso-for-network-services-breaks-after-upgrading-to-windows-11-version-22h2). +[!INCLUDE [windows-defender-credential-guard](../../../../includes/licensing/windows-defender-credential-guard.md)] + ## Related topics - [Protecting network passwords with Windows Defender Credential Guard](https://www.microsoft.com/itshowcase/Article/Content/831/Protecting-network-passwords-with-Windows-10-Credential-Guard) diff --git a/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md b/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md index afc6aaef79..f6a9150ebc 100644 --- a/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md +++ b/windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview.md @@ -8,7 +8,7 @@ ms.pagetype: security ms.localizationpriority: medium author: vinaypamnani-msft ms.author: vinpa -ms.date: 09/09/2021 +ms.date: 05/01/2023 ms.reviewer: manager: aaroncz ms.custom: asr @@ -49,6 +49,8 @@ Application Guard has been created to target several types of devices: - **Personal devices**. These personally owned desktops or mobile laptops aren't domain-joined or managed by an organization. The user is an admin on the device and uses a high-bandwidth wireless personal network while at home or a comparable public network while outside. +[!INCLUDE [microsoft-defender-application-guard-mdag-for-edge-standalone-mode](../../../../includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md)] + ## Related articles |Article |Description | diff --git a/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md b/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md index 2ba7d43f84..9f1f0f96d3 100644 --- a/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md +++ b/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control.md @@ -73,6 +73,8 @@ Smart App Control enforces the [Microsoft Recommended Driver Block rules](micros - Microsoft.Build.Framework.dll - Wslhost.dll +[!INCLUDE [windows-defender-application-control-wdac](../../../../includes/licensing/windows-defender-application-control-wdac.md)] + ## Related articles - [WDAC design guide](windows-defender-application-control-design-guide.md) From fdb06c1b36fd40336c506872a3d6e0422d2e1f8c Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 1 May 2023 11:59:40 -0400 Subject: [PATCH 42/65] added licensing info --- education/windows/autopilot-reset.md | 2 ++ windows/client-management/config-lock.md | 6 ++---- windows/client-management/mdm-overview.md | 2 ++ windows/configuration/kiosk-methods.md | 2 ++ windows/security/identity-protection/toc.yml | 2 +- .../microsoft-defender-smartscreen-overview.md | 2 ++ .../phishing-protection-microsoft-defender-smartscreen.md | 2 ++ ...by-controlling-the-health-of-windows-10-based-devices.md | 6 ++++-- .../security-policy-settings/account-lockout-policy.md | 2 ++ .../security-policy-settings/security-policy-settings.md | 2 ++ .../microsoft-recommended-driver-block-rules.md | 2 ++ .../windows-firewall-with-advanced-security.md | 2 +- .../windows-sandbox/windows-sandbox-overview.md | 4 ++-- windows/security/trusted-boot.md | 2 ++ 14 files changed, 28 insertions(+), 10 deletions(-) diff --git a/education/windows/autopilot-reset.md b/education/windows/autopilot-reset.md index adc2f3d815..15b7d22d04 100644 --- a/education/windows/autopilot-reset.md +++ b/education/windows/autopilot-reset.md @@ -20,6 +20,8 @@ To enable Autopilot Reset you must: 1. [Enable the policy for the feature](#enable-autopilot-reset) 2. [Trigger a reset for each device](#trigger-autopilot-reset) +[!INCLUDE [remote-wipe-autopilot-reset](../../includes/licensing/remote-wipe-autopilot-reset.md)] + ## Enable Autopilot Reset To use Autopilot Reset, [Windows Recovery Environment (WinRE) must be enabled on the device](#winre). diff --git a/windows/client-management/config-lock.md b/windows/client-management/config-lock.md index 2e86f60f6a..d32bed289c 100644 --- a/windows/client-management/config-lock.md +++ b/windows/client-management/config-lock.md @@ -26,11 +26,9 @@ To summarize, config lock: ## Configuration Flow -After a secured-core PC reaches the desktop, config lock will prevent configuration drift by detecting if the device is a secured-core PC or not. When the device isn't a secured-core PC, the lock won't apply. If the device is a secured-core PC, config lock will lock the policies listed under [List of locked policies](#list-of-locked-policies). +After a [secured-core PCs](/windows-hardware/design/device-experiences/oem-highly-secure) reaches the desktop, config lock will prevent configuration drift by detecting if the device is a secured-core PC or not. When the device isn't a secured-core PC, the lock won't apply. If the device is a secured-core PC, config lock will lock the policies listed under [List of locked policies](#list-of-locked-policies). -## System Requirements - -Config lock will be available for all Windows Professional and Enterprise Editions running on [secured-core PCs](/windows-hardware/design/device-experiences/oem-highly-secure). +[!INCLUDE [secured-core-configuration-lock](../../includes/licensing/secured-core-configuration-lock.md)] ## Enabling config lock using Microsoft Intune diff --git a/windows/client-management/mdm-overview.md b/windows/client-management/mdm-overview.md index ecc058a048..65a8d393da 100644 --- a/windows/client-management/mdm-overview.md +++ b/windows/client-management/mdm-overview.md @@ -56,6 +56,8 @@ For more information about the MDM policies defined in the MDM security baseline For information about the MDM policies defined in the Intune security baseline, see [Windows security baseline settings for Intune](/mem/intune/protect/security-baseline-settings-mdm-all). +[!INCLUDE [manage-by-mobile-device-management-mdm-and-group-policy](../../includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md)] + ## Frequently Asked Questions ### Can there be more than one MDM server to enroll and manage devices in Windows? diff --git a/windows/configuration/kiosk-methods.md b/windows/configuration/kiosk-methods.md index fca2b5ab94..0fdc2d15c1 100644 --- a/windows/configuration/kiosk-methods.md +++ b/windows/configuration/kiosk-methods.md @@ -71,6 +71,8 @@ There are several kiosk configuration methods that you can choose from, dependin >[!IMPORTANT] >Single-app kiosk mode isn't supported over a remote desktop connection. Your kiosk users must sign in on the physical device that is set up as a kiosk. +[!INCLUDE [assigned-access-kiosk-mode](../../includes/licensing/assigned-access-kiosk-mode.md)] + ## Methods for a single-app kiosk running a UWP app You can use this method | For this edition | For this kiosk account type diff --git a/windows/security/identity-protection/toc.yml b/windows/security/identity-protection/toc.yml index 27c8a6dad3..3190bc8236 100644 --- a/windows/security/identity-protection/toc.yml +++ b/windows/security/identity-protection/toc.yml @@ -7,7 +7,7 @@ items: items: - name: Windows Hello for Business 🔗 href: hello-for-business/index.yml - - name: Windows presence sensing 🔗 + - name: Windows presence sensing href: https://support.microsoft.com/windows/wake-your-windows-11-pc-when-you-approach-82285c93-440c-4e15-9081-c9e38c1290bb - name: Windows Hello for Business Enhanced Security Sign-in (ESS) 🔗 href: /windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security diff --git a/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md b/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md index dbb586c517..cb05a5d266 100644 --- a/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md +++ b/windows/security/threat-protection/microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md @@ -50,6 +50,8 @@ Microsoft Defender SmartScreen provide an early warning system against websites > [!IMPORTANT] > SmartScreen protects against malicious files from the internet. It does not protect against malicious files on internal locations or network shares, such as shared folders with UNC paths or SMB/CIFS shares. +[!INCLUDE [microsoft-defender-smartscreen](../../../../includes/licensing/microsoft-defender-smartscreen.md)] + ## Submit files to Microsoft Defender SmartScreen for review If you believe a warning or block was incorrectly shown for a file or application, or if you believe an undetected file is malware, you can [submit a file](https://www.microsoft.com/wdsi/filesubmission/) to Microsoft for review. For more information, see [Submit files for analysis](/microsoft-365/security/intelligence/submission-guide). diff --git a/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md b/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md index 8597ee9893..58dea5e41a 100644 --- a/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md +++ b/windows/security/threat-protection/microsoft-defender-smartscreen/phishing-protection-microsoft-defender-smartscreen.md @@ -39,6 +39,8 @@ Enhanced Phishing Protection provides robust phishing protections for work or sc - **Easy management through Group Policy and Microsoft Intune:** Enhanced Phishing Protection works with Group Policy and mobile device management (MDM) settings to help you manage your organization's computer settings. Based on how you set up Enhanced Phishing Protection, you can customize which phishing protection scenarios will show users warning dialogs. For example, the Service Enabled setting determines whether the Enhanced Phishing Protection service is on or off. The feature will be in audit mode if the other settings, which correspond to notification policies, aren't enabled. +[!INCLUDE [enhanced-phishing-protection-with-smartscreen](../../../../includes/licensing/enhanced-phishing-protection-with-smartscreen.md)] + ## Configure Enhanced Phishing Protection for your organization Enhanced Phishing Protection can be configured via Microsoft Intune, Group Policy Objects (GPO) or Configuration Service Providers (CSP) with an MDM service. Follow the instructions below to configure your devices using either Microsoft Intune, GPO or CSP. diff --git a/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md b/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md index b6fcd28bd2..a29c0cb634 100644 --- a/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md +++ b/windows/security/threat-protection/protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md @@ -1,5 +1,5 @@ --- -title: Control the health of Windows 10-based devices (Windows 10) +title: Control the health of Windows devices description: This article details an end-to-end solution that helps you protect high-value assets by enforcing, controlling, and reporting the health of Windows 10-based devices. ms.prod: windows-client ms.date: 10/13/2017 @@ -11,7 +11,7 @@ manager: dougeby ms.topic: conceptual --- -# Control the health of Windows 10-based devices +# Control the health of Windows devices **Applies to** @@ -327,6 +327,8 @@ For Windows 10-based devices, Microsoft introduces a new public API that will al For more information on device health attestation, see the [Detect an unhealthy Windows 10-based device](#detect-unhealthy) section. +[!INCLUDE [device-health-attestation-service](../../../includes/licensing/device-health-attestation-service.md)] + ### Hardware requirements The following table details the hardware requirements for both virtualization-based security services and the health attestation feature. For more information, see [Minimum hardware requirements](/windows-hardware/design/minimum/minimum-hardware-requirements-overview). diff --git a/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md b/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md index 03d4f6bba0..301d74416d 100644 --- a/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md +++ b/windows/security/threat-protection/security-policy-settings/account-lockout-policy.md @@ -32,6 +32,8 @@ The following topics provide a discussion of each policy setting's implementatio >[!NOTE] >Account lockout settings for remote access clients can be configured separately by editing the Registry on the server that manages the remote access. For more information, see [How to configure remote access client account lockout](/troubleshoot/windows-server/networking/configure-remote-access-client-account-lockout). +[!INCLUDE [account-lockout-policy](../../../../includes/licensing/account-lockout-policy.md)] + ## In this section | Topic | Description | diff --git a/windows/security/threat-protection/security-policy-settings/security-policy-settings.md b/windows/security/threat-protection/security-policy-settings/security-policy-settings.md index e5a2bba1d9..5cac6b5f49 100644 --- a/windows/security/threat-protection/security-policy-settings/security-policy-settings.md +++ b/windows/security/threat-protection/security-policy-settings/security-policy-settings.md @@ -71,6 +71,8 @@ The Security Settings extension of the Local Group Policy Editor includes the fo - **IP Security Policies on Local Computer.** Specify settings to ensure private, secure communications over IP networks by using cryptographic security services. IPsec establishes trust and security from a source IP address to a destination IP address. - **Advanced Audit Policy Configuration.** Specify settings that control the logging of security events into the security log on the device. The settings under Advanced Audit Policy Configuration provide finer control over which activities to monitor as opposed to the Audit Policy settings under Local Policies. +[!INCLUDE [windows-security-policy-settings-and-auditing](../../../../includes/licensing/windows-security-policy-settings-and-auditing.md)] + ## Policy-based security settings management The Security Settings extension to Group Policy provides an integrated policy-based management infrastructure to help you manage and enforce your security policies. diff --git a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md index 161e563a19..a03dd12363 100644 --- a/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md +++ b/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules.md @@ -59,6 +59,8 @@ The blocklist is updated with each new major release of Windows, typically 1-2 t Customers who always want the most up-to-date driver blocklist can also use Windows Defender Application Control (WDAC) to apply the latest recommended driver blocklist contained in this article. For your convenience, we've provided a download of the most up-to-date vulnerable driver blocklist along with instructions to apply it on your computer at the end of this article. Otherwise, you can use the XML provided below to create your own custom WDAC policies. +[!INCLUDE [microsoft-vulnerable-driver-blocklist](../../../../includes/licensing/microsoft-vulnerable-driver-blocklist.md)] + ## Blocking vulnerable drivers using WDAC Microsoft recommends enabling [HVCI](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity) or S mode to protect your devices against security threats. If this setting isn't possible, Microsoft recommends blocking [this list of drivers](#vulnerable-driver-blocklist-xml) within your existing Windows Defender Application Control policy. Blocking kernel drivers without sufficient testing can cause devices or software to malfunction, and in rare cases, blue screen. It's recommended to first validate this policy in [audit mode](/windows/security/threat-protection/windows-defender-application-control/audit-windows-defender-application-control-policies) and review the audit block events. diff --git a/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security.md b/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security.md index 282125d3bd..a5468a9a20 100644 --- a/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security.md +++ b/windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security.md @@ -23,7 +23,7 @@ Windows Defender Firewall in Windows 8, Windows 7, Windows Vista, Windows Serv The Windows Defender Firewall with Advanced Security MMC snap-in is more flexible and provides much more functionality than the consumer-friendly Windows Defender Firewall interface found in the Control Panel. Both interfaces interact with the same underlying services, but provide different levels of control over those services. While the Windows Defender Firewall Control Panel program can protect a single device in a home environment, it doesn't provide enough centralized management or security features to help secure more complex network traffic found in a typical business enterprise environment. - +[!INCLUDE [windows-firewall](../../../../includes/licensing/windows-firewall.md)] ## Feature description diff --git a/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md b/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md index 74e81b1a05..8f3d7bd7de 100644 --- a/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md +++ b/windows/security/threat-protection/windows-sandbox/windows-sandbox-overview.md @@ -32,10 +32,10 @@ Windows Sandbox has the following properties: > [!IMPORTANT] > Windows Sandbox enables network connection by default. It can be disabled using the [Windows Sandbox configuration file](/windows/security/threat-protection/windows-sandbox/windows-sandbox-configure-using-wsb-file#networking). +[!INCLUDE [windows-sandbox](../../../../includes/licensing/windows-sandbox.md)] + ## Prerequisites -- Windows 10, version 1903 and later, or Windows 11 -- Windows Pro, Enterprise or Education edition - ARM64 (for Windows 11, version 22H2 and later) or AMD64 architecture - Virtualization capabilities enabled in BIOS - At least 4 GB of RAM (8 GB recommended) diff --git a/windows/security/trusted-boot.md b/windows/security/trusted-boot.md index ad5c50ecc7..8790964196 100644 --- a/windows/security/trusted-boot.md +++ b/windows/security/trusted-boot.md @@ -29,6 +29,8 @@ Trusted Boot picks up the process that started with Secure Boot. The Windows boo Often, Windows can automatically repair the corrupted component, restoring the integrity of Windows and allowing the Windows 11 device to start normally. +[!INCLUDE [secure-boot-and-trusted-boot](../../includes/licensing/secure-boot-and-trusted-boot.md)] + ## See also [Secure the Windows boot process](information-protection/secure-the-windows-10-boot-process.md) \ No newline at end of file From 760dd104cda1fbaab04f3c1fb3c904ac4f2cf874 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 1 May 2023 17:45:50 -0400 Subject: [PATCH 43/65] updates --- windows/whats-new/windows-licensing.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index 5081043db0..2711f886ba 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -59,7 +59,7 @@ There are two core Windows 11 Enterprise offers: **Windows 11 Enterprise E3** an Windows 11 Enterprise E3 builds on Windows 11 Pro by adding more advanced features designed to address the needs of large and mid-size organizations. Examples include advanced protection against modern security threats, the broadest range of options for operating system deployment and update, and comprehensive device and app management. > [!NOTE] -> Windows 11 Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. +> Windows Enterprise E3 is a **per user subscription**, intended for organizations. It includes **Windows Enterprise edition** with cloud-powered capabilities and **subscription use rights**. Windows Enterprise E3 is usually licensed through Volume Licensing programs and is an upgrade from Windows Pro. #### Windows 11 Enterprise features @@ -97,7 +97,8 @@ The following table describes the Windows Enterprise licensing use rights: |-|-| |**[Five Windows instances per licensed user](https://www.microsoft.com/licensing/terms/productoffering/WindowsDesktopOperatingSystem/EAEAS)**|Allows your employees to simultaneously use a Windows laptop, a cloud PC and a specialized device with Windows LTSC, and more.| |**[36 months (3 years) support on annual feature releases](/windows/release-health/supported-versions-windows-client#enterprise-and-iot-enterprise-ltsbltsc-editions)**|Get extra time to deploy feature releases.| -|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible work styles and smarter work with the included virtualization access rights.| +|**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|Empower flexible work styles and smarter work with the included virtualization access rights. Includes FSLogix for a consistent experience of +Windows user profiles in virtual desktop environments.| |**[Windows release health in the Microsoft 365 admin center](https://aka.ms/WindowsReleaseHealthinM365)**|Gives you essential information about monthly quality and feature updates in the Microsoft 365 admin center.| |**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Provides per-device information about compatibility risks that are associated with an upgrade or update to a chosen version of Windows.| |**[Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports)**|Provides a summary view of the top compatibility risks, so you understand which compatibility risks impact the greatest number of devices in your organization.| @@ -130,7 +131,9 @@ In most cases, the Windows Pro edition comes pre-installed on a business-class d - Devices not properly provisioned that don't automatically upgrade to Windows Enterprise edition - Devices may have been acquired for a business process that was not under control of a central IT department or outside of the IT department's knowledge +- Devices may be used temporarily for a project by vendors and added to the IT infrastructure, but not upgraded to Enterprise edition - A developer that is developing applications that must be tested and certified on Pro, as that is how it will be delivered to customers +- A Windows Pro device that was pre-configured for a specific purpose and is certified on Pro only In these cases, you want the PC to be configured, secured, monitored, and updated with the enterprise management and security tools that come with the Windows Enterprise user subscription. Your Windows Enterprise E3 subscriptions does not block these scenarios. From 2fb823ed03a1997b42af79d367b4bca8493caf66 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Mon, 1 May 2023 17:59:11 -0400 Subject: [PATCH 44/65] updates --- windows/whats-new/windows-licensing.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/whats-new/windows-licensing.md b/windows/whats-new/windows-licensing.md index 2711f886ba..e45dbf9886 100644 --- a/windows/whats-new/windows-licensing.md +++ b/windows/whats-new/windows-licensing.md @@ -137,19 +137,19 @@ In most cases, the Windows Pro edition comes pre-installed on a business-class d In these cases, you want the PC to be configured, secured, monitored, and updated with the enterprise management and security tools that come with the Windows Enterprise user subscription. Your Windows Enterprise E3 subscriptions does not block these scenarios. -The following table lists the Windows 11 Enterprise features and their applicability to Windows Pro and Enterprise editions: +The following table lists the Windows 11 Enterprise features and their Windows edition requirements: | OS-based feature |Windows Pro|Windows Enterprise| |-|-|-| -|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|No|Yes| +|**[Windows Defender Credential Guard](/windows/security/identity-protection/credential-guard/credential-guard)**|❌|Yes| |**[Microsoft Defender Application Guard (MDAG) for Microsoft Edge](/deployedge/microsoft-edge-security-windows-defender-application-guard)**|Yes|Yes| |**[Modern BitLocker Management](/windows/security/information-protection/bitlocker/bitlocker-overview)**|Yes|Yes| -|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|No|Yes| +|**[Personal data encryption (PDE)](/windows/security/information-protection/personal-data-encryption/overview-pde)**|❌|Yes| |**[Direct Access](/windows-server/remote/remote-access/directaccess/directaccess)**|Yes|Yes| |**[Always On VPN](/windows-server/remote/remote-access/vpn/always-on-vpn/)**|Yes|Yes| -|**[Windows Experience customization](/windows/client-management/mdm/policy-csp-experience)**|No|Yes| +|**[Windows Experience customization](/windows/client-management/mdm/policy-csp-experience)**|❌|Yes| -The following table lists the Windows 11 Enterprise cloud-based features and their applicability to Windows Pro and Enterprise editions: +The following table lists the Windows 11 Enterprise cloud-based features and their Windows edition requirements: | Cloud-based feature |Windows Pro|Windows Enterprise| |-|-|-| @@ -159,14 +159,14 @@ The following table lists the Windows 11 Enterprise cloud-based features and the |**[Universal Print](/universal-print/)**|Yes|Yes| |**[Microsoft Connected Cache](/windows/deployment/do/waas-microsoft-connected-cache)**|Yes|Yes| |**[Endpoint analytics proactive remediation](/mem/analytics/overview)**|Yes|Yes| -|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|No|Yes| +|**[Organizational messages](/mem/intune/remote-actions/organizational-messages-overview)**|❌|Yes| -The following table lists the Windows 11 Enterprise E3 licensing use rights and their applicability to Windows Pro and Enterprise editions: +The following table lists the Windows 11 Enterprise E3 licensing use rights and their Windows edition requirements: |Licensing use rights|Windows Pro|Windows Enterprise| |-|-|-| |**[Five Windows instances per licensed user](https://www.microsoft.com/licensing/terms/productoffering/WindowsDesktopOperatingSystem/EAEAS)**|n/a|n/a| -|**[36 months (3 years) support on annual feature releases](/windows/release-health/supported-versions-windows-client#enterprise-and-iot-enterprise-ltsbltsc-editions)**|No|Yes| +|**[36 months (3 years) support on annual feature releases](/windows/release-health/supported-versions-windows-client#enterprise-and-iot-enterprise-ltsbltsc-editions)**|❌|Yes| |**[Azure Virtual Desktop, Windows 365 Enterprise and Virtual Desktop Access](/azure/virtual-desktop/prerequisites#operating-systems-and-licenses)**|n/a|n/a| |**[Windows release health in the Microsoft 365 admin center](https://aka.ms/WindowsReleaseHealthinM365)**|n/a|n/a| |**[Windows feature update device readiness report](/mem/intune/protect/windows-update-compatibility-reports)**|Yes|Yes| From e05711b29996ad32d33e91181728d5c8a910dd9b Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 2 May 2023 13:36:28 -0400 Subject: [PATCH 45/65] generated new include fiiles --- includes/licensing/_edition-requirements.md | 10 ++++----- includes/licensing/_licensing-requirements.md | 10 ++++----- .../licensing/access-control-aclsscals.md | 2 +- includes/licensing/account-lockout-policy.md | 2 +- .../licensing/always-on-vpn-device-tunnel.md | 2 +- .../licensing/assigned-access-kiosk-mode.md | 2 +- .../licensing/attack-surface-reduction-asr.md | 2 +- ...d-azure-ad-join-with-single-sign-on-sso.md | 2 +- includes/licensing/bitlocker.md | 2 +- ...tooth-pairing-and-connection-protection.md | 2 +- .../common-criteria-certifications.md | 2 +- .../licensing/controlled-folder-access.md | 2 +- .../device-health-attestation-service.md | 2 +- includes/licensing/direct-access.md | 2 +- includes/licensing/email-encryption-smime.md | 2 +- includes/licensing/encrypted-hard-drive.md | 2 +- ...ed-phishing-protection-with-smartscreen.md | 2 +- includes/licensing/exploit-protection.md | 2 +- ...fast-identity-online-fido2-security-key.md | 2 +- ...processing-standard-fips-140-validation.md | 2 +- includes/licensing/federated-sign-in.md | 6 ++--- .../hardware-enforced-stack-protection.md | 2 +- ...ypervisor-protected-code-integrity-hvci.md | 2 +- ...nel-direct-memory-access-dma-protection.md | 2 +- .../local-administrator-password-solution.md | 22 ------------------- ...local-security-authority-lsa-protection.md | 2 +- ...-device-management-mdm-and-group-policy.md | 2 +- includes/licensing/measured-boot.md | 2 +- .../licensing/microsoft-defender-antivirus.md | 2 +- ...pplication-guard-mdag-configure-via-mdm.md | 2 +- ...terprise-mode-and-enterprise-management.md | 2 +- ...ion-guard-mdag-for-edge-standalone-mode.md | 2 +- ...ication-guard-mdag-for-microsoft-office.md | 2 +- ...nder-application-guard-mdag-public-apis.md | 2 +- .../microsoft-defender-for-endpoint.md | 4 ++-- .../microsoft-defender-smartscreen.md | 2 +- .../microsoft-pluton-security-processor.md | 2 +- .../microsoft-vulnerable-driver-blocklist.md | 2 +- .../opportunistic-wireless-encryption-owe.md | 2 +- .../licensing/personal-data-encryption-pde.md | 2 +- includes/licensing/privacy-resource-usage.md | 2 +- .../privacy-transparency-and-controls.md | 2 +- ...wipe-autopilot-reset.md => remote-wipe.md} | 6 ++--- .../licensing/secure-boot-and-trusted-boot.md | 2 +- .../secured-core-configuration-lock.md | 2 +- includes/licensing/secured-core-pc.md | 2 +- ...s-with-intune.md => security-baselines.md} | 6 ++--- .../server-message-block-direct-smb-direct.md | 2 +- .../server-message-block-smb-file-service.md | 2 +- includes/licensing/smart-app-control.md | 2 +- .../smart-cards-for-windows-service.md | 2 +- .../tamper-protection-settings-for-mde.md | 2 +- .../licensing/transport-layer-security-tls.md | 2 +- .../trusted-platform-module-tpm-20.md | 2 +- includes/licensing/universal-print.md | 4 ++-- .../licensing/user-account-control-uac.md | 2 +- .../licensing/virtual-private-network-vpn.md | 2 +- .../virtualization-based-security-vbs.md | 2 +- includes/licensing/wifi-security.md | 2 +- includes/licensing/windows-autopatch.md | 2 +- includes/licensing/windows-autopilot.md | 2 +- includes/licensing/windows-containers.md | 2 +- ...ndows-defender-application-control-wdac.md | 2 +- .../windows-defender-credential-guard.md | 2 +- ...indows-defender-remote-credential-guard.md | 2 +- .../windows-defender-system-guard.md | 2 +- includes/licensing/windows-firewall.md | 2 +- ...-business-enhanced-security-sign-in-ess.md | 2 +- .../licensing/windows-hello-for-business.md | 2 +- includes/licensing/windows-laps.md | 2 +- .../licensing/windows-presence-sensing.md | 2 +- includes/licensing/windows-sandbox.md | 2 +- ...s-security-policy-settings-and-auditing.md | 2 +- 73 files changed, 88 insertions(+), 110 deletions(-) delete mode 100644 includes/licensing/local-administrator-password-solution.md rename includes/licensing/{remote-wipe-autopilot-reset.md => remote-wipe.md} (81%) rename includes/licensing/{security-baselines-with-intune.md => security-baselines.md} (81%) diff --git a/includes/licensing/_edition-requirements.md b/includes/licensing/_edition-requirements.md index 8f7e70b8b4..ba1ba8a093 100644 --- a/includes/licensing/_edition-requirements.md +++ b/includes/licensing/_edition-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/27/2023 +ms.date: 05/02/2023 ms.topic: include --- @@ -29,7 +29,7 @@ The following table lists the security features that are available in Windows, a |**[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)**|❌|❌|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| +|**[Hypervisor-protected Code Integrity (HVCI)](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity)**|Yes|Yes|Yes|Yes| |**[Kernel Direct Memory Access (DMA) protection](/windows/security/information-protection/kernel-dma-protection-for-thunderbolt)**|Yes|Yes|Yes|Yes| |**Local Security Authority (LSA) Protection**|Yes|Yes|Yes|Yes| |**[Manage by Mobile Device Management (MDM) and group policy](/windows/client-management/mdm/mdm-overview)**|Yes|Yes|Yes|Yes| @@ -43,16 +43,16 @@ The following table lists the security features that are available in Windows, a |**[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](/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)**|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)**|❌|Yes|❌|Yes| |**Privacy Resource Usage**|Yes|Yes|Yes|Yes| |**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes| -|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes| +|**[Remote wipe](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes| |**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes| |**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes| |**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes| -|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes| +|**[Security baselines](/windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines)**|Yes|Yes|Yes|Yes| |**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes| |**[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| diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md index 9e822cdbe0..3f82675929 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/27/2023 +ms.date: 05/02/2023 ms.topic: include --- @@ -29,7 +29,7 @@ The following table lists the security features that are available in Windows, a |**[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)**|❌|❌|❌|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| +|**[Hypervisor-protected Code Integrity (HVCI)](/windows/security/threat-protection/device-guard/enable-virtualization-based-protection-of-code-integrity)**|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 Security Authority (LSA) Protection**|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| @@ -43,16 +43,16 @@ The following table lists the security features that are available in Windows, a |**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|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](/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)**|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)**|❌|Yes|Yes|Yes|Yes| |**Privacy Resource Usage**|Yes|Yes|Yes|Yes|Yes| |**Privacy Transparency and Controls**|Yes|Yes|Yes|Yes|Yes| -|**[Remote wipe (Autopilot reset)](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes|Yes| +|**[Remote wipe](/windows/client-management/mdm/remotewipe-csp)**|Yes|Yes|Yes|Yes|Yes| |**[Secure Boot and Trusted Boot](/windows/security/trusted-boot)**|Yes|Yes|Yes|Yes|Yes| |**[Secured-core configuration lock](/windows/client-management/config-lock)**|Yes|Yes|Yes|Yes|Yes| |**[Secured-core PC](/windows-hardware/design/device-experiences/oem-highly-secure-11)**|Yes|Yes|Yes|Yes|Yes| -|**[Security baselines with Intune](/mem/intune/protect/security-baselines)**|Yes|Yes|Yes|Yes|Yes| +|**[Security baselines](/windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines)**|Yes|Yes|Yes|Yes|Yes| |**[Server Message Block (SMB) file service](/windows-server/storage/file-server/file-server-smb-overview)**|Yes|Yes|Yes|Yes|Yes| |**[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| diff --git a/includes/licensing/access-control-aclsscals.md b/includes/licensing/access-control-aclsscals.md index 028929c987..fee9b83dd3 100644 --- a/includes/licensing/access-control-aclsscals.md +++ b/includes/licensing/access-control-aclsscals.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/account-lockout-policy.md b/includes/licensing/account-lockout-policy.md index 9d28314c22..31328de6f2 100644 --- a/includes/licensing/account-lockout-policy.md +++ b/includes/licensing/account-lockout-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/always-on-vpn-device-tunnel.md b/includes/licensing/always-on-vpn-device-tunnel.md index 165e3355ce..5b43ce08c3 100644 --- a/includes/licensing/always-on-vpn-device-tunnel.md +++ b/includes/licensing/always-on-vpn-device-tunnel.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/assigned-access-kiosk-mode.md b/includes/licensing/assigned-access-kiosk-mode.md index 0aacfd0d54..bfc00c4cc6 100644 --- a/includes/licensing/assigned-access-kiosk-mode.md +++ b/includes/licensing/assigned-access-kiosk-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/attack-surface-reduction-asr.md b/includes/licensing/attack-surface-reduction-asr.md index bdfa84be11..e2c046e4dd 100644 --- a/includes/licensing/attack-surface-reduction-asr.md +++ b/includes/licensing/attack-surface-reduction-asr.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/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/azure-ad-join-active-directory-domain-join-and-hybrid-azure-ad-join-with-single-sign-on-sso.md index a2348b9f96..87edf7eca7 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/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/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/bitlocker.md b/includes/licensing/bitlocker.md index e1d0482a14..38e2b82e71 100644 --- a/includes/licensing/bitlocker.md +++ b/includes/licensing/bitlocker.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/bluetooth-pairing-and-connection-protection.md b/includes/licensing/bluetooth-pairing-and-connection-protection.md index ea7d847692..616dd12ead 100644 --- a/includes/licensing/bluetooth-pairing-and-connection-protection.md +++ b/includes/licensing/bluetooth-pairing-and-connection-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/common-criteria-certifications.md b/includes/licensing/common-criteria-certifications.md index 67da2eaa80..53c559c7d6 100644 --- a/includes/licensing/common-criteria-certifications.md +++ b/includes/licensing/common-criteria-certifications.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/controlled-folder-access.md b/includes/licensing/controlled-folder-access.md index 6e8429962d..936de372ba 100644 --- a/includes/licensing/controlled-folder-access.md +++ b/includes/licensing/controlled-folder-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/device-health-attestation-service.md b/includes/licensing/device-health-attestation-service.md index 180599b676..cf90b200ad 100644 --- a/includes/licensing/device-health-attestation-service.md +++ b/includes/licensing/device-health-attestation-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/direct-access.md b/includes/licensing/direct-access.md index 32f1858423..d51c6033ed 100644 --- a/includes/licensing/direct-access.md +++ b/includes/licensing/direct-access.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/email-encryption-smime.md b/includes/licensing/email-encryption-smime.md index 1e613f7ea7..14711602db 100644 --- a/includes/licensing/email-encryption-smime.md +++ b/includes/licensing/email-encryption-smime.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/encrypted-hard-drive.md b/includes/licensing/encrypted-hard-drive.md index 7f8eabb4fc..f88b491816 100644 --- a/includes/licensing/encrypted-hard-drive.md +++ b/includes/licensing/encrypted-hard-drive.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md index c050417d86..a06a3d4d8a 100644 --- a/includes/licensing/enhanced-phishing-protection-with-smartscreen.md +++ b/includes/licensing/enhanced-phishing-protection-with-smartscreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/exploit-protection.md b/includes/licensing/exploit-protection.md index ee0105c7aa..b5ace06b04 100644 --- a/includes/licensing/exploit-protection.md +++ b/includes/licensing/exploit-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/fast-identity-online-fido2-security-key.md b/includes/licensing/fast-identity-online-fido2-security-key.md index 1fac120af3..6376058af8 100644 --- a/includes/licensing/fast-identity-online-fido2-security-key.md +++ b/includes/licensing/fast-identity-online-fido2-security-key.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/federal-information-processing-standard-fips-140-validation.md b/includes/licensing/federal-information-processing-standard-fips-140-validation.md index 4f43d3d758..cba61d9588 100644 --- a/includes/licensing/federal-information-processing-standard-fips-140-validation.md +++ b/includes/licensing/federal-information-processing-standard-fips-140-validation.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index c1d9f41946..c1492f2b19 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- @@ -15,8 +15,8 @@ The following table lists the Windows editions that support Federated sign-in: Federated sign-in license entitlements are granted by the following licenses: -|Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| +|Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|No|No|Yes|Yes| +|No|No|No|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/hardware-enforced-stack-protection.md b/includes/licensing/hardware-enforced-stack-protection.md index 7d197bf299..289501a6a5 100644 --- a/includes/licensing/hardware-enforced-stack-protection.md +++ b/includes/licensing/hardware-enforced-stack-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/hypervisor-protected-code-integrity-hvci.md b/includes/licensing/hypervisor-protected-code-integrity-hvci.md index 659a1e1a0f..ba0cf1484b 100644 --- a/includes/licensing/hypervisor-protected-code-integrity-hvci.md +++ b/includes/licensing/hypervisor-protected-code-integrity-hvci.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/kernel-direct-memory-access-dma-protection.md b/includes/licensing/kernel-direct-memory-access-dma-protection.md index c07f32a3f1..a171311457 100644 --- a/includes/licensing/kernel-direct-memory-access-dma-protection.md +++ b/includes/licensing/kernel-direct-memory-access-dma-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/local-administrator-password-solution.md b/includes/licensing/local-administrator-password-solution.md deleted file mode 100644 index a7f5eb6aba..0000000000 --- a/includes/licensing/local-administrator-password-solution.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -author: paolomatarazzo -ms.author: paoloma -ms.date: 04/25/2023 -ms.topic: include ---- - -## Windows edition and licensing requirements - -The following table lists the Windows editions that support Local Administrator Password Solution: - -|Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| -|:---:|:---:|:---:|:---:| -|Yes|Yes|Yes|Yes| - -Local Administrator Password Solution 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 licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/local-security-authority-lsa-protection.md b/includes/licensing/local-security-authority-lsa-protection.md index f6b948f1a1..ac5cd05741 100644 --- a/includes/licensing/local-security-authority-lsa-protection.md +++ b/includes/licensing/local-security-authority-lsa-protection.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md index d0c8d30dd4..b852cf0a2a 100644 --- a/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md +++ b/includes/licensing/manage-by-mobile-device-management-mdm-and-group-policy.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/measured-boot.md b/includes/licensing/measured-boot.md index 873dd51db8..95c9ef12a9 100644 --- a/includes/licensing/measured-boot.md +++ b/includes/licensing/measured-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-antivirus.md b/includes/licensing/microsoft-defender-antivirus.md index 08df5e0218..8fc1f42bb6 100644 --- a/includes/licensing/microsoft-defender-antivirus.md +++ b/includes/licensing/microsoft-defender-antivirus.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md index e754997c7a..fb9dae35ef 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-configure-via-mdm.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/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/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md index 9dc9d2c111..0090aef8d1 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-enterprise-mode-and-enterprise-management.md +++ b/includes/licensing/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/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md index fe5677e4eb..a87ab98c51 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-edge-standalone-mode.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md index 3cbb70aa69..8b646454f9 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-for-microsoft-office.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md index eeaf93367e..61f06b5748 100644 --- a/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md +++ b/includes/licensing/microsoft-defender-application-guard-mdag-public-apis.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-defender-for-endpoint.md b/includes/licensing/microsoft-defender-for-endpoint.md index 312be13a46..a730169279 100644 --- a/includes/licensing/microsoft-defender-for-endpoint.md +++ b/includes/licensing/microsoft-defender-for-endpoint.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- @@ -17,6 +17,6 @@ Microsoft Defender for Endpoint license entitlements are granted by the followin |Windows Pro/Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| -|Yes|No|Yes|No|Yes| +|No|No|Yes|No|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/microsoft-defender-smartscreen.md b/includes/licensing/microsoft-defender-smartscreen.md index ff95861177..1f1233e529 100644 --- a/includes/licensing/microsoft-defender-smartscreen.md +++ b/includes/licensing/microsoft-defender-smartscreen.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-pluton-security-processor.md b/includes/licensing/microsoft-pluton-security-processor.md index d0f93bcb7c..fef0a04f28 100644 --- a/includes/licensing/microsoft-pluton-security-processor.md +++ b/includes/licensing/microsoft-pluton-security-processor.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/microsoft-vulnerable-driver-blocklist.md b/includes/licensing/microsoft-vulnerable-driver-blocklist.md index 98dd69ad55..2e0d09d51c 100644 --- a/includes/licensing/microsoft-vulnerable-driver-blocklist.md +++ b/includes/licensing/microsoft-vulnerable-driver-blocklist.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/opportunistic-wireless-encryption-owe.md b/includes/licensing/opportunistic-wireless-encryption-owe.md index 953cb81211..c2db27f073 100644 --- a/includes/licensing/opportunistic-wireless-encryption-owe.md +++ b/includes/licensing/opportunistic-wireless-encryption-owe.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/personal-data-encryption-pde.md b/includes/licensing/personal-data-encryption-pde.md index 5626b57d96..e55327fa5a 100644 --- a/includes/licensing/personal-data-encryption-pde.md +++ b/includes/licensing/personal-data-encryption-pde.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/privacy-resource-usage.md b/includes/licensing/privacy-resource-usage.md index 2bea08f5e1..2726b9940a 100644 --- a/includes/licensing/privacy-resource-usage.md +++ b/includes/licensing/privacy-resource-usage.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/privacy-transparency-and-controls.md b/includes/licensing/privacy-transparency-and-controls.md index 2fec75d8c4..45c5829016 100644 --- a/includes/licensing/privacy-transparency-and-controls.md +++ b/includes/licensing/privacy-transparency-and-controls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/remote-wipe-autopilot-reset.md b/includes/licensing/remote-wipe.md similarity index 81% rename from includes/licensing/remote-wipe-autopilot-reset.md rename to includes/licensing/remote-wipe.md index c68c8ad2ed..f9f9cb9973 100644 --- a/includes/licensing/remote-wipe-autopilot-reset.md +++ b/includes/licensing/remote-wipe.md @@ -1,19 +1,19 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- ## Windows edition and licensing requirements -The following table lists the Windows editions that support Remote wipe (Autopilot reset): +The following table lists the Windows editions that support Remote wipe: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes| -Remote wipe (Autopilot reset) license entitlements are granted by the following licenses: +Remote wipe 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| |:---:|:---:|:---:|:---:|:---:| diff --git a/includes/licensing/secure-boot-and-trusted-boot.md b/includes/licensing/secure-boot-and-trusted-boot.md index 53b48d99cc..eb8e3f243b 100644 --- a/includes/licensing/secure-boot-and-trusted-boot.md +++ b/includes/licensing/secure-boot-and-trusted-boot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/secured-core-configuration-lock.md b/includes/licensing/secured-core-configuration-lock.md index dddf8843a4..4fca24c0c8 100644 --- a/includes/licensing/secured-core-configuration-lock.md +++ b/includes/licensing/secured-core-configuration-lock.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/secured-core-pc.md b/includes/licensing/secured-core-pc.md index 8fca64cb2c..4b939c510e 100644 --- a/includes/licensing/secured-core-pc.md +++ b/includes/licensing/secured-core-pc.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/security-baselines-with-intune.md b/includes/licensing/security-baselines.md similarity index 81% rename from includes/licensing/security-baselines-with-intune.md rename to includes/licensing/security-baselines.md index 43b5f384ab..eece64a0d4 100644 --- a/includes/licensing/security-baselines-with-intune.md +++ b/includes/licensing/security-baselines.md @@ -1,19 +1,19 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- ## Windows edition and licensing requirements -The following table lists the Windows editions that support Security baselines with Intune: +The following table lists the Windows editions that support Security baselines: |Windows Pro|Windows Enterprise|Windows Pro Education/SE|Windows Education| |:---:|:---:|:---:|:---:| |Yes|Yes|Yes|Yes| -Security baselines with Intune license entitlements are granted by the following licenses: +Security baselines 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| |:---:|:---:|:---:|:---:|:---:| diff --git a/includes/licensing/server-message-block-direct-smb-direct.md b/includes/licensing/server-message-block-direct-smb-direct.md index 1b76968707..08fcde873f 100644 --- a/includes/licensing/server-message-block-direct-smb-direct.md +++ b/includes/licensing/server-message-block-direct-smb-direct.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/server-message-block-smb-file-service.md b/includes/licensing/server-message-block-smb-file-service.md index f39db20a54..badab98137 100644 --- a/includes/licensing/server-message-block-smb-file-service.md +++ b/includes/licensing/server-message-block-smb-file-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/smart-app-control.md b/includes/licensing/smart-app-control.md index cfb6c198a6..92cf1df0fb 100644 --- a/includes/licensing/smart-app-control.md +++ b/includes/licensing/smart-app-control.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/smart-cards-for-windows-service.md b/includes/licensing/smart-cards-for-windows-service.md index b7a9d46f11..e3631ecafc 100644 --- a/includes/licensing/smart-cards-for-windows-service.md +++ b/includes/licensing/smart-cards-for-windows-service.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/tamper-protection-settings-for-mde.md b/includes/licensing/tamper-protection-settings-for-mde.md index 06a01236ec..4a347eb0ad 100644 --- a/includes/licensing/tamper-protection-settings-for-mde.md +++ b/includes/licensing/tamper-protection-settings-for-mde.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/transport-layer-security-tls.md b/includes/licensing/transport-layer-security-tls.md index d0f2b933b2..0827acbdda 100644 --- a/includes/licensing/transport-layer-security-tls.md +++ b/includes/licensing/transport-layer-security-tls.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/trusted-platform-module-tpm-20.md b/includes/licensing/trusted-platform-module-tpm-20.md index 4b5197dd74..507e3a42d3 100644 --- a/includes/licensing/trusted-platform-module-tpm-20.md +++ b/includes/licensing/trusted-platform-module-tpm-20.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/universal-print.md b/includes/licensing/universal-print.md index 46f0afd2c6..42112d1a59 100644 --- a/includes/licensing/universal-print.md +++ b/includes/licensing/universal-print.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- @@ -17,6 +17,6 @@ Universal Print 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| +|No|Yes|Yes|Yes|Yes| For more information about Windows licensing, see [Windows licensing overview](/windows/whats-new/windows-licensing). diff --git a/includes/licensing/user-account-control-uac.md b/includes/licensing/user-account-control-uac.md index dca8cb0915..152ee532fe 100644 --- a/includes/licensing/user-account-control-uac.md +++ b/includes/licensing/user-account-control-uac.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/virtual-private-network-vpn.md b/includes/licensing/virtual-private-network-vpn.md index 61de672ee8..0749a1c128 100644 --- a/includes/licensing/virtual-private-network-vpn.md +++ b/includes/licensing/virtual-private-network-vpn.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/virtualization-based-security-vbs.md b/includes/licensing/virtualization-based-security-vbs.md index de05ea5d8e..65478e19ff 100644 --- a/includes/licensing/virtualization-based-security-vbs.md +++ b/includes/licensing/virtualization-based-security-vbs.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/wifi-security.md b/includes/licensing/wifi-security.md index 9507a7618a..b48b88988a 100644 --- a/includes/licensing/wifi-security.md +++ b/includes/licensing/wifi-security.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-autopatch.md b/includes/licensing/windows-autopatch.md index f67e2b5216..40aa73aa2e 100644 --- a/includes/licensing/windows-autopatch.md +++ b/includes/licensing/windows-autopatch.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-autopilot.md b/includes/licensing/windows-autopilot.md index 9c57cdb899..e0817f4ba8 100644 --- a/includes/licensing/windows-autopilot.md +++ b/includes/licensing/windows-autopilot.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-containers.md b/includes/licensing/windows-containers.md index 0e4df6dcb8..bcf079d6d5 100644 --- a/includes/licensing/windows-containers.md +++ b/includes/licensing/windows-containers.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-application-control-wdac.md b/includes/licensing/windows-defender-application-control-wdac.md index 3f81db1b61..b773a00934 100644 --- a/includes/licensing/windows-defender-application-control-wdac.md +++ b/includes/licensing/windows-defender-application-control-wdac.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-credential-guard.md b/includes/licensing/windows-defender-credential-guard.md index d55e33af47..5acd060ced 100644 --- a/includes/licensing/windows-defender-credential-guard.md +++ b/includes/licensing/windows-defender-credential-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-remote-credential-guard.md b/includes/licensing/windows-defender-remote-credential-guard.md index 51feb6043b..afdb6dbff1 100644 --- a/includes/licensing/windows-defender-remote-credential-guard.md +++ b/includes/licensing/windows-defender-remote-credential-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-defender-system-guard.md b/includes/licensing/windows-defender-system-guard.md index b4f7577506..c57688c93f 100644 --- a/includes/licensing/windows-defender-system-guard.md +++ b/includes/licensing/windows-defender-system-guard.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-firewall.md b/includes/licensing/windows-firewall.md index 12b7254fb9..4527a2042d 100644 --- a/includes/licensing/windows-firewall.md +++ b/includes/licensing/windows-firewall.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- 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 index 0b8095a9f8..76395b418b 100644 --- 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 @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-hello-for-business.md b/includes/licensing/windows-hello-for-business.md index cb8ec101ad..7f8dafb43e 100644 --- a/includes/licensing/windows-hello-for-business.md +++ b/includes/licensing/windows-hello-for-business.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-laps.md b/includes/licensing/windows-laps.md index dd378de2be..2bc6001b15 100644 --- a/includes/licensing/windows-laps.md +++ b/includes/licensing/windows-laps.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/27/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-presence-sensing.md b/includes/licensing/windows-presence-sensing.md index 25eda4a8de..7f941aa6ff 100644 --- a/includes/licensing/windows-presence-sensing.md +++ b/includes/licensing/windows-presence-sensing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-sandbox.md b/includes/licensing/windows-sandbox.md index 1b23c6f198..bf4a39123f 100644 --- a/includes/licensing/windows-sandbox.md +++ b/includes/licensing/windows-sandbox.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- diff --git a/includes/licensing/windows-security-policy-settings-and-auditing.md b/includes/licensing/windows-security-policy-settings-and-auditing.md index 0fabeddb20..7582a2d315 100644 --- a/includes/licensing/windows-security-policy-settings-and-auditing.md +++ b/includes/licensing/windows-security-policy-settings-and-auditing.md @@ -1,7 +1,7 @@ --- author: paolomatarazzo ms.author: paoloma -ms.date: 04/25/2023 +ms.date: 05/02/2023 ms.topic: include --- From 906ff15a786f49a897c72f912788014515c82187 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 2 May 2023 13:48:36 -0400 Subject: [PATCH 46/65] updates --- education/windows/autopilot-reset.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/education/windows/autopilot-reset.md b/education/windows/autopilot-reset.md index 15b7d22d04..adc2f3d815 100644 --- a/education/windows/autopilot-reset.md +++ b/education/windows/autopilot-reset.md @@ -20,8 +20,6 @@ To enable Autopilot Reset you must: 1. [Enable the policy for the feature](#enable-autopilot-reset) 2. [Trigger a reset for each device](#trigger-autopilot-reset) -[!INCLUDE [remote-wipe-autopilot-reset](../../includes/licensing/remote-wipe-autopilot-reset.md)] - ## Enable Autopilot Reset To use Autopilot Reset, [Windows Recovery Environment (WinRE) must be enabled on the device](#winre). From 96e4c2a792cd9a1aace97a62d2ea3e415a7619a5 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 2 May 2023 13:59:08 -0400 Subject: [PATCH 47/65] updates --- includes/licensing/_licensing-requirements.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/licensing/_licensing-requirements.md b/includes/licensing/_licensing-requirements.md index 3f82675929..afa913f660 100644 --- a/includes/licensing/_licensing-requirements.md +++ b/includes/licensing/_licensing-requirements.md @@ -40,7 +40,7 @@ The following table lists the security features that are available in Windows, a |**[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/office/application-guard-for-office-9e0fb9c2-ffad-43bf-8ba3-78f785fdba46)**|❌|❌|❌|❌|❌| |**Microsoft Defender Application Guard (MDAG) public APIs**|❌|Yes|Yes|Yes|Yes| -|**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|Yes|❌|Yes|❌|Yes| +|**[Microsoft Defender for Endpoint](/microsoft-365/security/defender-endpoint)**|❌|❌|Yes|❌|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](/windows/security/threat-protection/windows-defender-application-control/microsoft-recommended-driver-block-rules)**|Yes|Yes|Yes|Yes|Yes| @@ -60,7 +60,7 @@ The following table lists the security features that are available in Windows, a |**[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| +|**[Universal Print](/universal-print/)**|❌|Yes|Yes|Yes|Yes| |**[User Account Control (UAC)](/windows/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)](/windows-hardware/design/device-experiences/oem-vbs)**|Yes|Yes|Yes|Yes|Yes| From 8419154d82474f89a797e2cc470edbb0cccf85f6 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 2 May 2023 16:01:55 -0400 Subject: [PATCH 48/65] updates --- includes/licensing/federated-sign-in.md | 2 +- .../access-control/access-control.md | 2 ++ .../identity-protection/configure-s-mime.md | 2 ++ .../identity-protection/remote-credential-guard.md | 13 ++----------- ...-card-how-smart-card-sign-in-works-in-windows.md | 2 ++ .../user-account-control-overview.md | 2 ++ .../security/identity-protection/vpn/vpn-guide.md | 2 ++ .../bitlocker/bitlocker-overview.md | 2 ++ .../information-protection/encrypted-hard-drive.md | 2 ++ .../kernel-dma-protection-for-thunderbolt.md | 2 ++ .../personal-data-encryption/overview-pde.md | 2 ++ .../windows-security-baselines.md | 2 ++ 12 files changed, 23 insertions(+), 12 deletions(-) diff --git a/includes/licensing/federated-sign-in.md b/includes/licensing/federated-sign-in.md index c1492f2b19..7fbe9537a2 100644 --- a/includes/licensing/federated-sign-in.md +++ b/includes/licensing/federated-sign-in.md @@ -15,7 +15,7 @@ The following table lists the Windows editions that support Federated sign-in: Federated sign-in 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| +|Windows Pro Education/SE|Windows Enterprise E3|Windows Enterprise E5|Windows Education A3|Windows Education A5| |:---:|:---:|:---:|:---:|:---:| |No|No|No|Yes|Yes| diff --git a/windows/security/identity-protection/access-control/access-control.md b/windows/security/identity-protection/access-control/access-control.md index 6bec9ee14c..b1ca0e2e0f 100644 --- a/windows/security/identity-protection/access-control/access-control.md +++ b/windows/security/identity-protection/access-control/access-control.md @@ -39,6 +39,8 @@ This content set contains: - [Service Accounts](/windows-server/identity/ad-ds/manage/understand-service-accounts) - [Active Directory Security Groups](/windows-server/identity/ad-ds/manage/understand-security-groups) +[!INCLUDE [access-control-aclsscals](../../../../includes/licensing/access-control-aclsscals.md)] + ## Practical applications Administrators who use the supported version of Windows can refine the application and management of access control to objects and subjects to provide the following security: diff --git a/windows/security/identity-protection/configure-s-mime.md b/windows/security/identity-protection/configure-s-mime.md index 317ef89a50..510e690593 100644 --- a/windows/security/identity-protection/configure-s-mime.md +++ b/windows/security/identity-protection/configure-s-mime.md @@ -20,6 +20,8 @@ Encrypted messages can be read only by recipients who have a certificate. If you A digitally signed message reassures the recipient that the message hasn't been tampered with and verifies the identity of the sender. Recipients can only verify the digital signature if they're using an email client that supports S/MIME. +[!INCLUDE [email-encryption-smime](../../../includes/licensing/email-encryption-smime.md)] + ## Prerequisites - [S/MIME is enabled for Exchange accounts](/microsoft-365/security/office-365-security/s-mime-for-message-signing-and-encryption) (on-premises and Office 365). Users can't use S/MIME signing and encryption with a personal account such as Outlook.com. diff --git a/windows/security/identity-protection/remote-credential-guard.md b/windows/security/identity-protection/remote-credential-guard.md index 64e9869d2a..e80bc47f63 100644 --- a/windows/security/identity-protection/remote-credential-guard.md +++ b/windows/security/identity-protection/remote-credential-guard.md @@ -30,23 +30,14 @@ The following diagram helps you to understand how a standard Remote Desktop sess ![RDP connection to a server without Windows Defender Remote Credential Guard.png.](images/rdp-to-a-server-without-windows-defender-remote-credential-guard.png) -
- The following diagram helps you to understand how Windows Defender Remote Credential Guard works, what it helps to protect against, and compares it with the [Restricted Admin mode](https://social.technet.microsoft.com/wiki/contents/articles/32905.how-to-enable-restricted-admin-mode-for-remote-desktop.aspx) option: ![Windows Defender Remote Credential Guard.](images/windows-defender-remote-credential-guard-with-remote-admin-mode.png) -
As illustrated, Windows Defender Remote Credential Guard blocks NTLM (allowing only Kerberos), prevents Pass-the-Hash (PtH) attacks, and also prevents use of credentials after disconnection. -
-
Use the following table to compare different Remote Desktop connection security options: -
-
- - | Feature | Remote Desktop | Windows Defender Remote Credential Guard | Restricted Admin mode | |--------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | **Protection benefits** | Credentials on the server are not protected from Pass-the-Hash attacks. | User credentials remain on the client. An attacker can act on behalf of the user *only* when the session is ongoing | User logs on to the server as local administrator, so an attacker cannot act on behalf of the "domain user". Any attack is local to the server | @@ -58,12 +49,10 @@ Use the following table to compare different Remote Desktop connection security | **Multi-hop** | From the remote desktop, **you can connect through Remote Desktop to another computer** | From the remote desktop, you **can connect through Remote Desktop to another computer**. | Not allowed for user as the session is running as a local host account | | **Supported authentication** | Any negotiable protocol. | Kerberos only. | Any negotiable protocol | -
For further technical information, see [Remote Desktop Protocol](/windows/win32/termserv/remote-desktop-protocol) and [How Kerberos works](/previous-versions/windows/it-pro/windows-2000-server/cc961963(v=technet.10)). -
@@ -80,6 +69,8 @@ For further information on LAPS, see [Microsoft Security Advisory 3062591](https +[!INCLUDE [windows-defender-remote-credential-guard](../../../includes/licensing/windows-defender-remote-credential-guard.md)] + ## Remote Credential Guard requirements To use Windows Defender Remote Credential Guard, the Remote Desktop client and remote host must meet the following requirements: diff --git a/windows/security/identity-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md b/windows/security/identity-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md index a44e2533fc..5d498cb152 100644 --- a/windows/security/identity-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md +++ b/windows/security/identity-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md @@ -21,3 +21,5 @@ This topic for IT professional provides links to resources about the implementat - [Certificate Propagation Service](smart-card-certificate-propagation-service.md): Learn about how the certificate propagation service works when a smart card is inserted into a computer. - [Smart Card Removal Policy Service](smart-card-removal-policy-service.md): Learn about using Group Policy to control what happens when a user removes a smart card. + +[!INCLUDE [smart-cards-for-windows-service](../../../../includes/licensing/smart-cards-for-windows-service.md)] \ No newline at end of file diff --git a/windows/security/identity-protection/user-account-control/user-account-control-overview.md b/windows/security/identity-protection/user-account-control/user-account-control-overview.md index e85aae3ab9..ad89a60ec7 100644 --- a/windows/security/identity-protection/user-account-control/user-account-control-overview.md +++ b/windows/security/identity-protection/user-account-control/user-account-control-overview.md @@ -18,6 +18,8 @@ Other apps, especially those that were not specifically designed with security s When an app needs to run with more than standard user rights, UAC allows users to run apps with their administrator token (with administrative groups and privileges) instead of their default, standard user access token. Users continue to operate in the standard user security context, while enabling certain apps to run with elevated privileges, if needed. +[!INCLUDE [user-account-control-uac](../../../../includes/licensing/user-account-control-uac.md)] + ## Practical applications Admin Approval Mode in UAC helps prevent malware from silently installing without an administrator's knowledge. It also helps protect from inadvertent system-wide changes. Lastly, it can be used to enforce a higher level of compliance where administrators must actively consent or provide credentials for each administrative process. diff --git a/windows/security/identity-protection/vpn/vpn-guide.md b/windows/security/identity-protection/vpn/vpn-guide.md index 15f788082b..8a775eea81 100644 --- a/windows/security/identity-protection/vpn/vpn-guide.md +++ b/windows/security/identity-protection/vpn/vpn-guide.md @@ -14,6 +14,8 @@ To create a Windows 10 VPN device configuration profile see: [Windows 10 and Win > [!NOTE] > This guide does not explain server deployment. +[!INCLUDE [virtual-private-network-vpn](../../../../includes/licensing/virtual-private-network-vpn.md)] + ## In this guide | Article | Description | diff --git a/windows/security/information-protection/bitlocker/bitlocker-overview.md b/windows/security/information-protection/bitlocker/bitlocker-overview.md index a3b7a72ca1..d6c02185e3 100644 --- a/windows/security/information-protection/bitlocker/bitlocker-overview.md +++ b/windows/security/information-protection/bitlocker/bitlocker-overview.md @@ -52,6 +52,8 @@ BitLocker control panel, and they're appropriate to be used for automated deploy To find out what's new in BitLocker for Windows, such as support for the XTS-AES encryption algorithm, see [What's new in Windows 10, versions 1507 and 1511 for IT Pros: BitLocker](/windows/whats-new/whats-new-windows-10-version-1507-and-1511#bitlocker). +[!INCLUDE [bitlocker](../../../../includes/licensing/bitlocker.md)] + ## System requirements BitLocker has the following hardware requirements: diff --git a/windows/security/information-protection/encrypted-hard-drive.md b/windows/security/information-protection/encrypted-hard-drive.md index 4523cd4552..035d511240 100644 --- a/windows/security/information-protection/encrypted-hard-drive.md +++ b/windows/security/information-protection/encrypted-hard-drive.md @@ -48,6 +48,8 @@ Encrypted hard drives are supported natively in the operating system through the If you're a storage device vendor who is looking for more info on how to implement Encrypted Hard Drive, see the [Encrypted Hard Drive Device Guide](/previous-versions/windows/hardware/design/dn653989(v=vs.85)). +[!INCLUDE [encrypted-hard-drive](../../../includes/licensing/encrypted-hard-drive.md)] + ## System Requirements To use encrypted hard drives, the following system requirements apply: diff --git a/windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md b/windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md index eb8db70020..f0503ef3a9 100644 --- a/windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md +++ b/windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md @@ -41,6 +41,8 @@ When Kernel DMA Protection is enabled: - Peripherals with DMA Remapping-compatible device drivers will be automatically enumerated and started - Peripherals with DMA Remapping-incompatible drivers will be blocked from starting if the peripheral was plugged in before an authorized user logs in, or while the screen is locked. Once the system is unlocked, the peripheral driver will be started by the OS, and the peripheral will continue to function normally until the system is rebooted, or the peripheral is unplugged. The peripheral will continue to function normally if the user locks the screen or signs out of the system. +[!INCLUDE [kernel-direct-memory-access-dma-protection](../../../includes/licensing/kernel-direct-memory-access-dma-protection.md)] + ## System compatibility Kernel DMA Protection requires UEFI firmware support, and Virtualization-based Security (VBS) isn't required. diff --git a/windows/security/information-protection/personal-data-encryption/overview-pde.md b/windows/security/information-protection/personal-data-encryption/overview-pde.md index a88c9d276a..c7efa3d342 100644 --- a/windows/security/information-protection/personal-data-encryption/overview-pde.md +++ b/windows/security/information-protection/personal-data-encryption/overview-pde.md @@ -23,6 +23,8 @@ ms.date: 03/13/2023 [!INCLUDE [Personal Data Encryption (PDE) description](includes/pde-description.md)] +[!INCLUDE [personal-data-encryption-pde](../../../../includes/licensing/personal-data-encryption-pde.md)] + ## Prerequisites ### Required diff --git a/windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines.md b/windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines.md index 238193ef00..b4829615f9 100644 --- a/windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines.md +++ b/windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines.md @@ -41,6 +41,8 @@ For example, there are over 3,000 group policy settings for Windows 10, which do In modern organizations, the security threat landscape is constantly evolving, and IT pros and policy-makers must keep up with security threats and make required changes to security settings to help mitigate these threats. To enable faster deployments and make managing Microsoft products easier, Microsoft provides customers with security baselines that are available in consumable formats, such as group policy object backups. +[!INCLUDE [security-baselines](../../../../includes/licensing/security-baselines.md)] + ## Baseline principles Our recommendations follow a streamlined and efficient approach to baseline definitions. The foundation of that approach is essentially: From 6c450bf008da9e63422a97faf047ea8a73716e0f Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Tue, 2 May 2023 16:30:13 -0400 Subject: [PATCH 49/65] split toc.yml --- .../credential-guard/toc.yml | 17 +++ .../remote-credential-guard.md | 107 +++++++----------- .../identity-protection/smart-cards/toc.yml | 28 +++++ windows/security/identity-protection/toc.yml | 67 +---------- .../virtual-smart-cards/toc.yml | 17 +++ 5 files changed, 108 insertions(+), 128 deletions(-) create mode 100644 windows/security/identity-protection/credential-guard/toc.yml create mode 100644 windows/security/identity-protection/smart-cards/toc.yml create mode 100644 windows/security/identity-protection/virtual-smart-cards/toc.yml diff --git a/windows/security/identity-protection/credential-guard/toc.yml b/windows/security/identity-protection/credential-guard/toc.yml new file mode 100644 index 0000000000..3661af7b0e --- /dev/null +++ b/windows/security/identity-protection/credential-guard/toc.yml @@ -0,0 +1,17 @@ +items: +- name: Protect derived domain credentials with Credential Guard + href: credential-guard.md +- name: How Credential Guard works + href: credential-guard-how-it-works.md +- name: Requirements + href: credential-guard-requirements.md +- name: Manage Credential Guard + href: credential-guard-manage.md +- name: Credential Guard protection limits + href: credential-guard-protection-limits.md +- name: Considerations when using Credential Guard + href: credential-guard-considerations.md +- name: Additional mitigations + href: additional-mitigations.md +- name: Known issues + href: credential-guard-known-issues.md \ No newline at end of file diff --git a/windows/security/identity-protection/remote-credential-guard.md b/windows/security/identity-protection/remote-credential-guard.md index e80bc47f63..b0e29cd0e4 100644 --- a/windows/security/identity-protection/remote-credential-guard.md +++ b/windows/security/identity-protection/remote-credential-guard.md @@ -39,23 +39,19 @@ As illustrated, Windows Defender Remote Credential Guard blocks NTLM (allowing o Use the following table to compare different Remote Desktop connection security options: | Feature | Remote Desktop | Windows Defender Remote Credential Guard | Restricted Admin mode | -|--------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **Protection benefits** | Credentials on the server are not protected from Pass-the-Hash attacks. | User credentials remain on the client. An attacker can act on behalf of the user *only* when the session is ongoing | User logs on to the server as local administrator, so an attacker cannot act on behalf of the "domain user". Any attack is local to the server | -| **Version support** | The remote computer can run any Windows operating system | Both the client and the remote computer must be running **at least Windows 10, version 1607, or Windows Server 2016**. | The remote computer must be running **at least patched Windows 7 or patched Windows Server 2008 R2**.

For more information about patches (software updates) related to Restricted Admin mode, see [Microsoft Security Advisory 2871997](/security-updates/SecurityAdvisories/2016/2871997). | -| **Helps prevent**                    |      N/A          | | | -| **Credentials supported from the remote desktop client device** | |