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

Author: v-stsavell

articles/api-management/inject-vnet-v2.md

@@ -54,14 +54,7 @@ If you want to enable *public* inbound access to an API Management instance in t
 * Minimum: /27 (32 addresses)
 * Recommended: /24 (256 addresses) - to accommodate scaling of API Management instance
 
-### Network security group
-
-A network security group must be associated with the subnet. 
-
-* Configure an outbound NSG rule to allow access to Azure Storage on port 443. 
-* Configure other rules to meet your organization's network access requirements. 
-
-To set up a network security group, see [Create a network security group](../virtual-network/manage-network-security-group.md).
+[!INCLUDE [api-management-virtual-network-v2-nsg-rules](../../includes/api-management-virtual-network-v2-nsg-rules.md)]
 
 ### Subnet delegation
 

articles/api-management/integrate-vnet-outbound.md

@@ -5,7 +5,7 @@ author: dlepow
 ms.author: danlep
 ms.service: azure-api-management
 ms.topic: how-to 
-ms.date: 04/03/2025
+ms.date: 06/16/2025
 ---
 
 # Integrate an Azure API Management instance with a private virtual network for outbound connections 
@@ -46,9 +46,7 @@ If you want to inject a Premium v2 (preview) API Management instance into a virt
 * Minimum: /27 (32 addresses)
 * Recommended: /24 (256 addresses) - to accommodate scaling of API Management instance
 
-### Network security group
-
-A network security group must be associated with the subnet. Configure any network security group rules that you need for the gateway to access your API backends. Network security groups (NSG) can also be used to block outbound traffic to the internet and access only resources in your virtual network. To set up a network security group, see [Create a network security group](../virtual-network/manage-network-security-group.md).
+[!INCLUDE [api-management-virtual-network-v2-nsg-rules](../../includes/api-management-virtual-network-v2-nsg-rules.md)]
 
 ### Subnet delegation
 

articles/app-service/quickstart-arm-template.md

@@ -25,8 +25,6 @@ To complete this quickstart, you need an Azure account with an active subscripti
 
 If you're familiar with using ARM templates, you can skip to the end by selecting this :::image type="content" source="~/reusable-content/ce-skilling/azure/media/template-deployments/deploy-to-azure-button.svg" alt-text="Button to deploy the Resource Manager template to Azure." border="false" link="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fapp-service-docs-windows%2Fazuredeploy.json"::: button. This button opens the ARM template in the Azure portal. 
 
-:::image type="content" source="media/quickstart-arm/create-windows-code.png" alt-text="Screenshot of the ARM Template in the Azure portal.":::
-
 In the Azure portal, select **Create new** to create a new Resource Group and then select the **Review + create** button to deploy the app.
 
 ::: zone-end
@@ -39,8 +37,6 @@ To complete this quickstart, you need an Azure account with an active subscripti
 
 If you're familiar with using ARM templates, you can skip to the end by selecting this :::image type="content" source="~/reusable-content/ce-skilling/azure/media/template-deployments/deploy-to-azure-button.svg" alt-text="Button to deploy the Resource Manager template to Azure." border="false" link="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fapp-service-docs-linux%2Fazuredeploy.json"::: button. This button opens the ARM template in the Azure portal. 
 
-:::image type="content" source="media/quickstart-arm/create-linux.png" alt-text="Screenshot of the ARM Template in the Azure portal.":::
-
 In the Azure portal, select **Create new** to create a new Resource Group and then select the **Review + create** button to deploy the app.
 ::: zone-end
 ::: zone pivot="platform-windows-container"
@@ -50,8 +46,6 @@ Get started with [Azure App Service](overview.md) by deploying an app to the clo
 
 If you're familiar with using ARM templates, you can skip to the end by selecting this :::image type="content" source="~/reusable-content/ce-skilling/azure/media/template-deployments/deploy-to-azure-button.svg" alt-text="Button to deploy the Resource Manager template to Azure." border="false" link="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fapp-service-docs-windows-container%2Fazuredeploy.json"::: button. This button opens the ARM template in the Azure portal. 
 
-:::image type="content" source="media/quickstart-arm/create-windows-container.png" alt-text="Screenshot of the ARM Template in the Azure portal.":::
-
 In the Azure portal, select **Create new** to create a new Resource Group and then select the **Review + create** button to deploy the app.
 ::: zone-end
 
