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

Author: halkazwini

.openpublishing.redirection.json

@@ -4365,6 +4365,11 @@
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/monitoring-best-practices.md",
+      "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/scenario-route-between-hubs-firewall.md",
       "redirect_url": "/azure/virtual-wan/scenario-route-between-vnets-firewall",

articles/app-service/configure-language-python.md

@@ -49,7 +49,7 @@ When you scale an App Service plan, the needed infrastructure is added automatic
 
 A scale operation on one size and operating system won't affect scaling of the other combinations of size and operating system. For example, if you are scaling a Windows I2v2 App Service plan, a scale operation to a Windows I3v2 App Service plan starts immediately. Scaling normally takes less than 15 minutes but can take up to 45 minutes.
 
-In a multi-tenant App Service, scaling is immediate, because a pool of shared resources is readily available to support it. App Service Environment is a single-tenant service, so there's no shared buffer, and resources are allocated based on need.
+In a multitenant App Service, scaling is immediate, because a pool of shared resources is readily available to support it. App Service Environment is a single-tenant service, so there's no shared buffer, and resources are allocated based on need.
 
 ## App access
 
@@ -177,7 +177,7 @@ If you have multiple App Service Environments, you might want some of them to be
 
 Select the value you want, and then select **Save**.
 
-![Screenshot that shows the App Service Environment configuration portal.][5]
+![Screenshot that shows the App Service Environment upgrade preference setting.][7]
 
 This feature makes the most sense when you have multiple App Service Environments, and you might benefit from sequencing the upgrades. For example, you might set your development and test App Service Environments to be early, and your production App Service Environments to be late.
 
@@ -199,6 +199,7 @@ To delete:
 [4]: ./media/using/using-logs.png
 [5]: ./media/using/using-configuration.png
 [6]: ./media/using/using-ip-addresses.png
+[7]: ./media/using/using-upgrade-preference.png
 
 <!--Links-->
 

articles/app-service/environment/media/using/using-appcreate-skus.png

@@ -2,26 +2,26 @@
 title: Scale up features and capacities
 description: Learn how to scale up an app in Azure App Service. Get more CPU, memory, disk space, and extra features.
 ms.assetid: f7091b25-b2b6-48da-8d4a-dcf9b7baccab
-ms.topic: article
-ms.date: 05/08/2023
+ms.topic: how-to
+ms.date: 08/26/2024
 ms.author: msangapu
 author: msangapu-msft
 ---
 # Scale up an app in Azure App Service
 
 This article shows you how to scale your app in Azure App Service. There are two workflows for scaling, scale up and scale out, and this article explains the scale up workflow.
 
