Resolve syncing conflicts from repo_sync_working_branch to public

.github/copilot-instructions.md

@@ -60,6 +60,9 @@ Below are instructions specific to this repository. These may be updated by repo
 - Never use the word "across" (use alternatives like "in," "on," "throughout," or "for").
 - Never use internal engineering jargon in customer-facing content. For example, avoid terms like "fire" (for alerts), "mixed-mode," or "mixed-environment." Instead, use plain, descriptive language (for example, "the alert appears," "credentials are validated," "environments with both v2 and v3 sensors").
 
+### Pull Requests
+
+This is a fork of `MicrosoftDocs/defender-docs-pr`. When creating pull requests, always target the upstream repo (`MicrosoftDocs/defender-docs-pr`) by using `--repo MicrosoftDocs/defender-docs-pr`. Do not create PRs against this fork.
 
 ### Authoritative security content
 

.openpublishing.redirection.defender-business.json

@@ -4,6 +4,11 @@
       "source_path": "defender-business/mdb-preview.md",
       "redirect_url": "/defender-xdr/preview",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-business/mdb-controlled-folder-access.md",
+      "redirect_url": "/defender-endpoint/controlled-folder-access-overview#deployment-and-configuration-methods-for-cfa",
+      "redirect_document_id": false
     }
   ]
 }

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

@@ -1,5 +1,20 @@
 {
   "redirections": [
+    {
+      "source_path": "defender-for-cloud-apps/ai-agent-inventory.md",
+      "redirect_url": "/defender-xdr/security-for-ai/ai-agent-inventory",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-for-cloud-apps/ai-agent-protection.md",
+      "redirect_url": "/defender-xdr/security-for-ai/defender-security-for-ai",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-for-cloud-apps/real-time-agent-protection-during-runtime.md",
+      "redirect_url": "/defender-xdr/security-for-ai/ai-agent-real-time-protection",
+      "redirect_document_id": false
+    },
     {
       "source_path": "defender-for-cloud-apps/lifecycle-management.md",
       "redirect_url": "/defender-cloud-apps/ops-guide/ops-guide",
@@ -990,7 +1005,7 @@
       "redirect_url": "/defender-cloud-apps/what-is-defender-for-cloud-apps",
       "redirect_document_id": true
     },
-     {
+    {
       "source_path": "defender-for-cloud-apps/tutorial-ueba.md",
       "redirect_url": "/defender-cloud-apps/",
       "redirect_document_id": true
@@ -1034,6 +1049,36 @@
       "source_path": "defender-for-cloud-apps/webinars.md",
       "redirect_url": "/defender-cloud-apps/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-for-cloud-apps/app-governance-app-policies-get-started.md",
+      "redirect_document_id": false,
+      "redirect_url": "/defender-cloud-apps/app-governance-app-policies-overview"
+    },
+    {
+      "source_path": "defender-for-cloud-apps/app-governance-predefined-policies.md",
+      "redirect_document_id": false,
+      "redirect_url": "/defender-cloud-apps/app-governance-app-policies-overview"
+    },
+    {
+      "source_path": "defender-for-cloud-apps/app-governance-app-policies-manage.md",
+      "redirect_document_id": false,
+      "redirect_url": "/defender-cloud-apps/app-governance-app-policies-create"
+    },
+    {
+      "source_path": "defender-for-cloud-apps/app-governance-detect-remediate-get-started.md",
+      "redirect_document_id": false,
+      "redirect_url": "/defender-cloud-apps/app-governance-detect-remediate-overview"
+    },
+    {
+      "source_path": "defender-for-cloud-apps/app-governance-monitor-apps-unusual-data-usage.md",
+      "redirect_document_id": false,
+      "redirect_url": "/defender-cloud-apps/app-governance-detect-remediate-overview"
+    },
+    {
+      "source_path": "defender-for-cloud-apps/app-governance-visibility-insights-get-started.md",
+      "redirect_document_id": false,
+      "redirect_url": "/defender-cloud-apps/app-governance-visibility-insights-overview"
     }
   ]
 }

.openpublishing.redirection.defender-endpoint.json

@@ -155,6 +155,36 @@
       "redirect_url": "/defender-endpoint/microsoft-defender-endpoint",
       "redirect_document_id": true
     },
+    {
+      "source_path": "defender-endpoint/evaluate-controlled-folder-access.md",
+      "redirect_url": "/defender-endpoint/controlled-folder-access-monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-endpoint/controlled-folders.md",
+      "redirect_url": "/defender-endpoint/controlled-folder-access-overview",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "defender-endpoint/enable-controlled-folders.md",
+      "redirect_url": "/defender-endpoint/controlled-folder-access-configure",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "defender-endpoint/customize-controlled-folders.md",
+      "redirect_url": "/defender-endpoint/controlled-folder-access-configure",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-endpoint/defender-endpoint-demonstration-controlled-folder-access-test-tool.md",
+      "redirect_url": "/defender-endpoint/defender-endpoint-demonstration-controlled-folder-access-block-app",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "defender-endpoint/defender-endpoint-demonstration-controlled-folder-access.md",
+      "redirect_url": "/defender-endpoint/defender-endpoint-demonstration-controlled-folder-access-ransomware",
+      "redirect_document_id": true
+    },
     {
       "source_path": "defender-endpoint/configure-endpoints-non-windows.md",
       "redirect_url": "/defender-endpoint/onboarding",

.openpublishing.redirection.defender-for-cloud.json

@@ -739,6 +739,16 @@
       "source_path_from_root": "/defender-for-cloud/episode-forty-three.md",
       "redirect_url": "/azure/defender-for-cloud/episode-forty-four",
       "redirect_document_id": false
+    },
+    {  
+      "source_path_from_root": "/defender-for-cloud/secure-container-image.md",
+      "redirect_url": "/azure/defender-for-cloud/containers-software-supply-chain-security-introduction",
+      "redirect_document_id": false
+    },
+    {  
+      "source_path_from_root": "/defender-for-cloud/faq-runtime-gated.md",
+      "redirect_url": "/azure/defender-for-cloud/runtime-gated-overview",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.defender-xdr.json

@@ -230,7 +230,7 @@
       "redirect_url": "/defender-xdr/automatic-attack-disruption",
       "redirect_document_id": false
     },
