fixing merge conflicts

Author: George Wallace

.openpublishing.publish.config.json

@@ -381,6 +381,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "media-services-v3-python",
+      "url": "https://github.com/Azure-Samples/media-services-v3-python",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-javascript",
       "url": "https://github.com/Microsoft/tsiclient",
@@ -411,12 +417,6 @@
       "branch": "main",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "media-services-v3-python",
-      "url": "https://github.com/Azure-Samples/media-services-v3-python",
-      "branch": "main",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "remote-monitoring-webui",
       "url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -899,6 +899,7 @@
     "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
     "articles/mysql/.openpublishing.redirection.mysql.json",
     "articles/container-apps/.openpublishing.redirection.container-apps.json",
-    "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
+    "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
+    "articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -24,6 +24,22 @@
             "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/change-analysis.md",
+            "redirect_url": "/azure/azure-monitor/change/change-analysis",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/change-analysis-visualizations.md",
+            "redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
+            "redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
+            "redirect_document_id": false
         }
+
     ]
 }

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

@@ -60,6 +60,11 @@
             "redirect_url": "/azure/defender-for-cloud/os-coverage",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds.md",
+            "redirect_url": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
             "redirect_url": "/azure/defender-for-cloud/just-in-time-access-usage",
@@ -632,7 +637,7 @@
         },
         {
             "source_path_from_root": "/articles/security-center/supported-machines-endpoint-solutions-clouds.md",
-            "redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds",
+            "redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
             "redirect_document_id": true
         },
         {

.openpublishing.redirection.json

@@ -689,10 +689,30 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/frontdoor/concept-rules-set-action.md",
+      "source_path_from_root": "/articles/frontdoor/concept-rule-set-actions.md",
       "redirect_url": "/azure/frontdoor/front-door-rules-engine-actions",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-rules-set.md",
+      "redirect_url": "/azure/frontdoor/front-door-rules-engine",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-caching.md",
+      "redirect_url": "/azure/frontdoor/front-door-caching",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-route.md",
+      "redirect_url": "/azure/frontdoor/front-door-route-matching",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/frontdoor/concept-rule-set-url-redirect-and-rewrite.md",
+      "redirect_url": "/azure/frontdoor/front-door-url-redirect",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
       "redirect_url": "/aspnet/core/security/authorization/secure-data",
@@ -5962,7 +5982,7 @@
       "source_path_from_root": "/articles/azure-functions/functions-test-a-function.md",
       "redirect_url": "/azure/azure-functions/supported-languages",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
       "redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
@@ -6853,6 +6873,11 @@
       "redirect_url": "/azure/azure-functions/functions-kubernetes-keda",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-functions/functions-bindings-event-iot-output.md",
+      "redirect_url": "/azure/azure-functions/functions-bindings-event-hubs-output",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
       "redirect_url": "/azure/azure-government",
@@ -7762,7 +7787,7 @@
       "source_path_from_root": "/articles/cognitive-services/LUIS/luis-tutorial-review-endpoint-utterances.md",
       "redirect_url": "/azure/cognitive-services/LUIS/how-to/improve-application",
       "redirect_document_id": false
-    }, 
+    },
     {
       "source_path_from_root": "/articles/cognitive-services/LUIS/luis-concept-enterprise.md",
       "redirect_url": "/azure/cognitive-services/LUIS/how-to/improve-application",
@@ -9119,8 +9144,18 @@
       "redirect_document_id": false
     },
     {
-      "source_path": "articles/azure-resource-manager/managed-application-createuidefinition-overview.md",
-      "redirect_url": "/azure/azure-resource-manager/managed-applications/create-uidefinition-overview",
+      "source_path": "articles/azure-resource-manager/managed-applications/scripts/managed-application-cli-sample-create-application.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/managed-applications/scripts/managed-application-cli-sample-create-definition.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-resource-manager/managed-applications/scripts/managed-application-cli-sample-get-managed-group-resize-vm.md",
+      "redirect_url": "/azure/azure-resource-manager/managed-applications/update-managed-resources",
       "redirect_document_id": false
     },
     {
@@ -12053,7 +12088,6 @@
       "redirect_url": "/azure/azure-signalr/signalr-tutorial-authenticate-azure-functions",
       "redirect_document_id": true
     },
-
     {
       "source_path_from_root": "/articles/cognitive-services/form-recognizer/build-training-data-set.md",
       "redirect_url": "/azure/applied-ai-services/form-recognizer/build-training-data-set",
@@ -14634,7 +14668,7 @@
       "redirect_url": "/azure/data-explorer/manage-cluster-vertical-scaling",
       "redirect_document_id": false
     },
