Merge branch 'main' into chrisda

Author: chrisda

.acrolinx-config.edn

@@ -1,6 +1,6 @@
 {:changed-files-limit 30
  :allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["defender-xdr/" "exposure-management/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
+ :allowed-filename-matches ["defender-xdr/" "exposure-management/" "defender/" "defender-business/" "defender-vulnerability-management/" "defender-office-365/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
 
 :use-gh-statuses true
 

.openpublishing.publish.config.json

@@ -111,5 +111,10 @@
     }
   ],
   "branch_target_mapping": {},
-  "targets": {}
+  "targets": {},
+  "redirection_files": [
+    ".openpublishing.redirection.defender.json",
+    ".openpublishing.redirection.endpoint.json"
+  
+  ]
 }

defender-business/mdb-email-notifications.md

@@ -59,7 +59,7 @@ To view or edit email notification settings for your company, follow these steps
 
 3. Review the information on the **Alerts** and **Vulnerabilities** tabs.
 
-   - If you don't see any items listed on the **Alerts** tab, you can create a rule for people to be notified when alerts are generated. To get help with this task, see [Create rules for alert notifications](/defender-endpoint/api/configure-email-notifications).
+   - If you don't see any items listed on the **Alerts** tab, you can create a rule for people to be notified when alerts are generated. To get help with this task, see [Create rules for alert notifications](/defender-xdr/configure-email-notifications).
 
    - If you don't see any items listed on the **Vulnerabilities** tab, you can create a rule for people to be notified whenever a new vulnerability is discovered. To get help with this task, see [Create rules for vulnerability events](/defender-endpoint/configure-vulnerability-email-notifications).
 

defender-business/mdb-get-started.md

@@ -37,8 +37,8 @@ Use the navigation bar on the left side of the screen to access your incidents,
 | **Incidents & alerts** > **Incidents** | Takes you to your list of recent incidents. As alerts are triggered, incidents are created. An incident can include multiple alerts. Make sure to review your incidents regularly. To learn more, see [View and manage incidents in Defender for Business](mdb-view-manage-incidents.md).|
 | **Actions & submissions** > **Action center** | Takes you to your list of response actions, including completed and pending actions.<br/>- Select the **Pending** tab to view actions that require approval to proceed.<br/>- Select the **History** tab to see the actions that were taken. Some actions are taken automatically; others are taken manually or complete after they're approved.<br/><br/>To learn more, see [Review remediation actions in the Action center](mdb-review-remediation-actions.md). |
 | **Actions & submissions** > **Submissions** | Takes you to the unified submissions portal, where you can submit files to Microsoft for analysis. To learn more, see [Submit files in Microsoft Defender for Endpoint](/defender-endpoint/admin-submissions-mde) (the process is similar for Defender for Business). |
