Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into main

Author: aahill

.openpublishing.publish.config.json

@@ -840,7 +840,7 @@
     ".openpublishing.redirection.media-services.json",
     ".openpublishing.redirection.security-benchmark.json",
     ".openpublishing.redirection.sql-database.json",
-    ".openpublishing.redirection.synapse-analytics.json",
+    "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",
     ".openpublishing.redirection.azure-monitor.json",
     ".openpublishing.redirection.azure-percept.json",
@@ -871,6 +871,7 @@
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+    "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
     "articles/mysql/.openpublishing.redirection.mysql.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -837,12 +837,12 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access.md",
-            "redirect_url": "/azure/active-directory/active-directory-conditional-access-azure-portal",
+            "redirect_url": "/azure/active-directory/conditional-access/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-azuread-connected-apps.md",
-            "redirect_url": "/azure/active-directory/active-directory-conditional-access-azure-portal-get-started",
+            "redirect_url": "/azure/active-directory/concept-conditional-access-cloud-apps",
             "redirect_document_id": false
         },
         {
@@ -1972,7 +1972,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-azure-portal-get-started.md",
-            "redirect_url": "/azure/active-directory/conditional-access/app-based-mfa",
+            "redirect_url": "/azure/active-directory/conditional-access/howto-conditional-access-policy-azure-management",
             "redirect_document_id": true
         },
         {
@@ -2067,7 +2067,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-device-policies.md",
-            "redirect_url": "/azure/active-directory/conditional-access/overview",
+            "redirect_url": "/azure/active-directory/conditional-access/concept-condition-filters-for-devices",
             "redirect_document_id": false
         },
         {
@@ -2077,7 +2077,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/conditional-access/howto-conditional-access-adoption-kit.md",
-            "redirect_url": "/azure/active-directory/conditional-access/overview",
+            "redirect_url": "/azure/active-directory/conditional-access/plan-conditional-access",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.json

@@ -11,7 +11,7 @@ ms.workload: identity
 ms.topic: how-to
 ms.author: kengaderdus
 ms.subservice: B2C
-ms.date: 09/15/2021
+ms.date: 02/09/2022
 ---
 
 # Monitor Azure AD B2C with Azure Monitor
@@ -116,7 +116,7 @@ To create the custom authorization and delegation in Azure Lighthouse, we use an
    | --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
    | Subscription          | Select the directory that contains the Azure subscription where the _azure-ad-b2c-monitor_ resource group was created.                                                                                                                                                                                                                                                                                                                                                                                                       |
    | Region                | Select the region where the resource will be deployed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-   | Msp Offer Name        | A name describing this definition. For example, _Azure AD B2C Monitoring_. This is the name that will be displayed in Azure Lighthouse.                                                                                                                                                                                                                                                                                                                                                                                          |
+   | Msp Offer Name        | A name describing this definition. For example, _Azure AD B2C Monitoring_. This is the name that will be displayed in Azure Lighthouse.  The **MSP Offer Name** must be unique in your Azure AD. To monitor multiple Azure AD B2C tenants, use different names. |
    | Msp Offer Description | A brief description of your offer. For example, _Enables Azure Monitor in Azure AD B2C_.                                                                                                                                                                                                                                                                                                                                                                                                                                     |
    | Managed By Tenant Id  | The **Tenant ID** of your Azure AD B2C tenant (also known as the directory ID).                                                                                                                                                                                                                                                                                                                                                                                                                                              |
    | Authorizations        | Specify a JSON array of objects that include the Azure AD `principalId`, `principalIdDisplayName`, and Azure `roleDefinitionId`. The `principalId` is the **Object ID** of the B2C group or user that will have access to resources in this Azure subscription. For this walkthrough, specify the group's Object ID that you recorded earlier. For the `roleDefinitionId`, use the [built-in role](../role-based-access-control/built-in-roles.md) value for the _Contributor role_, `b24988ac-6180-42a0-ab88-20f7382dd24c`. |

.openpublishing.redirection.synapse-analytics.json

@@ -220,6 +220,16 @@ sections:
         answer: |
           No, Azure AD B2C is a pay-as-you-go Azure service and is not part of Enterprise Mobility Suite.
           
+      - question: |
+          Can I purchase Azure AD Premium P1 and Azure AD Premium P2 licensing for my Azure AD B2C tenant?
+        answer: |
+          No, Azure AD B2C tenants don't use Azure AD Premium P1 or Azure AD Premium P2 licensing. Azure AD B2C uses [Azure AD B2C Premium P1 or P2](billing.md#change-your-azure-ad-pricing-tier) licenses, which are different from Azure AD Premium P1 or P2 licenses for a Standard Azure AD tenant. Azure AD B2C tenants natively support some features that are similar to Azure AD Premium features, as explained in [Supported Azure AD features](supported-azure-ad-features.md).
+         
+      - question: |
+          Can I use group-based assignment for Azure AD Enterprise Applications in my Azure AD B2C tenant?
+        answer: |
+          No, Azure AD B2C tenants do not support [group-based assignment to Azure AD Enterprise Applications](../active-directory/manage-apps/assign-user-or-group-access-portal.md).
+          
       - question: |
           What Azure AD B2C features are unavailable in Microsoft Azure Government?
         answer: |

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

@@ -8,7 +8,7 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 10/15/2021
+ms.date: 02/09/2022
 ms.author: kengaderdus
 ms.subservice: B2C
 ---
@@ -102,8 +102,6 @@ A new orchestration step of type `InvokeSubJourney` is used to execute a sub jou
 </OrchestrationStep>
 ```
 
-> [!NOTE]
-> A sub journey should not call another sub journey.
 
 ## Components