Merge pull request #6833 from github/repo-sync

repo sync

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

@@ -21,8 +21,11 @@ topics:
 2. Enter the email address associated with your personal {% data variables.product.product_name %} account, then click **Send password reset email.** The email will be sent to the backup email address if you have one configured.
   ![Password reset email request dialog](/assets/images/help/settings/password-recovery-email-request.png)
 3. We'll email you a link that will allow you to reset your password. You must click on this link within 3 hours of receiving the email. If you didn't receive an email from us, make sure to check your spam folder.
-4. After clicking on the link in your email, you'll be asked to enter a new password.
-  ![Password recovery box](/assets/images/help/settings/password_recovery_page.png)
+4. If you have enabled two-factor authentication, you will be prompted for your 2FA credentials. Type your 2FA credentials or one of your 2FA recovery codes and click **Verify**.
+  ![Two-factor authentication prompt](/assets/images/help/2fa/2fa-password-reset.png)
+5. Type a new password, confirm your new password, and click **Change password**. For help creating a strong password, see "[Creating a strong password](/articles/creating-a-strong-password)."
+  {% if currentVersion == "free-pro-team@latest" %}![Password recovery box](/assets/images/help/settings/password-recovery-page.png){% else %}
+  ![Password recovery box](/assets/images/enterprise/settings/password-recovery-page.png){% endif %}
 
 {% tip %}
 

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

@@ -46,7 +46,8 @@ If you configured two-factor authentication using a security key, you can use yo
 
 {% if currentVersion == "free-pro-team@latest" %}
 ### Authenticating with a verified device, SSH token, or personal access token
-If you lose access to the two-factor authentication credentials and don't have your two-factor authentication recovery codes, you can have a one-time password sent to your verified email address to begin the verification process and regain access to your account.
+
+If you know your {% data variables.product.product_name %} password but don't have the two-factor authentication credentials or your two-factor authentication recovery codes, you can have a one-time password sent to your verified email address to begin the verification process and regain access to your account.
 
 {% note %}
 
@@ -56,7 +57,7 @@ If you lose access to the two-factor authentication credentials and don't have y
 
 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.
 
-{% data reusables.two_fa.username-password %}
+1. Type your username and password to prompt authentication. If you do not know your {% data variables.product.product_name %} password, you will not be able to generate a one-time password.
 2. Under "Having Problems?", click **Can't access your two factor device or valid recovery codes?**
   ![Link if you don't have your 2fa device or recovery codes](/assets/images/help/2fa/no-access-link.png)
 3. Click **I understand, get started** to request a reset of your authentication settings.