merge conflict fix

Author: bandersmsft

.openpublishing.publish.config.json

@@ -437,7 +437,7 @@
     {
       "path_to_root": "media-services-video-indexer",
       "url": "https://github.com/Azure-Samples/media-services-video-indexer",
-      "branch": "main",
+      "branch": "master",
       "branch_mapping": {}
     },
     {
@@ -473,7 +473,7 @@
     {
       "path_to_root": "azureml-examples-online-endpoint-vnet",
       "url": "https://github.com/azure/azureml-examples",
-      "branch": "rsethur/mvnet",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -632,6 +632,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "samples-cosmosdb-mongodb-javascript",
+      "url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-cosmosdb-java-v4-web-app",
       "url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -878,6 +884,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-cosmos-tableapi-dotnet",
+      "url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",
+      "branch": "v12",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "msdocs-django-postgresql-sample-app",
       "url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
@@ -925,6 +937,18 @@
       "url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
       "branch": "v3",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-cosmos-db-table-dotnet-v12",
+      "url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",
+      "branch": "v12",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-cosmos-mongodb-dotnet",
+      "url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
+      "branch": "quickstart-test",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -942,13 +966,16 @@
   },
   "redirection_files": [
     ".openpublishing.redirection.json",
+    ".openpublishing.redirection.azure-arc-data.json",
     ".openpublishing.redirection.active-directory.json",
+    ".openpublishing.redirection.azure-attestation.json",
     ".openpublishing.redirection.azure-blob.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",
     ".openpublishing.redirection.iot-hub.json",
+    ".openpublishing.redirection.app-service.json",
     ".openpublishing.redirection.key-vault.json",
     ".openpublishing.redirection.sql-database.json",
     ".openpublishing.redirection.security-benchmark.json",
@@ -991,6 +1018,7 @@
     "articles/spring-cloud/.openpublishing.redirection.spring-cloud.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/machine-learning/.openpublishing.redirection.machine-learning.json",
+    "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -355,6 +355,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/carlsonwagonlit-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
       "redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -2785,6 +2790,7 @@
       "redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
       "redirect_document_id": false
     },
+    
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
       "redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4510,6 +4516,11 @@
       "redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-group-writeback.md",
+      "redirect_url": "/azure/active-directory/hybrid/how-to-connect-group-writeback-v2",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
       "redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -8782,13 +8793,13 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-provisioning-tutorial.md",
-      "redirect_url": "/azure/active-directory/saas-apps/linkedinlearning-provisioning-tutorial",
+      "redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
-      "redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
-      "redirect_document_id": true
+      "redirect_url": "/azure",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
@@ -10794,6 +10805,11 @@
       "source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
       "redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
+      "redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
+      "redirect_document_id": true
     }
 
   ]

.openpublishing.redirection.app-service.json

@@ -0,0 +1,19 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
+      "redirect_url": "/azure/app-service/manage-backup",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/web-sites-restore.md",
+      "redirect_url": "/azure/app-service/manage-backup",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/app-service-web-restore-snapshots.md",
+      "redirect_url": "/azure/app-service/manage-backup",
+      "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.azure-arc-data.json

@@ -0,0 +1,169 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-arc/data/deploy-byok-active-directory-connector.md",
+            "redirect_url": "/azure/azure-arc/data/deploy-customer-managed-keytab-active-directory-connector",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-dag.md",
+            "redirect_url": "/cli/azure/sql/instance-failover-group-arc",
+            "redirect_document_id":false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/retrieve-the-username-password-for-data-controller.md",
+            "redirect_url": "/azure/azure-arc/data/update-service-principal-credentials",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-aks-cluster-data-controller.md",
+            "redirect_url": "/azure/azure-arc/data/create-complete-managed-instance-indirectly-connected",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/how-to-apply-security-context-constraint.md",
+            "redirect_url": "/azure/azure-arc/data",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode-prerequisites.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/deploy-data-controller-direct-mode.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-direct-cli",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-data-controller.md",
+            "redirect_url": "/azure/azure-arc/data/plan-azure-arc-data-services",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-data-controller-azure-data-studio.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-data-studio",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/data-controller-resource-in-azure-portal.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-azure-portal",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-cli.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-indirect-cli",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-azdata.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-using-cli",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/scale-out-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/known-issues.md",
+            "redirect_url": "/azure/azure-arc/data/release-notes",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/overview.md",
+            "redirect_url": "/azure/azure-arc/data/reference/reference-az-arcdata",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-data-controller-using-k8s-native-tools.md",
+            "redirect_url": "/azure/azure-arc/data/create-data-controller-using-kubernetes-native-tools",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-k8s-native-tools.md",
+            "redirect_url": "/azure/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-sql-managed-instance-using-k8s-native-tools.md",
+            "redirect_url": "/azure/azure-arc/data/create-sql-managed-instance-using-kubernetes-native-tools",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata.md",
+            "redirect_url": "/cli/azure/arcdata",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-ad-connector.md",
+            "redirect_url": "/cli/azure/arcdata",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc.md",
+            "redirect_url": "/cli/azure/arcdata/dc",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-config.md",
+            "redirect_url": "/cli/azure/arcdata/dc/config",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-debug.md",
+            "redirect_url": "/cli/azure/arcdata/dc/debug",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-endpoint.md",
+            "redirect_url": "/cli/azure/arcdata/dc/debug",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-dc-status.md",
+            "redirect_url": "/cli/azure/arcdata/dc/status",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-arcdata-resource-kind.md",
+            "redirect_url": "/cli/azure/arcdata/resource-kind",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server.md",
+            "redirect_url": "/cli/azure/postgres/arc-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-postgres-arc-server-endpoint.md",
+            "redirect_url": "/cli/azure/postgres/arc-server/endpoint",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-instance-failover-group-arc.md",
+            "redirect_url": "/cli/azure/sql/instance-failover-group-arc",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc.md",
+            "redirect_url": "/cli/azure/sql/mi-arc",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-config.md",
+            "redirect_url": "/cli/azure/sql/mi-arc/config",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-mi-arc-endpoint.md",
+            "redirect_url": "/cli/azure/sql/mi-arc/endpoint",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
+            "redirect_url": "/cli/azure/sql/midb-arc",
+            "redirect_document_id": false
+          }
+          ]
+}

.openpublishing.redirection.azure-attestation.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/attestation/audit-logs.md",
+            "redirect_url": "/azure/attestation/view-logs",
+            "redirect_document_id": true
+        }
+     ]
+}