fixing merge conflict

Author: paulth1

.openpublishing.publish.config.json

@@ -929,76 +929,79 @@
     "name": "docfx_v3"
   },
   "redirection_files": [
-    ".openpublishing.redirection.json",
-    ".openpublishing.redirection.azure-arc-data.json",
-    ".openpublishing.redirection.active-directory.json",
-    ".openpublishing.redirection.api-management.json",
-    ".openpublishing.redirection.azure-attestation.json",
-    ".openpublishing.redirection.storage.json",
-    "articles/data-factory/.openpublishing.redirection.data-factory.json",
-    ".openpublishing.redirection.defender-for-cloud.json",
-    ".openpublishing.redirection.defender-for-iot.json",
-    ".openpublishing.redirection.healthcare-apis.json",
-    "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
-    ".openpublishing.redirection.app-service.json",
-    ".openpublishing.redirection.key-vault.json",
-    ".openpublishing.redirection.sql-database.json",
-    ".openpublishing.redirection.machine-configuration.json",
-    ".openpublishing.redirection.security-benchmark.json",
-    "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
-    ".openpublishing.redirection.azure-web-pubsub.json",
-    ".openpublishing.redirection.azure-monitor.json",
-    ".openpublishing.redirection.azure-percept.json",
-    ".openpublishing.redirection.azure-productivity.json",
-    ".openpublishing.redirection.azure-australia.json",
-    ".openpublishing.redirection.iot-hub-device-update.json",
-    "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
-    "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
-    "articles/azure-relay/.openpublishing.redirection.relay.json",
-    "articles/communication-services/.openpublishing.redirection.communication-services.json",
-    "articles/confidential-computing/.openpublishing.redirection.json",
-    "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
-    "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
-    "articles/data-catalog/.openpublishing.redirection.data-catalog.json",
-    "articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
-    "articles/digital-twins/.openpublishing.redirection.digital-twins.json",
-    "articles/event-grid/.openpublishing.redirection.event-grid.json",
-    "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
-    "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
-    "articles/iot-central/.openpublishing.redirection.iot-central.json",
-    "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
-    "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
-    "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
-    "articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
-    "articles/mariadb/.openpublishing.redirection.mariadb.json",
-    "articles/marketplace/.openpublishing.redirection.marketplace.json",
-    "articles/mysql/.openpublishing.redirection.mysql.json",
-    "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
-    "articles/postgresql/.openpublishing.redirection.postgresql.json",
-    "articles/purview/.openpublishing.redirection.purview.json",
-    "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
-    "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
-    "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
-    "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/container-apps/.openpublishing.redirection.container-apps.json",
-    "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
-    "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
-    "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
-    "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
-    "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
-    "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
-    ".openpublishing.redirection.virtual-desktop.json",
-    ".openpublishing.redirection.deployment-environments.json",
-    "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
-    "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
-    "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
-    ".openpublishing.redirection.baremetal-infrastructure.json",
-    "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
-    "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
-    ".openpublishing.redirection.azure-vmware.json",
-    ".openpublishing.redirection.openshift.json"
-  ]
+  ".openpublishing.redirection.active-directory.json",
+  ".openpublishing.redirection.api-management.json",
+  ".openpublishing.redirection.app-service.json",
+  ".openpublishing.redirection.azure-arc-data.json",
+  ".openpublishing.redirection.azure-attestation.json",
+  ".openpublishing.redirection.azure-australia.json",
+  ".openpublishing.redirection.azure-databricks.json",
+  ".openpublishing.redirection.azure-hpc.json",
+  ".openpublishing.redirection.azure-monitor.json",
+  ".openpublishing.redirection.azure-percept.json",
+  ".openpublishing.redirection.azure-productivity.json",
+  ".openpublishing.redirection.azure-resource-manager.json",
+  ".openpublishing.redirection.azure-stack.json",
+  ".openpublishing.redirection.azure-vmware.json",
+  ".openpublishing.redirection.azure-web-pubsub.json",
+  ".openpublishing.redirection.baremetal-infrastructure.json",
+  ".openpublishing.redirection.defender-for-cloud.json",
+  ".openpublishing.redirection.defender-for-iot.json",
+  ".openpublishing.redirection.deployment-environments.json",
+  ".openpublishing.redirection.dev-box.json",
+  ".openpublishing.redirection.healthcare-apis.json",
+  ".openpublishing.redirection.iot-hub-device-update.json",
+  ".openpublishing.redirection.json",
+  ".openpublishing.redirection.key-vault.json",
+  ".openpublishing.redirection.machine-configuration.json",
+  ".openpublishing.redirection.openshift.json",
+  ".openpublishing.redirection.security-benchmark.json",
+  ".openpublishing.redirection.sql-database.json",
+  ".openpublishing.redirection.virtual-desktop.json",
+  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
+  "articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
+  "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
+  "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
+  "articles/azure-relay/.openpublishing.redirection.relay.json",
+  "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
+  "articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
+  "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
+  "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/communication-services/.openpublishing.redirection.communication-services.json",
+  "articles/confidential-computing/.openpublishing.redirection.json",
+  "articles/container-apps/.openpublishing.redirection.container-apps.json",
+  "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
+  "articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
+  "articles/data-catalog/.openpublishing.redirection.data-catalog.json",
+  "articles/data-factory/.openpublishing.redirection.data-factory.json",
+  "articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
+  "articles/digital-twins/.openpublishing.redirection.digital-twins.json",
+  "articles/event-grid/.openpublishing.redirection.event-grid.json",
+  "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
+  "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
+  "articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
+  "articles/iot-central/.openpublishing.redirection.iot-central.json",
+  "articles/iot-develop/.openpublishing.redirection.iot-develop.json",
+  "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
+  "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
+  "articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
+  "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
+  "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
+  "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
+  "articles/mariadb/.openpublishing.redirection.mariadb.json",
+  "articles/marketplace/.openpublishing.redirection.marketplace.json",
+  "articles/mysql/.openpublishing.redirection.mysql.json",
+  "articles/object-anchors/.openpublishing.redirection.object-anchors.json",
+  "articles/postgresql/.openpublishing.redirection.postgresql.json",
+  "articles/purview/.openpublishing.redirection.purview.json",
+  "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
+  "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
+  "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
+  "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
+  "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
+  "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
+  "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
+  "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
+  "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
+]
 }

