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

Author: halkazwini

.openpublishing.publish.config.json

@@ -44,12 +44,6 @@
             "branch": "main",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "acr-tasks",
-            "url": "https://github.com/Azure-Samples/acr-tasks",
-            "branch": "master",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "active-directory-b2c-javascript-nodejs-webapi",
             "url": "https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi",
@@ -74,12 +68,6 @@
             "branch": "master",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "azure_arc_sample",
-            "url": "https://github.com/microsoft/azure_arc",
-            "branch": "main",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "azure_cli_scripts",
             "url": "https://github.com/Azure-Samples/azure-cli-samples",

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "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/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
       "redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -475,6 +480,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",
@@ -580,100 +590,10 @@
       "redirect_url": "https://azure.microsoft.com/features/azure-portal/",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/azure-portal/admin-timeout.md",
-      "redirect_url": "/azure/azure-portal/set-preferences#change-the-directory-timeout-setting-admin",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/azure-portal-change-theme-high-contrast.md",
-      "redirect_url": "/azure/azure-portal/set-preferences#choose-a-theme-or-enable-high-contrast",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/azure-portal-export-delete-settings.md",
-      "redirect_url": "/azure/azure-portal/set-preferences#export-user-settings",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
-      "redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/original-preferences.md",
-      "redirect_url": "/azure/azure-portal/set-preferences",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/resource-group-portal-linked-resources.md",
-      "redirect_url": "/azure/azure-portal/azure-portal-dashboards",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/classic-deployment-model-quota-increase-requests.md",
-      "redirect_url": "/azure/quotas/classic-deployment-model-quota-increase-requests",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/how-to-use-file-uploader.md",
-      "redirect_url": "/azure/azure-portal/supportability/how-to-manage-azure-support-request#upload-files",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/low-priority-quota.md",
-      "redirect_url": "/azure/quotas/spot-quota",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/networking-quota-requests.md",
-      "redirect_url": "/azure/quotas/networking-quota-requests",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/per-vm-quota-requests.md",
-      "redirect_url": "/azure/quotas/per-vm-quota-requests",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/quotas-overview.md",
-      "redirect_url": "/azure/quotas/quotas-overview",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/regional-quota-requests.md",
-      "redirect_url": "/azure/quotas/regional-quota-requests",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/resource-manager-core-quotas-request.md",
-      "redirect_url": "/azure/quotas/regional-quota-requests",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/sku-series-unavailable.md",
-      "redirect_url": "/troubleshoot/azure/general/region-access-request-process",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/spot-quota.md",
-      "redirect_url": "/azure/quotas/spot-quota",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/supportability/view-quotas.md",
-      "redirect_url": "/azure/quotas/view-quotas",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/azure-portal/tutorial-azureportal-devops.md",
-      "redirect_url": "/azure/devops/pipelines/get-started-designer?toc=%2Fazure%2Fdevops%2Fuser-guide%2Ftoc.json&bc=%2Fazure%2Fdevops%2Fuser-guide%2Fbreadcrumb%2Ftoc.json&tabs=new-nav",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/azure-preview-portal-supported-browsers-devices.md",
       "redirect_url": "/azure/azure-portal/azure-portal-supported-browsers-devices",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-resource-manager/management/control-plane-metrics.md",
@@ -788,12 +708,12 @@
     {
       "source_path_from_root": "/articles/azure-supportability/how-to-create-azure-support-request.md",
       "redirect_url": "/azure/azure-portal/supportability/how-to-create-azure-support-request",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/how-to-use-file-uploader.md",
       "redirect_url": "/azure/azure-portal/supportability/how-to-use-file-uploader",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/azure-supportability/index.yml",
@@ -1475,16 +1395,6 @@
       "redirect_url": "/azure/cloudfoundry",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/container-registry/manual-regional-move.md",
-      "redirect_url": "/azure/operational-excellence/relocation-container-registry",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/copilot/limited-access.md",
-      "redirect_url": "/azure/copilot/manage-access",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/data-catalog/data-catalog-developer-concepts.md",
       "redirect_url": "/previous-versions/azure/data-catalog/data-catalog-developer-concepts",
@@ -2540,21 +2450,6 @@
       "redirect_url": "/azure/developer/jenkins/pipeline-with-github-and-docker",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/kubernetes-fleet/access-fleet-kubernetes-api.md",
-      "redirect_url": "/azure/kubernetes-fleet/quickstart-access-fleet-kubernetes-api",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/kubernetes-fleet/configuration-propagation.md",
-      "redirect_url": "/azure/kubernetes-fleet/resource-propagation",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/kubernetes-fleet/resource-propagation.md",
-      "redirect_url": "/azure/kubernetes-fleet/concepts-resource-propagation",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/labs/anomaly-finder/apiref.md",
       "redirect_url": "/azure/ai-services/anomaly-detector/",
@@ -2620,21 +2515,6 @@
       "redirect_url": "/azure/ai-services/anomaly-detector/quickstarts/detect-data-anomalies-python",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/lighthouse/concepts/azure-delegated-resource-management.md",
-      "redirect_url": "/azure/lighthouse/concepts/architecture",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/lighthouse/how-to/partner-earned-credit.md",
-      "redirect_url": "/azure/cost-management-billing/manage/link-partner-id",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/lighthouse/samples/policy-samples.md",
-      "redirect_url": "/azure/lighthouse/samples/policy-reference",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/load-balancer/tutorial-cross-region-cli.md",
       "redirect_url": "/azure/virtual-network/ip-services/tutorial-cross-region-portal",
@@ -2720,6 +2600,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",
@@ -4776,7 +4661,7 @@
       "redirect_document_id": false
     },
     {
-           "source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-ps.md",
+      "source_path_from_root": "/articles/load-balancer/load-balancer-ipv6-internet-ps.md",
       "redirect_url": "/azure/load-balancer/virtual-network-ipv4-ipv6-dual-stack-standard-load-balancer-powershell",
       "redirect_document_id": false
     },
