Merge branch 'copilot-enterprise-megabranch' into timrogers/copilot-for-docs-ga

content/account-and-profile/index.md

@@ -27,7 +27,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Accounts

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

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Profiles

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

@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Accounts

content/actions/automating-builds-and-tests/index.md

@@ -5,7 +5,6 @@ intro: 'You can automatically build and test your projects with {% data variable
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 redirect_from:
   - /actions/building-and-testing-code-with-continuous-integration

content/actions/deployment/about-deployments/index.md

@@ -5,7 +5,6 @@ intro: 'Learn how deployments can run with {% data variables.product.prodname_ac
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /about-continuous-deployment

content/actions/deployment/deploying-to-your-cloud-provider/deploying-to-azure/index.md

@@ -5,7 +5,6 @@ intro: 'Learn how to deploy to Azure App Service, Azure Kubernetes, and Azure St
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /deploying-nodejs-to-azure-app-service

content/actions/deployment/deploying-to-your-cloud-provider/index.md

@@ -4,7 +4,6 @@ shortTitle: Deploy to your cloud provider
 intro: 'You can deploy to various cloud providers, such as AWS, Azure, and GKE.'
 versions:
   fpt: '*'
-  ghae: '*'
   ghec: '*'
   ghes: '*'
 children:

content/actions/deployment/deploying-xcode-applications/index.md

@@ -5,7 +5,6 @@ intro: 'You can sign Xcode apps within your continuous integration (CI) workflow
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /installing-an-apple-certificate-on-macos-runners-for-xcode-development

content/actions/deployment/index.md

@@ -5,7 +5,6 @@ intro: 'Automatically deploy projects with {% data variables.product.prodname_ac
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /about-deployments

content/actions/deployment/managing-your-deployments/index.md

@@ -5,7 +5,6 @@ intro: You can review the past activity of your deployments.
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /viewing-deployment-history

content/actions/deployment/targeting-different-environments/index.md

@@ -5,7 +5,6 @@ intro: You can configure environments with protection rules and secrets. A workf
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /using-environments-for-deployment

content/actions/hosting-your-own-runners/index.md

@@ -14,7 +14,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /managing-self-hosted-runners

content/actions/hosting-your-own-runners/managing-self-hosted-runners/index.md

@@ -5,7 +5,6 @@ intro: You can host your own runners to run workflows in a highly customizable e
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /about-self-hosted-runners

content/actions/index.md

@@ -40,7 +40,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /quickstart

content/actions/managing-issues-and-pull-requests/index.md

@@ -5,7 +5,6 @@ intro: 'You can automatically manage your issues and pull requests using {% data
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /using-github-actions-for-project-management

content/actions/migrating-to-github-actions/automated-migrations/index.md

@@ -5,7 +5,6 @@ intro: 'Learn how to use {% data variables.product.prodname_actions_importer %}
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /automating-migration-with-github-actions-importer

content/actions/migrating-to-github-actions/index.md

@@ -5,7 +5,6 @@ intro: 'Learn how to migrate your existing CI/CD workflows to {% data variables.
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 redirect_from:
   - /articles/migrating-github-actions-from-hcl-syntax-to-yaml-syntax

content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/index.md

@@ -5,7 +5,6 @@ intro: 'Learn how to manually migrate your existing CI/CD workflows to {% data v
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /migrating-from-azure-pipelines-to-github-actions

content/actions/monitoring-and-troubleshooting-workflows/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /about-monitoring-and-troubleshooting

content/actions/using-containerized-services/index.md

@@ -5,7 +5,6 @@ intro: 'You can use containerized services in your {% data variables.product.pro
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 redirect_from:
   - /actions/automating-your-workflow-with-github-actions/using-databases-and-services

content/admin/code-security/managing-github-advanced-security-for-your-enterprise/index.md

@@ -10,7 +10,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '> 3.6'
 topics:
   - Enterprise
 children:
