Merge pull request #299281 from MicrosoftDocs/main

05/02/2025 PM Publishing

Author: v-alje

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-python-pivot.md

@@ -81,7 +81,7 @@ After the files are updated, prepare your environment variables to work with Ope
 
 ### API keys and endpoints
 
-To make calls to OpenAI with your client, you need to first get the keys and endpoint values from Azure OpenAI or OpenAI, and add them as secrets for use in your application. Save the values for later use.
+To make calls to OpenAI with your client, first get the keys and endpoint values from Azure OpenAI or OpenAI, and add them as secrets for use in your application. Save the values for later use.
 
 For Azure OpenAI, see [this documentation](/azure/ai-services/openai/quickstart?pivots=programming-language-csharp&tabs=command-line%2Cpython#retrieve-key-and-endpoint) to retrieve the following values. If you're planning to use a [managed identity](../../overview-managed-identity.md) to secure your app, you don't need the API key value.
 

articles/application-gateway/classic-to-resource-manager.md

@@ -5,23 +5,35 @@ services: application-gateway
 author: greg-lindsay
 ms.service: azure-application-gateway
 ms.topic: how-to
-ms.date: 10/02/2024
+ms.date: 05/01/2025
 ms.author: greglin
 ---
 
 # Application gateway classic to Resource Manager migration
 
-Resource Manager enables deploying complex applications through templates, configures virtual machines by using VM extensions, and incorporates access management and tagging. Azure Resource Manager includes scalable, parallel deployment for virtual machines into availability sets. The new deployment model also provides lifecycle management of compute, network, and storage independently.
-You can read more about Azure Resource Manager [features and benefits](../azure-resource-manager/management/overview.md).
+This article describes benefits of the new [Azure Resource Manager](../azure-resource-manager/management/overview.md) (ARM) deployment model and provides guidance on how to migrate Azure Application Gateway from [classic deployment](#what-is-azure-service-manager-and-what-does-it-mean-by-classic) to Azure Resource Manager deployment.  For more information about deployment models, see [Azure Resource Manager vs. classic deployment](/azure/azure-resource-manager/management/deployment-models).
 
-Application gateway resources are **not** migrated automatically as part of VNet migration from classic to Resource Manager.
-As part of VNet migration process as documented at [IaaS resources migration page](/azure/virtual-machines/migration-classic-resource-manager-ps), if you have an application gateway resource present on the VNet that you're trying to migrate to Resource Manager deployment model, the automatic migration wouldn't be successful. 
+> [!NOTE]
+> For information about retirement of the classic deployment model, see [Azure updates](https://azure.microsoft.com/updates?id=azure-classic-resource-providers-will-be-retired-on-31-august-2024).
+
+Azure Resource Manager has many features and benefits, including:
+* Deployment of complex applications through [templates](/azure/azure-resource-manager/templates/overview) 
+* Configuration of virtual machines with [VM extensions](/azure/virtual-machines/extensions/overview) 
+* Incorporation of [access management](/azure/role-based-access-control/) and [tagging](/azure/azure-resource-manager/management/tag-resources) 
+* Scalable, parallel deployment for virtual machines into [availability sets](/azure/virtual-machines/availability-set-overview)
+* Independent lifecycle management of compute, network, and storage resources
+
+At a high level, migration of an application gateway from classic to Resource Manager requires three steps:
+1. Remove (delete) the application gateway resource from the VNet.
+2. [Migrate your IaaS resources](/azure/virtual-machines/migration/migration-classic-resource-manager-ps).
+3. [Recreate the application gateway resource](#creating-a-new-application-gateway-resource) using Resource Manager.
 
-To migrate your application gateway resource to Resource Manager deployment model, you'll have to remove the Application Resource from the VNet before beginning migration and then recreate the application gateway resource once migration is complete.
+> [!IMPORTANT]
+> Application gateway resources are **not** migrated automatically as part of VNet migration from classic to Resource Manager. If you have an application gateway resource present on the VNet that you're trying to migrate to Resource Manager deployment model, automatic migration fails.
 
 ## Creating a new application gateway resource 
 
-For more information on how to set up an application gateway resource after VNet migration, you can refer:
+See the following articles for more information on how to set up an application gateway resource after VNet migration:
 
 * [Deployment via portal](quick-create-portal.md)
 * [Deployment via PowerShell](quick-create-powershell.md)
@@ -54,27 +66,29 @@ Step 1: Install the old PowerShell version for managing legacy resources.
 > [!NOTE]
 > The cmdlets referenced in this documentation are for managing legacy Azure resources that use Azure Service Manager (ASM) APIs. This legacy PowerShell module isn't recommended for creating new resources since ASM is scheduled for retirement.
 
-Step 2: Run the following command to remove the application gateway.
- [Remove-AzureApplicationGateway](/powershell/module/servicemanagement/azure/remove-azureapplicationgateway)
+Step 2: Run the following command to remove the application gateway: [Remove-AzureApplicationGateway](/powershell/module/servicemanagement/azure/remove-azureapplicationgateway)
 
  ```
-#Login to account and set proper subscription
-  Add-AzureAccount
-  Get-AzureSubscription
-  Select-AzureSubscription -SubscriptionId <SubscriptionId> -Default
+# Sign in to account and set proper subscription
+Add-AzureAccount
+Get-AzureSubscription
+Select-AzureSubscription -SubscriptionId <SubscriptionId> -Default
  
-  # Get the list of application gateways in the subscription
-  Get-AzureApplicationGateway
+# Get the list of application gateways in the subscription
+Get-AzureApplicationGateway
  
-  #Remove the desired application gateway
-  Remove-AzureApplicationGateway -Name <NameofGateway>
+# Remove the desired application gateway
+Remove-AzureApplicationGateway -Name <NameofGateway>
 ```
 
 ### How do I report an issue?
 
 Post your issues and questions about migration to our [Microsoft Q&A page](/answers/topics/azure-virtual-network.html). We recommend posting all your questions on this forum. If you have a support contract, you're welcome to log a support ticket as well.
 
 ## Next steps
-To get started, see: [platform-supported migration of IaaS resources from classic to Resource Manager](/azure/virtual-machines/migration-classic-resource-manager-ps)
+
+To get started, see [Platform-supported migration of IaaS resources from classic to Resource Manager](/azure/virtual-machines/migration-classic-resource-manager-ps)
+
+Also see [Prepare for Azure classic administrator roles retirement](/azure/cost-management-billing/manage/classic-administrator-retire?source=recommendations) and [Azure classic subscription administrators](/azure/role-based-access-control/classic-administrators?source=recommendations&tabs=azure-portal).
 
 For any concerns around migration, you can contact Azure Support. Learn more about [Azure support here](https://azure.microsoft.com/support/options/).

articles/automanage/automanage-account.md

@@ -2,7 +2,7 @@
 title: Azure Automanage Account
 description: Learn how an Automanage Account works and how to create one.
 ms.service: azure-automanage
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 12/10/2021
 ---
 

articles/automanage/automanage-arc.md

@@ -3,7 +3,7 @@ title: Azure Automanage for Azure Arc-enabled servers
 description: Learn about Azure Automanage for Azure Arc-enabled servers
 ms.service: azure-automanage
 ms.collection: linux
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 05/12/2022
 ---
 

articles/automanage/automanage-linux.md

@@ -5,7 +5,7 @@ author: mmccrory
 ms.service: azure-automanage
 ms.custom: linux-related-content
 ms.collection: linux
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 12/10/2021
 ms.author: memccror
 ---

articles/automanage/automanage-smb-over-quic.md

@@ -3,7 +3,7 @@ title: SMB over QUIC with Azure Automanage machine best practices
 description: Overview of managing SMB over QUIC with Azure Automanage machine best practices
 author: daniellee-microsoft
 ms.service: azure-automanage
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 11/1/2021
 ms.author: jol
 ---

articles/automanage/automanage-windows-server.md

@@ -3,7 +3,7 @@ title: Azure Automanage for Windows Server
 description: Learn about Azure Automanage for virtual machines best practices for services that are automatically onboarded and configured for Windows Server machines.
 author: mmccrory
 ms.service: azure-automanage
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 03/22/2022
 ms.author: memccror
 ---

articles/automanage/common-errors.md

@@ -2,7 +2,7 @@
 title: Troubleshoot common Azure Automanage onboarding errors
 description: Common Automanage onboarding errors and how to troubleshoot them
 ms.service: azure-automanage
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 12/10/2021
 ---
 

articles/automanage/repair-automanage-account.md

@@ -2,7 +2,7 @@
 title: Repair a broken Azure Automanage Account
 description: If you've recently moved a subscription that contains an Automanage Account to a new tenant, you need to reconfigure it. In this article, you'll learn how.
 ms.service: azure-automanage
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 11/05/2020
 ms.custom: devx-track-azurecli, subject-rbac-steps
 ---

articles/automanage/virtual-machines-best-practices.md

@@ -3,7 +3,7 @@ title: Azure Automanage Machine Best Practices
 description: Learn about the Azure Automanage machine best practices for services that are automatically onboarded and configured for you.
 author: mmccrory
 ms.service: azure-automanage
-ms.topic: conceptual
+ms.topic: concept-article
 ms.date: 12/10/2021
 ms.author: memccror
 ---