fix merge conflict

Author: asudbring

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}
+ :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}

.openpublishing.publish.config.json

@@ -356,6 +356,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-python-worker",
+      "url": "https://github.com/Azure/azure-functions-python-worker",
+      "branch": "dev",
+      "branch_mapping": {}
+    },    
     {
       "path_to_root": "functions-openapi-turbine-repair",
       "url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",
@@ -866,6 +872,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "blob-devguide-go",
+      "url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -962,12 +974,24 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-tomcat-mysql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-typescript-e2e-apps",
+      "url": "https://github.com/Azure-Samples/azure-typescript-e2e-apps",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-webpubsub",
       "url": "https://github.com/Azure/azure-webpubsub",
@@ -1113,7 +1137,7 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "articles/reusable-content",
+      "path_to_root": "reusable-content",
       "url": "https://github.com/MicrosoftDocs/reusable-content",
       "branch": "main",
       "branch_mapping": {}
@@ -1177,6 +1201,12 @@
       "url": "https://github.com/Azure-Samples/explore-iot-operations",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "SupportArticles-docs",
+      "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -1193,16 +1223,18 @@
     "name": "docfx_v3"
   },
   "redirection_files": [
-  ".openpublishing.redirection.json",
   ".openpublishing.redirection.active-directory.json",
+  ".openpublishing.redirection.ansible.json",
   ".openpublishing.redirection.api-management.json",
   ".openpublishing.redirection.app-service.json",
+  ".openpublishing.redirection.asc-for-iot.json",
+  ".openpublishing.redirection.availability-zones.json",
+  ".openpublishing.redirection.azure-app-configuration.json",
   ".openpublishing.redirection.azure-arc-data.json",
   ".openpublishing.redirection.azure-attestation.json",
-  ".openpublishing.redirection.azure-app-configuration.json",
-  ".openpublishing.redirection.azure-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-australia.json",
   ".openpublishing.redirection.azure-databricks.json",
+  ".openpublishing.redirection.azure-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-hpc.json",
   ".openpublishing.redirection.azure-kubernetes-service.json",
   ".openpublishing.redirection.azure-monitor.json",
@@ -1213,34 +1245,58 @@
   ".openpublishing.redirection.azure-vmware.json",
   ".openpublishing.redirection.azure-web-pubsub.json",
   ".openpublishing.redirection.baremetal-infrastructure.json",
+  ".openpublishing.redirection.blockchain.json",
   ".openpublishing.redirection.container-service.json",
+  ".openpublishing.redirection.data-lake-analytics.json",
   ".openpublishing.redirection.defender-for-cloud.json",
   ".openpublishing.redirection.defender-for-iot.json",
+  ".openpublishing.redirection.dev-spaces.json",
   ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.germany.json",
+  ".openpublishing.redirection.government.json",
   ".openpublishing.redirection.guidance.json",
+  ".openpublishing.redirection.industry.json",
+  ".openpublishing.redirection.iot-accelerators.json",
+  ".openpublishing.redirection.iot-develop.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
+  ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
   ".openpublishing.redirection.machine-configuration.json",
   ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
   ".openpublishing.redirection.purview.json",
+  ".openpublishing.redirection.remoteapp.json",
   ".openpublishing.redirection.security-benchmark.json",
+  ".openpublishing.redirection.security-center.json",
   ".openpublishing.redirection.sentinel.json",
+  ".openpublishing.redirection.service-fabric-mesh.json",
   ".openpublishing.redirection.spring-cloud.json",
+  ".openpublishing.redirection.sql-data-warehouse.json",
   ".openpublishing.redirection.sql-database.json",
+  ".openpublishing.redirection.terraform.json",
+  ".openpublishing.redirection.update-center.json",
   ".openpublishing.redirection.virtual-desktop.json",
+  ".openpublishing.redirection.vmware-cloudsimple.json",
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
   "articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
+  "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
+  "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
+  "articles/automation/.openpublishing.redirection.automation.json",
+  "articles/azure-arc/.openpublishing.redirection.azure-arc.json",
+  "articles/azure-cache-for-redis/.openpublishing.redirection.redis-cache.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-functions/.openpublishing.redirection.azure-functions.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",
   "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
+  "articles/backup/.openpublishing.redirection.backup.json",
+  "articles/batch/.openpublishing.redirection.batch.json",
+  "articles/cloud-services/.openpublishing.redirection.cloud-services.json",
   "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
   "articles/communication-services/.openpublishing.redirection.communication-services.json",
   "articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",
@@ -1250,55 +1306,62 @@
   "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
   "articles/data-catalog/.openpublishing.redirection.data-catalog.json",
   "articles/data-factory/.openpublishing.redirection.data-factory.json",
-  "articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
+  "articles/databox-online/.openpublishing.redirection.databox-online.json",
   "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
   "articles/dev-box/.openpublishing.redirection.dev-box.json",
   "articles/digital-twins/.openpublishing.redirection.digital-twins.json",
   "articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
   "articles/event-grid/.openpublishing.redirection.event-grid.json",
   "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
-  "articles/governance/policy/.openpublishing.redirection.policy.json",
-  "articles/governance/policy/.openpublishing.redirection.resource-graph.json",
+  "articles/frontdoor/.openpublishing.redirection.frontdoor.json",
   "articles/governance/blueprints/.openpublishing.redirection.blueprints.json",
   "articles/governance/management-groups/.openpublishing.redirection.management-groups.json",
-  "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
+  "articles/governance/policy/.openpublishing.redirection.policy.json",
+  "articles/governance/policy/.openpublishing.redirection.resource-graph.json",
   "articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
+  "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
   "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
   "articles/internet-peering/.openpublishing.redirection.internet-peering.json",
-  "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
   "articles/iot-central/.openpublishing.redirection.iot-central.json",
-  "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/.openpublishing.redirection.iot.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
   "articles/iot-operations/.openpublishing.redirection.iot-operations.json",
+  "articles/iot/.openpublishing.redirection.iot.json",
   "articles/lab-services/.openpublishing.redirection.lab-services.json",
+  "articles/load-balancer/.openpublishing.redirection.load-balancer.json",
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
   "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
   "articles/mariadb/.openpublishing.redirection.mariadb.json",
+  "articles/migrate/.openpublishing.redirection.migrate.json",
   "articles/mysql/.openpublishing.redirection.mysql.json",
   "articles/network-watcher/.openpublishing.redirection.network-watcher.json",
+  "articles/networking/.openpublishing.redirection.networking.json",
   "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
   "articles/operator-insights/.openpublishing.redirection.operator-insights.json",
   "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
   "articles/peering-service/.openpublishing.redirection.peering-service.json",
   "articles/postgresql/.openpublishing.redirection.postgresql.json",
   "articles/route-server/.openpublishing.redirection.route-server.json",
   "articles/sap/.openpublishing.redirection.sap.json",
+  "articles/search/.openpublishing.redirection.search.json",
   "articles/security/.openpublishing.redirection.security.json",
   "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
+  "articles/service-fabric/.openpublishing.redirection.service-fabric.json",
   "articles/site-recovery/.openpublishing.redirection.site-recovery.json",
   "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
   "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
   "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
+  "articles/storage/.openpublishing.redirection.storage.json",
   "articles/storsimple/.openpublishing.redirection.storsimple.json",
   "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
   "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
+  "articles/time-series-insights/.openpublishing.redirection.time-series-insights.json",
   "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
   "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
-  "articles/virtual-network/.openpublishing.redirection.virtual-network.json"
+  "articles/virtual-network/.openpublishing.redirection.virtual-network.json",
+  "articles/vpn-gateway/.openpublishing.redirection.vpn-gateway.json"
 ]
 }

.openpublishing.redirection.active-directory.json

@@ -32725,6 +32725,11 @@
             "redirect_url": "/azure/active-directory/governance/licensing-fundamentals",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/active-directory/azuread-dev/index.yml",
+            "redirect_url": "/entra/identity-platform",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/active-directory/azuread-dev/about-microsoft-identity-platform.md",
             "redirect_url": "/previous-versions/azure/active-directory/azuread-dev/about-microsoft-identity-platform",
@@ -33690,6 +33695,6 @@
             "source_path_from_root": "/articles/active-directory-domain-services/contact-us.md",
             "redirect_url": "/azure/active-directory/fundamentals/support-help-options",
             "redirect_document_id": false
-        },
+        }
     ]
-}
+}