so many updates

windows/security/TOC.yml

@@ -45,6 +45,10 @@
        href: cryptography-certificate-mgmt.md
      - name: The Windows Security app
        href: threat-protection/windows-defender-security-center/windows-defender-security-center.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: Encryption and data protection 
      href: encryption-data-protection.md
      items:
@@ -126,72 +130,13 @@
                   href: information-protection/bitlocker/ts-bitlocker-decode-measured-boot-logs.md
      - name: Configure S/MIME for Windows
        href: identity-protection/configure-s-mime.md    
-     - name: Security policy settings
+   - name: Windows security baselines
-       href: threat-protection/security-policy-settings/security-policy-settings.md
+     href: threat-protection/windows-security-configuration-framework/windows-security-baselines.md
-     - name: Security auditing
+     items: 
-       href: threat-protection/auditing/security-auditing-overview.md
+      - name: Security Compliance Toolkit
-     - name: Windows Information Protection (WIP)
+        href: threat-protection/windows-security-configuration-framework/security-compliance-toolkit-10.md
-       href: information-protection/windows-information-protection/protect-enterprise-data-using-wip.md
+      - name: Get support
-       items: 
+        href: threat-protection/windows-security-configuration-framework/get-support-for-security-baselines.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 with MDM using the Azure portal for Microsoft Intune
-              href: information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
-              items: 
-                - name: Deploy your WIP policy using the Azure portal for Microsoft Intune
-                  href: information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md
-                - name: Associate and deploy a VPN policy for WIP using the Azure portal for 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 Endpoint Configuration Manager
-          href: information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md
-          items: 
-            - name: Create and deploy a WIP policy using Microsoft Endpoint 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: 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: 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: Network security
      items:
      - name: VPN technical guide
@@ -294,6 +239,61 @@
               href: threat-protection/intelligence/developer-faq.yml
             - name: Software developer resources
               href: threat-protection/intelligence/developer-resources.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 with MDM using the Azure portal for Microsoft Intune
+              href: information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
+              items: 
+                - name: Deploy your WIP policy using the Azure portal for Microsoft Intune
+                  href: information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md
+                - name: Associate and deploy a VPN policy for WIP using the Azure portal for 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 Endpoint Configuration Manager
+           href: information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md
+           items: 
+            - name: Create and deploy a WIP policy using Microsoft Endpoint 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: Application security
   href: apps.md
   items:

windows/security/apps.md

@@ -1,6 +1,6 @@
 ---
 title: Windows application security
-description: Get an overview of application security in Windows 11
+description: Get an overview of application security in Windows 10 and Windows 11
 ms.reviewer: 
 manager: dansimp
 ms.author: dansimp

windows/security/cloud.md

@@ -1,6 +1,6 @@
 ---
 title: Windows and cloud security
-description: Get an overview of cloud services supported in Windows 11
+description: Get an overview of cloud services supported in Windows 11 and Windows 10
 ms.reviewer: 
 author: denisebmsft
 ms.author: deniseb
@@ -22,8 +22,6 @@ ms.technology: windows-sec
 
 # Windows and cloud security
 
-*This article provides an overview of cloud services built into Windows 11.*
-
 Today’s workforce has more freedom and mobility than ever before. With the growth of enterprise cloud adoption, increased personal app usage, and increased use of third-party apps, the risk of data exposure is at its highest. Enabling Zero-Trust protection, Windows 11 works with Microsoft cloud services. Windows and cloud services together help organizations strengthen their multi-cloud security infrastructure, protect hybrid cloud workloads, and safeguard sensitive information while controlling access and mitigating threats. 
 
 Windows 11 includes the cloud services that are listed in the following table:<br/><br/>

windows/security/hardware.md

@@ -1,6 +1,6 @@
 ---
 title: Windows hardware security
-description: Get an overview of hardware security in Windows
+description: Get an overview of hardware security in Windows 11 and Windows 10
 ms.reviewer: 
 manager: dansimp
 ms.author: dansimp

