Fix blocking issues and merge conflict

Author: sethmanheim

articles/active-directory-b2c/add-password-change-policy.md

@@ -26,12 +26,12 @@ ms.custom: sfi-image-nochange
 
 [!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
 
-You can configure Azure Active Directory B2C (Azure AD B2C) so that a user who is signed in with a local account can change their password without using email verification to prove their identity. 
+You can configure Azure Active Directory B2C (Azure AD B2C) to allow users who are signed in with a local account to change their password without using email verification to prove their identity.
 
 The password change flow involves the following steps:
 
 1. The user signs in to their local account. If the session is still active, Azure AD B2C authorizes the user and skips to the next step.
-1. In **Old password**, the user verifies their old password. In **New password**, they create and confirm their new password.
+1. In **Old password**, the user verifies their current password. In **New password**, they create and confirm their new password.
 
    ![Screenshot that shows two numbered dialogs for making a password change.](./media/add-password-change-policy/password-change-flow.png)  
 

articles/active-directory-b2c/add-profile-editing-policy.md

@@ -44,7 +44,7 @@ If you haven't already done so, [register a web application in Azure Active Dire
 
 ## Create a profile editing user flow
 
-If you want to enable users to edit their profile in your application, you use a profile editing user flow.
+To enable users to edit their profile in your application, use a profile editing user flow.
 
 1. In the menu of the Azure AD B2C tenant overview page, select **User flows**, and then select **New user flow**.
 1. On the **Create a user flow** page, select the **Profile editing** user flow. 

articles/api-management/api-management-howto-use-managed-service-identity.md

@@ -2,72 +2,73 @@
 author: cephalin
 ms.service: azure-app-service
 ms.topic: include
-ms.date: 11/18/2025
+ms.date: 03/03/2026
 ms.author: cephalin
 ms.custom:
   - build-2025
 ---
 
 
-In this section, you'll use GitHub Codespaces to create an Azure OpenAI resource with the Azure CLI.
+In this section, you use Azure CLI in GitHub Codespaces to create an Azure OpenAI resource.
 
-1. Go to [GitHub Codespaces](https://github.com/codespaces) and sign in with your GitHub account.
-1. Find the **Blank** template by GitHub and select **Use this template** to create a new blank Codespace.
-1. In the Codespace terminal, install the Azure CLI:
+1. Sign in to [GitHub Codespaces](https://github.com/codespaces) with your GitHub account.
+1. Select **Use this template** in the **Blank** tile to create a new blank codespace.
+1. In the Codespace terminal, install the Azure CLI.
 
-    ```bash
-    curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
-    ```
-  
-1. Sign in to your Azure account:
+   ```bash
+   curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
+   ```
 
-    ```azurecli
-    az login
-    ```
-  
-    Follow the instructions in the terminal to authenticate.
+1. Sign in to your Azure account.
 
-1. Set environment variables for your resource group name, Azure OpenAI service name, and location:
+   ```azurecli
+   az login
+   ```
 
-    ```azurecli
-    export RESOURCE_GROUP="<group-name>"
-    export OPENAI_SERVICE_NAME="<azure-openai-name>"
-    export APPSERVICE_NAME="<app-name>"
-    export LOCATION="eastus2"
-    ```
+   Follow the instructions in the terminal to authenticate.
 
-    > [!IMPORTANT]
-    > The region is critical as it's tied to the regional availability of the chosen model. Model availability and [deployment type availability](/azure/ai-foundry/foundry-models/concepts/deployment-types) vary from region to region. This tutorial uses `gpt-4o-mini`, which is available in `eastus2` under the Standard deployment type. If you deploy to a different region, this model might not be available or might require a different tier. Before changing regions, consult the [Model summary table and region availability](/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability) to verify model support in your preferred region.
-    > 
+1. Set environment variables by providing names for your resource group and Azure OpenAI service and setting an appropriate Azure region as your location.
 
-1. Create a resource group and an Azure OpenAI resource with a custom domain, then add a gpt-4o-mini model:
+   ```azurecli
+   export RESOURCE_GROUP="<group-name>"
+   export OPENAI_SERVICE_NAME="<azure-openai-name>"
+   export APPSERVICE_NAME="<app-name>"
+   export LOCATION="<azure-region>"
+   ```
 
-    ```azurecli
-    # Resource group
-    az group create --name $RESOURCE_GROUP --location $LOCATION
-    # Azure OpenAI resource
-    az cognitiveservices account create \
-      --name $OPENAI_SERVICE_NAME \
-      --resource-group $RESOURCE_GROUP \
-      --location $LOCATION \
-      --custom-domain $OPENAI_SERVICE_NAME \
-      --kind OpenAI \
-      --sku s0
-    # gpt-4o-mini model
-    az cognitiveservices account deployment create \
-      --name $OPENAI_SERVICE_NAME \
-      --resource-group $RESOURCE_GROUP \
-      --deployment-name gpt-4o-mini \
-      --model-name gpt-4o-mini \
-      --model-version 2024-07-18 \
-      --model-format OpenAI \
-      --sku-name Standard \
-      --sku-capacity 1
-    # Cognitive Services OpenAI User role that lets the signed in Azure user to read models from Azure OpenAI
-    az role assignment create \
-      --assignee $(az ad signed-in-user show --query id -o tsv) \
-      --role "Cognitive Services OpenAI User" \
-      --scope /subscriptions/$(az account show --query id -o tsv)/resourceGroups/$RESOURCE_GROUP/providers/Microsoft.CognitiveServices/accounts/$OPENAI_SERVICE_NAME
-    ```
+   > [!IMPORTANT]
+   > The location is tied to the regional availability of the chosen model. Model and [deployment type](/azure/ai-foundry/foundry-models/concepts/deployment-types) availability vary among Azure regions and billing tiers. This tutorial uses `gpt-4o-mini`, which is available in several regions under the Standard deployment type.
+   >
+   > Before selecting a location, consult the [Model summary and region availability table](/azure/ai-services/openai/concepts/models#model-summary-table-and-region-availability) to verify model support in your preferred region.
 
-Now that you have an Azure OpenAI resource, you'll create a web application to interact with it.
+1. Create a resource group and an Azure OpenAI resource with a custom domain, and then add a `gpt-4o-mini` model:
+
+   ```azurecli
+   # Resource group
+   az group create --name $RESOURCE_GROUP --location $LOCATION
+   # Azure OpenAI resource
+   az cognitiveservices account create \
+     --name $OPENAI_SERVICE_NAME \
+     --resource-group $RESOURCE_GROUP \
+     --location $LOCATION \
+     --custom-domain $OPENAI_SERVICE_NAME \
+     --kind OpenAI \
+     --sku s0
+   # gpt-4o-mini model
+   az cognitiveservices account deployment create \
+     --name $OPENAI_SERVICE_NAME \
+     --resource-group $RESOURCE_GROUP \
+     --deployment-name gpt-4o-mini \
+     --model-name gpt-4o-mini \
+     --model-version 2024-07-18 \
+     --model-format OpenAI \
+     --sku-name Standard \
+     --sku-capacity 1
+   # Cognitive Services OpenAI User role that lets the signed in Azure user read models from Azure OpenAI
+   az role assignment create \
+     --assignee $(az ad signed-in-user show --query id -o tsv) \
+     --role "Cognitive Services OpenAI User" \
+     --scope /subscriptions/$(az account show --query id -o tsv)/resourceGroups/$RESOURCE_GROUP/providers/Microsoft.CognitiveServices/accounts/$OPENAI_SERVICE_NAME
+   ```
+
+Now that you have an Azure OpenAI resource, you can create a web application to interact with it.

articles/app-service/app-service-undelete.md

@@ -6,19 +6,20 @@ ms.custom: devx-track-terraform
 
 ms.assetid: 1e5ecfa8-4ab1-47d3-ab23-97abf723516d
 ms.topic: sample
-ms.date: 06/25/2024
+ms.date: 03/16/2026
 author: ericgre
 ms.author: ericg
 ms.service: azure-app-service
 ---
+
 # Terraform samples for Azure App Service
 
 The following table includes links to Terraform scripts.
 
 | Script | Description |
 |-|-|
 |**Create app**||
-| [Create two apps and connect securely with Private Endpoint and VNet integration](./scripts/terraform-secure-backend-frontend.md)| Creates two App Service apps and connect apps together with Private Endpoint and VNet integration. |
+| [Create two apps and connect them securely with Private Endpoint and VNet integration](./scripts/terraform-secure-backend-frontend.md)| Creates two App Service apps and connects the apps together with Private Endpoint and virtual network integration. |
 | [Provision App Service and use slot swap to deploy](/azure/developer/terraform/provision-infrastructure-using-azure-deployment-slots)| Provision App Service infrastructure with Azure deployment slots. |
 | [Create an Azure Windows web app with a backup](./scripts/terraform-backup.md)| Create an Azure Windows web app with a backup schedule. |
 | [Create a Windows container app on App Service](/azure/app-service/provision-resource-terraform?tabs=windows-container)| Create an Azure Windows web app with a backup schedule. |

articles/app-service/includes/tutorial-ai-openai-chatbot/create-openai-resource.md

@@ -1,10 +1,10 @@
 ---
 title: 'PowerShell: Deploy Private Endpoint for Web App with PowerShell'
-description: Learn how to use PowerShell to deploy Private Endpoint for your Web App.
+description: Use this sample PowerShell script to deploy Private Endpoint for your Web App.
 author: ericgre
 ms.assetid: e1cc08d5-91cf-49d7-8d0a-c0e7bd2046ac
 ms.topic: sample
-ms.date: 12/06/2022
+ms.date: 03/16/2026
 ms.author: ericg
 ms.service: azure-app-service
 ms.custom: devx-track-azurepowershell

articles/app-service/media/tutorial-ai-openai-chatbot-python/chat-in-browser.png

@@ -1,10 +1,10 @@
 ---
 title: 'Use an Azure Resource Manager template to deploy a private endpoint for a web app'
-description: Learn how to use ARM template to deploy a private endpoint for your web app.
+description: Learn how to use an ARM template to deploy a private endpoint for your web app.
 author: ericgre
 ms.assetid: 49e460d0-7759-4ceb-b5a4-f1357e4fde56
 ms.topic: sample
-ms.date: 07/08/2020
+ms.date: 03/16/2026
 ms.author: ericg
 ms.service: azure-app-service
 ms.custom: devx-track-arm-template
@@ -32,14 +32,14 @@ This template creates a private endpoint for an Azure web app.
 
 Here's how to deploy the Azure Resource Manager template to Azure:
 
-1. To sign in to Azure and open the template, select this link:  [Deploy to Azure](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fprivate-endpoint-webapp%2Fazuredeploy.json). The template creates the virtual network, the web app, the private endpoint, and the private DNS zone.
-2. Select or create your resource group.
-3. Enter the name of your web app, Azure App Service plan, and private endpoint.
-5. Read the statement about terms and conditions. If you agree, select **I agree to the terms and conditions stated above** > **Purchase**. The deployment can take several minutes to finish.
+1. To sign in to Azure and open the template, select this link: [Deploy to Azure](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-quickstart-templates%2Fmaster%2Fquickstarts%2Fmicrosoft.web%2Fprivate-endpoint-webapp%2Fazuredeploy.json). The template creates the virtual network, the web app, the private endpoint, and the private DNS zone.
+1. Select or create your resource group.
+1. Enter the name of your web app, Azure App Service plan, and private endpoint.
+1. Read the statement about terms and conditions. If you agree, select **I agree to the terms and conditions stated above** > **Purchase**. The deployment can take several minutes to finish.
 
 ## Clean up resources
 
-When you no longer need the resources that you created with the private endpoint, delete the resource group. This removes the private endpoint and all the related resources.
+When you no longer need the resources that you created with the private endpoint, delete the resource group. By removing the resource group, you remove the private endpoint and all the related resources.
 
 To delete the resource group, call the `Remove-AzResourceGroup` cmdlet: