fix conflict

Author: David Curwin

.openpublishing.publish.config.json

@@ -135,9 +135,9 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "ms-identity-dotnetcore-b2c-account-management",
+      "path_to_root": "ms-identity-dotnetcore-b2c-account-management-archive",
       "url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
-      "branch": "master",
+      "branch": "archive",
       "branch_mapping": {}
     },
     {

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

@@ -80,6 +80,11 @@
             "redirect_url": "/azure/aks/azure-csi-files-storage-provision",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/learn/tutorial-kubernetes-workload-identity.md",
+            "redirect_url": "/azure/aks/workload-identity-deploy-cluster",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
             "redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
@@ -451,11 +456,6 @@
             "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

@@ -6679,6 +6679,11 @@
             "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
+            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
             "redirect_url": "/azure/copilot/overview",
@@ -6694,11 +6699,6 @@
             "redirect_url": "/azure/copilot/overview",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
-            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
             "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",
@@ -6728,8 +6728,14 @@
             "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
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/essentials/pipeline-overview.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
+            "redirect_document_id": false
         }
 
+        
 
     ]
 }

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

@@ -1920,6 +1920,11 @@
           "redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
           "redirect_document_id": false
         },
+        {
+          "source_path_from_root": "/articles/azure-resource-manager/managed-applications/deploy-marketplace-app-quickstart.md",
+          "redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
+          "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/resource-manager-policy.md",
             "redirect_url": "/azure/governance/policy/overview",

.openpublishing.redirection.container-registry.json

@@ -1,33 +1,55 @@
 {
     "redirections": [
+        
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-oci-artifacts.md",
+            "redirect_url": "/azure/container-registry/container-registry-manage-artifact",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-oras-artifacts.md",
+            "redirect_url": "/azure/container-registry/container-registry-manage-artifact",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
+        
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-auth-cli",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-cli.md",
-            "redirect_url": "/azure/container-registry/tutorial-enable-artifact-cache-cli",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/tutorial-artifact-cache.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-registry-cache.md",
-            "redirect_url": "/azure/container-registry/tutorial-artifact-cache",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-registry-cache.md",
-            "redirect_url": "/azure/container-registry/tutorial-troubleshoot-artifact-cache",
+            "redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/tutorial-troubleshoot-artifact-cache.md",
+            "redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
             "redirect_document_id": false
         },
         {
@@ -60,6 +82,31 @@
             "redirect_url": "/azure/container-registry/troubleshoot-artifact-streaming",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache-cli.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-enable-artifact-cache-auth-cli.md",
+            "redirect_url": "/azure/container-registry/container-registry-artifact-cache",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/tutorial-artifact-cache-troubleshoot.md",
+            "redirect_url": "/azure/container-registry/troubleshoot-artifact-cache",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
             "redirect_url": "/azure/container-registry/monitor-service"

.openpublishing.redirection.json

@@ -1,6 +1,26 @@
 {
     "redirections": [
     {
+      "source_path": "articles/application-gateway/scripts/create-vmss-waf-cli.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/scripts/create-vmss-waf-powershell.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-waf-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/powershell-samples.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/powershell-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/scripts/traffic-manager-cli-websites-high-availability.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-cli-websites-high-availability",
+      "redirect_document_id": false
+     },
+     {
       "source_path": "articles/network-watcher/network-watcher-security-group-view-powershell.md",
       "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-powershell",
       "redirect_document_id": false
@@ -34,7 +54,7 @@
       "source_path": "articles/germany/index.yml",
       "redirect_url": "/previous-versions/azure/germany/index",
       "redirect_document_id": false
-    },
+     },
         {
             "source_path_from_root": "/articles/internet-analyzer/internet-analyzer-cli.md",
             "redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-cli",
@@ -3828,11 +3848,6 @@
             "redirect_url": "/azure/sentinel/data-connectors-reference",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/sentinel/data-connectors/windows-firewall-events-via-ama.md",
-            "redirect_url": "/azure/sentinel/data-connectors-reference",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/private-link/tutorial-private-endpoint-webapp-portal.md",
             "redirect_url": "/azure/private-link/create-private-endpoint-portal",
@@ -4060,9 +4075,19 @@
         },
         {
             "source_path_from_root":"/articles/cosmos-db/high-availability.md",
-            "redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
+            "redirect_url":"/azure/reliability/reliability-cosmos-db-nosql",
             "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/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
+            "redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root":"/articles/migrate/how-to-assess.md",
             "redirect_url":"/azure/migrate/whats-new#update-april-2024",
@@ -4072,6 +4097,11 @@
             "source_path_from_root":"/articles/migrate/prepare-isv-movere.md",
             "redirect_url":"/azure/migrate/whats-new#update-april-2024",
             "redirect_document_id":false 
+        },
+        {
+            "source_path_from_root":"/articles/aks/troubleshoot-udp-packet-drops.md",
+            "redirect_url":"/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
+            "redirect_document_id":false
         }
     ]
 }

.openpublishing.redirection.operator-5g-core.json

@@ -15,11 +15,6 @@
             "redirect_url": "/azure/operator-5g-core/how-to-deploy-observability",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service.md",
-            "redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-nexus-azure-kubernetes-service.md",
             "redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,20 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
+            "redirect_url": "/azure/sentinel/create-analytics-rule-from-template",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/detect-threats-built-in.md",
+            "redirect_url": "/azure/sentinel/threat-detection",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/detect-threats-custom.md",
+            "redirect_url": "/azure/sentinel/create-analytics-rules",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/sentinel/automate-responses-with-playbooks.md#azure-logic-apps-basic-concepts",
             "redirect_url": "/azure/sentinel/playbooks/logic-apps-playbooks",
@@ -142,8 +157,8 @@
         },
         {
             "source_path": "articles/sentinel/data-connectors/crowdstrike-falcon-data-replicator-using-azure-function.md",
-            "redirect_url": "/azure/sentinel/data-connectors/crowdstrike-falcon-data-replicator-using-azure-functions",
-            "redirect_document_id": true
+            "redirect_url": "/azure/sentinel/data-connectors/crowdstrike-falcon-data-replicator",
+            "redirect_document_id": false
         },
         {
             "source_path": "articles/sentinel/data-connectors/cybersixgill-actionable-alerts-using-azure-function.md",
@@ -1202,8 +1217,8 @@
         },
         {
             "source_path_from_root": "/articles/sentinel/data-connectors/crowdstrike-falcon-endpoint-protection.md",
-            "redirect_url": "/azure/sentinel/data-connectors-reference",
-            "redirect_document_id": false
+            "redirect_url": "/azure/sentinel/data-connectors/deprecated-crowdstrike-falcon-endpoint-protection-via-legacy-agent",
+            "redirect_document_id": true
         },
         {
             "source_path_from_root": "/articles/sentinel/data-connectors/cyberark-enterprise-password-vault-epv-events.md",
@@ -1589,6 +1604,26 @@
             "source_path": "articles/sentinel/data-connectors/zero-networks-segment-audit-function-using-azure-function.md",
             "redirect_url": "/azure/sentinel/data-connectors/zero-networks-segment-audit",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/sentinel/data-connectors/crowdstrike-falcon-data-replicator-using-azure-functions.md",
+            "redirect_url": "/azure/sentinel/data-connectors/crowdstrike-falcon-data-replicator",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/sentinel/data-connectors/crowdstrike-falcon-data-replicator-v2-using-azure-functions.md",
+            "redirect_url": "/azure/sentinel/data-connectors/crowdstrike-falcon-data-replicator-v2",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/fortinet-fortiweb-web-application-firewall.md",
+            "redirect_url": "/azure/sentinel/data-connectors/deprecated-fortinet-fortiweb-web-application-firewall-via-legacy-agent",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/fortinet.md",
+            "redirect_url": "/azure/sentinel/data-connectors/deprecated-fortinet-via-legacy-agent",
+            "redirect_document_id": true
         }
     ]
 }

