fixing merge conflict

Author: paulth1

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
+      "redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
+      "redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/confidential-computing/virtual-machine-solutions.md",
       "redirect_url": "/azure/virtual-machines/",
@@ -2010,21 +2020,6 @@
       "redirect_url": "/azure/migrate/migrate-services-overview",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/monitoring/management-overview-monitoring.md",
-      "redirect_url": "/azure/monitoring/",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/monitoring/monitoring-container-health.md",
-      "redirect_url": "/azure/monitoring/monitoring-container-insights-overview",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/monitoring/monitoring-walkthrough-servicemap.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/multi-factor-authentication/end-user/index.md",
       "redirect_url": "/azure/multi-factor-authentication/end-user/multi-factor-authentication-end-user",
@@ -2210,101 +2205,6 @@
       "redirect_url": "/azure/openshift/delete-cluster",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/index.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/oms-solution-agenthealth.md",
-      "redirect_url": "/azure/monitoring/monitoring-solution-agenthealth",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/oms-solution-office-365.md",
-      "redirect_url": "/azure/monitoring/monitoring-solution-office-365",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-architecture.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-integration.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-overview.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-runbook-datacollect.md",
-      "redirect_url": "/azure/monitoring/monitoring-runbook-datacollect",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-sdk.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-service-map-scom.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map-scom",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-service-map.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solution-targeting.md",
-      "redirect_url": "/azure/monitoring/monitoring-solution-targeting",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-best-practices.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-best-practices",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-creating.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-creating",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-automation.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-resources-automation",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-searches-alerts.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-resources-searches-alerts",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-views.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-resources-views",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-solution-file.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-solution-file",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-walkthrough-servicemap.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/operator-service-manager/overview.md",
       "redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -3701,4 +3601,4 @@
       "redirect_document_id": false
     }
   ]
-}
+}

articles/active-directory-b2c/identity-provider-ping-one.md

@@ -25,7 +25,7 @@ zone_pivot_groups: b2c-policy-type
 
 ## Create a PingOne application
 
-To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. For more information, see [Adding or updating an OIDC application](https://docs.pingidentity.com/access/sources/dita/topic?resourceid=p14e_add_update_oidc_application) in the Ping Identity documentation. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
+To enable sign-in for users with a PingOne (Ping Identity) account in Azure Active Directory B2C (Azure AD B2C), you need to create an application in the Ping Identity Administrator Console. If you don't already have a PingOne account, you can sign up at [`https://admin.pingone.com/web-portal/register`](https://admin.pingone.com/web-portal/register).
 
 1. Sign in to the Ping Identity Administrator Console with your PingOne account credentials.
 1. In the left menu of the page, select **Connections**, then next to **Applications**, select **+**.

articles/active-directory-b2c/media/phone-based-mfa/details-tab-1.png

@@ -32,7 +32,7 @@ Biometric authentication has the following benefits:
 
 To get started, you'll need:
 
-- License to [Grit's Visual IEF builder](https://www.gritiefedit.com/). Contact [Grit support](mailto:[email protected]) for licensing details. For this tutorial you don't need a license.
+- License to [Grit's Visual IEF builder](/azure/active-directory-b2c/partner-grit-editor). Contact [Grit support](mailto:[email protected]) for licensing details. For this tutorial you don't need a license.
 
 - An Azure subscription. If you don't have one, get a [free account](https://azure.microsoft.com/free/).
 
@@ -62,7 +62,7 @@ Contact [Grit support](mailto:[email protected]) for details to get o
 
 ### Configure Grit's biometric authentication with Azure AD B2C
 
-1. Navigate to <https://www.gritiefedit.com> and enter your email if you're asked for it.
+1. Navigate to </azure/active-directory-b2c/partner-grit-editor> and enter your email if you're asked for it.
 
 1. Press cancel in the quick start wizard.
 

articles/active-directory-b2c/media/phone-based-mfa/details-tab-2.png

@@ -31,7 +31,7 @@ To get started with the IEF Editor, ensure the following prerequisites are met:
 
 - A Microsoft Entra subscription. If you don't have one, you can get an [Azure free account](https://azure.microsoft.com/free/).
 - An Azure AD B2C tenant linked to the Azure subscription. Learn more at [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md).
-- [Visual IEF Editor](https://www.gritiefedit.com) is free and works only with Google Chrome browser.
+- [Visual IEF Editor](/azure/active-directory-b2c/partner-grit-editor) is free and works only with Google Chrome browser.
 - Review and download policies from [Azure AD B2C customer policies starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack)
 - Install Google Chrome browser
 
@@ -43,7 +43,7 @@ The following illustration shows a sample code-development workflow from XML fil
 
 | Step | Description |
 |:-----|:------|
-| 1. | Go to https://www.gritiefedit.com and upload the policies from [Azure AD B2C customer policies starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) using the upload policy button in the user interface.|
+| 1. | Go to /azure/active-directory-b2c/partner-grit-editor and upload the policies from [Azure AD B2C customer policies starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack) using the upload policy button in the user interface.|
 | 2. | Using the Visual IEF editor tool, select and edit any user journey and self asserted profile that needs update/modification.|
 |3. | Once the files are updated, select the download button. All the policies will be downloaded to the local machine.|
 |4. | Check in the files in GitHub or CI/CD pipeline. |

articles/active-directory-b2c/media/phone-based-mfa/details-tab-3.png

@@ -107,16 +107,14 @@ Use the instructions in the following sections to configure PingAccess and PingF
 
 To configure PingFederate as the token provider for PingAccess, ensure connectivity from PingFederate to PingAccess. Confirm connectivity from PingAccess to PingFederate.  
 
-For more information, see [Configure PingFederate as the token provider for PingAccess](https://docs.pingidentity.com/access/sources/dita/topic?category=pingaccess&Releasestatus_ce=Current&resourceid=pa_configure_pf_as_the_token_provider_for_pa) in the Ping Identity documentation.
-
 ### Configure a PingAccess application for header-based authentication
 
 Use the following instructions to create a PingAccess application for the target web application, for header-based authentication. 
 
 #### Create a virtual host
 
 >[!IMPORTANT]
->Create a virtual host for every application. For more information, see [What can I configure with PingAccess?](https://docs.pingidentity.com/access/sources/dita/topic?category=pingaccess&Releasestatus_ce=Current&resourceid=pa_what_can_I_configure_with_pa) in the Ping Identity documentation.
+>Create a virtual host for every application.
 
 To create a virtual host:
 

articles/active-directory-b2c/media/phone-based-mfa/overview-tab.png

@@ -7,7 +7,7 @@ author: kengaderdus
 manager: CelesteDG
 ms.service: azure-active-directory
 ms.topic: how-to
-ms.date: 09/11/2024
+ms.date: 10/23/2024
 ms.author: kengaderdus
 ms.subservice: b2c
 
@@ -114,4 +114,4 @@ Take the following actions to help mitigate fraudulent sign-ups.
 
 - Learn about [Identity Protection and Conditional Access for Azure AD B2C](conditional-access-identity-protection-overview.md) 
 
-- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)
+- Apply [Conditional Access to user flows in Azure Active Directory B2C](conditional-access-user-flow.md)