Update 2FA recovery language post-UX changes (#56832)

Co-authored-by: Copilot <[email protected]>
Co-authored-by: Jules <[email protected]>

Author: 3 people

content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/unlinking-your-email-address-from-a-locked-account.md

@@ -1,6 +1,6 @@
 ---
 title: Unlinking your email address from a locked account
-intro: 'If you have lost your two-factor authentication (2FA) credentials and are unable to recover access, you can remove the connection between your email address and a 2FA locked account. The email address is then available for you to link it to a new or existing account, maintaining your commit history.'
+intro: 'If you have lost your two-factor authentication (2FA) credentials and are unable to recover access, you can remove the connection between your email address and a 2FA locked account.'
 redirect_from:
   - /early-access/account-and-profile/unlinking-your-email-address-from-a-locked-account
   - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/unlinking-your-email-address-from-a-locked-account
@@ -26,30 +26,23 @@ Be aware that nothing else associated with your 2FA locked account, including yo
 
 Unlinking email addresses is only available for accounts with 2FA enabled. If you do not have 2FA enabled, you can sign in and remove your email address from your account settings.
 
+Educational benefits cannot be transferred after an email address is unlinked and associated with a different account. To keep these benefits, you must continue using the original account that was used to apply.
+
 > [!WARNING]
-> Following these steps will not disable 2FA or provide access to a locked account, but will instead unlink the associated email address so it may be used for a different account. If you cannot regain access to the 2FA locked account, these steps will permanently break the link between the account and the linked email address. Before continuing with this article, be sure you have lost all access to your account. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials).
->
-> Educational benefits and discounts cannot be transferred after an email address is unlinked and associated with a different account. To keep these benefits, you must continue using the original account that was used to apply.
+> Following these steps will not disable 2FA or provide access to a locked account, but will instead unlink the associated email address so it may be used for a different account. If you cannot regain access to the 2FA locked account, these steps will permanently break the link between the account and the linked email address. Before continuing, be sure you have lost all access to your account. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials).
 
 ### Unlinking with your password
 
-If you know your password, you can sign in with your password to unlink your email address
+If you know your password, you can sign in with your password to unlink your email address.
 
