Merge branch 'main' into WI446820-find-all-mdi-docs-with-the-word-on-prem

Author: DeCohen

.acrolinx-config.edn

@@ -1,6 +1,6 @@
 {:changed-files-limit 60
  :allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["ATADocs/" "ATPDocs/" "CloudAppSecurityDocs/" "defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/" "unified-secops-platform/"] ;; 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 ["advanced-threat-analytics/" "defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud-apps/" "defender-for-cloud/" "defender-for-identity/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/" "unified-secops-platform/"] ;; 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
 

.github/workflows/AutoLabelAssign.yml

@@ -30,8 +30,11 @@ jobs:
         with:
             PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
             AutoAssignUsers: 1
+            AutoAssignReviewers: 1
             AutoLabel: 1
             ExcludedUserList: '["user1", "user2"]'
             ExcludedBranchList: '["branch1", "branch2"]'
         secrets:
-            AccessToken: ${{ secrets.GITHUB_TOKEN }}
+            AccessToken: ${{ secrets.GITHUB_TOKEN }}
+            PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
+            ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/BackgroundTasks.yml

@@ -6,6 +6,7 @@ permissions:
 
 on:
   pull_request_target:
+    types: [opened, synchronize, reopened, ready_for_review]
 
 jobs:
   upload:

.openpublishing.publish.config.json

@@ -51,7 +51,7 @@
     },
     {
       "docset_name": "defender-cloud-apps",
-      "build_source_folder": "CloudAppSecurityDocs",
+      "build_source_folder": "defender-for-cloud-apps",
       "build_output_subfolder": "defender-cloud-apps",
       "locale": "en-us",
       "monikers": [],

.openpublishing.redirection.defender-cloud-apps.json

@@ -20,6 +20,11 @@
       "redirect_url": "/defender-endpoint/evaluate-mdav-using-gp",
       "redirect_document_id": false
     },
+    {
+      "source_path": "defender-endpoint/linux-install-with-activator.md",
+      "redirect_url": "/defender-endpoint/linux-custom-location-installation",
+      "redirect_document_id": false
+    },
     {
       "source_path": "defender-endpoint/preview.md",
       "redirect_url": "/defender-xdr/preview",

.openpublishing.redirection.defender-endpoint.json

@@ -859,6 +859,11 @@
       "source_path": "defender-for-identity/manage-security-alerts.md",
       "redirect_url": "/defender-for-identity/understanding-security-alerts",
       "redirect_document_id": false
-    },  
+    },
+    {
+      "source_path": "defender-for-identity/automated-response-exclusions.md",
+      "redirect_url": "/defender-xdr/automatic-attack-disruption-exclusions",
+      "redirect_document_id": false
+    }
   ]
 }

.openpublishing.redirection.defender-identity.json

@@ -96,7 +96,7 @@
     - name: Security, privacy, and compliance
       href: mdb-security-privacy-compliance.md
     - name: Top 10 ways to secure your business data
-      href: /Microsoft-365/business-premium/secure-your-business-data?bc=%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fdefender-business%2Ftoc.json
+      href: /microsoft-365/admin/security-and-compliance/m365b-security-best-practices?bc=%2Fdefender-business%2Fbreadcrumb%2Ftoc.json&toc=%2Fdefender-business%2Ftoc.json
     - name: How to get help or contact support
       href: /microsoft-365/admin/get-help-support
     - name: Frequently asked questions

CloudAppSecurityDocs/cloud-discovery-anomaly-detection-policy.md

@@ -163,9 +163,9 @@ sections:
 
       - question: Can I have a mix of Microsoft endpoint security subscriptions?
         answer: |
-          Microsoft Defender for Business does not support mixed licensing, so a tenant with Defender for Business (which is included in Microsoft 365 Business Premium) along with Defender for Endpoint Plan 2 (which is included in Microsoft 365 E5 Security) defaults to the Defender for Business experience. 
+          Microsoft Defender for Business does not support mixed licensing, so a tenant with Defender for Business (which is included in Microsoft 365 Business Premium) along with Defender for Endpoint Plan 2 (which is included in the Microsoft Defender Suite) defaults to the Defender for Business experience. 
 
-          For example, if you have 80 users licensed for Defender for Business (as part of a Microsoft 365 Business Premium subscription), and you add Microsoft 365 E5 Security for 30 of those users, the experience for all users defaults to Defender for Business. If you want to change that to the Defender for Endpoint Plan 2 experience, you should license all users for Defender for Endpoint Plan 2 (either through the standalone version of Defender for Endpoint Plan 2 or Microsoft 365 E5 Security), and then contact Microsoft Support to request the switch for your tenant.
+          For example, if you have 80 users licensed for Defender for Business (as part of a Microsoft 365 Business Premium subscription), and you add the Microsoft Defender Suite for 30 of those users, the experience for all users defaults to Defender for Business. If you want to change that to the Defender for Endpoint Plan 2 experience, you should license all users for Defender for Endpoint Plan 2 (either through the standalone version of Defender for Endpoint Plan 2 or the Microsoft Defender Suite), and then contact Microsoft Support to request the switch for your tenant.
                     
           For more information, see [Manage your subscription settings](mdb-manage-subscription.md).