merge conflict

Author: lgayhardt

.openpublishing.publish.config.json

@@ -884,6 +884,7 @@
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
     "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
-    "articles/mysql/.openpublishing.redirection.mysql.json"
+    "articles/mysql/.openpublishing.redirection.mysql.json",
+    "articles/container-apps/.openpublishing.redirection.container-apps.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -800,6 +800,11 @@
             "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/o365-external-user.md",
+            "redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-current-preview-limitations.md",
             "redirect_url": "/azure/active-directory/active-directory-b2b-current-limitations",
@@ -7910,6 +7915,11 @@
             "redirect_url": "/azure/active-directory/saas-apps/cisco-webex-provisioning-tutorial",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/saas-apps/active-and-thriving-perth-airport-tutorial.md",
+            "redirect_url": "/azure/active-directory/saas-apps/active-and-thriving-tutorial",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-saas-cisco-webex-tutorial.md",
             "redirect_url": "/azure/active-directory/saas-apps/cisco-webex-tutorial",

.openpublishing.redirection.azure-monitor.json

@@ -19,6 +19,11 @@
             "source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
             "redirect_url": "/azure/service-bus-messaging/service-bus-insights",
             "redirect_document_id": false
+        },
+        {
+            "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
         }
     ]
 }

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

@@ -1,10 +1,5 @@
 {
     "redirections": [
-        {
-            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
-            "redirect_url": "/azure/sentinel/iot-solution",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
             "redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -30,7 +25,17 @@
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
         },
-	{
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
+            "redirect_document_id": false
+        },
+	    {
             "source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
@@ -230,11 +235,6 @@
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -564,6 +564,29 @@
             "source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
             "redirect_url": "/azure/defender-for-iot/organizations",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
+            "redirect_document_id": false
         }
     ]
-}
+}
+
+
+

.openpublishing.redirection.json

@@ -15901,8 +15901,13 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-developer-lab.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-developer-lab",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-developer-lab.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-dev-ops.md",
@@ -16036,13 +16041,23 @@
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-test-env.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-test-env",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-training-lab.md",
-      "redirect_url": "/azure/devtest-labs/devtest-lab-training-lab",
-      "redirect_document_id": true
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-test-env.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/devtest-lab-training-lab.md",
+      "redirect_url": "/azure/devtest-labs/devtest-lab-guidance-get-started",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/lab-services/devtest-lab-troubleshoot-apply-artifacts.md",
@@ -19815,9 +19830,9 @@
       "redirect_document_id": false
     },
     {
-      "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-app-service.md",
-      "redirect_url": "/azure/machine-learning/how-to-deploy-app-service",
-      "redirect_document_id": true
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-app-service.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-managed-online-endpoints",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-azure-container-instance.md",
@@ -19844,6 +19859,11 @@
       "redirect_url": "/azure/machine-learning/how-to-deploy-and-where",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/machine-learning/how-to-homomorphic-encryption-seal.md",
+      "redirect_url": "/azure/machine-learning/",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/machine-learning/service/concept-accelerate-with-fpgas.md",
       "redirect_url": "/azure/machine-learning/how-to-deploy-fpga-web-service",
@@ -19855,9 +19875,14 @@
       "redirect_document_id": true
     },
     {
-      "source_path_from_root": "/articles/machine-learning/service/how-to-deploy-functions.md",
-      "redirect_url": "/azure/machine-learning/how-to-deploy-functions",
-      "redirect_document_id": true
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-functions.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-managed-online-endpoints",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/machine-learning/how-to-deploy-no-code-deployment.md",
+      "redirect_url": "/azure/machine-learning/how-to-deploy-mlflow-models-online-endpoints",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/machine-learning/service/concept-accelerate-inferencing-with-gpus.md",
@@ -22629,6 +22654,46 @@
       "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-intro.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-advanced-complexity.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-concepts-terms.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-powershell-reference.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-plans-billing.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-limits-defaults-errors.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-high-availability-reliability.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
+    {
+      "source_path_from_root": "/articles/scheduler/scheduler-outbound-authentication.md",
+      "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
+      "redirect_document_id": ""
+    },
     {
       "source_path_from_root": "/articles/scheduler/get-started-portal.md",
       "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
@@ -26254,9 +26319,19 @@
       "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
       "redirect_document_id": false
     },
+    {
+      "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-legacy",
+      "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-nodejs",
       "redirect_document_id": false
     },
     {
@@ -39419,11 +39494,6 @@
       "redirect_url": "/azure/azure-monitor/agents/data-sources-windows-events",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/azure-monitor/platform/data-collection-rule-overview.md",
-      "redirect_url": "/azure/azure-monitor/agents/data-collection-rule-overview",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/azure-monitor/platform/data-sources.md",
       "redirect_url": "/azure/azure-monitor/agents/data-sources",
@@ -44154,6 +44224,11 @@
       "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-manage",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/applied-ai-services/form-recognizer/managed-identity-byos.md",
+      "redirect_url": "/azure/applied-ai-services/form-recognizer/managed-identities",
+      "redirect_document_id": false
+    },
     {
     "source_path_from_root": "/articles/azure/virtual-desktop/azure-advisor.md",
     "redirect_url": "/azure/advisor/advisor-overview",
@@ -44178,6 +44253,25 @@
         "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/azure/marketplace/co-sell-requirements.md",
+          "redirect_url": "/partner-center/co-sell-requirements",
+          "redirect_document_id": false
+      },        
+      {
+        "source_path_from_root": "/articles/azure/marketplace/co-sell-status.md",
+        "redirect_url": "/partner-center/co-sell-status",
+        "redirect_document_id": false
+      },
+      {
+          "source_path_from_root": "/articles/azure/marketplace/co-sell-configure.md",
+          "redirect_url": "/partner-center/co-sell-configure",
+          "redirect_document_id": false
+      },
+      {
+          "source_path_from_root": "/articles/azure/marketplace/co-sell-overview.md",
+          "redirect_url": "/partner-center/co-sell-overview",
+          "redirect_document_id": false
       }
   ]
 }

