Merge branch 'main' into wufb_do

education/windows/index.yml

@@ -7,7 +7,8 @@ metadata:
   title: Windows for Education documentation
   description: Learn about how to plan, deploy and manage Windows devices in an education environment with Microsoft Intune
   ms.topic: landing-page
-  ms.prod: windows
+  ms.prod: windows-client
+  ms.technology: itpro-edu
   ms.collection:
   - education
   - highpri

windows/application-management/index.yml

@@ -1,25 +1,19 @@
 ### YamlMime:Landing
 
-title: Windows application management # < 60 chars
+title: Windows application management
-summary: Learn about managing applications in Windows client, including how to remove background task resource restrictions.  # < 160 chars
+summary: Learn about managing applications in Windows client, including how to remove background task resource restrictions.
 
 metadata:
-  title: Windows application management  # Required; page title displayed in search results. Include the brand. < 60 chars.
+  title: Windows application management
-  description: Learn about managing applications in Windows 10 and Windows 11. # Required; article description that is displayed in search results. < 160 chars.
+  description: Learn about managing applications in Windows 10 and Windows 11.
-  services: windows-10
+  ms.topic: landing-page
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.prod: windows-client
-  ms.subservice: subservice
+  ms.collection:
-  ms.topic: landing-page # Required
-  ms.collection: 
-    - windows-10
     - highpri
   author: nicholasswhite
   ms.author: nwhite
   manager: aaroncz
-  ms.date: 08/24/2021 #Required; mm/dd/yyyy format.
+  ms.date: 08/24/2021
-  ms.localizationpriority : medium
-    
-# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
 
 landingContent:
 # Cards and links should be based on top customer tasks or top subjects

windows/client-management/index.yml

@@ -6,12 +6,10 @@ summary: Find out how to apply custom configurations to Windows client devices.
 metadata:
   title: Manage Windows client # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Learn about the administrative tools, tasks, and best practices for managing Windows clients across your enterprise. # Required; article description that is displayed in search results. < 160 chars.
-  services: windows-10
+  ms.topic: landing-page
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.prod: windows-client
-  ms.subservice: subservice
+  ms.technology: itpro-manage
-  ms.topic: landing-page # Required
   ms.collection:
-    - windows-10
     - highpri
   author: aczechowski
   ms.author: aaroncz

windows/client-management/mdm/index.yml

@@ -6,11 +6,10 @@ summary: Learn more about the configuration service provider (CSP) policies avai
 metadata:
   title: Configuration Service Provider # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Learn more about the configuration service provider (CSP) policies available on Windows 10 and Windows 11. # Required; article description that is displayed in search results. < 160 chars.
-  ms.topic: landing-page # Required
+  ms.topic: landing-page
-  services: windows-10
+  ms.technology: itpro-manage
-  ms.prod: windows
+  ms.prod: windows-client
   ms.collection:
-    - windows-10
     - highpri
   ms.custom: intro-hub-or-landing
   author: vinaypamnani-msft

windows/configuration/index.yml

@@ -6,12 +6,9 @@ summary: Find out how to apply custom configurations to Windows 10 and Windows 1
 metadata:
   title: Configure Windows client # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Find out how to apply custom configurations to Windows client devices. # Required; article description that is displayed in search results. < 160 chars.
-  services: windows-10
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
-  ms.subservice: subservice
   ms.topic: landing-page # Required
+  ms.prod: windows-client
   ms.collection:
-    - windows-10
     - highpri
   author: aczechowski
   ms.author: aaroncz

windows/deployment/deploy-windows-to-go.md

@@ -6,6 +6,7 @@ manager: aaroncz
 author: frankroj
 ms.author: frankroj
 ms.prod: windows-client
+ms.technology: itpro-deploy
 ms.topic: article
 ms.custom: seo-marvel-apr2020
 ms.date: 10/31/2022

windows/deployment/do/index.yml

@@ -6,12 +6,10 @@ summary: Set up peer to peer downloads for Windows Updates and learn about Micro
 metadata:
   title: Delivery Optimization # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Learn about using peer to peer downloads on Windows clients and learn about Microsoft Connected Cache. # Required; article description that is displayed in search results. < 160 chars.
-  services: windows-10
+  ms.topic: landing-page
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.prod: windows-client
-  ms.subservice: subservice
+  ms.technology: itpro-updates
-  ms.topic: landing-page # Required
   ms.collection:
-    - windows-10
     - highpri
   author: aczechowski
   ms.author: aaroncz

windows/deployment/index.yml