@@ -20,4 +19,3 @@ children:
   - /configuring-dependency-review-for-your-appliance
   - /configuring-secret-scanning-for-your-appliance
 ---
-

content/admin/code-security/managing-supply-chain-security-for-your-enterprise/index.md

@@ -4,7 +4,6 @@ shortTitle: Supply chain security
 intro: 'You can visualize, maintain, and secure the dependencies in your developers'' software supply chain.'
 versions:
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/configuration/configuring-github-connect/index.md

@@ -12,7 +12,6 @@ redirect_from:
   - /admin/configuration/managing-connections-between-your-enterprise-accounts
 versions:
   ghes: '*'
-  ghae: '*'
 type: how_to
 topics:
   - Enterprise

content/admin/configuration/configuring-user-applications-for-your-enterprise/index.md

@@ -5,7 +5,6 @@ intro: 'You can configure applications for users in your enterprise.'
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/configuration/hardening-security-for-your-enterprise/index.md

@@ -5,7 +5,6 @@ intro: 'You can configure features and settings to harden security for your ente
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/github-actions/managing-access-to-actions-from-githubcom/index.md

@@ -5,7 +5,6 @@ redirect_from:
   - /enterprise/admin/github-actions/managing-access-to-actions-from-githubcom
 versions:
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/identity-and-access-management/understanding-iam-for-enterprises/index.md

@@ -18,7 +18,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Accounts
   - Authentication

content/admin/index.md

@@ -97,7 +97,6 @@ layout: product-landing
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 children:
   - /overview
   - /managing-your-enterprise-account

content/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/index.md

@@ -5,7 +5,6 @@ intro: 'You can communicate information to users in your enterprise by customizi
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/managing-accounts-and-repositories/index.md

@@ -11,7 +11,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/index.md

@@ -16,7 +16,6 @@ intro: 'You can use organizations to group users within your company, such as di
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/index.md

@@ -14,7 +14,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/admin/monitoring-activity-in-your-enterprise/index.md

@@ -6,7 +6,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 children:

content/authentication/index.md

@@ -17,7 +17,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 introLinks:
   overview: /authentication/keeping-your-account-and-data-secure/about-authentication-to-github

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

@@ -1,34 +0,0 @@
----
-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="Manage METHOD" %}, then click **Set as preferred method**.
-
-    ![Screenshot of the "Two-factor methods" settings. To the right of "Authenticator app," a dropdown menu, labeled with a kebab icon, is expanded and outlined in orange.](/assets/images/help/2fa/change-preferred-2fa-method.png)
-
-A "Preferred" label is displayed next to the name of your preferred method.
-
-## Further reading
-
-- "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication)"
-- "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods)"

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

