Merge conflict resolution

Author: lootle1

.openpublishing.publish.config.json

@@ -290,6 +290,24 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "functions-event-hub-azd-dotnet",
+            "url": "https://github.com/Azure-Samples/functions-quickstart-dotnet-azd-eventhub",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "functions-event-hub-azd-typescript",
+            "url": "https://github.com/Azure-Samples/functions-quickstart-typescript-azd-eventhub",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "functions-event-hub-azd-python",
+            "url": "https://github.com/Azure-Samples/functions-quickstart-python-azd-eventhub",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-templates-v3",
             "url": "https://github.com/Azure/azure-functions-templates",

.openpublishing.redirection.json

@@ -1,5 +1,95 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/sentinel/datalake/sentinel-mcp-chatgpt-connector.md",
+      "redirect_url": "/azure/sentinel/datalake/sentinel-mcp-chatgpt-claude-connector",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/airflow-configurations.md",
+      "redirect_url": "/previous-versions/azure/data-factory/airflow-configurations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/airflow-get-ip-airflow-cluster.md",
+      "redirect_url": "/previous-versions/azure/data-factory/airflow-get-ip-airflow-cluster",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/airflow-import-dags-blob-storage.md",
+      "redirect_url": "/previous-versions/azure/data-factory/airflow-import-dags-blob-storage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/airflow-install-private-package.md",
+      "redirect_url": "/previous-versions/azure/data-factory/airflow-install-private-package",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/airflow-pricing.md",
+      "redirect_url": "/previous-versions/azure/data-factory/airflow-pricing",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/airflow-sync-github-repository.md",
+      "redirect_url": "/previous-versions/azure/data-factory/airflow-sync-github-repository",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/ci-cd-pattern-with-airflow.md",
+      "redirect_url": "/previous-versions/azure/data-factory/ci-cd-pattern-with-airflow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/concepts-workflow-orchestration-manager.md",
+      "redirect_url": "/previous-versions/azure/data-factory/concepts-workflow-orchestration-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/create-airflow-environment.md",
+      "redirect_url": "/previous-versions/azure/data-factory/create-airflow-environment",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/delete-dags-in-workflow-orchestration-manager.md",
+      "redirect_url": "/previous-versions/azure/data-factory/delete-dags-in-workflow-orchestration-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/diagnostic-logs-and-metrics-for-workflow-orchestration-manager.md",
+      "redirect_url": "/previous-versions/azure/data-factory/diagnostic-logs-and-metrics-for-workflow-orchestration-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/enable-azure-key-vault.md",
+      "redirect_url": "/previous-versions/azure/data-factory/enable-azure-key-vault",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/get-started-with-workflow-orchestration-manager.md",
+      "redirect_url": "/previous-versions/azure/data-factory/get-started-with-workflow-orchestration-manager",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/kubernetes-secret-pull-image-from-private-container-registry.md",
+      "redirect_url": "/previous-versions/azure/data-factory/kubernetes-secret-pull-image-from-private-container-registry",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/password-change-airflow.md",
+      "redirect_url": "/previous-versions/azure/data-factory/password-change-airflow",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/rest-apis-for-airflow-integrated-runtime.md",
+      "redirect_url": "/previous-versions/azure/data-factory/rest-apis-for-airflow-integrated-runtime",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/data-factory/tutorial-run-existing-pipeline-with-airflow.md",
+      "redirect_url": "/previous-versions/azure/data-factory/tutorial-run-existing-pipeline-with-airflow",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/iot-hub/horizontal-arm-route-messages.md",
       "redirect_url": "/previous-versions/azure/iot-hub/horizontal-arm-route-messages",
@@ -426,6 +516,11 @@
       "redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-billing",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-functions/durable/durable-task-scheduler/quickstart-work-item-filtering-durable-task.md",
+      "redirect_url": "/azure/durable-task/scheduler/quickstart-work-item-filtering-durable-task",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-functions/durable/durable-functions-cloud-backup.md",
       "redirect_url": "/azure/azure-functions/durable/durable-functions-fan-in-fan-out",
@@ -441,6 +536,11 @@
       "redirect_url": "/azure/azure-functions/durable/durable-functions-human-interaction",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/azure-functions/durable/tutorial-durable-text-analysis-azure-files.md",
+      "redirect_url": "/azure/azure-functions/durable-functions/tutorial-durable-text-analysis-azure-files",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/expressroute/expressroute-troubleshooting-arp-resource-manager.md",
       "redirect_url": "/troubleshoot/azure/expressroute/expressroute-troubleshooting-arp-resource-manager",
@@ -7482,6 +7582,6 @@
       "source_path": "articles/certification/edge-secured-core-get-certified.md",
       "redirect_url": "/azure/certification/requirements-edge-secured-core",
       "redirect_document_id": false
-    },
+    }
   ]
 }

articles/active-directory-b2c/partner-onfido.md

@@ -113,7 +113,7 @@ REST API settings:
 #### Upload your files
 
 1. Store the UI folder files in your blob container.
