resolve merge conflict

Author: ktoliver

.openpublishing.publish.config.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.active-directory.json

@@ -1,5 +1,50 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/considerations-for-deployment.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/considerations-for-deployment",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/index.yml",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/key-concepts.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/key-concepts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/overview.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/partner-solutions.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/partner-solutions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/quickstart-create-vm-azure-resource-manager-template.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/quickstart-create-vm-azure-resource-manager-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/quickstart-create-vm-cli.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/quickstart-create-vm-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-go-sdk.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-go-sdk",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
+      "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/ai-studio/how-to/commitment-tier.md",
       "redirect_url": "/azure/ai-services/commitment-tier.md",
@@ -1270,46 +1315,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",
@@ -3695,36 +3700,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",
@@ -4586,4 +4561,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.api-management.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.devops-project.json

@@ -19,3 +19,10 @@
 /articles/virtual-machines-scale-sets @jasonwhowell @thomps23
 /articles/container-instances @jasonwhowell @thomps23
 /articles/service-fabric @jasonwhowell @thomps23
+/articles/machine-learning @jasonwhowell @thomps23
+/articles/ai-studio @jasonwhowell @thomps23
+/articles/ai-services @jasonwhowell @thomps23
+/articles/genomics @jasonwhowell @thomps23
+/articles/open-datasets @jasonwhowell @thomps23
+/articles/search @jasonwhowell @thomps23
+

.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

@@ -3,7 +3,7 @@ title: Use Well Architected Framework assessments in Azure Advisor
 description: Azure Advisor offers Well Architected Framework assessments (curated and focused Advisor optimization reports) through the Assessments entry in the left menu of the Azure Advisor Portal.
 ms.service: azure
 ms.topic: article
-ms.date: 02/18/2024
+ms.date: 08/22/2024
 
 #customer intent: As an Advisor user, I want WAF assessments so that I can better understand recommendations.
 
@@ -30,15 +30,7 @@ To see all Microsoft assessment choices, go to the [Learn platform > Assessments
 
 ## Prerequisites
 
-You can manage access to Advisor WAF assessments using built-in roles. The permissions vary by role.
-
-> [!NOTE]
-> These roles must be configured for the relevant subscription to create the assessment and view the corresponding recommendations.
-
-| **Name** | **Description** |
-|---|:---:|
-|Reader|View assessments for a subscription or workload and the corresponding recommendations|
-|Contributor|Create assessments for a subscription or workload and triage the corresponding recommendations|
+[!INCLUDE [View and manage assessments](./includes/advisor-permissions-waf-assessments.md)]
 
 ## Access Azure Advisor WAF assessments