@@ -0,0 +1,104 @@
+---
+title: Changing your two-factor authentication method
+intro: You can change two-factor authentication (2FA) method without disabling 2FA entirely.
+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
+  - /authentication/securing-your-account-with-two-factor-authentication-2fa/changing-your-preferred-two-factor-authentication-method
+versions:
+  feature: 2fa-reconfiguration-inline-update
+topics:
+  - 2FA
+shortTitle: Change 2FA method
+---
+
+You can reconfigure your two-factor authentication (2FA) settings or add new 2FA methods without disabling 2FA entirely, allowing you to keep both your recovery codes and your membership in organizations that require 2FA.
+
+## Changing an existing two-factor authentication method
+
+{% ifversion fpt or ghec %}
+You can configure a different authenticator app or change your phone number, without disabling 2FA or creating a new set of recovery codes.
+
+### Changing the TOTP app
+
+{% endif %}
+
+You can change the time-based one-time password (TOTP) application you use to generate authentication codes
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.security %}
+{% data reusables.two_fa.edit-existing-method %}
+{% data reusables.two_fa.enable-totp-app-method %}
+{% data reusables.two_fa.save-2fa-method-when-editing%}
+
+{% warning %}
+
+**Warning:** Changes to an existing 2FA method will only take effect after you have provided a valid code from the new method and clicked **Save**. Only replace the existing 2FA method on your device (e.g. the {% data variables.product.prodname_dotcom %} entry in your TOTP app) after your new method is saved to your {% data variables.product.prodname_dotcom %} account completely.
+
+{% endwarning %}
+
+{% data reusables.two_fa.manual-totp-app-setup %}
+
+{% ifversion fpt or ghec %}
+
+### Changing the SMS number
+
+You can change the phone number you use to receive authentication codes via SMS.
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.security %}
+{% data reusables.two_fa.edit-existing-method %}
+{% data reusables.two_fa.enable-sms-number-method %}
+{% data reusables.two_fa.save-2fa-method-when-editing%}
+
+{% endif %}
+
+## Adding additional two-factor authentication methods
+
+We recommend adding more than one 2FA method to your account. This ensures that you can still sign in to your account, even if you lose one of your methods.
+
+In addition to adding multiple 2FA methods, we strongly recommend setting up multiple recovery methods to avoid losing access to your account. For more information, see "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods)."
+
+{% ifversion fpt or ghec %}
+
+### Adding a TOTP app
+
+You can add a time-based one-time password (TOTP) application to generate authentication codes.
+{% endif %}
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.security %}
+{% data reusables.two_fa.add-additional-method %}
+{% data reusables.two_fa.enable-totp-app-method %}
+{% data reusables.two_fa.save-2fa-method-when-editing%}
+{% data reusables.two_fa.manual-totp-app-setup %}
+
+{% ifversion fpt or ghec %}
+
+### Adding an SMS number
+
+{% data reusables.two_fa.sms-warning %}
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.security %}
+{% data reusables.two_fa.add-additional-method %}
+{% data reusables.two_fa.enable-sms-number-method %}
+{% data reusables.two_fa.save-2fa-method-when-editing%}
+
+{% endif %}
+
+## Setting a preferred two-factor authentication method
+
+If you have multiple 2FA methods, you can choose a preferred method that will be shown first when you are asked to authenticate with 2FA.
+
+{% data reusables.user-settings.access_settings %}
+{% data reusables.user-settings.security %}
+1. Under "Two-factor authentication" in "Preferred 2FA method", select your preferred 2FA method from the dropdown.
+
+## Further reading
+
+- "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication)"
+- "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication-recovery-methods)"

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

@@ -66,33 +66,13 @@ A time-based one-time password (TOTP) application automatically generates an aut
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
 {% data reusables.two_fa.enable-two-factor-authentication %}
-{%- ifversion fpt or ghec or ghes > 3.8 %}
+{% data reusables.two_fa.enable-totp-app-method %}
-1. Under "Setup authenticator app", do one of the following:
-    - Scan the QR code with your mobile device's app. After scanning, the app displays a six-digit code that you can enter on {% data variables.product.product_name %}.
-    - If you can't scan the QR code, click **setup key** to see a code, the TOTP secret, that you can manually enter in your TOTP app instead.
-
-   ![Screenshot of the "Setup authenticator app" section of the 2FA settings. A link, labeled "setup key", is highlighted in orange.](/assets/images/help/2fa/ghes-3.8-and-higher-2fa-wizard-app-click-code.png)
-1. The TOTP application saves your account on {% data variables.location.product_location %} and generates a new authentication code every few seconds. On {% data variables.product.product_name %}, type the code into the field under "Verify the code from the app".
-{%- else %}
-1. Under "Two-factor authentication", select **Set up using an app** and click **Continue**.
-1. Under "Authentication verification", do one of the following:
-    - Scan the QR code with your mobile device's app. After scanning, the app displays a six-digit code that you can enter on {% data variables.product.product_name %}.
-    - If you can't scan the QR code, click **enter this text code** to see a code that you can manually enter in your TOTP app instead.
-    ![Screenshot of the 2FA enablement page. A link with the text "enter this text code" is highlighted in orange.](/assets/images/help/2fa/2fa-wizard-app-click-code.png)
-1. The TOTP application saves your account on {% data variables.location.product_location %} and generates a new authentication code every few seconds. On {% data variables.product.product_name %}, type the code into the field under "Enter the six-digit code from the application".
-{%- endif %}
 {% data reusables.two_fa.save_your_recovery_codes_during_2fa_setup %}
 {% data reusables.two_fa.backup_options_during_2fa_enrollment %}
-{% ifversion ghes < 3.9 %}{% data reusables.two_fa.test_2fa_immediately %}{% endif %}
 
-If you wish to setup a TOTP app manually, and require the parameters encoded in the QR code, they are:
+### Manually configuring a TOTP app
-- Type: `TOTP`
+
-- Label: `GitHub:<username>` where `<username>` is your handle on GitHub, for example `monalisa`
+{% data reusables.two_fa.manual-totp-app-setup %}
-- Secret: This is the encoded setup key, shown if you click {%- ifversion fpt or ghec or ghes > 3.8 %}"setup key"{%- else %}"enter this text code"{%- endif %} during configuration
-- Issuer: `GitHub`
-- Algorithm: The default of SHA1 is used
-- Digits: The default of 6 is used
-- Period: The default of 30 (seconds) is used
 
 {% ifversion fpt or ghec %}
 
@@ -100,22 +80,12 @@ If you wish to setup a TOTP app manually, and require the parameters encoded in
 
 If you're unable to configure a TOTP app, you can also register your phone number to receive SMS messages.
 
-Before using this method, be sure that you can receive text messages. Carrier rates may apply.
+{% data reusables.two_fa.sms-warning %}
-
-{% warning %}
-
-**Warning:** We **strongly recommend** using a TOTP application for two-factor authentication instead of SMS, and security keys as backup methods instead of SMS. {% data variables.product.product_name %} doesn't support sending SMS messages to phones in every country. Before configuring authentication via text message, review the list of countries where {% data variables.product.product_name %} supports authentication via SMS. For more information, see "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/countries-where-sms-authentication-is-supported)".
-
-{% endwarning %}
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.security %}
 {% data reusables.two_fa.enable-two-factor-authentication %}
-1. At the bottom of the page, next to "SMS authentication", click **Select**.
+{% data reusables.two_fa.enable-sms-number-method %}
-1. Complete the CAPTCHA challenge, which helps protect against spam and abuse.
-1. Under "Setup SMS authentication", select your country code and type your mobile phone number, including the area code. When your information is correct, click **Send authentication code**.
-1. You'll receive a text message with a security code. On {% data variables.product.product_name %}, type the code into the field under "Verify the code sent to your phone" and click **Continue**.
-   - If you need to edit the phone number you entered, you'll need to complete another CAPTCHA challenge.
 {% data reusables.two_fa.save_your_recovery_codes_during_2fa_setup %}
 {% data reusables.two_fa.backup_options_during_2fa_enrollment %}
 

content/authentication/securing-your-account-with-two-factor-authentication-2fa/disabling-two-factor-authentication-for-your-personal-account.md

@@ -18,18 +18,20 @@ shortTitle: Disable 2FA
 {% data reusables.two_fa.mandatory-2fa-contributors-2023 %}
 {% endif %}
 
