Merge branch 'main' into release-vpn-sku

Author: v-alje

articles/active-directory-b2c/enable-authentication-angular-spa-app.md

@@ -624,8 +624,7 @@ In the *src/app/profile* folder, update *profile.component.html* with the follow
 To call a [token-based authorization web API](enable-authentication-web-api.md), the app needs to have a valid access token. The [MsalInterceptor](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/msal-interceptor.md) provider automatically acquires tokens for outgoing requests that use the Angular [HttpClient](https://angular.io/api/common/http/HttpClient) class to known protected resources.
 
 > [!IMPORTANT]
-> The MSAL initialization method (in the `app.module.ts` class) maps protected resources, such as web APIs, with the required app scopes by using the `protectedResourceMap` object. If your code needs to call another web API, add the web API URI and the web API HTTP method, with the corresponding scopes, to the `protectedResourceMap` object. For more information, see [Protected Resource Map](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/master/lib/msal-angular/docs/v2-docs/msal-interceptor.md#protected-resource-map).
-
+> The MSAL initialization method (in the `app.module.ts` class) maps protected resources, such as web APIs, with the required app scopes by using the `protectedResourceMap` object. If your code needs to call another web API, add the web API URI and the web API HTTP method, with the corresponding scopes, to the `protectedResourceMap` object. For more information, see [Protected Resource Map](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/msal-interceptor.md#protected-resource-map).
 
 When the [HttpClient](https://angular.io/api/common/http/HttpClient)  object calls a web API, the [MsalInterceptor](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/msal-interceptor.md) provider takes the following steps:
 

articles/api-management/api-management-configuration-repository-git.md

@@ -52,7 +52,7 @@ This article describes how to enable and use Git to manage your service configur
 ## Save the service configuration to the Git repository
 
 > [!CAUTION]
-> Any secrets that are not defined as named values will be stored in the repository and will remain in its history. Named values provide a secure place to manage constant string values, including secrets, across all API configuration and policies, so you don't have to store them directly in your policy statements. For more information, see [Use named values in Azure API Management policies](api-management-howto-properties.md).
+> Any secrets that are not defined as named values will be stored in the repository and will remain in its history. Named values provide a secure place to manage constant string values, including secrets, across all API configurations and policies, so you don't have to store them directly in your policy statements. For more information, see [Use named values in Azure API Management policies](api-management-howto-properties.md).
 >
 
 

articles/api-management/api-management-get-started-publish-versions.md

@@ -16,7 +16,7 @@ ms.author: danlep
 
 [!INCLUDE [api-management-availability-all-tiers](../../includes/api-management-availability-all-tiers.md)]
 
-There are times when it's impractical to have all callers to your API use the same version. When callers want to upgrade to a later version, they want an approach that's easy to understand. As shown in this tutorial, it's possible to provide multiple *versions* in Azure API Management. 
+There are situations where it's impractical for all API consumers to use the same version. When consumers are ready to upgrade to a newer version, they prefer a simple and understandable approach. As demonstrated in this tutorial, Azure API Management supports exposing multiple API versions to meet this need.
 
 For background, see [Versions](api-management-versions.md) and [Revisions](api-management-revisions.md).
 

articles/api-management/get-started-create-service-instance.md

@@ -51,11 +51,9 @@ Sign in to the [Azure portal](https://portal.azure.com).
 
 1. On the **Monitor + secure** tab, optionally select one or more recommended add-in services to use with API Management. These services incur extra costs. For example, select **Log Analytics** to define a Log Analytics workspace you can target for API Management logs. 
 
-1. On the **Managed identity** tab, we recommend selecting the checkbox to enable a system-assigned identity for your API Management instance. A managed identity generated by Microsoft Entra ID allows your API Management instance to easily and securely access other Microsoft Entra protected resources, such as Azure Key Vault. Azure manages this identity, so you don't have to provision or rotate any credentials.
+    > [!TIP]
+    > It can take 30 to 40 minutes or more to create and activate an API Management service in this tier. To quickly find a newly created service, select **Pin to dashboard**.
 
-1. Optionally, on the **Tags** tab, add tags to your API Management instance. Tags are key-value pairs that help you organize and manage your Azure resources.
-
-1. On the **Review + install** tab, review the settings you selected. If you need to make changes, go back to the previous tabs. If everything looks good, select **Create**.
 
 [!INCLUDE [api-management-navigate-to-instance](../../includes/api-management-navigate-to-instance.md)]
 

articles/app-service/includes/tutorial-ai-slm/faq.md

@@ -25,7 +25,7 @@ For example, the [Phi-3 mini model with a 4K context length from Hugging Face](h
 
 ### How to use my own SLM sidecar?
 
-The sample repository contains a sample SLM container that you can use as a sidecar. It runs a FastAPI application that listens on port 8000, as specified in its [Dockerfile](https://github.com/Azure-Samples/ai-slm-in-app-service-sidecar/blob/main/bring_your_own_slm/src/phi-3-sidecar/Dockerfile). The application uses [ONNX Runtime](https://onnxruntime.ai/docs/) to load the Phi-3 model, then forwards the HTTP POST data to the model and streams the response from the model back to the client. For more information, see [model_api.py](https://github.com/Azure-Samples/ai-slm-in-app-service-sidecar/blob/main/src/phi-3-sidecar/model_api.py).
+The sample repository contains a sample SLM container that you can use as a sidecar. It runs a FastAPI application that listens on port 8000, as specified in its [Dockerfile](https://github.com/Azure-Samples/ai-slm-in-app-service-sidecar/blob/main/bring_your_own_slm/src/phi-3-sidecar/Dockerfile). The application uses [ONNX Runtime](https://onnxruntime.ai/docs/) to load the Phi-3 model, then forwards the HTTP POST data to the model and streams the response from the model back to the client. For more information, see [model_api.py](https://github.com/Azure-Samples/ai-slm-in-app-service-sidecar/blob/main/bring_your_own_slm/src/phi-3-sidecar/model_api.py).
 
 To build the sidecar image yourself, you need to install Docker Desktop locally on your machine.
 
@@ -43,7 +43,7 @@ To build the sidecar image yourself, you need to install Docker Desktop locally
     huggingface-cli download microsoft/Phi-3-mini-4k-instruct-onnx --local-dir ./Phi-3-mini-4k-instruct-onnx
     ```
     
-    The [Dockerfile](https://github.com/Azure-Samples/ai-slm-in-app-service-sidecar/blob/main/src/phi-3-sidecar/Dockerfile) is configured to copy the model from *./Phi-3-mini-4k-instruct-onnx*.
+    The [Dockerfile](https://github.com/Azure-Samples/ai-slm-in-app-service-sidecar/blob/main/bring_your_own_slm/src/phi-3-sidecar/Dockerfile) is configured to copy the model from *./Phi-3-mini-4k-instruct-onnx*.
     
 1. Build the Docker image. For example:
 

articles/app-service/tutorial-webjobs.md

@@ -181,7 +181,7 @@ WebJobs is a feature of Azure App Service that enables you to run a program
 
 ## Download the sample WebJob
 
-You can [download a pre-built sample project](https://github.com/Azure-Samples/App-Service-Node-WebJobs-QuickStart/archive/refs/heads/main.zip) to get started quickly. The sample includes two files: `webjob.js` and `run.sh`.
+You can [download a pre-built sample project](https://github.com/Azure-Samples/App-Service-NodeJS-WebJobs-QuickStart/archive/refs/heads/main.zip) to get started quickly. The sample includes two files: `webjob.js` and `run.sh`.
 
 The JavaScript, `webjob.js`, outputs the current time to the console as shown below:
 

articles/application-gateway/private-link-configure.md

@@ -34,6 +34,10 @@ To enable Private Link Configuration, a subnet, different from the Application G
 > [!NOTE]
 > The maximum number of IP addresses per private link configuration is eight. Only dynamic allocation is supported.
 
+> [!NOTE]
+> The Application Gateway name and Private link name together shouldn't exceed 70 characters.To avoid deployment failures due to name length constraints, ensure that both the Application Gateway name and the Private Link configuration name are kept sufficiently short.
+
+
 Complete the following steps to create a new subnet:
 
 [Add, change, or delete a virtual network subnet](../virtual-network/virtual-network-manage-subnet.md#add-a-subnet)
@@ -205,4 +209,4 @@ A list of all Azure CLI references for Private Link Configuration on Application
 
 ## Next steps
 
-- Learn about Azure Private Link: [What is Azure Private Link](../private-link/private-link-overview.md).
+- Learn about Azure Private Link: [What is Azure Private Link](../private-link/private-link-overview.md).

articles/avere-vfxt/avere-vfxt-whitepapers.md

@@ -14,8 +14,6 @@ This article lists case studies, technology whitepapers, infographics, and other
 
 ## Deploy Agisoft PhotoScan on Azure
 
-**Link:** [Deploy Agisoft PhotoScan on Azure with Avere vFXT for Azure or BeeGFS](https://azure.microsoft.com/mediahandler/files/resourcefiles/deploy-agisoft-photoscan-on-azure-with-azere-vfxt-for-azure-or-beegfs/AgiSoft%20PhotoScan%20on%20Azure%20using%20Avere%20vFXT%20or%20BeeGFS.pdf)
-
 This guide provides step-by-step guidance for installing Agisoft PhotoScan photogrammetry software backed by either Avere vFXT storage or BeeGFS parallel file system. The author, Paulo Marques da Costa of AzureCAT, shows how to set up PhotoScan on Azure Virtual Machines (VMs). High-performance storage accelerates processing time, and the results of his benchmark tests are included. This environment can be scaled up and down as needed and supports terabytes of storage without sacrificing performance.
 
 ## Datasheet: Avere vFXT for Azure

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

@@ -125,7 +125,7 @@
     - name: Monitor using insights
       href: cache-insights-overview.md
     - name: Monitor using diagnostic settings
-      href: /monitor/cache-monitor-diagnostic-settings.md
+      href: cache-monitor-diagnostic-settings.md
     - name: List of Redis metrics
       href: /azure/redis/monitor-cache-reference
 
@@ -277,7 +277,7 @@
     - name: Route events with Azure portal  
       href: cache-event-grid-quickstart-portal.md
     - name: Route events with Azure CLI 
-      href: /cache-event-grid-quickstart-cli.md
+      href: cache-event-grid-quickstart-cli.md
     - name: Route events with PowerShell 
       href: cache-event-grid-quickstart-powershell.md
   - name: Create leaderboards

articles/azure-functions/functions-infrastructure-as-code.md

@@ -129,7 +129,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
 For more context, see the complete [main.bicep](https://github.com/Azure-Samples/function-app-arm-templates/blob/main/function-app-linux-consumption/main.bicep#L37) file in the templates repository.
 ::: zone-end  
 ::: zone pivot="flex-consumption-plan"
-For more context, see the complete [storage-account.bicep](https://github.com/Azure-Samples/functions-quickstart-dotnet-azd/blob/main/infra/core/storage/storage-account.bicep) file in the sample repository.
+For more context, see the complete [storage-PrivateEndpoint.bicep](https://github.com/Azure-Samples/functions-quickstart-dotnet-azd/blob/main/infra/app/storage-PrivateEndpoint.bicep) file in the sample repository.
 ::: zone-end  
 
 ### [ARM template](#tab/json)