Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into apicdata

Author: gitName

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/api-management/self-hosted-gateway-migration-guide.md",
+      "redirect_url": "/previous-versions/azure/api-management/self-hosted-gateway-migration-guide",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/governance/machine-configuration/whats-new/migrating-from-dsc-extension.md ",
       "redirect_url": " https://azure.microsoft.com/updates/migrate-from-linux-dsc-extension-to-the-guest-configuration-feature-of-azure-policy-by-may-1-2025/",
@@ -480,6 +485,11 @@
       "redirect_url": "/azure/azure-health-insights/overview",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-maps/tutorial-iot-hub-maps.md",
+      "redirect_url": "/azure/azure-maps",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/azure-maps/about-creator.md",
       "redirect_url": "/azure/azure-maps/creator-indoor-maps",
@@ -2595,6 +2605,11 @@
       "redirect_url": "/azure/azure-maps/zoom-levels-and-tile-grid",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/managed-grafana/how-to-sync-teams-with-azure-ad-groups.md",
+      "redirect_url": "how-to-sync-teams-with-entra-groups",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/media-services/azure-media-player/azure-media-player-license.md",
       "redirect_url": "/legal/azure-media-player/azure-media-player-license",
@@ -4666,4 +4681,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

CODEOWNERS

@@ -2,19 +2,19 @@
 # Each line is a file pattern followed by one or more owners.
 
 # Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
-/articles/aks @tynevi @thomps23
-/articles/defender-for-cloud  @tynevi @thomps23
-/articles/attestation  @tynevi @thomps23
-/articles/confidential-ledger  @tynevi @thomps23
-/articles/dedicated-hsm  @tynevi @thomps23
-/articles/key-vault  @tynevi @thomps23
-/articles/payment-hsm  @tynevi @thomps23
-/articles/postgresql @tynevi @thomps23
-/articles/cosmos-db @tynevi @thomps23
-/articles/dms @tynevi @thomps23
-/articles/mariadb @tynevi @thomps23
-/articles/mysql @tynevi @thomps23
-/articles/managed-instance-apache-cassandra @tynevi @thomps23
+/articles/aks @tynevi @thomps23 @jasonwhowell
+/articles/defender-for-cloud  @tynevi @thomps23 @jasonwhowell
+/articles/attestation  @tynevi @thomps23 @jasonwhowell
+/articles/confidential-ledger  @tynevi @thomps23 @jasonwhowell
+/articles/dedicated-hsm  @tynevi @thomps23 @jasonwhowell
+/articles/key-vault  @tynevi @thomps23 @jasonwhowell
+/articles/payment-hsm  @tynevi @thomps23 @jasonwhowell
+/articles/postgresql @tynevi @thomps23 @jasonwhowell
+/articles/cosmos-db @tynevi @thomps23 @jasonwhowell
+/articles/dms @tynevi @thomps23 @jasonwhowell
+/articles/mariadb @tynevi @thomps23 @jasonwhowell
+/articles/mysql @tynevi @thomps23 @jasonwhowell
+/articles/managed-instance-apache-cassandra @tynevi @thomps23 @jasonwhowell
 /articles/virtual-machines @jasonwhowell @thomps23
 /articles/virtual-machines-scale-sets @jasonwhowell @thomps23
 /articles/container-instances @jasonwhowell @thomps23

articles/active-directory-b2c/custom-policy-developer-notes.md

