fix merge conflict

Author: tamram

.openpublishing.redirection.defender-for-iot.json

@@ -1,7 +1,16 @@
 {
     "redirections": [
         {
-            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-install-software.md",
+            "source_path_from_root": "/articles/defender-for-iot/organizations/resources-training-sessions.md",
+            "redirect_url": "https://techcommunity.microsoft.com/t5/microsoft-defender-for-iot-blog/microsoft-defender-for-iot-ninja-training/ba-p/2428899",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-manage-the-alert-event.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
+            "redirect_document_id": false
+        },
+        {   "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-install-software.md",
             "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor",
             "redirect_document_id": false
         },

.openpublishing.redirection.json

@@ -5988,6 +5988,11 @@
             "redirect_url": "/azure/automation/create-azure-automation-account-portal",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/automation/automation-solution-vm-management-enable.md",
+            "redirect_url": "/azure/automation/automation-solution-vm-management",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/update-center/enable-machines.md",
             "redirect_url": "/azure/update-center/updates-maintenance-schedules",
@@ -14758,6 +14763,12 @@
             "redirect_url": "/azure/load-balancer/load-balancer-security-controls",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/load-balancer/update-load-balancer-with-vm-scale-set.md",
+            "redirect_url": "/azure/load-balancer/configure-inbound-nat-rules-vm-scale-set",
+            "redirect_document_id": false
+        },
+
         {
             "source_path_from_root": "/articles/load-balancer/load-balancer-get-started-internet-arm-cli.md",
             "redirect_url": "/azure/load-balancer/quickstart-create-basic-load-balancer-cli",

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

@@ -4,89 +4,78 @@ titleSuffix: Azure AD B2C
 description: Tutorial to configure Azure Active Directory B2C with Hypr for true passwordless strong customer authentication
 services: active-directory-b2c
 author: gargi-sinha
-manager: CelesteDG
+manager: martinco
 ms.reviewer: kengaderdus
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 09/13/2022
+ms.date: 12/7/2022
 ms.author: gasinh
 ms.subservice: B2C
 ---
 
 # Tutorial for configuring HYPR with Azure Active Directory B2C
 
-In this sample tutorial, we provide guidance on how to configure Azure AD B2C with [HYPR](https://get.hypr.com). With Azure AD B2C as an identity provider, you can integrate HYPR with any of your customer applications to provide true passwordless authentication to your users. HYPR replaces passwords with Public key encryptions eliminating fraud, phishing, and credential reuse.
+In this tutorial, learn to configure Azure Active Directory B2C (Azure AD B2C) with [HYPR](https://get.hypr.com). When Azure AD B2C is the identity provider (IdP), you can integrate HYPR with customer applications for passwordless authentication. HYPR replaces passwords with public key encryptions that help prevent fraud, phishing, and credential reuse.
 
 ## Prerequisites
 
 To get started, you'll need:
 
-- An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
-
-- An [Azure AD B2C tenant](./tutorial-create-tenant.md). Tenant is linked to your Azure subscription.
-
-- A HYPR cloud tenant, get a free [trial account](https://get.hypr.com/free-trial).
-
-- A user's mobile device registered using the HYPR REST APIs or the HYPR Device Manager in your HYPR tenant. For example, you can use the [HYPR Java SDK](https://docs.hypr.com/integratinghypr/docs/hypr-java-web-sdk) to accomplish this task.
+- An Azure AD 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
+- A HYPR cloud tenant
+  - Request a HYPR [custom demo](https://get.hypr.com/free-trial)
+- A user mobile device registered using the HYPR REST APIs, or the HYPR Device Manager in your HYPR tenant
+  - For example, see [HYPR SDK for Java Web](https://docs.hypr.com/integratinghypr/docs/hypr-java-web-sdk) 
 
 ## Scenario description
 
-The HYRP integration includes the following components:
-
-- Azure AD B2C – The authorization server, responsible for verifying the user’s credentials, also known as the identity provider
+The HYPR integration has the following components:
 
-- Web and mobile applications - Your mobile or web applications that you choose to protect with HYPR and Azure AD B2C. HYPR provides a robust mobile SDK also a mobile app that you can use on iOS and Android platforms to do true passwordless authentication.
-
-- The HYPR mobile app - The HYPR mobile app can be used to execute this sample if prefer not to use the mobile SDKs in your own mobile applications.
-
-- HYPR REST APIs - You can use the HYPR APIs to do both user device registration and authentication. These APIs can be found [here](https://apidocs.hypr.com).
+- **Azure AD B2C** – The authorization server to verify user credentials, or the identity provider (IdP)
+- **Web and mobile applications** - For mobile or web applications protected by HYPR and Azure AD B2C
+  - HYPR has mobile SDK and a mobile app for iOS and Android
+- **HYPR mobile app** - Use it for this tutorial, if you're not using the mobile SDKs in your mobile applications
+- **HYPR REST APIs** - User device registration and authentication
+  - Go to apidocs.hypr.com for [HYPR Passwordless APIs](https://apidocs.hypr.com)
 
 The following architecture diagram shows the implementation.
 
-![Screenshot for hypr-architecture-diagram](media/partner-hypr/hypr-architecture-diagram.png)
+   ![Diagram of hypr architecture](media/partner-hypr/hypr-architecture-diagram.png)
 
-|Step | Description |
-|:-----| :-----------|
-| 1. | User arrives at a login page. Users select sign-in/sign-up and enter username into the page.
-| 2. | The application sends the user attributes to Azure AD B2C for identify verification.
-| 3. | Azure AD B2C collects the user attributes and sends the attributes to HYPR to authenticate the user through the HYPR mobile app.
-| 4. | HYPR sends a push notification to the registered user mobile device for a Fast Identity Online (FIDO) certified authentication. It can be a user finger print, biometric or decentralized pin.  
-| 5. | After user acknowledges the push notification, user is either granted or denied access to the customer application based on the verification results.
+1. User arrives at a sign-in page and selects sign-in or sign-up. User enters username.
+2. The application sends the user attributes to Azure AD B2C for identify verification.
+3. Azure AD B2C sends user attributes to HYPR to authenticate the user through the HYPR mobile app.
+4. HYPR sends a push notification to the registered user mobile device for a Fast Identity Online (FIDO) certified authentication. It can be a user fingerprint, biometric, or decentralized PIN. 
+5. After user acknowledges the push notification, user is granted or denied access to the customer application.
 
 ## Configure the Azure AD B2C policy
 
-1. Go to the [Azure AD B2C HYPR policy](https://github.com/HYPR-Corp-Public/Azure-AD-B2C-HYPR-Sample/tree/master/policy) in the Policy folder.
-
-2. Follow this [document](tutorial-create-user-flows.md?pivots=b2c-custom-policy#custom-policy-starter-pack) to download [LocalAccounts starter pack](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/LocalAccounts)
-
+1. Go to [Azure-AD-B2C-HYPR-Sample/policy/](https://github.com/HYPR-Corp-Public/Azure-AD-B2C-HYPR-Sample/tree/master/policy).
+2. Follow the instructions in [Custom policy starter pack](tutorial-create-user-flows.md?pivots=b2c-custom-policy#custom-policy-starter-pack) to download [Active-directory-b2c-custom-policy-starterpack/LocalAccounts/](https://github.com/Azure-Samples/active-directory-b2c-custom-policy-starterpack/tree/master/LocalAccounts)
 3. Configure the policy for the Azure AD B2C tenant.
 
 >[!NOTE]
->Update the provided policies to relate to your specific tenant.
+>Update policies to relate to your tenant.
 
 ## Test the user flow
 
-1. Open the Azure AD B2C tenant and under Policies select **Identity Experience Framework**.
+1. Open the Azure AD B2C tenant.
+2. Under **Policies**, select **Identity Experience Framework**.
+3. Select the **SignUpSignIn** you created.
+4. Select **Run user flow**.
+5. For **Application**, select the registered app (sample is JWT).
+6. For **Reply URL**, select the **redirect URL**.
+7. Select **Run user flow**.
+8. Complete the sign-up flow to create an account.
+9. After the user attribute is created, HYPR is called. 
 
-2. Select your previously created **SignUpSignIn**.
-
-3. Select **Run user flow** and select the settings:
-
-   a. **Application**: select the registered app (sample is JWT)
-
-   b. **Reply URL**: select the **redirect URL**
-
-   c. Select **Run user flow**.
-
-4. Go through sign-up flow and create an account
-
-5. HYPR will be called during the flow, after user attribute is created. If the flow is incomplete, check that user isn't saved in the directory.
+>[!TIP]
+>If the flow is incomplete, confirm the user is saved in the directory.
 
 ## Next steps
 
-For additional information, review the following articles:
-
 - [Custom policies in Azure AD B2C](./custom-policy-overview.md)
-
 - [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy)