Merge branch 'main' into 439236

Author: MeeraDi

.gitignore

@@ -46,3 +46,115 @@ articles/planetary-computer/image_syntax_checker.py
 articles/planetary-computer/image-file-fixer.py
 articles/planetary-computer/orphaned-media.py
 articles/planetary-computer/orphaned_media_files.txt
+articles/planetary-computer/naip-airports.md
+articles/planetary-computer/sentinel-2-l2a-grindavik.md
+articles/planetary-computer/temp_editor.md
+articles/planetary-computer/umbra-sar.md
+articles/planetary-computer/geocatalog_configs/buildingfootprint/mosaics.json
+articles/planetary-computer/geocatalog_configs/buildingfootprint/render-options.json
+articles/planetary-computer/geocatalog_configs/buildingfootprint/stac.json
+articles/planetary-computer/geocatalog_configs/buildingfootprint/tile-settings.json
+articles/planetary-computer/geocatalog_configs/ecmwf-forecast/mosaics.json
+articles/planetary-computer/geocatalog_configs/ecmwf-forecast/render-options.json
+articles/planetary-computer/geocatalog_configs/ecmwf-forecast/stac.json
+articles/planetary-computer/geocatalog_configs/ecmwf-forecast/tile-settings.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc/mosaics.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc/render-options.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc/stac.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc/tile-settings.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/mosaics.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/render-options.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/stac.json
+articles/planetary-computer/geocatalog_configs/esa-cci-lc-netcdf/tile-settings.json
+articles/planetary-computer/geocatalog_configs/fws-nwi/mosaics.json
+articles/planetary-computer/geocatalog_configs/fws-nwi/stac.json
+articles/planetary-computer/geocatalog_configs/fws-nwi/tile-settings.json
+articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-943/mosaics.json
+articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-943/stac.json
+articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-943/tile-settings.json
+articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-97/mosaics.json
+articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-97/stac.json
+articles/planetary-computer/geocatalog_configs/fws-nwi-tutorial-97/tile-settings.json
+articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/mosaics.json
+articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/render-options.json
+articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/stac.json
+articles/planetary-computer/geocatalog_configs/GEBCO_bathymetry/tile-settings.json
+articles/planetary-computer/geocatalog_configs/goes-glm/mosaics.json
+articles/planetary-computer/geocatalog_configs/goes-glm/stac.json
+articles/planetary-computer/geocatalog_configs/goes-glm/tile-settings.json
+articles/planetary-computer/geocatalog_configs/guam-dem/mosaics.json
+articles/planetary-computer/geocatalog_configs/guam-dem/render-options.json
+articles/planetary-computer/geocatalog_configs/guam-dem/stac.json
+articles/planetary-computer/geocatalog_configs/guam-dem/tile-settings.json
+articles/planetary-computer/geocatalog_configs/LA-Fires/mosaics.json
+articles/planetary-computer/geocatalog_configs/LA-Fires/render-options.json
+articles/planetary-computer/geocatalog_configs/LA-Fires/stac.json
+articles/planetary-computer/geocatalog_configs/LA-Fires/tile-settings.json
+articles/planetary-computer/geocatalog_configs/meta-population/render-options.json
+articles/planetary-computer/geocatalog_configs/meta-population/stac.json
+articles/planetary-computer/geocatalog_configs/meta-population/tile-settings.json
+articles/planetary-computer/geocatalog_configs/modis-14A1-061/mosaics.json
+articles/planetary-computer/geocatalog_configs/modis-14A1-061/stac.json
+articles/planetary-computer/geocatalog_configs/modis-14A1-061/tile-settings.json
+articles/planetary-computer/geocatalog_configs/modis-21A2-061/mosaics.json
+articles/planetary-computer/geocatalog_configs/modis-21A2-061/stac.json
+articles/planetary-computer/geocatalog_configs/modis-21A2-061/tile-settings.json
+articles/planetary-computer/geocatalog_configs/monrovia-drone/mosaics.json
+articles/planetary-computer/geocatalog_configs/monrovia-drone/render-options.json
+articles/planetary-computer/geocatalog_configs/monrovia-drone/stac.json
+articles/planetary-computer/geocatalog_configs/monrovia-drone/tile-settings.json
+articles/planetary-computer/geocatalog_configs/naip-airports/mosaics.json
+articles/planetary-computer/geocatalog_configs/naip-airports/render-options.json
+articles/planetary-computer/geocatalog_configs/naip-airports/stac.json
+articles/planetary-computer/geocatalog_configs/naip-airports/tile-settings.json
+articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/mosaics.json
+articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/render-options.json
+articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/stac.json
+articles/planetary-computer/geocatalog_configs/NAIP_Duplin_NC/tile-settings.json
+articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/mosaics.json
+articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/render-options.json
+articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/stac.json
+articles/planetary-computer/geocatalog_configs/nasa-nex-gddp-cmip6/tile-settings.json
+articles/planetary-computer/geocatalog_configs/ndvi_diff/mosaics.json
+articles/planetary-computer/geocatalog_configs/ndvi_diff/render-options.json
+articles/planetary-computer/geocatalog_configs/ndvi_diff/stac.json
+articles/planetary-computer/geocatalog_configs/ndvi_diff/tile-settings.json
+articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/mosaics.json
+articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/render-options.json
+articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/stac.json
+articles/planetary-computer/geocatalog_configs/noaa-climate-normals-netcdf/tile-settings.json
+articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus/mosaics.json
+articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus/stac.json
+articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus/tile-settings.json
+articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus-test/mosaics.json
+articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus-test/stac.json
+articles/planetary-computer/geocatalog_configs/noaa-hrrr-sfc-conus-test/tile-settings.json
+articles/planetary-computer/geocatalog_configs/noaa-mrms-qpe-1h-pass1/render-options.json
+articles/planetary-computer/geocatalog_configs/noaa-mrms-qpe-1h-pass1/stac.json
+articles/planetary-computer/geocatalog_configs/noaa-mrms-qpe-1h-pass1/tile-settings.json
+articles/planetary-computer/geocatalog_configs/potsdam-aerial/mosaics.json
+articles/planetary-computer/geocatalog_configs/potsdam-aerial/render-options.json
+articles/planetary-computer/geocatalog_configs/potsdam-aerial/stac.json
+articles/planetary-computer/geocatalog_configs/potsdam-aerial/tile-settings.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/mosaics.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/render-options.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/stac.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a-tutorial-231/tile-settings.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/mosaics.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/render-options.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/stac.json
+articles/planetary-computer/geocatalog_configs/sentinel-2-l2a_Grindavik/tile-settings.json
+articles/planetary-computer/geocatalog_configs/umbra-sar/mosaics.json
+articles/planetary-computer/geocatalog_configs/umbra-sar/render-options.json
+articles/planetary-computer/geocatalog_configs/umbra-sar/stac.json
+articles/planetary-computer/geocatalog_configs/umbra-sar/tile-settings.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/mosaics.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/render-options.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/stac.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-airplanes/tile-settings.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-ships/mosaics.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-ships/render-options.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-ships/stac.json
+articles/planetary-computer/geocatalog_configs/umbra-sar-ships/tile-settings.json
+articles/planetary-computer/helper-content/collection-config-scraper.py
+articles/planetary-computer/helper-content/generate_collection_docs.py

