Merge pull request #313118 from MicrosoftDocs/main

Auto Publish – main to live - 2026-03-13 11:00 UTC

Author: learn-build-service-prod[bot]

articles/azure-functions/TOC.yml

@@ -273,6 +273,8 @@
     - name: Availability zones and disaster recovery
       displayName: availability zones, high-availability, zone redundancy, disaster recovery
       href: /azure/reliability/reliability-functions?toc=/azure/azure-functions/toc.json&bc=/azure/azure-functions/breadcrumb/toc.json
+    - name: Zone redundancy
+      href: functions-zone-redundancy.md
     - name: Migrate to a zone-redundant plan
       href: /azure/reliability/migrate-functions?toc=%2fazure%2fazure-functions%2ftoc.json
   - name: Diagnostics

articles/azure-functions/functions-how-to-custom-container.md

@@ -1,7 +1,7 @@
 ---
 title: Work with Azure Functions in Containers
 description: Learn how to work with containerized function apps running in Linux containers in an Azure Container Apps environment.
-ms.date: 02/25/2026
+ms.date: 03/13/2026
 ms.topic: how-to
 zone_pivot_groups: functions-container-hosting
 ms.custom:
@@ -99,6 +99,15 @@ The Azure Functions extension for Visual Studio Code creates your Dockerfile whe
 
 ---
 