-| **Secure score** | Provides a representation of your company's security position and offers suggestions to improve it. To learn more, see [Microsoft Secure Score for Devices](/defender-endpoint/tvm-microsoft-secure-score-devices). |
-| **Learning hub** | Provides access to security training and other resources through learning paths that are included with your subscription. You can filter by product, skill level, role, and more. The Learning hub can help your security team ramp up on security features and capabilities in Defender for Business and more Microsoft offerings, such as [Microsoft Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint.md) and [Microsoft Defender for Office 365](/defender-office-365/mdo-about).  |
+| **Secure score** | Provides a representation of your company's security position and offers suggestions to improve it. To learn more, see [Microsoft Secure Score for Devices](/defender-vulnerability-management/tvm-microsoft-secure-score-devices). |
+| **Learning hub** | Provides access to security training and other resources through learning paths that are included with your subscription. You can filter by product, skill level, role, and more. The Learning hub can help your security team ramp up on security features and capabilities in Defender for Business and more Microsoft offerings, such as [Microsoft Defender for Endpoint](/defender-endpoint/microsoft-defender-endpoint) and [Microsoft Defender for Office 365](/defender-office-365/mdo-about).  |
 | **Trials** | Try additional security and compliance capabilities by adding on a trial subscription. If you do not see **Trials** in your navigation bar, and you want to add on another trial, you can take one of the following steps: <br/>- Visit the [Small Business Solutions page](https://www.microsoft.com/en-us/store/b/business?icid=CNavBusinessStore), and choose **Questions? Talk to an expert** to get some help adding on a trial subscription. <br/>- Go to the [Microsoft 365 admin center](https://admin.microsoft.com/?auth_upn=admin%40M365B614031.onmicrosoft.com&source=applauncher#/catalog), and choose **Billing** > **Purchase services**. If you need help, choose **Help & support**.    |
 | **Partner catalog** | Lists Microsoft partners who provide technical and professional services. |
 | **Assets** > **Devices** | Enables you to view devices, such as computers and mobile devices that are enrolled in [Microsoft Intune](/mem/intune/fundamentals/what-is-intune). |

defender-endpoint/TOC.yml

@@ -694,6 +694,11 @@
         items:
         - name: Use Microsoft Intune to manage Microsoft Defender Antivirus
           href: use-intune-config-manager-microsoft-defender-antivirus.md
+        - name: Use Microsoft Defender for Endpoint Security Settings Management to manage
+            Microsoft Defender Antivirus
+          href: mde-security-settings-management.md
+          displayName: Use Microsoft Defender for Endpoint Security Settings Management to
+            manage Microsoft Defender Antivirus MDE Attach MDE Attach v2
         - name: Use Group Policy settings to manage Microsoft Defender Antivirus
           href: use-group-policy-microsoft-defender-antivirus.md
         - name: Use PowerShell cmdlets to manage Microsoft Defender Antivirus

defender-endpoint/alerts-queue.md

@@ -76,7 +76,7 @@ So, for example:
 You can choose to filter the list of alerts based on their Status.
 
 > [!NOTE]
-> If you see an *Unsupported alert type* alert status, it means that automated investigation capabilities cannot pick up that alert to run an automated investigation. However, you can [investigate these alerts manually](/defender/investigate-incidents#alerts).
+> If you see an *Unsupported alert type* alert status, it means that automated investigation capabilities cannot pick up that alert to run an automated investigation. However, you can [investigate these alerts manually](/defender-xdr/investigate-incidents#alerts).
 
 ### Categories
 

defender-endpoint/api/apis-intro.md

@@ -42,7 +42,7 @@ Watch this video for a quick overview of Defender for Endpoint's APIs.
 
 In general, you'll need to take the following steps to use the APIs:
 
-- Create a [Microsoft Entra application](/defender-endpoint/exposed-apis-create-app-nativeapp)
+- Create a [Microsoft Entra application](/defender-endpoint/api/exposed-apis-create-app-nativeapp)
 - Get an access token using this application
 - Use the token to access Defender for Endpoint API
 

defender-endpoint/api/get-assessment-information-gathering.md

@@ -115,7 +115,7 @@ GET https://api.securitycenter.microsoft.com/api/machines/InfoGatheringExport?$s
 
 ## Other related
 
-- [DeviceTvmInfoGathering](/defender/advanced-hunting-devicetvminfogathering-table)
+- [DeviceTvmInfoGathering](/defender-xdr/advanced-hunting-devicetvminfogathering-table)
 - [DeviceTvmInfoGatheringKB](/defender-xdr/advanced-hunting-devicetvminfogatheringkb-table)
 - [Vulnerability management](/defender-vulnerability-management/defender-vulnerability-management)
 - [Vulnerabilities in your organization](/defender-vulnerability-management/tvm-weaknesses)

defender-endpoint/api/get-installed-software.md

@@ -105,5 +105,5 @@ Here is an example of the response.
 ## See also
 
 - [Microsoft Defender Vulnerability Management](/defender-vulnerability-management/defender-vulnerability-management)
-- [Defender Vulnerability Management software inventory](/defender-endpoint/tvm-software-inventory)
+- [Defender Vulnerability Management software inventory](/defender-vulnerability-management/tvm-software-inventory)
 [!INCLUDE [Microsoft Defender for Endpoint Tech Community](../../includes/defender-mde-techcommunity.md)]

defender-endpoint/api/get-machine-group-exposure-score.md

@@ -103,5 +103,5 @@ Here is an example of the response.
 ## Related topics
 
 - [Microsoft Defender Vulnerability Management](/defender-vulnerability-management/defender-vulnerability-management)
-- [Defender Vulnerability Management exposure score](/defender-endpoint/tvm-exposure-score)
+- [Defender Vulnerability Management exposure score](/defender-vulnerability-management/tvm-exposure-score)
 [!INCLUDE [Microsoft Defender for Endpoint Tech Community](../../includes/defender-mde-techcommunity.md)]