Address merge conflicts.

Author: TimShererWithAquent

.openpublishing.redirection.active-directory.json

@@ -94,21 +94,6 @@
       "source_path": "articles/devops-project/retirement-and-migration.md",
       "redirect_url": "/previous-versions/azure/devops-project/retirement-and-migration",
       "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/virtual-machines/linux/tutorial-azure-devops-blue-green-strategy.md",
-      "redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-azure-devops-blue-green-strategy",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/virtual-machines/linux/tutorial-azure-devops-canary-strategy.md",
-      "redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-azure-devops-canary-strategy",
-      "redirect_document_id": false
-    },
-    {
-      "source_path": "articles/virtual-machines/linux/tutorial-build-deploy-azure-pipelines.md",
-      "redirect_url": "/previous-versions/azure/virtual-machines/linux/tutorial-build-deploy-azure-pipelines",
-      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.api-management.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/ai-studio/how-to/commitment-tier.md",
+      "redirect_url": "/azure/ai-services/commitment-tier.md",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/files/files-samples-dotnet-v11.md",
       "redirect_url": "/previous-versions/azure/storage/files/files-samples-dotnet-v11",
@@ -1265,46 +1270,6 @@
       "redirect_url": "/azure/cloudfoundry",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/container-instances/availability-zones.md",
-      "redirect_url": "/azure/reliability/reliability-containers",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/container-instances-jenkins.md",
-      "redirect_url": "/azure/jenkins/container-instances-jenkins",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/container-instances-monitor.md",
-      "redirect_url": "/azure/container-instances/monitor-azure-container-instances",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/container-instances-mounting-azure-files-volume.md",
-      "redirect_url": "/azure/container-instances/container-instances-volume-azure-files",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/container-instances-quickstart-docker-cli.md",
-      "redirect_url": "/azure/container-instances/quickstart-docker-cli",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/container-instances-quotas.md",
-      "redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/container-instances-region-availability.md",
-      "redirect_url": "/azure/container-instances/container-instances-resource-and-quota-limits",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/container-instances/tutorial-docker-compose.md",
-      "redirect_url": "/azure/container-instances/container-instances-multi-container-group",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/container-registry/manual-regional-move.md",
       "redirect_url": "/azure/operational-excellence/relocation-container-registry",
@@ -3690,36 +3655,6 @@
       "redirect_url": "/azure/sentinel/monitor-your-data",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/service-fabric/service-fabric-best-practices-overview.md",
-      "redirect_url": "/azure/service-fabric/service-fabric-best-practices-security",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-event-generation-app.md",
-      "redirect_url": "/azure/service-fabric/monitor-service-fabric#application-monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-event-generation-perf.md",
-      "redirect_url": "/azure/service-fabric/monitor-service-fabric-reference#performance-metrics",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/service-fabric/service-fabric-diagnostics-overview.md",
-      "redirect_url": "/azure/service-fabric/monitor-service-fabric",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/service-fabric/service-fabric-rest-based-application-lifecycle-sample.md",
-      "redirect_url": "/rest/api/servicefabric/",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/service-fabric/upgrade-managed-disks.md",
-      "redirect_url": "/azure/service-fabric/service-fabric-scale-up-primary-node-type",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/service-health/alerts-activity-log-service-notifications.md",
       "redirect_url": "/azure/service-health/alerts-activity-log-service-notifications-portal",
@@ -4569,6 +4504,16 @@
       "source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
       "redirect_url": "/azure/virtual-network/how-to-create-encryption",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-powershell.md",
+      "redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-cli.md",
+      "redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
+      "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.devops-project.json

@@ -350,11 +350,6 @@
       "redirect_url": "/security/benchmark/azure/baselines/cognitive-services-security-baseline",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/container-instances/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/container-instances-security-baseline",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/container-registry/security-baseline.md",
       "redirect_url": "/security/benchmark/azure/baselines/container-registry-security-baseline",
@@ -425,11 +420,6 @@
       "redirect_url": "/security/benchmark/azure/baselines/service-bus-messaging-security-baseline",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/service-fabric/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/service-fabric-security-baseline",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/site-recovery/security-baseline.md",
       "redirect_url": "/security/benchmark/azure/baselines/site-recovery-security-baseline",
@@ -450,21 +440,6 @@
       "redirect_url": "/security/benchmark/azure/baselines/traffic-manager-security-baseline",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/virtual-machine-scale-sets-security-baseline",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machines/linux/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/virtual-machines-linux-security-baseline",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machines/windows/security-baseline.md",
-      "redirect_url": "/security/benchmark/azure/baselines/virtual-machines-windows-security-baseline",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/virtual-network/security-baseline.md",
       "redirect_url": "/security/benchmark/azure/baselines/virtual-network-security-baseline",

.openpublishing.redirection.json

@@ -111,7 +111,7 @@ REST API settings:
 #### Upload your files
 
 1. Store the UI folder files in your blob container.
-2. [Use Azure Storage Explorer to manage Azure managed disks](../virtual-machines/disks-use-storage-explorer-managed-disks.md) and access permissions.
+2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
 
 ### Configure Azure AD B2C
 

.openpublishing.redirection.security-benchmark.json

@@ -78,14 +78,14 @@ Azure Hybrid Benefit represents an excellent opportunity to save on Virtual Mach
 #### Windows VM/VMSS
 
 Azure Hybrid Benefit represents an excellent opportunity to save on Virtual Machines OS costs.
-If you have Software Assurance, you can enable the [Azure Hybrid Benefit](../virtual-machines/windows/hybrid-use-benefit-licensing.md). You can see potential savings using [Azure Hybrid Benefit Calculator](https://azure.microsoft.com/pricing/hybrid-benefit/#calculator).
+If you have Software Assurance, you can enable the [Azure Hybrid Benefit](/azure/virtual-machines/windows/hybrid-use-benefit-licensing). You can see potential savings using [Azure Hybrid Benefit Calculator](https://azure.microsoft.com/pricing/hybrid-benefit/#calculator).
 
 > [!NOTE]
 > The query has a Quick Fix column that helps you to apply Azure Hybrid Benefit to Windows VMs.
 
 #### Linux VM/VMSS
 
-[Azure Hybrid Benefit for Linux](../virtual-machines/linux/azure-hybrid-benefit-linux.md) is a licensing benefit that helps you to significantly reduce the costs of running your Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) virtual machines (VMs) in the cloud.
+[Azure Hybrid Benefit for Linux](/azure/virtual-machines/linux/azure-hybrid-benefit-linux) is a licensing benefit that helps you to significantly reduce the costs of running your Red Hat Enterprise Linux (RHEL) and SUSE Linux Enterprise Server (SLES) virtual machines (VMs) in the cloud.
 
 #### SQL
 
@@ -117,7 +117,7 @@ The following queries show compute resources that you can optimize to save money
 
 #### Virtual Machines in a Stopped State
 
-This query identifies Virtual Machines that aren't properly deallocated. If a virtual machine’s status is Stopped rather than Stopped (Deallocated), you're still billed for the resource as the hardware remains allocated for you. Learn more about [States and billing status of Azure Virtual Machines](../virtual-machines/states-billing.md).
+This query identifies Virtual Machines that aren't properly deallocated. If a virtual machine’s status is Stopped rather than Stopped (Deallocated), you're still billed for the resource as the hardware remains allocated for you. Learn more about [States and billing status of Azure Virtual Machines](/azure/virtual-machines/states-billing).
 
 #### Deallocated virtual machines
 

.openpublishing.redirection.virtual-machines.json

@@ -67,7 +67,7 @@ Advisor recommends resizing virtual machines when it's possible to fit the curre
 
 ### Burstable recommendations
 
-We evaluate if workloads are eligible to run on specialized SKUs called **Burstable SKUs** that support variable workload performance requirements and are less expensive than general purpose SKUs. Learn more about burstable SKUs here: [B-series burstable - Azure Virtual Machines](../virtual-machines/sizes-b-series-burstable.md).
+We evaluate if workloads are eligible to run on specialized SKUs called **Burstable SKUs** that support variable workload performance requirements and are less expensive than general purpose SKUs. Learn more about burstable SKUs here: [B-series burstable - Azure Virtual Machines](/azure/virtual-machines/sizes-b-series-burstable).
 
 A burstable SKU recommendation is made if:
 

articles/active-directory-b2c/partner-onfido.md

@@ -221,7 +221,7 @@ Learn more about [Virtual machine - AccelNetDisengaged (Accelerated Networking m
 
 Ultra disk is available in the same region as your database workload. Ultra disk offers high throughput, high IOPS, and consistent low latency disk storage for your database workloads: For Oracle DBs, you can now use either 4k or 512E sector sizes with Ultra disk depending on your Oracle DB version. For SQL server, using Ultra disk for your log disk might offer more performance for your database. See instructions here for migrating your log disk to Ultra disk.
 
-Learn more about [Virtual machine - AzureStorageVmUltraDisk (Take advantage of Ultra Disk low latency for your log disks and improve your database workload performance.)](../virtual-machines/disks-enable-ultra-ssd.md?tabs=azure-portal).
+Learn more about [Virtual machine - AzureStorageVmUltraDisk (Take advantage of Ultra Disk low latency for your log disks and improve your database workload performance.)](/azure/virtual-machines/disks-enable-ultra-ssd?tabs=azure-portal).
 
 ### Upgrade the size of your most active virtual machines to prevent resource exhaustion and improve performance