@@ -30,18 +30,19 @@ Azure Active Directory B2C [user flows and custom policies](user-flow-overview.m
 
 - Support requests for public preview features can be submitted through regular support channels.
 
-## User flows
-|Feature  |User flow  |Custom policy  |Notes  |
-|---------|:---------:|:---------:|---------|
-| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA| |
-| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password.| GA | GA | |
-| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | |
-| [Self-Service password reset](add-password-reset-policy.md) | GA| GA| Available in China cloud, but only for custom policies. |
-| [Force password reset](force-password-reset.md) | GA | GA | Available in China cloud, but only for custom policies. |
-| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | Available in China cloud, but only for custom policies. |
-| [Smart lockout](threat-management.md) | GA | GA | |
-| [Conditional Access and Identity Protection](conditional-access-user-flow.md) | GA | GA | Not available for SAML applications. Limited CA features are available in China cloud. Identity Protection is not available in China cloud. |
-| [CAPTCHA](add-captcha.md) | Preview | Preview | You can enable it during sign-up or sign-in for Local accounts. |
+## Feature availability
+| Feature | User flow | Custom policy | User flow in China | Custom policy in China | Notes |
+|---|:---:|:---:|---|---|---|
+| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with email and password. | GA | GA | GA | GA |  |
+| [Sign-up and sign-in](add-sign-up-and-sign-in-policy.md) with username and password. | GA | GA | GA | GA |  |
+| [Profile editing flow](add-profile-editing-policy.md) | GA | GA | GA | GA |  |
+| [Self-Service password reset](add-password-reset-policy.md) | GA | GA | GA | GA |  |
+| [Force password reset](force-password-reset.md) | GA | GA | NA | GA |  |
+| [Phone sign-up and sign-in](phone-authentication-user-flows.md) | GA | GA | NA | GA |  |
+| [Smart lockout](threat-management.md) | GA | GA | NA | NA |  |
+| [Conditional Access](conditional-access-user-flow.md) | GA | GA | NA | Limited availability | Not available for SAML applications.  |
+| [Identity Protection](conditional-access-identity-protection-overview.md) | GA | GA | NA | NA |  |
+| [CAPTCHA](add-captcha.md) | Preview | Preview | NA | NA | You can enable it during sign-up or sign-in for Local accounts. |
 
 ## OAuth 2.0 application authorization flows
 

articles/api-management/TOC.yml

@@ -1,7 +1,6 @@
 - name: Azure API Management Documentation
   href: index.yml
 - name: Get started
-  expanded: true
   items:
   - name: What's new?
     href: https://github.com/Azure/API-Management/blob/main/changelogs/api-management-service.md
@@ -13,7 +12,7 @@
     - name: API Management features availability
       href: api-management-features.md
     - name: API Management gateways
-      href: api-management-gateways-overview.md  
+      href: api-management-gateways-overview.md
     - name: v2 service tiers
       href: v2-service-tiers-overview.md
     - name: Terminology
@@ -64,6 +63,7 @@
       href: api-management-howto-developer-portal-customize.md
     - name: 10 - Manage APIs in Visual Studio Code
       href: visual-studio-code-tutorial.md
+  expanded: true
 - name: Deployment and operations
   items:
   - name: Provision and scale
@@ -111,7 +111,7 @@
     - name: VNet injection (service) - requirements
       href: virtual-network-injection-resources.md
     - name: VNet integration (workspace gateway) - requirements
-      href: virtual-network-workspaces-resources.md  
+      href: virtual-network-workspaces-resources.md
     - name: Deploy to a VNet - external
       href: api-management-using-with-vnet.md
     - name: Deploy to a VNet - internal
@@ -290,7 +290,7 @@
   - name: Self-hosted gateway overview
     href: self-hosted-gateway-overview.md
   - name: Deploy the gateway
-    items: 
+    items:
     - name: Provision a self-hosted gateway
       href: api-management-howto-provision-self-hosted-gateway.md
     - name: Deploy a self-hosted gateway to Azure Kubernetes Service
@@ -304,7 +304,7 @@
     - name: Deploy a self-hosted gateway to Docker
       href: how-to-deploy-self-hosted-gateway-docker.md
     - name: Deploy a self-hosted gateway to Azure Container Apps
-      href: how-to-deploy-self-hosted-gateway-container-apps.md  
+      href: how-to-deploy-self-hosted-gateway-container-apps.md
     - name: Deploy an Azure API Management gateway to Arc-enabled Kubernetes cluster
       href: how-to-deploy-self-hosted-gateway-azure-arc.md
   - name: Configure custom domain for self-hosted gateway
@@ -319,8 +319,6 @@
     href: self-hosted-gateway-enable-azure-ad.md
   - name: Guidance for running on Kubernetes
     href: how-to-self-hosted-gateway-on-kubernetes-in-production.md
-  - name: Migrate to self-hosted gateway v2
-    href: self-hosted-gateway-migration-guide.md
   - name: Support policy for self-hosted gateway
     href: self-hosted-gateway-support-policies.md
 - name: Secure your APIs
@@ -390,13 +388,13 @@
     - name: Extend portal with custom functionality
       href: developer-portal-extend-custom-functionality.md
     - name: Enable CORS for interactive console
-      href: enable-cors-developer-portal.md    
+      href: enable-cors-developer-portal.md
     - name: Enable console OAuth support
       href: api-management-howto-oauth2.md
     - name: Integrate Application Insights
       href: developer-portal-integrate-application-insights.md
     - name: Log developer portal usage
-      href: developer-portal-enable-usage-logs.md  
+      href: developer-portal-enable-usage-logs.md
     - name: Integrate Google Tag Manager
       href: developer-portal-integrate-google-tag-manager.md
     - name: Customize developer portal on WordPress
@@ -425,20 +423,19 @@
       href: api-management-howto-configure-notifications.md
   - name: Export APIs
     items:
-
     - name: Inventory APIs in API Center
       href: ../api-center/import-api-management-apis.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
     - name: Export APIs to Postman for API development
       displayName: collection
       href: export-api-postman.md
     - name: Export APIs to the Power Platform
       items:
-        - name: Export API as custom connector
-          displayName: Power Platform
-          href: export-api-power-platform.md
-        - name: Enable CORS for custom connector
-          displayName: Power Platform
-          href: enable-cors-power-platform.md
+      - name: Export API as custom connector
+        displayName: Power Platform
+        href: export-api-power-platform.md
+      - name: Enable CORS for custom connector
+        displayName: Power Platform
+        href: enable-cors-power-platform.md
   - name: Monetize APIs
     items:
     - name: Monetization overview
@@ -681,7 +678,7 @@
     - name: stv1 compute platform retirement - Global Azure (August 2024)
       href: breaking-changes/stv1-platform-retirement-august-2024.md
     - name: stv1 compute platform retirement - Azure Government, Azure in China (February 2025)
-      href: breaking-changes/stv1-platform-retirement-sovereign-clouds-february-2025.md 
+      href: breaking-changes/stv1-platform-retirement-sovereign-clouds-february-2025.md
     - name: Workspaces preview breaking changes, part 2 (March 2025)
       href: breaking-changes/workspaces-breaking-changes-march-2025.md
     - name: Git configuration retirement (March 2025)

articles/api-management/api-management-gateways-overview.md

@@ -54,8 +54,6 @@ API Management offers both managed and self-hosted gateways:
 
     * Each self-hosted gateway is associated with a **Gateway** resource in a cloud-based API Management instance from which it receives configuration updates and communicates status. 
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-deprecation.md)]
-
 ## Feature comparison: Managed versus self-hosted gateways
 
 The following tables compare features available in the following API Management gateways:

