Resolving merge conflict

Author: LouisBerner

.openpublishing.publish.config.json

@@ -233,7 +233,13 @@
     {
       "path_to_root": "azure-functions-durable-js",
       "url": "https://github.com/Azure/azure-functions-durable-js",
-      "branch": "main",
+      "branch": "v2.x",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-functions-durable-js-v3",
+      "url": "https://github.com/Azure/azure-functions-durable-js",
+      "branch": "v3.x",
       "branch_mapping": {}
     },
     {
@@ -536,6 +542,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-cosmos-db-mongodb-mern-web-app",
+      "url": "https://github.com/Azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-cosmos-spark",
       "url": "https://github.com/Azure/azure-cosmosdb-spark",
@@ -760,7 +772,7 @@
     },
     {
       "path_to_root": "azure-spring-apps-reference-architecture",
-      "url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
+      "url": "https://github.com/Azure/azure-spring-apps-landing-zone-accelerator",
       "branch": "reference-architecture",
       "branch_mapping": {}
     },
@@ -970,6 +982,7 @@
   ".openpublishing.redirection.security-benchmark.json",
   ".openpublishing.redirection.sql-database.json",
   ".openpublishing.redirection.virtual-desktop.json",
+  ".openpublishing.redirection.devops-project.json",
   "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -996,7 +1009,7 @@
   "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
   "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
-  "articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
+  "articles/iot/.openpublishing.redirection.iot.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",

.openpublishing.redirection.active-directory.json

@@ -95,6 +95,11 @@
       "redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/governance/manage-lifecycle-workflows.md",
+      "redirect_url": "/azure/active-directory/governance/understanding-lifecycle-workflows",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
       "redirect_url": "/graph/api/resources/identitygovernance-workflow",
@@ -160,6 +165,46 @@
       "redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identities-faqs.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identities-faqs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-user-assigned-managed-identity.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-user-assigned-managed-identity",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-gcp.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-gcp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-block-using-azure-policy.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-block-using-azure-policy",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-considerations.md",
+      "redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-considerations",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
       "redirect_url": "/azure/active-directory/develop/v2-overview",
@@ -4446,6 +4491,11 @@
       "redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/customize-branding.md",
       "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7229,6 +7279,11 @@
     {
       "source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
       "redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
+      "redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
       "redirect_document_id": true
     },
     {
@@ -10941,6 +10996,11 @@
       "redirect_url": "/azure/active-directory-b2c/tenant-management-add-administrator",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/support-options.md",
+      "redirect_url": "/azure/active-directory-b2c/find-help-open-support-ticket",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",

.openpublishing.redirection.azure-monitor.json

@@ -1,11 +1,6 @@
 {
     "redirections": [
-       {
-            "source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-debugger-troubleshoot.md",
-            "redirect_url": "https://learn.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/snapshot-debugger-troubleshoot",
-            "redirect_document_id": false
-        },
-        {
+         {
             "source_path_from_root": "/articles/azure-monitor/best-practices.md",
             "redirect_url": "/azure/azure-monitor/getting-started",
             "redirect_document_id": false
@@ -35,16 +30,41 @@
             "redirect_url": "/azure/azure-monitor/change/change-analysis",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/javascript.md",
+            "redirect_url": "/azure/azure-monitor/app/javascript-sdk",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/source-map-support.md",
+            "redirect_url": "/azure/azure-monitor/app/javascript-sdk-advanced",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/release-notes.md",
             "redirect_url": "/azure/azure-monitor/app/app-insights-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/console.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/console",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/devops.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/old-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/automate-custom-reports.md",
+            "redirect_url": "/previous-versions/azure/azure-monitor/app/custom-reports",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/resource-manager-function-app.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-function-app",
@@ -6005,6 +6025,72 @@
             "source_path_from_root": "/articles/azure-monitor/app/availability-multistep.md",
             "redirect_url": "/previous-versions/azure/azure-monitor/app/availability-multistep",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-overview.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-get-started.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-detailed-instructions.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-api-reference.md",
+            "redirect_url": "/azure/azure-monitor/app/application-insights-asp-net-agent",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-request-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-dependency-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-exception-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-trace-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-event-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-metric-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-pageview-telemetry.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/data-model-context.md",
+            "redirect_url": "/azure/azure-monitor/app/data-model-complete",
+            "redirect_document_id": false
         }
+
     ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -89,6 +89,66 @@
       "source_path": "articles/lab-services/troubleshoot.md",
       "redirect_url": "/azure/lab-services/troubleshoot-lab-creation",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-portal.md",
+      "redirect_url": "/azure/lab-services/quick-create-connect-lab",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/tutorial-setup-lab-plan.md",
+      "redirect_url": "/azure/lab-services/quick-create-resources",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-portal.md",
+      "redirect_url": "/azure/lab-services/quick-create-resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-bicep.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-bicep.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-bicep",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-powershell.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-powershell",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-python.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-plan-template.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-template",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-powershell.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-powershell",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-python.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-python",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/quick-create-lab-template.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-template",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/classroom-labs-faq.yml",
+      "redirect_url": "/azure/lab-services/lab-services-overview",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.azure-resource-manager.json

@@ -1410,6 +1410,11 @@
             "redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-custom-role-definition",
             "redirect_document_id": false
         },
+        {
+          "source_path_from_root": "/articles/azure-resource-manager/managed-applications/concepts-custom-role-definition.md",
+          "redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
+          "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/managed-applications/concepts-managed-applications-built-in-policy.md",
             "redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-built-in-policy",
@@ -1600,6 +1605,11 @@
             "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-portal",
             "redirect_document_id": false
         },
+        {
+          "source_path_from_root": "/articles/azure-resource-manager/managed-applications/publish-portal.md",
+          "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
+          "redirect_document_id": false
+      },
         {
             "source_path_from_root": "/articles/managed-applications/publish-service-catalog-app.md",
             "redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1881,4 +1891,4 @@
             "redirect_document_id": false
         }
     ]
-}
+}

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

@@ -809,6 +809,11 @@
             "source_path_from_root": "/articles/defender-for-cloud/faq-azure-monitor-logs.yml",
             "redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
+            "redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
+            "redirect_document_id": true
         }
     ]
 }