@@ -4791,4 +4676,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

articles/active-directory-b2c/azure-monitor.md

@@ -43,7 +43,7 @@ Watch this video to learn how to configure monitoring for Azure AD B2C using Azu
 ## Deployment overview
 
 Azure AD B2C uses [Microsoft Entra monitoring](../active-directory/reports-monitoring/overview-monitoring-health.md). Unlike Microsoft Entra tenants, an Azure AD B2C tenant can't have a subscription associated with it. So, we need to take extra steps to enable the integration between Azure AD B2C and Log Analytics, which is where we send the logs.
-To enable _Diagnostic settings_ in Microsoft Entra ID within your Azure AD B2C tenant, you use [Azure Lighthouse](../lighthouse/overview.md) to [delegate a resource](../lighthouse/concepts/architecture.md), which allows your Azure AD B2C (the **Service Provider**) to manage a Microsoft Entra ID (the **Customer**) resource.
+To enable _Diagnostic settings_ in Microsoft Entra ID within your Azure AD B2C tenant, you use [Azure Lighthouse](/azure/lighthouse/overview) to [delegate a resource](/azure/lighthouse/concepts/architecture), which allows your Azure AD B2C (the **Service Provider**) to manage a Microsoft Entra ID (the **Customer**) resource.
 
 > [!TIP]
 > Azure Lighthouse is typically used to manage resources for multiple customers. However, it can also be used to manage resources **within an enterprise that has multiple Microsoft Entra tenants of its own**, which is what we are doing here, except that we are only delegating the management of single resource group.
@@ -113,7 +113,7 @@ To create the custom authorization and delegation in Azure Lighthouse, we use an
 
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra ID tenant from the **Directories + subscriptions** menu.
-1. Use the **Deploy to Azure** button to open the Azure portal and deploy the template directly in the portal. For more information, see [create an Azure Resource Manager template](../lighthouse/how-to/onboard-customer.md#create-an-azure-resource-manager-template).
+1. Use the **Deploy to Azure** button to open the Azure portal and deploy the template directly in the portal. For more information, see [create an Azure Resource Manager template](/azure/lighthouse/how-to/onboard-customer#create-an-azure-resource-manager-template).
 
    [![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fazure-ad-b2c%2Fsiem%2Fmaster%2Ftemplates%2FrgDelegatedResourceManagement.json)
 
@@ -141,7 +141,7 @@ To create the custom authorization and delegation in Azure Lighthouse, we use an
    ]
    ```
 
-After you deploy the template, it can take a few minutes (typically no more than five) for the resource projection to complete. You can verify the deployment in your Microsoft Entra tenant and get the details of the resource projection. For more information, see [View and manage service providers](../lighthouse/how-to/view-manage-service-providers.md).
+After you deploy the template, it can take a few minutes (typically no more than five) for the resource projection to complete. You can verify the deployment in your Microsoft Entra tenant and get the details of the resource projection. For more information, see [View and manage service providers](/azure/lighthouse/how-to/view-manage-service-providers).
 
 ## 4. Select your subscription
 

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

@@ -264,7 +264,7 @@
   - name: Set or edit policies
     href: set-edit-policies.md
   - name: Author policies using Microsoft Copilot in Azure
-    href: ../copilot/author-api-management-policies.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
+    href: /azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
   - name: Debug policies in VS Code
     href: api-management-debug-policies.md
   - name: Policy expressions