@@ -6,12 +6,10 @@ summary: Learn about deploying and keeping Windows client devices up to date.  #
 metadata:
   title: Windows client deployment resources and documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Learn about deploying Windows 10 and keeping it up to date in your organization. # Required; article description that is displayed in search results. < 160 chars.
-  services: windows-10
+  ms.topic: landing-page
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.technology: itpro-apps
-  ms.subservice: subservice
+  ms.prod: windows-client
-  ms.topic: landing-page # Required
   ms.collection:
-    - windows-10
     - highpri
   author: frankroj
   ms.author: frankroj

windows/deployment/planning/windows-10-enterprise-faq-itpro.yml

@@ -3,7 +3,8 @@ metadata:
   title: Windows 10 Enterprise FAQ for IT pros (Windows 10)
   description: Get answers to common questions around compatibility, installation, and support for Windows 10 Enterprise.
   keywords: Windows 10 Enterprise, download, system requirements, drivers, appcompat, manage updates, Windows as a service, servicing channels, deployment tools
-  ms.prod: w10
+  ms.prod: windows-client
+  ms.technology: itpro-deploy
   ms.mktglfcycl: plan
   ms.localizationpriority: medium
   ms.sitesec: library

windows/deployment/planning/windows-to-go-frequently-asked-questions.yml

@@ -8,7 +8,8 @@ metadata:
   ms.author: frankroj
   manager: aaroncz
   keywords: FAQ, mobile, device, USB
-  ms.prod: w10
+  ms.prod: windows-client
+  ms.technology: itpro-deploy
   ms.mktglfcycl: deploy
   ms.pagetype: mobility
   ms.sitesec: library

windows/deployment/usmt/usmt-faq.yml

@@ -3,11 +3,11 @@ metadata:
   title: 'Frequently Asked Questions (Windows 10)'
   description: 'Learn about frequently asked questions and recommended solutions for migrations using User State Migration Tool (USMT) 10.0.'
   ms.assetid: 813c13a7-6818-4e6e-9284-7ee49493241b
-  ms.reviewer: 
+  ms.prod: windows-client
+  ms.technology: itpro-deploy
   author: frankroj
   ms.author: frankroj
   manager: aaroncz
-  ms.prod: w10
   ms.mktglfcycl: deploy
   ms.sitesec: library
   audience: itpro

windows/deployment/windows-autopilot/index.yml

@@ -6,12 +6,10 @@ summary: 'Note: Windows Autopilot documentation has moved! A few more resources
 metadata:
   title: Windows Autopilot deployment resources and documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
   description: Learn about deploying Windows 10 and keeping it up to date in your organization. # Required; article description that is displayed in search results. < 160 chars.
-  services: windows-10
+  ms.topic: landing-page
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.prod: windows-client
-  ms.subservice: subservice
+  ms.technology: itpro-deploy
-  ms.topic: landing-page # Required
   ms.collection:
-    - windows-10
     - highpri
   author: frankroj
   ms.author: frankroj

windows/hub/index.yml

@@ -8,12 +8,9 @@ brand: windows
 metadata:
   title: Windows client documentation for IT Pros # Required; page title displayed in search results. Include the brand. < 60 chars.
   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.
-  services: windows-10
+  ms.topic: hub-page
-  ms.service: subservice #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.prod: windows-client
-  ms.subservice: subservice # Optional; Remove if no subservice is used.
-  ms.topic: hub-page # Required
   ms.collection:
-    - windows-10
     - highpri
   author: dougeby #Required; your GitHub user alias, with correct capitalization.
   ms.author: dougeby #Required; microsoft alias of author; optional team alias.

windows/security/information-protection/bitlocker/bitlocker-and-adds-faq.yml

@@ -3,8 +3,8 @@ metadata:
   title: BitLocker and Active Directory Domain Services (AD DS) FAQ (Windows 10)
   description: Learn more about how BitLocker and Active Directory Domain Services (AD DS) can work together to keep devices secure. 
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-  ms.reviewer: 
+  ms.prod: windows-client
-  ms.prod: m365-security
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml

@@ -4,7 +4,8 @@ metadata:
   description: Browse frequently asked questions about BitLocker deployment and administration, such as, "Can BitLocker deployment be automated in an enterprise environment?"
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
   ms.reviewer: 
-  ms.prod: m365-security
+  ms.prod: windows-client
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-frequently-asked-questions.yml