.openpublishing.redirection.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/backup/azure-elastic-storage-area-network-backup-manage.md",
+      "redirect_url": "/azure/backup/azure-elastic-san-backup-manage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/backup/azure-elastic-storage-area-network-backup-restore.md",
+      "redirect_url": "/azure/backup/azure-elastic-san-backup-restore",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/backup/azure-elastic-storage-area-network-backup-configure.md",
+      "redirect_url": "/azure/backup/azure-elastic-san-backup-configure",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/backup/azure-elastic-storage-area-network-backup-support-matrix.md",
+      "redirect_url": "/azure/backup/azure-elastic-san-backup-support-matrix",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/backup/azure-elastic-storage-area-network-backup-overview.md",
+      "redirect_url": "/azure/backup/azure-elastic-san-backup-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cdn/cdn-traffic-manager.md",
       "redirect_url": "/previous-versions/azure/cdn/cdn-traffic-manager",
@@ -2409,6 +2434,16 @@
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/gateway-sku-change.md",
+      "redirect_url": "/azure/vpn-gateway/gateway-sku-upgrade",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/gateway-sku-resize.md",
+      "redirect_url": "/azure/vpn-gateway/gateway-sku-upgrade",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -7059,6 +7094,26 @@
       "redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/app-service/sre-agent-overview.md",