articles/api-management/breaking-changes/self-hosted-gateway-v0-v1-retirement-oct-2023.md

@@ -5,15 +5,15 @@ services: api-management
 author: dlepow
 ms.service: azure-api-management
 ms.topic: reference
-ms.date: 09/06/2022
+ms.date: 09/25/2024
 ms.author: danlep
 ---
 
 # Support ending for Azure API Management self-hosted gateway version 0 and version 1 container images (October 2023)
 
 [!INCLUDE [api-management-availability-premium-dev](../../../includes/api-management-availability-premium-dev.md)]
 
-The [self-hosted gateway](../self-hosted-gateway-overview.md) is an optional, containerized version of the default managed gateway included in every API Management service. On 1 October 2023 we're removing support for the v0 and v1 versions of the self-hosted gateway container image. If you've deployed the self-hosted gateway using either of these container images, you need to take the steps below to continue using the self-hosted gateway by migrating to the v2 container image and configuration API.
+The [self-hosted gateway](../self-hosted-gateway-overview.md) is an optional, containerized version of the default managed gateway included in every API Management service. On 1 October 2023 we removed support for the v0 and v1 versions of the self-hosted gateway container image. If you've deployed the self-hosted gateway using either of these container images, you need to take the steps below to continue using the self-hosted gateway by migrating to the v2 container image and configuration API.
 
 ## Is my service affected by this?
 
