Merge conflict

Author: Wenhao Zhang

.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

@@ -236,6 +236,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-python-extensions",
+      "url": "https://github.com/Azure/azure-functions-python-extensions",
+      "branch": "dev",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-python-tensorflow-tutorial",
       "url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
@@ -247,7 +253,7 @@
       "url": "https://github.com/Azure-Samples/function-app-arm-templates",
       "branch": "main",
       "branch_mapping": {}
-    },    
+    },
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -356,6 +362,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 +878,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/",
@@ -974,6 +992,12 @@
       "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",
@@ -986,6 +1010,12 @@
       "branch": "docs-snippets",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-openai-extension",
+      "url": "https://github.com/Azure/azure-functions-openai-extension",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-dotnet-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
@@ -1183,6 +1213,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": {
@@ -1201,6 +1237,7 @@
   "redirection_files": [
   ".openpublishing.redirection.active-directory.json",
   ".openpublishing.redirection.ansible.json",
+  ".openpublishing.redirection.api-center.json",
   ".openpublishing.redirection.api-management.json",
   ".openpublishing.redirection.app-service.json",
   ".openpublishing.redirection.asc-for-iot.json",
@@ -1232,6 +1269,7 @@
   ".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",
@@ -1297,7 +1335,6 @@
   "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-dps/.openpublishing.redirection.iot-dps.json",
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
@@ -1318,6 +1355,7 @@
   "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/operator-service-manager/.openpublishing.redirection.operator-service-manager.json",
   "articles/peering-service/.openpublishing.redirection.peering-service.json",
   "articles/postgresql/.openpublishing.redirection.postgresql.json",
   "articles/route-server/.openpublishing.redirection.route-server.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",

.openpublishing.redirection.api-center.json

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/api-center/use-vscode-extension-copilot.md",
+      "redirect_url": "/azure/api-center/use-vscode-extension",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.azure-kubernetes-service.json

@@ -351,12 +351,6 @@
             "redirect_url": "/cli/azure/aks#az_aks_create",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/aks/delete-cluster.md",
-            "redirect_url": "/cli/azure/aks#az_aks_delete",
-            "redirect_document_id": false
-        },
-
         {
             "source_path": "articles/aks/view-master-logs.md",
             "redirect_url": "/azure/aks/view-control-plane-logs",
@@ -457,6 +451,11 @@
             "redirect_url": "/azure/aks/create-node-pools",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/copilot/limited-access.md",
+            "redirect_url": "/azure/copilot/manage-access",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/command-invoke.md",
             "redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.azure-monitor.json

@@ -5,6 +5,11 @@
             "redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/om-agents.md",
+            "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
+            "redirect_document_id": false
+         },
         {
             "source_path_from_root": "/articles/azure-monitor/best-practices.md",
             "redirect_url": "/azure/azure-monitor/getting-started",
@@ -6644,6 +6649,16 @@
             "redirect_url": "/azure/azure-functions/functions-monitoring",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/app-insights-azure-ad-api.md",
+            "redirect_url": "/azure/azure-monitor/app/azure-ad-authentication",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/resources-roles-access-control.md",
+            "redirect_url": "/azure/azure-monitor/roles-permissions-security",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
             "redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
@@ -6688,7 +6703,18 @@
             "source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/remote-write-prometheus.md",
+            "redirect_url": "/azure/azure-monitor/essentials/prometheus-remote-write-virtual-machines",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/prometheus-get-started.md",
+            "redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-overview",
+            "redirect_document_id": false
         }
+        
 
     ]
 }

.openpublishing.redirection.container-service.json

@@ -6,6 +6,7 @@
             "redirect_document_id": false
         },
         {
+        
             "source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
             "redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",
             "redirect_document_id": false

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

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
+            "redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/prevent-misconfigurations.md",
             "redirect_url": "/azure/defender-for-cloud/manage-mcsb",
@@ -711,7 +716,7 @@
             "redirect_document_id": true
         },
         {
-            "source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.md",
+            "source_path_from_root": "/articles/security-center/update-regulatory-compliance-packages.yml",
             "redirect_url": "/azure/defender-for-cloud/update-regulatory-compliance-packages",
             "redirect_document_id": true
         },
@@ -721,7 +726,7 @@
             "redirect_document_id": true
         },
         {
-            "source_path_from_root": "/articles/security-center/workflow-automation.md",
+            "source_path_from_root": "/articles/security-center/workflow-automation.yml",
             "redirect_url": "/azure/defender-for-cloud/workflow-automation",
             "redirect_document_id": true
         },

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,35 @@
 {
-    "redirections": [          
+    "redirections": [  
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-azure-rtos-security-module.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/iot-security-azure-rtos.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/iot-security-threadx",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/azure-rtos-security-module-api.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/threadx-security-module-api",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-alerts-recommendations.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-alerts-recommendations",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-rtos-security-module.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/concept-threadx-security-module",
+            "redirect_document_id": false
+        },         
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/how-to-rtos-security-module.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/how-to-threadx-security-module",
+            "redirect_document_id": false
+        },         
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/resources-manage-proprietary-protocols.md",
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-manage-individual-sensors#manage-custom-plugins-legacy",
@@ -730,7 +760,7 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.md",
+            "source_path_from_root": "/articles/defender-for-iot/how-to-deploy-edge.yml",
             "redirect_url": "/azure/defender-for-iot/device-builders/how-to-deploy-edge",
             "redirect_document_id": false
         },