Merge pull request #200203 from MicrosoftDocs/main

6/01 PM Publish

Author: huypub

.openpublishing.redirection.azure-monitor.json

@@ -1,5 +1,65 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-aspnetcore-linux.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-aspnetcore-linux",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-azure-functions.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-azure-functions",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-bring-your-own-storage.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-bring-your-own-storage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-cloudservice.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-cloudservice",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-containers.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-containers",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-overview.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-servicefabric.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-servicefabric",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-settings.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-settings",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-trackrequests.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-trackrequests",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-troubleshooting.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-troubleshooting",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/profiler-vm.md",
+            "redirect_url": "/azure/azure-monitor/profiler/profiler-vm",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/app-insights-dashboards.md",
             "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
@@ -102,22 +162,37 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric-overview.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alert-types.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-instances.md" ,
             "redirect_url": "/azure/azure-monitor/alerts/alerts-page.md",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-states.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-page",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/alerts-unified-log.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alert-types.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/azure-monitor/alerts/activity-log-alerts.md" ,
-            "redirect_url": "/azure/azure-monitor/alerts/alert-types.md",
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-smartgroups-overview.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-smart-groups.md" ,
+            "redirect_url": "/azure/azure-monitor/alerts/alerts-types",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.json

@@ -43186,92 +43186,92 @@
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/connect-to-azure.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/connect-to-azure",
+      "redirect_url": "/azure/azure-video-indexer/connect-to-azure",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/manage-account-connected-to-azure.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/manage-account-connected-to-azure",
+      "redirect_url": "/azure/azure-video-indexer/manage-account-connected-to-azure",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/migrate-from-v1-to-v2.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/",
+      "redirect_url": "/azure/azure-video-indexer/",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/upload-index-videos.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/upload-index-videos",
+      "redirect_url": "/azure/azure-video-indexer/upload-index-videos",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-concepts.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-create-new.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/",
+      "redirect_url": "/azure/azure-video-indexer/",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-embed-widgets.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-embed-widgets",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-embed-widgets",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-get-started.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-get-started",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-get-started",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-output-json-v2.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-output-json-v2",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-output-json-v2",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/Video/GetStarted.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/Video/Glossary.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/Video/Home.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/Video/How-To/HowtoAnalyzeVideo_Video.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/Video/How-To/HowtoCallVideoAPIs.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-overview.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-overview",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-overview",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-search.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-search",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-search",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-use-apis.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-use-apis",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-use-apis",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-view-edit.md",
-      "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-view-edit",
+      "redirect_url": "/azure/azure-video-indexer/video-indexer-view-edit",
       "redirect_document_id": false
     },
     {

articles/active-directory/authentication/howto-mfa-userstates.md

@@ -6,7 +6,7 @@ services: multi-factor-authentication
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: how-to
-ms.date: 07/22/2021
+ms.date: 06/01/2022
 
 ms.author: justinha
 author: justinha
@@ -54,9 +54,9 @@ All users start out *Disabled*. When you enroll users in per-user Azure AD Multi
 To view and manage user states, complete the following steps to access the Azure portal page:
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as a Global administrator.
-1. Search for and select *Azure Active Directory*, then select **Users** > **All users**.
-1. Select **Per-user MFA**. You may need to scroll to the right to see this menu option. Select the example screenshot below to see the full Azure portal window and menu location:
-    [![Select Multi-Factor Authentication from the Users window in Azure AD.](media/howto-mfa-userstates/selectmfa-cropped.png)](media/howto-mfa-userstates/selectmfa.png#lightbox)
+1. Search for and select **Azure Active Directory**, then select **Users** > **All users**.
+1. Select **Per-user MFA**. 
+   :::image type="content" border="true" source="media/howto-mfa-userstates/selectmfa-cropped.png" alt-text="Screenshot of select Multi-Factor Authentication from the Users window in Azure AD.":::
 1. A new page opens that displays the user state, as shown in the following example.
    ![Screenshot that shows example user state information for Azure AD Multi-Factor Authentication](./media/howto-mfa-userstates/userstate1.png)
 

articles/active-directory/authentication/media/howto-mfa-userstates/selectmfa-cropped.png

@@ -11,7 +11,7 @@ manager: karenhoran
 ms.reviewer: calebb, dawoo, jebeckha, grtaylor
 ms.collection: M365-identity-device-management
 ---
-# How to: Block legacy authentication to Azure AD with Conditional Access   
+# How to: Block legacy authentication access to Azure AD with Conditional Access   
 
 To give your users easy access to your cloud apps, Azure Active Directory (Azure AD) supports a broad variety of authentication protocols including legacy authentication. However, legacy authentication doesn't support multifactor authentication (MFA). MFA is in many environments a common requirement to address identity theft. 
 

articles/active-directory/conditional-access/block-legacy-authentication.md

@@ -145,7 +145,8 @@ The filter for devices condition in Conditional Access evaluates policy based on
 
 ## Next steps
 
+- [Back to school – Using Boolean algebra correctly in complex filters](https://techcommunity.microsoft.com/t5/intune-customer-success/back-to-school-using-boolean-algebra-correctly-in-complex/ba-p/3422765)
 - [Update device Graph API](/graph/api/device-update?tabs=http)
 - [Conditional Access: Conditions](concept-conditional-access-conditions.md)
 - [Common Conditional Access policies](concept-conditional-access-policy-common.md)
-- [Securing devices as part of the privileged access story](/security/compass/privileged-access-devices)
+- [Securing devices as part of the privileged access story](/security/compass/privileged-access-devices)

articles/active-directory/conditional-access/concept-condition-filters-for-devices.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: conceptual
-ms.date: 03/17/2021
+ms.date: 06/01/2022
 
 ms.author: joflore
 author: MicrosoftGuyJFlo
@@ -35,7 +35,7 @@ The following options are available to include when creating a Conditional Acces
    - All guest and external users
       - This selection includes any B2B guests and external users including any user with the `user type` attribute set to `guest`. This selection also applies to any external user signed-in from a different organization like a Cloud Solution Provider (CSP). 
    - Directory roles
-      - Allows administrators to select specific built-in Azure AD directory roles used to determine policy assignment. For example, organizations may create a more restrictive policy on users assigned the global administrator role. Other role types are not supported, including administrative unit-scoped roles and custom roles.
+      - Allows administrators to select specific built-in Azure AD directory roles used to determine policy assignment. For example, organizations may create a more restrictive policy on users assigned the global administrator role. Other role types aren't supported, including administrative unit-scoped roles and custom roles.
    - Users and groups
       - Allows targeting of specific sets of users. For example, organizations can select a group that contains all members of the HR department when an HR app is selected as the cloud app. A group can be any type of user group in Azure AD, including dynamic or assigned security and distribution groups. Policy will be applied to nested users and groups.
 
@@ -50,7 +50,7 @@ The following options are available to include when creating a Conditional Acces
 
 ## Exclude users
 
-When organizations both include and exclude a user or group the user or group is excluded from the policy, as an exclude action overrides an include in policy. Exclusions are commonly used for emergency access or break-glass accounts. More information about emergency access accounts and why they are important can be found in the following articles: 
+When organizations both include and exclude a user or group the user or group is excluded from the policy, as an exclude action overrides an include in policy. Exclusions are commonly used for emergency access or break-glass accounts. More information about emergency access accounts and why they're important can be found in the following articles: 
 
 * [Manage emergency access accounts in Azure AD](../roles/security-emergency-access.md)
 * [Create a resilient access control management strategy with Azure Active Directory](../authentication/concept-resilient-controls.md)
@@ -66,15 +66,19 @@ The following options are available to exclude when creating a Conditional Acces
 
 ### Preventing administrator lockout
 
-To prevent an administrator from locking themselves out of their directory when creating a policy applied to **All users** and **All apps**, they will see the following warning.
+To prevent an administrator from locking themselves out of their directory when creating a policy applied to **All users** and **All apps**, they'll see the following warning.
 
 > Don't lock yourself out! We recommend applying a policy to a small set of users first to verify it behaves as expected. We also recommend excluding at least one administrator from this policy. This ensures that you still have access and can update a policy if a change is required. Please review the affected users and apps.
 
 By default the policy will provide an option to exclude the current user from the policy, but this default can be overridden by the administrator as shown in the following image. 
 
 ![Warning, don't lock yourself out!](./media/concept-conditional-access-users-groups/conditional-access-users-and-groups-lockout-warning.png)
 
-If you do find yourself locked out, see [What to do if you are locked out of the Azure portal?](troubleshoot-conditional-access.md#what-to-do-if-youre-locked-out-of-the-azure-portal)
+If you do find yourself locked out, see [What to do if you're locked out of the Azure portal?](troubleshoot-conditional-access.md#what-to-do-if-youre-locked-out-of-the-azure-portal)
+
+### External partner access
+
+Conditional Access policies that target external users may interfere with service provider access, for example granular delegated admin privileges [Introduction to granular delegated admin privileges (GDAP)](/partner-center/gdap-introduction).
 
 ## Next steps
 

articles/active-directory/conditional-access/concept-conditional-access-users-groups.md

@@ -1,6 +1,5 @@
 ---
-title: Microsoft identity platform access tokens | Azure
-titleSuffix: Microsoft identity platform
+title: Microsoft identity platform access tokens
 description: Learn about access tokens emitted by the Azure AD v1.0 and Microsoft identity platform (v2.0) endpoints.
 services: active-directory
 author: nickludwig

articles/active-directory/develop/access-tokens.md

@@ -1,5 +1,5 @@
 ---
-title: Microsoft identity platform accounts & tenant profiles on Android | Azure
+title: Microsoft identity platform accounts & tenant profiles on Android
 description: An overview of the Microsoft identity platform accounts for Android
 services: active-directory
 author: shoatman

articles/active-directory/develop/accounts-overview.md

@@ -1,6 +1,5 @@
 ---
 title: Microsoft identity platform certificate credentials
-titleSuffix: Microsoft identity platform
 description: This article discusses the registration and use of certificate credentials for application authentication.
 services: active-directory
 author: nickludwig