Add content for inline updates to 2FA settings (#34230)

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com>
Co-authored-by: Zachary Sierakowski <zacharysierakowski@github.com>

content/authentication/securing-your-account-with-two-factor-authentication-2fa/accessing-github-using-two-factor-authentication.md

@@ -39,7 +39,7 @@ After you sign in to {% data variables.product.product_name %} using your passwo
 
 If you chose to set up two-factor authentication using a TOTP application on your smartphone, you can generate an authentication code for {% data variables.product.product_name %} at any time. In most cases, just launching the application will generate a new code. You should refer to your application's documentation for specific instructions.
 
-If you delete your authenticator application after configuring two-factor authentication, you'll need to provide your recovery code to get access to your account. Many TOTP apps support the secure backup of your authentication codes in the cloud and can be restored if you lose access to your device. For more information, see "[Recovering your account if you lose your two-factor authentication credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)"
+If you delete your authenticator application after configuring two-factor authentication, you'll need to provide your recovery code to get access to your account. Many TOTP apps support the secure backup of your authentication codes in the cloud and can be restored if you lose access to your device. For more information, see "[Recovering your account if you lose your two-factor authentication credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)."
 
 {% ifversion fpt or ghec %}
 

content/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device.md

@@ -1,35 +0,0 @@
----
-title: Changing two-factor authentication delivery methods for your mobile device
-intro: You can switch between receiving authentication codes through a text message or a mobile application.
-redirect_from:
-  - /articles/changing-two-factor-authentication-delivery-methods
-  - /articles/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
-  - /github/authenticating-to-github/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
-  - /github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
-versions:
-  fpt: '*'
-  ghec: '*'
-topics:
-  - 2FA
-shortTitle: Change 2FA delivery method
----
-{% note %}
-
-**Note:** Changing your primary method for two-factor authentication invalidates your current two-factor authentication setup, including your recovery codes. Keep your new set of recovery codes safe. Changing your primary method for two-factor authentication does not affect your fallback SMS configuration, if configured. For more information, see "[Configuring two-factor authentication recovery methods](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#setting-a-fallback-authentication-number)."
-
-{% endnote %}
-
-{% data reusables.user-settings.access_settings %}
-{% data reusables.user-settings.security %}
-3. Next to "Primary two-factor method", click **Change**.
-  ![Edit primary delivery options](/assets/images/help/2fa/edit-primary-delivery-option.png)
-4. Under "Delivery options", click **Reconfigure two-factor authentication**.
-    ![Switching your 2FA delivery options](/assets/images/help/2fa/2fa-switching-methods.png)
-5. Decide whether to set up two-factor authentication using a TOTP mobile app or text message. For more information, see "[Configuring two-factor authentication](/articles/configuring-two-factor-authentication)."
-    - To set up two-factor authentication using a TOTP mobile app, click **Set up using an app**.
-    - To set up two-factor authentication using text message (SMS), click **Set up using SMS**.
-
-## Further reading
-
-- "[About two-factor authentication](/articles/about-two-factor-authentication)"
-- "[Configuring two-factor authentication recovery methods](/articles/configuring-two-factor-authentication-recovery-methods)"

content/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-your-preferred-two-factor-authentication-method.md

@@ -0,0 +1,33 @@
+---
+title: Changing your preferred two-factor authentication method
+intro: You can switch your preferred two-factor authentication (2FA) method to complete 2FA prompts with the newly selected method.
+redirect_from:
+  - /articles/changing-two-factor-authentication-delivery-methods
+  - /articles/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
+  - /github/authenticating-to-github/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
+  - /github/authenticating-to-github/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
+  - /authentication/securing-your-account-with-two-factor-authentication-2fa/changing-two-factor-authentication-delivery-methods-for-your-mobile-device
+versions:
+  feature: 2fa-reconfiguration-inline-update
+topics:
+  - 2FA
+shortTitle: Change 2FA method
+---
+
+{% note %}
+
+**Note:** You can reconfigure your 2FA settings without disabling 2FA entirely, allowing you to keep both your recovery codes and your membership in organizations that require 2FA.
+
+{% endnote %}
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.security %}
+1. In "Two-factor methods", find the method you want to set as your preferred 2FA method. Next to that method, select {% octicon "kebab-horizontal" aria-label="The horizontal kebab icon" %}, then click **Set as preferred method**.
+    ![Screenshot of the "Set as preferred method" button in the 2FA settings](/assets/images/help/2fa/change-preferred-2fa-method.png)
+
+A "Preferred" label is displayed next to the name of your preferred method.
+
+## Further reading
+
+- "[Configuring two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication)"
+- "[Configuring two-factor authentication recovery methods](/articles/configuring-two-factor-authentication-recovery-methods)"