+      "redirect_url": "/azure/sre-agent/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service/sre-agent-usage.md",
+      "redirect_url": "/azure/sre-agent/usage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/app-service/tutorial-sre-agent.md",
+      "redirect_url": "/azure/sre-agent/troubleshoot-azure-app-service",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/container-apps/sre-agent-troubleshoot.md",
+      "redirect_url": "/azure/sre-agent/troubleshoot-azure-container-apps",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/reliability/whats-new.md",
       "redirect_url": "/azure/reliability/overview",

articles/active-directory-b2c/billing.md

@@ -5,7 +5,7 @@ author: kengaderdus
 manager: CelesteDG
 ms.service: azure-active-directory
 ms.topic: reference
-ms.date: 06/10/2025
+ms.date: 06/13/2025
 ms.author: kengaderdus
 ms.subservice: b2c
 ms.custom: fasttrack-edit
@@ -19,7 +19,7 @@ ms.custom: fasttrack-edit
 
 Azure Active Directory B2C (Azure AD B2C) pricing is based on monthly active users (MAU), which is the count of unique users with authentication activity within a calendar month. This billing model applies to both Azure AD B2C tenants and [Microsoft Entra guest user collaboration (B2B)](../active-directory/external-identities/external-identities-pricing.md). MAU billing helps you reduce costs by offering a free tier and flexible, predictable pricing. 
 
-In this article, learn about MAU and Go Local billing, linking Azure AD B2C tenants to a subscription, and changing the pricing tier.
+In this article, learn about MAU and Go Local billing and linking Azure AD B2C tenants to a subscription.
 
 ## MAU overview
 
@@ -43,7 +43,7 @@ MAU billing went into effect for Azure AD B2C tenants on **November 1, 2019**. A
 - If you have an Azure AD B2C tenant that hasn't been linked to a subscription, link it now. 
 - If you have an existing Azure AD B2C tenant that was linked to a subscription before November 1, 2019, upgrade to the monthly active users (MAU) billing model. You can also choose to stay on the per-authentication billing model.
 
