Merging changes synced from https://github.com/MicrosoftDocs/windows-docs-pr (branch live)

windows/configuration/TOC.yml

@@ -117,7 +117,7 @@
       items:
         - name: Set up and test Cortana in Windows 10, version 2004 and later
           href: cortana-at-work/set-up-and-test-cortana-in-windows-10.md
-        - name: Testing scenarios using Cortana in your business or organization
+        - name: Cortana at work testing scenarios
           href: cortana-at-work/cortana-at-work-testing-scenarios.md
         - name: Test scenario 1 - Sign into Azure AD, enable the wake word, and try a voice query
           href: cortana-at-work/cortana-at-work-scenario-1.md
@@ -138,7 +138,7 @@
         - name: Set up and test Cortana in Windows 10, versions 1909 and earlier, with Microsoft 365 in your organization
           href: cortana-at-work/cortana-at-work-o365.md
         - name: Testing scenarios using Cortana in your business or organization
-          href: cortana-at-work/cortana-at-work-testing-scenarios.md
+          href: cortana-at-work/testing-scenarios-using-cortana-in-business-org.md
         - name: Test scenario 1 - Sign into Azure AD, enable the wake word, and try a voice query
           href: cortana-at-work/test-scenario-1.md
         - name: Test scenario 2 - Perform a quick search with Cortana at work

windows/configuration/cortana-at-work/cortana-at-work-testing-scenarios.md

@@ -1,31 +1,25 @@
 ---
-title: Testing scenarios using Cortana in your business or organization (Windows 10)
+title: Cortana at work testing scenarios
-description: A list of suggested testing scenarios that you can use to test Cortana in your organization.
+description: Suggested testing scenarios that you can use to test Cortana in your organization.
 ms.prod: w10
 ms.mktglfcycl: manage
 ms.sitesec: library
 author: greg-lindsay
 ms.localizationpriority: medium
 ms.author: greglin
-ms.date: 10/05/2017
+ms.date: 06/28/2021
 ms.reviewer: 
 manager: dansimp
 ---
 
-# Testing scenarios using Cortana in your business or organization
+# Cortana at work testing scenarios
 
 We've come up with a list of suggested testing scenarios that you can use to test Cortana in your organization. After you complete all the scenarios, you should be able to:
 
 - [Sign into Azure AD, enable the Cortana wake word, and try a voice query](cortana-at-work-scenario-1.md)
-
 - [Perform a Bing search with Cortana](cortana-at-work-scenario-2.md)
-
 - [Set a reminder](cortana-at-work-scenario-3.md)
-
 - [Use Cortana to find free time on your calendar](cortana-at-work-scenario-4.md)
-
 - [Find out about a person](cortana-at-work-scenario-5.md)
-
 - [Change your language and perform a quick search with Cortana](cortana-at-work-scenario-6.md)
-
 - [Use Windows Information Protection (WIP) to secure content on a device and then try to manage your organization’s entries in the notebook](cortana-at-work-scenario-7.md)

windows/security/threat-protection/TOC.yml

@@ -224,7 +224,7 @@
         - name: Information for developers
           items: 
             - name: Software developer FAQ
-              href: intelligence/developer-faq.md
+              href: intelligence/developer-faq.yml
             - name: Software developer resources
               href: intelligence/developer-resources.md
     - name: The Windows Security app

windows/security/threat-protection/intelligence/TOC.yml

@@ -55,6 +55,6 @@
     - name: Information for developers
       items: 
         - name: Software developer FAQ
-          href: developer-faq.md
+          href: developer-faq.yml
         - name: Software developer resources
           href: developer-resources.md

windows/security/threat-protection/intelligence/developer-faq.md

