From 0a111358fe562f4410fc6a1103ba84e8ac9cff56 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Tue, 30 Jan 2024 12:16:41 -0500
Subject: [PATCH 1/4] Remove GHAE in Liquid and front matter (13) (#48922)

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
---
 .../actions/learn-github-actions/contexts.md  |  2 +-
 ...igrating-from-jenkins-to-github-actions.md |  3 +-
 .../publishing-docker-images.md               | 35 +++++++++----------
 .../workflow-syntax-for-github-actions.md     |  7 ++--
 ...ling-unified-search-for-your-enterprise.md |  3 +-
 ...guring-github-pages-for-your-enterprise.md | 11 ------
 content/admin/github-actions/index.md         |  2 +-
 content/admin/index.md                        | 11 ------
 content/authentication/index.md               |  5 ---
 content/billing/index.md                      |  2 --
 content/code-security/index.md                |  6 ----
 content/organizations/index.md                |  2 --
 12 files changed, 23 insertions(+), 66 deletions(-)

diff --git a/content/actions/learn-github-actions/contexts.md b/content/actions/learn-github-actions/contexts.md
index fcb422de03..cbc97ada82 100644
--- a/content/actions/learn-github-actions/contexts.md
+++ b/content/actions/learn-github-actions/contexts.md
@@ -587,7 +587,7 @@ The `runner` context contains information about the runner that is executing the
 | `runner.os` | `string` | {% data reusables.actions.runner-os-description %} |{% ifversion actions-runner-arch-envvars %}
 | `runner.arch` | `string` | {% data reusables.actions.runner-arch-description %} |{% endif %}
 | `runner.temp` | `string` | {% data reusables.actions.runner-temp-directory-description %} |
-| `runner.tool_cache` | `string` |  {% data reusables.actions.runner-tool-cache-description %} |
+| `runner.tool_cache` | `string` | {% data reusables.actions.runner-tool-cache-description %} |
 | `runner.debug` | `string` | {% data reusables.actions.runner-debug-description %} |
 
 {%- comment %}
diff --git a/content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-jenkins-to-github-actions.md b/content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-jenkins-to-github-actions.md
index c746e5778c..f532218bed 100644
--- a/content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-jenkins-to-github-actions.md
+++ b/content/actions/migrating-to-github-actions/manually-migrating-to-github-actions/migrating-from-jenkins-to-github-actions.md
@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: tutorial
 topics:
@@ -69,7 +68,7 @@ Jenkins uses directives to manage _Declarative Pipelines_. These directives defi
 | [`triggers { upstreamprojects() }`](https://jenkins.io/doc/book/pipeline/syntax/#triggers) | [`jobs.<job_id>.needs`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idneeds) |
 | [Jenkins cron syntax](https://jenkins.io/doc/book/pipeline/syntax/#cron-syntax)            | [`on.schedule`](/actions/using-workflows/workflow-syntax-for-github-actions#onschedule) |
 | [`stage`](https://jenkins.io/doc/book/pipeline/syntax/#stage)                              | [`jobs.<job_id>`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_id) <br> [`jobs.<job_id>.name`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idname) |
-| [`tools`](https://jenkins.io/doc/book/pipeline/syntax/#tools)                              | {% ifversion ghae %}The command-line tools available in `PATH` on your self-hosted runner systems. {% data reusables.actions.self-hosted-runners-software %}{% else %}[Specifications for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software) |{% endif %}
+| [`tools`](https://jenkins.io/doc/book/pipeline/syntax/#tools)                              | [Specifications for {% data variables.product.prodname_dotcom %}-hosted runners](/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software) |
 | [`input`](https://jenkins.io/doc/book/pipeline/syntax/#input)                              | [`inputs`](/actions/creating-actions/metadata-syntax-for-github-actions#inputs) |
 | [`when`](https://jenkins.io/doc/book/pipeline/syntax/#when)                                | [`jobs.<job_id>.if`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idif) |
 
diff --git a/content/actions/publishing-packages/publishing-docker-images.md b/content/actions/publishing-packages/publishing-docker-images.md
index 3c206a07fe..7bcc6a16b1 100644
--- a/content/actions/publishing-packages/publishing-docker-images.md
+++ b/content/actions/publishing-packages/publishing-docker-images.md
@@ -8,7 +8,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: tutorial
 topics:
@@ -17,7 +16,7 @@ topics:
   - Docker
 layout: inline
 ---
- 
+
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 ## Introduction
@@ -91,19 +90,19 @@ jobs:
     steps:
       - name: Check out the repo
         uses: {% data reusables.actions.action-checkout %}
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: {% raw %}${{ secrets.DOCKER_USERNAME }}{% endraw %}
           password: {% raw %}${{ secrets.DOCKER_PASSWORD }}{% endraw %}
-      
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: my-docker-hub-namespace/my-docker-hub-repository
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
@@ -142,9 +141,9 @@ The `build-push-action` options required for {% data variables.product.prodname_
 - `push`: If set to `true`, the image will be pushed to the registry if it is built successfully.{% ifversion fpt or ghec %}
 - `tags` and `labels`: These are populated by output from `metadata-action`.{% else %}
 - `tags`: Must be set in the format {% ifversion ghes %}`{% data reusables.package_registry.container-registry-hostname %}/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
-  
+
    For example, for an image named `octo-image` stored on {% data variables.product.prodname_ghe_server %} at `https://HOSTNAME/octo-org/octo-repo`, the `tags` option should be set to `{% data reusables.package_registry.container-registry-hostname %}/octo-org/octo-repo/octo-image:latest`{% else %}`docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME:VERSION`.
-  
+
    For example, for an image named `octo-image` stored on {% data variables.product.prodname_dotcom %} at `http://github.com/octo-org/octo-repo`, the `tags` option should be set to `docker.pkg.github.com/octo-org/octo-repo/octo-image:latest`{% endif %}. You can set a single tag as shown below, or specify multiple tags in a list.{% endif %}
 
 {% ifversion fpt or ghec or ghes %}
@@ -174,22 +173,22 @@ jobs:
     steps:
       - name: Check out the repo
         uses: {% data reusables.actions.action-checkout %}
-      
+
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
-          registry: {% ifversion ghae %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}
+          registry: docker.pkg.github.com
           username: {% raw %}${{ github.actor }}{% endraw %}
           password: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: .
           push: true
           tags: |
-            {% ifversion ghae %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/octo-image:${{ github.sha }}{% endraw %}
-            {% ifversion ghae %}docker.YOUR-HOSTNAME.com{% else %}docker.pkg.github.com{% endif %}{% raw %}/${{ github.repository }}/octo-image:${{ github.event.release.tag_name }}{% endraw %}
+            docker.pkg.github.com{% raw %}/${{ github.repository }}/octo-image:${{ github.sha }}{% endraw %}
+            docker.pkg.github.com{% raw %}/${{ github.repository }}/octo-image:${{ github.event.release.tag_name }}{% endraw %}
 ```
 
 The above workflow checks out the {% data variables.product.product_name %} repository, uses the `login-action` to log in to the registry, and then uses the `build-push-action` action to: build a Docker image based on your repository's `Dockerfile`; push the image to the Docker registry, and apply the commit SHA and release version as image tags.
@@ -226,28 +225,28 @@ jobs:
     steps:
       - name: Check out the repo
         uses: {% data reusables.actions.action-checkout %}
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: {% raw %}${{ secrets.DOCKER_USERNAME }}{% endraw %}
           password: {% raw %}${{ secrets.DOCKER_PASSWORD }}{% endraw %}
-      
+
       - name: Log in to the {% ifversion fpt or ghec or ghes %}Container{% else %}Docker{% endif %} registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
-          registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghae %}docker.YOUR-HOSTNAME.com{% elsif ghes %}{% data reusables.package_registry.container-registry-hostname %}{% else %}docker.pkg.github.com{% endif %}
+          registry: {% ifversion fpt or ghec %}ghcr.io{% elsif ghes %}{% data reusables.package_registry.container-registry-hostname %}{% else %}docker.pkg.github.com{% endif %}
           username: {% raw %}${{ github.actor }}{% endraw %}
           password: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
-      
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: |
             my-docker-hub-namespace/my-docker-hub-repository
-            {% ifversion fpt or ghec or ghes %}{% data reusables.package_registry.container-registry-hostname %}/{% raw %}${{ github.repository }}{% endraw %}{% elsif ghae %}{% raw %}docker.YOUR-HOSTNAME.com/${{ github.repository }}/my-image{% endraw %}{% else %}{% raw %}docker.pkg.github.com/${{ github.repository }}/my-image{% endraw %}{% endif %}
-      
+            {% ifversion fpt or ghec or ghes %}{% data reusables.package_registry.container-registry-hostname %}/{% raw %}${{ github.repository }}{% endraw %}{% else %}{% raw %}docker.pkg.github.com/${{ github.repository }}/my-image{% endraw %}{% endif %}
+
       - name: Build and push Docker images
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
diff --git a/content/actions/using-workflows/workflow-syntax-for-github-actions.md b/content/actions/using-workflows/workflow-syntax-for-github-actions.md
index 862952d3bf..2245ed39f3 100644
--- a/content/actions/using-workflows/workflow-syntax-for-github-actions.md
+++ b/content/actions/using-workflows/workflow-syntax-for-github-actions.md
@@ -11,7 +11,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 ---
 
@@ -699,9 +698,7 @@ steps:
 
 The command used, `perl` in this example, must be installed on the runner.
 
-{% ifversion ghae %}
-{% data reusables.actions.self-hosted-runners-software %}
-{% elsif fpt or ghec %}
+{% ifversion fpt or ghec %}
 For information about the software included on GitHub-hosted runners, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-github-hosted-runners#supported-software)."
 {% endif %}
 
@@ -821,7 +818,7 @@ The maximum number of minutes to run the step before killing the process.
 
 The maximum number of minutes to let a job run before {% data variables.product.prodname_dotcom %} automatically cancels it. Default: 360
 
-If the timeout exceeds the job execution time limit for the runner, the job will be canceled when the execution time limit is met instead. For more information about job execution time limits, see {% ifversion fpt or ghec or ghes %}"[AUTOTITLE](/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits)" for {% data variables.product.prodname_dotcom %}-hosted runners and {% endif %}"[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#usage-limits){% ifversion fpt or ghec or ghes %}" for self-hosted runner usage limits.{% elsif ghae %}."{% endif %}
+If the timeout exceeds the job execution time limit for the runner, the job will be canceled when the execution time limit is met instead. For more information about job execution time limits, see {% ifversion fpt or ghec or ghes %}"[AUTOTITLE](/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits)" for {% data variables.product.prodname_dotcom %}-hosted runners and {% endif %}"[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#usage-limits)" for self-hosted runner usage limits.
 
 {% note %}
 
diff --git a/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md b/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md
index 59d2e8b24f..80b338fb48 100644
--- a/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md
+++ b/content/admin/configuration/configuring-github-connect/enabling-unified-search-for-your-enterprise.md
@@ -14,7 +14,6 @@ redirect_from:
 permissions: 'Enterprise owners can enable unified search between {% data variables.product.product_name %} and {% data variables.product.prodname_dotcom_the_website %}.'
 versions:
   ghes: '*'
-  ghae: '*'
 type: how_to
 topics:
   - Enterprise
@@ -26,7 +25,7 @@ topics:
 
 {% data reusables.github-connect.beta %}
 
-When you enable unified search, users can view search results from content on {% data variables.product.prodname_dotcom_the_website %} when searching from {% data variables.location.product_location %}{% ifversion ghae %} on {% data variables.product.prodname_ghe_managed %}{% endif %}.
+When you enable unified search, users can view search results from content on {% data variables.product.prodname_dotcom_the_website %} when searching from {% data variables.location.product_location %}.
 
 You can choose to allow search results for public repositories on {% data variables.product.prodname_dotcom_the_website %}, and you can separately choose to allow search results for private repositories on {% data variables.product.prodname_ghe_cloud %}. If you enable unified search for private repositories, users can only search private repositories that they have access to and that are owned by the connected enterprise account. For more information, see "[AUTOTITLE](/search-github/getting-started-with-searching-on-github/about-searching-on-github#searching-across-github-enterprise-and-githubcom-simultaneously)."
 
diff --git a/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
index 33a1914b2a..4abac40f10 100644
--- a/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
+++ b/content/admin/configuration/configuring-user-applications-for-your-enterprise/configuring-github-pages-for-your-enterprise.md
@@ -12,7 +12,6 @@ redirect_from:
   - /admin/configuration/configuring-your-enterprise/configuring-github-pages-for-your-enterprise
 versions:
   ghes: '*'
-  ghae: '*'
 type: how_to
 topics:
   - Enterprise
@@ -50,16 +49,6 @@ If subdomain isolation is disabled for your enterprise, you should also disable
 
 {% endif %}
 
-{% ifversion ghae %}
-
-{% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.policies-tab %}
-{% data reusables.enterprise-accounts.pages-tab %}
-1. Under "Pages policies", deselect **Enable {% data variables.product.prodname_pages %}**.
-{% data reusables.enterprise-accounts.pages-policies-save %}
-
-{% endif %}
-
 {% ifversion ghes %}
 
 ## Configuring {% data variables.product.prodname_pages %} response headers for your enterprise
diff --git a/content/admin/github-actions/index.md b/content/admin/github-actions/index.md
index 5090302d07..091256ede2 100644
--- a/content/admin/github-actions/index.md
+++ b/content/admin/github-actions/index.md
@@ -1,7 +1,7 @@
 ---
 title: Managing GitHub Actions for your enterprise
 allowTitleToDifferFromFilename: true
-intro: 'Enable {% data variables.product.prodname_actions %} on {% ifversion ghae %}{% data variables.product.prodname_ghe_managed %}{% else %}{% data variables.product.prodname_ghe_server %}{% endif %}, and manage {% data variables.product.prodname_actions %} policies and settings.'
+intro: 'Enable {% data variables.product.prodname_actions %} on {% data variables.product.product_name %}, and manage {% data variables.product.prodname_actions %} policies and settings.'
 redirect_from:
   - /enterprise/admin/github-actions
 versions:
diff --git a/content/admin/index.md b/content/admin/index.md
index b9e2acb995..60ff459d0d 100644
--- a/content/admin/index.md
+++ b/content/admin/index.md
@@ -71,32 +71,21 @@ changelog:
   label: enterprise
 featuredLinks:
   startHere:
-    - '{% ifversion ghae %}/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/auditing-users-across-your-enterprise{% endif %}'
     - /admin/identity-and-access-management/understanding-iam-for-enterprises/about-identity-and-access-management
-    - '{% ifversion ghae %}/admin/configuration/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list{% endif %}'
     - '{% ifversion ghec %}/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise{% endif %}'
     - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise
     - '{% ifversion ghes %}/admin/overview/about-upgrades-to-new-releases{% endif %}'
-    - '{% ifversion ghae %}/admin/policies/enforcing-policies-for-your-enterprise/about-enterprise-policies{% endif %}'
   guideCards:
     - '{% ifversion ghes %}/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server{% endif %}'
     - '{% ifversion ghes %}/admin/packages/getting-started-with-github-packages-for-your-enterprise{% endif %}'
     - '{% ifversion ghes %}/admin/code-security/managing-github-advanced-security-for-your-enterprise{% endif %}'
-    - '{% ifversion ghae %}/admin/overview/initializing-github-ae{% endif %}'
-    - '{% ifversion ghae %}/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise{% endif %}'
-    - '{% ifversion ghae %}/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-ae{% endif %}'
     - '{% ifversion ghec %}/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise{% endif %}'
     - '{% ifversion ghec %}/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise{% endif %}'
     - '{% ifversion ghec %}/admin/policies/enforcing-policies-for-your-enterprise/enforcing-repository-management-policies-in-your-enterprise{% endif %}'
   popular:
     - /admin/overview/about-github-enterprise-server
-    - '{% ifversion ghae %}/admin/release-notes{% endif %}'
     - '{% ifversion ghes %}/admin/overview/setting-up-a-trial-of-github-enterprise-server{% endif %}'
     - '{% ifversion ghes %}/admin/installation{% endif %}'
-    - '{% ifversion ghae %}/admin/identity-and-access-management/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
-    - '{% ifversion ghae %}/admin/overview/about-upgrades-to-new-releases{% endif %}'
-    - '{% ifversion ghae %}/admin/overview/deploying-github-ae{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise{% endif %}'
     - /admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities
     - '{% ifversion ghec %}/admin/configuration/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise{% endif %}'
diff --git a/content/authentication/index.md b/content/authentication/index.md
index 0719a95d82..60e86671c5 100644
--- a/content/authentication/index.md
+++ b/content/authentication/index.md
@@ -26,20 +26,16 @@ featuredLinks:
     - /authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent
     - /authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens
     - /authentication/securing-your-account-with-two-factor-authentication-2fa/configuring-two-factor-authentication
-    - '{% ifversion ghae %}/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials{% endif %}'
   popular:
     - /authentication/troubleshooting-ssh
     - /authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys
     - /authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account
-    - '{% ifversion ghae %}/authentication/connecting-to-github-with-ssh/testing-your-ssh-connection{% endif %}'
     - /authentication/authenticating-with-saml-single-sign-on
     - /authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
   guideCards:
     - /authentication/securing-your-account-with-two-factor-authentication-2fa/recovering-your-account-if-you-lose-your-2fa-credentials
     - /authentication/troubleshooting-ssh/error-permission-denied-publickey
     - /authentication/keeping-your-account-and-data-secure/creating-a-strong-password
-    - '{% ifversion ghae %}/authentication/keeping-your-account-and-data-secure/updating-your-github-access-credentials{% endif %}'
-    - '{% ifversion ghae %}/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on{% endif %}'
 changelog:
   label: '2FA,authentication,security keys,SSH,token authentication'
 layout: product-landing
@@ -59,4 +55,3 @@ children:
   - /managing-commit-signature-verification
   - /troubleshooting-commit-signature-verification
 ---
-
diff --git a/content/billing/index.md b/content/billing/index.md
index 4d31f7e336..606c669bed 100644
--- a/content/billing/index.md
+++ b/content/billing/index.md
@@ -15,7 +15,6 @@ featuredLinks:
     - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
   popular:
     - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}'
@@ -24,7 +23,6 @@ featuredLinks:
     - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
     - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
   guideCards:
     - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
     - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
diff --git a/content/code-security/index.md b/content/code-security/index.md
index 55f44968db..0e191943b3 100644
--- a/content/code-security/index.md
+++ b/content/code-security/index.md
@@ -18,9 +18,6 @@ featuredLinks:
     - '{% ifversion fpt or ghec or ghes %}/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates{% endif %}'
     - '{% ifversion code-scanning-without-workflow %}/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning{% endif %}'
     - '{% ifversion ghes < 3.9 %}/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning{% endif %}'
-    - '{% ifversion ghae %}/code-security/secret-scanning/configuring-secret-scanning-for-your-repositories{% endif %}'
-    - '{% ifversion ghae %}/code-security/code-scanning/integrating-with-code-scanning/uploading-a-sarif-file-to-github{% endif %}'
-    - '{% ifversion ghae %}/code-security/code-scanning/integrating-with-code-scanning/using-code-scanning-with-your-existing-ci-system{% endif %}'
     - /code-security/supply-chain-security/end-to-end-supply-chain/end-to-end-supply-chain-overview
   popular:
     - '{% ifversion ghes %}/admin/release-notes{% endif %}'
@@ -29,10 +26,7 @@ featuredLinks:
     - /code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
     - /code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
     - /code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot
-    - '{% ifversion ghae %}/code-security/secret-scanning/about-secret-scanning{% endif %}'
     - /code-security/dependabot/working-with-dependabot/troubleshooting-the-detection-of-vulnerable-dependencies
-    - '{% ifversion ghae %}/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages{% endif %}'
-    - '{% ifversion ghae %}/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/running-codeql-code-scanning-in-a-container{% endif %}'
 changelog:
   label: security-and-compliance
   versions:
diff --git a/content/organizations/index.md b/content/organizations/index.md
index 4e4878ca07..5600a3b046 100644
--- a/content/organizations/index.md
+++ b/content/organizations/index.md
@@ -18,7 +18,6 @@ featuredLinks:
     - /organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization
     - /organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization
     - /organizations/managing-oauth-access-to-your-organizations-data/about-oauth-app-access-restrictions
-    - '{% ifversion ghae %}/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization{% endif %}'
   guideCards:
     - /organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization
     - /organizations/managing-membership-in-your-organization/adding-people-to-your-organization
@@ -50,4 +49,3 @@ children:
   - /managing-git-access-to-your-organizations-repositories
   - /migrating-to-improved-organization-permissions
 ---
-

From 93a4f303bdb04fdb435eebd617e772573664ff09 Mon Sep 17 00:00:00 2001
From: Sarah Edwards <skedwards88@github.com>
Date: Tue, 30 Jan 2024 09:35:02 -0800
Subject: [PATCH 2/4] add note about permissions for the checks REST endpoints
 (#48910)

---
 content/rest/checks/runs.md   | 4 ++++
 content/rest/checks/suites.md | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/content/rest/checks/runs.md b/content/rest/checks/runs.md
index 010b542338..14bccf6308 100644
--- a/content/rest/checks/runs.md
+++ b/content/rest/checks/runs.md
@@ -12,6 +12,10 @@ allowTitleToDifferFromFilename: true
 autogenerated: rest
 ---
 
+{% note %}
 
+**Note**: {% data reusables.apps.checks-availability %}
+
+{% endnote %}
 
 <!-- Content after this section is automatically generated -->
diff --git a/content/rest/checks/suites.md b/content/rest/checks/suites.md
index be1e282ea9..d04c6f1acb 100644
--- a/content/rest/checks/suites.md
+++ b/content/rest/checks/suites.md
@@ -12,6 +12,12 @@ allowTitleToDifferFromFilename: true
 autogenerated: rest
 ---
 
+{% note %}
+
+**Note**: {% data reusables.apps.checks-availability %}
+
+{% endnote %}
+
 {% note %}
 
   **Note:** A GitHub App usually only receives one [`check_suite`](/webhooks-and-events/webhooks/webhook-events-and-payloads#check_suite) event per commit SHA, even if you push the commit SHA to more than one branch. To find out when a commit SHA is pushed to a branch, you can subscribe to branch [`create`](/webhooks-and-events/webhooks/webhook-events-and-payloads#create) events.

From 336a8fee89c412609e6db60db9e4d5c325f12373 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Tue, 30 Jan 2024 12:52:28 -0500
Subject: [PATCH 3/4] Remove GHAE release-notes (#48920)

---
 src/frame/middleware/index.js                 |  2 -
 .../components/GHAEReleaseNotePatch.tsx       | 46 ---------------
 .../components/GHAEReleaseNotes.tsx           | 59 -------------------
 src/release-notes/pages/release-notes.tsx     | 27 +++------
 4 files changed, 9 insertions(+), 125 deletions(-)
 delete mode 100644 src/release-notes/components/GHAEReleaseNotePatch.tsx
 delete mode 100644 src/release-notes/components/GHAEReleaseNotes.tsx

diff --git a/src/frame/middleware/index.js b/src/frame/middleware/index.js
index 4f39210500..5f37d8b26d 100644
--- a/src/frame/middleware/index.js
+++ b/src/frame/middleware/index.js
@@ -38,7 +38,6 @@ import categoriesForSupport from './categories-for-support.js'
 import triggerError from '#src/observability/middleware/trigger-error.js'
 import secretScanning from '#src/secret-scanning/middleware/secret-scanning.js'
 import ghesReleaseNotes from '#src/release-notes/middleware/ghes-release-notes.js'
-import ghaeReleaseNotes from '#src/release-notes/middleware/ghae-release-notes.js'
 import whatsNewChangelog from './context/whats-new-changelog.js'
 import layout from './context/layout.js'
 import currentProductTree from './context/current-product-tree.js'
@@ -265,7 +264,6 @@ export default function (app) {
   // *** Preparation for render-page: contextualizers ***
   app.use(asyncMiddleware(secretScanning))
   app.use(asyncMiddleware(ghesReleaseNotes))
-  app.use(asyncMiddleware(ghaeReleaseNotes))
   app.use(asyncMiddleware(whatsNewChangelog))
   app.use(layout)
   app.use(features) // needs to come before product tree
diff --git a/src/release-notes/components/GHAEReleaseNotePatch.tsx b/src/release-notes/components/GHAEReleaseNotePatch.tsx
deleted file mode 100644
index 61d8958249..0000000000
--- a/src/release-notes/components/GHAEReleaseNotePatch.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useRef } from 'react'
-import dayjs from 'dayjs'
-
-import { useTranslation } from 'src/languages/components/useTranslation'
-import { PatchNotes } from './PatchNotes'
-import { CurrentVersion, ReleaseNotePatch } from './types'
-
-type Props = { patch: ReleaseNotePatch; currentVersion: CurrentVersion }
-export function GHAEReleaseNotePatch({ patch, currentVersion }: Props) {
-  const { t } = useTranslation('release_notes')
-  const containerRef = useRef<HTMLDivElement>(null)
-  const bannerText = t('banner_text')
-
-  return (
-    <div ref={containerRef} className="mb-10 pb-6" id={patch.release}>
-      <header
-        style={{ zIndex: 1, marginTop: -1 }}
-        className="container-md border-top border-bottom px-3 pt-4 pb-2"
-      >
-        <div className="d-flex flex-items-center">
-          <h2 className="border-bottom-0 m-0 p-0">
-            {currentVersion.versionTitle} {patch.release}
-          </h2>
-
-          {patch.release_candidate && (
-            <span
-              className="IssueLabel color-bg-attention-emphasis color-fg-on-emphasis ml-3"
-              style={{ whiteSpace: 'pre' }}
-            >
-              Release Candidate
-            </span>
-          )}
-        </div>
-        <p className="color-fg-muted mt-1">
-          {bannerText} {dayjs(patch.date).format('MMMM DD, YYYY')}.
-        </p>
-      </header>
-
-      <div className="container-md px-3">
-        <div className="mt-3" dangerouslySetInnerHTML={{ __html: patch.intro }} />
-
-        <PatchNotes patch={patch} />
-      </div>
-    </div>
-  )
-}
diff --git a/src/release-notes/components/GHAEReleaseNotes.tsx b/src/release-notes/components/GHAEReleaseNotes.tsx
deleted file mode 100644
index a32e4bebf5..0000000000
--- a/src/release-notes/components/GHAEReleaseNotes.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import cx from 'classnames'
-
-import { MarkdownContent } from 'src/frame/components/ui/MarkdownContent'
-import { GHAEReleaseNotesContextT } from './types'
-import { GHAEReleaseNotePatch } from './GHAEReleaseNotePatch'
-
-import styles from './PatchNotes.module.scss'
-
-type Props = {
-  context: GHAEReleaseNotesContextT
-}
-
-export function GHAEReleaseNotes({ context }: Props) {
-  const { currentVersion, releaseNotes, releases } = context
-
-  return (
-    <>
-      <h1 id="title-h1" className="f4 p-3 m-0 border-bottom">
-        {currentVersion.planTitle} release notes
-      </h1>
-
-      <div className="d-md-flex flex-md-row-reverse">
-        {releases && (
-          <aside
-            className={cx('position-sticky border-md-left no-print flex-shrink-0', styles.aside)}
-          >
-            <nav className="height-full overflow-auto">
-              <ul className="list-style-none py-2 px-0 my-0">
-                {releases.map((release) => {
-                  return (
-                    <li key={release.version} className="my-2 px-3 f4 d-inline-block d-md-block">
-                      <a href={`#${release.version}`} className="text-underline">
-                        {release.version}
-                      </a>
-                    </li>
-                  )
-                })}
-              </ul>
-            </nav>
-          </aside>
-        )}
-
-        <article className="flex-1 flex-shrink-0">
-          <MarkdownContent data-search="article-body">
-            {releaseNotes.map((patch) => {
-              return (
-                <GHAEReleaseNotePatch
-                  key={patch.version}
-                  patch={patch}
-                  currentVersion={currentVersion}
-                />
-              )
-            })}
-          </MarkdownContent>
-        </article>
-      </div>
-    </>
-  )
-}
diff --git a/src/release-notes/pages/release-notes.tsx b/src/release-notes/pages/release-notes.tsx
index 6e565a0d9e..7eb9debbfc 100644
--- a/src/release-notes/pages/release-notes.tsx
+++ b/src/release-notes/pages/release-notes.tsx
@@ -9,26 +9,25 @@ import {
   addUINamespaces,
 } from 'src/frame/components/context/MainContext'
 import { DefaultLayout } from 'src/frame/components/DefaultLayout'
-import { GHAEReleaseNotes } from 'src/release-notes/components/GHAEReleaseNotes'
 import { GHESReleaseNotes } from 'src/release-notes/components/GHESReleaseNotes'
-import {
-  GHAEReleaseNotesContextT,
-  GHESReleaseNotesContextT,
-} from 'src/release-notes/components/types'
+import { GHESReleaseNotesContextT } from 'src/release-notes/components/types'
 
 const liquid = new Liquid()
 type Props = {
   mainContext: MainContextT
-  ghaeContext: GHAEReleaseNotesContextT | null
   ghesContext: GHESReleaseNotesContextT | null
 }
-export default function ReleaseNotes({ mainContext, ghesContext, ghaeContext }: Props) {
+export default function ReleaseNotes({ mainContext, ghesContext }: Props) {
+  if (!ghesContext) {
+    // (Jan 2024) If we some day have more types of release notes, we'll
+    // need to make this more forgiving.
+    // This component used to cater for GHAE too when that existed.
+    throw new Error('GHES is the only option')
+  }
   return (
     <MainContext.Provider value={mainContext}>
       <DefaultLayout>
-        {ghesContext && <GHESReleaseNotes context={ghesContext} />}
-
-        {ghaeContext && <GHAEReleaseNotes context={ghaeContext} />}
+        <GHESReleaseNotes context={ghesContext} />
       </DefaultLayout>
     </MainContext.Provider>
   )
@@ -82,14 +81,6 @@ export const getServerSideProps: GetServerSideProps<Props> = async (context) =>
               },
             }
           : null,
-      ghaeContext:
-        currentVersion.plan === 'github-ae'
-          ? {
-              currentVersion,
-              releaseNotes: req.context.ghaeReleaseNotes,
-              releases: req.context.ghaeReleases,
-            }
-          : null,
     },
   }
 }

