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

updates

Browse Source
This commit is contained in:
Paolo Matarazzo
2023-06-15 07:06:50 -04:00
parent f13f64329d
commit 3266f8316b
6 changed files with 11 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
windows/security/introduction/licensing-and-edition-requirements.md
View File

@ -1,31 +0,0 @@
---
title: Windows security features licensing and edition requirements
description: Learn about Windows licensing and edition requirements for the features included in Windows.
ms.collection:
- tier2
ms.topic: conceptual
ms.date: 06/13/2023
appliesto:
- ✅ <a href=/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
ms.author: paoloma
author: paolomatarazzo
ms.prod: windows-client
---
# Windows security features licensing and edition requirements
This article lists the security features that are available in Windows.
Select one of the two tabs to learn about licensing requirements to use the security features, or to learn about the Windows edition requirements that support them:
#### [:::image type="icon" source="../images/icons/windows-os.svg" border="false"::: **Licensing requirements**](#tab/licensing)
[!INCLUDE [licensing-requirements](../../../includes/licensing/_licensing-requirements.md)]
#### [:::image type="icon" source="../images/icons/windows-os.svg" border="false"::: **Edition requirements**](#tab/edition)
[!INCLUDE [_edition-requirements](../../../includes/licensing/_edition-requirements.md)]
---
For more information about Windows licensing, see [Windows Commercial Licensing overview](/windows/whats-new/windows-licensing).

26
windows/security/introduction/security-features-edition-requirements.md
View File

@ -1,26 +0,0 @@
---
title: Windows security features and 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: 05/04/2023
appliesto:
- ✅ <a href=/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
ms.technology: itpro-security
---
# Windows security features and edition requirements
This article lists the security features that are available in Windows, and the Windows editions that support them.
> [!NOTE]
> The **Windows edition** requirements listed in the following table may be different from the **licensing** requirements. If you're looking for licensing requirements, see [Windows security features and licensing requirements](security-features-licensing-requirements.md).
[!INCLUDE [_edition-requirements](../../../includes/licensing/_edition-requirements.md)]
For more information about Windows licensing, see [Windows Commercial Licensing overview](/windows/whats-new/windows-licensing).

26
windows/security/introduction/security-features-licensing-requirements.md
View File

@ -1,26 +0,0 @@
---
title: Windows security features and 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: 04/24/2023
appliesto:
- ✅ <a href=/windows/release-health/supported-versions-windows-client target=_blank>Windows 11</a>
ms.technology: itpro-security
---
# Windows security features and licensing requirements
This article lists the security features that are available in Windows, and the licensing requirements to use them.
> [!NOTE]
> The **licensing** requirements listed in the following table may be different from the **Windows edition** requirements. If you're looking for Windows edition requirements, see [Windows security features and edition requirements](security-features-edition-requirements.md).
[!INCLUDE [_licensing-requirements](../../../includes/licensing/_licensing-requirements.md)]
For more information about Windows licensing, see [Windows Commercial Licensing overview](/windows/whats-new/windows-licensing).