Merge pull request #8432 from MicrosoftDocs/main

Publish 06/22/2023 3:30 PM PDT

.openpublishing.redirection.json

@@ -21764,6 +21764,21 @@
       "source_path": "windows/security/information-protection/personal-data-encryption/overview-pde.md",
       "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/index",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/introduction/security-features-edition-requirements.md",
+      "redirect_url": "/windows/security/licensing-and-edition-requirements",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/introduction/security-features-licensing-requirements.md",
+      "redirect_url": "/windows/security/licensing-and-edition-requirements",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/security-foundations.md",
+      "redirect_url": "/windows/security/security-foundations/index",
+      "redirect_document_id": false
     }
   ]
 }

windows/deployment/update/deployment-service-drivers.md

@@ -8,7 +8,7 @@ ms.author: mstewart
 manager: aaroncz
 ms.topic: article
 ms.technology: itpro-updates
-ms.date: 06/16/2023
+ms.date: 06/22/2023
 ---
 
 # Deploy drivers and firmware updates with Windows Update for Business deployment service
@@ -81,7 +81,7 @@ To create a policy without any deployment settings, in the request body specify
    
    {
      "audience": {
-       "@odata.id": "d39ad1ce-0123-4567-89ab-cdef01234567"
+       "id": "d39ad1ce-0123-4567-89ab-cdef01234567"
      }
    }
    ```

windows/hub/TOC.yml

@@ -1,28 +0,0 @@
-- name: Windows
-  href: index.yml
-  items: 
-    - name: What's new
-      expanded: true
-      items:
-        - name: What's new in Windows
-          href: /windows/whats-new
-        - name: Windows 11
-          href: /windows/whats-new/windows-11
-    - name: Release information
-      href: /windows/release-health
-    - name: Deployment
-      href: /windows/deployment
-    - name: Configuration
-      href: /windows/configuration
-    - name: Client management
-      href: /windows/client-management
-    - name: Application management
-      href: /windows/application-management
-    - name: Security
-      href: /windows/security
-    - name: Privacy
-      href: /windows/privacy
-    - name: Troubleshooting
-      href: /windows/client-management/windows-10-support-solutions
-    - name: Previous Windows versions
-      href: /previous-versions/windows

windows/hub/breadcrumb/toc.yml

@@ -37,9 +37,13 @@ items:
             tocHref: /windows/security/
             topicHref: /windows/security/
             items:
-              - name: Windows Hello for Business
+              - name: Identity protection
-                tocHref: /windows/security/identity-protection/hello-for-business/
+                tocHref: /windows/security/identity-protection/
-                topicHref: /windows/security/identity-protection/hello-for-business/
+                topicHref: /windows/security/identity-protection/
+                items:
+                - name: Windows Hello for Business
+                  tocHref: /windows/security/identity-protection/hello-for-business/
+                  topicHref: /windows/security/identity-protection/hello-for-business
               - name: Security auditing
                 tocHref: /windows/security/threat-protection/auditing/
                 topicHref: /windows/security/threat-protection/auditing/security-auditing-overview
@@ -52,6 +56,13 @@ items:
               - name: Application Control for Windows
                 tocHref: /windows/security/threat-protection/windows-defender-application-control/
                 topicHref: /windows/security/threat-protection/windows-defender-application-control/
+              - name: OS
+                tocHref: /windows/security/operating-system-security/
+                topicHref: /windows/security/operating-system-security/
+              - name: Network
+                tocHref: /windows/security/operating-system-security/network-security/
+                topicHref: /windows/security/operating-system-security/network-security/
               - name: Windows Defender Firewall
-                tocHref: /windows/security/threat-protection/windows-firewall/
+                tocHref: /windows/security/operating-system-security/network-security/windows-firewall/
-                topicHref: /windows/security/threat-protection/windows-firewall/windows-firewall-with-advanced-security
+                topicHref: /windows/security/operating-system-security/network-security/windows-firewall/windows-firewall-with-advanced-security
+                

windows/hub/images/accessprotection.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2{fill:#0070c0;}.cls-3,.cls-4{fill:none;stroke:#0070c0;stroke-miterlimit:10;}.cls-3{stroke-width:3.02px;}.cls-4{stroke-width:3px;}</style></defs><title>AccessProtection</title><g id="Icons"><polygon class="cls-2" points="52.5 18 36 18 36 1.5 39 1.5 39 15 52.5 15 52.5 18"/><path class="cls-2" d="M9,57V3H36.88L51,17.12V28.2a10.09,10.09,0,0,1,3,1.15V15.88L38.12,0H6V60H35V57Z"/><rect class="cls-3" x="39.5" y="43.5" width="19" height="15"/><path class="cls-4" d="M43.5,43.5V38a5.5,5.5,0,0,1,11,0v5.5"/></g></svg>

windows/hub/images/applicationmanagement.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2{fill:none;stroke:#0070c0;stroke-miterlimit:10;stroke-width:3px;}</style></defs><title>ApplicationManagement</title><g id="Icons"><polyline class="cls-2" points="50.75 46.5 58.5 46.5 58.5 5.5 9.5 5.5 9.5 13.5"/><rect class="cls-2" x="1.5" y="13.5" width="49" height="41"/><line class="cls-2" x1="1.5" y1="21.5" x2="50.5" y2="21.5"/><rect class="cls-2" x="8.5" y="28.5" width="16" height="19"/><line class="cls-2" x1="30" y1="28.5" x2="45" y2="28.5"/><line class="cls-2" x1="30" y1="36.5" x2="45" y2="36.5"/><line class="cls-2" x1="30" y1="44.5" x2="40" y2="44.5"/></g></svg>

windows/hub/images/clientmanagement.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2{fill:none;stroke:#0070c0;stroke-miterlimit:10;stroke-width:3px;}.cls-3{fill:#0070c0;}</style></defs><title>ClientManagement</title><g id="Icons"><path class="cls-2" d="M1.5,48.5a2.09,2.09,0,0,0,2,2h53a2.09,2.09,0,0,0,2-2,5.1,5.1,0,0,0-.84-3l-6.16-7H8.5l-6.16,7A5.1,5.1,0,0,0,1.5,48.5Z"/><rect class="cls-2" x="8.5" y="9.5" width="43" height="29"/><circle class="cls-3" cx="30" cy="15" r="1.75"/></g></svg>

windows/hub/images/configuration.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2{fill:none;stroke:#0070c0;stroke-miterlimit:10;stroke-width:3px;}</style></defs><title>Configuration</title><g id="Icons"><path class="cls-2" d="M50.63,30c0-.64,0-1.28-.1-1.91l7.25-4.52-3.59-8.66-8.32,1.92a20.87,20.87,0,0,0-2.7-2.7l1.92-8.32L36.43,2.22,31.91,9.47c-.63-.06-1.27-.09-1.91-.09s-1.28,0-1.91.09L23.57,2.22,14.91,5.81l1.92,8.32a20.87,20.87,0,0,0-2.7,2.7L5.81,14.91,2.22,23.57l7.25,4.52c-.06.63-.09,1.27-.09,1.91s0,1.28.09,1.91L2.22,36.43l3.59,8.66,8.32-1.92a20.87,20.87,0,0,0,2.7,2.7l-1.92,8.32,8.66,3.59,4.52-7.25c.63.06,1.27.1,1.91.1s1.28,0,1.91-.1l4.52,7.25,8.66-3.59-1.92-8.32a20.87,20.87,0,0,0,2.7-2.7l8.32,1.92,3.59-8.66-7.25-4.52C50.59,31.28,50.63,30.64,50.63,30ZM20.5,30A9.5,9.5,0,1,1,30,39.5,9.5,9.5,0,0,1,20.5,30Z"/></g></svg>

windows/hub/images/deployment.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2,.cls-3{fill:none;stroke:#0070c0;stroke-miterlimit:10;stroke-width:3px;}.cls-3{stroke-dasharray:2.4 2.4;}.cls-4{mask:url(#mask);}.cls-5{filter:url(#luminosity-noclip);}</style><filter id="luminosity-noclip" x="-3" y="3" width="66" height="54" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-color="#fff" result="bg"/><feBlend in="SourceGraphic" in2="bg"/></filter><mask id="mask" x="-3" y="3" width="66" height="54" maskUnits="userSpaceOnUse"><g class="cls-5"><rect x="-3" y="18" width="24" height="24"/><rect x="39" y="3" width="24" height="24"/><rect x="39" y="33" width="24" height="24"/></g></mask></defs><title>Deployment</title><g id="Icons"><rect class="cls-2" x="1.5" y="22.5" width="15" height="15"/><polyline class="cls-2" points="58.5 21 58.5 22.5 57 22.5"/><line class="cls-3" x1="54.6" y1="22.5" x2="46.2" y2="22.5"/><polyline class="cls-2" points="45 22.5 43.5 22.5 43.5 21"/><line class="cls-3" x1="43.5" y1="18.6" x2="43.5" y2="10.2"/><polyline class="cls-2" points="43.5 9 43.5 7.5 45 7.5"/><line class="cls-3" x1="47.4" y1="7.5" x2="55.8" y2="7.5"/><polyline class="cls-2" points="57 7.5 58.5 7.5 58.5 9"/><line class="cls-3" x1="58.5" y1="11.4" x2="58.5" y2="19.8"/><polyline class="cls-2" points="58.5 51 58.5 52.5 57 52.5"/><line class="cls-3" x1="54.6" y1="52.5" x2="46.2" y2="52.5"/><polyline class="cls-2" points="45 52.5 43.5 52.5 43.5 51"/><line class="cls-3" x1="43.5" y1="48.6" x2="43.5" y2="40.2"/><polyline class="cls-2" points="43.5 39 43.5 37.5 45 37.5"/><line class="cls-3" x1="47.4" y1="37.5" x2="55.8" y2="37.5"/><polyline class="cls-2" points="57 37.5 58.5 37.5 58.5 39"/><line class="cls-3" x1="58.5" y1="41.4" x2="58.5" y2="49.8"/><g class="cls-4"><line class="cls-2" x1="16.5" y1="22.5" x2="43.5" y2="14.5"/><line class="cls-2" x1="16.5" y1="37.5" x2="43.5" y2="45.5"/></g></g></svg>

windows/hub/images/deviceSecurity.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2{fill:#0070c0;}.cls-3{fill:none;stroke:#0070c0;stroke-miterlimit:10;stroke-width:3px;}</style></defs><title>DeviceSecurity</title><g id="Icons"><path class="cls-2" d="M29.89,49H3.5a.62.62,0,0,1-.5-.5,3.88,3.88,0,0,1,.47-2L9.18,40H28V37H10V11H50V26.7a11.62,11.62,0,0,1,3,1.42h0V8H7V37.93l-5.82,6.6A6.62,6.62,0,0,0,0,48.5,3.6,3.6,0,0,0,3.5,52H31.64A22.74,22.74,0,0,1,29.89,49Z"/><path class="cls-3" d="M58.5,33.5V41c0,6.25-4.65,12.38-12.14,16.31l-.86.45-.86-.45C37.15,53.38,32.5,47.25,32.5,41V33.5h2a11.13,11.13,0,0,0,6-1.66,9.85,9.85,0,0,1,10,0,11.17,11.17,0,0,0,6,1.62Z"/></g></svg>

windows/hub/images/threatprotection.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2{fill:#0070c0;}.cls-3{fill:none;stroke:#0070c0;stroke-miterlimit:10;stroke-width:3px;}</style></defs><title>ThreatProtection</title><g id="Icons"><rect class="cls-2" x="28" y="41" width="3" height="3"/><rect class="cls-2" x="28" y="11" width="3" height="26"/><path class="cls-3" d="M55.5,21.5c0,13.78-9.93,26.31-26,35.34-16.07-9-26-21.56-26-35.34V9.5A30.48,30.48,0,0,0,20.21,4.29,15.89,15.89,0,0,1,29.5,1.5a15.89,15.89,0,0,1,9.29,2.79A30.48,30.48,0,0,0,55.5,9.5Z"/></g></svg>

windows/hub/images/whatsnew.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 60 60"><defs><style>.cls-1{opacity:0.5;}.cls-2,.cls-3{fill:none;stroke:#107c10;stroke-miterlimit:10;stroke-width:3px;}.cls-3{stroke-linecap:round;}</style></defs><title>WhatsNew</title><g id="Icons"><path class="cls-2" d="M58.5,41.5a6,6,0,0,1-6,6H7.5a6,6,0,0,1-6-6V9.5h49v7h8Z"/><line class="cls-3" x1="50.5" y1="16.5" x2="50.5" y2="39.5"/><line class="cls-2" x1="45" y1="16.5" x2="7" y2="16.5"/><line class="cls-2" x1="45" y1="40.5" x2="29" y2="40.5"/><line class="cls-2" x1="45" y1="32.5" x2="29" y2="32.5"/><line class="cls-2" x1="45" y1="24.5" x2="29" y2="24.5"/><rect class="cls-2" x="8.5" y="24.5" width="15" height="16"/></g></svg>

windows/hub/images/winlogo.svg

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by Microsoft Visio, SVG Export winlogo.svg Page-1 -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"
-		xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="6.06944in" height="6.09028in"
-		viewBox="0 0 437 438.5" xml:space="preserve" color-interpolation-filters="sRGB" class="st2">
-	<v:documentProperties v:langID="1033" v:viewMarkup="false"/>
-
-	<style type="text/css">
-	<![CDATA[
-		.st1 {fill:none;stroke:none;stroke-width:0.25}
-		.st2 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
-	]]>
-	</style>
-
-	<g v:mID="0" v:index="1" v:groupContext="foregroundPage">
-		<title>Page-1</title>
-		<v:pageProperties v:drawingScale="1" v:pageScale="1" v:drawingUnits="0" v:shadowOffsetX="9" v:shadowOffsetY="-9"/>
-		<g id="shape1-1" v:mID="1" v:groupContext="shape" transform="translate(0.25,-0.25)">
-			<title>Sheet.1</title>
-			<rect v:rectContext="foreign" x="0" y="0.500011" width="436.5" height="438" class="st1"/>
-			<image x="0" y="0.500011" width="436.5" height="438" preserveAspectRatio="none" xlink:href="data:image/png;base64,iV
-						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"/>
-			<rect v:rectContext="foreign" x="0" y="0.500011" width="436.5" height="438" class="st1"/>
-		</g>
-	</g>
-</svg>

windows/hub/index.yml

@@ -1,255 +1,168 @@
 ### YamlMime:Hub
 
-title: Windows client documentation for IT Pros # < 60 chars
+title: Windows client documentation for IT Pros
-summary: Evaluate, plan, deploy, secure, and manage devices running Windows 10 and Windows 11. # < 160 chars
+summary: Learn how to deploy, secure, and manage Windows clients for your organization.
-# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-apps | power-automate | power-bi | power-platform | power-virtual-agents | sql | sql-server | vs | visual-studio | windows | xamarin
 brand: windows
 
 metadata:
-  title: Windows client documentation for IT Pros # Required; page title displayed in search results. Include the brand. < 60 chars.
+  title: Windows client documentation
-  description: Evaluate, plan, deploy, secure, and manage devices running Windows 10 and Windows 11. # Required; article description that is displayed in search results. < 160 chars.
+  description: Learn how to deploy, secure, and manage Windows clients for your organization.
   ms.topic: hub-page
   ms.prod: windows-client
   ms.collection:
     - highpri
     - tier1
-  author: aczechowski #Required; your GitHub user alias, with correct capitalization.
+  author: paolomatarazzo
-  ms.author: aaroncz #Required; microsoft alias of author; optional team alias.
+  ms.author: paoloma
-  ms.date: 10/01/2021 #Required; mm/dd/yyyy format.
+  manager: aaroncz
-  localization_priority: medium
+  ms.date: 06/20/2023
 
-# highlightedContent section (optional)
-# Maximum of 8 items
 highlightedContent:
-# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
   items:
-    # Card
+  - title: Get started with Windows 11
-    - title: Become a Windows Insider
+    itemType: get-started
-      itemType: overview
+    url: /windows/whats-new/windows-11-overview
-      url: https://insider.windows.com
+  - title: Windows 11, version 22H2
-    # Card
+    itemType: whats-new
-    - title: See what's new in Windows release health
+    url: /windows/whats-new/whats-new-windows-11-version-22H2
-      itemType: overview
+  - title: Windows 11, version 22H2 group policy settings reference 
-      url: /windows/release-health/
+    itemType: download
-    # Card
+    url: https://www.microsoft.com/en-us/download/details.aspx?id=104594
-    - title: Empower your hybrid workforce
+  - title: Windows release health
-      itemType: overview
+    itemType: whats-new
-      url: https://www.microsoft.com/microsoft-365/blog/2021/10/04/empower-your-hybrid-workforce-today-with-windows-11/
+    url: /windows-insider/get-started
+  - title: Windows commercial licensing
+    itemType: overview
+    url: /windows/whats-new/windows-licensing
+  - title: Windows 365 documentation
+    itemType: overview
+    url: /windows-365
+  - title: Explore all Windows trainings and learning paths for IT pros
+    itemType: learn
+    url: https://learn.microsoft.com/en-us/training/browse/?products=windows&roles=administrator
+  - title: Enroll Windows client devices in Microsoft Intune
+    itemType: how-to-guide
+    url: /mem/intune/fundamentals/deployment-guide-enrollment-windows
 
-# productDirectory section (optional)
 productDirectory:
-  title: Get to know Windows 11 # < 60 chars (optional)
+  title: Get started
-  summary: Learn more about what's new, what's updated, and what you get in Windows 11 # < 160 chars (optional)
   items:
-  # Card
-    - title: Windows 11 overview
-      imageSrc: /windows/resources/images/winlogo.svg
-      summary: Get more information about features and improvements that are important to admins
-      url: /windows/whats-new/windows-11-overview
-    - title: Windows 11 requirements
-      imageSrc: /windows/resources/images/winlogo.svg
-      summary: See the system requirements for Windows 11, including running Windows 11 on a virtual machine
-      url: /windows/whats-new/windows-11-requirements
-    - title: Learn more about Windows 11 Enterprise
-      imageSrc: /windows/resources/images/winlogo.svg
-      summary: Get more information on the features, security, and licensing plans designed for organizations
-      url: https://www.microsoft.com/microsoft-365/windows/windows-11-enterprise
-    - title: FAQ - Upgrade to Windows 11
-      imageSrc: /windows/resources/images/winlogo.svg
-      summary: See some common questions and answers when upgrading to Windows 11
-      url: https://support.microsoft.com/windows/upgrade-to-windows-11-faq-fb6206a2-1a0f-448a-80f1-8668ee5b2bf9
-    - title: Windows 11 chip to cloud protection - Security challenges of hybrid work
-      imageSrc: /windows/resources/images/winlogo.svg
-      summary: Blog from the Microsoft Windows Security Team
-      url: https://www.microsoft.com/security/blog/2021/10/04/windows-11-offers-chip-to-cloud-protection-to-meet-the-new-security-challenges-of-hybrid-work
-    - title: Trusted Platform Module (TPM)
-      imageSrc: /windows/resources/images/winlogo.svg
-      summary: Learn more about TPM, and why it's a good thing
-      url: /windows/security/information-protection/tpm/trusted-platform-module-overview
 
-# conceptualContent section (optional)
+    - title: Learn how to deploy Windows
-conceptualContent:
+      imageSrc: /media/common/i_deploy.svg
-# Supports up to 3 sections
-# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
-
-  title: Windows client resources and documentation for IT Pros 
-  summary: Plan, deploy, secure, and manage devices running Windows 10 and Windows 11.
-  items:
-  # card
-    - title: Overview
       links:
-        - url: /windows/whats-new/windows-11-overview
+        - url: /mem/autopilot/
-          itemType: overview
+          text: Windows Autopilot overview
-          text: Windows 11 overview
+        - url: /mem/autopilot/tutorial/autopilot-scenarios
-        - url: /windows/whats-new/windows-11-plan
+          text: "Tutorial: Windows Autopilot scenarios"
-          itemType: overview
+        - url: /windows/deployment/do/
-          text: Plan for Windows 11
+          text: Delivery optimization
-        - url: /windows/whats-new/windows-11-prepare
+        - url: /windows/deployment/update/deployment-service-overview
-          itemType: overview
+          text: Windows Update for Business deployment service
-          text: Prepare for Windows 11
-        - url: /windows/whats-new/whats-new-windows-10-version-21H1
-          itemType: overview
-          text: What's new in Windows 10, version 21H1
-        - url:  /windows/release-health/release-information
-          itemType: overview
-          text: Windows release information
-
-  # Card (optional)
-    - title: Configuration
-      links:
-        - url: /windows/configuration/index
-          itemType: overview
-          text: Configure Windows
-        - url: /windows/configuration/provisioning-packages/provisioning-packages
-          itemType: how-to-guide
-          text: Use Provisioning packages to configure new devices
-        - url: /windows/configuration/windows-accessibility-for-itpros
-          itemType: overview
-          text: Accessibility information for IT Pros
-        - url: /windows/configuration/customize-start-menu-layout-windows-11
-          itemType: how-to-guide
-          text: Customize the Start menu layout
-        - url: /windows/configuration/stop-employees-from-using-microsoft-store
-          itemType: how-to-guide
-          text: Control access to Microsoft Store
-        - url: /windows/configuration/set-up-shared-or-guest-pc
-          itemType: how-to-guide
-          text: Set up a shared or guest PC
-
-  # Card (optional)
-    - title: Deployment
-      links:
-        - url: /windows/deployment/index      
-          itemType: deploy
-          text: Deploy and update Windows
-        - url: /windows/deployment/windows-10-deployment-scenarios
-          itemType: deploy
-          text: Windows deployment scenarios
-        - url: /windows/deployment/update/create-deployment-plan
-          itemType: deploy
-          text: Create a deployment plan
-        - url: /windows/deployment/update/prepare-deploy-windows
-          itemType: deploy
-          text: Prepare to deploy Windows client
         - url: /windows/deployment/windows-autopatch
-          itemType: deploy
+          text: Windows Autopatch overview
-          text: Windows Autopatch
+        - url: /windows/deployment
+          text: Learn more about Windows deployment >
 
-  # Card
+    - title: Learn how to secure Windows
-    - title: App management
+      imageSrc: /media/common/i_security-management.svg
       links:
-        - url: /windows/application-management/index
+        - url: /windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines
-          itemType: overview
+          text: Windows security baselines
-          text: Windows application management
+        - url: /windows/security/identity-protection/credential-guard/credential-guard-how-it-works
-        - url: /windows/application-management/apps-in-windows-10
+          text: Windows Defender Credential Guard
-          itemType: overview
+        - url: /windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust
-          text: Learn more about the different apps types for Windows
+          text: Windows Hello for Business cloud Kerberos trust
-        - url: /windows/application-management/private-app-repository-mdm-company-portal-windows-11
+        - url: /education/windows/tutorial-school-deployment/windows/security/threat-protection/windows-defender-application-control/
-          itemType: how-to-guide
+          text: Windows Defender Application Control (WDAC)
-          text: Use the private app repo on Windows 11
+        - url: /windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview
-        - url:  /windows/application-management/remove-provisioned-apps-during-update
+          text: Microsoft Defender Application Guard
-          itemType: how-to-guide
+        - url: /windows/security
-          text: Keep removed apps from returning during an update
+          text: Learn more about Windows security >
-        - url:  https://blogs.windows.com/windowsdeveloper/2021/10/04/developing-for-windows-11/
-          itemType: overview
-          text: Blog - Develop apps for Windows 11
 
-  # Card
+    - title: Learn about privacy in Windows
-    - title: Client management
+      imageSrc: /media/common/i_lock.svg
       links:
+        - url: /windows/privacy/required-diagnostic-events-fields-windows-11-22h2
+          text: Windows 11 required diagnostic data
+        - url: /windows/privacy/configure-windows-diagnostic-data-in-your-organization
+          text: Configure Windows diagnostic data in your organization
+        - url: /windows/privacy/diagnostic-data-viewer-overview
+          text: Diagnostic Data Viewer
+        - url: /windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services
+          text: Manage connections to Microsoft services
+        - url: /windows/privacy/windows-10-and-privacy-compliance
+          text: Windows privacy compliance guide
+        - url: /windows/privacy
+          text: Learn more about privacy in Windows >
 
-        - url: /windows/client-management/index
+    - title: Learn how to manage Windows
-          itemType: overview
+      imageSrc: /media/common/i_management.svg
-          text: Windows client management
+      links:
+        - url: /windows/client-management/mobile-device-enrollment
+          text: MDM enrollment
+        - url: /windows/client-management/mdm/
+          text: Configuration Service Provider (CSP)
         - url: /windows/client-management/administrative-tools-in-windows-10
-          itemType: overview
+          text: Windows administrative tools
-          text: Administrative tools 
+        - url: /windows/client-management/client-tools/quick-assist
-        - url: /windows/client-management/mandatory-user-profile
+          text: Use Quick Assist to help users
-          itemType: how-to-guide
+        - url: /windows/application-management/index
-          text: Create mandatory user profiles
+          text: Learn more about application management >
-        - url: /windows/client-management/new-policies-for-windows-10
+        - url: /windows/client-management
-          itemType: overview
+          text: Learn more about Windows management >
-          text: New policies for Windows 10
-        - url: /windows/client-management/mdm/configuration-service-provider-reference
-          itemType: reference
-          text: Configuration service provider reference
 
-  # Card (optional)
+    - title: Learn how to configure Windows
-    - title: Security and Privacy
+      imageSrc: /media/common/i_config-tools.svg
       links:
-        - url: /windows/security/index    
+        - url: /windows/configuration/windows-accessibility-for-itpros
-          itemType: overview
+          text: Accessibility information
-          text: Windows Enterprise Security
+        - url: /windows/configuration/provisioning-packages/provisioning-packages
-        - url: /windows/security/hardware
+          text: Use Provisioning packages to configure new devices
-          itemType: overview
+        - url: /windows/configuration/customize-start-menu-layout-windows-11
-          text: Hardware security
+          text: Customize the Start menu layout
-        - url: /windows/security/operating-system
+        - url: /windows/configuration/set-up-shared-or-guest-pc
-          itemType: overview
+          text: Set up a shared or guest PC
-          text: Operating system security
+        - url: /windows/configuration/kiosk-methods
-        - url: /windows/security/apps         
+          text: Configure kiosks and digital signs
-          itemType: overview
+        - url: /windows/configuration
-          text: Application security
+          text: Learn more about Windows configuration >
-        - url: /windows/security/identity
+
-          itemType: overview
+    - title: Learn about Windows for Education
-          text: Identity and privacy
+      imageSrc: /media/common/i_advanced.svg
-        - url: /windows/security/cloud
+      links:
-          itemType: overview
+        - url: /education/windows/windows-11-se-overview
-          text: Cloud services
+          text: Windows 11 SE Overview
-        - url: /windows/privacy/index
+        - url: /education/windows/federated-sign-in
-          itemType: overview
+          text: Configure federated sign-in for Windows devices
-          text: Windows Privacy
+        - url: /education/windows/get-minecraft-for-education
+          text: Get and deploy Minecraft Education
+        - url: /education/windows/tutorial-school-deployment/
+          text: "Tutorial: deploy and manage Windows devices in a school"
+        - url: /education/windows/tutorial-deploy-apps-winse/
+          text: "Tutorial: deploy applications to Windows 11 SE"
+        - url: /education/Windows
+          text: Learn more about Windows for Education >
 
-# additionalContent section (optional)
-# Card with summary style
 additionalContent:
-  # Supports up to 4 subsections
   sections:
-    - title: More Windows resources # < 60 chars (optional)
+    - title: More Windows resources
       items:
-        # Card
-        - title: Windows product site
-          summary: Find out how Windows enables your business to do more
-          url: https://www.microsoft.com/microsoft-365/windows
-        - title: "Windows 11: A new era for the PC begins today"
-          summary: Blog article that describes how Windows 11 empowers you to produce and inspires you to create
-          url: https://blogs.windows.com/windowsexperience/2021/10/04/windows-11-a-new-era-for-the-pc-begins-today/
-        - title: Windows IT Pro blogs
-          summary: The latest Windows blog articles for the IT Pro 
-          url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
-        - title: Windows blogs
-          summary: Keep up with the latest news about Windows
-          url: https://blogs.windows.com/
-        - title: Participate in the Tech Community
-          summary: Learn how to be part of the Windows Tech Community
-          url: https://techcommunity.microsoft.com/t5/windows/ct-p/Windows10
-        - title: Ask the community
-          summary: Get help, and help others
-          url: https://answers.microsoft.com/windows/forum
 
-    - title: Other resources
+        - title: Windows hardware
-      items:
-        - title: Microsoft endpoint management with Intune
           links:
-            - text: Intune is a family of products
+            - text: Windows hardware developer documentation
-              url: /mem/endpoint-manager-overview
+              url: /windows-hardware/drivers/
-            - text: What is Microsoft Intune?
+            - text: Get started with building Windows devices
-              url: /mem/intune/fundamentals/what-is-intune
+              url: /windows-hardware/get-started
-            - text: Microsoft Intune services simplify upgrades to Windows 11
+            - text: Download the Windows Driver Kit
-              url: https://techcommunity.microsoft.com/t5/microsoft-endpoint-manager-blog/endpoint-manager-simplifies-upgrades-to-windows-11/ba-p/2771886
+              url: /windows-hardware/drivers/download-the-wdk
-            - text: Understanding readiness for Windows 11 with Microsoft Intune services
+            - text: Device and driver installation
-              url: https://techcommunity.microsoft.com/t5/microsoft-endpoint-manager-blog/understanding-readiness-for-windows-11-with-microsoft-endpoint/ba-p/2770866
+              url: /windows-hardware/drivers/install/overview-of-device-and-driver-installation
-            - text: Microsoft endpoint management blog
+            - text: Windows Driver Frameworks
-              url: https://aka.ms/memblog
+              url: /windows-hardware/drivers/wdf/
-        - title: Windows 365
+            - text: Kernel-mode driver architecture design guide
-          links:
+              url: /windows-hardware/drivers/kernel/
-            - text: Windows 365 documentation
-              url: /windows-365
-            - text: What is Windows 365
-              url: /windows-365/overview
-            - text: Windows 365 Enterprise now supports Windows 11
-              url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/windows-365-enterprise-now-supports-windows-11/ba-p/2810334              
-            - text: Windows 365 blog
-              url: https://www.microsoft.com/microsoft-365/blog/
 
         - title: Windows Server
           links:
@@ -257,7 +170,27 @@ additionalContent:
               url: /windows-server
             - text: What's new in Windows Server 2022?
               url: /windows-server/get-started/whats-new-in-windows-server-2022
-            - text: Get started with Windows Server
-              url: /windows-server/get-started/get-started-with-windows-server
             - text: Windows Server blog
               url: https://cloudblogs.microsoft.com/windowsserver/
+
+        - title: Windows product site and blogs
+          links:
+            - text: Find out how Windows enables your business to do more
+              url: https://www.microsoft.com/microsoft-365/windows
+            - text: Windows blogs
+              url: https://blogs.windows.com/
+            - text: Windows IT Pro blog
+              url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
+            - text: Microsoft Intune blog
+              url: https://techcommunity.microsoft.com/t5/microsoft-intune-blog/bg-p/MicrosoftEndpointManagerBlog
+            - text: "Windows help & learning: end-user documentation"
+              url: https://support.microsoft.com/windows
+
+        - title: Participate in the community
+          links:
+            - text: Windows community
+              url: https://techcommunity.microsoft.com/t5/windows/ct-p/Windows10
+            - text: Microsoft Intune community
+              url: https://techcommunity.microsoft.com/t5/microsoft-intune/bd-p/Microsoft-Intune
+            - text: Microsoft Support community
+              url: https://answers.microsoft.com/windows/forum

windows/security/images/icons/certificate.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M4.75 3C3.23122 3 2 4.23122 2 5.75V10.9995C2.91223 9.78534 4.3644 9 6 9C8.76142 9 11 11.2386 11 14C11 15.1258 10.6279 16.1647 10 17.0005V18H19.25C20.7688 18 22 16.7688 22 15.25V5.75C22 4.23122 20.7688 3 19.25 3H4.75ZM6.75 7H17.25C17.6642 7 18 7.33579 18 7.75C18 8.16421 17.6642 8.5 17.25 8.5H6.75C6.33579 8.5 6 8.16421 6 7.75C6 7.33579 6.33579 7 6.75 7ZM12 12.75C12 12.3358 12.3358 12 12.75 12H17.25C17.6642 12 18 12.3358 18 12.75C18 13.1642 17.6642 13.5 17.25 13.5H12.75C12.3358 13.5 12 13.1642 12 12.75ZM5.99967 10C3.79017 10 1.99902 11.7911 1.99902 14.0006C1.99902 16.2101 3.79017 18.0013 5.99967 18.0013C8.20916 18.0013 10.0003 16.2101 10.0003 14.0006C10.0003 11.7911 8.20916 10 5.99967 10ZM9.00076 18.001C8.16487 18.6291 7.12573 19.0013 5.99967 19.0013C4.8745 19.0013 3.83612 18.6297 3.00058 18.0025L3.0001 21.2487C3.0001 21.8195 3.6046 22.1681 4.09019 21.9176L4.17966 21.8635L6.00002 20.5912L7.81967 21.8635C8.28757 22.1904 8.91959 21.8946 8.99232 21.353L8.99923 21.2487L9.00076 18.001Z" fill="#0078D4" />
+</svg>

windows/security/images/icons/license.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M2 3.75C2 2.7835 2.7835 2 3.75 2H9.25C10.2165 2 11 2.7835 11 3.75V10H14V11.5C14 12.8807 12.8807 14 11.5 14H4.5C3.11929 14 2 12.8807 2 11.5V3.75ZM11 13H11.5C12.3284 13 13 12.3284 13 11.5V11H11V13ZM4.5 5.5C4.5 5.77614 4.72386 6 5 6H8C8.27614 6 8.5 5.77614 8.5 5.5C8.5 5.22386 8.27614 5 8 5H5C4.72386 5 4.5 5.22386 4.5 5.5ZM5 7.5C4.72386 7.5 4.5 7.72386 4.5 8C4.5 8.27614 4.72386 8.5 5 8.5H8C8.27614 8.5 8.5 8.27614 8.5 8C8.5 7.72386 8.27614 7.5 8 7.5H5ZM4.5 10.5C4.5 10.7761 4.72386 11 5 11H6.5C6.77614 11 7 10.7761 7 10.5C7 10.2239 6.77614 10 6.5 10H5C4.72386 10 4.5 10.2239 4.5 10.5Z"  fill="#0078D4"  />
+</svg>

windows/security/index.yml

@@ -145,7 +145,7 @@ landingContent:
       - linkListType: overview
         links:
         - text: Overview
-          url: security-foundations.md
+          url: security-foundations/index.md
       - linkListType: reference
         links:
           - text: Microsoft Security Development Lifecycle

windows/security/introduction/security-features-edition-requirements.md

@@ -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).

windows/security/introduction/security-features-licensing-requirements.md

@@ -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).

windows/security/licensing-and-edition-requirements.md

@@ -0,0 +1,31 @@
+---
+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/15/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/certificate.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).

windows/security/security-foundations/index.md

@@ -1,18 +1,15 @@
 ---
 title: Windows security foundations
 description: Get an overview of security foundations, including the security development lifecycle, common criteria, and the bug bounty program.
-ms.reviewer: 
+ms.topic: conceptual
-ms.topic: article
+ms.date: 06/15/2023
-ms.author: paoloma
 author: paolomatarazzo
-ms.prod: windows-client
+ms.author: paoloma
-ms.technology: itpro-security
-ms.date: 12/31/2017
 ---
 
 # Windows security foundations
 
-Microsoft is committed to continuously invest in improving our software development process, building highly secure-by-design software, and addressing security compliance requirements. At Microsoft, we embed security and privacy considerations from the earliest life-cycle phases of all our software development processes. We build in security from the ground for powerful defense in today’s threat environment.
+Microsoft is committed to continuously invest in improving our software development process, building highly secure-by-design software, and addressing security compliance requirements. At Microsoft, we embed security and privacy considerations from the earliest life-cycle phases of all our software development processes. We build in security from the ground for powerful defense in today's threat environment.
 
 Our strong security foundation uses Microsoft Security Development Lifecycle (SDL) Bug Bounty, support for product security standards and certifications, and Azure Code signing. As a result, we improve security by producing software with fewer defects and vulnerabilities instead of relying on applying updates after vulnerabilities have been identified.
 
@@ -20,7 +17,7 @@ Use the links in the following table to learn more about the security foundation
 
 | Concept | Description |
 |:---|:---|
-| FIPS 140-2 Validation | The Federal Information Processing Standard (FIPS) Publication 140-2 is a U.S. government standard. FIPS is based on Section 5131 of the Information Technology Management Reform Act of 1996. It defines the minimum security requirements for cryptographic modules in IT products. Microsoft maintains an active commitment to meeting the requirements of the FIPS 140-2 standard, having validated cryptographic modules against it since it was first established in 2001. <br/><br/>Learn more about [FIPS 140-2 Validation](threat-protection/fips-140-validation.md). |
+| FIPS 140-2 Validation | The Federal Information Processing Standard (FIPS) Publication 140-2 is a U.S. government standard. FIPS is based on Section 5131 of the Information Technology Management Reform Act of 1996. It defines the minimum security requirements for cryptographic modules in IT products. Microsoft maintains an active commitment to meeting the requirements of the FIPS 140-2 standard, having validated cryptographic modules against it since it was first established in 2001. <br/><br/>Learn more about [FIPS 140-2 Validation](../threat-protection/fips-140-validation.md). |
-| Common Criteria Certifications |  Microsoft supports the Common Criteria certification program, ensures that products incorporate the features and functions required by relevant Common Criteria Protection Profiles, and completes Common Criteria certifications of Microsoft Windows products. <br/><br/>Learn more about [Common Criteria Certifications](threat-protection/windows-platform-common-criteria.md). |
+| Common Criteria Certifications |  Microsoft supports the Common Criteria certification program, ensures that products incorporate the features and functions required by relevant Common Criteria Protection Profiles, and completes Common Criteria certifications of Microsoft Windows products. <br/><br/>Learn more about [Common Criteria Certifications](../threat-protection/windows-platform-common-criteria.md). |
-| Microsoft Security Development Lifecycle | The Security Development Lifecycle (SDL) is a security assurance process that is focused on software development. The SDL has played a critical role in embedding security and privacy in software and culture at Microsoft.<br/><br/>Learn more about [Microsoft SDL](threat-protection/msft-security-dev-lifecycle.md).|
+| Microsoft Security Development Lifecycle | The Security Development Lifecycle (SDL) is a security assurance process that is focused on software development. The SDL has played a critical role in embedding security and privacy in software and culture at Microsoft.<br/><br/>Learn more about [Microsoft SDL](../threat-protection/msft-security-dev-lifecycle.md).|
 | Microsoft Bug Bounty Program | If you find a vulnerability in a Microsoft product, service, or device, we want to hear from you! If your vulnerability report affects a product or service that is within scope of one of our bounty programs below, you could receive a bounty award according to the program descriptions.<br/><br/>Learn more about the [Microsoft Bug Bounty Program](https://www.microsoft.com/en-us/msrc/bounty?rtc=1). |

windows/security/security-foundations/toc.yml

@@ -1,6 +1,6 @@
 items:
 - name: Overview
-  href: ../security-foundations.md
+  href: index.md
 - name: Microsoft Security Development Lifecycle
   href: ../threat-protection/msft-security-dev-lifecycle.md
 - name: Certification

windows/security/toc.yml

@@ -8,10 +8,8 @@
     href: introduction/index.md
   - name: Zero Trust and Windows
     href: zero-trust-windows-device-health.md
-  - name: Security features and edition requirements
+  - name: Security features licensing and edition requirements
-    href: introduction/security-features-edition-requirements.md
+    href: licensing-and-edition-requirements.md
-  - name: Security features and licensing requirements
-    href: introduction/security-features-licensing-requirements.md
 - name: Hardware security
   href: hardware-security/toc.yml
 - name: Operating system security