articles/active-directory-b2c/access-tokens.md

@@ -23,7 +23,7 @@ An *access token* contains claims that you can use in Azure Active Directory B2C
 This article shows you how to request an access token for a web application and web API. For more information about tokens in Azure AD B2C, see the [overview of tokens in Azure Active Directory B2C](tokens-overview.md).
 
 > [!NOTE]
-> **Web API chains (On-Behalf-Of) is not supported by Azure AD B2C** - Many architectures include a web API that needs to call another downstream web API, both secured by Azure AD B2C. This scenario is common in clients that have a web API back end, which in turn calls a another service. This chained web API scenario can be supported by using the OAuth 2.0 JWT Bearer Credential grant, otherwise known as the On-Behalf-Of flow. However, the On-Behalf-Of flow is not currently implemented in Azure AD B2C. Although On-Behalf-Of works for applications registered in Microsoft Entra ID, it does not work for applications registered in Azure AD B2C, regardless of the tenant (Microsoft Entra ID or Azure AD B2C) that is issuing the tokens.
+> **Web API chains (On-Behalf-Of) is not supported by Azure AD B2C** - Many architectures include a web API that needs to call another downstream web API, both secured by Azure AD B2C. This scenario is common in clients that have a web API back end, which in turn calls another service. This chained web API scenario can be supported by using the OAuth 2.0 JWT Bearer Credential grant, otherwise known as the On-Behalf-Of flow. However, the On-Behalf-Of flow is not currently implemented in Azure AD B2C. Although On-Behalf-Of works for applications registered in Microsoft Entra ID, it does not work for applications registered in Azure AD B2C, regardless of the tenant (Microsoft Entra ID or Azure AD B2C) that is issuing the tokens.
 
 ## Prerequisites
 

articles/active-directory-b2c/azure-monitor.md

@@ -316,7 +316,7 @@ Use the following instructions to create a new Azure Alert, which will send an [
    - Alert logic: Set **Number of results** **Greater than** **0**.
    - Evaluation based on: Select **120** for Period (in minutes) and **5** for Frequency (in minutes)
 
-   ![Create a alert rule condition](./media/azure-monitor/alert-create-rule-condition.png)
+   ![Create an alert rule condition](./media/azure-monitor/alert-create-rule-condition.png)
 
 After the alert is created, go to **Log Analytics workspace** and select **Alerts**. This page displays all the alerts that have been triggered in the duration set by **Time range** option.