Merge branch 'main' into release-esan-backup

Author: v-alje

articles/application-gateway/for-containers/prometheus-grafana.md

@@ -4,7 +4,7 @@ description: Configure Application Gateway for Containers metrics to be sent to
 services: application-gateway
 author: greg-lindsay
 ms.service: azure-appgw-for-containers
-ms.topic: article
+ms.topic: how-to
 ms.date: 10/21/2024
 ms.author: greglin
 ---

articles/application-gateway/for-containers/siem-integration-with-sentinel.md

@@ -4,7 +4,7 @@ description: Configure Application Gateway for Containers for SIEM integration w
 services: application-gateway
 author: greg-lindsay
 ms.service: azure-appgw-for-containers
-ms.topic: article
+ms.topic: how-to
 ms.date: 07/11/2024
 ms.author: greglin
 ---

articles/application-gateway/resource-health-overview.md

@@ -4,7 +4,7 @@ description: This article is an overview of the resource health feature for Azur
 services: application-gateway
 author: greg-lindsay
 ms.service: azure-application-gateway
-ms.topic: article
+ms.topic: overview
 ms.date: 7/9/2019
 ms.author: greglin
 ---
@@ -56,4 +56,4 @@ The **Degraded** health status indicates your gateway has detected a loss in per
 
 ## Next steps
 
-To learn about troubleshooting Application Gateway Web Application Firewall (WAF), see [Troubleshoot Web Application Firewall (WAF) for Azure Application Gateway](../web-application-firewall/ag/web-application-firewall-troubleshoot.md).
+To learn about troubleshooting Application Gateway Web Application Firewall (WAF), see [Troubleshoot Web Application Firewall (WAF) for Azure Application Gateway](../web-application-firewall/ag/web-application-firewall-troubleshoot.md).

articles/azure-app-configuration/TOC.yml

@@ -166,6 +166,10 @@
       href: concept-soft-delete.md
     - name: Recover or purge deleted stores
       href: howto-recover-deleted-stores-in-azure-app-configuration.md
+- name: AI configuration
+  items:
+  - name: Overview
+    href: concept-ai-configuration.md
 - name: Feature management
   items:
   - name: Overview

articles/azure-app-configuration/concept-ai-configuration.md