@@ -97,7 +91,7 @@ This template contains several parameters that are predefined for your convenien
 | appServicePlanName | string  | `webAppPlan-<uniqueString>` | App Service Plan name based on a [unique string value](../azure-resource-manager/templates/template-functions-string.md#uniquestring) |
 | location   | string  | `[resourceGroup().location]` | [App region](../azure-resource-manager/templates/template-functions-resource.md#resourcegroup)
 | sku        | string  | `F1`                         | Instance size (F1 = Free Tier) |
-| linuxFxVersion   | string  | `DOTNETCORE|3.0`        | "Programming language stack &#124; Version" |
+| linuxFxVersion   | string  | `DOTNETCORE|9.0`        | "Programming language stack &#124; Version" |
 | repoUrl    | string  | ` `                          | External Git repo (optional) |
 
 ---
@@ -162,11 +156,11 @@ az webapp config show --resource-group myResourceGroup --name <app-name> --query
 
 | Language    | Example                                                                            |
 |-------------|------------------------------------------------------------------------------------|
-| **.NET**    | linuxFxVersion="DOTNETCORE&#124;3.0"                                               |
-| **Java**    | linuxFxVersion="JAVA&#124;21-java21 TOMCAT&#124;10.1-java21 JBOSSEAP&#124;8-java17"|
-| **Node.js** | linuxFxVersion="NODE&#124;10.15"                                                   |
-| **Python**  | linuxFxVersion="PYTHON&#124;3.7"                                                   |
-| **PHP**     | linuxFxVersion="PHP&#124;7.4"                                                      |
+| **.NET**    | linuxFxVersion="DOTNETCORE&#124;9.0"                                               |
+| **Java**    | linuxFxVersion="JAVA&#124;21-java21 TOMCAT&#124;11.0-java21 JBOSSEAP&#124;8-java17"|
+| **Node.js** | linuxFxVersion="NODE&#124;22-lts                                                   |
+| **Python**  | linuxFxVersion="PYTHON&#124;3.13"                                                   |
+| **PHP**     | linuxFxVersion="PHP&#124;8.4"                                                      |
 
 ---
 ::: zone-end
@@ -220,3 +214,4 @@ When no longer needed, [delete the resource group](../azure-resource-manager/man
 
 > [!div class="nextstepaction"]
 > [Secure with custom domain and certificate](tutorial-secure-domain-certificate.md)
+

articles/app-service/tutorial-php-mysql-app.md

@@ -239,7 +239,7 @@ The creation wizard generated the connectivity variables for you already as [app
         A **Create connection** dialog is opened on top of the edit dialog.
     :::column-end:::
     :::column:::
-        :::image type="content" source="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png" alt-text="A screenshot showing how to edit a service connector with a key vault connection." lightbox="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png":::
+        :::image type="content" source="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png" alt-text="A screenshot that shows how to edit a service connector with a key vault connection." lightbox="./media/tutorial-php-mysql-app/azure-portal-secure-connection-secrets-5.png":::
     :::column-end:::
 :::row-end:::
 :::row:::

articles/azure-resource-manager/managed-applications/publish-bicep-definition.md

@@ -33,7 +33,7 @@ To complete the tasks in this article, you need the following items:
 ## Create a Bicep file
 
 > [!Note]
-> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
+> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
 
 Every managed application definition includes a file named _mainTemplate.json_. The template defines the Azure resources to deploy and is no different than a regular ARM template. You can develop the template using Bicep and then convert the Bicep file to JSON.
 

articles/azure-resource-manager/managed-applications/publish-service-catalog-app.md

@@ -34,7 +34,7 @@ To complete this quickstart, you need the following items:
 ## Create the ARM template
 
 > [!Note]
-> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
+> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
 
 Every managed application definition includes a file named _mainTemplate.json_. The template defines the Azure resources to deploy and is no different than a regular ARM template.
 

articles/azure-resource-manager/managed-applications/publish-service-catalog-bring-your-own-storage.md

@@ -35,7 +35,7 @@ To complete this quickstart, you need the following items:
 ## Create the ARM template
 
 > [!Note]
-> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
+> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
 
 Every managed application definition includes a file named _mainTemplate.json_. The template defines the Azure resources to deploy and is no different than a regular ARM template.
 

articles/azure-resource-manager/managed-applications/reference-main-template-artifact.md

@@ -12,7 +12,7 @@ This article is a reference for a _mainTemplate.json_ artifact in Azure Managed
 ## Deployment template
 
 > [!Note]
-> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](https://learn.microsoft.com/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
+> Azure Managed Applications only supports ARM templates using languageVersion 1.0 and **does not** support languageVersion 2.0. Refer to the [ARM Template documentation](/azure/azure-resource-manager/templates/syntax#languageversion-20) to see what features will automatically enable version 2.0.
 
 The following JSON shows an example of _mainTemplate.json_ file for Azure Managed Applications:
 

articles/communication-services/concepts/voice-video-calling/simulcast.md

@@ -1,33 +1,40 @@
 ---
-title: Azure Communication Services Simulcast
-titleSuffix: An Azure Communication Services concept document
-description: Overview of Simulcast - how sending multiple video quality streams helps overall call quality.
+title: Simulcast
+titleSuffix: An Azure Communication Services article
+description: This article describes how to send multiple video quality streams helps overall call quality.
 author: sloanster
 manager: chpalm
 services: azure-communication-services
 
 ms.author: micahvivion
-ms.date: 02/19/2024
+ms.date: 06/26/2025
 ms.topic: conceptual
 ms.subservice: calling
 ms.service: azure-communication-services
 ---
-# What is Simulcast?
-Simulcast is a technique that allows video streaming applications to send multiple versions of the same video content at different resolutions and bitrates. This way, the receiver can choose the most suitable version based on their network conditions and device capabilities. 
+# Simulcast
 
-The lack of simulcast support leads to a degraded video experience in calls with three or more participants. If a video receiver with poor network conditions joins the conference, it impacts the quality of video received from the sender without simulcast support for all other participants. The video sender optimizes its video feed against the lowest common denominator. When simulcast streaming is available the potential impact of one person affecting the entire streaming quality experience is minimized.
+Simulcast is a technique that enables video streaming applications to send multiple versions of the same video content at different resolutions and bitrates. This way, the receiver can choose the most suitable version based on their network conditions and device capabilities. 
 
-Simulcast is supported on Azure Communication Services SDK for WebJS (1.9.1-beta.1+) and native SDK for Android, iOS, and Windows. Currently, simulcast on the sender side is supported on following desktop browsers - Chrome and Edge. Simulcast on receiver side is supported on all platforms that Azure Communication Services Calling supports. Support for Sender side Simulcast capability from mobile browsers will be added in the future.
+The lack of simulcast support leads to a degraded video experience in calls with three or more participants. If a video receiver with poor network conditions joins the conference, it impacts the quality of video received from the sender without simulcast support for all other participants. The video sender optimizes its video feed against the lowest common denominator. When simulcast streaming is available, the potential impact of one person affecting the entire streaming quality experience is minimized.
 
-## How Simulcast works
-Simulcast is a feature that allows a publisher, in this case the Azure Communication Services calling SDK, to send different qualities of the same video to the SFU. The SFU then forwards the most suitable quality to each other endpoint on a call, based on their bandwidth, CPU, and resolution preferences. This way, the publisher can save resources and the subscribers can receive the best possible quality. The SFU doesn't change the video quality, it only selects which one to forward.
+Simulcast is supported on Azure Communication Services SDK for WebJS (1.9.1-beta.1+) and native SDK for Android, iOS, and Windows. Currently, simulcast on the sender side is supported on following desktop browsers - Chrome and Microsoft Edge. Simulcast on receiver side is supported on all platforms that Azure Communication Services Calling supports. Support for Sender side Simulcast capability from mobile browsers is planned for a future release.
+
+## How simulcast works
+
+The simulcast feature enables a publisher, in this case the Azure Communication Services calling SDK, to send different qualities of the same video to the selective forwarding unit (SFU). The SFU then forwards the most suitable quality to each other endpoint on a call, based on their bandwidth, CPU, and resolution preferences. This way, the publisher can save resources and the subscribers can receive the best possible quality. The SFU doesn't change the video quality. The SFU only selects which one to forward.
+
+## Supported number of video qualities available with Simulcast
 
-## Supported number of video qualities available with Simulcast.
 Simulcast streaming from a web endpoint supports a maximum two video qualities. There aren't API controls needed to enable Simulcast for Azure Communication Services. Simulcast is enabled and available for all video calls.
 
 ## Available video resolutions
-When streaming with simulcast, there are no set resolutions for high or low quality simulcast video streams. Instead, based on many different variables, either a single or multiple video steams are delivered. If every subscriber to video is requesting and capable of receiving maximum resolution what publisher can provide, only that maximum resolution will be sent. The following resolutions are supported:
-- 1080P
+
+When a participant is streaming with simulcast, there are no set resolutions for high or low quality simulcast video streams. Instead, based on many different variables, either a single or multiple video steams are delivered. If every subscriber to video is requesting and capable of receiving maximum resolution what publisher can provide, only that it sends maximum resolution.
+
+Simulcast supports the following resolutions:
+
+- 1080p
 - 720p
 - 540p
 - 360p

articles/communication-services/how-tos/calling-sdk/powerpoint-live.md

@@ -14,9 +14,9 @@ ms.custom: template-how-to
 
 # View PowerPoint Live presentations
 
-This article describes how to enable meeting participants to view [PowerPoint Live presentations in Microsoft Teams](https://support.microsoft.com/en-us/office/present-from-powerpoint-live-in-microsoft-teams-28b20e74-7165-499c-9bd4-0ad975d448ad) using the Azure Communication Services Calling SDKs.
+This article describes how to enable meeting participants to view [PowerPoint Live presentations in Microsoft Teams](https://support.microsoft.com/office/present-from-powerpoint-live-in-microsoft-teams-28b20e74-7165-499c-9bd4-0ad975d448ad) using the Azure Communication Services Calling SDKs.
 
-Attendees who use Azure Communication Services Calling SDKs to [join a Microsoft Teams meeting](./teams-interoperability.md) can view PowerPoint Live presentations and interact with [reactions](./reactions.md) and [raise hand](./raise-hand.md). The attendee view automatically maintains synchronization with the current slide of the Microsoft Teams presenter.
+Attendees who use Azure Communication Services Calling SDKs to [join a Microsoft Teams meeting](./teams-interoperability.md) can view PowerPoint Live presentations and interact with [reactions](./reactions.md) and [raise hand](./raise-hand.md). The attendee view automatically synchronizes with the current slide of the Microsoft Teams presenter.
 
 ## Prerequisites