Merge branch 'main' into jun1-editing-fixes

Author: seesharprun

.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
         },
         {

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

@@ -114,7 +114,7 @@ Follow the steps mentioned in [this tutorial](tutorial-register-applications.md?
    | Property | Value |
    |:--------|:-------------|
    |Name  | Login with Asignio *(or a name of your choice)*
-   |Metadata URL |  https://authorization.asignio.com/.well-known/openid-configuration|
+   |Metadata URL |  `https://authorization.asignio.com/.well-known/openid-configuration`|
    | Client ID |  enter the client ID that you previously generated in [step 1](#step-1-configure-an-application-with-asignio)|
    |Client Secret |  enter the Client secret that you previously generated in [step 1](#step-1-configure-an-application-with-asignio)|
    | Scope | openid email profile |

articles/active-directory/conditional-access/concept-conditional-access-users-groups.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/fundamentals/7-secure-access-conditional-access.md

@@ -89,6 +89,10 @@ There may be times you want to block external users except a specific group. For
 
 After confirming your settings using [report-only mode](../conditional-access/howto-conditional-access-insights-reporting.md), an administrator can move the **Enable policy** toggle from **Report-only** to **On**.
 
+### 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).
+
 ## Implement Conditional Access
 
 Many common Conditional Access policies are documented. See the article [Common Conditional Access policies](../conditional-access/concept-conditional-access-policy-common.md) for other common policies you may want to adapt for external users.

articles/active-directory/manage-apps/add-application-portal-setup-sso.md

@@ -3,14 +3,14 @@ title: 'Quickstart: Enable single sign-on for an enterprise application'
 titleSuffix: Microsoft Entra
 description: Enable single sign-on for an enterprise application in Azure Active Directory.
 services: active-directory
-author: omondiatieno
+author: davidmu1
 manager: CelesteDG
 ms.service: active-directory
 ms.subservice: app-mgmt
 ms.topic: quickstart
 ms.workload: identity
 ms.date: 09/21/2021
-ms.author: jomondi
+ms.author: davidmu
 ms.reviewer: ergleenl
 ms.custom: contperf-fy22q2, mode-other
 #Customer intent: As an administrator of an Azure AD tenant, I want to enable single sign-on for an enterprise application.

articles/api-management/api-management-howto-create-or-invite-developers.md

@@ -52,6 +52,8 @@ When a developer is invited, an email is sent to the developer. This email is ge
 
 Once the invitation is accepted, the account becomes active.
 
+Invitation link will be active for 2 days.
+
 ## <a name="block-developer"> </a> Deactivate or reactivate a developer account
 
 By default, newly created or invited developer accounts are **Active**. To deactivate a developer account, click **Block**. To reactivate a blocked developer account, click **Activate**. A blocked developer account can't access the developer portal or call any APIs. To delete a user account, click **Delete**.