Merge pull request #31961 from github/repo-sync

Repo sync

Author: docs-bot

.github/workflows/delete-orphan-translation-files.yml

@@ -99,6 +99,22 @@ jobs:
             exit 0
           fi
 
+          # Create a general retry function that retries and sleeps
+          retry_command() {
+            local max_attempts=3
+            local attempt=1
+
+            while [ $attempt -le $max_attempts ]; do
+              echo "Attempt $attempt: $@"
+              "$@" && return 0
+              ((attempt++))
+              sleep 3 # You can adjust the sleep duration as needed
+            done
+
+            echo "Max attempts reached. Command failed after $max_attempts attempts."
+            return 1
+          }
+
           git status
           current_timestamp=$(date '+%Y-%m-%d-%H%M%S')
           branch_name="delete-orphan-files-$current_timestamp"
@@ -115,7 +131,7 @@ jobs:
             ' \
             --repo "${{ matrix.language_repo }}"
           echo "Merge created PR..."
-          gh pr merge --merge --auto --delete-branch "$branch_name"
+          retry_command gh pr merge --merge --auto --delete-branch "$branch_name"
 
       - uses: ./.github/actions/slack-alert
         if: ${{ failure() && github.event_name != 'workflow_dispatch' }}

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

@@ -91,9 +91,8 @@ You can use your two-factor authentication credentials or two-factor authenticat
     **Warning**: {% data reusables.accounts.you-must-know-your-password %}
 
     {% endwarning %}
-1. Under "Having problems?", click **Use a recovery code or request a reset**.
+1. Under "Having problems?", click **Use a recovery code or begin 2FA account recovery**.
 
-   ![Screenshot of the 2FA page at sign in. A link with the text "Use a recovery code or request a reset" is outlined in orange.](/assets/images/help/2fa/use-recovery-code-or-reset-link.png)
 {% ifversion 2fa-reconfiguration-inline-update %}
 1. Under "Locked out?", click **Recover your account or unlink an email address**.
 {% else %}