-* [Scale up](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Get more CPU, memory, disk space, and extra features
+* [Scale up](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Get more CPU, memory, or disk space, or extra features
   like dedicated virtual machines (VMs), custom domains and certificates, staging slots, autoscaling, and more. You scale up by changing the pricing tier of the
   App Service plan that your app belongs to.
 * [Scale out](https://en.wikipedia.org/wiki/Scalability#Horizontal_and_vertical_scaling): Increase the number of VM instances that run your app.
-  Basic, Standard and Premium service plans scale out to as many as 3, 10 and 30 instances respectively. [App Service Environments](environment/intro.md)
-  in **Isolated** tier further increases your scale-out count to 100 instances. For more information about scaling out, see
+  Basic, Standard, and Premium service plans scale out to as many as 3, 10, and 30 instances, respectively. [App Service Environments](environment/intro.md)
+  in the Isolated tier further increase your scale-out count to 100 instances. For more information about scaling out, see
   [Scale instance count manually or automatically](/azure/azure-monitor/autoscale/autoscale-get-started). There, you find out how
   to use autoscaling, which is to scale instance count automatically based on predefined rules and schedules.
 
 >[!IMPORTANT]
-> [App Service now offers an automatic scale-out option to handle varying incoming HTTP requests.](./manage-automatic-scaling.md)
+> [App Service offers an automatic scale-out option to handle varying incoming HTTP requests.](./manage-automatic-scaling.md)
 >
 
 The scale settings take only seconds to apply and affect all apps in your [App Service plan](../app-service/overview-hosting-plans.md).
@@ -30,7 +30,7 @@ They don't require you to change your code or redeploy your application.
 For information about the pricing and features of individual App Service plans, see [App Service Pricing Details](https://azure.microsoft.com/pricing/details/web-sites/).  
 
 > [!NOTE]
-> Before you switch an App Service plan from the **Free** tier, you must first remove the [spending limits](https://azure.microsoft.com/pricing/spending-limits/) in place for your Azure subscription. To view or change options for your Microsoft Azure App Service subscription, see [Microsoft Azure Subscriptions][azuresubscriptions].
+> Before you switch an App Service plan from the Free tier, you must first remove the [spending limits](https://azure.microsoft.com/pricing/spending-limits/) in place for your Azure subscription. To view or change options for your App Service subscription, see [Cost Management + Billing][azuresubscriptions] in the Azure portal.
 > 
 > 
 
@@ -61,35 +61,35 @@ If your app depends on other services, such as Azure SQL Database or Azure Stora
 
 1. In the **Overview** page for your app, select the **Resource group** link.
 
-    ![Scale up your Azure app's related resources](./media/web-sites-scale/RGEssentialsLink.png)
+    ![Scale up your Azure app's related resources.](./media/web-sites-scale/RGEssentialsLink.png)
 
-2. In the **Summary** part of the **Resource group** page, select a resource that you want to scale. The following screenshot
+2. On the **Overview** page for the resource group, select a resource that you want to scale. The following screenshot
    shows a SQL Database resource.
 
     ![Navigate to resource group page to scale up your Azure app](./media/web-sites-scale/ResourceGroup.png)
 
-    To scale up the related resource, see the documentation for the specific resource type. For example, to scale up a single SQL Database, see [Scale single database resources in Azure SQL Database](/azure/azure-sql/database/single-database-scale). To scale up an Azure Database for MySQL resource, see [Scale MySQL resources](/azure/mysql/concepts-pricing-tiers#scale-resources).
+    To scale up the related resource, see the documentation for the specific resource type. For example, to scale up a single SQL database, see [Scale single database resources in Azure SQL Database](/azure/azure-sql/database/single-database-scale). To scale up an Azure Database for MySQL resource, see [Scale Azure Database for MySQL resources](/azure/mysql/concepts-pricing-tiers#scale-resources).
 
 <a name="OtherFeatures"></a>
 <a name="devfeatures"></a>
 
 ## Compare pricing tiers
 
-For detailed information, such as VM sizes for each pricing tier, see [App Service Pricing Details](https://azure.microsoft.com/pricing/details/app-service).
+For detailed information, such as VM sizes for each pricing tier, see [App Service Pricing Details](https://azure.microsoft.com/pricing/details/app-service/windows/).
 
 For a table of service limits, quotas, and constraints, and supported features in each tier, see [App Service limits](../azure-resource-manager/management/azure-subscription-service-limits.md#app-service-limits).
 
 <a name="Next Steps"></a>
 
-## More resources
+## Related content
 
-* [Scale instance count manually or automatically](/azure/azure-monitor/autoscale/autoscale-get-started)
+* [Get started with autoscale in Azure](/azure/azure-monitor/autoscale/autoscale-get-started)
 * [Configure Premium V3 tier for App Service](app-service-configure-premium-tier.md)
 * [Tutorial: Run a load test to identify performance bottlenecks in a web app](../load-testing/tutorial-identify-bottlenecks-azure-portal.md)
 <!-- LINKS -->
 [vmsizes]:https://azure.microsoft.com/pricing/details/app-service/
 [SQLaccountsbilling]:https://go.microsoft.com/fwlink/?LinkId=234930
-[azuresubscriptions]:https://account.windowsazure.com/subscriptions
+[azuresubscriptions]:https://ms.portal.azure.com/#view/Microsoft_Azure_Billing/BillingMenuBlade/~/Overview
 
 <!-- IMAGES -->
 [ChooseWHP]: ./media/web-sites-scale/scale1ChooseWHP.png