fix merge conflicts

Author: tamram

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