-We strongly recommend using two-factor authentication to secure your account. If you need to disable 2FA, we recommend re-enabling it as soon as possible.
-
-{% ifversion mandatory-2fa-dotcom-contributors %}
-If you are part of the group that {% data variables.product.prodname_dotcom %} is requiring to enroll in 2FA in 2023, you cannot disable 2FA. A banner will display in your authentication settings to remind you that you are not allowed to disable 2FA. For more information about our 2023 2FA enrollment rollout for contributors to {% data variables.product.prodname_dotcom_the_website %}, see [this blog post](https://github.blog/2023-03-09-raising-the-bar-for-software-security-github-2fa-begins-march-13).
-{% endif %}
-
 {% warning %}
 
 **Warning:** If you're a member{% ifversion fpt or ghec %}, billing manager,{% endif %} or outside collaborator to a public repository of an organization that requires two-factor authentication and you disable 2FA, you'll be automatically removed from the organization, and you'll lose your access to their repositories. To regain access to the organization, re-enable two-factor authentication and contact an organization owner.
 
 {% endwarning %}
 
+We strongly recommend using two-factor authentication (2FA) to secure your account. If you need to disable 2FA, we recommend re-enabling it as soon as possible.
+
+{% ifversion mandatory-2fa-dotcom-contributors %}
+If you are part of the group that {% data variables.product.prodname_dotcom %} is requiring to enroll in 2FA in 2023, you cannot disable 2FA. A banner will display in your authentication settings to remind you that you are not allowed to disable 2FA. For more information about our 2023 2FA enrollment rollout for contributors to {% data variables.product.prodname_dotcom_the_website %}, see [this blog post](https://github.blog/2023-03-09-raising-the-bar-for-software-security-github-2fa-begins-march-13).
+
+You can modify your existing 2FA configuration instead of disabling it entirely. For more information, see "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa/changing-your-two-factor-authentication-method)."
+{% endif %}
+
 If your organization requires two-factor authentication and you're a member, owner, or an outside collaborator on a private repository of your organization, you must first leave your organization before you can disable two-factor authentication.
 
 To remove yourself from your organization:

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

@@ -18,7 +18,7 @@ children:
   - /configuring-two-factor-authentication-recovery-methods
   - /accessing-github-using-two-factor-authentication
   - /recovering-your-account-if-you-lose-your-2fa-credentials
-  - /changing-your-preferred-two-factor-authentication-method
+  - /changing-your-two-factor-authentication-method
   - /about-mandatory-two-factor-authentication
   - /countries-where-sms-authentication-is-supported
   - /disabling-two-factor-authentication-for-your-personal-account

content/billing/index.md

@@ -32,7 +32,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Billing

content/communities/documenting-your-project-with-wikis/index.md

@@ -11,7 +11,6 @@ product: '{% data reusables.gated-features.wikis %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Community

content/communities/index.md

@@ -25,7 +25,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Community

content/communities/moderating-comments-and-conversations/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Community

content/communities/setting-up-your-project-for-healthy-contributions/index.md

@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Community

content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/index.md

@@ -10,7 +10,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Community

content/get-started/index.md

@@ -19,7 +19,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 layout: product-landing
 introLinks:

content/get-started/writing-on-github/editing-and-sharing-content-with-gists/index.md

@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /creating-gists

content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/index.md

@@ -9,7 +9,6 @@ intro: 'You can use simple features to format your comments and interact with ot
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /quickstart-for-writing-on-github

content/github-cli/index.md

@@ -5,7 +5,6 @@ intro: '{% data reusables.cli.about-cli %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /github-cli

content/index.md

@@ -45,7 +45,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - search

content/issues/index.md

@@ -32,7 +32,6 @@ beta_product: false
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /tracking-your-work-with-issues

content/issues/using-labels-and-milestones-to-track-work/index.md

@@ -5,7 +5,6 @@ intro: 'Use labels and milestones to categorize and track work on {% data variab
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Issues

content/migrations/importing-source-code/index.md

@@ -5,7 +5,6 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 # topics:
 redirect_from:
   - /categories/67/articles

content/migrations/importing-source-code/using-the-command-line-to-import-source-code/index.md

@@ -5,7 +5,6 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 # topics:
 children:
   - /about-source-code-imports-using-the-command-line

content/migrations/index.md

@@ -22,7 +22,6 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Administrator
   - Enterprise

content/organizations/index.md

@@ -27,7 +27,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/keeping-your-organization-secure/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/index.md

@@ -5,7 +5,6 @@ intro: 'You can manage security settings and review the audit log{% ifversion gh
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-access-to-your-organizations-project-boards/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-git-access-to-your-organizations-repositories/index.md

@@ -7,7 +7,6 @@ redirect_from:
   - /github/setting-up-and-managing-organizations-and-teams/managing-git-access-to-your-organizations-repositories
 versions:
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-membership-in-your-organization/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md

@@ -29,8 +29,8 @@ When {% data variables.projects.projects_v1_boards %} are disabled, you will no
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
-1. Decide whether to disable {% data variables.projects.projects_v2_and_v1 %} in your organization. Then, under **Projects**:
+1. Decide whether to disable {% data variables.projects.projects_v2_and_v1 %} in your organization. Then, under "Projects":
-    - To disable {% data variables.projects.projects_v2_and_v1 %}, unselect **Enable Projects for the organization**.
+    - To disable {% data variables.projects.projects_v2_and_v1 %}, deselect **Enable Projects for the organization**.
     - To enable {% data variables.projects.projects_v2_and_v1 %} in the organization, select **Enable Projects for the organization**.
 1. Click **Save**.
 
@@ -45,9 +45,9 @@ You can control whether organization members can create {% data variables.projec
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
-1. Decide whether to allow members to create {% data variables.projects.projects_v1_boards %} in repositories in your organization. Then, under **Projects (classic) only**:
+1. Decide whether to allow members to create {% data variables.projects.projects_v1_boards %} in repositories in your organization. Then, under "Projects (classic) only":
     - To enable {% data variables.projects.projects_v1_boards %} in repositories, select **Allow members to enable {% data variables.product.prodname_projects_v1_caps %} for all repositories**.
-    - To disable {% data variables.projects.projects_v1_boards %} in repositories, unselect **Allow members to enable {% data variables.product.prodname_projects_v1_caps %} for all repositories**.
+    - To disable {% data variables.projects.projects_v1_boards %} in repositories, deselect **Allow members to enable {% data variables.product.prodname_projects_v1_caps %} for all repositories**.
 1. Click **Save**.
 
 {% endif %}

content/organizations/managing-organization-settings/index.md

@@ -7,7 +7,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-organization-settings/upgrading-to-the-github-customer-agreement.md

@@ -18,7 +18,7 @@ The Standard Terms of Service is an agreement between {% data variables.product.
 
 You can upgrade to the {% data variables.product.company_short %} Customer Agreement instead of using the Standard Terms of Service to help prevent sensitive information from being exposed. For more information see "[AUTOTITLE](/code-security/getting-started/best-practices-for-preventing-data-leaks-in-your-organization)."
 
-1. Navigate to your organization's settings and scroll to the **Terms of Service** section.
+1. Navigate to your organization's settings and scroll to the "Terms of Service" section.
 1. Click **Read the {% data variables.product.company_short %} Customer Agreement**.
 1. After you've read the {% data variables.product.company_short %} Customer Agreement, click **Sign {% data variables.product.company_short %} customer terms**.
 1. Select **Yes, I want to sign these terms on behalf of my business.**

content/organizations/managing-peoples-access-to-your-organization-with-roles/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-programmatic-access-to-your-organization/index.md

@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-user-access-to-your-organizations-repositories/index.md

@@ -10,7 +10,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-user-access-to-your-organizations-repositories/managing-outside-collaborators/index.md

@@ -4,7 +4,6 @@ intro: You can manage outside collaborators, or people who have access to reposi
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/index.md

@@ -4,7 +4,6 @@ intro: You can control the level of access that each person has to your organiza
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Organizations

content/packages/index.md

@@ -31,7 +31,6 @@ layout: product-landing
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /quickstart

content/packages/learn-github-packages/index.md

@@ -11,7 +11,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /introduction-to-github-packages

content/pages/getting-started-with-github-pages/index.md

@@ -10,7 +10,6 @@ product: '{% data reusables.gated-features.pages %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pages

content/pages/index.md

@@ -40,7 +40,6 @@ product: '{% data reusables.gated-features.pages %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pages

content/pages/setting-up-a-github-pages-site-with-jekyll/index.md

@@ -10,7 +10,6 @@ product: '{% data reusables.gated-features.pages %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pages

content/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pull requests

content/pull-requests/collaborating-with-pull-requests/getting-started/index.md

@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pull requests

content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pull requests

content/pull-requests/collaborating-with-pull-requests/index.md

@@ -12,7 +12,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pull requests

content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Pull requests

content/pull-requests/committing-changes-to-your-project/troubleshooting-commits/index.md

@@ -7,7 +7,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /commit-exists-on-github-but-not-in-my-local-clone

content/pull-requests/index.md

@@ -26,7 +26,6 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Pull requests
 children:

content/repositories/archiving-a-github-repository/index.md

@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/index.md

@@ -7,7 +7,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/index.md

@@ -7,7 +7,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/index.md

@@ -11,7 +11,6 @@ product: '{% data reusables.gated-features.protected-branches %}'
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/index.md

@@ -28,7 +28,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/index.md

@@ -4,7 +4,6 @@ intro: 'You can enable, configure, and disable optional features for your reposi
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/index.md

@@ -4,7 +4,6 @@ intro: You can choose the way your repository functions by managing repository s
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/working-with-files/managing-files/index.md

@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Repositories

content/repositories/working-with-files/managing-large-files/index.md

@@ -11,7 +11,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 children:
   - /about-large-files-on-github

content/search-github/index.md

@@ -31,7 +31,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - GitHub search

content/search/index.md

@@ -5,6 +5,5 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 ---
 

content/support/contacting-github-support/creating-a-support-ticket.md

@@ -81,8 +81,12 @@ Especially for tickets with {% data variables.product.support_ticket_priority_ur
 
 {% endnote %}
 
-1. Navigate to the {% data variables.contact.contact_landing_page_portal %}.
+1. Navigate to the {% data variables.contact.contact_landing_page_portal %} and choose one of the following options:
-1. In the bottom-left corner of the page, click **Contact us**.
+
+   - To sign in with your {% data variables.product.prodname_dotcom %} account, click **Sign in with {% data variables.product.prodname_dotcom %}**.
+   - To sign up for {% data variables.product.prodname_dotcom %}, click **Sign up for {% data variables.product.prodname_dotcom %}**.
+   - If you can't sign in or sign up, click **Can't sign in?** and fill out the form. You will be guided through an email verification process.{% ifversion ghec or ghes %} You will need to upload your {% data variables.product.prodname_enterprise %} license. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)."{% endif %}
+
 {% data reusables.support.submit-a-ticket %}
 
 {% ifversion ghes %}
@@ -93,6 +97,13 @@ Especially for tickets with {% data variables.product.support_ticket_priority_ur
 {% data reusables.enterprise_site_admin_settings.management-console %}
 {% data reusables.enterprise_management_console.type-management-console-password %}
 {% data reusables.enterprise_management_console.support-link %}
+
+1. Choose one of the following options:
+
+   - To sign in with your {% data variables.product.prodname_dotcom %} account, click **Sign in with {% data variables.product.prodname_dotcom %}**.
+   - To sign up for {% data variables.product.prodname_dotcom %}, click **Sign up for {% data variables.product.prodname_dotcom %}**.
+   - If you can't sign in or sign up, click **Can't sign in?** and fill out the form. You will be guided through an email verification process. You will need to upload your {% data variables.product.prodname_enterprise %} license. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)."
+
 1. If you'd like to include diagnostics with your support ticket, Under "Diagnostics", click **Download diagnostic info** and save the file locally. You'll attach this file to your support ticket later.
 1. To complete your ticket and display the {% data variables.contact.enterprise_portal %}, under "Open Support Request", click **New support request**.
 {% data reusables.support.submit-a-ticket %}

content/support/contacting-github-support/index.md

@@ -6,7 +6,6 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 redirect_from:
   - /enterprise/admin/guides/enterprise-support/receiving-help-from-github-enterprise-support
   - /enterprise/admin/enterprise-support/receiving-help-from-github-support