fixing merge conflicts

Author: batamig

.openpublishing.publish.config.json

@@ -913,6 +913,12 @@
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-cache-redis-samples",
+      "url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -929,76 +935,81 @@
     "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/logic-apps/.openpublishing.redirection.logic-apps.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/sap/.openpublishing.redirection.sap.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

@@ -55,6 +55,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/trello-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/atlassian-cloud-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",
@@ -70,6 +75,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -1870,6 +1880,11 @@
       "redirect_url": "/azure/active-directory/hybrid/migrate-from-federation-to-cloud-authentication",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-deployment-checklist-p2.md",
+      "redirect_url": "/azure/active-directory/fundamentals/concept-secure-remote-workers",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory/conditional-access/app-based-mfa.md",
       "redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
@@ -4361,6 +4376,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",
@@ -4386,6 +4406,11 @@
       "redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/recommendations-integrate-third-party-apps.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
       "redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",
@@ -4406,11 +4431,21 @@
       "redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/recommendation-integrate-third-party-apps.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/reports-monitoring/concept-reporting-api.md",
       "redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/reference-reports-latencies.md",
+      "redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/customize-branding.md",
       "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -10901,6 +10936,11 @@
       "redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app-with-api",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/tenant-management.md",
+      "redirect_url": "/azure/active-directory-b2c/tenant-management-add-administrator",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
       "redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",
@@ -11058,18 +11098,23 @@
     },
     {
       "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
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
+      "redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
+      "redirect_document_id": false
     }
   ]
 }