Merge branch 'main' into release-asr-cost-articles

Author: v-alje

.openpublishing.redirection.json

@@ -6430,6 +6430,11 @@
       "redirect_url": "/azure/iot-hub-device-update/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/reliability/asm-retirement.md",
+      "redirect_url": "/azure/azure-resource-manager/management/asm-retirement",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/reliability/reliability-azure-container-apps.md",
       "redirect_url": "/azure/reliability/reliability-container-apps",

articles/application-gateway/json-web-token-overview.md

@@ -338,7 +338,7 @@ To use these keys from clients, you need to retrieve them from the key vault.
 > [!NOTE]
 > Publishing as a function app requires the Aspire Azure App Service integration, which is currently in preview.
 
-You can configure Aspire to deploy to a function app using the [Aspire Azure App Service integration](/dotnet/aspire/azure/azure-app-service-integration). Because Aspire publishes the Functions project as a container, the hosting plan for your function app must support deploying containerized applications.
+You can configure Aspire to deploy to a function app using the [Aspire Azure App Service integration](https://aspire.dev/integrations/cloud/azure/azure-functions). Because Aspire publishes the Functions project as a container, the hosting plan for your function app must support deploying containerized applications.
 
 To publish your Aspire Functions project as a function app, follow these steps:
 

articles/azure-functions/dotnet-aspire-integration.md

@@ -1,12 +1,8 @@
 ---
 title: Azure Service Manager retirement
 description: Azure Service Manager retirement documentation for all classic compute, networking and storage resources
-author: surbhijain
 ms.topic: overview
-ms.date: 04/18/2024
-ms.author: surbhijain
-ms.service: azure-asm
-
+ms.date: 01/15/2026
 ---
 
 # Azure Service Manager retirement

articles/reliability/asm-retirement.md …rce-manager/management/asm-retirement.mdarticles/reliability/asm-retirement.md renamed to articles/azure-resource-manager/management/asm-retirement.md articles/reliability/asm-retirement.md renamed to articles/azure-resource-manager/management/asm-retirement.md

@@ -317,3 +317,6 @@
     href: https://stackoverflow.com/questions/tagged/azure-resource-manager
   - name: Manage personal data
     href: resource-manager-personal-data.md
+  - name: Azure Service Manager retirement
+    href: ./asm-retirement.md
+  

articles/azure-resource-manager/management/toc.yml

@@ -2,7 +2,7 @@
 title: About Azure Database for PostgreSQL Flexible server backup
 description: An overview on Azure Database for PostgreSQL Flexible server backup
 ms.topic: overview
-ms.date: 02/28/2025
+ms.date: 10/14/2025
 ms.service: azure-backup
 ms.custom:
   - ignite-2024

articles/backup/backup-azure-database-postgresql-flex-overview.md

@@ -2,11 +2,11 @@
 title: Automate email resource management
 titleSuffix: An Azure Communication Services Automation Sample
 description: This article describes how to automate the creation of Communication Services and Email Communication Services. This article also describes how to manage custom domains, configure DNS records, and verify domains.
-author: Deepika0530
+author: ddouglas-msft
 manager: komivi.agbakpem
 services: azure-communication-services
 
-ms.author: v-deepikal
+ms.author: ddouglas
 ms.date: 01/16/2025
 ms.topic: tutorial
 ms.service: azure-communication-services

articles/communication-services/samples/email-resource-management.md

@@ -67,6 +67,7 @@ Register the required namespaces.
 az provider register --namespace Microsoft.ExtendedLocation --wait
 az provider register --namespace Microsoft.KubernetesConfiguration --wait
 az provider register --namespace Microsoft.App --wait
+az provider register --namespace Microsoft.Web --wait
 az provider register --namespace Microsoft.OperationalInsights --wait
 ```
 
@@ -76,6 +77,7 @@ az provider register --namespace Microsoft.OperationalInsights --wait
 az provider register --namespace Microsoft.ExtendedLocation --wait
 az provider register --namespace Microsoft.KubernetesConfiguration --wait
 az provider register --namespace Microsoft.App --wait
+az provider register --namespace Microsoft.Web --wait
 az provider register --namespace Microsoft.OperationalInsights --wait
 ```
 

articles/container-apps/azure-arc-enable-cluster.md

@@ -1,8 +1,8 @@
 ---
 title: Reservation discount for Azure Data Explorer
 description: Learn how the reservation discount is applied to Azure Data Explorer markup meter.
-author: avneraa
-ms.author: avnera
+author: pri-mittal
+ms.author: primittal
 ms.reviewer: orspodek
 ms.service: azure-data-explorer
 ms.topic: conceptual

articles/cost-management-billing/reservations/understand-azure-data-explorer-reservation-charges.md

@@ -251,7 +251,7 @@ For more information, see [ERSPAN ports](best-practices/traffic-mirroring-method
 > [!NOTE]
 > This procedure restarts your sensor software to implement any changes made.
 >
-> Defender for IoT ERSPAN monitoring is tested, certified, and supported **only when the ERSPAN tunnel originates from Cisco devices.**
+> Defender for IoT ERSPAN monitoring is tested, certified, and supported **only when the ERSPAN tunnel originates from Cisco equipment.**
 >
 > ERSPAN tunnels from non-Cisco vendors are **not supported** and might fail due to differences in ERSPAN implementations.