Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afd-faq

Author: halkazwini

articles/azure-cache-for-redis/TOC.yml

@@ -35,17 +35,21 @@
     items:
     - name: Overview
       href: /azure/redis/migrate/migrate-basic-standard-premium-overview
-    - name: Understand
+    - name: Understand differences
       href: /azure/redis/migrate/migrate-basic-standard-premium-understand
-    - name: Self-service
+    - name: Explore migration options
+      href: /azure/redis/migrate/migrate-basic-standard-premium-options
+    - name: Self-service migration
       href: /azure/redis/migrate/migrate-basic-standard-premium-self-service
+    - name: Migration using tooling
+      href: /azure/redis/migrate/migrate-basic-standard-premium-with-tooling
   - name: Migrate Enterprise tier to Azure Managed Redis
     items:
     - name: Overview
       href: /azure/redis/migrate/migrate-redis-enterprise-overview
-    - name: Understand
+    - name: Understand differences
       href: /azure/redis/migrate/migrate-redis-enterprise-understand
-    - name: Self-service
+    - name: Self-service migration
       href: /azure/redis/migrate/migrate-redis-enterprise-self-service
   - name: Migrate to Azure Redis from other caches
     href: cache-migration-guide.md

articles/azure-cache-for-redis/cache-whats-new.md

@@ -15,6 +15,10 @@ appliesto:
 
 Find out what's new in Azure Redis.
 
+## April 2026
+
+### Tooling to migrate Azure Cache for Redis instance to Azure Managed Redis (preview)
+Tooling to aid migration from Azure Cache for Redis (Basic, Standard, and Premium) is now available in Public Preview. When migration is initiated using the tooling, your Azure Cache for Redis endpoint is updated to point to your precreated Azure Managed Redis. For more information, see [Migration using tooling](/azure/redis/migrate/migrate-basic-standard-premium-with-tooling).
 
 ## October 2025
 

articles/azure-functions/scenario-custom-remote-mcp-server.md

@@ -1,7 +1,7 @@
 ---
 title: Build a custom remote MCP server using Azure Functions
 description: "Learn how to create and deploy a custom Model Context Protocol (MCP) server using Azure Functions. This quickstart uses the Azure Developer CLI to deploy an MCP server project that enables AI clients to access custom tools hosted on Azures Flex Consumption plan."
-ms.date: 12/01/2025
+ms.date: 04/06/2026
 ms.update-cycle: 180-days
 ms.topic: quickstart
 ai-usage: ai-assisted
@@ -85,7 +85,7 @@ Use the `azd init` command to create a local Azure Functions code project from a
     azd init --template remote-mcp-functions-dotnet -e mcpserver-dotnet
     ```
 
-    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-dotnet) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also used in the name of the resource group you create in Azure.       
+    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-dotnet) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also part of the name of the resource group you create in Azure.       
 ::: zone-end  
 ::: zone pivot="programming-language-java"  
 2. In your local terminal or command prompt, run this `azd init` command:
@@ -94,7 +94,7 @@ Use the `azd init` command to create a local Azure Functions code project from a
     azd init --template remote-mcp-functions-java -e mcpserver-java 
     ```
 
-    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-java) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also used in names of the resources you create in Azure. 
+    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-java) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also part of the names of the resources you create in Azure. 
 ::: zone-end  
 ::: zone pivot="programming-language-typescript"  
 2. In your local terminal or command prompt, run this `azd init` command:
@@ -103,7 +103,7 @@ Use the `azd init` command to create a local Azure Functions code project from a
     azd init --template remote-mcp-functions-typescript -e mcpserver-ts
     ```
 
-    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-typescript) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also used in names of the resources you create in Azure.   
+    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-typescript) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also part of the names of the resources you create in Azure.   
 ::: zone-end
 ::: zone pivot="programming-language-python"  
 2. In your local terminal or command prompt, run this `azd init` command:
@@ -112,7 +112,7 @@ Use the `azd init` command to create a local Azure Functions code project from a
     azd init --template remote-mcp-functions-python -e mcpserver-python
     ```
 