-Your Azure AD B2C tenant must also be linked to the appropriate Azure pricing tier based on the features you want to use. Premium features require Azure AD B2C [Premium P1 or P2 pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/). You might need to upgrade your pricing tier as you use new features. For example, for risk-based Conditional Access policies, you’ll need to select the Azure AD B2C Premium P2 pricing tier for your tenant.
+Your Azure AD B2C tenant must also be linked to the appropriate Azure pricing tier based on the features you want to use. Premium features require Azure AD B2C [Premium P1 pricing](https://azure.microsoft.com/pricing/details/active-directory-b2c/).
 
 > [!NOTE]
 > Your first 50,000 MAUs per month are free for both Premium P1 and Premium P2 features, but the **free tier doesn’t apply to free trial, credit-based, or sponsorship subscriptions**. Once the free trial period or credits expire for these types of subscriptions, you'll begin to be charged for Azure AD B2C MAUs. To determine the total number of MAUs, we combine MAUs from all your tenants (both Microsoft Entra ID and Azure AD B2C) that are linked to the same subscription.

articles/active-directory-b2c/enable-authentication-angular-spa-app.md

@@ -624,8 +624,7 @@ In the *src/app/profile* folder, update *profile.component.html* with the follow
 To call a [token-based authorization web API](enable-authentication-web-api.md), the app needs to have a valid access token. The [MsalInterceptor](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/msal-interceptor.md) provider automatically acquires tokens for outgoing requests that use the Angular [HttpClient](https://angular.io/api/common/http/HttpClient) class to known protected resources.
 
 > [!IMPORTANT]
-> The MSAL initialization method (in the `app.module.ts` class) maps protected resources, such as web APIs, with the required app scopes by using the `protectedResourceMap` object. If your code needs to call another web API, add the web API URI and the web API HTTP method, with the corresponding scopes, to the `protectedResourceMap` object. For more information, see [Protected Resource Map](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/master/lib/msal-angular/docs/v2-docs/msal-interceptor.md#protected-resource-map).
-
+> The MSAL initialization method (in the `app.module.ts` class) maps protected resources, such as web APIs, with the required app scopes by using the `protectedResourceMap` object. If your code needs to call another web API, add the web API URI and the web API HTTP method, with the corresponding scopes, to the `protectedResourceMap` object. For more information, see [Protected Resource Map](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/msal-interceptor.md#protected-resource-map).
 
 When the [HttpClient](https://angular.io/api/common/http/HttpClient)  object calls a web API, the [MsalInterceptor](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-angular/docs/msal-interceptor.md) provider takes the following steps:
 

articles/active-directory-b2c/faq.yml

@@ -8,7 +8,7 @@ metadata:
   ms.service: azure-active-directory
 
   ms.topic: faq
-  ms.date: 06/12/2024
+  ms.date: 06/20/2025
   ms.author: godonnell
   ms.subservice: b2c
   ms.custom: b2c-support, has-azure-ad-ps-ref,azure-ad-ref-level-one-done
@@ -24,7 +24,7 @@ sections:
       - question: |
           Azure AD B2C end of sale
         answer: |
-          Effective **May 1, 2025** Azure AD B2C will no longer be available to purchase for new customers, but current Azure AD B2C customers can continue using the product. The product experience, including creating new tenants or user flows, will remain unchanged. The operational commitments, including service level agreements (SLAs), security updates, and compliance, will also remain unchanged. We'll continue supporting Azure AD B2C until at least May 2030. More information, including migration plans will be made available. Contact your account representative for more information and to learn more about Microsoft Entra External ID.
+          Effective **May 1, 2025** Azure AD B2C will no longer be available to purchase for new customers, but current Azure AD B2C customers can continue using the product. The product experience, including creating new tenants or user flows, will remain unchanged; however, new tenants can only be created with Azure AD B2C P1.  Azure AD B2C P2 will be discontinued on March 15, 2026, for all customers. The operational commitments, including service level agreements (SLAs), security updates, and compliance, will also remain unchanged. We'll continue supporting Azure AD B2C until at least May 2030. More information, including migration plans will be made available. Contact your account representative for more information and to learn more about Microsoft Entra External ID.
       - question: |
           What is Microsoft Entra External ID?
         answer: |

articles/api-management/TOC.yml

@@ -113,7 +113,7 @@
         href: inject-vnet-v2.md
       - name: Virtual network integration (v2 tiers)
         href: integrate-vnet-outbound.md
-    - name: Virtual network integration (workspace gateway) - requirements
+    - name: Virtual network for workspace gateways
       href: virtual-network-workspaces-resources.md
     - name: Connect privately using private endpoint
       href: private-endpoint.md

articles/api-management/api-management-configuration-repository-git.md

@@ -52,7 +52,7 @@ This article describes how to enable and use Git to manage your service configur
 ## Save the service configuration to the Git repository
 
 > [!CAUTION]
-> Any secrets that are not defined as named values will be stored in the repository and will remain in its history. Named values provide a secure place to manage constant string values, including secrets, across all API configuration and policies, so you don't have to store them directly in your policy statements. For more information, see [Use named values in Azure API Management policies](api-management-howto-properties.md).
+> Any secrets that are not defined as named values will be stored in the repository and will remain in its history. Named values provide a secure place to manage constant string values, including secrets, across all API configurations and policies, so you don't have to store them directly in your policy statements. For more information, see [Use named values in Azure API Management policies](api-management-howto-properties.md).
 >