@@ -1,51 +0,0 @@
----
-title: Software developer FAQ
-ms.reviewer: 
-description: This page provides answers to common questions we receive from software developers
-keywords: wdsi, software, developer, faq, dispute, false-positive, classify, installer, software, bundler, blocking
-search.product: eADQiWindows 10XVcnh
-ms.prod: m365-security
-ms.mktglfcycl: deploy
-ms.sitesec: library
-ms.pagetype: security
-ms.author: dansimp
-author: dansimp
-ms.localizationpriority: medium
-manager: dansimp
-audience: ITPro
-ms.collection: M365-security-compliance
-ms.topic: article
-ms.technology: mde
----
-
-# Software developer FAQ
-
-This page provides answers to common questions we receive from software developers. For general guidance about submitting malware or incorrectly detected files, read the submission guide.
-
-## Does Microsoft accept files for a known list or false-positive prevention program?
-
-No. We don't accept these requests from software developers. Signing your program's files in a consistent manner, with a digital certificate issued by a trusted root authority, helps our research team quickly identify the source of a program and apply previously gained knowledge. In some cases, this might result in your program being quickly added to the known list. Far less frequently, in will add your digital certificate to a list of trusted publishers.
-
-## How do I dispute the detection of my program?
-
-Submit the file in question as a software developer. Wait until your submission has a final determination.
-
-If you're not satisfied with our determination of the submission, use the developer contact form provided with the submission results to reach Microsoft. We'll use the information you provide to investigate further if necessary.
-
-We encourage all software vendors and developers to read about [how Microsoft identifies malware and Potentially Unwanted Applications (PUA)](criteria.md).
-
-## Why is Microsoft asking for a copy of my program?
-
-Providing copies can help us with our analysis. Participants of the [Microsoft Active Protection Service (MAPS)](https://www.microsoft.com/msrc/mapp) may occasionally receive these requests. The requests will stop once our systems have received and processed the file.
-
-## Why does Microsoft classify my installer as a software bundler?
-
-It contains instructions to offer a program classified as unwanted software. You can review the [criteria](criteria.md) we use to check applications for behaviors that are considered unwanted.
-
-## Why is the Windows Defender Firewall blocking my program?
-
-Firewall blocks aren't related to Microsoft Defender Antivirus and other Microsoft antimalware. [Learn about Windows Defender Firewall](../windows-firewall/windows-firewall-with-advanced-security.md).
-
-## Why does the Microsoft Defender Windows Defender SmartScreen say my program isn't commonly downloaded?
-
-This isn't related to Microsoft Defender Antivirus and other Microsoft antimalware. [Learn about Microsoft Defender Windows Defender SmartScreen](../microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md)

windows/security/threat-protection/intelligence/developer-faq.yml

@@ -0,0 +1,60 @@
+### YamlMime:FAQ
+metadata:
+  title: Software developer FAQ
+  ms.reviewer: 
+  description: This page provides answers to common questions we receive from software developers
+  keywords: wdsi, software, developer, faq, dispute, false-positive, classify, installer, software, bundler, blocking
+  search.product: eADQiWindows 10XVcnh
+  ms.prod: m365-security
+  ms.mktglfcycl: deploy
+  ms.sitesec: library
+  ms.pagetype: security
+  ms.author: dansimp
+  author: dansimp
+  ms.localizationpriority: medium
+  manager: dansimp
+  audience: ITPro
+  ms.collection: M365-security-compliance
+  ms.topic: article
+  ms.technology: mde
+    
+title: Software developer FAQ
+summary: This page provides answers to common questions we receive from software developers. For general guidance about submitting malware or incorrectly detected files, read the submission guide.
+
+
+sections:
+  - name: Ignored
+    questions:
+      - question: |
+          Does Microsoft accept files for a known list or false-positive prevention program?
+        answer: |
+          No. We don't accept these requests from software developers. Signing your program's files in a consistent manner, with a digital certificate issued by a trusted root authority, helps our research team quickly identify the source of a program and apply previously gained knowledge. In some cases, this might result in your program being quickly added to the known list. Far less frequently, in will add your digital certificate to a list of trusted publishers.
+
+      - question: |
+          How do I dispute the detection of my program?
+        answer: |
+          Submit the file in question as a software developer. Wait until your submission has a final determination.
+          
+          If you're not satisfied with our determination of the submission, use the developer contact form provided with the submission results to reach Microsoft. We'll use the information you provide to investigate further if necessary.
+          
+          We encourage all software vendors and developers to read about [how Microsoft identifies malware and Potentially Unwanted Applications (PUA)](criteria.md).
+          
+      - question: |
+          Why is Microsoft asking for a copy of my program?
+        answer: |
+          Providing copies can help us with our analysis. Participants of the [Microsoft Active Protection Service (MAPS)](https://www.microsoft.com/msrc/mapp) may occasionally receive these requests. The requests will stop once our systems have received and processed the file.
+          
+      - question: |
+          Why does Microsoft classify my installer as a software bundler?
+        answer: |
+          It contains instructions to offer a program classified as unwanted software. You can review the [criteria](criteria.md) we use to check applications for behaviors that are considered unwanted.
+          
+      - question: |
+          Why is the Windows Defender Firewall blocking my program?
+        answer: |
+          Firewall blocks aren't related to Microsoft Defender Antivirus and other Microsoft antimalware. [Learn about Windows Defender Firewall](../windows-firewall/windows-firewall-with-advanced-security.md).
+          
+      - question: |
+          Why does the Microsoft Defender Windows Defender SmartScreen say my program isn't commonly downloaded?
+        answer: |
+          This isn't related to Microsoft Defender Antivirus and other Microsoft antimalware. [Learn about Microsoft Defender Windows Defender SmartScreen](../microsoft-defender-smartscreen/microsoft-defender-smartscreen-overview.md)

windows/security/threat-protection/intelligence/developer-resources.md

@@ -37,7 +37,7 @@ To objectively identify malware and unidentified software, Microsoft applies a [
 
 ### Developer questions
 
-Find more guidance about the file submission and detection dispute process in our [FAQ for software developers](developer-faq.md).
+Find more guidance about the file submission and detection dispute process in our [FAQ for software developers](developer-faq.yml).
 
 ### Scan your software