fix conflict

Author: davidmu1

.openpublishing.redirection.active-directory.json

@@ -55,6 +55,11 @@
       "redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/firstbird-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/radancys-employee-referrals-tutorial",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",

articles/active-directory-b2c/TOC.yml

@@ -35,7 +35,7 @@
   # - name: 4 - Create custom policies
     # Create this file (tutorial-create-custom-policies.md), and content into it. You also need to update the index.yml's card, Customize, to reflect the new file name
     # What keywords users are searching in TOC: https://review.docs.microsoft.com/en-us/help/contribute/kusto/samples/discoverability-toc-filter?branch=main 
-    # href: tutorial-create-user-flows.md
+    # href:tutorial-create-user-flows.md
   - name: 4 - Manage your tenant
     href: tenant-management.md
     displayName: break glass account, emergence account
@@ -106,6 +106,7 @@
       href: user-flow-overview.md
     - name: Custom policy overview
       href: custom-policy-overview.md
+      displayName: extend, extensibility
   - name: API Connectors
     href: api-connectors-overview.md
     displayName: REST API, web API, API connectors, Dynamic data retrieval, external data sources, external identity data source, outbound webhooks, third-party integration
@@ -461,7 +462,8 @@
     - name: Integrate with our technology partners
       items:
       - name: Azure AD B2C partner gallery
-        href: partner-gallery.md      
+        href: partner-gallery.md     
+        displayName: marketplace, integration, extensibility, extend, customization, customisation
     # Secure
   - name: Secure
     items:

articles/active-directory/authentication/howto-mfa-nps-extension-errors.md

@@ -69,6 +69,8 @@ Sometimes, your users may get messages from Multi-Factor Authentication because
 | **OathCodeIncorrect** | Wrong code entered\OATH Code Incorrect | The user entered the wrong code. Have them try again by requesting a new code or signing in again. |
 | **SMSAuthFailedMaxAllowedCodeRetryReached** | Maximum allowed code retry reached | The user failed the verification challenge too many times. Depending on your settings, they may need to be unblocked by an admin now.  |
 | **SMSAuthFailedWrongCodeEntered** | Wrong code entered/Text Message OTP Incorrect | The user entered the wrong code. Have them try again by requesting a new code or signing in again. |
+| **AuthenticationThrottled** | Too many attempts by user in a short period of time. Throttling. | Microsoft may limit repeated authentication attempts that are performed by the same user in a short period of time. This limitation does not apply to the Microsoft Authenticator or verification code. If you have hit these limits, you can use the Authenticator App, verification code or try to sign in again in a few minutes. |
+| **AuthenticationMethodLimitReached** | Authentication Method Limit Reached. Throttling. | Microsoft may limit repeated authentication attempts that are performed by the same user using the same authentication method type in a short period of time, specifically Voice call or SMS. This limitation does not apply to the Microsoft Authenticator or verification code. If you have hit these limits, you can use the Authenticator App, verification code or try to sign in again in a few minutes.|
 
 ## Errors that require support
 

articles/active-directory/cloud-sync/media/migrate-aadc-to-cloud-sync/sync-tool-1.png

@@ -2,7 +2,7 @@
 title: Configure role claim for enterprise Azure AD apps
 description: Learn how to configure the role claim issued in the SAML token for enterprise applications in Azure Active Directory
 services: active-directory
-author: jeevansd
+author: davidmu1
 manager: CelesteDG
 
 ms.service: active-directory
@@ -11,7 +11,7 @@ ms.custom: aaddev
 ms.workload: identity
 ms.topic: how-to
 ms.date: 11/11/2021
-ms.author: jeedes
+ms.author: davidmu
 ---
 
 # Configure the role claim issued in the SAML token for enterprise applications

articles/active-directory/develop/active-directory-enterprise-app-role-management.md

@@ -2,15 +2,15 @@
 title: Claims challenges, claims requests, and client capabilities
 description: Explanation of claims challenges, claims requests, and client capabilities in the Microsoft identity platform.
 services: active-directory
-author: knicholasa
-manager: martinco
+author: davidmu1
+manager: CelesteDG
 
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: reference
 ms.workload: identity
-ms.date: 05/11/2021
-ms.author: nichola
+ms.date: 01/19/2023
+ms.author: davidmu
 ms.reviewer: kkrishna, kylemar
 # Customer intent: As an application developer, I want to learn how to handle claims challenges returned from APIs protected by the Microsoft identity platform. 
 ---

articles/active-directory/develop/claims-challenge.md

@@ -2,14 +2,14 @@
 title: Microsoft identity platform ID tokens
 description: Learn how to use id_tokens emitted by the Azure AD v1.0 and Microsoft identity platform (v2.0) endpoints.
 services: active-directory
-author: nickludwig
+author: davidmu1
 manager: CelesteDG
 ms.service: active-directory
 ms.subservice: develop
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 01/25/2022
-ms.author: ludwignick
+ms.date: 01/19/2023
+ms.author: davidmu
 ms.reviewer: ludwignick
 ms.custom: aaddev, identityplatformtop40, fasttrack-edit
 ---

articles/active-directory/develop/id-tokens.md

@@ -1,16 +1,16 @@
 ---
 title: SAML 2.0 token claims reference
 description: Claims reference with details on the claims included in SAML 2.0 tokens issued by the Microsoft identity platform, including their JWT equivalents.
-author: kenwith
+author: davidmu1
 services: active-directory
 manager: CelesteDG
 
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: reference
 ms.workload: identity
-ms.date: 03/29/2021
-ms.author: kenwith
+ms.date: 01/19/2023
+ms.author: davidmu
 ms.reviewer: paulgarn
 ms.custom: aaddev
 ---

articles/active-directory/develop/reference-saml-tokens.md

@@ -2,15 +2,15 @@
 title: Request custom claims (MSAL iOS/macOS)
 description: Learn how to request custom claims.
 services: active-directory
-author: OwenRichards1
+author: davidmu1
 manager: CelesteDG
 
 ms.service: active-directory
 ms.subservice: develop
 ms.workload: identity
 ms.topic: how-to
-ms.date: 08/26/2019
-ms.author: owenrichards
+ms.date: 01/19/2023
+ms.author: davidmu
 ms.custom: aaddev
 ---
 

articles/active-directory/develop/request-custom-claims.md

@@ -2,15 +2,15 @@
 title: Create a trust relationship between a user-assigned managed identity and an external identity provider
 description: Set up a trust relationship between a user-assigned managed identity in Azure AD and an external identity provider.  This allows a software workload outside of Azure to access Azure AD protected resources without using secrets or certificates. 
 services: active-directory
-author: rwike77
+author: davidmu1
 manager: CelesteDG
 
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: how-to
 ms.workload: identity
-ms.date: 10/24/2022
-ms.author: ryanwi
+ms.date: 01/19/2023
+ms.author: davidmu
 ms.custom: aaddev
 ms.reviewer: shkhalide, udayh, vakarand
 zone_pivot_groups: identity-wif-mi-methods