Merge branch 'master' into pubclientrediruri

Author: maliksahil

.openpublishing.redirection.json

@@ -10455,7 +10455,7 @@
     },
     {
       "source_path_from_root": "/articles/azure-resource-manager/templates/template-functions-any.md",
-      "redirect_url": "/azure/azure-resource-manager/bicep/template-functions-any",
+      "redirect_url": "/azure/azure-resource-manager/bicep/bicep-functions-any",
       "redirect_document_id": false
     },
     {
@@ -14063,6 +14063,16 @@
       "redirect_url": "/azure/azure-toolkit-for-intelliJ",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-vmware/deploy-disaster-recovery-using-jetstream.md",
+      "redirect_url": "/azure/azure-vmware/concepts-run-command",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-vmware/deploy-zerto-disaster-recovery.md",
+      "redirect_url": "/azure/azure-vmware/introduction",
+      "redirect_document_id": false
+    },    
     {
       "source_path_from_root": "/articles/azure-vmware/concepts-monitor-protection.md",
       "redirect_url": "/azure/azure-vmware/integrate-azure-native-services",

articles/active-directory-b2c/azure-monitor.md

@@ -31,6 +31,10 @@ In this article, you learn how to transfer the logs to an Azure Log Analytics wo
 > [!IMPORTANT]
 > When you plan to transfer Azure AD B2C logs to different monitoring solutions, or repository, consider the following. Azure AD B2C logs contain personal data. Such data should be processed in a manner that ensures appropriate security of the personal data, including protection against unauthorized or unlawful processing, using appropriate technical or organizational measures.
 
+Watch this video to learn how to configure monitoring for Azure AD B2C using Azure Monitor.  
+
+>[!Video https://www.youtube.com/embed/tF2JS6TGc3g]
+
 ## Deployment overview
 
 Azure AD B2C leverages [Azure Active Directory monitoring](../active-directory/reports-monitoring/overview-monitoring.md). Because an Azure AD B2C tenant, unlike Azure AD tenants, can't have a subscription associated with it, we need to take some additional steps to enable the integration between Azure AD B2C and Log Analytics, which is where we'll send the logs.

articles/active-directory-b2c/azure-sentinel.md

@@ -38,7 +38,7 @@ In this tutorial, you'll learn to:
 
 Enable **Diagnostic settings** in Azure AD within your Azure AD B2C tenant to define where logs and metrics for a resource should be sent.
 
-Then after, [configure Azure AD B2C to send logs to Azure Monitor](https://docs.microsoft.com/azure/active-directory-b2c/azure-monitor).
+Then after, [configure Azure AD B2C to send logs to Azure Monitor](./azure-monitor.md).
 
 ## Deploy an Azure Sentinel instance
 
@@ -79,7 +79,7 @@ In the following example, we explain the scenario where you receive a notificati
 1. From the Azure Sentinel navigation menu, select **Analytics**.
 
 2. In the action bar at the top, select **+ Create** and select
-   **Scheduled query rule**. It will open the **Analytics rule wizard**.
+   **Scheduled query rule**. This will open the **Analytics rule wizard**.
 
 ![image shows select create scheduled query rule](./media/azure-sentinel/create-scheduled-rule.png)
 

articles/active-directory-b2c/customize-ui.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 06/27/2021
+ms.date: 09/06/2021
 ms.custom: "project-no-code, b2c-support"
 ms.author: mimart
 ms.subservice: B2C
@@ -206,11 +206,10 @@ Keep these things in mind when you configure company branding in Azure AD B2C:
 * The banner logo appears in the verification emails sent to your users when they initiate a sign-up user flow.
 
 
+::: zone pivot="b2c-user-flow"
 
 ## Enable company branding in user flow pages
 
-::: zone pivot="b2c-user-flow"
-
 Once you've configured company branding, enable it in your user flows.
 
 1. In the left menu of the Azure portal, select **Azure AD B2C**.
@@ -228,6 +227,8 @@ If you'd like to brand all pages in the user flow, set the page layout version f
 
 ::: zone pivot="b2c-custom-policy"
 
+## Enable company branding in custom policy pages
+
 Once you've configured company branding, enable it in your custom policy. Configure the [page layout version](contentdefinitions.md#migrating-to-page-layout) with page `contract` version for *all* of the content definitions in your custom policy. The format of the value must contain the word `contract`: _urn:com:microsoft:aad:b2c:elements:**contract**:page-name:version_. To specify a page layout in your custom policies that use an old **DataUri** value. For more information, learn how to [migrate to page layout](contentdefinitions.md#migrating-to-page-layout) with page version.
 
 The following example shows the content definitions with their corresponding the page contract, and *Ocean Blue* page template: 

articles/active-directory-b2c/language-customization.md

@@ -34,6 +34,10 @@ You might not need that level of control over what languages your customer sees.
 > [!NOTE]
 > If you're using custom user attributes, you need to provide your own translations. For more information, see [Customize your strings](#customize-your-strings).
 
+Watch this video to learn how to localize or customize language using Azure AD B2C.
+
+>[!Video https://www.youtube.com/embed/yqrX5_tA7Ms]
+
 ::: zone pivot="b2c-custom-policy"
 
 Localization requires three steps: 

articles/active-directory/app-provisioning/use-scim-to-provision-users-and-groups.md

@@ -144,11 +144,8 @@ It helps to categorize between `/User` and `/Group` to map any default user attr
 | Azure Active Directory group | urn:ietf:params:scim:schemas:core:2.0:Group |
 | --- | --- |
 | displayName |displayName |
-| mail |emails[type eq "work"].value |
-| mailNickname |displayName |
 | members |members |
 | objectId |externalId |
-| proxyAddresses |emails[type eq "other"].Value |
 
 **Example list of group attributes**
 
@@ -1422,4 +1419,4 @@ To help drive awareness and demand of our joint integration, we recommend you up
 > [Writing expressions for attribute mappings](functions-for-customizing-application-data.md)
 > [Scoping filters for user provisioning](define-conditional-rules-for-provisioning-user-accounts.md)
 > [Account provisioning notifications](user-provisioning.md)
-> [List of tutorials on how to integrate SaaS apps](../saas-apps/tutorial-list.md)
+> [List of tutorials on how to integrate SaaS apps](../saas-apps/tutorial-list.md)

articles/active-directory/develop/TOC.yml

@@ -264,7 +264,7 @@
         - name: Interactive with WAM
           href: scenario-desktop-acquire-token-wam.md
         - name: Integrated Windows Auth
-          href: scenario-desktop-acquire-token-iwa.md
+          href: scenario-desktop-acquire-token-integrated-windows-authentication.md
         - name: Username Password
           href: scenario-desktop-acquire-token-username-password.md
         - name: Device code flow

articles/active-directory/develop/howto-add-branding-in-azure-ad-apps.md

@@ -8,7 +8,7 @@ manager: CelesteDG
 
 ms.service: active-directory
 ms.subservice: develop
-ms.topic: how-to
+ms.topic: conceptual
 ms.workload: identity
 ms.date: 08/31/2020
 ms.author: ryanwi

articles/active-directory/develop/howto-handle-samesite-cookie-changes-chrome-browser.md

@@ -9,7 +9,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.subservice: develop
 ms.workload: identity
-ms.topic: how-to
+ms.topic: conceptual
 ms.date: 01/27/2020
 ms.author: jmprieur
 ms.reviewer: kkrishna