@@ -33,7 +33,7 @@ We highly recommend customers to use ["All Recommendations" overview in Azure Ad
 
 ## What is the deadline for the change?
 
-**Support for the v1 configuration API and for the v0 and v1 container images of the self-hosted gateway will retire on 1 October 2023.**   
+**Support for the v1 configuration API and for the v0 and v1 container images of the self-hosted gateway retired on 1 October 2023.**   
 
 Version 2 of the configuration API and container image is already available, and includes the following improvements:  
 
@@ -45,7 +45,7 @@ If you are using version 0 or version 1 of the self-hosted gateway, you will nee
 
 ## What do I need to do?
 
-Migrate all your existing deployments of the self-hosted gateway using version 0 or version 1 to the newest v2 container image and v2 configuration API by 1 October 2023.
+Migrate all your existing deployments of the self-hosted gateway using version 0 or version 1 to the newest v2 container image and v2 configuration API.
 
 Follow the [migration guide](../self-hosted-gateway-migration-guide.md) for a successful migration.
 

articles/api-management/how-to-deploy-self-hosted-gateway-azure-kubernetes-service.md

@@ -15,8 +15,6 @@ ms.author: danlep
 
 This article provides the steps for deploying self-hosted gateway component of Azure API Management to [Azure Kubernetes Service](https://azure.microsoft.com/services/kubernetes-service/). For deploying self-hosted gateway to a Kubernetes cluster, see the how-to article for deployment by using a [deployment YAML file](how-to-deploy-self-hosted-gateway-kubernetes.md) or [with Helm](how-to-deploy-self-hosted-gateway-kubernetes-helm.md).
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-deprecation.md)]
-
 > [!NOTE]
 > You can also deploy self-hosted gateway to an [Azure Arc-enabled Kubernetes cluster](how-to-deploy-self-hosted-gateway-azure-arc.md) as a [cluster extension](/azure/azure-arc/kubernetes/extensions).
 

articles/api-management/how-to-deploy-self-hosted-gateway-docker.md

@@ -15,8 +15,6 @@ ms.author: danlep
 
 This article provides the steps for deploying self-hosted gateway component of Azure API Management to a Docker environment.
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-deprecation.md)]
-
 > [!NOTE]
 > Hosting self-hosted gateway in Docker is best suited for evaluation and development use cases. Kubernetes is recommended for production use. Learn how to [deploy with Helm](how-to-deploy-self-hosted-gateway-kubernetes-helm.md) or using [deployment YAML file](how-to-deploy-self-hosted-gateway-kubernetes.md) to learn how to deploy self-hosted gateway to Kubernetes.
 

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes-helm.md

@@ -17,8 +17,6 @@ ms.author: tomkerkhove
 
 This article provides the steps for deploying self-hosted gateway component of Azure API Management to a Kubernetes cluster by using Helm.
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-deprecation.md)]
-
 > [!NOTE]
 > You can also deploy self-hosted gateway to an [Azure Arc-enabled Kubernetes cluster](how-to-deploy-self-hosted-gateway-azure-arc.md) as a [cluster extension](/azure/azure-arc/kubernetes/extensions).
 

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes.md

@@ -14,8 +14,6 @@ ms.date: 05/22/2023
 
 This article describes the steps for deploying the self-hosted gateway component of Azure API Management to a Kubernetes cluster.
 
-[!INCLUDE [preview](./includes/preview/preview-callout-self-hosted-gateway-deprecation.md)]
-
 > [!NOTE]
 > You can also deploy self-hosted gateway to an [Azure Arc-enabled Kubernetes cluster](how-to-deploy-self-hosted-gateway-azure-arc.md) as a [cluster extension](/azure/azure-arc/kubernetes/extensions).