-  {
+    {
       "source_path": "defender-xdr/deception-overview.md",
       "redirect_url": "/defender-xdr/automatic-attack-disruption",
       "redirect_document_id": false
@@ -339,6 +339,136 @@
       "source_path": "defender-xdr/faq-incident-notifications-xdr.md",
       "redirect_url": "/defender-xdr/faq-managed-response",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/defender-experts-for-hunting.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/before-you-begin-defender-experts.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-prerequisites",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/onboarding-defender-experts-for-hunting.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-onboarding",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/access-den-graph-api.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-graph-api",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/experts-on-demand.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-ask-experts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/defender-experts-report.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/faq-defender-experts-hunting.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-hunting-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/dex-xdr-overview.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/before-you-begin-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-prerequisites",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/get-started-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/start-using-mdex-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-start-using",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/managed-detection-and-response-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-managed-response",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/defender-experts-scoped-coverage.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-scoped-coverage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/communicate-defender-experts-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-communication",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/reports-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-reports",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/third-party-enrichment-defender-experts.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-third-party-enrichment",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/auditing.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-auditing",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/additional-information-xdr.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-considerations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/frequently-asked-questions.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-faq",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/faq-managed-response.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-faq-managed-response",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/dex-xdr-permissions.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mdr-permissions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/dex-servers-overview.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-servers-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/get-started-dex-servers.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-servers-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/teams-restrictions-dexapp.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-teams-app-permissions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/defender-experts-managed-security-guide.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-mssp-guide",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "defender-xdr/faq-cloud-coverage-defender-experts.md",
+      "redirect_url": "/defender-xdr/defender-experts/defender-experts-faq-cloud-coverage",
+      "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/sentinel/datalake/sentinel-mcp-graph-tool.md",
+      "redirect_url": "/azure/sentinel/datalake/sentinel-mcp-data-exploration-tool#graph-tools-preview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/sentinel/datalake/sentinel-mcp-responsible-ai-faq.md",
       "redirect_url": "/azure/sentinel/datalake/sentinel-mcp-application-card",
@@ -3480,16 +3485,6 @@
       "redirect_url": "/azure/sentinel/isv/sentinel-playbook-creation",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/sentinel/normalization-create-parsers-ai-agent.md",
-      "redirect_url": "/azure/sentinel/isv/normalization-create-parsers-ai-agent",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/sentinel/normalization-develop-parsers.md",
-      "redirect_url": "/azure/sentinel/isv/normalization-develop-parsers",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/sentinel/publish-sentinel-solutions.md",
       "redirect_url": "/azure/sentinel/isv/publish-sentinel-solutions",

authorized-approvers.txt

@@ -11,7 +11,9 @@
 #   - To keep default owners on a specific folder, include them on that line too.
 
 # Default owners for everything unless a later match takes precedence
-* @MicrosoftDocs/msecd-org
+* @MicrosoftDocs/msecd-org @snicklezzz
 
-# Specific folder overrides (include default team to retain their access)
-# /compliance/ @MicrosoftDocs/msecd-org @chvukosw @k-reagle
+# Specific folder overrides (include default team to retain their approval)
+# /FOLDER/ @MicrosoftDocs/msecd-org OPTIONAL_APPROVERS
+
+/compliance/ @MicrosoftDocs/msecd-org @chvukosw @k-reagle

defender-business/TOC.yml

@@ -51,8 +51,6 @@
         href: mdb-firewall.md
       - name: Web content filtering
         href: mdb-web-content-filtering.md
-      - name: Controlled folder access
-        href: mdb-controlled-folder-access.md
       - name: Attack surface reduction
         href: mdb-asr.md
       - name: Portal and feature settings

defender-business/get-defender-business.md

@@ -128,7 +128,7 @@ The following table summarizes these portals and how you use them.
 |---|---|
 |Microsoft 365 admin center|<ul><li>Activate your trial and sign in for the first time.</li><li>Assign user licenses.</li><li>View your products and services.</li><li>Complete setup tasks for your Microsoft 365 subscription.</li></ul> <br/> For more information, see [Overview of the Microsoft 365 admin center](/microsoft-365/admin/admin-overview/admin-center-overview).|
 |Defender portal|<ul><li>Set up and configure Defender for Business.</li><li>Monitor your devices and threat detections</li><li>View your devices and device protection policies.</li><li>View detected threats and take action.</li><li>View security recommendations and manage your security settings.</li></ul> <br/> For more information, see [Get started using the Microsoft Defender portal](mdb-get-started.md).|
-|Intune admin center|<ul><li>Onboard iOS and Android devices.</li><li>Configure certain capabilities, such as [attack surface reduction rules](mdb-asr.md).</li></ul> <br/> For more information about Intune, see [Microsoft Intune securely manages identities, manages apps, and manages devices](/intune/intune-service/fundamentals/what-is-intune).|
+|Intune admin center|<ul><li>Onboard iOS and Android devices.</li><li>Configure certain capabilities, such as [attack surface reduction features](mdb-asr.md).</li></ul> <br/> For more information about Intune, see [Microsoft Intune securely manages identities, manages apps, and manages devices](/intune/intune-service/fundamentals/what-is-intune).|
 
 ## Next step