fixing merge conflict

Author: paulth1

articles/active-directory-b2c/TOC.yml

@@ -537,8 +537,6 @@
             href: partner-nok-nok.md
           - name: Transmit Security for passwordless
             href: partner-bindid.md
-          - name: Transmit Security for risk detection
-            href: partner-transmit-security.md
           - name: Trusona
             href: partner-trusona.md
           - name: Twilio
@@ -571,6 +569,8 @@
         - name: Microsoft Dynamics 365 Fraud Protection
           href: partner-dynamics-365-fraud-protection.md
           displayName: m365 dynamics, dynamics fraud protection, fraud, 365 protection
+        - name: Transmit Security
+          href: partner-transmit-security.md
       - name: Investigate risk with Identity Protection
         href: identity-protection-investigate-risk.md
       - name: Configure Conditional Access

articles/active-directory-b2c/manage-user-data.md

@@ -22,7 +22,7 @@ ms.custom: fasttrack-edit
 
  This article discusses how you can manage the user data in Azure Active Directory B2C (Azure AD B2C) by using the operations that are provided by the [Microsoft Graph API](/graph/use-the-api). Managing user data includes deleting or exporting data from audit logs.
 
-[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
+[!INCLUDE [gdpr-intro-sentence.md](~/reusable-content/ce-skilling/azure/includes/gdpr-intro-sentence.md)]
 
 ## Delete user data
 

articles/active-directory-b2c/oauth2-error-technical-profile.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 05/07/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 
@@ -73,6 +73,43 @@ The following example shows a technical profile for `ReturnOAuth2Error`:
 </ClaimsProviders> -->
 ```
 
+## Define claims transformation to generate custom values of error code and error message
+
+Use these steps to generate custom values of error code and error message:
+
+1. Locate the `ClaimsTransformations` element, then add the following code inside it
+
+    ```xml
+    <!--
+     <ClaimsTransformations> -->
+    <ClaimsTransformation Id="GenerateErrorCode" TransformationMethod="CreateStringClaim">
+            <InputParameters>
+              <InputParameter Id="value" DataType="string" Value="Error_001" />
+            </InputParameters>
+            <OutputClaims>
+              <OutputClaim ClaimTypeReferenceId="errorCode" TransformationClaimType="createdClaim" />
+            </OutputClaims>
+          </ClaimsTransformation>
+          <ClaimsTransformation Id="GenerateErrorMessage" TransformationMethod="CreateStringClaim">
+            <InputParameters>
+              <InputParameter Id="value" DataType="string" Value="Insert error description." />
+            </InputParameters>
+            <OutputClaims>
+              <OutputClaim ClaimTypeReferenceId="errorMessage" TransformationClaimType="createdClaim" />
+            </OutputClaims>
+          </ClaimsTransformation>
+    <!--
+    </ClaimsTransformations> -->
+    ```
+
+1. Add the two claims transformations in the `OutputClaimsTransformations` element of any technical profile before Oauth2 technical that you define:
+
+    ```xml
+        <OutputClaimsTransformations>
+          <OutputClaimsTransformation ReferenceId="generateErrorCode" />
+          <OutputClaimsTransformation ReferenceId="generateErrorMessage" />
+        </OutputClaimsTransformations>
+    ```
 ## Input claims
 
 The **InputClaims** element contains a list of claims required to return OAuth2 error. 
@@ -123,6 +160,20 @@ In the following example:
 </UserJourney>
 ```
 
+Optionally, you can use preconditions to manipulate the Oauth2 error technical profile. For example, if there is no email claim, you can set to call Oauth2 error technical profile:
+
+```xml
+<OrchestrationStep Order="3" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="ReturnOAuth2Error">
+      <Preconditions>
+        <Precondition Type="ClaimsExist" ExecuteActionsIf="false">
+          <Value>email</Value>
+          <Action>SkipThisOrchestrationStep</Action>
+        </Precondition>
+      </Preconditions>
+    </OrchestrationStep>
+```
+
+
 ## Next steps
 
 Learn about [UserJourneys](userjourneys.md)

articles/active-directory-b2c/partner-nevis.md

@@ -23,10 +23,12 @@ In this tutorial, learn to enable passwordless authentication in Azure Active Di
 To get started, you'll need:
 
 - A Nevis demo account
-  - Go to nevis.net for [Nevis + Microsoft Azure AD B2C](https://www.nevis-security.com/aadb2c/) to request an account
-* An Azure subscription
+  - Go to `nevis.net` for [Nevis + Microsoft Azure AD B2C](https://www.nevis-security.com/aadb2c/) to request an account
+
+- An Azure subscription
 
   - If you don't have one, you can get an [Azure free account](https://azure.microsoft.com/free/)
+
 - An [Azure AD B2C tenant](./tutorial-create-tenant.md) linked to your Azure subscription
 
 >[!NOTE]
@@ -56,17 +58,17 @@ The diagram shows the implementation.
 
 ### Request a Nevis account 
 
-1. Go to nevis.net for [Nevis + Microsoft Azure AD B2C](https://www.nevis-security.com/aadb2c/). 
+1. Go to `nevis.net` for [Nevis + Microsoft Azure AD B2C](https://www.nevis-security.com/aadb2c/).
 2. Use the form request an account.
 3. Two emails arrive:
 
-*  Management account notification
-*  Mobile app invitation
+- Management account notification
+- Mobile app invitation
 
 ### Add your Azure AD B2C tenant to your Nevis account
 
 1. From the management account trial email, copy your management key.
-2. In a browser, open https://console.nevis.cloud/.
+2. In a browser, open the [Nevis management console](https://console.nevis.cloud/).
 3. Use the management key to sign in to the management console.
 4. Select **Add Instance**.
 5. Select the created instance.
@@ -99,14 +101,14 @@ The diagram shows the implementation.
 10. For **Key Usage**, select **Encryption**.
 11. Select **Create**.
 
-### Configure and upload the nevis.html to Azure blob storage
+### Configure and upload the nevis.html file to Azure blob storage
 
 1. In your Identity Environment (IDE), go to the [/master/samples/Nevis/policy](https://github.com/azure-ad-b2c/partner-integrations/tree/master/samples/Nevis/policy) folder.
-2. In [/samples/Nevis/policy/nevis.html](https://github.com/azure-ad-b2c/partner-integrations/blob/master/samples/Nevis/policy/nevis.html) open the nevis.html file.
+2. In [/samples/Nevis/policy/nevis.html](https://github.com/azure-ad-b2c/partner-integrations/blob/master/samples/Nevis/policy/nevis.html) open the `nevis.html` file.
 3. Replace the  **authentication_cloud_url** with the Nevis Admin console URL `https://<instance_id>.mauth.nevis.cloud`.
 4. Select **Save**.
 5. [Create an Azure Blob storage account](./customize-ui-with-html.md#2-create-an-azure-blob-storage-account).
-6. Upload the nevis.html file to your Azure blob storage.
+6. Upload the `nevis.html` file to your Azure blob storage.
 7. [Configure CORS](./customize-ui-with-html.md#3-configure-cors).
 8. Enable cross-origin resource sharing (CORS) for the file.
 9. In the list, select the **nevis.html** file.
@@ -132,7 +134,7 @@ The diagram shows the implementation.
 3. Replace **your tenant** with your Azure tenant account name in **TenantId**.
 4. Replace **your tenant** with your Azure tenant account name in **PublicPolicyURI**.
 5. Under **BasePolicy**, in the **TenantId**, replace **your tenant** with your Azure tenant account name.
-6. Under **BuildingBlocks**, replace **LoadUri** with the nevis.html blob link URL, in your blob storage account.
+6. Under **BuildingBlocks**, replace **LoadUri** with the `nevis.html` blob link URL, in your blob storage account.
 7. Select **Save**.
 
 ### Customize SignUpOrSignin.xml

articles/active-directory-b2c/partner-saviynt.md

@@ -70,6 +70,9 @@ The following architecture diagram illustrates the implementation.
 2. Create delegated administration policies.
 3. Assign users the delegated administrator role.
 
+>[!NOTE]
+>User administrator role will be required for a Service Principal Name (SPN) to integrate with Saviynt EIC system. 
+
 ## Configure Azure AD B2C with Saviynt
 
 Use the following instructions to create an application, delete users, and more. 

articles/active-directory-b2c/partner-transmit-security.md

@@ -6,7 +6,7 @@ author: yoelh
 manager: martinco
 ms.service: active-directory
 ms.topic: how-to
-ms.date: 05/13/2024
+ms.date: 06/04/2024
 ms.author: yoelh
 ms.reviewer: kengaderdus
 ms.subservice: B2C
@@ -16,7 +16,7 @@ zone_pivot_groups: b2c-policy-type
 ---
 
 
-# Configure Transmit Security with Azure Active Directory B2C for risk detection and prevention
+# Configure Transmit Security with Azure Active Directory B2C for Fraud Prevention
 
 In this tutorial, learn to integrate Azure Active Directory B2C (Azure AD B2C) authentication with [Transmit Security's Detection and Response Services (DRS)](https://transmitsecurity.com/platform/detection-and-response). Transmit Security allows you to detect risk in customer interactions on digital channels, and to enable informed identity and trust decisions across the consumer experience.
 

articles/active-directory-b2c/quickstart-native-app-desktop.md

@@ -21,7 +21,7 @@ ms.subservice: B2C
 
 Azure Active Directory B2C (Azure AD B2C) provides cloud identity management to keep your application, business, and customers protected. Azure AD B2C enables your applications to authenticate to social accounts and enterprise accounts using open standard protocols. In this quickstart, you use a Windows Presentation Foundation (WPF) desktop application to sign in using a social identity provider and call an Azure AD B2C protected web API.
 
-[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
 
 ## Prerequisites
 

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 03/01/2024
+ms.date: 06/05/2024
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: whats-new
@@ -19,6 +19,17 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
 
+## May 2024
+
+### New articles
+
+- [Configure Transmit Security with Azure Active Directory B2C for risk detection and prevention](partner-transmit-security.md)
+
+### Updated articles
+
+- [Set up sign-up and sign-in with a LinkedIn account using Azure Active Directory B2C](identity-provider-linkedin.md) - Updated LinkedIn instructions
+- [Page layout versions](page-layout.md) - Updated page layout versions
+
 ## February 2024
 
 ### New articles
@@ -41,12 +52,3 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 - [Tutorial: Configure Nok Nok Passport with Azure Active Directory B2C for passwordless FIDO2 authentication](partner-nok-nok.md) - Updated Nok Nok instructions 
 - [Configure Transmit Security with Azure Active Directory B2C for passwordless authentication](partner-bindid.md) - Updated Transmit Security instructions
 - [About claim resolvers in Azure Active Directory B2C custom policies](claim-resolver-overview.md) - Updated claim resolvers and user journey
-
-## December 2023
-
-### Updated articles
-
-- [Set up a resource owner password credentials flow in Azure Active Directory B2C](add-ropc-policy.md) - Updated ROPC flow limitations
-- [Add user attributes and customize user input in Azure Active Directory B2C](configure-user-input.md) - Updated instructional steps
-- [Set up sign-up and sign-in with a Google account using Azure Active Directory B2C](identity-provider-google.md) - Editorial updates
-- [Localization string IDs](localization-string-ids.md) - Updated the localization string IDs

articles/advisor/advisor-alerts-arm.md

@@ -10,7 +10,7 @@ ms.date: 06/29/2020
 
 This article shows you how to set up an alert for new recommendations from Azure Advisor using an Azure Resource Manager template (ARM template).
 
-[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
+[!INCLUDE [About Azure Resource Manager](~/reusable-content/ce-skilling/azure/includes/resource-manager-quickstart-introduction.md)]
 
 Whenever Azure Advisor detects a new recommendation for one of your resources, an event is stored in [Azure Activity log](../azure-monitor/essentials/platform-logs-overview.md). You can set up alerts for these events from Azure Advisor using a recommendation-specific alerts creation experience. You can select a subscription and optionally a resource group to specify the resources that you want to receive alerts on.
 

articles/advisor/advisor-alerts-bicep.md

@@ -10,7 +10,7 @@ ms.date: 04/26/2022
 
 This article shows you how to set up an alert for new recommendations from Azure Advisor using Bicep.
 
-[!INCLUDE [About Bicep](../../includes/resource-manager-quickstart-bicep-introduction.md)]
+[!INCLUDE [About Bicep](~/reusable-content/ce-skilling/azure/includes/resource-manager-quickstart-bicep-introduction.md)]
 
 Whenever Azure Advisor detects a new recommendation for one of your resources, an event is stored in [Azure Activity log](../azure-monitor/essentials/platform-logs-overview.md). You can set up alerts for these events from Azure Advisor using a recommendation-specific alerts creation experience. You can select a subscription and optionally select a resource group to specify the resources that you want to receive alerts on.