.openpublishing.redirection.active-directory.json

@@ -4361,6 +4361,11 @@
       "redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-mfa-get-started",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/conditional-access/faqs.md",
+      "redirect_url": "/azure/active-directory/conditional-access/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/conditional-access/concept-baseline-protection.md",
       "redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-security-defaults",
@@ -11058,12 +11063,17 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/privileged-identity-management/concept-privileged-access-versus-role-assignable.md",
-      "redirect_url": "azure/active-directory/privileged-identity-management/concept-pim-for-groups",
+      "redirect_url": "/azure/active-directory/privileged-identity-management/concept-pim-for-groups",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/privileged-identity-management/groups-features.md",
-      "redirect_url": "azure/active-directory/privileged-identity-management/concept-pim-for-groups",
+      "redirect_url": "/azure/active-directory/privileged-identity-management/concept-pim-for-groups",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-data-inventory.md",
+      "redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/product-data-billable-resources",
       "redirect_document_id": false
     }
   ]

.openpublishing.redirection.azure-databricks.json

@@ -0,0 +1,104 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-databricks/index.yml",
+            "redirect_url": "/azure/databricks/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/vnet-injection.md",
+            "redirect_url": "/azure/databricks/administration-guide/cloud-configurations/azure/vnet-inject",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/connect-databricks-excel-python-r.md",
+            "redirect_url": "/azure/databricks/scenarios/connect-databricks-excel-python-r",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/databricks-cli-from-azure-cloud-shell.md",
+            "redirect_url": "/azure/databricks/scenarios/databricks-cli-from-azure-cloud-shell",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/databricks-connect-to-data-sources.md",
+            "redirect_url": "/azure/databricks/scenarios/databricks-connect-to-data-sources",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/databricks-extract-load-sql-data-warehouse.md",
+            "redirect_url": "/azure/databricks/scenarios/databricks-extract-load-sql-data-warehouse",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/databricks-sentiment-analysis-cognitive-services.md",
+            "redirect_url": "/azure/databricks/scenarios/databricks-sentiment-analysis-cognitive-services",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/databricks-stream-from-eventhubs.md",
+            "redirect_url": "/azure/databricks/scenarios/databricks-stream-from-eventhubs",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/frequently-asked-questions-databricks.md",
+            "redirect_url": "/azure/databricks/scenarios/frequently-asked-questions-databricks",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/howto-regional-disaster-recovery.md",
+            "redirect_url": "/azure/databricks/scenarios/howto-regional-disaster-recovery",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/mysql-ip-address.md",
+            "redirect_url": "/azure/databricks/scenarios/mysql-ip-address",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/quickstart-create-databricks-workspace-portal.md",
+            "redirect_url": "/azure/databricks/scenarios/quickstart-create-databricks-workspace-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/quickstart-create-databricks-workspace-powershell.md",
+            "redirect_url": "/azure/databricks/scenarios/quickstart-create-databricks-workspace-powershell",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/quickstart-create-databricks-workspace-resource-manager-template.md",
+            "redirect_url": "/azure/databricks/scenarios/quickstart-create-databricks-workspace-resource-manager-template",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/quickstart-create-databricks-workspace-vnet-injection.md",
+            "redirect_url": "/azure/databricks/scenarios/quickstart-create-databricks-workspace-vnet-injection",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/security-baseline.md",
+            "redirect_url": "/azure/databricks/scenarios/security-baseline",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/service-endpoint-cosmosdb.md",
+            "redirect_url": "/azure/databricks/scenarios/service-endpoint-cosmosdb",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/store-secrets-azure-key-vault.md",
+            "redirect_url": "/azure/databricks/scenarios/store-secrets-azure-key-vault",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/vnet-injection-sql-server.md",
+            "redirect_url": "/azure/databricks/scenarios/vnet-injection-sql-server",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-databricks/what-is-azure-databricks.md",
+            "redirect_url": "/azure/databricks/scenarios/what-is-azure-databricks",
+            "redirect_document_id": false
+        }
+    ]
+}