windows/security/identity.md

@@ -1,6 +1,6 @@
 ---
 title: Windows identity security
-description: Get an overview of identity security in Windows 11
+description: Get an overview of identity security in Windows 11 and Windows 10
 ms.reviewer: 
 manager: dansimp
 ms.author: dansimp

windows/security/operating-system.md

@@ -16,8 +16,6 @@ ms.technology: windows-sec
 
 # Windows operating system security
 
-*This article provides an overview of operating system security in Windows 11.*
-
 Security and privacy depend on an operating system that guards your system and information from the moment it starts up, providing fundamental chip-to-cloud protection. Windows 11 is the most secure Windows yet with extensive security measures designed to help keep you safe. These measures include built-in advanced encryption and data protection, robust network and system security, and intelligent safeguards against ever-evolving threats. 
 
 Use the links in the following table to learn more about the operating system security features and capabilities in Windows 11:<br/><br/>

windows/security/threat-protection/fips-140-validation.md

@@ -6780,7 +6780,7 @@ Version 6.3.9600</td>
 
 #### SP 800-132 Password-Based Key Derivation Function (PBKDF)
 
-<table border="1" cellpadding="0" summary="table" xmlns="http://www.w3.org/1999/xhtml">
+<table border="1" cellpadding="0">
   <tr>
     <td>
       <b>Modes / States / Key Sizes</b>

windows/security/threat-protection/windows-defender-security-center/wdsc-account-protection.md

@@ -10,10 +10,10 @@ ms.pagetype: security
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 04/30/2018
+ms.date:
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 
@@ -21,8 +21,8 @@ ms.technology: mde
 
 **Applies to**
 
-- Windows 10, version 1803 and later
+- Windows 10
-
+- Windows 11
 
 The **Account protection** section contains information and settings for account protection and sign in. IT administrators and IT pros can get more information and documentation about configuration from the following:
 

windows/security/threat-protection/windows-defender-security-center/wdsc-app-browser-control.md

@@ -11,17 +11,18 @@ ms.localizationpriority: medium
 audience: ITPro
 author: dansimp
 ms.author: dansimp
-ms.date: 04/30/2018
+ms.date: 
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 # App and browser control
 
 **Applies to**
 
-- Windows 10, version 1703 and later
+- Windows 10
+- Windows 11
 
 The **App and browser control** section contains information and settings for Windows Defender SmartScreen. IT administrators and IT pros can get configuration guidance from the [Windows Defender SmartScreen documentation library](/windows/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-overview).
 

windows/security/threat-protection/windows-defender-security-center/wdsc-customize-contact-information.md

@@ -10,25 +10,18 @@ ms.pagetype: security
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 09/13/2021
+ms.date: 
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 # Customize the Windows Security app for your organization
 
 **Applies to**
 
-- Windows 10, version 1709 and later
+- Windows 10
-
+- Windows 11
-**Audience**
-
-- Enterprise security administrators
-
-**Manageability available with**
-
-- Group Policy
 
 You can add information about your organization in a contact card to the Windows Security app. You can include a link to a support site, a phone number for a help desk, and an email address for email-based support.
 

windows/security/threat-protection/windows-defender-security-center/wdsc-device-performance-health.md

@@ -10,10 +10,10 @@ ms.pagetype: security
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 04/30/2018
+ms.date: 
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 
@@ -21,7 +21,8 @@ ms.technology: mde
 
 **Applies to**
 
-- Windows 10, version 1703 and later
+- Windows 10
+- Windows 11
 
 
 The **Device performance & health** section contains information about hardware, devices, and drivers related to the machine. IT administrators and IT pros should reference the appropriate documentation library for the issues they are seeing, such as the [configure the Load and unload device drivers security policy setting](/windows/device-security/security-policy-settings/load-and-unload-device-drivers) and how to [deploy drivers during Windows 10 deployment using Microsoft Endpoint Configuration Manager](/windows/deployment/deploy-windows-cm/add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager).