@@ -4,7 +4,8 @@ metadata:
   description: Find the answers you need by exploring this brief hub page listing FAQ pages for various aspects of BitLocker.
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
   ms.reviewer: 
-  ms.prod: m365-security
+  ms.prod: windows-client
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-key-management-faq.yml

@@ -3,8 +3,8 @@ metadata:
   title: BitLocker Key Management FAQ (Windows 10)
   description: Browse frequently asked questions concerning the requirements to use, upgrade, deploy and administer, and key management policies for BitLocker.
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-  ms.reviewer: 
+  ms.prod: windows-client
-  ms.prod: m365-security
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-network-unlock-faq.yml

@@ -2,7 +2,8 @@
 metadata:
   title: BitLocker Network Unlock FAQ (Windows 10)
   description: Familiarize yourself with BitLocker Network Unlock. Learn how it can make desktop and server management easier within domain environments.
-  ms.prod: m365-security
+  ms.prod: windows-client
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml

@@ -3,8 +3,8 @@ metadata:
   title: BitLocker overview and requirements FAQ (Windows 10)
   description: This article for IT professionals answers frequently asked questions concerning the requirements to use BitLocker.
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-  ms.reviewer: 
+  ms.prod: windows-client
-  ms.prod: m365-security
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-security-faq.yml

@@ -3,8 +3,8 @@ metadata:
   title: BitLocker Security FAQ (Windows 10)
   description: Learn more about how BitLocker security works. Browse frequently asked questions, such as, "What form of encryption does BitLocker use?"
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-  ms.reviewer: 
+  ms.prod: windows-client
-  ms.prod: m365-security
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-to-go-faq.yml

@@ -3,9 +3,9 @@ metadata:
   title: BitLocker To Go FAQ (Windows 10)
   description: "Learn more about BitLocker To Go"
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-  ms.reviewer: 
+  ms.prod: windows-client
+  ms.technology: itpro-security
   ms.author: frankroj
-  ms.prod: m365-security
   ms.mktglfcycl: deploy
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-upgrading-faq.yml

@@ -2,7 +2,8 @@
 metadata:
   title: BitLocker Upgrading FAQ (Windows 10)
   description: Learn more about upgrading systems that have BitLocker enabled. Find frequently asked questions, such as, "Can I upgrade to Windows 10 with BitLocker enabled?"
-  ms.prod: m365-security
+  ms.prod: windows-client
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml

@@ -3,8 +3,8 @@ metadata:
   title: Using BitLocker with other programs FAQ (Windows 10)
   description: Learn how to integrate BitLocker with other software on a device.
   ms.assetid: c40f87ac-17d3-47b2-afc6-6c641f72ecee
-  ms.reviewer: 
+  ms.prod: windows-client
-  ms.prod: m365-security
+  ms.technology: itpro-security
   ms.mktglfcycl: explore
   ms.sitesec: library
   ms.pagetype: security

windows/security/threat-protection/microsoft-defender-application-guard/faq-md-app-guard.yml

@@ -2,17 +2,17 @@
 metadata:
   title: FAQ - Microsoft Defender Application Guard (Windows 10)
   description: Learn about the commonly asked questions and answers for Microsoft Defender Application Guard.
-  ms.prod: m365-security
   ms.mktglfcycl: manage
   ms.sitesec: library
   ms.pagetype: security
   ms.localizationpriority: medium
-  author: denisebmsft
+  ms.prod: windows-client
-  ms.author: deniseb
+  ms.technology: itpro-security
+  author: vinaypamnani-msft
+  ms.author: vinpa
   ms.reviewer:
   manager: aaroncz
   ms.custom: asr
-  ms.technology: windows-sec
   ms.topic: faq
 title: Frequently asked questions - Microsoft Defender Application Guard
 summary: |

windows/whats-new/windows-11-requirements.md

@@ -84,7 +84,7 @@ The following configuration requirements apply to VMs running Windows 11.
 -	Generation: 2<b> \*</b>
 -	Storage: 64 GB or greater
 -	Security: 
-    - Azure: [Trusted launch](/azure/virtual-machines/trusted-launch) with vTPM and secure boot enabled
+    - Azure: [Trusted launch](/azure/virtual-machines/trusted-launch) with vTPM enabled
     - Hyper-V: [Secure boot and TPM enabled](/windows-server/virtualization/hyper-v/learn-more/Generation-2-virtual-machine-security-settings-for-Hyper-V#secure-boot-setting-in-hyper-v-manager)
     - General settings: Secure boot capable, virtual TPM enabled
 -	Memory:  4 GB or greater