-2. [Use Azure Storage Explorer to manage Azure Managed Disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
+2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
 
 ### Configure Azure AD B2C
 

articles/api-management/TOC.yml

@@ -745,7 +745,7 @@
       href: breaking-changes/git-configuration-retirement-march-2025.md
     - name: Direct management API retirement (March 2025)
       href: breaking-changes/direct-management-api-retirement-march-2025.md
-    - name: Managed certificates suspension (August 2025 - March 2026)
+    - name: Managed certificates suspension (August 2025 - June 2026)
       href: breaking-changes/managed-certificates-suspension-august-2025.md
     - name: ADAL-based identity provider retirement (September 2025)
       href: breaking-changes/identity-provider-adal-retirement-sep-2025.md

articles/api-management/api-management-capacity.md

@@ -170,7 +170,8 @@ Use capacity metrics for making decisions whether to scale an API Management ins
 + Ignore sudden spikes that are most likely not related to an increase in load (see [Capacity metric behavior](#capacity-metric-behavior) section for explanation).
 + As a general rule, upgrade or scale your instance when a capacity metric value exceeds **60% - 70%** for a long period of time (for example, 30 minutes). Different values may work better for your service or scenario.
 + If your instance or workspace gateway is configured with only 1 unit, upgrade or scale it when a capacity metric value exceeds **40%** for a long period. This recommendation is based on the need to reserve capacity for guest OS updates in the underlying service platform.
-+ Use [available diagnostics](monitor-api-management.md) to monitor the response times of API calls. Consider adjusting scaling thresholds if you notice degraded response times with increasing value of capacity metric. 
++ Use [available diagnostics](monitor-api-management.md) to monitor the response times of API calls. Consider adjusting scaling thresholds if you notice degraded response times with increasing value of capacity metric.
++ For classic tiers, discard the most recent 1‑minute data point when reading raw Azure API Management capacity metrics because the derived value can be invalid if source data isn’t available at aggregation time; do not base operational or scaling decisions on 1‑minute values — for autoscaling use average aggregation windows of 30 minutes or longer, evaluate sustained conditions before scaling, and annotate dashboards to exclude the final 1‑minute point so trends reflect reliable data.
 
 > [!TIP]  
 > If you are able to estimate your traffic beforehand, test your API Management instance or workspace gateway on workloads you expect. You can increase the request load gradually and monitor the value of the capacity metric that corresponds to your peak load. Follow the steps from the previous section to use Azure portal to understand how much capacity is used at any given time.

articles/api-management/api-management-howto-mutual-certificates.md

@@ -7,7 +7,7 @@ author: dlepow
 
 ms.service: azure-api-management
 ms.topic: how-to
-ms.date: 11/14/2025
+ms.date: 03/31/2026
 ms.author: danlep 
 ms.custom:
   - devx-track-azurepowershell
@@ -35,7 +35,6 @@ API Management provides two options for managing certificates that are used to s
 
 [!INCLUDE [api-management-workspace-key-vault-availability](../../includes/api-management-workspace-key-vault-availability.md)]
 
-
 We recommend that you use key vault certificates because doing so improves API Management security:
 
 * Certificates stored in key vaults can be reused across services.
@@ -49,14 +48,11 @@ We recommend that you use key vault certificates because doing so improves API M
 * If you haven't created an API Management instance yet, see [Create an API Management service instance](get-started-create-service-instance.md).
 * Configure your backend service client certificate authentication. For information about configuring certificate authentication in Azure App Service, see [Configure TLS mutual authentication in App Service][to configure certificate authentication in Azure WebSites refer to this article]. 
 * Ensure that you have access to the certificate and the password for management in an Azure key vault, or a certificate to upload to the API Management service. The certificate must be in PFX format. Self-signed certificates are allowed. 
-* If you use a self-signed certificate or other custom CA certificate and your API Management instance is in one of the classic tiers, install the corresponding root and intermediate CA certificates in API Management to enable validation of the backend service certificate. For more information, see [How to add a custom CA certificate in Azure API Management](api-management-howto-ca-certificates.md)
-
-    If you don't install the CA certificates, API Management can't validate the backend service certificate, and requests to the backend service fail unless you disable certificate chain validation. See [Disable certificate chain validation for self-signed certificates](#disable-certificate-chain-validation-for-self-signed-certificates) later in this article.
-
-    [!INCLUDE [api-management-ca-certificate-v2-tiers](../../includes/api-management-ca-certificate-v2-tiers.md)]
+* If you use a self-signed certificate and your API Management instance is in one of the classic tiers, disable certificate chain validation. See [Disable certificate chain validation for self-signed certificates](#disable-certificate-chain-validation-for-self-signed-certificates) later in this article.
 
     > [!NOTE]
-    > CA certificates for certificate validation aren't supported in the Consumption tier.
+    > When a client certificate is used by API Management for **outbound authentication** (for example, when API Management presents the certificate to a backend service), you don't need to upload the root or intermediate CA certificates to the API Management CA store. In this scenario, API Management *presents* the client certificate and doesn't perform certificate chain validation.<br/><br/>
+    > Uploading trusted root or intermediate CA certificates is only required when API Management must *validate* a certificate chain, such as during inbound client certificate authentication.
 
 [!INCLUDE [api-management-client-certificate-key-vault](../../includes/api-management-client-certificate-key-vault.md)]
 
@@ -118,4 +114,4 @@ To delete a certificate, select **Delete** on the ellipsis (**...**) menu:
 [Create an API Management service instance]: get-started-create-service-instance.md
 
 [WebApp-GraphAPI-DotNet]: https://github.com/AzureADSamples/WebApp-GraphAPI-DotNet
-[to configure certificate authentication in Azure WebSites refer to this article]: ../app-service/app-service-web-configure-tls-mutual-auth.md
+[to configure certificate authentication in Azure WebSites refer to this article]: ../app-service/app-service-web-configure-tls-mutual-auth.md