Merge pull request #302571 from MicrosoftDocs/main

Auto Publish – main to live - 2025-07-11 05:00 UTC

Author: learn-build-service-prod[bot]

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

@@ -23,7 +23,7 @@ Each App Service plan defines:
 - Region (West US, East US, and so on)
 - Number of virtual machine (VM) instances
 - Size of VM instances (small, medium, large)
-- Pricing tier (Free, Shared, Basic, Standard, Premium, PremiumV2, PremiumV3, IsolatedV2)
+- Pricing tier (Free, Shared, Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 IsolatedV2)
 
 ## Pricing tiers
 
@@ -32,7 +32,7 @@ The pricing tier of an App Service plan determines what App Service features you
 | Category | Tiers | Description |
 |:-|:-|:-|
 | Shared compute | Free, Shared | Free and Shared, the two base tiers, run an app on the same Azure VM as other App Service apps, including apps of other customers. These tiers allocate CPU quotas to each app that runs on the shared resources. The resources can't scale out. These tiers are intended for only development and testing purposes. |
-| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3 | The Basic, Standard, Premium, PremiumV2, and PremiumV3 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances that are available to you for scale-out. |
+| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 | The Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances that are available to you for scale-out. |
 | Isolated | IsolatedV2 | The IsolatedV2 tier runs dedicated Azure VMs on dedicated Azure virtual networks. This tier provides network isolation on top of compute isolation to your apps. It provides the maximum scale-out capabilities. |
 
 Each tier also provides a specific subset of App Service features. These features include custom domains and TLS/SSL certificates, autoscaling, deployment slots, backups, Azure Traffic Manager integration, and more. The higher the tier, the more features that are available. To find out which features are supported in each pricing tier, see the [App Service plan details](https://azure.microsoft.com/pricing/details/app-service/windows/#pricing).
@@ -41,29 +41,7 @@ You can find more comparisons of plans in [App Service limits](../azure-resource
 
 <a name="new-pricing-tier-premiumv3"></a>
 
-### PremiumV3 pricing tier
-
-The PremiumV3 pricing tier provides machines with faster processors (minimum 195 [Azure Compute Units](/azure/virtual-machines/acu) per virtual CPU), SSD storage, memory-optimized options, and quadruple memory-to-core ratio compared to the Standard tier.
-
-PremiumV3 also supports higher scale by using increased instance count, while it still provides the advanced capabilities in the Standard tier. PremiumV3 includes all features available in the PremiumV2 tier.
-
-Multiple VM sizes are available for this tier, including 4-to-1 and 8-to-1 memory-to-core ratios:
-
-| App Service plan | Cores (vCPU) | Memory (GiB) |
-|:-|:-|:-|
-| P0v3 | 1 | 4 |
-| P1v3 | 2 | 8 |
-| P1mv3 | 2 | 16 |
-| P2v3 | 4 | 16 |
-| P2mv3 | 4 | 32 |
-| P3v3 | 8 | 32 |
-| P3mv3 | 8 | 64 |
-| P4mv3 | 16 | 128 |
-| P5mv3 | 32 | 256 |
-
-For PremiumV3 pricing information, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
-
-To get started with the PremiumV3 pricing tier, see [Configure PremiumV3 tier for Azure App Service](app-service-configure-premium-tier.md).
+For pricing information, see [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/).
 
 ## Considerations for running and scaling an app
 
@@ -88,7 +66,7 @@ This section describes how App Service apps are billed. For detailed, region-spe
 Except for the Free tier, an App Service plan carries a charge on the compute resources that it uses:
 
 - **Shared tier**: Each app receives a quota of CPU minutes, so *each app* is charged for the CPU quota.
-- **Dedicated compute tiers (Basic, Standard, Premium, PremiumV2, PremiumV3)**: The App Service plan defines the number of VM instances that the apps are scaled to, so *each VM instance* in the App Service plan is charged. These VM instances are charged the same, regardless of how many apps are running on them. To avoid unexpected charges, see [Delete an App Service plan](app-service-plan-manage.md#delete-an-app-service-plan).
+- **Dedicated compute tiers (Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4)**: The App Service plan defines the number of VM instances that the apps are scaled to, so *each VM instance* in the App Service plan is charged. These VM instances are charged the same, regardless of how many apps are running on them. To avoid unexpected charges, see [Delete an App Service plan](app-service-plan-manage.md#delete-an-app-service-plan).
 - **IsolatedV2 tier**: The App Service Environment defines the number of isolated workers that run your apps, and *each worker* is charged.
 
 You aren't charged for using the App Service features that are available to you. These features include configuring custom domains, TLS/SSL certificates, deployment slots, and backups. The exceptions are:
@@ -129,12 +107,12 @@ Isolate your app in a new App Service plan when:
   | 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 |
+  | P0v3, P0v4 | 8 |
+  | P1v3, P1v4, I1v2 | 16 |
+  | P2v3, P2v4, I2v2, P1mv3, P1mv4 | 32 |
+  | P3v3, P3v4, I3v2, P2mv3 | 64 |
   | I4v2, I5v2, I6v2 | Maximum density bound by vCPU usage |
-  | P3mv3, P4mv3, P5mv3 | Maximum density bound by vCPU usage |
+  | P3mv3, P3mv4, P4mv3, P4mv4, P5mv3, P5mv4 | Maximum density bound by vCPU usage |
 - You want to scale the app independently from the other apps in the existing plan.
 - The app needs resources in a different geographical region. This way, you can allocate a new set of resources for your app and gain greater control of your apps.
 

articles/azure-cache-for-redis/cache-how-to-encryption.md

@@ -1,15 +1,11 @@
 ---
 title: Configure disk encryption in Azure Cache for Redis
 description: Learn about disk encryption when using Azure Cache for Redis.
-
-
-
 ms.topic: how-to
-ms.date: 02/28/2024
+ms.date: 07/09/2025
 appliesto:
   - ✅ Azure Cache for Redis
 
-
 ---
 
 # Configure disk encryption for Azure Cache for Redis instances using customer managed keys
@@ -20,22 +16,23 @@ Azure Cache for Redis offers platform-managed keys (PMKs), also know as Microsof
 
 ## Scope of availability for CMK disk encryption
 
-| Tier | Basic, Standard, Premium  | Enterprise, Enterprise Flash  |
-|:-:|---------|---------------|
-|Microsoft managed keys (MMK) | Yes   | Yes             |
-|Customer managed keys (CMK) | No     |  Yes            |
+- **Basic, Standard, Premium tiers:**
+  - Microsoft managed keys (MMK) are used for disk encryption in most cache sizes, except Basic and Standard sizes C0 and C1.
+  - Customer managed keys (CMK) aren't supported.
+
+- **Enterprise, Enterprise Flash tiers:**
+  - Microsoft managed keys (MMK) are supported.
+  - Customer managed keys (CMK) are supported.
 
 > [!WARNING]
-> By default, all Azure Cache for Redis tiers use Microsoft managed keys to encrypt disks mounted to cache instances. However, in the Basic and Standard tiers, the C0 and C1 SKUs do not support any disk encryption.
+> By default, all Azure Cache for Redis tiers use Microsoft managed keys to encrypt disks mounted to cache instances. However, in the Basic and Standard tiers, the C0 and C1 SKUs don't support any disk encryption.
 >
 
 > [!IMPORTANT]
 > On the Premium tier, data persistence streams data directly to Azure Storage, so disk encryption is less important. Azure Storage offers a [variety of encryption methods](../storage/common/storage-service-encryption.md) to be used instead.
 >
 
-## Encryption coverage
-
-### Enterprise tiers
+## Encryption for Enterprise tier
 
 In the **Enterprise** tier, disk encryption is used to encrypt the persistence disk, temporary files, and the OS disk:
 
@@ -47,22 +44,22 @@ MMK is used to encrypt these disks by default, but CMK can also be used.
 
 In the **Enterprise Flash** tier, keys and values are also partially stored on-disk using nonvolatile memory express (NVMe) flash storage. However, this disk isn't the same as the one used for persisted data. Instead, it's ephemeral, and data isn't persisted after the cache is stopped, deallocated, or rebooted. MMK is only supported on this disk because this data is transient and ephemeral.
 
-| Data stored |Disk    |Encryption Options |
-|-------------------|------------------|-------------------|
-|Persistence files | Persistence disk | MMK or CMK |
-|RDB files waiting to be exported | OS disk and Persistence disk | MMK or CMK |
-|Keys & values (Enterprise Flash tier only) | Transient NVMe disk | MMK |
+| Data stored                                    | Disk                          | Encryption Options |
+|------------------------------------------------|-------------------------------|--------------------|
+| Persistence files                              | Persistence disk              | MMK or CMK         |
+| RDB files waiting to be exported               | OS disk and Persistence disk  | MMK or CMK         |
+| Keys & values (Enterprise Flash tier only)    | Transient NVMe disk           | MMK                |
 
-### Other tiers
+## Encryption for Basic, Standard, and Premium tiers
 
-In the **Basic, Standard, and Premium** tiers, the OS disk is encrypted by default using MMK. There's no persistence disk mounted and Azure Storage is used instead. The C0 and C1 SKUs do not use disk encryption.
+In the **Basic, Standard, and Premium** tiers, the OS disk is encrypted by default using MMK. There's no persistence disk mounted and Azure Storage is used instead. The C0 and C1 SKUs don't use disk encryption.
 
 ## Prerequisites and limitations
 
 ### General prerequisites and limitations
 
 - Disk encryption isn't available in the Basic and Standard tiers for the C0 or C1 SKUs
-- Only user assigned managed identity is supported to connect to Azure Key Vault. System assigned managed identity is not supported.
+- Only user assigned managed identity is supported to connect to Azure Key Vault. System assigned managed identity isn't supported.
 - Changing between MMK and CMK on an existing cache instance triggers a long-running maintenance operation. We don't recommend this for production use because a service disruption occurs.
 
 ### Azure Key Vault prerequisites and limitations
@@ -100,13 +97,13 @@ In the **Basic, Standard, and Premium** tiers, the OS disk is encrypted by defau
 
 1. If using the **URI** input method, enter the Key Identifier URI for your chosen key from Azure Key Vault.  
 
-1. When you've entered all the information for your cache, select **Review + create**.
+1. When you enter all the information for your cache, select **Review + create**.
 
 ### Add CMK encryption to an existing Enterprise cache
 
 1. Go to the **Encryption** in the Resource menu of your cache instance. If CMK is already set up, you see the key information.
 
-1. If you haven't set up or if you want to change CMK settings, select **Change encryption settings**
+1. If you haven't set up CMK or want to change CMK settings, select **Change encryption settings**.
    :::image type="content" source="media/cache-how-to-encryption/cache-encryption-existing-use.png" alt-text="Screenshot encryption selected in the Resource menu for an Enterprise tier cache.":::
 
 1. Select **Use a customer-managed key** to see your configuration options.
@@ -133,3 +130,4 @@ Learn more about Azure Cache for Redis features:
 
 - [Data persistence](cache-how-to-premium-persistence.md)
 - [Import/Export](cache-how-to-import-export-data.md)
+- [Import/Export](cache-how-to-import-export-data.md)

articles/azure-functions/functions-develop-vs-code.md

@@ -135,12 +135,13 @@ The project template creates a project in your chosen language and installs the
 
 * **Dockerfile** (optional): Lets you create a containerized function app from your project by using an approved base image for your project. You only get this file when you run the command `Azure Functions: Create New Containerized Project...`. You can add a Dockerfile to an existing project using the `func init --docker-only` command in [Core Tools](./functions-core-tools-reference.md#func-init).  
 
-Depending on your language, these other files are created:
-
 ::: zone pivot="programming-language-csharp"  
 An HttpExample.cs class library file, the contents of which vary depending on whether your project runs in an [isolated worker process](dotnet-isolated-process-guide.md#project-structure) or [in-process](functions-dotnet-class-library.md#functions-class-library-project) with the Functions host.
 ::: zone-end  
-::: zone pivot="programming-language-java"  
+::: zone pivot="programming-language-java" 
+
+These files are created:
+ 
 + A pom.xml file in the root folder that defines the project and deployment parameters, including project dependencies and the [Java version](functions-reference-java.md#java-versions). The pom.xml also contains information about the Azure resources that are created during a deployment.
 
 + A [Functions.java file](functions-reference-java.md#triggers-and-annotations) in your src path that implements the function.
@@ -166,7 +167,8 @@ Files generated depend on the chosen Node.js programming model for Functions:
 
 ::: zone-end  
 ::: zone pivot="programming-language-powershell"  
-An HttpExample folder that contains:
+
+An HttpExample folder is created that contains:
 
 + The [function.json definition file](functions-reference-powershell.md#folder-structure)
 + A run.ps1 file, which contains the function code.