Fix merge conflict.

Author: v-jaswel

.openpublishing.publish.config.json

@@ -230,6 +230,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-docs-python-v2",
+      "url": "https://github.com/Azure-Samples/functions-docs-python-v2",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-docs-powershell",
       "url": "https://github.com/Azure-Samples/functions-docs-powershell",
@@ -416,6 +422,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureml-examples-archive",
+      "url": "https://github.com/azure/azureml-examples",
+      "branch": "v1-archive",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-batch-pup",
       "url": "https://github.com/azure/azureml-examples",
@@ -1079,6 +1091,7 @@
   "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
   "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
   "articles/communication-services/.openpublishing.redirection.communication-services.json",
+  "articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",
   "articles/confidential-computing/.openpublishing.redirection.json",
   "articles/container-apps/.openpublishing.redirection.container-apps.json",
   "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",

.openpublishing.redirection.active-directory.json

@@ -100,6 +100,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/easy-metrics-connector-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/gainsight-saml-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/gainsight-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -1613,17 +1618,17 @@
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-protect-web-api-dotnet-core-prepare-api.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-protect-web-api-dotnet-core-build-app",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-protect-web-api-dotnet-core-protect-endpoints.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-protect-web-api-dotnet-core-build-app",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-protect-web-api-dotnet-core-test-api.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-protect-web-api-dotnet-core-test-api",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-overview.md",
@@ -1633,17 +1638,17 @@
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-prepare-app.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-browserless-app-dotnet-sign-in-build-app",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-prepare-tenant.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-browserless-app-dotnet-sign-in-prepare-tenant",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-browserless-app-dotnet-sign-in-sign-in.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-browserless-app-dotnet-sign-in-build-app",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/delegate-invitations.md",
@@ -1678,17 +1683,17 @@
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-overview.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-node-sign-in-prepare-tenant",
-      "redirect_document_id": true 
+      "redirect_document_id": true
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-prepare-tenant.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-node-sign-in-prepare-tenant",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-prepare-app.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-node-sign-in-prepare-tenant",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-node-sign-in-sign-in-out.md",
@@ -1703,17 +1708,32 @@
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-call-api-prepare-app.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-daemon-node-call-api-prepare-tenant",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-call-api-prepare-tenant.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-daemon-node-call-api-prepare-tenant",
-      "redirect_document_id": false 
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-daemon-node-call-api-call-api.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-daemon-node-call-api-prepare-tenant",
-      "redirect_document_id": false 
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sign-in-prepare-tenant.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-dotnet-sign-in-prepare-tenant",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sign-in-prepare-app.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-dotnet-sign-in-prepare-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/external-identities/customers/how-to-web-app-dotnet-sign-in-sign-out.md",
+      "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-web-app-dotnet-sign-in-sign-out",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/external-identities/conditional-access.md",
@@ -5250,6 +5270,76 @@
       "redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-security-defaults",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-filter-audit-log.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-customize-filter-logs",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/reference-basic-info-sign-in-logs.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/concept-sign-in-log-activity-details",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/concept-all-sign-ins.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/concept-sign-ins",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-use-azure-monitor-workbooks.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-use-workbooks",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/concept-activity-logs-azure-monitor.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/concept-log-monitoring-integration-options-considerations",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/tutorial-log-analytics-wizard.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/tutorial-configure-log-analytics-workspace",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-azure-monitor-route-logs-to-storage-account.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-archive-logs-to-storage-account",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/overview-monitoring.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/overview-monitoring-health",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/overview-reports.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/overview-monitoring-health",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-sumologic.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-stream-logs-to-event-hub",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-splunk.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-stream-logs-to-event-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-arcsight.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-stream-logs-to-event-hub",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-integrate-activity-logs-with-log-analytics.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/howto-integrate-activity-logs-with-azure-monitor-logs",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/overview-service-health-notifications.md",
+      "redirect_url": "/azure/service-health/service-health-portal-update",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/reports-monitoring/quickstart-configure-named-locations.md",
       "redirect_url": "/azure/active-directory/conditional-access/location-condition",
@@ -13441,7 +13531,7 @@
       "redirect_document_id": false
     },
     {
-     "source_path_from_root": "/articles/active-directory/external-identities/customers/sample-single-page-application-angular.md",
+      "source_path_from_root": "/articles/active-directory/external-identities/customers/sample-single-page-application-angular.md",
       "redirect_url": "/azure/active-directory/external-identities/customers/sample-single-page-app-angular-sign-in",
       "redirect_document_id": false
     },
@@ -13470,7 +13560,8 @@
       "redirect_url": "/azure/active-directory/external-identities/customers/tutorial-single-page-app-react-sign-in-sign-out",
       "redirect_document_id": false
     },
-    { "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-whatis.md",
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-whatis.md",
       "redirect_url": "/azure/active-directory/fundamentals/whatis",
       "redirect_document_id": false
     },
@@ -13561,7 +13652,12 @@
       "source_path_from_root": "/articles/active-directory/fundamentals/add-users-azure-active-directory.md",
       "redirect_url": "/azure/active-directory/fundamentals/add-users",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/privileged-identity-management/subscription-requirements.md",
+      "redirect_url": "/azure/active-directory/governance/licensing-fundamentals",
+      "redirect_document_id": false
     }
-   
+
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -6310,11 +6310,6 @@
             "redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-hybrid-setup.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
             "redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
@@ -6324,11 +6319,6 @@
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
             "redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
             "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
-            "redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
-            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -184,6 +184,26 @@
       "source_path": "articles/lab-services/how-to-access-vm-for-students-within-teams.md",
       "redirect_url": "/azure/lab-services/tutorial-access-lab-virtual-machine-teams-canvas",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/lab-creator-support-information.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/lab-user-support-information.md",
+      "redirect_url": "/azure/lab-services/how-to-access-lab-virtual-machine",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-lab-plan-template.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-plan-bicep",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-lab-template.md",
+      "redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
+      "redirect_document_id": false
     }
   ]
-}
+}