windows/security/threat-protection/windows-defender-security-center/wdsc-device-security.md

@@ -10,17 +10,18 @@ ms.pagetype: security
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 10/02/2018
+ms.date: 
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 # Device security
 
 **Applies to**
 
-- Windows 10, version 1803 and later
+- Windows 10
+- Windows 11
 
 The **Device security** section contains information and settings for built-in device security.
 

windows/security/threat-protection/windows-defender-security-center/wdsc-family-options.md

@@ -10,10 +10,10 @@ ms.pagetype: security
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 04/30/2018
+ms.date: 
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 
@@ -21,8 +21,8 @@ ms.technology: mde
 
 **Applies to**
 
-- Windows 10, version 1703 and later
+- Windows 10
-
+- Windows 11
 
 The **Family options** section contains links to settings and further information for parents of a Windows 10 PC. It is not generally intended for enterprise or business environments.
 

windows/security/threat-protection/windows-defender-security-center/wdsc-firewall-network-protection.md

@@ -9,10 +9,10 @@ ms.sitesec: library
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 04/30/2018
+ms.date:
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 
@@ -20,8 +20,8 @@ ms.technology: mde
 
 **Applies to**
 
-- Windows 10, version 1703 and later
+- Windows 10
-
+- Windows 11
 
 The **Firewall & network protection** section contains information about the firewalls and network connections used by the machine, including the status of Windows Defender Firewall and any other third-party firewalls. IT administrators and IT pros can get configuration guidance from the [Windows Defender Firewall with Advanced Security documentation library](../windows-firewall/windows-firewall-with-advanced-security.md).
 

windows/security/threat-protection/windows-defender-security-center/wdsc-hide-notifications.md

@@ -10,25 +10,18 @@ ms.pagetype: security
 ms.localizationpriority: medium
 author: dansimp
 ms.author: dansimp
-ms.date: 07/23/2020
+ms.date: 
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 # Hide Windows Security app notifications
 
 **Applies to**
 
-- Windows 10, version 1809 and above
+- Windows 10
-
+- Windows 11
-**Audience**
-
-- Enterprise security administrators
-
-**Manageability available with**
-
-- Group Policy
 
 The Windows Security app is used by a number of Windows security features to provide notifications about the health and security of the machine. These include notifications about firewalls, antivirus products, Windows Defender SmartScreen, and others.
 

windows/security/threat-protection/windows-defender-security-center/wdsc-virus-threat-protection.md

@@ -12,16 +12,15 @@ author: dansimp
 ms.author: dansimp
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
-
 # Virus and threat protection
 
 **Applies to**
 
-- Windows 10, version 1703 and later
+- Windows 10
-
+- Windows 11
 
 The **Virus & threat protection** section contains information and settings for antivirus protection from Microsoft Defender Antivirus and third-party AV products.
 

windows/security/threat-protection/windows-defender-security-center/windows-defender-security-center.md

@@ -11,14 +11,15 @@ author: dansimp
 ms.author: dansimp
 ms.reviewer: 
 manager: dansimp
-ms.technology: mde
+ms.technology: windows-sec
 ---
 
 # The Windows Security app
 
 **Applies to**
 
-- Windows 10, version 1703 and later
+- Windows 10
+- Windows 11
 
 This library describes the Windows Security app, and provides information on configuring certain features, including:
 

windows/security/threat-protection/windows-security-configuration-framework/TOC.yml

@@ -1,9 +0,0 @@
-- name: Windows security guidance for enterprises
-  items: 
-    - name: Windows security baselines
-      href: windows-security-baselines.md
-      items: 
-        - name: Security Compliance Toolkit
-          href: security-compliance-toolkit-10.md
-        - name: Get support
-          href: get-support-for-security-baselines.md