Merge pull request #313317 from MicrosoftDocs/main

Auto Publish – main to live - 2026-03-18 06:00 UTC

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

articles/api-management/private-endpoint.md

@@ -5,7 +5,7 @@ ms.service: azure-api-management
 author: dlepow
 ms.author: danlep
 ms.topic: how-to
-ms.date: 11/17/2025
+ms.date: 03/17/2026
 ms.custom:
   - build-2025
   - sfi-image-nochange
@@ -32,7 +32,9 @@ You can configure an inbound [private endpoint](../private-link/private-endpoint
 * Only the API Management instance's **Gateway endpoint** supports inbound Private Link connections. 
 * Each API Management instance supports at most 100 Private Link connections.
 * Connections aren't supported on the [self-hosted gateway](self-hosted-gateway-overview.md) or on a [workspace gateway](workspaces-overview.md#workspace-gateway). 
-* In the classic API Management tiers, private endpoints aren't supported in instances injected in an internal or external virtual network.
+* In the classic API Management tiers, private endpoints aren't supported in instances injected in an internal or external virtual network. 
+    > [!NOTE]
+    > In the Standard v2 and Premium v2 tiers, private endpoints are supported in instances with any supported virtual network configuration when fronted with [Azure Front Door Premium](../frontdoor/standard-premium/how-to-enable-private-link-apim.md).
 
 ## Typical scenarios
 
@@ -43,9 +45,6 @@ Supported configurations include:
 * Pass client requests through a firewall and configure rules to route requests privately to the API Management gateway.
 * Configure Azure Front Door (or Azure Front Door with Azure Application Gateway) to receive external traffic and then route traffic privately to the API Management gateway. For example, see [Connect Azure Front Door Premium to an Azure API Management with Private Link](../frontdoor/standard-premium/how-to-enable-private-link-apim.md).
 
-    > [!NOTE]
-    > Currently, routing traffic privately from Azure Front Door to an API Management Premium v2 instance isn't supported.
-
 ## Prerequisites
 
 - An existing API Management instance. [Create one if you haven't already](get-started-create-service-instance.md). 

articles/app-service/webjobs-sdk-how-to.md

@@ -158,7 +158,7 @@ The following table shows built-in roles that we recommend when you use triggers
 [Azure Service Bus Data Receiver]: ../role-based-access-control/built-in-roles.md#azure-service-bus-data-receiver
 [Azure Service Bus Data Sender]: ../role-based-access-control/built-in-roles.md#azure-service-bus-data-sender
 [Azure Service Bus Data Owner]: ../role-based-access-control/built-in-roles.md#azure-service-bus-data-owner
-[role-assignment-scope]: ../service-bus-messaging/service-bus-managed-service-identity.md#resource-scope
+[role-assignment-scope]: ../service-bus-messaging/service-bus-managed-service-identity.md#choose-the-resource-scope
 
 #### Connection strings in version 2.*x*
 

articles/application-gateway/ipv6-application-gateway-portal.md

@@ -65,7 +65,7 @@ If your error code isn't listed, submit a GitHub issue. On the right side of the
 | PrivateIPAddressInReservedRange | The specified IP address includes an address range required by Azure. Change IP address to avoid reserved range. | [Private IP addresses](../../virtual-network/ip-services/private-ip-addresses.md)
 | PrivateIPAddressNotInSubnet | The specified IP address is outside of the subnet range. Change IP address to fall within subnet range. | [Private IP addresses](../../virtual-network/ip-services/private-ip-addresses.md) |
 | PropertyChangeNotAllowed | Some properties can't be changed on a deployed resource. When updating a resource, limit your changes to permitted properties. | [Update resource](/azure/architecture/guide/azure-resource-manager/advanced-templates/update-resource) |
-| PublicIPCountLimitReached | You've reached the limit for the number of running public IPs. Shut down unneeded resources or contact Azure support to request an increase. For example, in Azure Databricks, see [Unexpected cluster termination](/azure/databricks/kb/clusters/termination-reasons) and [IP address limit prevents cluster creation](/azure/databricks/kb/clusters/azure-ip-limit). | [Public IP address limits](../management/azure-subscription-service-limits.md#publicip-address) |
+| PublicIPCountLimitReached | You've reached the limit for the number of running public IPs. Shut down unneeded resources or contact Azure support to request an increase. For example, in Azure Databricks, see [IP address limit prevents cluster creation](/azure/databricks/kb/clusters/azure-ip-limit). | [Public IP address limits](../management/azure-subscription-service-limits.md#publicip-address) |
 | RegionDoesNotAllowProvisioning | Select a different region or submit a quota support request for **Region access**. | |
 | RequestDisallowedByPolicy | Your subscription includes a resource policy that prevents an action you're trying to do during deployment. Find the policy that blocks the action. If possible, change your deployment to meet the limitations from the policy. | [Resolve policies](error-policy-requestdisallowedbypolicy.md) |
 | ReservedResourceName | Provide a resource name that doesn't include a reserved name. | [Reserved resource names](error-reserved-resource-name.md) |

articles/azure-resource-manager/troubleshooting/common-deployment-errors.md

@@ -68,7 +68,7 @@ After vSAN TRIM/UNMAP is enabled, you must meet certain prerequisites in order f
 
 For more information about how to reclaim space for Windows and Linux systems for TRIM/UNMAP to execute, see the following VMware articles:
 - [How to reclaim disk space](https://knowledge.broadcom.com/external/article/340005/reclaiming-disk-space-from-thin-provisio.html)
-- [Learn the procedure to enable TRIM/UNMAP](https://knowledge.broadcom.com/external/article/326595/procedure-to-enable-trimunmap.html)
+- [Learn the procedure to enable TRIM/UNMAP](https://techdocs.broadcom.com/us/en/vmware-cis/vsan/vsan/8-0/vsan-administration/expanding-and-managing-a-vsan-cluster/vsan-file-service/reclaiming-space-with-unmap-in-vsan-distributed-file-system.html)
 
 ## Set VMware vSAN space efficiency
 

articles/azure-vmware/configure-vsan.md

@@ -41,16 +41,16 @@ Azure Content Delivery Network global and Azure Content Delivery Network China h
 
      - Two pricing tiers: Standard and premium
 
-     - [Documentation](https://docs.azure.cn/en-us/cdn/)
+     - [Documentation](https://docs.azure.cn/en-us/frontdoor/china-cdn-retirement-faq)
 
 ## Next steps
 
 To learn more about Azure Content Delivery Network China, see:
 
 - [Content Delivery Network features](https://www.azure.cn/en-us/home/features/cdn/)
 
-- [Overview of Azure Content Delivery Network](https://docs.azure.cn/en-us/cdn/cdn-overview)
+- [Overview of Azure Content Delivery Network](https://docs.azure.cn/en-us/frontdoor/azure-china-cdn-and-afd-comparison)
 
-- [Use the Azure content delivery network](https://docs.azure.cn/en-us/cdn/cdn-how-to-use)
+- [Use the Azure content delivery network](https://docs.azure.cn/en-us/frontdoor/azure-china-cdn-migration-to-azure-front-door-guidance)
 
 - [Azure service availability in China](/azure/china/concepts-service-availability)

articles/cdn/cdn-china-delivery.md

@@ -17,7 +17,7 @@ Azure provides you with two ways to save on your usage by committing for one or
 
 ## Compare reservations with savings plans
 
-When you opt for reservations, you're making a commitment to use a specific type of compute instance or instance family, in a specific Azure region, for a set period of time. For example, you might commit to using a D2v4 virtual machine in the Japan East region for one year. A savings plan involves committing to a specific hourly expenditure on eligible compute services across all Azure regions for a certain period. For instance, you might commit to spending $5.00 per hour for three years. Reservations only apply to the specified compute service and region combination. Savings plan benefits are applicable to all usage from participating compute services across the globe, up to the hourly commitment.
+When you opt for reservations, you're making a commitment to use a specific type of compute instance or instance family, in a specific Azure region, for a set period of time. For example, you might commit to using a D2v4 virtual machine in the Japan East region for one year. An savings plan involves committing to a specific hourly expenditure on eligible compute services across all Azure regions for a certain period. For instance, you might commit to spending $5.00 per hour for three years. Reservations only apply to the specified compute service and region combination. Savings plan benefits are applicable to all usage from participating compute services across the globe, up to the hourly commitment.
 
 ### Choose a reservation
 

articles/cost-management-billing/savings-plan/decide-between-savings-plan-reservation.md

@@ -13,15 +13,15 @@ ms.date: 01/08/2026
 
 # How a savings plan discount is applied
 
-Savings plans save you money when you have consistent usage of Azure compute resources. A savings plan can help you save money by allowing you to commit to a fixed hourly spend on compute services for one-year or three-year terms. The savings can significantly reduce your resource costs by up to 65% from pay-as-you-go prices. Discount rates per meter vary by commitment term (1-year or 3-year), not commitment amount.
+Savings plans save you money when you have consistent usage of Azure compute resources. An savings plan can help you save money by allowing you to commit to a fixed hourly spend on compute services for one-year or three-year terms. The savings can significantly reduce your resource costs by up to 65% from pay-as-you-go prices. Discount rates per meter vary by commitment term (1-year or 3-year), not commitment amount.
 
 Each hour with a savings plan, your eligible compute usage is discounted until you reach your commitment amount – subsequent usage after you reach your commitment amount is priced at pay-as-you-go rates. A resource within the savings plan's scope must generate the usage to be eligible for a savings plan benefit. Each hour's benefit is _use-it-or-lose-it_, and can't be rolled over to another hour.
 
 The benefit is first applied to the product that has the greatest savings plan discount when compared to the equivalent pay-as-you-go rate (see your price list for savings plan pricing). The application prioritization is done to ensure that you receive the maximum benefit from your savings plan investment. We multiply the savings plan rate to that product's usage and deduct the result from the savings plan commitment. The process repeats until the commitment is exhausted (or until there's no more usage to consume the benefit).
 
 A savings plan discount only applies to resources associated with Enterprise Agreement, Microsoft Partner Agreement, and Microsoft Customer Agreements. Resources that run in a subscription with other offer types don't receive the discount.
 
-Here's a video that explains how a savings plan is applied to the compute environment.
+Here's a video that explains how an savings plan is applied to the compute environment.
 
 >[!VIDEO https://www.youtube.com/embed/AZOyh1rl3kU]
 
@@ -33,13 +33,13 @@ For example, VM _X_ has the highest savings plan discount of all savings plan-el
 
 ## Savings plan and Azure consumption discounts
 
-In most situations, a savings plan provides the best combination of flexibility and pricing.  If you're operating under an Azure consumption discount (ACD), in rare occasions, you might have some pay-as-you-go rates that are lower than the savings plan rate. In these cases, Azure uses the lower of the two rates.
+In most situations, an savings plan provides the best combination of flexibility and pricing.  If you're operating under an Azure consumption discount (ACD), in rare occasions, you might have some pay-as-you-go rates that are lower than the savings plan rate. In these cases, Azure uses the lower of the two rates.
 
 For example, VM _X_ has the highest savings plan discount of all savings plan-eligible resources you used in a particular hour. If you have an ACD rate that is lower than the savings plan rate, the ACD rate is applied to your hourly usage. The result is decremented from your hourly commitment. The approach ensures you always get the best available rate.
 
 ## Benefit allocation window
 
-With a savings plan, you get significant and flexible discounts off your pay-as-you-go rates in exchange for a one or three-year spend commitment. When you use an Azure resource, usage details are periodically reported to the Azure billing system. The billing system is tasked with quickly applying your savings plan in the most beneficial manner possible. The plan benefits are applied to usage that has the largest discount percentage first. For the application to be most effective, the billing system needs visibility to your usage in a timely manner.
+With an savings plan, you get significant and flexible discounts off your pay-as-you-go rates in exchange for a one or three-year spend commitment. When you use an Azure resource, usage details are periodically reported to the Azure billing system. The billing system is tasked with quickly applying your savings plan in the most beneficial manner possible. The plan benefits are applied to usage that has the largest discount percentage first. For the application to be most effective, the billing system needs visibility to your usage in a timely manner.
 
 The savings plan benefit application operates under a best fit benefit model. When your benefit application is evaluated for a given hour, the billing system incorporates usage arriving up to 48 hours after the given hour. During the sliding 48-hour window, you might see changes to charges, including the possibility of savings plan utilization that's greater than 100%. The situation happens because the system is constantly working to provide the best possible benefit application. Keep the 48-hour window in mind when you inspect your usage.
 

articles/cost-management-billing/savings-plan/discount-application.md

@@ -12,7 +12,7 @@ ms.author: onwokolo
 ---
 
 # Manage savings plans
-After you buy a savings plan, with sufficient permissions, you can make the following types of changes to a savings plan:
+After you buy an savings plan, with sufficient permissions, you can make the following types of changes to a savings plan:
 
 - Update a savings plan scope.
 - Change autorenewal settings.
@@ -93,9 +93,9 @@ Unlike reservations, you can't cancel or exchange savings plans. You can trade-i
 ## Change billing subscription
 Currently, the billing subscription used for monthly payments of a savings plan can't be changed.
 
-## Check billing subscription for a savings plan
+## Check billing subscription for an savings plan
 
-To check the billing subscription for a savings plan:
+To check the billing subscription for an savings plan:
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 2. Select **All services** > **Savings plans**.

articles/cost-management-billing/savings-plan/manage-savings-plan.md

@@ -1,7 +1,7 @@
 ---
-title: Permissions to buy a savings plan
+title: Permissions to buy an savings plan
 titleSuffix: Microsoft Cost Management
-description: This article provides you with information to understand who can buy a savings plan.
+description: This article provides you with information to understand who can buy an savings plan.
 author: nwokolo
 ms.reviewer: onwokolo
 ms.service: cost-management-billing
@@ -11,7 +11,7 @@ ms.date: 01/08/2026
 ms.author: onwokolo
 ---
 
-# Permissions to buy a savings plan
+# Permissions to buy an savings plan
 
 Savings plan discounts only apply to resources associated with subscriptions purchased through an Enterprise Agreement, Microsoft Customer Agreement, or Microsoft Partner Agreement. You can buy a savings plan for an Azure subscription that's of type Enterprise Agreement (MS-AZR-0017P or MS-AZR-0148P), Microsoft Customer Agreement, or Microsoft Partner Agreement. To determine if you're eligible to buy a plan, [check your billing type](../manage/view-all-accounts.md#check-the-type-of-your-account).
 
@@ -39,9 +39,9 @@ Microsoft Customer Agreement (MCA), Billing Profile Owners can restrict savings
 
 Partners can use **Home** > **Savings plan** in the [Azure portal](https://portal.azure.com/) to purchase savings plans on behalf of their customers.
 
-As of June 2023, partners can purchase a savings plan through the Partner Center. Previously, the savings plan was only supported for purchase through the Azure portal. Partners can now purchase a savings plan through the Partner Center portal or APIs. They can also continue to use the Azure portal.
+As of June 2023, partners can purchase an savings plan through the Partner Center. Previously, the savings plan was only supported for purchase through the Azure portal. Partners can now purchase an savings plan through the Partner Center portal or APIs. They can also continue to use the Azure portal.
 
-To purchase a savings plan by using the Partner Center APIs, see [Purchase savings plans](/partner-center/developer/azure-purchase-savings-plan).
+To purchase an savings plan by using the Partner Center APIs, see [Purchase savings plans](/partner-center/developer/azure-purchase-savings-plan).
 
 ## Need help?