-        {
+    {
       "source_path_from_root": "/articles/postgresql/howto-manage-firewall-using-cli.md",
       "redirect_url": "/azure/postgresql/quickstart-create-server-database-azure-cli#configure-a-server-based-firewall-rule",
       "redirect_document_id": true
@@ -15153,7 +15187,7 @@
       "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-azure-rtos-security-module.md",
       "redirect_url": "/azure/defender-for-iot/device-builders/how-to-quickstart-azure-rtos-security-module",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path_from_root": "/articles/defender-for-iot/organizations/integration-cisco-ise-pxgrid.md",
       "redirect_url": "/azure/defender-for-iot/organizations/integration-forescout",
@@ -17698,7 +17732,7 @@
       "source_path_from_root": "/articles/lab-services/class-type-ethical-hacking-virtualbox.md",
       "redirect_url": "/azure/lab-services/class-types",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path_from_root": "/articles/lab-services/classroom-labs/class-type-jupyter-notebook.md",
       "redirect_url": "/azure/lab-services/class-type-jupyter-notebook",
@@ -26003,12 +26037,12 @@
       "source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-javascript-client-libraries-legacy.md",
       "redirect_url": "/azure/storage/blobs/quickstart-blobs-javascript-browser",
       "redirect_document_id": false
-    },    
+    },
     {
       "source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-legacy.md",
       "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
       "redirect_document_id": false
-    },        
+    },
     {
       "source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-nodejs-v10.md",
       "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
@@ -33264,7 +33298,7 @@
       "redirect_url": "https://azure.microsoft.com/services/cognitive-services/",
       "redirect_document_id": false
     },
-        {
+    {
       "source_path_from_root": "/articles/machine-learning/studio/whats-new.md",
       "redirect_url": "https://azure.microsoft.com/updates/?product=machine-learning-studio",
       "redirect_document_id": false
@@ -43920,34 +43954,94 @@
       "redirect_document_id": false
     },
     {
-    "source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
-    "redirect_url": "/azure/advisor/advisor-overview",
-    "redirect_document_id": false
+      "source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
+      "redirect_url": "/azure/advisor/advisor-overview",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-wpf-translation-csharp.md",
       "redirect_url": "/ai-builder/flow-text-translation?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
       "redirect_document_id": false
-      },
-      {
-        "source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-build-flask-app-translation-synthesis.md",
-        "redirect_url": "/learn/modules/translate-text-with-translator-service?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
-        "redirect_document_id": false
-      },
-      {
-        "source_path": "articles/machine-learning/classic/deploy-with-resource-manager-template.md",
-        "redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-with-resource-manager-template",
-        "redirect_document_id": false
-      },
-      {
-        "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
-        "redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
-        "redirect_document_id": false
-      },
-      {
-        "source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
-        "redirect_url": "/azure/virtual-desktop/overview",
-        "redirect_document_id": false
-      }
+    },
+    {
+      "source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-build-flask-app-translation-synthesis.md",
+      "redirect_url": "/learn/modules/translate-text-with-translator-service?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/machine-learning/classic/deploy-with-resource-manager-template.md",
+      "redirect_url": "/previous-versions/azure/machine-learning/classic/deploy-with-resource-manager-template",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
+      "redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-desktop/compare-virtual-desktop-windows-365.md",
+      "redirect_url": "/azure/virtual-desktop/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/cis-azure-1-1-0.md",
+      "redirect_url": "/azure/governance/policy/samples/cis-azure-1-1-0",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/cis-azure-1-3-0.md",
+      "redirect_url": "/azure/governance/policy/samples/cis-azure-1-3-0",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/cmmc-l3.md",
+      "redirect_url": "/azure/governance/policy/samples/cmmc-l3",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/hipaa-hitrust-9-2.md",
+      "redirect_url": "/azure/governance/policy/samples/hipaa-hitrust-9-2",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/irs-1075-sept2016",
+      "redirect_url": "/azure/governance/policy/samples/irs-1075-sept2016",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/nist-sp-800-171-r2",
+      "redirect_url": "/azure/governance/policy/samples/nist-sp-800-171-r2",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/media/control-mapping.md",
+      "redirect_url": "/azure/governance/policy/samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/media/deploy.md",
+      "redirect_url": "/azure/governance/policy/samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/media/index.md",
+      "redirect_url": "/azure/governance/policy/samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/control-mapping.md",
+      "redirect_url": "/azure/governance/policy/samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/deploy.md",
+      "redirect_url": "/azure/governance/policy/samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/governance/blueprints/samples/pci-dss-3.2.1/index.md",
+      "redirect_url": "/azure/governance/policy/samples",
+      "redirect_document_id": false
+    }
   ]
-}
+}

.openpublishing.redirection.media-services.json

@@ -639,7 +639,52 @@
             "source_path_from_root": "/articles/media-services/latest/job-create-cli-how-to.md",
             "redirect_url": "/azure/media-services/latest/job-create-how-to",
             "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          }, 
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-subclip-video-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-subclip-video-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-presets-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-dotnet-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
           },   
+          {
+            "source_path_from_root": "/articles/media-services/latest/crop-howto.md",
+            "redirect_url": "/azure/media-services/latest/transform-crop-how-to",
+            "redirect_document_id": false
+          },  
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-custom-preset-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-custom-transform-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/transform-generate-thumbnails-rest-how-to.md",
+            "redirect_url": "/azure/media-services/latest/transform-generate-thumbnails-how-to",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/media-reserved-units-cli-how-to.md",
+            "redirect_url": "/azure/media-services/latest/media-reserved-units-how-to",
+            "redirect_document_id": false
+          },
         {
             "source_path_from_root": "/articles/media-services/latest/latest/asset-publish-cli-how-to.md",
             "redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",