merge conflict

Author: gitName

articles/api-management/TOC.yml

@@ -688,7 +688,7 @@
       href: breaking-changes/git-configuration-retirement-march-2025.md
     - name: Direct management API retirement (March 2025)
       href: breaking-changes/direct-management-api-retirement-march-2025.md
-    - name: Managed certificates suspension (August 2025)
+    - name: Managed certificates suspension (August 2025 - March 2026)
       href: breaking-changes/managed-certificates-suspension-august-2025.md
     - name: ADAL-based identity provider retirement (September 2025)
       href: breaking-changes/identity-provider-adal-retirement-sep-2025.md
@@ -703,4 +703,4 @@
   - name: Stack Overflow
     href: https://stackoverflow.com/questions/tagged/azure-api-management
   - name: aka.ms/apimlove
-    href: https://aka.ms/apimlove
+    href: https://aka.ms/apimlove

articles/api-management/breaking-changes/managed-certificates-suspension-august-2025.md

@@ -10,13 +10,15 @@ ms.date: 07/18/2025
 ms.author: danlep
 ---
 
-# Creation of managed certificates temporarily suspended for custom domains (August 2025)
+# Creation of managed certificates temporarily suspended for custom domains (August 2025 - March 2026)
 
 [!INCLUDE [premium-dev-standard-basic.md](../../../includes/api-management-availability-premium-dev-standard-basic.md)]
 
 Creation of Azure-managed certificates for custom domains in API Management will be temporarily turned off from August 15, 2025 to March 15, 2026. Existing managed certificates will be autorenewed and remain unaffected.
 
