Merge branch 'MicrosoftDocs:main' into main

Author: MutemwaRMasheke

articles/app-service/deploy-staging-slots.md

@@ -547,6 +547,13 @@ Here are some common swap errors:
 
 - Local cache initialization might fail when the app content exceeds the local disk quota specified for the local cache. For more information, see [Local cache overview](overview-local-cache.md).
 
+- During a site update operation, the following error may occur "_The slot cannot be changed because its configuration settings have been prepared for swap_". This can occur if either [swap with preview (multi-phase swap)](#swap-with-preview-multi-phase-swap) phase 1 has been completed but phase 2 has not yet been performed, or a swap has failed. There are two ways resolve the issue:
+
+    1. Cancel the swap operation which will reset the site back to the old state
+    1. Complete the swap operation which will update site to the desired new state
+
+    Refer to [swap with preview (multi-phase swap)](#swap-with-preview-multi-phase-swap) to learn how to cancel or complete the swap operation.
+
 - During [custom warm-up](#Warm-up), the HTTP requests are made internally (without going through the external URL). They can fail with certain URL rewrite rules in *Web.config*. For example, rules for redirecting domain names or enforcing HTTPS can prevent warm-up requests from reaching the app code. To work around this issue, modify your rewrite rules by adding the following two conditions:
 
     ```xml

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

@@ -1,27 +1,27 @@
 ---
-title: Application Gateway classic to Resource Manager
-description: Learn about moving Application Gateway resources from the classic deployment model to the Resource Manager deployment model.
+title: Azure Application Gateway classic to Resource Manager
+description: Learn about moving Azure Application Gateway resources from the classic deployment model to the Resource Manager deployment model.
 services: application-gateway
 author: greg-lindsay
 ms.service: azure-application-gateway
 ms.topic: how-to
-ms.date: 06/27/2024
+ms.date: 10/02/2024
 ms.author: greglin
 ---
 
-# Application Gateway classic to Resource Manager migration
+# 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).
 
-Application Gateway resources will **not** be 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. 
+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. 
 
-In order 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.
+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.
 
-## Creating a new Application Gateway resource 
+## Creating a new application gateway resource 
 
-For more information on how to set up an Application Gateway resource after VNet migration, you can refer:
+For more information on how to set up an application gateway resource after VNet migration, you can refer:
 
 * [Deployment via portal](quick-create-portal.md)
 * [Deployment via PowerShell](quick-create-powershell.md)
@@ -43,13 +43,38 @@ Azure Resource Manager is the latest control plane of Azure responsible for crea
 
 ### Where can I find more information regarding classic to Azure Resource Manager migration?
 
-Please refer to [Frequently asked questions about classic to Azure Resource Manager migration](/azure/virtual-machines/migration-classic-resource-manager-faq)
+Refer to [Frequently asked questions about classic to Azure Resource Manager migration](/azure/virtual-machines/migration-classic-resource-manager-faq)
+
+### How can I clean up my classic application gateway deployment?
+
+Step 1: Install the old PowerShell version for managing legacy resources.
+
+[Installing the Azure PowerShell Service Management module](/powershell/azure/servicemanagement/install-azure-ps)
+
+> [!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)
+
+ ```
+#Login 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
+ 
+  #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)
 
-For any concerns around migration, you can contact Azure Support. Learn more about [Azure support here](https://azure.microsoft.com/support/options/).
+For any concerns around migration, you can contact Azure Support. Learn more about [Azure support here](https://azure.microsoft.com/support/options/).

articles/firewall/protect-azure-kubernetes-service.md

@@ -26,7 +26,7 @@ However, in a production environment, communications with a Kubernetes cluster s
 
 The simplest solution uses a firewall device that can control outbound traffic based on domain names. A firewall typically establishes a barrier between a trusted network and an untrusted network, such as the Internet. Azure Firewall, for example, can restrict outbound HTTP and HTTPS traffic based on the FQDN of the destination, giving you fine-grained egress traffic control, but at the same time allows you to provide access to the FQDNs encompassing an AKS cluster’s outbound dependencies (something that NSGs can't do). Likewise, you can control ingress traffic and improve security by enabling threat intelligence-based filtering on an Azure Firewall deployed to a shared perimeter network. This filtering can provide alerts, and deny traffic to and from known malicious IP addresses and domains.
 
-See the following video by Abhinav Sriram for a quick overview on how this works in practice on a sample environment:
+See the following video for a quick overview on how this works in practice on a sample environment:
 
 > [!VIDEO https://www.microsoft.com/en-us/videoplayer/embed/RE529Qc]