From 65e0900d3f79af713be22f43dcd25a4cbd183725 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Tue, 30 Jan 2024 12:56:41 -0500
Subject: [PATCH 4/4] Remove GHAE in Liquid and front matter (14) (#48929)

---
 .../setting-a-backup-email-address.md           |  3 +--
 .../security-hardening-for-github-actions.md    |  3 ---
 .../actions/using-workflows/about-workflows.md  |  3 +--
 ...-to-your-enterprise-with-an-ip-allow-list.md |  4 ----
 .../viewing-people-in-your-enterprise.md        |  3 ---
 .../scopes-for-oauth-apps.md                    | 17 ++++++++---------
 .../connecting-with-third-party-applications.md |  3 +--
 content/authentication/index.md                 |  2 +-
 .../about-authentication-to-github.md           | 15 +++------------
 9 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-a-backup-email-address.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-a-backup-email-address.md
index 5847e267dc..acb9363ea1 100644
--- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-a-backup-email-address.md
+++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-a-backup-email-address.md
@@ -1,6 +1,6 @@
 ---
 title: Setting a backup email address
-intro: 'Use a backup email address as an additional destination for security-relevant account notifications{% ifversion not ghae %} and to securely reset your password if you can no longer access your primary email address{% endif %}.'
+intro: 'Use a backup email address as an additional destination for security-relevant account notifications and to securely reset your password if you can no longer access your primary email address.'
 redirect_from:
   - /articles/setting-a-backup-email-address
   - /github/setting-up-and-managing-your-github-user-account/setting-a-backup-email-address
@@ -9,7 +9,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Accounts
diff --git a/content/actions/security-guides/security-hardening-for-github-actions.md b/content/actions/security-guides/security-hardening-for-github-actions.md
index 150d4f3d69..5f5693c33d 100644
--- a/content/actions/security-guides/security-hardening-for-github-actions.md
+++ b/content/actions/security-guides/security-hardening-for-github-actions.md
@@ -208,12 +208,9 @@ You can help mitigate this risk by following these good practices:
 
 The same principles described above for using third-party actions also apply to using third-party workflows. You can help mitigate the risks associated with reusing workflows by following the same good practices outlined above. For more information, see "[AUTOTITLE](/actions/using-workflows/reusing-workflows)."
 
-{% ifversion not ghae %}
-
 ## Using {% data variables.product.prodname_dependabot_version_updates %} to keep actions up to date
 
 You can use {% data variables.product.prodname_dependabot_version_updates %} to ensure that references to actions{% ifversion dependabot-updates-actions-reusable-workflows %} and reusable workflows{% endif %} used in your repository are kept up to date. Actions are often updated with bug fixes and new features to make automated processes more reliable, faster, and safer. {% data variables.product.prodname_dependabot_version_updates %} take the effort out of maintaining your dependencies as {% data variables.product.prodname_dependabot %} does this automatically for you. For more information, see "[AUTOTITLE](/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot)."
-{% endif %}
 
 {% ifversion internal-actions %}
 
diff --git a/content/actions/using-workflows/about-workflows.md b/content/actions/using-workflows/about-workflows.md
index 25a5444ccd..c7f3d7f80f 100644
--- a/content/actions/using-workflows/about-workflows.md
+++ b/content/actions/using-workflows/about-workflows.md
@@ -5,7 +5,6 @@ intro: 'Get a high-level overview of {% data variables.product.prodname_actions
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 type: overview
 redirect_from:
@@ -179,7 +178,7 @@ For more information, see "[AUTOTITLE](/actions/using-containerized-services)."
 
 ### Using labels to route workflows
 
-If you want to be sure that a particular type of runner will process your job, you can use labels to control where jobs are executed. You can assign labels to a self-hosted runner in addition to their default label of `self-hosted`. Then, you can refer to these labels in your YAML workflow, ensuring that the job is routed in a predictable way.{% ifversion not ghae %} {% data variables.product.prodname_dotcom %}-hosted runners have predefined labels assigned.{% endif %}
+If you want to be sure that a particular type of runner will process your job, you can use labels to control where jobs are executed. You can assign labels to a self-hosted runner in addition to their default label of `self-hosted`. Then, you can refer to these labels in your YAML workflow, ensuring that the job is routed in a predictable way. {% data variables.product.prodname_dotcom %}-hosted runners have predefined labels assigned.
 
 This example shows how a workflow can use labels to specify the required runner:
 
diff --git a/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md b/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
index bafb1c1edf..5e24e9d664 100644
--- a/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
+++ b/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md
@@ -201,10 +201,6 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth
 
 {% data reusables.actions.ip-allow-list-self-hosted-runners %}
 
-{% ifversion not ghae %}
-
 ## Using {% data variables.product.prodname_pages %} with an IP allow list
 
 {% data reusables.pages.ip-allow-list-pages %}
-
-{% endif %}
diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
index 5ebe6a6dfd..ad72df9536 100644
--- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
@@ -11,7 +11,6 @@ redirect_from:
 versions:
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 topics:
   - Enterprise
 shortTitle: View people in your enterprise
@@ -46,9 +45,7 @@ You can view all the current enterprise owners{% ifversion ghec %} and billing m
 Enterprise owners whose accounts are suspended are included in the list of enterprise administrators, and are identified as suspended. You should consider demoting any suspended owners you see. For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/promoting-or-demoting-a-site-administrator#demoting-a-site-administrator-from-the-enterprise-settings)."
 {% endif %}
 
-{% ifversion not ghae %}
 You can also remove an administrator. For more information. see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise#removing-an-enterprise-administrator-from-your-enterprise-account)."
-{% endif %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
diff --git a/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md b/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md
index 3432a2838b..e158f5872e 100644
--- a/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md
+++ b/content/apps/oauth-apps/building-oauth-apps/scopes-for-oauth-apps.md
@@ -10,7 +10,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - OAuth apps
@@ -47,18 +46,18 @@ X-Accepted-OAuth-Scopes: user
 ## Available scopes
 
 Name | Description
------|-----------|{% ifversion not ghae %}
-**`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% endif %}{% ifversion ghes %}
+-----|-----------|
+**`(no scope)`** | Grants read-only access to public information (including user profile info, repository info, and gists){% ifversion ghes %}
 **`site_admin`** | Grants site administrators access to [{% data variables.product.prodname_ghe_server %} Administration API endpoints](/rest/enterprise-admin).{% endif %}
 **`repo`** | Grants full access to public{% ifversion ghec or ghes %}, internal,{% endif %} and private repositories including read and write access to code, commit statuses, repository invitations, collaborators, deployment statuses, and repository webhooks. **Note**: In addition to repository related resources, the `repo` scope also grants access to manage organization-owned resources including projects, invitations, team memberships and webhooks. This scope also grants the ability to manage projects owned by users.
-&emsp;`repo:status`| Grants read/write access to commit statuses in {% ifversion fpt %}public and private{% elsif ghec or ghes %}public, private, and internal{% elsif ghae %}private and internal{% endif %} repositories. This scope is only necessary to grant other users or services access to private repository commit statuses _without_ granting access to the code.
-&emsp;`repo_deployment`| Grants access to [deployment statuses](/rest/repos#deployments) for {% ifversion not ghae %}public{% else %}internal{% endif %} and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, _without_ granting access to the code.{% ifversion not ghae %}
-&emsp;`public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.{% endif %}
+&emsp;`repo:status`| Grants read/write access to commit statuses in {% ifversion fpt %}public and private{% elsif ghec or ghes %}public, private, and internal{% endif %} repositories. This scope is only necessary to grant other users or services access to private repository commit statuses _without_ granting access to the code.
+&emsp;`repo_deployment`| Grants access to [deployment statuses](/rest/repos#deployments) for public and private repositories. This scope is only necessary to grant other users or services access to deployment statuses, _without_ granting access to the code.
+&emsp;`public_repo`| Limits access to public repositories. That includes read/write access to code, commit statuses, repository projects, collaborators, and deployment statuses for public repositories and organizations. Also required for starring public repositories.
 &emsp;`repo:invite` | Grants accept/decline abilities for invitations to collaborate on a repository. This scope is only necessary to grant other users or services access to invites _without_ granting access to the code.{% ifversion fpt or ghes or ghec %}
 &emsp;`security_events` | Grants: <br/> read and write access to security events in the [{% data variables.product.prodname_code_scanning %} API](/rest/code-scanning) {%- ifversion ghec %}<br/> read and write access to security events in the [{% data variables.product.prodname_secret_scanning %} API](/rest/secret-scanning){%- endif %} <br/> This scope is only necessary to grant other users or services access to security events _without_ granting access to the code.{% endif %}
-**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories. The `repo` {% ifversion fpt or ghec or ghes %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks.
-&emsp;`write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories.
-&emsp;`read:repo_hook`| Grants read and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% elsif ghae %}private or internal{% endif %} repositories.
+**`admin:repo_hook`** | Grants read, write, ping, and delete access to repository hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% endif %} repositories. The `repo` {% ifversion fpt or ghec or ghes %}and `public_repo` scopes grant{% else %}scope grants{% endif %} full access to repositories, including repository hooks. Use the `admin:repo_hook` scope to limit access to only repository hooks.
+&emsp;`write:repo_hook` | Grants read, write, and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% endif %} repositories.
+&emsp;`read:repo_hook`| Grants read and ping access to hooks in {% ifversion fpt %}public or private{% elsif ghec or ghes %}public, private, or internal{% endif %} repositories.
 **`admin:org`** | Fully manage the organization and its teams, projects, and memberships.
 &emsp;`write:org`| Read and write access to organization membership, organization projects, and team membership.
 &emsp;`read:org`| Read-only access to organization membership, organization projects, and team membership.
diff --git a/content/apps/oauth-apps/using-oauth-apps/connecting-with-third-party-applications.md b/content/apps/oauth-apps/using-oauth-apps/connecting-with-third-party-applications.md
index 198f80a64e..3ccc27bbca 100644
--- a/content/apps/oauth-apps/using-oauth-apps/connecting-with-third-party-applications.md
+++ b/content/apps/oauth-apps/using-oauth-apps/connecting-with-third-party-applications.md
@@ -10,7 +10,6 @@ redirect_from:
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Identity
@@ -58,7 +57,7 @@ There are several types of data that applications can request.
 | --- | --- |
 | Commit status | You can grant access for a third-party application to report your commit status. Commit status access allows applications to determine if a build is a successful against a specific commit. Applications won't have access to your code, but they <em>can</em> read and write status information against a specific commit. |
 | Deployments | Deployment status access allows applications to determine if a deployment is successful against a specific commit for a repository. Applications won't have access to your code. |
-| Gists | [Gist](https://gist.github.com) access allows applications to read or write to {% ifversion not ghae %}both your public and{% else %}both your internal and{% endif %} secret Gists. |
+| Gists | [Gist](https://gist.github.com) access allows applications to read or write to both your public and secret Gists. |
 | Hooks | [Webhooks](/webhooks-and-events/webhooks/about-webhooks) access allows applications to read or write hook configurations on repositories you manage. |
 | Notifications | Notification access allows applications to read your {% data variables.product.product_name %} notifications, such as comments on issues and pull requests. However, applications remain unable to access anything in your repositories. |
 | Organizations and teams | Organization and teams access allows apps to access and manage organization and team membership. |
diff --git a/content/authentication/index.md b/content/authentication/index.md
index 60e86671c5..64fc2784b8 100644
--- a/content/authentication/index.md
+++ b/content/authentication/index.md
@@ -1,7 +1,7 @@
 ---
 title: Authentication documentation
 shortTitle: Authentication
-intro: 'Keep your account and data secure with features like {% ifversion not ghae %}two-factor authentication, {% endif %}SSH{% ifversion not ghae %},{% endif %} and commit signature verification.'
+intro: 'Keep your account and data secure with features like two-factor authentication, SSH, and commit signature verification.'
 redirect_from:
   - /categories/56/articles
   - /categories/ssh
diff --git a/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md b/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md
index 947bc473e4..0005bbe103 100644
--- a/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md
+++ b/content/authentication/keeping-your-account-and-data-secure/about-authentication-to-github.md
@@ -4,7 +4,6 @@ intro: 'You can securely access your account''s resources by authenticating to {
 versions:
   fpt: '*'
   ghes: '*'
-  ghae: '*'
   ghec: '*'
 topics:
   - Identity
@@ -16,23 +15,17 @@ shortTitle: Authentication to GitHub
 ---
 ## About authentication to {% data variables.product.prodname_dotcom %}
 
-To keep your account secure, you must authenticate before you can access{% ifversion not ghae %} certain{% endif %} resources on {% data variables.product.product_name %}. When you authenticate to {% data variables.product.product_name %}, you supply or confirm credentials that are unique to you to prove that you are exactly who you declare to be.
+To keep your account secure, you must authenticate before you can access certain resources on {% data variables.product.product_name %}. When you authenticate to {% data variables.product.product_name %}, you supply or confirm credentials that are unique to you to prove that you are exactly who you declare to be.
 
 You can access your resources in {% data variables.product.product_name %} in a variety of ways: in the browser, via {% data variables.product.prodname_desktop %} or another desktop application, with the API, or via the command line. Each way of accessing {% data variables.product.product_name %} supports different modes of authentication.
 {%- ifversion not fpt %}
-- Your identity provider (IdP){% endif %}{% ifversion not ghae %}
-- Username and password with two-factor authentication{% ifversion passkeys %}, or a passkey{% endif %}{% endif %}
+- Your identity provider (IdP){% endif %}
+- Username and password with two-factor authentication{% ifversion passkeys %}, or a passkey{% endif %}
 - {% data variables.product.pat_generic_caps %}
 - SSH key
 
 ## Authenticating in your browser
 
-{% ifversion ghae %}
-
-You can authenticate to {% data variables.product.product_name %} in your browser using your IdP. For more information, see "[AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)."
-
-{% else %}
-
 {% ifversion fpt or ghec %}
 
 If you're a member of an {% data variables.enterprise.prodname_emu_enterprise %}, you will authenticate to {% data variables.product.product_name %} in your browser using your IdP. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users#authenticating-as-a-managed-user){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
@@ -82,8 +75,6 @@ If you need to use multiple accounts on {% data variables.location.product_locat
 - **SAML single sign-on**
   - Before you can access resources owned by an organization or enterprise account that uses SAML single sign-on, you may need to also authenticate through an IdP. For more information, see "[AUTOTITLE](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}{% endif %}
 
-{% endif %}
-
 ### Session cookies
 
 {% data variables.product.company_short %} uses cookies to provide services and secure {% data variables.location.product_location %}. {% ifversion fpt or ghec %}You can review details about {% data variables.product.company_short %}'s cookies in the [privacy/cookies repository](https://github.com/privacy/cookies).{% endif %}