Repo sync

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

@@ -45,17 +45,7 @@ Since an email address can only be associated with a single {% data variables.pr
    In the modal that appears, click **I understand, get started**.
 1. 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**.
-1. To begin unlinking an email address from the locked account, click **Start unlinking email**.
-1. On the "Unlink Email" screen, click **Continue**.
-1. In the inbox of the email account you want to unlink, open the email with the subject "[{% data variables.product.company_short %}] Unlink this email."
-   - Optionally, to unlink multiple email accounts, in the inbox of each account you want to unlink, open the email with the subject "[{% data variables.product.company_short %}] Unlink this email," then complete the following steps.
-
-1. In the email, click **Unlink this email**.
-
-   ![Screenshot of an email from {% data variables.product.prodname_dotcom %} to unlink an email address from a {% data variables.product.prodname_dotcom %} account. A link with the text "Unlink this email" is outlined in orange.](/assets/images/help/2fa/unlink-this-email.png)
-
-1. To finish unlinking your email, on {% data variables.product.prodname_dotcom_the_website %}, click **Unlink**.
-1. Optionally, to create a new account and link your newly unlinked email, click **Create a new account**.
+{% data reusables.accounts.unlinking-email-address %}
 
    {% note %}
 

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

@@ -27,12 +27,15 @@ shortTitle: Update access credentials
 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 GitHub Mobile to verify, click **Enter two-factor authentication or recovery code**.
+      - 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 GitHub Mobile** instead.
+     - 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 have forgotten your password and you've lost access to your two-factor authentication credentials, click **Start a 2FA recovery request**. For more information, see "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-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

@@ -102,11 +102,29 @@ You can use your two-factor authentication credentials or two-factor authenticat
 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. Choose an alternative 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 %}**.
-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.
+1. {% data reusables.accounts.alternative-authentication %}
+1. {% data reusables.accounts.support-request-recovery %}
+
+{% endif %}
+
+{% ifversion 2fa-recovery-flow %}
+
+## Requesting help with two-factor authentication
+
+If you have forgotten your password and you've lost access to your two-factor authentication credentials, you can start account recovery to regain access to your account. You'll need to verify your identity using a recovery authentication factor, such as an SSH key or previously verified device. If no recovery methods are available, you can choose to unlink your email address from your account.
+
+1. Click **Forgot password?**.
+1. Enter a primary or backup email address associated with your account on {% data variables.location.product_location %}, then click **Send password reset email.**
+1. Check your email for a link to reset your password. You must click on this link within three hours of receiving the email. If you don't see an email from us, make sure to check your spam folder.
+1. Click on the link in the email, then under "Having problems?", click **Start a 2FA recovery request**.
+1. To complete your recovery request, you'll need to verify an alternative authentication factor. {% data reusables.accounts.alternative-authentication %}
+1. {% data reusables.accounts.support-request-recovery %}
+
+### Unlinking your email address
+
+Alternatively, if no recovery methods are available, you can choose to 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. For more information, 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)."
+
+{% data reusables.accounts.unlinking-email-address %}
 
 {% endif %}
 

data/features/2fa-recovery-flow.yml

@@ -0,0 +1,5 @@
+# Reference: #11773
+# 2FA account recovery from the password reset screen
+versions:
+  fpt: '*'
+  ghec: '*'

data/reusables/accounts/alternative-authentication.md

@@ -0,0 +1,4 @@
+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**. Device verification is recorded with cookies, and won't be available if your browser deletes cookies regularly.
+    - 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 %}**.

data/reusables/accounts/support-request-recovery.md

@@ -0,0 +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.

data/reusables/accounts/unlinking-email-address.md

@@ -0,0 +1,11 @@
+1. To begin unlinking an email address from the locked account, click **Start unlinking email**.
+1. On the "Unlink Email" screen, click **Continue**.
+1. In the inbox of the email account you want to unlink, open the email with the subject "[{% data variables.product.company_short %}] Unlink this email."
+   - Optionally, to unlink multiple email accounts, in the inbox of each account you want to unlink, open the email with the subject "[{% data variables.product.company_short %}] Unlink this email," then complete the following steps.
+
+1. In the email, click **Unlink this email**.
+
+   ![Screenshot of an email from {% data variables.product.prodname_dotcom %} to unlink an email address from a {% data variables.product.prodname_dotcom %} account. A link with the text "Unlink this email" is outlined in orange.](/assets/images/help/2fa/unlink-this-email.png)
+
+1. To finish unlinking your email, on {% data variables.product.prodname_dotcom_the_website %}, click **Unlink**.
+1. Optionally, to create a new account and link your newly unlinked email, click **Create a new account**.

data/reusables/accounts/you-must-know-your-password.md

@@ -1 +1 @@
-If you protect your personal account with two-factor authentication but do not know your password, you will not be able to follow these steps to recover your account. {% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)."
+If you protect your personal account with two-factor authentication but do not know your password, {% ifversion 2fa-recovery-flow %} you will need to start a two-factor authentication recovery request. For more information, see "[Request help with two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials#request-help-with-two-factor-authentication)."{% else %}you will not be able to follow these steps to recover your account.{% data variables.product.company_short %} can send a password reset email to a verified address associated with your account. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials#requesting-a-new-password)."{% endif %}