-1. Navigate to [https://github.com/login](https://github.com/login).
-1. To prompt two-factor authentication, type your username and password, then click **Sign in**.
-1. Under "Having problems?", click **Use a recovery code or begin 2FA account recovery**.
-1. Under "Locked out?", click **Try 2FA account recovery, or unlink your account email address(es)**.
-1. In the modal that appears, click **I understand, get started**.
-1. You may be required to verify an email address. To send an email containing a one-time password to each email address associated with your account, click **Send one-time password**.
-1. To verify your identity, type the one-time password from your email in the "One-time password" text field, then click **Verify email address**.
+{% data reusables.accounts.prompt-for-2fa-recovery-code %}
+{% data reusables.accounts.start-automated-recovery-with-password %}
 {% data reusables.accounts.unlinking-email-address %}
 
 ### Unlinking without your password
 
 If you do not know your account password, you can request a password reset link to unlink your email address.
 
 {% data reusables.accounts.request-password-reset-link %}
-
-1. On {% data variables.product.prodname_dotcom %}, you will be prompted for your 2FA credentials. Under "Having problems?", click **Start a 2FA recovery request or unlink your account email address(es)**.
-1. In the modal that appears, click **I understand, get started**.
+{% data reusables.accounts.start-automated-recovery-without-password %}
 {% data reusables.accounts.unlinking-email-address %}

content/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials.md

@@ -1,6 +1,6 @@
 ---
 title: Updating your GitHub access credentials
-intro: '{% data variables.product.github %} credentials include not only your password, but also the access tokens, SSH keys, and application API tokens you use to communicate with {% data variables.product.github %}. Should you have the need, you can reset all of these access credentials yourself.'
+intro: '{% data variables.product.github %} credentials include your password, access tokens, SSH keys, and application API tokens used to communicate with {% data variables.product.github %}. You can reset all of these access credentials yourself.'
 redirect_from:
   - /articles/rolling-your-credentials
   - /articles/how-can-i-reset-my-password
@@ -27,18 +27,16 @@ shortTitle: Update access credentials
 {% data reusables.accounts.request-password-reset-link %}
 
 1. If you have enabled two-factor authentication, you will be prompted for your 2FA credentials:
-{% ifversion fpt or ghec %}
-   * If you have {% data variables.product.prodname_mobile %}, you will be sent a push notification to verify your identity. Open the push notification or the {% data variables.product.prodname_mobile %} app and enter the two-digit code shown to you on the password reset page in your browser.
-      * To skip using {% data variables.product.prodname_mobile %} to verify, click **Enter two-factor authentication or recovery code**.
-{% endif %}
-   * Type your authentication code or one of your recovery codes and click **Verify**.
-     * If you have added a security key to your account, click **Use security key** instead of typing an authentication code.
-     {% ifversion fpt or ghec %}
-     * If you have set up [{% data variables.product.prodname_mobile %}](https://github.com/mobile), click **Authenticate with {% data variables.product.prodname_mobile %}** instead.
-     {% endif %}
-     {% ifversion 2fa-recovery-flow %}
-     * If you've lost access to your two-factor authentication credentials and your recovery codes, you can start account recovery request. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials#recovering-without-your-password-or-two-factor-authentication-credentials).
-     {% endif %}
+   * If you have added a passkey or a security key to your account, click **Use passkey or security key**.
+   {% ifversion fpt or ghec %}
+   * If you have set up [{% data variables.product.prodname_mobile %}](https://github.com/mobile), you will be sent a push notification to verify your identity. If you didn't receive a notification, click "More options", then **Authenticate with {% data variables.product.prodname_mobile %}**.
+   {% endif %}
+   * Alternatively, type your TOTP or SMS authentication code, or one of your recovery codes, and click **Verify**.
+
+   {% ifversion 2fa-recovery-flow %}
+   > [!NOTE]
+   > If you've lost access to your two-factor authentication credentials and your recovery codes, you can start account recovery request. See [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials#recovering-without-your-password-or-two-factor-authentication-credentials).
+   {% endif %}
 1. In the text field under **Password**, type a new password. Then, in the text field under **Confirm password**, type the password again.
 1. Click **Change password**. For help creating a strong password, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-strong-password).
 

content/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials.md

@@ -29,12 +29,10 @@ shortTitle: Recover an account with 2FA
 
 Use one of your recovery codes to automatically regain entry into your account. You may have saved your recovery codes to a password manager or your computer's downloads folder. The default filename for recovery codes is `github-recovery-codes.txt`. For more information about recovery codes, see [AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes).
 
-1. Type your username and password to prompt authentication.
-
-    > [!NOTE]
-    > If you do not know your password, you can use a recovery code after requesting a new password. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password).
+> [!NOTE]
+> If you do not know your password, you can use a recovery code after requesting a new password. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password).
 
-1. Under "Having problems?," click **Use a recovery code{% ifversion fpt or ghec %} or begin 2FA account recovery{% endif %}**.
+{% data reusables.accounts.prompt-for-2fa-recovery-code %}
 1. Type one of your recovery codes, then click **Verify**.
 
 ## Authenticating with a passkey
@@ -63,43 +61,41 @@ If you know your password for {% data variables.product.prodname_dotcom %} but d
 
 You can use your two-factor authentication credentials or two-factor authentication recovery codes to regain access to your account anytime during the 3-5 day waiting period.
 
-1. Type your username and password to prompt authentication.
+> [!WARNING]
+> {% data reusables.accounts.you-must-know-your-password %}
 
-    > [!WARNING]
-    > {% data reusables.accounts.you-must-know-your-password %}
+{% data reusables.accounts.prompt-for-2fa-recovery-code %}
+{% data reusables.accounts.start-automated-recovery-with-password %}
+{% data reusables.accounts.choose-recovery-verification-factor %}
 
-1. Under "Having problems?," click **Use a recovery code or begin 2FA account recovery**.
-1. Under "Locked out?," click **Try 2FA account recovery, or unlink your account email address(es)**.
-1. Click **I understand, get started** to request a reset of your authentication settings.
-1. Click **Send one-time password** to send a one-time password to all eligible addresses associated with your account. Only verified emails are eligible for account recovery. If you've restricted password resets to your primary and/or backup addresses, these addresses are the only addresses eligible for account recovery.
-1. Under "One-time password," type the temporary password from the recovery email {% data variables.product.prodname_dotcom %} sent, then click **Verify email address**.
-1. {% data reusables.accounts.alternative-authentication %}
-    {% data reusables.accounts.alternative-authentication-note %}
-1. {% data reusables.accounts.support-request-recovery %}
+{% data reusables.accounts.automated-recovery-review-period-notice %}
 
 {% endif %}
 
 {% ifversion 2fa-recovery-flow %}
 
 ## Recovering without your password
 
