resolve conflict

Author: b-ahibbard

.openpublishing.publish.config.json

@@ -380,6 +380,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "functions-openapi-turbine-repair-isolated",
+      "url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair-isolated",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-functions-templates-v3",
       "url": "https://github.com/Azure/azure-functions-templates",
@@ -404,6 +410,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-search-static-web-app",
+      "url": "https://github.com/Azure-Samples/azure-search-static-web-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "samples-personalizer",
       "url": "https://github.com/Azure-Samples/cognitive-services-personalizer-samples",
@@ -896,6 +908,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "storage-mgmt-devguide-dotnet",
+      "url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -986,6 +1004,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-fastapi-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-fastapi-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "msdocs-quarkus-postgresql-sample-app",
       "url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",
@@ -1272,12 +1296,10 @@
   ".openpublishing.redirection.availability-zones.json",
   ".openpublishing.redirection.azure-app-configuration.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-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-hpc.json",
-  ".openpublishing.redirection.azure-kubernetes-service.json",
   ".openpublishing.redirection.azure-monitor.json",
   ".openpublishing.redirection.azure-percept.json",
   ".openpublishing.redirection.azure-productivity.json",
@@ -1290,10 +1312,10 @@
   ".openpublishing.redirection.cognitive-services.json",
   ".openpublishing.redirection.container-service.json",
   ".openpublishing.redirection.data-lake-analytics.json",
-  ".openpublishing.redirection.defender-for-cloud.json",
   ".openpublishing.redirection.defender-for-iot.json",
   ".openpublishing.redirection.dev-spaces.json",
   ".openpublishing.redirection.devops-project.json",
+  ".openpublishing.redirection.dms.json",
   ".openpublishing.redirection.document-db.json",
   ".openpublishing.redirection.germany.json",
   ".openpublishing.redirection.government.json",
@@ -1303,7 +1325,6 @@
   ".openpublishing.redirection.iot-develop.json",
   ".openpublishing.redirection.iot-hub-device-update.json",
   ".openpublishing.redirection.json",
-  ".openpublishing.redirection.key-vault.json",
   ".openpublishing.redirection.machine-configuration.json",
   ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
@@ -1324,7 +1345,6 @@
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services.openpublishing.redirection.ai-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
-  "articles/aks/.openpublishing.redirection.aks.json",
   "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
   "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
   "articles/automation/.openpublishing.redirection.automation.json",

.openpublishing.redirection.ai-services-from-applied.json

@@ -539,161 +539,6 @@
       "source_path_from_root": "/articles/applied-ai-services/immersive-reader/context/context.md",
       "redirect_url": "/azure/ai-services/immersive-reader/?context=/azure/ai-services/immersive-reader/context/context",
       "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/v3-migration-guide.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/v3-1-migration-guide",
-      "redirect_document_id": true
-    },
-
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/sdk-overview.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/sdk-overview-v3-0",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/sdk-preview.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/sdk-overview-v3-1",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/csharp.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/csharp",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/java.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/java",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/javascript.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/javascript",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/python.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/python",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/get-started/rest-api.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/v2-1/rest-api",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-insurance-card.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/concept-health-insurance-card",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-w2.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/concept-tax-document",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/resource-customer-stories.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/overview",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/language-support.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/language-support-ocr",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-csharp-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/csharp-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-javascript-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/javascript-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-java-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/java-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-python-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/python-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/quickstarts/includes/v3-rest-api-sdk.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/quickstarts/includes/rest-api-sdk.md",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-sdk.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-sdk",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/document-translation-rest-api.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-container-configuration.md",
-      "redirect_url": "/azure/ai-services/translator/containers/configuration",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-container-supported-parameters.md",
-      "redirect_url": "/azure/ai-services/translator/containers/translate-text-parameters",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-disconnected-containers.md",
-      "redirect_url": "/azure/ai-services/translator/containers/install-run",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/containers/translator-how-to-install-container.md",
-      "redirect_url": "/azure/ai-services/translator/containers/install-run",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md",
-      "redirect_url": "/azure/ai-services/document-intelligence/concept-retrieval-augmented-generation",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/how-to-guides/use-rest-api-programmatically",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/synchronous-rest-api.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/how-to-guides/use-rest-api-programmatically",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/asynchronous-sdk.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/client-library-sdks",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/reference/synchronous-rest-api-guide.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/reference/translate-document",
-      "redirect_document_id": true
-      
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/reference/start-translation.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/reference/start-batch-translation",
-      "redirect_document_id": true
-      
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/translator/document-translation/reference/get-supported-storage-sources.md",
-      "redirect_url": "/azure/ai-services/translator/document-translation/reference/rest-api-guide",
-      "redirect_document_id": false
-      
     }
-
   ]
 }