resolve conflicts

Author: mumian

.openpublishing.publish.config.json

@@ -254,6 +254,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "function-flex-consumption",
+      "url": "https://github.com/Azure-Samples/azure-functions-flex-consumption-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "functions-azure-product",
       "url": "https://github.com/Azure/Azure-Functions",
@@ -506,6 +512,12 @@
       "branch": "sdk-codetest",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "rag-data-openai-python-promptflow-main",
+      "url": "https://github.com/Azure-Samples/rag-data-openai-python-promptflow",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-main",
       "url": "https://github.com/azure/azureml-examples",
@@ -974,6 +986,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",
@@ -986,6 +1004,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-app-service-sqldb-dotnetcore",
+      "url": "https://github.com/Azure-Samples/msdocs-app-service-sqldb-dotnetcore",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1219,6 +1243,12 @@
       "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-python-fastapi-webapp-quickstart",
+      "url": "https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.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
-      
     }
-
   ]
 }

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

@@ -15,11 +15,6 @@
       "redirect_url": "/azure/ai-services/ai-services-and-ecosystem",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/cognitive-services-and-machine-learning.md",
-      "redirect_url": "/azure/ai-services/ai-services-and-ecosystem",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/cognitive-services-apis-create-account-cli.md",
       "redirect_url": "/azure/ai-services/multi-service-resource",
@@ -55,11 +50,6 @@
       "redirect_url": "/azure/ai-services/ai-services-and-ecosystem",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/cognitive-services-development-options.md",
-      "redirect_url": "/azure/ai-services/ai-services-and-ecosystem",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/cognitive-services-environment-variables.md",
       "redirect_url": "/azure/ai-services/cognitive-services-environment-variables",
@@ -120,21 +110,11 @@
       "redirect_url": "/azure/ai-services/recover-purge-resources",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/manage-resources.md",
-      "redirect_url": "/azure/ai-services/recover-purge-resources",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/plan-manage-costs.md",
       "redirect_url": "/azure/ai-studio/how-to/costs-plan-manage",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/plan-manage-costs.md",
-      "redirect_url": "/azure/ai-studio/how-to/costs-plan-manage",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/policy-reference.md",
       "redirect_url": "/azure/ai-services/policy-reference",
@@ -545,11 +525,6 @@
       "redirect_url": "/azure/ai-services/cognitive-services-container-support",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/containers/index.yml",
-      "redirect_url": "/azure/ai-services/cognitive-services-container-support",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/content-moderator/api-reference.md",
       "redirect_url": "/azure/ai-services/content-moderator/api-reference",
@@ -1560,11 +1535,6 @@
       "redirect_url": "/azure/ai-services/speech-service/get-started-stt-diarization",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/conversation-transcription.md",
-      "redirect_url": "/azure/ai-services/speech-service/get-started-stt-diarization",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/custom-commands-encryption-of-data-at-rest.md",
       "redirect_url": "/azure/ai-services/speech-service/custom-commands-encryption-of-data-at-rest",
@@ -1685,11 +1655,6 @@
       "redirect_url": "/azure/ai-services/speech-service/get-started-stt-diarization",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-async-conversation-transcription.md",
-      "redirect_url": "/azure/ai-services/speech-service/get-started-stt-diarization",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/how-to-audio-content-creation.md",
       "redirect_url": "/azure/ai-services/speech-service/how-to-audio-content-creation",
@@ -1845,31 +1810,6 @@
       "redirect_url": "/azure/ai-services/speech-service/professional-voice-deploy-endpoint",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-voice-create-voice.md",
-      "redirect_url": "/azure/ai-services/speech-service/professional-voice-train-voice",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-voice-prepare-data.md",
-      "redirect_url": "/azure/ai-services/speech-service/professional-voice-create-training-set",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-voice-talent.md",
-      "redirect_url": "/azure/ai-services/speech-service/professional-voice-create-consent",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-custom-voice.md",
-      "redirect_url": "/azure/ai-services/speech-service/professional-voice-create-project",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-deploy-and-use-endpoint.md",
-      "redirect_url": "/azure/ai-services/speech-service/professional-voice-deploy-endpoint",
-      "redirect_document_id": true
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/how-to-develop-custom-commands-application.md",
       "redirect_url": "/azure/ai-services/speech-service/how-to-develop-custom-commands-application",
@@ -1950,11 +1890,6 @@
       "redirect_url": "/azure/ai-services/speech-service/get-started-stt-diarization",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/how-to-use-conversation-transcription.md",
-      "redirect_url": "/azure/ai-services/speech-service/get-started-stt-diarization",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/how-to-use-custom-entity-pattern-matching.md",
       "redirect_url": "/azure/ai-services/speech-service/how-to-use-custom-entity-pattern-matching",
@@ -2045,11 +1980,6 @@
       "redirect_url": "/azure/ai-services/speech-service/migrate-v3-1-to-v3-2",
       "redirect_document_id": true
     },
-    {
-      "source_path_from_root": "/articles/ai-services/speech-service/migrate-v2-to-v3.md",
-      "redirect_url": "/azure/ai-services/speech-service/migrate-v3-1-to-v3-2",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cognitive-services/speech-service/migrate-v3-0-to-v3-1.md",
       "redirect_url": "/azure/ai-services/speech-service/migrate-v3-0-to-v3-1",

.openpublishing.redirection.app-service.json

@@ -552,7 +552,12 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/configure-language-java.md",
-            "redirect_url": "/azure/app-service/configure-language-java?pivots=platform-linux",
+            "redirect_url": "/azure/app-service/configure-language-java-deploy-run?pivots=platform-linux",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/configure-language-java.md",
+            "redirect_url": "/azure/app-service/configure-language-java-deploy-run",
             "redirect_document_id": false
         },
         {
@@ -1850,6 +1855,16 @@
             "redirect_url": "/azure/app-service/scripts/powershell-scale-manual",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/app-service/get-resource-events.md",
+            "redirect_url": "/azure/app-service/monitor-app-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/overview-monitoring.md",
+            "redirect_url": "/azure/app-service/monitor-app-service",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/app-service/app-service-security-attributes.md",
             "redirect_url": "/azure/app-service/security-baseline",