.openpublishing.redirection.azure-monitor.json

@@ -4174,7 +4174,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/autoscale-resource-log-schema.md",
-            "redirect_url": "/azure/azure-monitor/autoscale/autoscale-resource-log-schema",
+            "redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
             "redirect_document_id": false
         },
         {
@@ -5671,6 +5671,21 @@
             "source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-monitor-cross-service-query.md",
             "redirect_url": "/azure/azure-monitor/logs/azure-monitor-data-explorer-proxy",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/mobile-center-quickstart.md",
+            "redirect_url": "https://github.com/Microsoft/appcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/windows-desktop.md",
+            "redirect_url": "https://github.com/Microsoft/appcenter",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-resource-log-schema.md",
+            "redirect_url": "/azure/azure-monitor/autoscale/autoscale-diagnostics",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -30,11 +30,6 @@
       "redirect_url": "/azure/devtest-labs/samples-powershell",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
-      "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
-      "redirect_document_id": false
-    },
     {
       "source_path": "articles/lab-services/how-to-create-schedules-within-teams.md",
       "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
@@ -89,6 +84,11 @@
       "source_path": "articles/lab-services/how-to-enable-nested-virtualization-template-vm.md",
       "redirect_url": "/azure/lab-services/concept-nested-virtualization-template-vm",
       "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/troubleshoot.md",
+      "redirect_url": "/azure/lab-services/troubleshoot-lab-creation",
+      "redirect_document_id": true
     }
   ]
 }