+## Create a custom Dockerfile
+
+Instead of using a generated Dockerfile, you can manually create one when you need more control over your container image. The [custom-container](https://github.com/Azure/azure-functions-docker/tree/dev/custom-container) folder of the `azure-functions-docker` repository provides these templates to get you started:
+
+| Template | Description |
+|----------|-------------|
+| [template.Dockerfile](https://github.com/Azure/azure-functions-docker/blob/dev/custom-container/template.Dockerfile) | A commented, step-by-step guide for building a custom container. It includes instructions for multiple language runtimes (Java, .NET isolated, Node.js, PowerShell, Python), optional CA certificate installation, running as a non-root user, and enabling SSH for Kudu debugging. |
+| [sample.Dockerfile](https://github.com/Azure/azure-functions-docker/blob/dev/custom-container/sample.Dockerfile) | A ready-to-use example built from the template that creates a Java-based Azure Functions container with SSH enabled for Kudu debugging. |
+
 ## Create your function app in a container
 
 With a Functions-generated Dockerfile in your code project, you can use Docker to create the containerized function app on your local computer. The following `docker build` command creates an image of your containerized functions from the project in the local directory:

articles/azure-functions/functions-networking-options.md

@@ -128,6 +128,13 @@ In a terminal window, go to the `FunctionsMcpTool` project folder:
 cd src/FunctionsMcpTool
 ```
 ::: zone-end  
+::: zone pivot="programming-language-java"  
+In a terminal window, go to the `FunctionsMcpTool` project folder:
+
+```console
+cd samples/FunctionsMcpTool
+```
+::: zone-end  
 ::: zone pivot="programming-language-csharp,programming-language-java,programming-language-python,programming-language-typescript" 
 
 [!INCLUDE [run-locally](../../includes/functions-mcp-run-locally.md)] 
@@ -180,11 +187,11 @@ The function code for the MCP server tools is defined in the `src` folder. The `
 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-java"
-The function code for the MCP server tools is defined in the `src/main/java/com/function/` folder. The `@McpToolTrigger` annotation exposes the functions as MCP Server tools:
+The function code for the MCP server tools is defined in the `samples/FunctionsMcpTool/src/main/java/com/function/` folder. The `@McpToolTrigger` annotation exposes the functions as MCP Server tools:
 
-<!- :::code language="java" source="~/functions-scenarios-custom-mcp-java/src/main/java/com/function/HelloWorld.java" range="35-51" ::: >
+:::code language="java" source="~/functions-scenarios-custom-mcp-java/samples/FunctionsMcpTool/src/main/java/com/function/HelloWorld.java" range="26-40" :::
 
-<!- :::code language="java" source="~/functions-scenarios-custom-mcp-java/src/main/java/com/function/Snippets.java" range="80-118" ::: >
+:::code language="java" source="~/functions-scenarios-custom-mcp-java/samples/FunctionsMcpTool/src/main/java/com/function/Snippets.java" range="50-83" :::
 
 You can view the complete project template in the [Azure Functions Java MCP Server](https://github.com/Azure-Samples/remote-mcp-functions-java) GitHub repository.
 ::: zone-end  

articles/azure-functions/functions-zone-redundancy.md

@@ -9,8 +9,6 @@ ms.custom: sfi-image-nochange
 # Customer intent: "As a cloud architect, I want to create an Azure VMware Solution assessment for on-premises VMs so that I can evaluate migration options and ensure compatibility with Azure's infrastructure."
 ---
 
-
-
 # Create an Azure VMware Solution assessment
 
 This article describes how to create an Azure VMware Solution assessment for on-premises VMs in a VMware vSphere environment with Azure Migrate: Discovery and assessment.
@@ -110,7 +108,7 @@ There are two types of sizing criteria that you can use to create Azure VMware S
 1. In **Review + create assessment**, review the assessment details, and select **Create** to run the assessment.
 
     > [!NOTE]
-    > For discovering data using the Azure migrate appliance for creating assessments, we recommend that you wait at least a day after starting discovery before you create an assessment. This provides time to collect performance data with higher confidence. Ideally, after you start discovery, wait for the performance duration you specify (day/week/month) for a high [performance coverage](/azure/migrate/concepts-assessment-calculation?view=migrate#coverage).
+    > For discovering data using the Azure migrate appliance for creating assessments, we recommend that you wait at least a day after starting discovery before you create an assessment. This provides time to collect performance data with higher confidence. Ideally, after you start discovery, wait for the performance duration you specify (day/week/month) for a high performance coverage.
 
     :::image type="content" source="./media/tutorial-assess-vmware-azure-vmware-solution/assessment-overview-v2.png" alt-text="Screenshot showing an overview of an Azure VMware Solution assessment." lightbox="./media/tutorial-assess-vmware-azure-vmware-solution/assessment-overview-v2.png" :::
 

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

@@ -83,8 +83,6 @@ items:
         href: tutorial-discover-physical.md
       - name: Support matrix for Physical server discovery
         href: migrate-support-matrix-physical.md
-    # - name: Appliance configuration
-    #   items:
     - name: Deep discover database workloads
       items:
       - name: SQL instances
@@ -219,18 +217,6 @@ items:
           href: create-file-share-assessment.md
         - name: Review assessment report
           href: review-file-share-assessment.md
-#     - name: AVS assessment
-#       items:
-#       - name: Create an AVS assessment
-#         href: tutorial-assess-vmware-azure-vmware-solution.md
-#       - name: Customize assessment settings
-#         href: assessment-properties.md
-#       - name: Review assessment report
-#         href: review-azure-vmware-solution-assessment.md
-#      - name: SAP assessment
-#       items:
-#       - name: Review assessment report
-#         href: review-sap-assessment.md
   - name: Wave planning
     items:
     - name: Overview
@@ -263,12 +249,6 @@ items:
       href: ../site-recovery/vmware-physical-azure-support-matrix.md?toc=/azure/migrate/toc.json
     - name: Hyper-V migration requirements
       href: migrate-support-matrix-hyper-v-migration.md
-  # - name: Agent-based migrations
-  #   items:
-  #   - name: Hydration process 
-  #     href: hydration-process.md
-  #   - name: Agentless migrations using scripts
-  #     href: tutorial-migrate-vmware-powershell.md
 - name: Modernize applications
   items:
   - name: Overview of Web App Migration and Modernization
@@ -301,8 +281,6 @@ items:
           href: /azure/azure-local/migrate/migration-azure-migrate-vmware-overview?toc=/azure/migrate/toc.json
     - name: Migrate Hyper-V servers 
       items:
-#       - name: Create Business case and assessment
-#         href: tutorial-assess-hyper-v.md        
         - name: Assess large number of servers in Hyper-V environment
           href: scale-hyper-v-assessment.md
         - name: Migrate to Azure Cloud
@@ -322,16 +300,8 @@ items:
           href: tutorial-discover-aws.md
         - name: Discover GCP inventory
           href: tutorial-discover-gcp.md
-  #     - name: Create Business case and assessment
-  #       href: tutorial-assess-aws.md
         - name: Migrate AWS EC2 to Azure
           href: tutorial-migrate-aws-virtual-machines.md
-  # - name: Migrate SAP applications
-  #   items:
-  #  - name: Discover SAP systems (preview)
-  #    href: tutorial-discover-sap-systems.md
-  #   - name: Assess SAP systems for migration (preview)
-  #     href: tutorial-assess-sap-systems.md
 - name: How-to
   items:
   - name: Discover and assess using Azure Private Link
@@ -364,14 +334,6 @@ items:
     items:
     - name: Enable application and code assessment
       href: appcat/index.yml
-#   - name: Assess a SQL Server database
-#     href: /sql/dma/dma-assess-sql-data-estate-to-sqldb
-#   - name: Create SQL assessment
-#     href: how-to-create-sql-assessment.md
-#   - name: Review SQL assessment
-#     href: how-to-review-sql-assessment.md
-#   - name: Customize an assessment
-#     href: how-to-modify-assessment.md
     - name: Scale assessment
       items:
       - name: Assess large number of servers in VMware environment
@@ -511,78 +473,6 @@ items:
     href: https://azure.microsoft.com/products/azure-migrate
   - name: Azure Roadmap
     href: https://azure.microsoft.com/updates/
-  # - name: Assess
-  #   items:
-  #   - name: Assess servers in VMware environment
-  #     items:
-  #   - name: Assess servers in Hyper-V environment 
-  #     items:
-  #     - name: Assess physical servers
-  #     items:
-  #   - name: Assess GCP instances for migration to Azure
-  #     href: tutorial-assess-gcp.md
-  #   - name: Assess web apps for migration to Azure Kubernetes Service (AKS)
-  #     href: tutorial-assess-aspnet-aks.md
-  #   - name: Assess web apps for migration to Azure App Service
-  #     href: tutorial-assess-webapps.md
-  # - name: Migrate
-  #   items:
-  #   - name: Migrate servers in VMware environment
-  #     items:
-  #   - name: Migrate GCP instances
-  #     href: tutorial-migrate-gcp-virtual-machines.md
-  # - name: Modernize
-  #   items:
-# - name: Concepts
-#   items:
-#   - name: General
-#     items:
-#   - name: Security
-#     items:
-#   - name: Discover
-#     items:
-#     - name: Dependency analysis overview
-#       href: concepts-dependency-visualization.md
-#   - name: Decide
-#     items:
-#   - name: Assess
-#     items:
-#     - name: Assessments overview (migrate to Azure SQL)
-#       href: concepts-azure-sql-assessment-calculation.md
-#   - name: Migrate
-#     items:
-#     - name: Build a migration plan
-#       href: concepts-migration-planning.md
-#     - name: Physical server migration support
-#       href: migrate-support-matrix-physical-migration.md
-#     - name: Replication appliance requirements
-#       href: migrate-replication-appliance.md
-#       items:
-#         - name: Prepare for VMware agentless migration
-#           href: prepare-for-agentless-migration.md
-#     - name: Web apps migration support
-#       href: concepts-migration-webapps.md
-#   - name: Discover
-#     items:
-#     - name: Deploy the Azure Migrate appliance
-#       items:
-#       - name: Deploy appliance with template (VMware)
-#         href: how-to-set-up-appliance-vmware.md
-#       - name: Deploy appliance with template (Hyper-V)
-#         href: how-to-set-up-appliance-hyper-v.md
-#   - name: Assess
-#     items:
-#     - name: Azure Migrate application and code assessment
-#       href: appcat/index.yml
-#     - name: Group machines for assessment
-#       href: how-to-create-a-group.md
-#     - name: Create an Azure SQL assessment
-#       href: how-to-create-azure-sql-assessment.md
-#     - name: Create an Azure App Service assessment
-#       href: how-to-create-azure-app-service-assessment.md
+
 #     - name: Create an AVS assessment
-#       href: how-to-create-azure-vmware-solution-assessment.md
-#   - name: Migrate
-#     items:
-#     - name: Add migration tools
-#       href: how-to-migrate.md
+#       href: how-to-create-azure-vmware-solution-assessment.md

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

@@ -8,7 +8,7 @@ ms.date: 11/11/2024
 ms.author: glenga
 ---
 
-| Feature |[Flex Consumption plan](../articles/azure-functions/flex-consumption-plan.md)|[Consumption plan](../articles/azure-functions/consumption-plan.md)|[Premium plan](../articles/azure-functions/functions-premium-plan.md)|[Dedicated plan](../articles/azure-functions/dedicated-plan.md)/[ASE](../articles/app-service/environment/intro.md)|[Container Apps](../articles/container-apps/functions-overview.md)<sup>1</sup> |  
+| Feature |[Flex Consumption plan](../articles/azure-functions/flex-consumption-plan.md)|[Consumption plan](../articles/azure-functions/consumption-plan.md)|[Premium plan](../articles/azure-functions/functions-premium-plan.md)|[Dedicated plan](../articles/azure-functions/dedicated-plan.md)/[ASE](../articles/app-service/environment/overview.md)|[Container Apps](../articles/container-apps/functions-overview.md)<sup>1</sup> |  
 |----------------|-----------|----------------|---------|---------------| ---| 
 |[Inbound IP restrictions](../articles/azure-functions/functions-networking-options.md#inbound-networking-features)|✔|✔|✔|✔|✔| 
 |[Inbound Private Endpoints](../articles/azure-functions/functions-networking-options.md#inbound-networking-features)|✔| |✔|✔| |  

articles/migrate/how-to-create-azure-vmware-solution-assessment.md

@@ -15,4 +15,4 @@ If you want to make calls to Private Endpoints, then you must make sure that you
 * Manage the private endpoint in the DNS server used by your app. To manage a private endpoint, you must know the endpoint address and use an A record to reference the endpoint you're trying to reach.
 * Configure your own DNS server to forward to [Azure DNS private zones](../articles/dns/private-dns-privatednszone.md).
 
-To learn more, see [using Private Endpoints for Web Apps](../articles/app-service/networking/private-endpoint.md).
+To learn more, see [using Private Endpoints for Web Apps](../articles/app-service/overview-private-endpoint.md).