From 93ca7abb4b0b2b8575a42fda760f3af05fd3c29a Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Thu, 8 Feb 2024 07:24:17 -0500
Subject: [PATCH] Remove GHAE in Liquid and front matter (28) (#49091)

Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com>
---
 data/reusables/supported-languages/Cs.md                  | 2 +-
 data/reusables/supported-languages/go.md                  | 2 +-
 data/reusables/supported-languages/java.md                | 2 +-
 data/reusables/supported-languages/javascript.md          | 2 +-
 data/reusables/supported-languages/php.md                 | 2 +-
 .../supported-languages/products-table-header.md          | 3 +--
 data/reusables/supported-languages/python.md              | 2 +-
 data/reusables/supported-languages/ruby.md                | 2 +-
 data/reusables/supported-languages/scala.md               | 2 +-
 data/reusables/supported-languages/typescript.md          | 2 +-
 data/reusables/webhooks/secret.md                         | 2 +-
 data/variables/contact.yml                                | 2 +-
 data/variables/gists.yml                                  | 8 ++++----
 data/variables/location.yml                               | 2 +-
 14 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/data/reusables/supported-languages/Cs.md b/data/reusables/supported-languages/Cs.md
index 109edf4158..dc392b2ca2 100644
--- a/data/reusables/supported-languages/Cs.md
+++ b/data/reusables/supported-languages/Cs.md
@@ -1 +1 @@
-| C# {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI  | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI |{% endif %}
+| C# {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI  | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>`dotnet` CLI |{% endif %}
diff --git a/data/reusables/supported-languages/go.md b/data/reusables/supported-languages/go.md
index a5afd4cef1..f8f1f18595 100644
--- a/data/reusables/supported-languages/go.md
+++ b/data/reusables/supported-languages/go.md
@@ -1 +1 @@
-| Go {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Go modules | {% octicon "check" aria-label="Supported" %}<br> Go modules | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Go modules | {% octicon "check" aria-label="Supported" %}<br>Go modules | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
+| Go {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Go modules | {% octicon "check" aria-label="Supported" %}<br> Go modules | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Go modules | {% octicon "check" aria-label="Supported" %}<br>Go modules | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
diff --git a/data/reusables/supported-languages/java.md b/data/reusables/supported-languages/java.md
index 26dc965404..62bc521cdf 100644
--- a/data/reusables/supported-languages/java.md
+++ b/data/reusables/supported-languages/java.md
@@ -1 +1 @@
-| Java {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle| {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle |{% endif %}
+| Java {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle| {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle |{% endif %}
diff --git a/data/reusables/supported-languages/javascript.md b/data/reusables/supported-languages/javascript.md
index c151653383..a932c69aa7 100644
--- a/data/reusables/supported-languages/javascript.md
+++ b/data/reusables/supported-languages/javascript.md
@@ -1 +1 @@
-| JavaScript {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm, Yarn | {% octicon "check" aria-label="Supported" %}<br>npm | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm, Yarn | {% octicon "check" aria-label="Supported" %}<br>npm | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm |{% endif %}
+| JavaScript {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm, Yarn | {% octicon "check" aria-label="Supported" %}<br>npm | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm, Yarn | {% octicon "check" aria-label="Supported" %}<br>npm | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>npm |{% endif %}
diff --git a/data/reusables/supported-languages/php.md b/data/reusables/supported-languages/php.md
index 0a52d9ca61..43a5a2e09b 100644
--- a/data/reusables/supported-languages/php.md
+++ b/data/reusables/supported-languages/php.md
@@ -1 +1 @@
-| PHP {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
+| PHP {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %}<br>Composer | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
diff --git a/data/reusables/supported-languages/products-table-header.md b/data/reusables/supported-languages/products-table-header.md
index ed8b4d0de7..12027fcbe4 100644
--- a/data/reusables/supported-languages/products-table-header.md
+++ b/data/reusables/supported-languages/products-table-header.md
@@ -1,4 +1,3 @@
 {% ifversion fpt or ghec %}| [GitHub Copilot](/copilot/overview-of-github-copilot/about-github-copilot-individual#about-github-copilot) | [Code navigation](/repositories/working-with-files/using-files/navigating-code-on-github) | [{% data variables.product.prodname_code_scanning_caps %}](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning) | [Dependency graph, {% data variables.product.prodname_dependabot_alerts %}](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#supported-package-ecosystems) | [{% data variables.product.prodname_dependabot_version_updates %}, {% data variables.product.prodname_dependabot_security_updates %}](/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates#supported-repositories-and-ecosystems) | [{% data variables.product.prodname_actions %}](/actions/automating-builds-and-tests/about-continuous-integration#supported-languages) | [{% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages#supported-clients-and-formats) |
 | :-- | :-: | :-: | :-: | :-: | :-: | :-: | :-: |{% elsif ghes %}| [{% data variables.product.prodname_code_scanning_caps %}](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning) | [Dependency graph, {% data variables.product.prodname_dependabot_alerts %}](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph#supported-package-ecosystems) {% ifversion ghes %}| [{% data variables.product.prodname_dependabot_version_updates %}, {% data variables.product.prodname_dependabot_security_updates %}](/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates#supported-repositories-and-ecosystems){% endif %} | [{% data variables.product.prodname_actions %}](/actions/automating-builds-and-tests/about-continuous-integration#supported-languages) | [{% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages#supported-clients-and-formats) |
-| :-- | :-: | :-: {% ifversion ghes %}| :-: {% endif %}| :-: | :-: |{% elsif ghae %}| [{% data variables.product.prodname_code_scanning_caps %}](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning) | [{% data variables.product.prodname_actions %}](/actions/automating-builds-and-tests/about-continuous-integration#supported-languages) | [{% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages#supported-clients-and-formats) |
-| :-- | :-: | :-: | :-: |{% endif %}
+| :-- | :-: | :-: {% ifversion ghes %}| :-: {% endif %}| :-: | :-: |{% endif %}
diff --git a/data/reusables/supported-languages/python.md b/data/reusables/supported-languages/python.md
index 123cf6a663..1c4e6b5eb0 100644
--- a/data/reusables/supported-languages/python.md
+++ b/data/reusables/supported-languages/python.md
@@ -1 +1 @@
-| Python {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} <br>precise| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
+| Python {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} <br>precise| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %}<br>pip | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
diff --git a/data/reusables/supported-languages/ruby.md b/data/reusables/supported-languages/ruby.md
index 9b7a8ed39e..5714093371 100644
--- a/data/reusables/supported-languages/ruby.md
+++ b/data/reusables/supported-languages/ruby.md
@@ -1 +1 @@
-| Ruby {% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %}| {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems |{% elsif ghae %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems |{% endif %}
+| Ruby {% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %}| {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %}<br>RubyGems | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>RubyGems |{% endif %}
diff --git a/data/reusables/supported-languages/scala.md b/data/reusables/supported-languages/scala.md
index ab8ddddb3b..1385554f82 100644
--- a/data/reusables/supported-languages/scala.md
+++ b/data/reusables/supported-languages/scala.md
@@ -1 +1 @@
-| Scala {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghae %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
+| Scala {% ifversion fpt or ghec %}| {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% elsif ghes %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %}<br>Maven, Gradle | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Unsupported" %} |{% endif %}
diff --git a/data/reusables/supported-languages/typescript.md b/data/reusables/supported-languages/typescript.md
index 535f0b8744..8e2cd1ff6a 100644
--- a/data/reusables/supported-languages/typescript.md
+++ b/data/reusables/supported-languages/typescript.md
@@ -1 +1 @@
-| TypeScript {% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm, Yarn | {% octicon "check" aria-label="The check icon" %}<br>npm | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm, Yarn | {% octicon "check" aria-label="The check icon" %}<br>npm | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm |{% elsif ghae %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm |{% endif %}
+| TypeScript {% ifversion fpt or ghec %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm, Yarn | {% octicon "check" aria-label="The check icon" %}<br>npm | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm |{% elsif ghes %}| {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm, Yarn | {% octicon "check" aria-label="The check icon" %}<br>npm | {% octicon "check" aria-label="The check icon" %} | {% octicon "check" aria-label="The check icon" %}<br>npm |{% endif %}
diff --git a/data/reusables/webhooks/secret.md b/data/reusables/webhooks/secret.md
index 9747d3f598..f581dfb01f 100644
--- a/data/reusables/webhooks/secret.md
+++ b/data/reusables/webhooks/secret.md
@@ -1 +1 @@
-Setting a webhook secret allows you to ensure that `POST` requests sent to the payload URL are from {% data variables.product.product_name %}. When you set a secret, you'll receive the {% ifversion fpt or ghes or ghec %}`X-Hub-Signature` and `X-Hub-Signature-256` headers{% elsif ghae %}`X-Hub-Signature-256` header{% endif %} in the webhook `POST` request. For more information on how to use a secret with a signature header to secure your webhook payloads, see "[AUTOTITLE](/webhooks-and-events/webhooks/securing-your-webhooks)."
+Setting a webhook secret allows you to ensure that `POST` requests sent to the payload URL are from {% data variables.product.product_name %}. When you set a secret, you'll receive the `X-Hub-Signature` and `X-Hub-Signature-256` headers in the webhook `POST` request. For more information on how to use a secret with a signature header to secure your webhook payloads, see "[AUTOTITLE](/webhooks-and-events/webhooks/securing-your-webhooks)."
diff --git a/data/variables/contact.yml b/data/variables/contact.yml
index e44e0d0976..56e8b4bca4 100644
--- a/data/variables/contact.yml
+++ b/data/variables/contact.yml
@@ -2,7 +2,7 @@ contact_ent_support: '[GitHub Enterprise Support](https://support.github.com)'
 
 # GitHub Support (with versioning for GHES, GHAE) - when users need to open a ticket through the support portal
 contact_support: >-
-  {% ifversion fpt or ghec %}us through the [GitHub Support portal](https://support.github.com){% elsif ghes %}your site administrator{% elsif ghae %}your enterprise owner{% endif %}
+  {% ifversion fpt or ghec %}us through the [GitHub Support portal](https://support.github.com){% elsif ghes %}your site administrator{% endif %}
 
 # GitHub Support (no versioning) - when users can self-serve from the support landing page
 contact_support_page: '[GitHub Support](https://support.github.com)'
diff --git a/data/variables/gists.yml b/data/variables/gists.yml
index ff36dd4aa1..bd2631486a 100644
--- a/data/variables/gists.yml
+++ b/data/variables/gists.yml
@@ -1,11 +1,11 @@
 gist_homepage: >-
-  {% ifversion fpt or ghec %}[gist home page](https://gist.github.com/){% elsif ghae %}gist home page, `http(s)://gist.[hostname]`{% else %}gist home page, `http(s)://[hostname]/gist` or `http(s)://gist.[hostname]` if subdomains are enabled{% endif %}
+  {% ifversion fpt or ghec %}[gist home page](https://gist.github.com/){% else %}gist home page, `http(s)://[hostname]/gist` or `http(s)://gist.[hostname]` if subdomains are enabled{% endif %}
 
 gist_search_url: >-
-  {% ifversion fpt or ghec %}[Gist Search](https://gist.github.com/search){% elsif ghae %}Gist Search, `http(s)://gist.[hostname]/search`{% else %}Gist Search, `http(s)://[hostname]/gist/search` or `http(s)://gist.[hostname]/search` if subdomains are enabled{% endif %}
+  {% ifversion fpt or ghec %}[Gist Search](https://gist.github.com/search){% else %}Gist Search, `http(s)://[hostname]/gist/search` or `http(s)://gist.[hostname]/search` if subdomains are enabled{% endif %}
 
 discover_url: >-
-  {% ifversion fpt or ghec %}[Discover](https://gist.github.com/discover){% elsif ghae %}Discover, `http(s)://gist.[hostname]/discover`{% else %}Discover, `http(s)://[hostname]/gist/discover` or `http(s)://gist.[hostname]/discover` if subdomains are enabled{% endif %}
+  {% ifversion fpt or ghec %}[Discover](https://gist.github.com/discover){% else %}Discover, `http(s)://[hostname]/gist/discover` or `http(s)://gist.[hostname]/discover` if subdomains are enabled{% endif %}
 
 gist_starred: >-
-  {% ifversion fpt or ghec %}[Gist starred page](https://gist.github.com/starred){% elsif ghae %}Gist starred page, `http(s)://gist.[hostname]/starred`{% else %}Gist starred page, `http(s)://[hostname]/gist/starred` or `http(s)://gist.[hostname]/starred` if subdomains are enabled{% endif %}
+  {% ifversion fpt or ghec %}[Gist starred page](https://gist.github.com/starred){% else %}Gist starred page, `http(s)://[hostname]/gist/starred` or `http(s)://gist.[hostname]/starred` if subdomains are enabled{% endif %}
diff --git a/data/variables/location.yml b/data/variables/location.yml
index 2101b7ab67..8f9a6271c8 100644
--- a/data/variables/location.yml
+++ b/data/variables/location.yml
@@ -1,6 +1,6 @@
 ## Use these variables when referring specifically to a location within a product
 product_location: >-
-  {% ifversion ghes %}your GitHub Enterprise Server instance{% elsif ghae %}your enterprise{% else %}GitHub.com{% endif %}
+  {% ifversion ghes %}your GitHub Enterprise Server instance{% else %}GitHub.com{% endif %}
 
 # Used ONLY when you need to refer to a GHES instance in an article that is versioned for non-GHES versions.
 # Do not use in other situations!