-If you have forgotten your password, you can request a new password. During the password reset process, you can use one of your two-factor authentication credentials or a recovery code. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password).
+If you have forgotten your password, you can request a new password and recover your account during the password reset process.
+
+### Using a two-factor authentication recovery code to reset your password
+
+If you have your recovery codes, you can use them to complete the password reset process. See [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password).
 
 ### Recovering without your password or two-factor authentication credentials
 
 If you have lost access to your two-factor authentication credentials and your recovery codes, you can start account recovery request. You'll need to verify your identity using a recovery authentication factor, such as an SSH key or previously verified device.
 
 {% data reusables.accounts.request-password-reset-link %}
 
-1. On {% data variables.product.prodname_dotcom %}, you will be prompted for your 2FA credentials. Under "Having problems?," click **Start a 2FA recovery request or unlink your account email address(es)**.
-1. To complete your recovery request, you'll need to verify an alternative authentication factor.
-{% data reusables.accounts.alternative-authentication %}
-    {% data reusables.accounts.alternative-authentication-note %}
-1. {% data reusables.accounts.support-request-recovery %}
+{% data reusables.accounts.start-automated-recovery-without-password %}
+{% data reusables.accounts.choose-recovery-verification-factor %}
+
+{% data reusables.accounts.automated-recovery-review-period-notice %}
 
 ## Unlinking your email address
 
-If you have exhausted your recovery options, you can unlink your email address from your account. The email address is then available for you to link it to a new or existing account, maintaining your commit history. See [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/unlinking-your-email-address-from-a-locked-account#unlinking-without-your-password).
+If you have exhausted your recovery options, you can unlink your email address from your account. The email address is then available for you to link it to a new or existing account, maintaining your commit history. See [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/unlinking-your-email-address-from-a-locked-account).
 
 {% endif %}
 

data/reusables/accounts/alternative-authentication-note.md

@@ -1 +1 @@
-A member of {% data variables.contact.github_support %} will review your request and email you within three business days. If your request is approved, you'll receive a link to complete your account recovery process. If your request is denied, the email will include a way to contact support with any additional questions.
+A member of {% data variables.contact.github_support %} will review your request and email you within three business days. If your request is approved, you'll receive a link to complete your account recovery process. If your request is denied, the email will include a way to contact support.

data/reusables/accounts/alternative-authentication.md

@@ -0,0 +1,8 @@
+1. Choose a recovery verification factor.
+
+    * If you've used your current device to log into this account before and would like to use the device for verification, click **Verify with this device**.
+    * If you've previously set up an SSH key on this account and would like to use the SSH key for verification, click **SSH key**.
+    * If you've previously set up a {% data variables.product.pat_generic %} and would like to use the {% data variables.product.pat_generic %} for verification, click **{% data variables.product.pat_generic_caps %}**.
+
+    > [!NOTE]
+    > For security reasons, an authentication factor may not be available for recovery, even if you've used that authentication method with the account before. For example, SSH keys are removed from accounts after a period of inactivity.

data/reusables/accounts/support-request-recovery.md renamed to data/reusables/accounts/automated-recovery-review-period-notice.md

@@ -0,0 +1,5 @@
+1. Navigate to [https://github.com/login](https://github.com/login).
+1. To prompt two-factor authentication, type your username and password, then click **Sign in**.
+   > [!NOTE]
+   > If you have linked a Google account to your {% data variables.product.prodname_dotcom %} account, you can sign-in with your social login instead of using your password.
+1. Under "More options", click **2FA recovery code**.

data/reusables/accounts/choose-recovery-verification-factor.md

@@ -0,0 +1,6 @@
+1. Under "More options", click **Begin account or email recovery**.
+1. In the modal that appears, click **I understand, get started**.
+1. You may be required to verify an email address. To send an email containing a one-time password to each email address associated with your account, click **Send one-time password**.
+   > [!NOTE]
+   > The one-time password will be sent to your primary and backup email addresses. Unless you have previously chosen a specific backup email address, all verified emails are considered backup email addresses.
+1. Type the one-time password from your email in the "One-time password" text field, then click **Verify email address**.

data/reusables/accounts/prompt-for-2fa-recovery-code.md

@@ -0,0 +1,2 @@
+1. You will be prompted for your 2FA credentials. Under "More options", click **Begin account or email recovery**.
+1. In the modal that appears, click **I understand, get started**.