-In the classic service tiers, Azure API Management offers [free, managed TLS certificates for custom domains](../configure-custom-domain.md#domain-certificate-options) (preview), allowing customers to secure their endpoints without purchasing and managing their own certificates. Because of an industry-wide deprecation of CNAME-based Domain Control Validation (DCV), our Certificate Authority (CA), DigiCert, will migrate to a new validation platform to meet Multi-Perspective Issuance Corroboration (MPIC) requirements for issuing certificates. This migration requires us to temporarily suspend the creation of managed certificates for custom domains.
+In the classic service tiers, Azure API Management offers [free, managed TLS certificates for custom domains](../configure-custom-domain.md#domain-certificate-options) (preview), allowing customers to secure their endpoints without purchasing and managing their own certificates. Because of an industry-wide deprecation of CNAME-based Domain Control Validation (DCV), our Certificate Authority (CA), DigiCert, is moving to a new open-source software (OSS) domain control validation (DCV) platform that provides transparency and accountability increasing the trustworthiness of domain validation. As part of this transition, DigiCert will deprecate support for the legacy CNAME Delegation DCV workflow. This migration requires us to temporarily suspend the creation of managed certificates for custom domains.
+
+Note that this does not impact the standard CNAME DCV workflow (where DigiCert validates a random value in the CNAME record) which is still supported in the OSS validation system. This change affects several Azure services that currently rely on the soon-to-be deprecated CNAME for automated certificate issuance and renewal.
 
 ## Is my service affected by this?
 

articles/api-management/breaking-changes/overview.md

@@ -30,7 +30,7 @@ The following table lists all the upcoming breaking changes and feature retireme
 | [Git repository retirement][git2025] | March 15, 2025 |
 | [Direct management API retirement][mgmtapi2025] | March 15, 2025 |
 | [Workspaces preview breaking changes, part 2][workspaces2025march] | March 31, 2025 |
-| [Managed certificates suspension][managed-certificates-suspension-august-2025] | August 15, 2025 |
+| [Managed certificates suspension][managed-certificates-suspension-august-2025] | August 15, 2025 - March 15, 2026|
 | [ADAL-based Microsoft Entra ID identity provider retirement][msal2025] | September 30, 2025 |
 | [CAPTCHA endpoint update][captcha2025] | September 30, 2025 |
 | [Built-in analytics dashboard retirement][analytics2027] | March 15, 2027 |

articles/api-management/export-rest-mcp-server.md

@@ -74,4 +74,4 @@ Follow these steps to expose a managed REST API in API Management as an MCP serv
 
 :::image type="content" source="media/export-rest-mcp-server/mcp-server-list.png" alt-text="Screenshot of the MCP server list in the portal.":::
 
-[!INCLUDE [api-management-configure-test-mcp-server](../../includes/api-management-configure-test-mcp-server.md)]
+[!INCLUDE [api-management-configure-test-mcp-server](../../includes/api-management-configure-test-mcp-server.md)]

articles/application-gateway/for-containers/web-application-firewall.md

@@ -59,7 +59,6 @@ spec:
 The following functionality is not supported on a WAF Policy associated with Application Gateway for Containers:
 
 * WAF Security Copilot
-* WAF Security Copilot – Embedded
 * JavaScript (JS) Challenge Actions
 * CRS 3.2 and lower ruleset
 

articles/application-gateway/understanding-pricing.md

@@ -54,16 +54,13 @@ You can also pre-provision resources by specifying the **Instance Count**. Each
 
 Manually defined scale and limits set for autoscaling (minimum or maximum) are set in terms of instance count. The manually set scale for instance count and the minimum instance count in autoscale config reserves 10 capacity units/instance. These reserved capacity units are billed as long as the application gateway is active regardless of the actual resource consumption. If actual consumption crosses the 10 capacity units/instance threshold, additional capacity units are billed under the variable component.
 
-> [!NOTE]
-> An **Instance** is a physical deployment unit of Application Gateway. Users aren't billed directly for the number of instances, but rather for the capacity units reserved or consumed by the instances. 
-
 #### Total capacity units
 
 Total capacity units are calculated based on the higher of the capacity units by utilization or by instance count.
 
 ### Compute unit
 
-**Compute Unit** is the measure of compute capacity consumed. Factors affecting compute unit consumption are TLS connections/second, URL Rewrite computations, and WAF rule processing. The number of requests a compute unit can handle depends on various criteria like TLS certificate key size, key exchange algorithm, header rewrites, and in case of WAF: incoming request size.
+**Compute units** are an entirely different concept from capacity units. Compute units are a measure of compute capacity consumed, while capacity units are a measure of capacity utilization across multiple parameters. Compute units are one of three parameters used to calculate capacity units. Factors affecting compute unit consumption are TLS connections/second, URL Rewrite computations, and WAF rule processing. The number of requests a compute unit can handle depends on various criteria like TLS certificate key size, key exchange algorithm, header rewrites, and in case of WAF: incoming request size.
 
 Compute unit guidance:
 * Basic_v2 (preview) - Each compute unit is capable of approximately 10 connections per second with RSA 2048-bit key TLS certificate.
@@ -72,9 +69,6 @@ Compute unit guidance:
 
 The following table shows example prices using Application Gateway Standard v2 SKU. These prices are based on a snapshot of East US pricing and are for illustration purposes only.
 
-> [!NOTE]
-> Compute units are an entirely different concept from capacity units. Compute units are a measure of compute capacity consumed, while capacity units are a measure of capacity utilization across multiple parameters. Compute units are one of three parameters used to calculate capacity units.
-
 ### How much traffic can an instance handle?
 
 Each instance of Application Gateway Standard_v2 can handle the following traffic:

articles/cost-management-billing/manage/download-azure-invoice-daily-usage-date.md

@@ -7,7 +7,7 @@ ms.reviewer: jkinma
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 01/22/2025
+ms.date: 07/29/2025
 ms.author: jkinma
 ---
 

articles/cost-management-billing/manage/ea-understand-pricesheet.md

@@ -5,11 +5,11 @@ author: jkinma39
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 01/22/2025
+ms.date: 07/29/2025
 ms.author: jkinma
 ms.reviewer: jkinma
 ms.custom:
-  - build-2025
+- build-2025
 ---
 
 # Terms in your Enterprise Agreement price sheet

articles/cost-management-billing/manage/elevate-access-global-admin.md

@@ -7,7 +7,7 @@ ms.reviewer: jkinma
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 01/22/2025
+ms.date: 07/24/2025
 ms.author: jkinma
 ---
 

articles/cost-management-billing/manage/manage-billing-across-tenants.md

@@ -7,7 +7,7 @@ ms.reviewer: jkinma
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 01/22/2025
+ms.date: 07/29/2025
 ms.author: jkinma
 ---