@@ -0,0 +1,51 @@
+---
+title: Azure App Configuration support for AI Configuration
+description: Introduction to AI Configuration support using App Configuration
+author: MaryanneNjeri
+ms.author: mgichohi
+ms.service: azure-app-configuration
+ms.topic: concept-article
+ms.date: 04/18/2025
+ms.collection: ce-skilling-ai-copilot
+---
+
+# AI configuration
+
+AI application development often requires rapid iteration of prompts and frequent tuning of model parameters to meet evolving goals such as quality, responsiveness, customer satisfaction, and cost efficiency. AI configuration in Azure App Configuration helps streamline this process by decoupling model settings from application code, enabling faster, safer, and more flexible iteration. Here are some key benefits:
+
+* **Rapid configuration iteration**  
+    Externalize AI model settings, such as prompts, temperature, or model versions, into Azure App Configuration. Your applications can dynamically load updated configurations at runtime without requiring restarts, rebuilds, or redeployments.
+
+* **Guided configuration authoring**  
+    Use built-in configuration templates that conform to the specifications of models from various providers. The guided configuration authoring simplifies the adoption of new models, reduces configuration errors, and accelerates development by ensuring your settings are valid and aligned with model requirements.
+
+* **Safe and controlled rollouts**  
+    Use feature flags to gradually release new model settings or models to targeted user segments. Monitor rollout progress with telemetry and control rollbacks or roll-forwards with ease.
+
+* **Data-driven experimentation**  
+	Define custom metrics to evaluate the effectiveness of new AI configurations. Measure impact on performance, cost, or user satisfaction to make informed decisions about future iterations.
+
+## Chat completion configuration
+
+Chat completion is an AI capability that produces human-like dialogue responses while retaining memory of previous interactions to create coherent, contextual conversations. The following models are supported.
+
+| **Provider**   | **Model**             |
+|----------------|-----------------------|
+| OpenAI         | GPT-3.5-Turbo         |
+| OpenAI         | GPT-4                 |
+| OpenAI         | GPT-4o                |
+| OpenAI         | GPT-4.5 Preview       |
+| OpenAI         | GPT-4.1               |
+| OpenAI         | GPT-4.1-nano          |
+| OpenAI         | GPT-4.1-mini          |
+| OpenAI         | o1                    |
+| OpenAI         | o1-mini               |
+| OpenAI         | o1-preview            |
+| OpenAI         | o3-mini               |
+| Anthropic      | Claude 3.7 Sonnet     |
+| Google         | Gemini 2.5 Pro        |
+| DeepSeek       | DeepSeek-R1           |
+
+
+Azure OpenAI Service supports a diverse set of models from OpenAI. For more information, see [Azure OpenAI Service models](/azure/ai-services/openai/concepts/models). To learn more about models from Anthropic, refer to the [Claude models documentation](https://docs.anthropic.com/docs/about-claude/models/overview).  
+For more details about models provided by Google, see the [Gemini models documentation](https://ai.google.dev/gemini-api/docs/models).

articles/azure-functions/flex-consumption-plan.md

@@ -105,14 +105,15 @@ This table shows the language stack versions that are currently supported for Fl
 
 | Language stack  | Required version |
 | --- | :-----: |
-| C# (isolated process mode)<sup>1</sup> | .NET 8<sup>2</sup> |
-| Java | Java 11, Java 17 |
-| Node.js | Node 20   |
+| C# (isolated process mode)<sup>1</sup> | .NET 8<sup>2</sup>, .NET 9<sup>3</sup> |
+| Java | Java 11, Java 17, Java 21 |
+| Node.js | Node.js 20, Node.js 22   |
 | PowerShell | PowerShell 7.4   |
 | Python | Python 3.10, Python 3.11, Python 3.12  | 
 
-<sup>1</sup>[C# in-process mode](./functions-dotnet-class-library.md) isn't supported. You instead need to [migrate your .NET code project to run in the isolated worker model](migrate-dotnet-to-isolated-model.md).  
-<sup>2</sup>Requires version `1.20.0` or later of [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker) and version `1.16.2` or later of [Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk).
+1. [C# in-process mode](./functions-dotnet-class-library.md) isn't supported. You instead need to [migrate your .NET code project to run in the isolated worker model](migrate-dotnet-to-isolated-model.md).  
+2. Requires version `1.20.0` or later of [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker) and version `1.16.2` or later of [Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk).
+3. Requires version `2.0.0` or later of both [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker) and [Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk).
 
 ## Regional subscription memory quotas
 

articles/azure-functions/functions-container-apps-hosting.md

@@ -19,7 +19,7 @@ For a general overview of container hosting options for Azure Functions, see [Li
 
 ## Hosting and workload profiles
 
-There are two primary hosting plans for Container Apps, a serverless [Consumption plan](../container-apps/plans.md#consumption) and a [Dedicated plan](../container-apps/plans.md#dedicated), which uses workload profiles to better control your deployment resources. A workload profile determines the amount of compute and memory resources available to container apps deployed in an environment. These profiles are configured to fit the different needs of your applications. 
+There are two primary plans for Container Apps: a serverless [Consumption plan](../container-apps/plans.md#consumption) and a [Dedicated plan](../container-apps/plans.md#dedicated). Both can be used in Workload profiles environment types, with workload profiles determining the compute and memory resources available to your apps. A workload profile determines the amount of compute and memory resources available to container apps deployed in an environment. These profiles are configured to fit the different needs of your applications. 
 
 The Consumption workload profile is the default profile added to every Workload profiles environment type. You can add Dedicated workload profiles to your environment as you create an environment or after it's created. To learn more about workload profiles, see [Workload profiles in Azure Container Apps](../container-apps/workload-profiles-overview.md).
 

articles/azure-netapp-files/azure-government.md

@@ -6,7 +6,7 @@ author: b-hchen
 ms.service: azure-netapp-files
 ms.custom: devx-track-azurecli, no-azure-ad-ps-ref
 ms.topic: concept-article
-ms.date: 04/17/2025
+ms.date: 05/21/2025
 ms.author: anfdocs
 ---
 
@@ -24,6 +24,7 @@ All [Azure NetApp Files features](whats-new.md) available on Azure public cloud
 
 | Azure NetApp Files features | Azure public cloud availability |  Azure Government availability |
 |:--- |:--- |:--- |
+| Azure NetApp Files customer-managed key with managed Hardware Security Module | Generally available | No |
 | Azure NetApp Files file access logs | Public preview | No |
 
 ## Portal access