Resolve syncing conflicts from repo_sync_working_branch to main

.openpublishing.publish.config.json

@@ -45,6 +45,12 @@
       "url": "https://github.com/MicrosoftDocs/reusable-content",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "security-docs/includes/entra-content",
+      "url": "https://github.com/MicrosoftDocs/entra-docs-pr",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "security-docs/zero-trust/siem-xdr-training.md",
+      "redirect_url": "security/zero-trust/security-adoption-discipline-architecture-tips",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "security-docs/zero-trust/ten-laws-of-security.md",
+      "redirect_url": "security/zero-trust/security-adoption-discipline-security-operations",
+      "redirect_document_id": false
+    },
     {
       "source_path": "security-docs/zero-trust/zero-trust-assessment-progress-tracking-resources.md",
       "redirect_url": "security/zero-trust/assessment/get-started",

security-docs/docfx.json

@@ -47,8 +47,8 @@
       "breadcrumb_path": "/security/breadcrumb/toc.json",
       "feedback_system": "Standard",
       "feedback_help_link_type": "get-help-at-qna",
-      "ms.author": "kenwith",
-      "author": "kenwith"
+      "ms.author": "raynew",
+      "author": "rayne-wiselman"
     },
     "fileMetadata": {
       "titleSuffix": {