Skip to content

Commit 0842bb3

Browse files
Merge pull request #311103 from MicrosoftDocs/main
Auto Publish – main to live - 2026-01-29 23:00 UTC
2 parents 93a2c5e + bd404a3 commit 0842bb3

25 files changed

Lines changed: 298 additions & 291 deletions

articles/app-service/configure-ssl-certificate-in-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom:
1717

1818
[!INCLUDE [app-service-managed-certificate](./includes/managed-certs/managed-certs-note.md)]
1919

20-
In your application code, you can access the [public or private certificates that you add to Azure App Service](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use public or private certificates in your application code.
20+
In your application code, you can access both [public key certificates and certificates that contain a private key that you add to Azure App Service.](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use public or private certificates in your application code.
2121

2222
This approach to using certificates in your code makes use of the Transport Layer Security (TLS) functionality in App Service, which requires your app to be in the Basic tier or higher. If your app is in the Free or Shared tier, you can [include the certificate file in your app repository](#load-a-certificate-from-a-file).
2323

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ Except for the Free tier, an App Service plan carries a charge on the compute re
7070

7171
- **Shared tier**: Each app receives a quota of CPU minutes, so *each app* is charged for the CPU quota.
7272
- **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).
73+
74+
> [!NOTE]
75+
> In dedicated compute tiers, the VM resources are **dedicated to your App Service plan and are not shared with other customers**.
76+
> However, **any apps you place inside the same App Service plan share those dedicated resources with each other**.
77+
> This means compute is dedicated at the **plan level**, not the **per-app level**.
78+
> To isolate compute per app, create a separate App Service plan.
79+
7380
- **IsolatedV2 tier**: The App Service Environment defines the number of isolated workers that run your apps, and *each worker* is charged.
7481

7582
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:

articles/azure-functions/functions-event-grid-blob-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ Visual Studio Code uses Azurite to emulate Azure Storage services when running l
273273

274274
1. Verify that the *local.settings.json* file has `"UseDevelopmentStorage=true"` set for `AzureWebJobsStorage`. This setting tells Core Tools to use Azurite instead of a real storage account connection when running locally.
275275

276-
1. Press F1 to open the command palette, type `Azurite: Start Blob Service`, and press enter. This action starts the Azurite Blob Storage service emulator.
276+
1. Press F1 to open the command palette, type `Azurite: Start`, and press Enter. This action starts the Azurite Blob Storage service emulator.
277277

278278
1. Select the Azure icon in the Activity bar, expand **Workspace** > **Attached Storage Accounts** > **Local Emulator**, right-click **Blob Containers**, select **Create Blob Container...**, enter the name `samples-workitems`, and press Enter.
279279

articles/azure-maps/supported-languages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ The following table provides supported views.
495495
| QA | Qatar (Arabic View) || | |
496496
| SA | Saudi Arabia (Arabic View) || | |
497497
| SY | Syria (Arabic View) || | |
498-
| US | United States of America | || |
498+
| US | United States of America | || |
499499
| YE | Yemen (Arabic View) || | |
500500
| Auto | Automatically detect based on request ||| |
501501
| Unified | Unified View (Others) |||

articles/azure-netapp-files/azure-netapp-files-resource-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: concept-article
8-
ms.date: 11/11/2025
8+
ms.date: 01/29/2026
99
ms.author: anfdocs
1010
# Customer intent: As an IT administrator managing Azure NetApp Files, I want to understand the resource limits and how to request limit increases, so that I can effectively plan and allocate storage resources for my organization’s needs.
1111
---

articles/azure-netapp-files/azure-netapp-files-service-levels.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: concept-article
8-
ms.date: 09/16/2025
8+
ms.date: 01/29/2026
99
ms.author: anfdocs
1010
# Customer intent: "As a cloud storage administrator, I want to understand the throughput capabilities of different service levels in Azure NetApp Files, so that I can choose the right configuration to meet my application's performance requirements."
1111
---
@@ -17,7 +17,7 @@ Service levels are an attribute of a capacity pool. Service levels are defined a
1717

1818
Azure NetApp Files supports five service levels: *Elastic*, *Flexible*, *Standard*, *Premium*, and *Ultra*.
1919

20-
The Elastic service level isn't bare-metal flash and is based on Azure infrastructure.
20+
The Flexible, Standard, Premium, and Ultra service levels deliver in‑Azure baremetal flash performance. The Elastic service level runs on Azure infrastructure and provides built‑in zonal redundancy with low single‑digit millisecond latency.
2121

2222
* **Elastic service level (preview)**:
2323
Elastic is an advanced, high-availability service level designed to deliver continuous data access with zero data loss even if an entire Azure Availability Zone becomes unavailable. This service eliminates single points of failure, making it ideal for mission-critical workloads that require uncompromising resilience and in-region data protection.

articles/azure-netapp-files/elastic-zone-redundant-concept.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Understand Azure NetApp Files zone-redundant storage service level
2+
title: Understand Azure NetApp Files Elastic zone-redundant storage service level
33
description: Understand the unique qualities of Elastic zone-redundant storage, which delivers built-in local redundancy is designed as a more affordable alternative.
44
services: azure-netapp-files
55
author: b-ahibbard
@@ -10,7 +10,7 @@ ms.author: anfdocs
1010
ms.custom: references-regions
1111
---
1212

13-
# Understand Azure NetApp Files zone-redundant storage service level (preview)
13+
# Understand Azure NetApp Files Elastic zone-redundant storage service level (preview)
1414

1515
Azure NetApp Files Elastic zone-redundant storage is a high-availability storage service level for Azure NetApp Files that synchronously replicates your data across multiple Azure Availability Zones in a single region. This means if one zone experiences an outage, your data and applications remain available from the other zones with zero data loss. Azure NetApp Files Elastic zone-redundant storage delivers similar enterprise-grade features as other Azure NetApp Files service levels (support for NFSv3, NFSv4.1, SMB, snapshots, clones, encryption, backup) but with built-in multi-availability zone redundancy. It eliminates single points of failure, ensuring continuous data access even during an entire zone outage.
1616

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
1919

2020
## January 2026
2121

22-
* [Elastic zone-redundant service level](elastic-zone-redundant-concept.md) (preview)
22+
* [Elastic zone-redundant storage service level](elastic-zone-redundant-concept.md) (preview)
2323

24-
Azure NetApp Files Elastic zone-redundant storage is an advanced high-availability service level for Azure NetApp Files that provides continuous data access with zero data loss, even if an entire Azure Availability Zone goes offline. Built on Azure’s Zone-redundant storage (ZRS) architecture and compute infrastructure, Azure NetApp Files Elastic zone-redundant storage synchronously replicates file data across availability zones within one region. By eliminating single points of failure, it ensures mission-critical workloads remain online and protected without requiring special configuration or manual intervention. This makes it ideal for applications that demand uncompromising resilience and in-region data protection.
24+
Azure NetApp Files Elastic zone-redundant storage service level is an advanced high-availability service level for Azure NetApp Files that provides continuous data access with zero data loss, even if an entire Azure Availability Zone goes offline. Built on Azure’s Zone-redundant storage (ZRS) architecture and compute infrastructure, Azure NetApp Files Elastic zone-redundant storage synchronously replicates file data across availability zones within one region. By eliminating single points of failure, it ensures mission-critical workloads remain online and protected without requiring special configuration or manual intervention. This makes it ideal for applications that demand uncompromising resilience and in-region data protection.
2525

26-
As a modern data platform, Azure NetApp Files Elastic zone-redundant storage provides consistent performance for metadata-heavy workloads across VMs and containers, making it well suited for AI, analytics, and Kubernetes/OpenShift environments. Whether youre running SAP shared files, AKS and containerized apps, cloud‑native applications, or general file shares, Azure NetApp Files Elastic zone-redundant storage delivers continuity without compromise, cost‑effective scalability, and operational simplicity. You can create volumes as small as 1 GiB, giving you the flexibility to optimize storage for workloads of any size.
26+
As a modern data platform, Azure NetApp Files Elastic zone-redundant storage provides consistent performance for metadata-heavy workloads across VMs and containers, making it well suited for AI, analytics, and Kubernetes/OpenShift environments. Whether you're running AKS and containerized apps, cloud‑native applications, or general file shares, Azure NetApp Files Elastic zone-redundant storage delivers continuity without compromise, cost‑effective scalability, and operational simplicity. You can create volumes as small as 1 GiB, giving you the flexibility to optimize storage for workloads of any size.
2727

2828
* [Application volume group for Oracle](configure-application-volume-oracle-api.md#replication) support for cross-zone and cross-region replication is now generally available (GA)
2929

articles/container-apps/plans.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
---
2-
title: Azure Container Apps plan types
3-
description: Compare different plans available in Azure Container Apps
2+
title: Azure Container Apps Plan Types
3+
description: Compare the plans that are available in Azure Container Apps.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.custom:
88
- ignite-2024
9-
ms.topic: conceptual
10-
ms.date: 11/05/2024
9+
ms.topic: concept-article
10+
ms.date: 01/28/2026
1111
ms.author: cshoe
1212
---
1313

1414
# Azure Container Apps plan types
1515

16-
Azure Container Apps features two different plan types.
16+
Azure Container Apps features two plan types:
1717

1818
| Plan type | Description |
1919
|--|--|
20-
| [Dedicated](#dedicated) | Fully managed environment with support for scale-to-zero and pay only for resources your apps use. Run apps with customized hardware and increased cost predictability using Dedicated [workload profiles](workload-profiles-overview.md) in the default workload profiles environment. |
21-
| [Consumption](#consumption) | Serverless environment with support for scale-to-zero and pay only for resources your apps use. |
20+
| [Dedicated](#dedicated) | Fully managed environment with support for scale-to-zero and paying only for resources that your apps use. Run apps with customized hardware and increased cost predictability by using Dedicated [workload profiles](workload-profiles-overview.md) in the default workload profiles environment. |
21+
| [Consumption](#consumption) | Serverless environment with support for scale-to-zero and paying only for resources that your apps use. |
2222

2323
<a id="consumption-dedicated"></a>
2424

@@ -27,28 +27,28 @@ Azure Container Apps features two different plan types.
2727
The Dedicated plan consists of a series of workload profiles that range from the default consumption profile to profiles that feature dedicated hardware customized for specialized compute needs.
2828

2929
You can select from general purpose or specialized compute
30-
[workload profiles](workload-profiles-overview.md) that provide larger amounts of CPU and memory or GPU enabled features. You pay per instance of the workload profile, versus per app, and workload profiles can scale in and out as demand rises and falls.
30+
[workload profiles](workload-profiles-overview.md) that provide larger amounts of CPU and memory or GPU-enabled features. You pay per instance of the workload profile, versus per app, and workload profiles can scale in and out as demand rises and falls.
3131

3232
Use the Dedicated plan when you need any of the following in a single environment:
3333

3434
- **Compute isolation**: Dedicated workload profiles provide access to dedicated hardware with a single tenant guarantee.
3535

36-
- **Customized compute**: Select from many types and sizes of workload profiles based on your apps requirements. You can deploy many apps to each workload profile. Each workload profile can scale independently as more apps are added or removed or as apps scale their replicas up or down.
36+
- **Customized compute**: Select from many types and sizes of workload profiles based on your app requirements. You can deploy many apps to each workload profile. Each workload profile can scale independently as more apps are added or removed or as apps scale their replicas up or down.
3737

38-
The Dedicated plan can be more cost effective when you're running higher scale deployments with steady throughput.
38+
The Dedicated plan can be more cost effective when you're running higher-scale deployments with steady throughput.
3939

4040
> [!NOTE]
4141
> When configuring your cluster with a user defined route for egress, you must explicitly send egress traffic to a network virtual appliance such as Azure Firewall.
4242
4343
## Consumption
4444

45-
The Consumption plan features a serverless architecture that allows your applications to scale in and out on demand. Applications can scale to zero, and you only pay for running apps.
45+
The Consumption plan features a serverless architecture that enables your applications to scale in and out on demand. Applications can scale to zero, and you only pay for running apps.
4646

47-
When you need on-demand specialized compute resources, you can use [serverless GPUs (preview)](gpu-serverless-overview.md).
47+
When you need on-demand specialized compute resources, you can use [serverless GPUs](gpu-serverless-overview.md).
4848

49-
## Next steps
49+
## Next step
5050

51-
Deploy an app with:
51+
Deploy an app with a:
5252

5353
- [Consumption plan](quickstart-portal.md)
5454
- [Dedicated plan](workload-profiles-manage-cli.md)

0 commit comments

Comments
 (0)