Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

articles/app-service/overview-hosting-plans.md

@@ -4,7 +4,7 @@ description: Learn how App Service plans work in Azure App Service, how they're
 keywords: app service, azure app service, scale, scalable, scalability, app service plan, app service cost
 ms.assetid: dea3f41e-cf35-481b-a6bc-33d7fc9d01b1
 ms.topic: article
-ms.date: 08/21/2024
+ms.date: 02/28/2025
 ms.author: msangapu
 author: msangapu-msft
 ms.custom: UpdateFrequency3
@@ -105,24 +105,11 @@ If your app is in the same App Service plan with other apps, you may want to imp
 
 ## Should I put an app in a new plan or an existing plan?
 
-Since you pay for the computing resources your App Service plan allocates (see [How much does my App Service plan cost?](#cost)), you can potentially save money by putting multiple apps into one App Service plan. You can continue to add apps to an existing plan as long as the plan has enough resources to handle the load. However, keep in mind that apps in the same App Service plan all share the same compute resources. To determine whether the new app has the necessary resources, you need to understand the capacity of the existing App Service plan, and the expected load for the new app. Overloading an App Service plan can potentially cause downtime for your new and existing apps.
+Since you pay for the computing resources your App Service plan allocates (see [How much does my App Service plan cost?](#cost)), you can potentially save money by putting multiple apps into one App Service plan. You can continue to add apps to an existing plan as long as the plan has enough resources to handle the load. However, keep in mind that apps in the same App Service plan all share the same compute resources. To determine whether the new app has the necessary resources, you need to understand the capacity of the existing App Service plan, and the expected load for the new app. Overloading an App Service plan can potentially cause downtime for your new and existing apps. You can find more comparisons between plans at [App Service limits](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-app-service-limits).
 
 Isolate your app into a new App Service plan when:
 
-- The app is resource-intensive. The number may actually be lower depending on how resource intensive the hosted applications are. However, for general guidance, refer to the table below:
-
-  | App Service Plan SKU | Maximum Apps |
-  |--|--|
-  | B1, S1, P1v2, I1v1 | 8 |
-  | B2, S2, P2v2, I2v1 | 16 |
-  | B3, S3, P3v2, I3v1 | 32 |
-  | P0v3 | 8 |
-  | P1v3, I1v2 | 16 |
-  | P2v3, I2v2, P1mv3 | 32 |
-  | P3v3, I3v2, P2mv3 | 64 |
-  | I4v2, I5v2, I6v2 | Maximum density bound by vCPU usage |
-  | P3mv3, P4mv3, P5mv3 | Maximum density bound by vCPU usage |
-
+- The app is resource-intensive.
 - You want to scale the app independently from the other apps in the existing plan.
 - The app needs resources in a different geographical region.
 

articles/app-service/overview-local-cache.md

@@ -5,7 +5,7 @@ services: azure-netapp-files
 author: ram-kakani
 ms.service: azure-netapp-files
 ms.topic: conceptual
-ms.date: 12/05/2024
+ms.date: 02/28/2025
 ms.author: ramakk
 ms.custom: references_regions
 ---
@@ -40,15 +40,16 @@ The following table describes what’s supported for each network features confi
 |     Number of IPs in a VNet (including immediately peered VNets) accessing volumes in an Azure NetApp Files hosting VNet    |     [Same standard limits as virtual machines (VMs)](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-resource-manager-virtual-networking-limits)    |     1000    |
 |     Azure NetApp Files delegated subnets per VNet    |     1    |     1    |
 |     [Network Security Groups](../virtual-network/network-security-groups-overview.md) (NSGs) on Azure NetApp Files delegated   subnets    |     Yes    |     No    |
+| NSG support for private endpoints | Yes* | No | 
 |     [User-defined routes](../virtual-network/virtual-networks-udr-overview.md#user-defined) (UDRs) on Azure NetApp Files delegated subnets    |     Yes    |     No    |
-|     Connectivity to [Private Endpoints](../private-link/private-endpoint-overview.md)    |     Yes*    |     No    |
+|     Connectivity to [Private Endpoints](../private-link/private-endpoint-overview.md)    |     Yes    |     No    |
 |     Connectivity to [Service Endpoints](../virtual-network/virtual-network-service-endpoints-overview.md)    |     Yes  |     No    |
 |     Azure policies (for example, custom naming policies) on the Azure NetApp Files interface    |     No    |     No    |
 |     Load balancers for Azure   NetApp Files traffic    |     No    |     No    |
 |     Dual stack (IPv4 and   IPv6) VNet    |     No <br> (IPv4 only supported)    |     No <br> (IPv4 only supported)   |
 |    Traffic routed via NVA from peered VNet | Yes    | No |
 
-\* Applying Azure network security groups on the private link subnet to Azure Key Vault isn't supported for Azure NetApp Files customer-managed keys. Network security groups don't affect connectivity to Private Link unless Private endpoint network policy is enabled on the subnet. It's recommended to keep this option disabled.
+\* This feature is currently in preview in all regions where Azure NetApp Files is supported. For guidance on configuring NSG policies for private endpoints, see [Manage network policies for private endpoints](../private-link/disable-private-endpoint-network-policy.md).
 
 ### Supported network topologies
 

articles/azure-netapp-files/azure-netapp-files-network-topologies.md

@@ -5,24 +5,22 @@ services: azure-netapp-files
 author: b-hchen
 ms.service: azure-netapp-files
 ms.topic: how-to
-ms.date: 02/07/2025
+ms.date: 02/28/2025
 ms.custom: references_regions
 ms.author: anfdocs
 ---
 # Configure network features for an Azure NetApp Files volume
 
 The **Network Features** functionality enables you to indicate whether you want to use VNet features for an Azure NetApp Files volume. With this functionality, you can set the option to ***Standard*** or ***Basic***. You can specify the setting when you create a new NFS, SMB, or dual-protocol volume. You can also modify the network features option on existing volumes. See [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details about network features.
 
-This article helps you understand the options and shows you how to configure network features.
-
 ## Options for network features 
 
 Two settings are available for network features: 
 
 * ***Standard***  
     This setting enables VNet features for the volume.  
 
-    If you need higher IP limits or VNet features such as [network security groups](../virtual-network/network-security-groups-overview.md), [user-defined routes](../virtual-network/virtual-networks-udr-overview.md#user-defined), or additional connectivity patterns, you should set **Network Features** to *Standard*.
+    If you need higher IP limits or VNet features such as [network security groups (NSGs)](../virtual-network/network-security-groups-overview.md), [user-defined routes](../virtual-network/virtual-networks-udr-overview.md#user-defined), or additional connectivity patterns, you should set **Network Features** to *Standard*.
 
 * ***Basic***  
     This setting provides reduced IP limits (<1000) and no additional VNet features for the volumes.

articles/azure-netapp-files/configure-network-features.md

@@ -6,7 +6,7 @@ author: b-ahibbard
 ms.service: azure-netapp-files
 ms.custom: devx-track-terraform
 ms.topic: how-to
-ms.date: 12/17/2024
+ms.date: 02/05/2025
 ms.author: anfdocs
 ---
 # Manage availability zone volume placement for Azure NetApp Files
@@ -123,18 +123,20 @@ If you're using a custom RBAC role or the [built-in Contributor role](../role-ba
     	"properties": {
     	    "roleName": ""
     	    "description": ""
-    	    "assignableScopes": ["/subscription/<subscriptionID>"
-            ],
+    	    "assignableScopes": ["/subscription/<subscriptionID>"],
     	},
     	"permissions": [
-            {
-        	    "actions": [
-                	"Microsoft.NetApp/locations/*",
-                	"Microsoft.NetApp/netAppAccounts/read",
-                	"Microsoft.NetApp/netAppAccounts/renewCredentials/action",
-                    "Microsoft.NetApp/netAppAccounts/capacityPools/read",
-                ]
-            }]
+        {
+            "actions": [
+                "Microsoft.NetApp/locations/*",
+                "Microsoft.NetApp/netAppAccounts/read",
+                "Microsoft.NetApp/netAppAccounts/renewCredentials/action",
+                "Microsoft.NetApp/netAppAccounts/capacityPools/read",
+                ],
+            "notActions": [],
+            "dataActions": [],
+            "notDataActions": []
+        }]
     }
     ```
 

articles/azure-netapp-files/manage-availability-zone-volume-placement.md

@@ -6,7 +6,7 @@ author: b-hchen
 ms.service: azure-netapp-files
 ms.custom: linux-related-content
 ms.topic: overview
-ms.date: 02/11/2025
+ms.date: 02/28/2025
 ms.author: anfdocs
 ---
 
@@ -16,6 +16,10 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
 
 ## February 2025
 
+* [Network security group (NSG) support for private link connectivity](azure-netapp-files-network-topologies.md) (Preview)
+
+    Azure NetApp Files now supports private links with NSGs in all regions. This feature enables you to apply NSG policies to private link endpoints, enhancing the security of your workload deployments. 
+
 * [New volume usage metric](azure-netapp-files-metrics.md#volumes): volume inodes percentage 
 
     Azure NetApp Files metrics now enable you to see the percentage of a volume's total [inodes](maxfiles-concept.md) consumed. 

articles/azure-netapp-files/whats-new.md

@@ -68,7 +68,8 @@ At this time, for most address spaces, you must add a subnet named **AzureBastio
 
 ### <a name="write-permissions"></a>Are special permissions required to deploy Bastion to the AzureBastionSubnet?
 
-To deploy Bastion to the AzureBastionSubnet, write permissions are required. Example: **Microsoft.Network/virtualNetworks/write**.
+To deploy Bastion to the AzureBastionSubnet, the following RBAC permissions are required: **Microsoft.Network/virtualNetworks/write**,**Microsoft.Network/virtualNetworks/subnets/join/action**, and
+**Microsoft.Network/publicIPAddresses**
 
 ### <a name="subnet"></a>Can I have an Azure Bastion subnet of size /27 or smaller (/28, /29, etc.)?
 

articles/bastion/bastion-faq.md

@@ -11,12 +11,7 @@ metadata:
   ms.custom: compute-evergreen
 title: 'Application and service availability issues for Azure Cloud Services (classic): Frequently asked questions (FAQs)'
 summary: |
-  [!INCLUDE [Cloud Services (classic) deprecation announcement](includes/deprecation-announcement.md)]
-  
-  This article includes frequently asked questions about application and service availability issues for [Microsoft Azure Cloud Services](https://azure.microsoft.com/services/cloud-services). You can also consult the [Cloud Services Virtual Machine (VM) Size page](cloud-services-sizes-specs.md) for size information.
-  
-
-  
+  This article includes frequently asked questions about application and service availability issues for [Microsoft Azure Cloud Services](https://azure.microsoft.com/services/cloud-services). You can also consult the [Cloud Services Virtual Machine (VM) Size page](cloud-services-sizes-specs.md) for size information. 
 
 sections:
   - name: Ignored

articles/cloud-services/cloud-services-application-and-service-availability-faq.yml

@@ -12,57 +12,7 @@ metadata:
   ms.custom: compute-evergreen
 title: 'Configuration and management issues for Azure Cloud Services (classic): Frequently asked questions (FAQs)'
 summary: |
-  [!INCLUDE [Cloud Services (classic) deprecation announcement](includes/deprecation-announcement.md)]
-  
   This article includes frequently asked questions about configuration and management issues for [Microsoft Azure Cloud Services](https://azure.microsoft.com/services/cloud-services). You can also consult the [Cloud Services Virtual Machine (VM) Size page](cloud-services-sizes-specs.md) for size information.
-  
-
-  
-  **Certificates**
-  
-  - [Why is the certificate chain of my Cloud Service TLS/SSL certificate incomplete?](#why-is-the-certificate-chain-of-my-cloud-service-tls-ssl-certificate-incomplete-)
-  - [What is the purpose of the "Microsoft Azure Tools Encryption Certificate for Extensions"?](#what-is-the-purpose-of-the--microsoft-azure-tools-encryption-certificate-for-extensions--)
-  - [How can I generate a Certificate Signing Request (CSR) without "RDP-ing" in to the instance?](#how-can-i-generate-a-certificate-signing-request--csr--without--rdp-ing--in-to-the-instance-)
-  - [My Cloud Service Management Certificate is expiring. How to renew it?](#my-cloud-service-management-certificate-is-expiring--how-to-renew-it-)
-  - [How to automate the installation of main TLS/SSL certificate(.pfx) and intermediate certificate(.p7b)?](#how-to-automate-the-installation-of-main-tls-ssl-certificate--pfx--and-intermediate-certificate--p7b--)
-  - [What is the purpose of the "Microsoft Azure Service Management for MachineKey" certificate?](#what-is-the-purpose-of-the--microsoft-azure-service-management-for-machinekey--certificate-)
-  
-  **Monitoring and logging**
-  
-  - [What are the upcoming Cloud Service capabilities in the Azure portal that can help manage and monitor applications?](#what-are-the-upcoming-cloud-service-capabilities-in-the-azure-portal-that-can-help-manage-and-monitor-applications-)
-  - [Why does Internet Information Service (IIS) stop writing to the log directory?](#why-does-iis-stop-writing-to-the-log-directory-)
-  - [How do I enable WAD logging for Cloud Services?](#how-do-i-enable-wad-logging-for-cloud-services-)
-  
-  **Network configuration**
-  
-  - [How do I set the idle timeout for Azure load balancer?](#how-do-i-set-the-idle-timeout-for-azure-load-balancer-)
-  - [How do I associate a static IP address to my Cloud Service?](#how-do-i-associate-a-static-ip-address-to-my-cloud-service-)
-  - [What are the features and capabilities that Azure basic IPS/IDS and DDOS provide?](#what-are-the-features-and-capabilities-that-azure-basic-ips-ids-and-ddos-provide-)
-  - [How to enable HTTP/2 on Cloud Services VM?](#how-to-enable-http-2-on-cloud-services-vm-)
-  
-  **Permissions**
-  
-  - [Are Microsoft internal engineers able to remote desktop to Cloud Service instances without permission?](#can-microsoft-internal-engineers-remote-desktop-to-cloud-service-instances-without-permission-)
-  - [I can't remote desktop to Cloud Service VM  by using the RDP file. I get following error: An authentication error has occurred (Code: 0x80004005)](#i-can-t-remote-desktop-to-cloud-service-vm--by-using-the-rdp-file--i-get-following-error--an-authentication-error-has-occurred--code--0x80004005-)
-  
-  **Scaling**
-  
-  - [I can't scale beyond X instances](#i-can-t-scale-beyond-x-instances)
-  - [How can I configure Auto-Scale based on Memory metrics?](#how-can-i-configure-auto-scale-based-on-memory-metrics-)
-  
-  **Generic**
-  
-  - [How do I add `nosniff` to my website?](#how-do-i-add--nosniff--to-my-website-)
-  - [How do I customize IIS for a web role?](#how-do-i-customize-iis-for-a-web-role-)
-  - [What is the quota limit for my Cloud Service?](#what-is-the-quota-limit-for-my-cloud-service-)
-  - [Why does the drive on my Cloud Service VM show little free disk space?](#why-does-the-drive-on-my-cloud-service-vm-show-little-free-disk-space-)
-  - [How can I add an Antimalware extension for my Cloud Services in an automated way?](#how-can-i-add-an-antimalware-extension-for-my-cloud-services-in-an-automated-way-)
-  - [How to enable Server Name Indication (SNI) for Cloud Services?](#how-to-enable-server-name-indication--sni--for-cloud-services-)
-  - [How can I add tags to my Azure Cloud Service?](#how-can-i-add-tags-to-my-azure-cloud-service--)
-  - [The Azure portal doesn't display the SDK version of my Cloud Service. How can I get that?](#the-azure-portal-doesn-t-display-the-sdk-version-of-my-cloud-service--how-can-i-get-that-)
-  - [I want to shut down the Cloud Service for several months. How to reduce the billing cost of Cloud Service without losing the IP address?](#i-want-to-shut-down-the-cloud-service-for-several-months--how-to-reduce-the-billing-cost-of-cloud-service-without-losing-the-ip-address-)
-  
-  
 
 sections:
   - name: Certificates

articles/cloud-services/cloud-services-configuration-and-management-faq.yml

@@ -11,12 +11,7 @@ metadata:
   ms.custom: compute-evergreen
 title: 'Connectivity and networking issues for Azure Cloud Services (classic): Frequently asked questions (FAQs)'
 summary: |
-  [!INCLUDE [Cloud Services (classic) deprecation announcement](includes/deprecation-announcement.md)]
-  
   This article includes frequently asked questions about connectivity and networking issues for [Azure Cloud Services](https://azure.microsoft.com/services/cloud-services). For size information, see the [Cloud Services Virtual Machine (VM) size page](cloud-services-sizes-specs.md).
-  
-
-  
 
 sections:
   - name: Ignored