content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods.md

@@ -28,12 +28,12 @@ To keep your account secure, don't share or distribute your recovery codes. We r
 - [1Password](https://1password.com/)
 - [LastPass](https://lastpass.com/)
 
-If you generate new recovery codes or disable and re-enable 2FA, the recovery codes in your security settings automatically update.
+If you generate new recovery codes or disable and re-enable 2FA, the recovery codes in your security settings automatically update.{% ifversion 2fa-reconfiguration-inline-update %} Reconfiguring your 2FA settings without disabling 2FA will not change your recovery codes.{% endif %}
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
 {% data reusables.two_fa.show-recovery-codes %}
-4. Save your recovery codes in a safe place. Your recovery codes can help you get back into your account if you lose access.
+1. Save your recovery codes in a safe place. Your recovery codes can help you get back into your account if you lose access.
     - To save your recovery codes on your device, click **Download**.
     - To save a hard copy of your recovery codes, click **Print**.
     - To copy your recovery codes for storage in a password manager, click **Copy**.
@@ -57,7 +57,7 @@ You can set up a security key as a secondary two-factor authentication method, a
 
 ## Setting a fallback authentication number
 
-You can provide a second number for a fallback device. If you lose access to both your primary device and your recovery codes, a backup SMS number can get you back in to your account.
+You can provide a second number for a fallback device. If you lose access to both your preferred device and your recovery codes, a backup SMS number can get you back in to your account.
 
 You can use a fallback number regardless of whether you've configured authentication via text message or TOTP mobile application.
 
@@ -71,11 +71,11 @@ You can use a fallback number regardless of whether you've configured authentica
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
-3. Next to "Fallback SMS number", click **Add**.
+1. Next to "Fallback SMS number", click **Add**.
 ![Add fallback SMS number button](/assets/images/help/2fa/add-fallback-sms-number-button.png)
-4. Under "Fallback SMS number", click **Add fallback SMS number**.
+1. Under "Fallback SMS number", click **Add fallback SMS number**.
 ![Add fallback SMS number text](/assets/images/help/2fa/add_fallback_sms_number_text.png)
-5. Select your country code and type your mobile phone number, including the area code. When your information is correct, click **Set fallback**.
+1. Select your country code and type your mobile phone number, including the area code. When your information is correct, click **Set fallback**.
 	![Set fallback SMS number](/assets/images/help/2fa/2fa-fallback-number.png)
 
 After setup, the backup device will receive a confirmation SMS.

content/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication.md

@@ -39,6 +39,14 @@ If you're a member of an {% data variables.enterprise.prodname_emu_enterprise %}
 
 {% endwarning %}
 
+{% ifversion 2fa-reconfiguration-inline-update %}
+{% note %}
+
+**Note:** You can reconfigure your 2FA settings without disabling 2FA entirely, allowing you to keep both your recovery codes and your membership in organizations that require 2FA.
+
+{% endnote %}
+{% endif %}
+
 ## Configuring two-factor authentication using a TOTP mobile app
 
 A time-based one-time password (TOTP) application automatically generates an authentication code that changes after a certain period of time. We recommend using cloud-based TOTP apps such as:
@@ -81,7 +89,7 @@ A time-based one-time password (TOTP) application automatically generates an aut
 
 ## Configuring two-factor authentication using text messages
 
-If you're unable to authenticate using a TOTP mobile app, you can authenticate using SMS messages. You can also provide a second number for a fallback device. If you lose access to both your primary device and your recovery codes, a backup SMS number can get you back in to your account.
+If you're unable to authenticate using a TOTP mobile app, you can authenticate using SMS messages. You can also provide a second number for a fallback device. If you lose access to both your preferred device and your recovery codes, a backup SMS number can get you back in to your account.
 
 Before using this method, be sure that you can receive text messages. Carrier rates may apply.
 
@@ -94,7 +102,7 @@ Before using this method, be sure that you can receive text messages. Carrier ra
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
 {% data reusables.two_fa.enable-two-factor-authentication %}
-4. Below "Setup authenticator app", select **SMS authentication**
+1. Below "Setup authenticator app", select **SMS authentication**
 
   ![2FA SMS alternative option](/assets/images/help/2fa/2fa_sms_alt_option.png)
 
@@ -122,15 +130,15 @@ Authentication with a security key is *secondary* to authentication with a TOTP
 2. Ensure that you have a WebAuthn compatible security key inserted into your computer.
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
-5. Next to "Security keys", click **Add**.
+1. Next to "Security keys", click **Add**.
   ![Add security keys option](/assets/images/help/2fa/add-security-keys-option.png)
-6. Under "Security keys", click **Register new security key**.
+1. Under "Security keys", click **Register new security key**.
   ![Registering a new security key](/assets/images/help/2fa/security-key-register.png)
-7. Type a nickname for the security key, then click **Add**.
+1. Type a nickname for the security key, then click **Add**.
   ![Providing a nickname for a security key](/assets/images/help/2fa/security-key-nickname.png)
-8. Activate your security key, following your security key's documentation.
+1. Activate your security key, following your security key's documentation.
   ![Prompt for a security key](/assets/images/help/2fa/security-key-prompt.png)
-9.  Confirm that you've downloaded and can access your recovery codes. If you haven't already, or if you'd like to generate another set of codes, download your codes and save them in a safe place. For more information, see "[Downloading your 2FA recovery codes](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)."
+1.  Confirm that you've downloaded and can access your recovery codes. If you haven't already, or if you'd like to generate another set of codes, download your codes and save them in a safe place. For more information, see "[Downloading your 2FA recovery codes](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods#downloading-your-two-factor-authentication-recovery-codes)."
 {% ifversion ghes < 3.9 %}{% data reusables.two_fa.test_2fa_immediately %}{% endif %}
 
 {% ifversion fpt or ghec %}

content/authentication/securing-your-account-with-two-factor-authentication-2fa/index.md

@@ -18,9 +18,8 @@ children:
   - /configuring-two-factor-authentication-recovery-methods
   - /accessing-github-using-two-factor-authentication
   - /recovering-your-account-if-you-lose-your-2fa-credentials
-  - /changing-two-factor-authentication-delivery-methods-for-your-mobile-device
+  - /changing-your-preferred-two-factor-authentication-method
   - /countries-where-sms-authentication-is-supported
   - /disabling-two-factor-authentication-for-your-personal-account
 shortTitle: Secure your account with 2FA
 ---
-

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

@@ -19,7 +19,7 @@ shortTitle: Recover an account with 2FA
 
 {% warning %}
 
-**Warnings**: 
+**Warnings**:
 
 - {% data reusables.two_fa.support-may-not-help %}
 
@@ -42,7 +42,7 @@ Use one of your recovery codes to automatically regain entry into your account.
     {% warning %}
 
     **Warning**: {% data reusables.accounts.you-must-know-your-password %}
-    
+
     {% endwarning %}
 
 {% ifversion fpt or ghec %}
@@ -60,7 +60,7 @@ Use one of your recovery codes to automatically regain entry into your account.
 {% ifversion fpt or ghec %}
 ## Authenticating with a fallback number
 
-If you lose access to your primary TOTP app or phone number, you can provide a two-factor authentication code sent to your fallback number to automatically regain access to your account.
+If you lose access to your preferred TOTP app or phone number, you can provide a two-factor authentication code sent to your fallback number to automatically regain access to your account.
 {% endif %}
 
 ## Authenticating with a security key
@@ -85,7 +85,7 @@ You can use your two-factor authentication credentials or two-factor authenticat
     {% warning %}
 
     **Warning**: {% data reusables.accounts.you-must-know-your-password %}
-    
+
     {% endwarning %}
 1. Under "Having problems?", click **Use a recovery code or request a reset**.
 

data/features/2fa-reconfiguration-inline-update.yml

@@ -0,0 +1,6 @@
+# Reference: #9087
+
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '> 3.8'