Merge branch 'main' into release-aio-2507

Author: v-alje

articles/api-center/register-discover-mcp-server.md

@@ -65,6 +65,8 @@ You can use the following lightweight OpenAPI 3.0 API definition for your MCP se
 
 Set up the [API Center portal](set-up-api-center-portal.md) so that developers and other stakeholders in your organization can discover MCP servers in your API inventory. Users can browse and filter MCP servers in the inventory and view details such as the URL endpoint of the MCP server, if available in the MCP server's API definition. 
 
+For a live example of how Azure API Center can power your private, enterprise-ready MCP registry, visit [https://mcp.azure.com](https://mcp.azure.com).
+
 :::image type="content" source="media/register-discover-mcp-server/mcp-server-portal-small.png" lightbox="media/register-discover-mcp-server/mcp-server-portal.png" alt-text="Screenshot of MCP server in API Center portal.":::
 
 > [!NOTE]

articles/application-gateway/for-containers/web-application-firewall.md

@@ -59,7 +59,6 @@ spec:
 The following functionality is not supported on a WAF Policy associated with Application Gateway for Containers:
 
 * WAF Security Copilot
-* WAF Security Copilot – Embedded
 * JavaScript (JS) Challenge Actions
 * CRS 3.2 and lower ruleset
 

articles/azure-functions/container-concepts.md

@@ -73,9 +73,24 @@ When creating your own containers, you're required to keep the base image of you
 
 The Functions team is committed to publishing monthly updates for these base images. Regular updates include the latest minor version updates and security fixes for both the Functions runtime and languages. You should regularly update your container from the latest base image and redeploy the updated version of your container. 
 
-When the base image is managed by Functions, such as in a standard deployment on Linux, your app is kept up to date automatically by the regular base image updates released by the Functions team. For such noncustomized containers, your app gets updated to run on the base image that has the new minor version or patched version of the host runtime. 
+Choose your base image based on the language stack you're using in your function app. The following table provides examples for each stack. In general, the tag should start with `4-` to indicate the V4 Functions runtime. When new minor versions are released, this tag will be updated to point to the new version. As you periodically rebuild your custom image, you will pull the new versions through that same tag, allowing your app to have the same updates. You shouldn't use tags that specify minor runtime versions, as these will not receive updates, and your app will potentially remain on an unpatched version, no matter how often you rebuild your custom image.
 
-When you create or deploy your own containerized app using a custom image, you're responsible for making sure that your custom image staying up-to-date with our released base images. In addition to new features and improvements, these base image updates can also include security updates that are critical for your app. To ensure your app is protected, you make sure you're staying up to date.
+| Language Stack | Example recommended base image tags |
+|----------------|----------------|
+| .NET (isolated worker model) | `mcr.microsoft.com/azure-functions/dotnet-isolated:4-dotnet-isolated8.0` or<br/>`mcr.microsoft.com/azure-functions/dotnet-isolated:4-dotnet-isolated8.0-appservice`<br/><br/>(These examples target .NET 8. Select the appropriate image for the .NET version you need.) |
+| .NET (legacy in-process model) | `mcr.microsoft.com/azure-functions/dotnet:4-dotnet8.0` or<br/>`mcr.microsoft.com/azure-functions/dotnet:4-dotnet8.0-appservice`<br/><br/>(Support will end for the in-process model on November 10, 2026. You should [migrate to the isolated worker model](https://aka.ms/af-dotnet-isolated-migration) as soon as possible.) |
+| Java | `mcr.microsoft.com/azure-functions/java:4-java21` or<br/>`mcr.microsoft.com/azure-functions/java:4-java21-appservice`<br/><br/>(These examples target Java 21. Select the appropriate image for the Java version you need.) |
+| Node.js (JavaScript or TypeScript) | `mcr.microsoft.com/azure-functions/node:4-node22` or<br/>`mcr.microsoft.com/azure-functions/node:4-node22-appservice`<br/><br/>(These examples target Node.js 22. Select the appropriate image for the Node.js version you need.) |
+| PowerShell | `mcr.microsoft.com/azure-functions/powershell:4-powershell7.4` or<br/>`mcr.microsoft.com/azure-functions/powershell:4-powershell7.4-appservice`<br/><br/>(These examples target PowerShell 7.4. Select the appropriate image for the PowerShell version you need.) |
+| Python | `mcr.microsoft.com/azure-functions/python:4-python3.12` or<br/>`mcr.microsoft.com/azure-functions/python:4-python3.12-appservice`<br/><br/>(These examples target Python 3.12. Select the appropriate image for the Python version you need.) |
+| Custom handlers / other | `mcr.microsoft.com/azure-functions/base:4` or<br/>`mcr.microsoft.com/azure-functions/base:4-appservice` |
+
+Base images ending in `-appservice` enable SSH and remote debugging from the platform. Unless you need these capabilities, you can use the base images without the `-appservice` suffix.
+
+> [!IMPORTANT]
+> It isn't sufficient to just have one of the above tags in your Dockerfile. You need to regularly pull the latest image from that tag so that your custom image can be rebuilt to include the latest updates. If you don't pull the latest image and rebuild, your app will continue to run on the old base image.
+
+When you create or deploy your own containerized app using a custom image, you're responsible for making sure that your custom image staying up-to-date with our released base images. In addition to new features and improvements, these base image updates can also include security updates that are critical for your app. To ensure your app is protected, make sure you're staying up to date. You should regularly pull the latest version of the base image, rebuild your custom container image, and redeploy your app to use it.
 
 In some cases, we're required to make platform-level changes that could mean that an app in a custom container using an old base image might stop working properly. For such major changes, we roll out updated images well in advance so that apps that take regular updates aren't negatively impacted. To avoid potential problems with your apps running in custom containers, make sure you don't fall too far behind the latest minor version released. During a support case, should we determine that your app is experiencing problems because it's on an older or unsupported version, we do request that you update your container to the latest base image version before continuing with support.
 

articles/azure-functions/functions-reference-java.md

@@ -150,7 +150,7 @@ The following table shows current supported Java versions for each major version
 
 | Functions version | Java versions (Windows) | Java versions (Linux) |
 | ----- | ----- | --- |
-| 4.x | 17 <br/>11 <br/>8 | 21 (Preview) <br/>17 <br/>11 <br/>8 |
+| 4.x | 21 <br/>17 <br/>11 <br/>8 | 21 <br/>17 <br/>11 <br/>8 |
 | 3.x | 11 <br/>8 | 11 <br/>8 |
 | 2.x | 8 | n/a |
 
@@ -162,7 +162,7 @@ You can control the version of Java targeted by the Maven archetype by using the
 
 The Maven archetype generates a pom.xml that targets the specified Java version. The following elements in pom.xml indicate the Java version to use:
 
-| Element |  Java 8 value | Java 11 value | Java 17 value | Java 21 value (Preview, Linux) | Description |
+| Element |  Java 8 value | Java 11 value | Java 17 value | Java 21 value | Description |
 | ---- | ---- | ---- | ---- | ---- | --- |
 | **`Java.version`** | 1.8 | 11 | 17 | 21 | Version of Java used by the maven-compiler-plugin. |
 | **`JavaVersion`** | 8 | 11 | 17 | 21 | Java version hosted by the function app in Azure. |

articles/baremetal-infrastructure/workloads/nc2-on-azure/faq.md

@@ -15,22 +15,6 @@ ms.service: azure-baremetal-infrastructure
 
 This article addresses questions most frequently asked about NC2 on Azure.
 
-## How does the 30-day free trial work?
-
-To help you evaluate NC2 on Azure, Nutanix offers and manages a 30-day free trial. You can sign up for the trial with Nutanix. 
-
-The following details are important considerations for Nutanix on Azure BareMetal nodes:
-
-**Cost coverage**: The BareMetal cluster nodes have no cost through the trial. Other components like VMs for Flow Gateway networking and other Azure services are billed and not included in the trial.
-
-**Trial duration**: The trial begins with the initial hardware node deployment and lasts for 30 consecutive days. It can't be paused, and the start date is fixed regardless of cluster activity. Even if the cluster is dropped, the trial time continues.
-
-**One-time opportunity**: The trial is a one-time offer. If you deploy a cluster after the initial 30-day trial period, regardless of the timeframe, the trial doesn't reset, and you'll be billed. Creating a cluster in a different subscription does not reset your trial timing.
-
-**Track the trial period**: There's no visible trial information for the BareMetal. You should track your BareMetal deployment date manually.
-
-For more information, see _*[Starting a Free Trial for NC2 ](https://portal.nutanix.com/page/documents/details?targetId=Nutanix-Cloud-Clusters-Azure:nc2-clusters-starting-a-nc2-free-trial-t.html"https://portal.nutanix.com/page/documents/details?targetid=nutanix-cloud-clusters-azure:nc2-clusters-starting-a-nc2-free-trial-t.html")*_
-
 ## What is Hyperconverged Infrastructure (HCI)?
 
 Hyper-converged infrastructure (HCI) uses locally attached storage resources to combine common data center hardware with intelligent software to create flexible building blocks that replace legacy infrastructure consisting of separate servers, storage networks, and storage arrays. [Video explanation](https://www.youtube.com/watch?v=OPYA5-V0yRo)