Merge branch 'main' into patch-3

content/authentication/keeping-your-account-and-data-secure/sudo-mode.md

@@ -41,13 +41,16 @@ After you authenticate to perform a sensitive action, your session is temporaril
 
 To confirm access for sudo mode, you {% ifversion totp-and-mobile-sudo-challenge %}can{% else %}must{% endif %} authenticate with your password.{% ifversion totp-and-mobile-sudo-challenge %} Optionally, you can use a different authentication method, like {% ifversion fpt or ghec %}a security key, {% data variables.product.prodname_mobile %}, or a 2FA code{% elsif ghes %}a security key or a 2FA code{% endif %}.{% endif %}
 
-{% ifversion totp-and-mobile-sudo-challenge %}
+{%- ifversion totp-and-mobile-sudo-challenge %}
 - [Confirming access using a security key](#confirming-access-using-a-security-key)
 {%- ifversion fpt or ghec %}
 - [Confirming access using GitHub Mobile](#confirming-access-using-github-mobile)
 {%- endif %}
 - [Confirming access using a 2FA code](#confirming-access-using-a-2fa-code)
 - [Confirming access using your password](#confirming-access-using-your-password)
+{%- endif %}
+
+{% ifversion totp-and-mobile-sudo-challenge %}
 
 ### Confirming access using a security key
 
@@ -57,8 +60,6 @@ When prompted to authenticate for sudo mode, click **Use security key**, then fo
 
 ![Screenshot of security key option for sudo mode](/assets/images/help/settings/sudo_mode_prompt_security_key.png)
 
-{% endif %}
-
 {% ifversion fpt or ghec %}
 
 ### Confirming access using {% data variables.product.prodname_mobile %}
@@ -75,8 +76,6 @@ You must install and sign into {% data variables.product.prodname_mobile %} to c
 
 {% endif %}
 
-{% ifversion totp-and-mobile-sudo-challenge %}
-
 ### Confirming access using a 2FA code
 
 You must configure 2FA using a TOTP mobile app{% ifversion fpt or ghec %} or text messages{% endif %} to confirm access to your account for sudo mode using a 2FA code. For more information, see "[Configuring two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication)."

content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md

@@ -23,11 +23,18 @@ permissions: People with write access for a forked repository can sync the fork
 
 ## Syncing a fork branch from the web UI
 
+{% ifversion syncing-fork-web-ui %}
 1. On {% data variables.product.product_name %}, navigate to the main page of the forked repository that you want to sync with the upstream repository.
-2. Select the **Fetch upstream** drop-down.
+2. Select the **Sync fork** dropdown.
+    !["Sync fork" dropdown emphasized](/assets/images/help/repository/sync-fork-dropdown.png)
+3. Review the details about the commits from the upstream repository, then click **Update branch**.
+    ![Sync fork modal with "Update branch" button emphasized](/assets/images/help/repository/update-branch-button.png)
+{% else %}
+1. On {% data variables.product.product_name %}, navigate to the main page of the forked repository that you want to sync with the upstream repository.
+2. Select the **Fetch upstream** dropdown.
     !["Fetch upstream" drop-down](/assets/images/help/repository/fetch-upstream-drop-down.png)
 3. Review the details about the commits from the upstream repository, then click **Fetch and merge**.
-    !["Fetch and merge" button](/assets/images/help/repository/fetch-and-merge-button.png)
+    !["Fetch and merge" button](/assets/images/help/repository/fetch-and-merge-button.png){% endif %}
 
 If the changes from the upstream repository cause conflicts, {% data variables.product.company_short %} will prompt you to create a pull request to resolve the conflicts.
 

data/features/syncing-fork-web-ui.yml

@@ -0,0 +1,7 @@
+# Issue 7629
+# Improved UI for manually syncing a fork
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.7'
+  ghae: 'issue-7629'

data/features/totp-and-mobile-sudo-challenge.yml

@@ -1,6 +1,6 @@
 # TOTP and mobile challenge for sudo mode prompt.
 
 versions:
-  fpt: '*'
-  ghec: '*'
+  #fpt: '*'
+  #ghec: '*'
   ghes: '>= 3.7'