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

Author: ericd-mst-github

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path_from_root": "/articles/active-directory/develop/active-directory-enterprise-app-role-management.md",
+      "redirect_url": "/azure/active-directory/develop/enterprise-app-role-management",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-schema-extensions.md",
       "redirect_url": "/azure/active-directory/develop/schema-extensions",

articles/active-directory/develop/TOC.yml

@@ -455,7 +455,7 @@
             - name: Configure optional claims
               href: optional-claims.md
             - name: Configure role claim
-              href: active-directory-enterprise-app-role-management.md
+              href: enterprise-app-role-management.md
             - name: Customize JWT claims
               href: jwt-claims-customization.md
             - name: Customize SAML claims

articles/active-directory/develop/active-directory-enterprise-app-role-management.md renamed to articles/active-directory/develop/enterprise-app-role-management.md

@@ -20,10 +20,10 @@ In Azure Active Directory (Azure AD), you can customize the role claim in the ac
 
 ## Prerequisites
 
-- An Azure AD subscription with a set up tenant. For more information, see [Quickstart: Set up a tenant](quickstart-create-new-tenant.md).
+- An Azure AD subscription with a configured tenant. For more information, see [Quickstart: Set up a tenant](quickstart-create-new-tenant.md).
 - An enterprise application that has been added to the tenant. For more information, see [Quickstart: Add an enterprise application](../manage-apps/add-application-portal.md).
 - Single sign-on (SSO) configured for the application. For more information, see [Enable single sign-on for an enterprise application](../manage-apps/add-application-portal-setup-sso.md).
-- A user account that will be assigned to the role. For more information, see [Quickstart: Create and assign a user account](../manage-apps/add-application-portal-assign-users.md).
+- A user account that is assigned to the role. For more information, see [Quickstart: Create and assign a user account](../manage-apps/add-application-portal-assign-users.md).
 
 > [!NOTE]
 > This article explains how to create, update, or delete application roles on the service principal using APIs in Azure AD. To use the new user interface for App Roles, see [Add app roles to your application and receive them in the token](howto-add-app-roles-in-azure-ad-apps.md).
@@ -43,7 +43,7 @@ Use the following steps to locate the enterprise application:
 
 Use the Microsoft Graph Explorer to add roles to an enterprise application.
 
-1. Open [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer) in another window and sign in using the global admin or co-admin credentials for your tenant.
+1. Open [Microsoft Graph Explorer](https://developer.microsoft.com/graph/graph-explorer) in another window and sign in using the administrator credentials for your tenant.
 
     > [!NOTE]
     > The Cloud App Administrator and App Administrator role won't work in this scenario. The Global Admin permissions are needed for directory read and write.

articles/active-directory/external-identities/media/reset-redemption-status/reset-status.png

@@ -1,13 +1,13 @@
 ---
 
-title: Reset a guest user's redemption status
+title: Reset redemption status for a guest user
 description: Learn how to reset the invitation redemption status for an Azure Active Directory B2B guest users in Azure AD External Identities.
 
 services: active-directory
 ms.service: active-directory
 ms.subservice: B2B
 ms.topic: how-to
-ms.date: 12/07/2022
+ms.date: 05/31/2023
 
 ms.author: cmulligan
 author: csmulligan
@@ -26,7 +26,7 @@ In this article, you'll learn how to update the [guest user's](user-properties.m
 - The user has moved to a different company, but they still need the same access to your resources
 - The user’s responsibilities have been passed along to another user
 
-To manage these scenarios previously, you had to manually delete the guest user’s account from your directory and reinvite the user. Now you can use the Azure portal, PowerShell or the Microsoft Graph invitation API to reset the user's redemption status and reinvite the user while keeping the user's object ID, group memberships, and app assignments. When the user redeems the new invitation, the [UPN](../hybrid/plan-connect-userprincipalname.md#what-is-userprincipalname) of the user doesn't change, but the user's sign-in name changes to the new email. Then the user can sign in using the new email or an email you've added to the `otherMails` property of the user object.
+To manage these scenarios previously, you had to manually delete the guest user’s account from your directory and reinvite the user. Now you can use the Azure portal, PowerShell or the Microsoft Graph invitation API to reset the user's redemption status and reinvite the user while keeping the user's object ID, group memberships, and app assignments. When the user redeems the new invitation, the UserPrincipalName (UPN) of the user doesn't change, but the user's sign-in name changes to the new email. Then the user can sign in using the new email or an email you've added to the `otherMails` property of the user object.
 
 ## Required Azure AD roles
 
@@ -48,15 +48,13 @@ To reset a user's redemption status, you'll need one of the following roles:
    1. Next to **Other emails**, select **Add email**. Select **Add**, type the new email, and select **Save**.
    1. Select the **Save** button at the bottom of the page to save all changes.
 
-1. On the **Overview** tab, under **My Feed**, select the **Manage (resend invitation / reset status)** link in the **B2B collaboration** tile.
+1. On the **Overview** tab, under **My Feed**, select the **Reset redemption status** link in the **B2B collaboration** tile.
 
-    [ ![Screenshot showing the B2B collaboration reset link.](./media/reset-redemption-status/user-profile-b2b-collaboration.png) ](media/reset-redemption-status/user-profile-b2b-collaboration.png#lightbox)
+   :::image type="content" source="media/reset-redemption-status/user-profile-b2b-collaboration.png" alt-text="Screenshot showing the B2B collaboration reset link." lightbox="media/reset-redemption-status/user-profile-b2b-collaboration.png":::
 
-1. Under **Redemption status**, next to **Reset invitation status?**, select **Yes**.
+1. Under **Reset redemption status**, select **Reset**.
 
-    ![Screenshot showing the reset invitation status setting.](./media/reset-redemption-status/reset-status.png)
-
-1. Select **Yes** to confirm.
+   :::image type="content" source="media/reset-redemption-status/reset-status.png" alt-text="Screenshot showing the reset invitation status setting.":::
 
 ## Use PowerShell or Microsoft Graph API to reset redemption status
 
@@ -121,5 +119,6 @@ ContentType: application/json
 
 ## Next steps
 
-- [Add Azure Active Directory B2B collaboration users by using PowerShell](customize-invitation-api.md#powershell)
 - [Properties of an Azure AD B2B guest user](user-properties.md)
+- [Add Azure Active Directory B2B collaboration users by using PowerShell](customize-invitation-api.md#powershell)
+