Merge branch 'MicrosoftDocs:main' into main

Author: KendalBond007

articles/active-directory-b2c/password-complexity.md

@@ -83,7 +83,7 @@ Allows you to control the different character types used in the password.
 
 - **2 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least two character types. For example, a number and a lowercase character.
 - **3 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least three character types. For example, a number, a lowercase character and an uppercase character.
-- **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all for character types.
+- **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all four character types.
 
     > [!NOTE]
     > Requiring **4 of 4** can result in end-user frustration. Some studies have shown that this requirement doesn't improve password entropy. See [NIST Password Guidelines](https://pages.nist.gov/800-63-3/sp800-63b.html#appA)

articles/api-management/send-one-way-request-policy.md

@@ -89,6 +89,6 @@ This example uses the `send-one-way-request` policy to send a message to a Slack
 
 ## Related policies
 
-* [Intergration and external communication](api-management-policies.md#integration-and-external-communication)
+* [Integration and external communication](api-management-policies.md#integration-and-external-communication)
 
 [!INCLUDE [api-management-policy-ref-next-steps](../../includes/api-management-policy-ref-next-steps.md)]

articles/app-service/app-service-configure-premium-v4-tier.md

@@ -3,7 +3,7 @@ title: Configure Premium V4 tier
 description: Learn how to better performance for your web, mobile, and API app in Azure App Service by scaling to the new Premium V4 pricing tier.
 keywords: app service, azure app service, scale, scalable, app service plan, app service cost
 ms.topic: article
-ms.date: 05/12/2025
+ms.date: 06/09/2025
 ms.author: msangapu
 author: msangapu-msft
 ms.custom:
@@ -96,9 +96,18 @@ Premium V4 is available in the following regions:
 
 ### Azure Public
 
+- Australia East
+- Canada Central
+- North Europe
 - East US
-- West Central US
+- East US 2
+- France Central
 - North Europe
+- Southeast Asia
+- Sweden Central
+- West Central US
+- West Europe
+- West US 3
 
 ## Scale up from an unsupported resource group and region combination
 

articles/app-service/index.yml

@@ -9,7 +9,7 @@ metadata:
   ms.topic: landing-page
   ms.author: msangapu
   ms.service: azure-app-service
-  ms.date: 01/22/2025
+  ms.date: 06/10/2025
   ms.custom: UpdateFrequency3
 
 landingContent:
@@ -55,6 +55,40 @@ landingContent:
           - text: Custom container
             url: quickstart-custom-container.md
 
+  - title: Integrate AI with App Service
+    linkLists:
+      - linkListType: concept
+        links:
+          - text: Introduction to AI integration with App Service
+            url: overview-ai-integration.md
+      - linkListType: tutorial
+        links:
+          - text: Build a RAG application with Azure OpenAI and Azure AI Search (.NET)
+            url: tutorial-ai-openai-search-dotnet.md
+          - text: Build a chatbot with Azure OpenAI (Blazor)
+            url: tutorial-ai-openai-chatbot-dotnet.md            
+          - text: Build a chatbot with Azure OpenAI (Spring Boot)
+            url: tutorial-ai-openai-chatbot-java.md            
+          - text: Run a chatbot with a local SLM (Express.js)
+            url: tutorial-ai-slm-expressjs.md
+          - text: Invoke OpenAPI web app from Azure AI Agent
+            url: invoke-openapi-web-app-from-azure-ai-agent-service.md
+
+  - title: Secure and deploy  
+    linkLists:
+      - linkListType: concept
+        links:
+          - text: Security in Azure App Service
+            url: overview-security.md        
+      - linkListType: tutorial
+        links:
+          - text: Secure with custom domain and certificate
+            url: tutorial-secure-domain-certificate.md
+          - text: Continuous deployment
+            url: deploy-continuous-deployment.md
+          - text: Upload content with FTP
+            url: deploy-ftp.md
+
   - title: Build a CRUD app
     linkLists:
       - linkListType: tutorial
@@ -76,17 +110,9 @@ landingContent:
           - text: REST API
             url: /rest/api/appservice/
 
-  - title: Secure and deploy  
+  - title: Troubleshoot with Azure SRE Agent (AI)
     linkLists:
-      - linkListType: concept
-        links:
-          - text: Security in Azure App Service
-            url: overview-security.md        
       - linkListType: tutorial
         links:
-          - text: Secure with custom domain and certificate
-            url: tutorial-secure-domain-certificate.md
-          - text: Continuous deployment
-            url: deploy-continuous-deployment.md
-          - text: Upload content with FTP
-            url: deploy-ftp.md
+          - text: Fix application issues with SRE Agent
+            url: tutorial-sre-agent.md

articles/app-service/overview-ai-integration.md

@@ -5,7 +5,7 @@ author: cephalin
 ms.author: cephalin
 ms.service: azure-app-service
 ms.topic: overview
-ms.date: 05/17/2025
+ms.date: 06/06/2025
 ms.custom:
   - build-2025
 ---
@@ -14,7 +14,7 @@ ms.custom:
 
 This article guides you to language-specific tutorials and resources to help you build intelligent applications with App Service.
 
-Azure App Service makes it easy to integrate AI capabilities into your web applications across multiple programming languages and frameworks. Whether you want to use powerful Azure OpenAI models, deploy local small language models (SLMs) directly with your apps, or implement advanced patterns like retrieval augmented generation (RAG), App Service provides the flexible, secure platform you need for AI-powered applications.
+Azure App Service makes it easy to integrate AI capabilities into your web applications across multiple programming languages and frameworks. Whether you want to use powerful Azure OpenAI models, deploy local small language models (SLMs) directly with your apps, host Model Context Protocol (MCP) servers or implement advanced patterns like retrieval augmented generation (RAG), App Service provides the flexible, secure platform you need for AI-powered applications.
 
 App Service offers several advantages for developing and deploying AI-powered applications:
 
@@ -62,6 +62,16 @@ Implement AI capabilities in your Python web applications:
 - [Run a chatbot with a local SLM (FastAPI)](tutorial-ai-slm-fastapi.md) - Deploy a FastAPI application with a local SLM sidecar.
 - [Azure AI Foundry tutorial: Deploy an enterprise chat web app](/azure/ai-foundry/tutorials/deploy-chat-web-app?toc=/azure/app-service/toc.json&bc=/azure/bread/toc.json) - Deploy fully integrated AI web app straight from your deployment in Azure AI Foundry. 
 
+## Model Context Protocol (MCP) servers
+
+Host [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) in your web applications:
+
+- [Host a .NET MCP server on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-dotnet) - Deploy an MCP server with .NET.
+- [Host a Node.js MCP server on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-node) - Deploy an MCP server with Node.js.
+- [Host a Python MCP server on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-python) - Deploy an MCP server with Python.
+- [Host a Pyton MCP server with key-based authorization on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-python-auth) - Deploy an MCP server with Python and key-based authorization.
+- [Host a Pyton MCP server with OAuth 2.0 authorization on Azure App Service](https://github.com/Azure-Samples/remote-mcp-webapp-python-auth-oauth) - Deploy an MCP server with Python and [Open Authorization (OAuth) 2.0 authorization with Micrososft Entra ID](/entra/architecture/auth-oauth2).
+
 ## More resources
 
 - [Azure OpenAI Service documentation](/azure/ai-services/openai/)

articles/application-gateway/configuration-http-settings.md

@@ -77,7 +77,7 @@ By default, the Application Gateway resource includes popular CA certificates, a
 
 ### Request timeout
 
-This setting is the number of seconds that the application gateway waits to receive a response from the backend server.
+This setting is the number of seconds that the application gateway waits to receive a response from the backend server. The default value is 20 seconds. However, you may wish to adjust this setting to the needs of your application.
 
 ### Override backend path
 

articles/application-gateway/configuration-listeners.md

@@ -85,7 +85,9 @@ $gw.EnableHttp2 = $true
 Set-AzApplicationGateway -ApplicationGateway $gw
 ```
 
-You can also enable HTTP2 support using the Azure portal by selecting **Enabled** under **HTTP2** in Application gateway > Configuration. 
+> [!IMPORTANT]
+> When creating an application gateway resource through the Azure portal, the default option for **HTTP2** is set as enabled. You can choose **Disabled** during creation, and re-enabled HTTP2 support using the Azure portal by selecting **Enabled** under **HTTP2** in **Application gateway > Configuration**.
+>
 
 ### WebSocket support
 

articles/application-gateway/key-vault-certs.md

@@ -121,7 +121,8 @@ For Cert name, type a friendly name for the certificate to be referenced in Key
 Once selected, select  **Add** (if creating) or **Save** (if editing) to apply the referenced Key Vault certificate to the listener.
 
 #### Key Vault Azure role-based access control permission model
-Application Gateway supports certificates referenced in Key Vault via the Role-based access control permission model. The first few steps to reference the Key Vault must be completed via ARM template, Bicep, CLI, or  PowerShell.
+
+Application Gateway supports certificates referenced in Key Vault via the Role-based access control permission model. The first few steps to reference the Key Vault must be completed via ARM template, Bicep, CLI, or PowerShell. During this process, a managed identity containing the proper Role-based access control permissions is utilized.
 
 > [!Note]
 > Specifying Azure Key Vault certificates that are subject to the role-based access control permission model is not supported via the portal.
@@ -140,7 +141,7 @@ Add-AzApplicationGatewaySslCertificate -KeyVaultSecretId $secretId -ApplicationG
 # Commit the changes to the Application Gateway
 Set-AzApplicationGateway -ApplicationGateway $appgw
 ```
-
+> 
 Once the commands have been executed, you can navigate to your Application Gateway in the Azure portal and select the Listeners tab.  Click Add Listener (or select an existing) and specify the Protocol to HTTPS.
 
 Under **Choose a certificate** select the certificate named in the previous steps.  Once selected, select  *Add* (if creating) or *Save* (if editing) to apply the referenced Key Vault certificate to the listener.

articles/automation/add-user-assigned-identity.md

@@ -7,6 +7,8 @@ ms.custom: devx-track-azurepowershell
 ms.date: 08/16/2024
 ms.topic: how-to 
 ms.service: azure-automation
+ms.author: v-jasmineme
+author: jasminemehndir
 ---
 
 # Using a user-assigned managed identity for an Azure Automation account

articles/automation/automation-alert-metric.md

@@ -4,6 +4,8 @@ description: This article describes how to setup a metric alert based on runbook
 services: automation
 ms.date: 08/10/2020
 ms.topic: how-to
+ms.author: v-jasmineme
+author: jasminemehndir
 ---
 # Monitor runbooks with metric alerts