Fix merge conflicts

Author: cdpark

.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,15 @@
 {
   "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",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/azure-app-configuration/rest-api-postman.md",
       "redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-postman",
@@ -575,100 +585,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",
@@ -783,12 +703,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",
@@ -1470,16 +1390,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",
@@ -2535,21 +2445,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/",
@@ -2615,21 +2510,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",
@@ -4771,7 +4651,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
     },
@@ -4786,4 +4666,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

CODEOWNERS

@@ -29,3 +29,11 @@
 /articles/advisor @jasonwhowell @thomps23
 /articles/chaos-studio @jasonwhowell @thomps23
 /articles/service-health @jasonwhowell @thomps23
+/articles/azure-arc @jasonwhowell @thomps23
+/articles/azure-linux @jasonwhowell @thomps23
+/articles/azure-portal @jasonwhowell @thomps23
+/articles/copilot @jasonwhowell @thomps23
+/articles/lighthouse @jasonwhowell @thomps23
+/articles/quotas @jasonwhowell @thomps23
+/articles/container-registry @jasonwhowell @thomps23
+/articles/kubernetes-fleet @jasonwhowell @thomps23

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/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

articles/api-management/api-management-howto-aad.md

@@ -6,7 +6,7 @@ description: Learn how to enable user sign-in to the API Management developer po
 author: dlepow
 ms.service: azure-api-management
 ms.topic: article
-ms.date: 12/08/2023
+ms.date: 09/19/2024
 ms.author: danlep
 ms.custom: engagement-fy23, devx-track-azurecli
 ---
@@ -76,14 +76,7 @@ After the Microsoft Entra provider is enabled:
 1. Save the **Redirect URL** for later.
 
     :::image type="content" source="media/api-management-howto-aad/api-management-with-aad001.png" alt-text="Screenshot of adding identity provider in Azure portal.":::
-
-    > [!NOTE]
-    > There are two redirect URLs:<br/>
-    > * **Redirect URL** points to the latest developer portal of the API Management.
-    > * **Redirect URL (deprecated portal)** points to the deprecated developer portal of API Management.
-    >
-    > We recommended you use the latest developer portal Redirect URL.
-   
+  
 1. In your browser, open the Azure portal in a new tab. 
 1. Navigate to [App registrations](https://go.microsoft.com/fwlink/?linkid=2083908) to register an app in Active Directory.
 1. Select **New registration**. On the **Register an application** page, set the values as follows:
@@ -104,9 +97,6 @@ After the Microsoft Entra provider is enabled:
     * Select any option for **Expires**.
     * Choose **Add**. 
 1. Copy the client **Secret value** before leaving the page. You will need it later. 
-1. Under **Manage** in the side menu, select **Authentication**.
-    1. Under the **Implicit grant and hybrid flows** section, select the **ID tokens** checkbox.
-    1. Select **Save**.
 1. Under **Manage** in the side menu, select **Token configuration** > **+ Add optional claim**.
     1. In **Token type**, select **ID**.
     1. Select (check) the following claims: **email**, **family_name**, **given_name**.
@@ -117,21 +107,14 @@ After the Microsoft Entra provider is enabled:
     > [!IMPORTANT]
     > Update the **Client secret** before the key expires. 
 
-1. In the **Add identity provider** pane's **Allowed tenants** field, specify the Microsoft Entra instance's domains to which you want to grant access to the API Management service instance APIs. 
-    * You can separate multiple domains with newlines, spaces, or commas.
-
-    > [!NOTE]
-    > You can specify multiple domains in the **Allowed Tenants** section. A global administration must grant the application access to directory data before users can sign in from a different domain than the original app registration domain. To grant permission, the global administrator should:
-    > 1. Go to `https://<URL of your developer portal>/aadadminconsent` (for example, `https://contoso.portal.azure-api.net/aadadminconsent`).
-    > 1. Enter the domain name of the Microsoft Entra tenant to which they want to grant access.
-    > 1. Select **Submit**. 
-
+1. In **Signin tenant**, specify a tenant name or ID to use for sign-in to Microsoft Entra. If no value is specified, the Common endpoint is used.
+1. In **Allowed tenants**, add specific Microsoft Entra tenant names or IDs for sign-in to Microsoft Entra. 
 1. After you specify the desired configuration, select **Add**.
 1. Republish the developer portal for the Microsoft Entra configuration to take effect. In the left menu, under **Developer portal**, select **Portal overview** > **Publish**. 
 
 After the Microsoft Entra provider is enabled:
 
-* Users in the specified Microsoft Entra instance can [sign into the developer portal by using a Microsoft Entra account](#log_in_to_dev_portal).
+* Users in the specified Microsoft Entra tenant(s) can [sign into the developer portal by using a Microsoft Entra account](#log_in_to_dev_portal).
 * You can manage the Microsoft Entra configuration on the **Developer portal** > **Identities** page in the portal.
 * Optionally configure other sign-in settings by selecting **Identities** > **Settings**. For example, you might want to redirect anonymous users to the sign-in page.
 * Republish the developer portal after any configuration change.
@@ -160,7 +143,7 @@ For steps, see [Switch redirect URIs to the single-page application type](../act
 ## Add an external Microsoft Entra group
 
 Now that you've enabled access for users in a Microsoft Entra tenant, you can:
-* Add Microsoft Entra groups into API Management. 
+* Add Microsoft Entra groups into API Management. Groups added must be in the tenant where your API Management instance is deployed.
 * Control product visibility using Microsoft Entra groups.
 
 1. Navigate to the App Registration page for the application you registered in [the previous section](#enable-user-sign-in-using-azure-ad---portal).