.openpublishing.redirection.media-services.json

@@ -624,6 +624,16 @@
             "source_path_from_root": "/articles/media-services/latest/security-private-link-how-to.md",
             "redirect_url": "/azure/media-services/latest/security-private-link-arm-how-to",
             "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/asset-create-asset-upload-portal-quickstart.md",
+            "redirect_url": "/azure/media-services/latest/video-on-demand-simple-portal-quickstart",
+            "redirect_document_id": true
+          },
+          {
+            "source_path_from_root": "/articles/media-services/latest/architecture-design-multi-drm-system.md",
+            "redirect_url": "/azure/media-services/latest/drm-content-protection-concept",
+            "redirect_document_id": true
           },     
         {
             "source_path_from_root": "/articles/media-services/latest/latest/questions-collection.md",

CODEOWNERS

@@ -24,13 +24,6 @@ articles/azure-monitor/vm @bwren
 articles/advisor @rboucher
 articles/service-health @rboucher
 
-
-# Azure Active Directory
-/articles/active-directory-b2c/ @msmimart @yoelhor
-/articles/active-directory/app-provisioning/ @CelesteDG
-/articles/active-directory/develop/ @mmacy
-/articles/active-directory/manage-apps/ @CelesteDG
-
 # Azure Synapse Analytics
 /articles/synapse-analytics/ @julieMSFT @ryanmajidi @saveenr 
 /articles/synapse-analytics/backuprestore/ @joannapea @julieMSFT

CONTRIBUTING.md

@@ -21,8 +21,8 @@ Please use the Feedback tool at the bottom of any article to submit bugs and sug
 
 ### Editing in GitHub
 
-Follow the guidance for [Quick edits to existing documents](https://docs.microsoft.com/contribute/#quick-edits-to-existing-documents) in our contributors guide.
+Follow the guidance for [Quick edits to existing documents](/contribute/#quick-edits-to-existing-documents) in our contributors guide.
 
 ### Pull Request
 
-Review the guidance for [Pull Requests](https://docs.microsoft.com/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.
+Review the guidance for [Pull Requests](/contribute/how-to-write-workflows-major#pull-request-processing) in our contributors guide.

README.md

@@ -10,7 +10,7 @@ Contributing to open source is more than just providing updates, it's also about
 
 You've decided to contribute, that's great! To contribute to the documentation, you need a few tools.
 
-Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](https://docs.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
+Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for the [GitHub account setup](/contribute/get-started-setup-github) from our contributor guide.
 
 #### Download
 
@@ -22,7 +22,7 @@ Install the following tools:
 
 #### Install
 
-Follow the instructions provided in the [Install content authoring tools](https://docs.microsoft.com/contribute/get-started-setup-tools) from our contributor guide.
+Follow the instructions provided in the [Install content authoring tools](/contribute/get-started-setup-tools) from our contributor guide.
 
 ## License