repo sync

.github/workflows/azure-prod-build-deploy.yml

@@ -142,11 +142,6 @@ jobs:
         run: |
           az webapp deployment slot swap --slot canary --target-slot production -n ghdocs-prod -g docs-prod
 
-  send-slack-notification-on-failure:
-    needs: [azure-prod-build-and-deploy]
-    runs-on: ubuntu-latest
-    if: ${{ failure() }}
-    steps:
       - name: Send Slack notification if workflow failed
         uses: someimportantcompany/github-actions-slack-message@f8d28715e7b8a4717047d23f48c39827cacad340
         if: ${{ failure() }}

content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/index.md

@@ -14,6 +14,7 @@ children:
   - /merging-multiple-personal-accounts
   - /converting-a-user-into-an-organization
   - /best-practices-for-leaving-your-company
+  - /unlinking-your-email-address-from-a-locked-account
   - /deleting-your-personal-account
 ---
 

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

@@ -0,0 +1,93 @@
+---
+title: Unlinking your email address from a locked account
+intro: 'You can remove the connection between your email address and a locked account. The email address is then available for you to link it to a new or existing account, maintaining your commit history.'
+redirect_from:
+  - /early-access/account-and-profile/unlinking-your-email-address-from-a-locked-account
+versions:
+  fpt: '*'
+  ghec: '*'
+topics:
+  - Accounts
+  - 2FA
+shortTitle: Unlink your email
+---
+
+{% note %}
+
+**Notes:**
+
+- Following these steps will not provide access to the locked account, but instead unlink the associated email address so it may be used for a different account. If you cannot regain access to the locked account, these steps will permanently break the link between the account and the linked email address. Before continuing with this article, be sure you have lost all access to your account. For more information, see "[Recovering your account if you lose your 2FA credentials](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials)."
+
+- If you recover access to your locked account, you can re-link an unlinked email address. For more information, see "[Adding an email address to your GitHub account](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)."
+
+{% endnote %}
+
+## About unlinking your email address
+
+Since an email address can only be associated with a single {% data variables.product.prodname_dotcom %} account, unlinking your email address from a locked account allows you to link that email address to a new or existing account. Additionally, linking a previously used commit email address to a new account will connect your commit history to that account. Unless you have chosen to keep your email address private, your account's commit email address is the same as your account's primary email address. For more information, see "[Setting your commit email address](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address)." Be aware that nothing else associated with your locked account, including your repositories, permissions, and profile, will transfer to your new account.
+
+{% note %}
+
+**Note:** Backup email addresses are not associated with your commits. Unlinking a backup email address and linking the email address to a different account will not connect your commit history to that account.
+
+{% endnote %}
+
+## Unlinking your email address
+
+1. Navigate to [https://github.com/login](https://github.com/login).
+1. To prompt two-factor authentication, type your username and password, then click **Sign in**.
+1. On the "Two-factor authentication" screen, click **Use a recovery code or request a reset**.
+
+  ![Screenshot of the two-factor authentication prompt with emphasis on the "Use a recovery code or request a reset" link](/assets/images/help/2fa/recovery-code-or-reset.png)
+
+1. On the "Two-factor recovery" screen, click **Try recovering your account**.
+
+  ![Screenshot of the two-factor recovery prompt with emphasis on the "Try recovering your account" link](/assets/images/help/2fa/try-recovering-account.png)
+
+  In the pop-up window that appears, click **I understand, get started**.
+
+  ![Screenshot of the "Recovering your account" pop-up window with emphasis on the "I understand, get started" button](/assets/images/help/2fa/reset-auth-settings.png)
+
+1. To send an email containing a one-time password to each email address associated with your account, click **Send one-time password**.
+
+  ![Screenshot of the email verification screen with emphasis on the "Send one-time password" button](/assets/images/help/2fa/send-one-time-password.png)
+
+1. To verify your identity, type the one-time password from your email in the "One-time password" text field.
+
+  ![Screenshot of the email verification screen with emphasis on the "One-time password" text field](/assets/images/help/2fa/one-time-password-field.png)
+
+   Click **Verify email address**.
+
+   ![Screenshot of the email verification screen with emphasis on the "Verify email address" button](/assets/images/help/2fa/verify-email-address.png)
+
+1. To begin unlinking an email address from the locked account, click **Start unlinking email**.
+
+  ![Screenshot of the account recovery screen with emphasis on the "Start unlinking email" button](/assets/images/help/2fa/start-unlinking-email.png)
+
+1. On the "Unlink Email" screen, click **Continue**.
+
+  ![Screenshot of the unlink email screen with emphasis on the "Continue" button](/assets/images/help/2fa/continue-unlinking-email.png)
+
+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 the email to unlink the email address from an account with emphasis on the "Unlink this email" link](/assets/images/help/2fa/unlink-this-email.png)
+
+1. To finish unlinking your email, on {% data variables.product.prodname_dotcom_the_website %}, click **Unlink**.
+
+  ![Screenshot of the unlink email screen with emphasis on the "Unlink" button](/assets/images/help/2fa/final-unlink-button.png)
+
+1. Optionally, to create a new account and link your newly unlinked email, click **Create a new account**.
+
+  {% note %}
+
+  **Note:** You can also link your unlinked email to an existing {% data variables.product.prodname_dotcom %} account. For more information, see "[Adding an email address to your {% data variables.product.prodname_dotcom %} account](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/adding-an-email-address-to-your-github-account)."
+
+  {% endnote %}
+
+  ![Screenshot of the "Email unlinked" screen with emphasis on the "Create a new account" button](/assets/images/help/2fa/unlink-email-create-new-account.png)
+
+1. Optionally, if you have any form of payment set up on the locked account, contact [{% data variables.contact.github_support %}](https://support.github.com/contact) to cancel future payments. For example, you might have a paid subscription or sponsor developers through {% data variables.product.prodname_sponsors %}. If you are sponsored through {% data variables.product.prodname_sponsors %}, please mention this so that the team can help you migrate your sponsorships.

content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md

@@ -47,14 +47,23 @@ You can authenticate to {% data variables.product.product_name %} in your browse
 
 - **Username and password only**
     - You'll create a password when you create your account on {% data variables.product.product_name %}. We recommend that you use a password manager to generate a random and unique password. For more information, see "[Creating a strong password](/github/authenticating-to-github/creating-a-strong-password)."{% ifversion fpt or ghec %}
-  - If you have not enabled 2FA, {% data variables.product.product_name %} will ask for additional verification when you first sign in from an unrecognized device, such as a new browser profile, a browser where the cookies have been deleted, or a new computer.
+    - If you have not enabled 2FA, {% data variables.product.product_name %} will ask for additional verification when you first sign in from an unrecognized device, such as a new browser profile, a browser where the cookies have been deleted, or a new computer.
 
    After providing your username and password, you will be asked to provide a verification code that we will send to you via email. If you have the {% data variables.product.prodname_mobile %} application installed, you'll receive a notification there instead. For more information, see "[{% data variables.product.prodname_mobile %}](/get-started/using-github/github-mobile)."{% endif %}
 - **Two-factor authentication (2FA)** (recommended)
     - If you enable 2FA, after you successfully enter your username and password, we'll also prompt you to provide a code that's generated by a time-based one time password (TOTP) application on your mobile device{% ifversion fpt or ghec %} or sent as a text message (SMS).{% endif %}{% ifversion 2fa-check-up-period %}
     - After you configure 2FA, your account enters a check up period for 28 days. You can leave the check up period by successfully performing 2FA within those 28 days. If you don't perform 2FA in that timespan, you'll then be asked to perform 2FA inside one of your existing {% data variables.product.prodname_dotcom_the_website %} sessions.
     - If you cannot perform 2FA to pass the 28th day checkup, you will be provided a shortcut that lets you reconfigure your 2FA settings. You must reconfigure your settings before you can access the rest of {% data variables.product.prodname_dotcom %}{% endif %}. For more information, see "[Accessing {% data variables.product.prodname_dotcom %} using two-factor authentication](/github/authenticating-to-github/accessing-github-using-two-factor-authentication#providing-a-2fa-code-when-signing-in-to-the-website){% ifversion 2fa-check-up-period %}" and "[Configuring two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication){% endif %}."
-    - In addition to authentication with a TOTP application{% ifversion fpt or ghec %} or a text message{% endif %}, you can optionally add an alternative method of authentication with {% ifversion fpt or ghec %}{% data variables.product.prodname_mobile %} or{% endif %} a security key using WebAuthn. For more information, see {% ifversion fpt or ghec %}"[Configuring two-factor authentication with {% data variables.product.prodname_mobile %}](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-github-mobile)" and {% endif %}"[Configuring two-factor authentication using a security key](/github/authenticating-to-github/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)."{% ifversion ghes %}
+    - In addition to authentication with a TOTP application{% ifversion fpt or ghec %} or a text message{% endif %}, you can optionally add an alternative method of authentication with {% ifversion fpt or ghec %}{% data variables.product.prodname_mobile %} or{% endif %} a security key using WebAuthn. For more information, see {% ifversion fpt or ghec %}"[Configuring two-factor authentication with {% data variables.product.prodname_mobile %}](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication#configuring-two-factor-authentication-using-github-mobile)" and {% endif %}"[Configuring two-factor authentication using a security key](/github/authenticating-to-github/configuring-two-factor-authentication#configuring-two-factor-authentication-using-a-security-key)."
+
+    {% ifversion fpt or ghec %}
+    {% note %}
+
+    **Note:** {% data reusables.two_fa.unlink-email-address %}
+
+    {% endnote %}
+    {% endif %}    
+{% ifversion ghes %}
 - **External authentication**
   - Your site administrator may configure {% data variables.location.product_location %} to use external authentication instead of a username and password. For more information, see "[External authentication methods](/admin/identity-and-access-management/managing-iam-for-your-enterprise/about-authentication-for-your-enterprise#external-authentication)."{% endif %}{% ifversion fpt or ghec %}
 - **SAML single sign-on**

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

@@ -23,6 +23,14 @@ In addition to security keys, you can also use {% data variables.product.prodnam
 
 You can also configure additional recovery methods in case you lose access to your two-factor authentication credentials. For more information on setting up 2FA, see "[Configuring two-factor authentication](/articles/configuring-two-factor-authentication)" and "[Configuring two-factor authentication recovery methods](/articles/configuring-two-factor-authentication-recovery-methods)."
 
+{% ifversion fpt or ghec %}
+{% note %}
+
+**Note:** {% data reusables.two_fa.unlink-email-address %}
+
+{% endnote %}
+{% endif %}
+
 We **strongly** urge you to enable 2FA for the safety of your account, not only on {% data variables.product.product_name %}, but on other websites and apps that support 2FA. You can enable 2FA to access {% data variables.product.product_name %} and {% data variables.product.prodname_desktop %}.
 
 For more information, see "[Accessing {% data variables.product.prodname_dotcom %} using two-factor authentication](/articles/accessing-github-using-two-factor-authentication)."

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

@@ -102,6 +102,14 @@ When you access a repository via Subversion, you must provide a {% data variable
 
 If you lose access to your two-factor authentication credentials, you can use your recovery codes or another recovery method (if you've set one up) to regain access to your account. For more information, see "[Recovering your account if you lose your 2FA credentials](/articles/recovering-your-account-if-you-lose-your-2fa-credentials)."
 
+{% ifversion fpt or ghec %}
+{% note %}
+
+**Note:** {% data reusables.two_fa.unlink-email-address %}
+
+{% endnote %}
+{% endif %}
+
 If your authentication fails several times, you may wish to synchronize your phone's clock with your mobile provider. Often, this involves checking the "Set automatically" option on your phone's clock, rather than providing your own time zone.
 
 ## Further reading

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

@@ -25,6 +25,12 @@ shortTitle: Recover an account with 2FA
 
 {% endwarning %}
 
+{% note %}
+
+**Note:** {% data reusables.two_fa.unlink-email-address %}
+
+{% endnote %}
+
 {% endif %}
 
 ## Using a two-factor authentication recovery code

data/reusables/two_fa/recover-account-without-2fa.md

@@ -0,0 +1 @@
+If you have lost access to your two-factor authentication credentials, there are a few different ways to recover your account. For more information, see "[Recovering your account if you lose your 2FA credentials](/authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials)."

data/reusables/two_fa/unlink-email-address.md

@@ -0,0 +1 @@
+If you cannot use any recovery methods, you have permanently lost access to your account. However, you can unlink an email address tied to the locked account. The unlinked email address can then be linked to a new or existing account. For more information, see "[Unlinking your email address from a locked account](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/unlinking-your-email-address-from-a-locked-account)."