-    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-python) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also used in names of the resources you create in Azure. 
+    This command pulls the project files from the [template repository](https://github.com/Azure-Samples/remote-mcp-functions-python) and initializes the project in the current folder. The `-e` flag sets a name for the current environment. In `azd`, the environment maintains a unique deployment context for your app, and you can define more than one. It's also part of the names of the resources you create in Azure. 
 ::: zone-end
 ::: zone pivot="programming-language-csharp,programming-language-java,programming-language-python,programming-language-typescript" 
 ## Start the storage emulator
@@ -198,9 +198,9 @@ You can view the complete project template in the [Azure Functions Java MCP Serv
 ::: zone pivot="programming-language-python"
 The function code for the MCP server tools is defined in the `src/function_app.py` file. The MCP function annotations expose these functions as MCP Server tools:
 
-<!-- :::code language="python" source="~/functions-scenarios-custom-mcp-python/src/function_app.py" range="30-33" ::: -->
+:::code language="python" source="~/functions-scenarios-custom-mcp-python/src/FunctionsMcpTool/function_app.py" range="18-25" ::: 
 
-<!-- :::code language="python" source="~/functions-scenarios-custom-mcp-python/src/function_app.py" range="36-60" ::: -->
+:::code language="python" source="~/functions-scenarios-custom-mcp-python/src/FunctionsMcpTool/function_app.py" range="28-42" ::: 
 
 You can view the complete project template in the [Azure Functions Python MCP Server](https://github.com/Azure-Samples/remote-mcp-functions-python) GitHub repository.
 ::: zone-end   

articles/azure-functions/scenario-mcp-apps.md

@@ -1,7 +1,7 @@
 ---
 title: Build an MCP Apps server using Azure Functions
 description: "Learn how to create and deploy an MCP App that returns interactive UI using Azure Functions. This quickstart uses the Azure Developer CLI to deploy an MCP App project that enables AI clients to access tools with rich interactive interfaces hosted on Azure's Flex Consumption plan."
-ms.date: 02/25/2026
+ms.date: 04/06/2026
 ms.update-cycle: 180-days
 ms.topic: quickstart
 ai-usage: ai-assisted
@@ -248,17 +248,17 @@ The `GetWeatherWidget` function serves the bundled HTML file at that URI using `
 You can view the complete project template in the [Azure Functions .NET MCP Server](https://github.com/Azure-Samples/remote-mcp-functions-dotnet) GitHub repository.
 ::: zone-end  
 ::: zone pivot="programming-language-python"
-The function code for the MCP Apps weather tool is defined in the `src/function_app.py` file. In this function, the `metadata` parameter on `@app.mcp_tool()` adds UI metadata to the `get_weather` tool.
+The function code for the MCP Apps weather tool is defined in the `src/McpWeatherApp/function_app.py` file. In this function, the `metadata` parameter on `@app.mcp_tool()` adds UI metadata to the `get_weather` tool.
 
-<!-- :::code language="python" source="~/functions-scenarios-custom-mcp-python/src/function_app.py" range="109-130" ::: -->
+:::code language="python" source="~/functions-scenarios-custom-mcp-python/src/McpWeatherApp/function_app.py" range="70-92" :::
 
 The `@app.mcp_resource_trigger()` decorator is applied to the `get_weather_widget` function, which serves the HTML widget.
 
-<!-- :::code language="python" source="~/functions-scenarios-custom-mcp-python/src/function_app.py" range="64-105" ::: -->
+:::code language="python" source="~/functions-scenarios-custom-mcp-python/src/McpWeatherApp/function_app.py" range="27-67" ::: 
 
 The `TOOL_METADATA` constant declares a `ui.resourceUri` that tells the MCP host to fetch the interactive UI from `ui://weather/index.html` after the tool runs.
 
-<!-- :::code language="python" source="~/functions-scenarios-custom-mcp-python/src/function_app.py" range="20-21" ::: -->
+:::code language="python" source="~/functions-scenarios-custom-mcp-python/src/McpWeatherApp/function_app.py" range="21" ::: 
 
 The `get_weather_widget` function serves the bundled HTML file at that URI using `@app.mcp_resource_trigger()`.