From 4efef1c4d0450cc7d1569653f19977a394511023 Mon Sep 17 00:00:00 2001
From: Anne-Marie <102995847+am-stead@users.noreply.github.com>
Date: Wed, 12 Mar 2025 09:46:18 +0000
Subject: [PATCH 1/5] GHAS unbundling task: Gated feature statements #17241
 (#54569)

Co-authored-by: Felicity Chapman <felicitymay@github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com>
---
 ...curity-and-analysis-for-your-enterprise.md |  7 +++----
 ...b-advanced-security-for-your-enterprise.md |  2 +-
 .../index.md                                  |  2 +-
 .../securing-your-enterprise/index.md         |  2 +-
 ...ut-billing-for-github-advanced-security.md |  2 +-
 .../index.md                                  |  2 +-
 ...-up-a-trial-of-github-advanced-security.md |  2 +-
 ...nformation-for-github-advanced-security.md |  2 +-
 ...ing-your-github-advanced-security-usage.md |  2 +-
 .../index.md                                  |  2 +-
 .../about-github-advanced-security.md         |  2 +-
 .../dependabot/github-presets-availability.md |  1 +
 .../reusables/gated-features/code-scanning.md | 12 +++++++----
 data/reusables/gated-features/codeql.md       | 12 ++++++++++-
 .../gated-features/delegated-bypass.md        | 15 ++++++--------
 .../dependabot-auto-triage-rules.md           | 17 ++++++++++++----
 .../gated-features/dependency-review.md       | 14 +++++++------
 data/reusables/gated-features/ghas-ghec.md    | 12 ++++++++++-
 data/reusables/gated-features/ghas.md         |  3 ---
 .../partner-pattern-validity-check-ghas.md    | 13 +++++++-----
 .../push-protection-for-repos.md              | 18 ++++++++---------
 .../secret-scanning-custom-patterns.md        | 11 ++++++++--
 .../secret-scanning-non-provider-patterns.md  | 11 ++++++++--
 .../gated-features/secret-scanning.md         | 19 ++++++++++--------
 .../gated-features/security-campaigns.md      | 11 +++++-----
 .../security-configurations-enterprise.md     | 20 +++++++------------
 .../gated-features/security-overview.md       |  2 +-
 27 files changed, 131 insertions(+), 87 deletions(-)
 create mode 100644 data/reusables/dependabot/github-presets-availability.md
 delete mode 100644 data/reusables/gated-features/ghas.md

diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md
index 9fab8d55f96a..2b9d841ea70a 100644
--- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md
+++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise.md
@@ -1,9 +1,8 @@
 ---
-title: Enforcing policies for security features in your enterprise
-intro: 'You can enforce policies to manage the use of security features for codebases within your enterprise''s organizations.'
-allowTitleToDifferFromFilename: true
+title: Enforcing policies for code security and analysis for your enterprise
+intro: 'You can enforce policies to manage the use of code security and analysis features within your enterprise''s organizations.'
 permissions: 'Enterprise owners'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   ghec: '*'
   ghes: '*'
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md
index 50f6f23b7489..ea2ba472da2f 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md
@@ -2,7 +2,7 @@
 title: Enabling {% data variables.product.prodname_GHAS %} {% ifversion ghas-products %}products {% endif %}for your enterprise
 shortTitle: Enabling {% data variables.product.prodname_GHAS %}
 intro: 'You can configure {% data variables.product.prodname_ghe_server %} to include {% data variables.product.prodname_GHAS %}{% ifversion ghas-products %} products{% endif %}. This provides extra features that help users find and fix security problems in their code.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 allowTitleToDifferFromFilename: true
 redirect_from:
   - /admin/advanced-security/enabling-github-advanced-security-for-your-enterprise
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/index.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/index.md
index 6636b7f668f6..59b719622f0f 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/index.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/index.md
@@ -3,7 +3,7 @@ title: '{% ifversion ghes %}Setting up {% data variables.product.prodname_GHAS %
 shortTitle: '{% ifversion ghes %}Set up{% else %}Configure{% endif %} {% data variables.product.prodname_GHAS %}'
 intro: 'You can {% ifversion ghes %}set up{% else %}configure{% endif %} {% data variables.product.prodname_AS %}{% ifversion ghas-products %} products{% endif %} to suit your enterprise''s needs.'
 allowTitleToDifferFromFilename: true
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 redirect_from:
   - /enterprise/admin/configuration/configuring-advanced-security-features
   - /admin/configuration/configuring-advanced-security-features
diff --git a/content/admin/managing-code-security/securing-your-enterprise/index.md b/content/admin/managing-code-security/securing-your-enterprise/index.md
index 5b2176b97042..600ed42b44cb 100644
--- a/content/admin/managing-code-security/securing-your-enterprise/index.md
+++ b/content/admin/managing-code-security/securing-your-enterprise/index.md
@@ -2,7 +2,7 @@
 title: Securing your enterprise
 shortTitle: Securing your enterprise
 intro: '{% ifversion security-configurations-cloud %}Enable the {% data variables.product.prodname_github_security_configuration %} or c{% elsif security-configurations-ghes-only %}C{% endif %}reate and apply {% data variables.product.prodname_custom_security_configurations %} to quickly secure your enterprise.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   feature: security-configuration-enterprise-level
 topics:
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
index beb9bb349a0a..e6e13e2c94c8 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
@@ -1,7 +1,7 @@
 ---
 title: About billing for GitHub Advanced Security
 intro: 'Learn how {% data variables.product.prodname_GH_advanced_security %} costs are calculated and how to get the most from your license.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 redirect_from:
   - /admin/advanced-security/about-licensing-for-github-advanced-security
   - /billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md
index 52ea4a72aeab..ced255a6ea04 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md
@@ -2,7 +2,7 @@
 title: Managing billing for GitHub Advanced Security
 shortTitle: GitHub Advanced Security
 intro: 'You can view and manage your use of seats on a license for {% data variables.product.prodname_GH_advanced_security %}.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 redirect_from:
   - /billing/managing-licensing-for-github-advanced-security
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
index e01d00bc436b..e9f1529d4657 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
@@ -1,7 +1,7 @@
 ---
 title: Setting up a trial of GitHub Advanced Security
 intro: 'You can try {% data variables.product.prodname_GH_advanced_security %} for free.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   ghec: '*'
 type: how_to
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
index 001794d704ac..1b23d97549a3 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
@@ -2,7 +2,7 @@
 title: Viewing committer information for GitHub Advanced Security
 intro: 'You can view information about the {% data variables.product.prodname_GH_advanced_security %} committers for your enterprise and calculate the cost for additional committers with the site admin dashboard.'
 permissions: 'Site administrators can view committer information for {% data variables.product.prodname_GH_advanced_security %}.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   ghes: '*'
 type: how_to
diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
index 01557598e83e..c113d8d78618 100644
--- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
@@ -2,7 +2,7 @@
 title: Viewing your GitHub Advanced Security usage
 intro: 'You can view usage of {% data variables.product.prodname_GH_advanced_security %} for your enterprise.'
 permissions: 'Enterprise owners can view usage for {% data variables.product.prodname_GH_advanced_security %}.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 redirect_from:
   - /billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
   - /admin/advanced-security/viewing-your-github-advanced-security-usage
diff --git a/content/code-security/trialing-github-advanced-security/index.md b/content/code-security/trialing-github-advanced-security/index.md
index 0ed76d1cdb49..65d173f263e1 100644
--- a/content/code-security/trialing-github-advanced-security/index.md
+++ b/content/code-security/trialing-github-advanced-security/index.md
@@ -2,7 +2,7 @@
 title: Trialing {% data variables.product.prodname_GHAS %}
 shortTitle: Trial {% data variables.product.prodname_GHAS %}
 intro: 'Learn how to get the most out of your trial of {% data variables.product.prodname_GHAS %}.'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md
index 261522708924..6aaca3b727fa 100644
--- a/content/get-started/learning-about-github/about-github-advanced-security.md
+++ b/content/get-started/learning-about-github/about-github-advanced-security.md
@@ -1,7 +1,7 @@
 ---
 title: About GitHub Advanced Security
 intro: '{% data variables.product.prodname_dotcom %} makes extra security features available to customers under an {% data variables.product.prodname_advanced_security %} license.{% ifversion fpt or ghec %} These features are also enabled for public repositories.{% endif %}'
-product: '{% data reusables.gated-features.ghas %}'
+product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   fpt: '*'
   ghes: '*'
diff --git a/data/reusables/dependabot/github-presets-availability.md b/data/reusables/dependabot/github-presets-availability.md
new file mode 100644
index 000000000000..bfa13b1ff19b
--- /dev/null
+++ b/data/reusables/dependabot/github-presets-availability.md
@@ -0,0 +1 @@
+**{% data variables.dependabot.github_presets %}** are available for all repository types.
diff --git a/data/reusables/gated-features/code-scanning.md b/data/reusables/gated-features/code-scanning.md
index e039074da2e6..b2f29aaa7e12 100644
--- a/data/reusables/gated-features/code-scanning.md
+++ b/data/reusables/gated-features/code-scanning.md
@@ -1,10 +1,14 @@
-{% ifversion fpt or ghec %}
 {% data variables.product.prodname_code_scanning_caps %} is available for the following repository types:
 
+{%- ifversion fpt %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
+
+{%- elsif ghec %}
 * Public repositories on {% data variables.product.prodname_dotcom_the_website %}
-* Organization-owned repositories on {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
 
-{% elsif ghes %}
-Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{%- elsif ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
 
 {% endif %}
diff --git a/data/reusables/gated-features/codeql.md b/data/reusables/gated-features/codeql.md
index 196ebc70ec58..6807ed01a600 100644
--- a/data/reusables/gated-features/codeql.md
+++ b/data/reusables/gated-features/codeql.md
@@ -1,4 +1,14 @@
 {% data variables.product.prodname_codeql %} is available for the following repository types:
 
+{%- ifversion fpt %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}, see [GitHub CodeQL Terms and Conditions](https://github.com/github/codeql-cli-binaries/blob/main/LICENSE.md){% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
+
+{%- elsif ghec %}
 * Public repositories on {% data variables.product.prodname_dotcom_the_website %}, see [GitHub CodeQL Terms and Conditions](https://github.com/github/codeql-cli-binaries/blob/main/LICENSE.md)
-* Organization-owned repositories on {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+
+{%- elsif ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+
+{% endif %}
diff --git a/data/reusables/gated-features/delegated-bypass.md b/data/reusables/gated-features/delegated-bypass.md
index ba1cb7223c91..2b600a7f71b5 100644
--- a/data/reusables/gated-features/delegated-bypass.md
+++ b/data/reusables/gated-features/delegated-bypass.md
@@ -1,13 +1,10 @@
-Delegated bypass requires push protection to be enabled for the organization or the repository. See [AUTOTITLE](/code-security/secret-scanning/introduction/about-push-protection).
+Delegated bypass for push protection is available for the following repository types:
 
-Delegated bypass is available for the following repositories:
+{% ifversion fpt %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
 
 {% ifversion ghec %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
 
-* Private and internal repositories in organizations using {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
-
-{% elsif ghes %}
-
-* Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
-
-{% endif %}
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/dependabot-auto-triage-rules.md b/data/reusables/gated-features/dependabot-auto-triage-rules.md
index 594790572108..ec62e551e0a6 100644
--- a/data/reusables/gated-features/dependabot-auto-triage-rules.md
+++ b/data/reusables/gated-features/dependabot-auto-triage-rules.md
@@ -1,5 +1,14 @@
-{% data variables.dependabot.auto_triage_rules %} are available for the following repository types:
+{% data reusables.dependabot.github-presets-availability %}
 
-* All repositories for {% data variables.dependabot.github_presets %}{% ifversion fpt %}
-* Public repositories for {% data variables.dependabot.custom_rules %}{% elsif ghec or ghes %}
-* Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled for {% data variables.dependabot.custom_rules %}{% endif %}
+**{% data variables.dependabot.custom_rules_caps %}** are available for the following repository types:
+
+{% ifversion fpt %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}{%- ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
+
+{% ifversion ghec %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
+
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}  
diff --git a/data/reusables/gated-features/dependency-review.md b/data/reusables/gated-features/dependency-review.md
index f133d37eb4b6..572d45ee0b4e 100644
--- a/data/reusables/gated-features/dependency-review.md
+++ b/data/reusables/gated-features/dependency-review.md
@@ -1,10 +1,12 @@
-{% ifversion fpt or ghec %}
 Dependency review is available for the following repository types:
 
-* Public repositories on {% data variables.product.prodname_dotcom_the_website %}
-* Organization-owned repositories on {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{%- ifversion fpt %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}{%- ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
 
-{% elsif ghes %}
-Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{%- ifversion ghec %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
 
-{% endif %}
+{%- ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/ghas-ghec.md b/data/reusables/gated-features/ghas-ghec.md
index 755c9b2b0f73..cf4d520cdda0 100644
--- a/data/reusables/gated-features/ghas-ghec.md
+++ b/data/reusables/gated-features/ghas-ghec.md
@@ -1,3 +1,13 @@
-{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom %}. For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans).{% endif %}
+{% ifversion ghas-products %}
+
+{% data variables.product.prodname_GH_code_security %} and {% data variables.product.prodname_GH_secret_protection %} are available for {% ifversion fpt or ghec %}accounts on {% data variables.product.prodname_team %} and {% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}accounts on {% data variables.product.prodname_ghe_server %}{% endif %}.
+
+{% else %}
+
+{% data variables.product.prodname_GHAS %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.
+
+{% endif %}
+
+{% ifversion fpt or ghec %} Some features are also available for free for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans).
 
 {% data reusables.advanced-security.ghas-for-azdo-link %}
diff --git a/data/reusables/gated-features/ghas.md b/data/reusables/gated-features/ghas.md
deleted file mode 100644
index 25d238c4b0a3..000000000000
--- a/data/reusables/gated-features/ghas.md
+++ /dev/null
@@ -1,3 +0,0 @@
-{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom %}.{% endif %} For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans).
-
-{% data reusables.advanced-security.ghas-for-azdo-link %}
diff --git a/data/reusables/gated-features/partner-pattern-validity-check-ghas.md b/data/reusables/gated-features/partner-pattern-validity-check-ghas.md
index df12432e86f1..faf5475d9bf5 100644
--- a/data/reusables/gated-features/partner-pattern-validity-check-ghas.md
+++ b/data/reusables/gated-features/partner-pattern-validity-check-ghas.md
@@ -1,7 +1,10 @@
-{% ifversion ghec %}
-Validity checks for partner patterns is available on all types of repositories on {% data variables.product.github %}. To use this feature, you must have a license for {% data variables.product.prodname_GH_advanced_security %}.
+Validity checks for partner patterns are available for the following repository types:
+
+{% ifversion fpt %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
 
-{% elsif ghes %}
-Validity checks for partner patterns is available on all types of repositories in {% data variables.product.prodname_ghe_server %}. This feature requires a license for {% data variables.product.prodname_GH_advanced_security %}.
+{% ifversion ghec %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
 
-{% endif %}
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/push-protection-for-repos.md b/data/reusables/gated-features/push-protection-for-repos.md
index c2805ef7d6bd..5613851bbdeb 100644
--- a/data/reusables/gated-features/push-protection-for-repos.md
+++ b/data/reusables/gated-features/push-protection-for-repos.md
@@ -1,13 +1,13 @@
-Push protection for repositories and organizations is available for the following repository types:
+Push protection is available for the following repository types:
 
-{% ifversion fpt or ghec %}
+{% ifversion fpt %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
 
-* {% ifversion ghec %}User-owned public{% elsif fpt %}Public{% endif %} repositories for free
-* Private and internal repositories in organizations using {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion ghec %}
+{% ifversion ghec %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled
 * User namespace repositories belonging to {% data variables.product.prodname_emus %}{% endif %}
 
-{% elsif ghes %}
-
-* Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
-
-{% endif %}
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/secret-scanning-custom-patterns.md b/data/reusables/gated-features/secret-scanning-custom-patterns.md
index 5efb79071f5c..2d37fd7d224d 100644
--- a/data/reusables/gated-features/secret-scanning-custom-patterns.md
+++ b/data/reusables/gated-features/secret-scanning-custom-patterns.md
@@ -1,3 +1,10 @@
-Custom patterns for {% data variables.product.prodname_secret_scanning %} is available for the following repositories:
+Custom patterns for {% data variables.product.prodname_secret_scanning %} is available for the following repository types:
 
-* Public, private, and internal repositories in organizations using {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{% ifversion fpt %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
+
+{% ifversion ghec %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
+
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/secret-scanning-non-provider-patterns.md b/data/reusables/gated-features/secret-scanning-non-provider-patterns.md
index 1c25ae8e090a..93a3b8ee41e8 100644
--- a/data/reusables/gated-features/secret-scanning-non-provider-patterns.md
+++ b/data/reusables/gated-features/secret-scanning-non-provider-patterns.md
@@ -1,3 +1,10 @@
-Scanning for non-provider patterns is available for the following repositories:
+Scanning for non-provider patterns is available for the following repository types:
 
-* Public, private, and internal repositories in organizations using {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{% ifversion fpt %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
+
+{% ifversion ghec %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
+
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/secret-scanning.md b/data/reusables/gated-features/secret-scanning.md
index 1ba519656363..b8b0d24a1eea 100644
--- a/data/reusables/gated-features/secret-scanning.md
+++ b/data/reusables/gated-features/secret-scanning.md
@@ -1,14 +1,17 @@
-{% data variables.product.prodname_secret_scanning_caps %} is available for the following repositories:
+{% data variables.product.prodname_secret_scanning_caps %} is available for the following repository types:
 
-{% ifversion fpt or ghec %}
+{%- ifversion fpt %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}{% ifversion ghas-products-cloud %}
+* Organization-owned repositories on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
 
-  * Public repositories (for free)
-  * Private and internal repositories in organizations using {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion secret-scanning-user-owned-repos %}
-  * User-owned repositories for {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %}{% endif %}
+{%- elsif ghec %}
+* Public repositories on {% data variables.product.prodname_dotcom_the_website %}
+* Organization-owned repositories on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion secret-scanning-user-owned-repos %}
+* User-owned repositories for {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %}{% endif %}
 
-{% elsif ghes %}
+{%- elsif ghes %}
 
-* Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
-* {% ifversion secret-scanning-user-owned-repos %}User-owned repositories{% endif %} for an enterprise with {% data variables.product.prodname_GH_advanced_security %} enabled
+* Organization-owned repositories with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion secret-scanning-user-owned-repos %}
+* User-owned repositories for enterprises with [{% data variables.product.prodname_GH_secret_protection %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
 
 {% endif %}
diff --git a/data/reusables/gated-features/security-campaigns.md b/data/reusables/gated-features/security-campaigns.md
index b2b5475ac459..b2f0022e9de4 100644
--- a/data/reusables/gated-features/security-campaigns.md
+++ b/data/reusables/gated-features/security-campaigns.md
@@ -1,7 +1,8 @@
-{% ifversion ghec %}
-Organizations on {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{% ifversion fpt %}{% ifversion ghas-products-cloud %}
+Organizations on {% data variables.product.prodname_team %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
 
-{% elsif ghes %}
-Organizations with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{% ifversion ghec %}
+Organizations on {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
 
-{% endif %}
+{% ifversion ghes %}
+Organizations with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}
diff --git a/data/reusables/gated-features/security-configurations-enterprise.md b/data/reusables/gated-features/security-configurations-enterprise.md
index e58b29c89485..07772b040843 100644
--- a/data/reusables/gated-features/security-configurations-enterprise.md
+++ b/data/reusables/gated-features/security-configurations-enterprise.md
@@ -1,15 +1,9 @@
-{% data variables.product.prodname_security_configurations_caps %} is available for the following repositories:
+{% data variables.product.prodname_security_configurations_caps %} are available for the following repository types:
 
-{% ifversion ghec %}
+{%- ifversion ghec %}
+* Organization-owned repositories on {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_cs_or_sp %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion secret-scanning-user-owned-repos %}
+* User-owned repositories for {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %}{% endif %}{% endif %}
 
-  * Public repositories
-  * Private and internal repositories in organizations using {% data variables.product.prodname_ghe_cloud %} with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion secret-scanning-user-owned-repos %}
-
-{% endif %}
-
-{% elsif ghes %}
-
-* Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
-* {% ifversion secret-scanning-user-owned-repos %}User-owned repositories{% endif %} for an enterprise with {% data variables.product.prodname_GH_advanced_security %} enabled
-
-{% endif %}
+{% ifversion ghes %}
+* Organization-owned repositories with [{% data variables.product.prodname_GH_cs_or_sp %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% ifversion secret-scanning-user-owned-repos %}
+* User-owned repositories for enterprises with [{% data variables.product.prodname_GH_cs_or_sp %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}{% endif %}
diff --git a/data/reusables/gated-features/security-overview.md b/data/reusables/gated-features/security-overview.md
index df0121b48c97..ce4d614ec992 100644
--- a/data/reusables/gated-features/security-overview.md
+++ b/data/reusables/gated-features/security-overview.md
@@ -1,5 +1,5 @@
 {% ifversion fpt %}
-Organizations that use {% data variables.product.prodname_enterprise %}
+Organizations that use {% ifversion ghas-products-cloud %}{% data variables.product.prodname_team %} or {% endif %}{% data variables.product.prodname_enterprise %}
 {% elsif ghec %}
 Enterprises and their organizations
 {% elsif ghes %}

From 894341c206070aa9da88f87a9c856f4426213bcf Mon Sep 17 00:00:00 2001
From: Anne-Marie <102995847+am-stead@users.noreply.github.com>
Date: Wed, 12 Mar 2025 10:28:28 +0000
Subject: [PATCH 2/5] GHAS unbundling task - #17242: Revise "GitHub Plans"
 [part of "Preparation for basic updates for product split - #17242"] (#54683)

---
 .../learning-about-github/githubs-plans.md       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/content/get-started/learning-about-github/githubs-plans.md b/content/get-started/learning-about-github/githubs-plans.md
index 9923a9f44d7d..527e8d1e3f02 100644
--- a/content/get-started/learning-about-github/githubs-plans.md
+++ b/content/get-started/learning-about-github/githubs-plans.md
@@ -84,6 +84,13 @@ In addition to the features available with {% data variables.product.prodname_fr
 * {% data variables.contact.github_support %} via email
 * 3,000 {% data variables.product.prodname_actions %} minutes per month
 * 2 GB {% data variables.product.prodname_registry %} storage
+{%- ifversion ghas-products %}
+* The option to purchase {% data variables.product.prodname_GHAS %} products:
+  * {% data variables.product.prodname_GH_code_security %}
+  * {% data variables.product.prodname_GH_secret_protection %}
+  
+  For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).{%- endif %}
+
 * Advanced tools and insights in private repositories:
   * Required pull request reviewers
   * Multiple pull request reviewers
@@ -97,7 +104,8 @@ In addition to the features available with {% data variables.product.prodname_fr
     > [!NOTE]
     > To publish a {% data variables.product.prodname_pages %} site privately, you need to have an organization account. Additionally, your organization must use {% data variables.product.prodname_ghe_cloud %}.
 
-  * Wikis
+  * Wikis{% ifversion ghas-products %}
+  * Security overview{% endif %}
   * Repository insights graphs: Pulse, contributors, traffic, commits, code frequency, network, and forks
     {% data reusables.repositories.repo-insights-commit-limit %}
 {%- ifversion fpt or ghec %}
@@ -120,9 +128,9 @@ In addition to the features available with {% data variables.product.prodname_te
 * Authentication with SAML single sign-on
 * Access provisioning with SAML or SCIM
 * Deployment protection rules with {% data variables.product.prodname_actions %} for private or internal repositories
-* {% data variables.product.prodname_github_connect %}
-* The option to purchase {% data variables.product.prodname_GH_advanced_security %}. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security).
-* Additional features such as internal repositories, security overview, and repository rules.
+* {% data variables.product.prodname_github_connect %}{%- ifversion ghas-products %}{% else %}
+* The option to purchase {% data variables.product.prodname_GHAS %}. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security){% endif %}
+* Additional features such as internal repositories{%- ifversion ghas-products %}{% else %}, security overview,{% endif %} and repository rules.
 
 {% data variables.product.prodname_ghe_cloud %} specifically includes:
 * 50,000 {% data variables.product.prodname_actions %} minutes per month

From 676597a7d4edf949d20734bc344ade186a6ab972 Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Wed, 12 Mar 2025 11:31:13 +0100
Subject: [PATCH 3/5] GitHub Copilot Chat for Xcode [GA] (#54643)

---
 .../changing-the-ai-model-for-copilot-chat.md | 41 +++++++++++++++++--
 ...ng-github-copilot-questions-in-your-ide.md |  6 ++-
 .../copilot/xcode-chat-public-preview-note.md |  1 -
 3 files changed, 42 insertions(+), 6 deletions(-)
 delete mode 100644 data/reusables/copilot/xcode-chat-public-preview-note.md

diff --git a/content/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-chat.md b/content/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-chat.md
index 223c70f95f3e..fdc78411b017 100644
--- a/content/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-chat.md
+++ b/content/copilot/using-github-copilot/ai-models/changing-the-ai-model-for-copilot-chat.md
@@ -46,7 +46,7 @@ For more information about these models, see:
 
 ## Changing your AI model
 
-These instructions are for {% data variables.product.prodname_copilot_short %} on the {% data variables.product.github %} website. For {% data variables.product.prodname_vs %} or {% data variables.product.prodname_vscode_shortname %}, click the appropriate tab at the top of this page.
+These instructions are for {% data variables.product.prodname_copilot_short %} on the {% data variables.product.github %} website. For instructions on different clients, click the appropriate tab at the top of this page.
 
 {% data reusables.copilot.model-picker-enable-alternative-models %}
 
@@ -88,7 +88,7 @@ For more information about these models, see:
 
 ## Changing your AI model
 
-These instructions are for {% data variables.product.prodname_vscode_shortname %}. For {% data variables.product.prodname_vs %} or for {% data variables.product.prodname_copilot_short %} on the {% data variables.product.github %} website, click the appropriate tab at the top of this page.
+These instructions are for {% data variables.product.prodname_vscode_shortname %}. For instructions on different clients, click the appropriate tab at the top of this page.
 
 {% data reusables.copilot.model-picker-enable-alternative-models %}
 
@@ -120,7 +120,7 @@ For more information about these models, see:
 
 ## Changing the AI model for {% data variables.product.prodname_copilot_chat_short %}
 
-These instructions are for {% data variables.product.prodname_vs %}. For {% data variables.product.prodname_vscode_shortname %} or for {% data variables.product.prodname_copilot_short %} on the {% data variables.product.github %} website, click the appropriate tab at the top of this page.
+These instructions are for {% data variables.product.prodname_vs %}. For instructions on different clients, click the appropriate tab at the top of this page.
 
 To use multi-model {% data variables.product.prodname_copilot_chat_short %}, you must use {% data variables.product.prodname_vs %} 2022 version 17.12 or later. See the [{% data variables.product.prodname_vs %} downloads page](https://visualstudio.microsoft.com/downloads/).
 
@@ -198,3 +198,38 @@ These instructions are for the Eclipse IDE. For instructions on different client
 1. In the bottom right of the chat panel, click the currently selected AI model, then select an alternative model from the popup menu.
 
 {% endeclipse %}
+
+{% xcode %}
+
+> [!NOTE] Multiple model support in {% data variables.product.prodname_copilot_chat_short %} is in {% data variables.release-phases.public_preview %} and is subject to change.
+
+## AI models for {% data variables.product.prodname_copilot_chat_short %}
+
+The following models are currently available through multi-model {% data variables.product.prodname_copilot_chat_short %}:
+
+* {% data reusables.copilot.model-description-gpt-4o %}
+* {% data reusables.copilot.model-description-claude-sonnet-35 %}
+* {% data reusables.copilot.model-description-o1 %}
+* {% data reusables.copilot.model-description-o3-mini %}
+* {% data reusables.copilot.model-description-gemini-flash %}
+
+For more information about these models, see:
+
+* **OpenAI's GPT-4o, o1, and o3-mini models**: [Models](https://platform.openai.com/docs/models) in the OpenAI Platform documentation.
+* **Anthropic's {% data variables.copilot.copilot_claude_sonnet %} model**: [AUTOTITLE](/copilot/using-github-copilot/ai-models/using-claude-sonnet-in-github-copilot).
+* **Google's {% data variables.copilot.copilot_gemini_flash %} model**: [AUTOTITLE](/copilot/using-github-copilot/ai-models/using-gemini-flash-in-github-copilot).
+
+## Changing the AI model for {% data variables.product.prodname_copilot_chat_short %}
+
+These instructions are for Xcode. For instructions on different clients, click the appropriate tab at the top of this page.
+
+To use multi-model {% data variables.product.prodname_copilot_chat_short %}, you must install the {% data variables.product.prodname_copilot %} for Xcode extension. See [AUTOTITLE](/copilot/configuring-github-copilot/installing-the-github-copilot-extension-in-your-environment).
+
+{% data reusables.copilot.model-picker-enable-alternative-models %}
+
+{% data reusables.copilot.chat-model-limitations-ide %}
+
+1. To open the chat view, click **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}** in the menu bar, then click **Open Chat**.
+1. In the bottom right of the chat view, select the **CURRENT-MODEL** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click the AI model of your choice.
+
+{% endxcode %}
diff --git a/content/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide.md b/content/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide.md
index c9c96a16c01d..1022ec8e33e1 100644
--- a/content/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide.md
+++ b/content/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide.md
@@ -366,8 +366,6 @@ To share feedback about {% data variables.product.prodname_copilot_chat_short %}
 
 {% xcode %}
 
-{% data reusables.copilot.xcode-chat-public-preview-note %}
-
 ## Prerequisites
 
 To use {% data variables.product.prodname_copilot %} for Xcode, you must install the {% data variables.product.prodname_copilot %} for Xcode extension. See [AUTOTITLE](/copilot/configuring-github-copilot/installing-the-github-copilot-extension-in-your-environment).
@@ -386,6 +384,10 @@ You can ask {% data variables.product.prodname_copilot_chat_short %} to give you
 
    The response often includes interactive elements. For example, the response may include buttons to copy or insert a code block.
 
+## AI models for {% data variables.product.prodname_copilot_chat_short %}
+
+{% data reusables.copilot.change-the-ai-model %}
+
 ## Using keywords in your prompt
 
 You can use special keywords to help {% data variables.product.prodname_copilot_short %} understand your prompt.
diff --git a/data/reusables/copilot/xcode-chat-public-preview-note.md b/data/reusables/copilot/xcode-chat-public-preview-note.md
deleted file mode 100644
index 33bf2df6c885..000000000000
--- a/data/reusables/copilot/xcode-chat-public-preview-note.md
+++ /dev/null
@@ -1 +0,0 @@
-> [!NOTE] {% data variables.product.prodname_copilot_chat_short %} in Xcode is in {% data variables.release-phases.public_preview %} and subject to change.

From 9804090a03cb01ae6b50b3ea236634c98bc9ff3f Mon Sep 17 00:00:00 2001
From: Ben Ahmady <32935794+subatoi@users.noreply.github.com>
Date: Wed, 12 Mar 2025 10:55:12 +0000
Subject: [PATCH 4/5] Replaces blank line (#54790)

---
 data/reusables/actions/actions-billing.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/data/reusables/actions/actions-billing.md b/data/reusables/actions/actions-billing.md
index 53f4784da0f3..384523c5a247 100644
--- a/data/reusables/actions/actions-billing.md
+++ b/data/reusables/actions/actions-billing.md
@@ -1,3 +1 @@
-{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. See [AUTOTITLE](/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories).
-
-For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits.
+{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. See [AUTOTITLE](/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job#standard-github-hosted-runners-for-public-repositories). For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits.

From f46a691d24bdd04c6ab3f1fb70f2f447b87c76f6 Mon Sep 17 00:00:00 2001
From: Kensuke Nagae <kyanny@github.com>
Date: Wed, 12 Mar 2025 20:02:54 +0900
Subject: [PATCH 5/5] Update GHES 3.13, 3.14, 3.15, 3.16 release notes
 (Elasticsearch data loss with `ghe-repl-teardown` | `ghe-repl-promote`)
 (#54639)

Co-authored-by: Sophie <29382425+sophietheking@users.noreply.github.com>
---
 data/release-notes/enterprise-server/3-13/0.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/10.yml          | 4 ++++
 data/release-notes/enterprise-server/3-13/11.yml          | 5 ++++-
 data/release-notes/enterprise-server/3-13/2.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/3.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/4.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/5.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/6.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/7.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/8.yml           | 4 ++++
 data/release-notes/enterprise-server/3-13/9.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/0.yml           | 6 +++++-
 data/release-notes/enterprise-server/3-14/1.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/2.yml           | 8 +++++---
 data/release-notes/enterprise-server/3-14/3.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/4.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/5.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/6.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/7.yml           | 4 ++++
 data/release-notes/enterprise-server/3-14/8.yml           | 5 ++++-
 data/release-notes/enterprise-server/3-15/0.yml           | 4 ++++
 data/release-notes/enterprise-server/3-15/1.yml           | 5 +++++
 data/release-notes/enterprise-server/3-15/2.yml           | 6 +++++-
 data/release-notes/enterprise-server/3-15/3.yml           | 5 ++++-
 data/release-notes/enterprise-server/3-16/0-rc1.yml       | 4 ++++
 .../release-notes/2025-03-03-elasticsearch-data-loss.md   | 6 ++++++
 26 files changed, 110 insertions(+), 8 deletions(-)
 create mode 100644 data/reusables/release-notes/2025-03-03-elasticsearch-data-loss.md

diff --git a/data/release-notes/enterprise-server/3-13/0.yml b/data/release-notes/enterprise-server/3-13/0.yml
index 74defca6f9e1..489169132b90 100644
--- a/data/release-notes/enterprise-server/3-13/0.yml
+++ b/data/release-notes/enterprise-server/3-13/0.yml
@@ -191,6 +191,10 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
 
   deprecations:
     # https://github.com/github/releases/issues/2732
diff --git a/data/release-notes/enterprise-server/3-13/10.yml b/data/release-notes/enterprise-server/3-13/10.yml
index 7b7e35c70756..615d201feec2 100644
--- a/data/release-notes/enterprise-server/3-13/10.yml
+++ b/data/release-notes/enterprise-server/3-13/10.yml
@@ -52,3 +52,7 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-13/11.yml b/data/release-notes/enterprise-server/3-13/11.yml
index ea3ee6816a69..31f057ed037b 100644
--- a/data/release-notes/enterprise-server/3-13/11.yml
+++ b/data/release-notes/enterprise-server/3-13/11.yml
@@ -62,7 +62,10 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-      
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
   errata:
     - |
       The warning and known issues section have been updated to accurately reflect that instances installed on GCP will face issues while hotpatching to 3.13.11. Previously, the warning and known issue indicated that customers would face issues either while upgrading or hotpatching to version 3.13.11. [Updated: 2025-03-11]
diff --git a/data/release-notes/enterprise-server/3-13/2.yml b/data/release-notes/enterprise-server/3-13/2.yml
index dbd75439599d..f0bbb53312c9 100644
--- a/data/release-notes/enterprise-server/3-13/2.yml
+++ b/data/release-notes/enterprise-server/3-13/2.yml
@@ -175,3 +175,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-13/3.yml b/data/release-notes/enterprise-server/3-13/3.yml
index 3805d45c79f3..5b6aef0e7f43 100644
--- a/data/release-notes/enterprise-server/3-13/3.yml
+++ b/data/release-notes/enterprise-server/3-13/3.yml
@@ -131,6 +131,10 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
 
   errata:
     - |
diff --git a/data/release-notes/enterprise-server/3-13/4.yml b/data/release-notes/enterprise-server/3-13/4.yml
index f2b3fdaf8508..dde7ff83c1b0 100644
--- a/data/release-notes/enterprise-server/3-13/4.yml
+++ b/data/release-notes/enterprise-server/3-13/4.yml
@@ -80,6 +80,10 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
 
   errata:
     - 'The [Known issues](/admin/release-notes#3.13.4-known-issues) section previously indicated that `Instance setup in AWS with IMDSv2 enforced fails if no public IP is present` is still an issue. The issue is resolved and is documented in the [Bug fixes](/admin/release-notes#3.13.4-bugs) section. [Updated: 2024-09-30]'
diff --git a/data/release-notes/enterprise-server/3-13/5.yml b/data/release-notes/enterprise-server/3-13/5.yml
index 211cd14ded1c..15e8a061fdc1 100644
--- a/data/release-notes/enterprise-server/3-13/5.yml
+++ b/data/release-notes/enterprise-server/3-13/5.yml
@@ -62,3 +62,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-13/6.yml b/data/release-notes/enterprise-server/3-13/6.yml
index f8771fac46fd..382c61393ce3 100644
--- a/data/release-notes/enterprise-server/3-13/6.yml
+++ b/data/release-notes/enterprise-server/3-13/6.yml
@@ -68,3 +68,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-13/7.yml b/data/release-notes/enterprise-server/3-13/7.yml
index a52abf8117bc..04f8a030635d 100644
--- a/data/release-notes/enterprise-server/3-13/7.yml
+++ b/data/release-notes/enterprise-server/3-13/7.yml
@@ -32,3 +32,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-13/8.yml b/data/release-notes/enterprise-server/3-13/8.yml
index 6cfc6f548505..b5e135b76694 100644
--- a/data/release-notes/enterprise-server/3-13/8.yml
+++ b/data/release-notes/enterprise-server/3-13/8.yml
@@ -33,3 +33,7 @@ sections:
       Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GitHub Enterprise Server instance would fail, reporting that MSSQL was not responding. The can be avoided by start MSSQL prior to stopping replication  `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-13/9.yml b/data/release-notes/enterprise-server/3-13/9.yml
index 7f9064cbcc91..9f0750be7b58 100644
--- a/data/release-notes/enterprise-server/3-13/9.yml
+++ b/data/release-notes/enterprise-server/3-13/9.yml
@@ -58,3 +58,7 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/0.yml b/data/release-notes/enterprise-server/3-14/0.yml
index e692862bef83..cff617ba77f5 100644
--- a/data/release-notes/enterprise-server/3-14/0.yml
+++ b/data/release-notes/enterprise-server/3-14/0.yml
@@ -221,13 +221,17 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
 
   deprecations:
     - |
       The Manage GHES API reached feature parity with the Management Console API in GHES 3.12. As a result, we will remove the Management Console API in GitHub Enterprise Server 3.15. For information about updating tooling that relies on the Management Console API, see [AUTOTITLE](/rest/enterprise-admin/management-console).
     - |
       Team discussions have been removed from {% data variables.product.prodname_ghe_server %}. The sunset of this feature was announced in 2023. See the [GitHub Blog post](https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/). [Updated: 2025-02-13]
-  
+
   errata:
     - |
       These release notes previously indicated as a known issue that on GitHub Enterprise Server 3.14.0 when log forwarding is enabled, some forwarded log entries may be duplicated.
diff --git a/data/release-notes/enterprise-server/3-14/1.yml b/data/release-notes/enterprise-server/3-14/1.yml
index 16b70ad83e07..899f09a893ec 100644
--- a/data/release-notes/enterprise-server/3-14/1.yml
+++ b/data/release-notes/enterprise-server/3-14/1.yml
@@ -80,3 +80,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/2.yml b/data/release-notes/enterprise-server/3-14/2.yml
index 34dfca1cfb67..7abd992dfb34 100644
--- a/data/release-notes/enterprise-server/3-14/2.yml
+++ b/data/release-notes/enterprise-server/3-14/2.yml
@@ -84,9 +84,11 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
-      
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
+
   deprecations:
     - |
       The option to "copy Storage settings from Actions" in the Management Console ("GitHub Packages" > "Packages Storage Settings") has been removed. [Updated: 2024-11-20]
-      
-  
diff --git a/data/release-notes/enterprise-server/3-14/3.yml b/data/release-notes/enterprise-server/3-14/3.yml
index 840cdbabe0b4..0787e9664f16 100644
--- a/data/release-notes/enterprise-server/3-14/3.yml
+++ b/data/release-notes/enterprise-server/3-14/3.yml
@@ -82,3 +82,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/4.yml b/data/release-notes/enterprise-server/3-14/4.yml
index b91671b89a8a..2183c8e52711 100644
--- a/data/release-notes/enterprise-server/3-14/4.yml
+++ b/data/release-notes/enterprise-server/3-14/4.yml
@@ -42,3 +42,7 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
       [Updated: 2024-11-29]
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/5.yml b/data/release-notes/enterprise-server/3-14/5.yml
index c2ed8b238ec3..394decab147f 100644
--- a/data/release-notes/enterprise-server/3-14/5.yml
+++ b/data/release-notes/enterprise-server/3-14/5.yml
@@ -43,3 +43,7 @@ sections:
       Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GitHub Enterprise Server instance would fail, reporting that MSSQL was not responding. The can be avoided by start MSSQL prior to stopping replication  `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/6.yml b/data/release-notes/enterprise-server/3-14/6.yml
index 8b17d6293d58..0213ad49f561 100644
--- a/data/release-notes/enterprise-server/3-14/6.yml
+++ b/data/release-notes/enterprise-server/3-14/6.yml
@@ -76,3 +76,7 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/7.yml b/data/release-notes/enterprise-server/3-14/7.yml
index aecbdeb98cf2..0ea38ba4dc0c 100644
--- a/data/release-notes/enterprise-server/3-14/7.yml
+++ b/data/release-notes/enterprise-server/3-14/7.yml
@@ -62,3 +62,7 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-14/8.yml b/data/release-notes/enterprise-server/3-14/8.yml
index 3bcb1b4358bc..e2fac4a0d24a 100644
--- a/data/release-notes/enterprise-server/3-14/8.yml
+++ b/data/release-notes/enterprise-server/3-14/8.yml
@@ -80,7 +80,10 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-  
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
   errata:
     - |
       The warning and known issues section have been updated to accurately reflect that instances installed on GCP will face issues while hotpatching to 3.14.8. Previously, the warning and known issue indicated that customers would face issues either while upgrading or hotpatching to version 3.14.8. [Updated: 2025-03-11]
diff --git a/data/release-notes/enterprise-server/3-15/0.yml b/data/release-notes/enterprise-server/3-15/0.yml
index 2ce7356d39dc..01365cd42dfb 100644
--- a/data/release-notes/enterprise-server/3-15/0.yml
+++ b/data/release-notes/enterprise-server/3-15/0.yml
@@ -203,6 +203,10 @@ sections:
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
     - |
       On Azure instances, a failed pre-upgrade check due to insufficient user disk size can result in the Management Console displaying an `Internal Server Error`. To restore access to the Management Console, run `sudo rm /var/log/preflight-check-report.json` to remove the file. If enabled, the `automatic update checks` need to be disabled from the Management Console until user disk size is increased to minimum 500 GB. To increase the user disk size, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/updating-the-virtual-machine-and-physical-resources/increasing-storage-capacity#increasing-the-data-partition-size).
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
 
   closing_down:
     # https://github.com/github/releases/issues/3525
diff --git a/data/release-notes/enterprise-server/3-15/1.yml b/data/release-notes/enterprise-server/3-15/1.yml
index db086103bf5f..13c0d25bf66a 100644
--- a/data/release-notes/enterprise-server/3-15/1.yml
+++ b/data/release-notes/enterprise-server/3-15/1.yml
@@ -90,6 +90,11 @@ sections:
       An organization-level code scanning configuration page is displayed on instances that do not use GitHub Advanced Security or code scanning.
     - |
       When initializing a new GHES cluster, nodes with the `consul-server` role should be added to the cluster before adding additional nodes. Adding all nodes simultaneously creates a race condition between nomad server registration and nomad client registration.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
+
   deprecations:
     # https://github.com/github/releases/issues/4037
     - heading: Upcoming deprecation of projects (classic)
diff --git a/data/release-notes/enterprise-server/3-15/2.yml b/data/release-notes/enterprise-server/3-15/2.yml
index 7b7575584e85..3ab49e6dd885 100644
--- a/data/release-notes/enterprise-server/3-15/2.yml
+++ b/data/release-notes/enterprise-server/3-15/2.yml
@@ -40,7 +40,7 @@ sections:
   closing_down:
     - |
       All users should be aware that GitHub Projects (classic) are closing down. They should migrate to new Projects powered by GitHub Issues. See [AUTOTITLE](/enterprise-server@3.15/issues/planning-and-tracking-with-projects/creating-projects/migrating-from-projects-classic).
-      
+
       GitHub Projects (classic) will be retired in GitHub Enterprise Server 3.17. For more information, see the [Projects (classic) sunset](https://github.blog/changelog/2024-05-23-sunset-notice-projects-classic/) blog post.
   known_issues:
     - |
@@ -77,3 +77,7 @@ sections:
       When initializing a new GHES cluster, nodes with the `consul-server` role should be added to the cluster before adding additional nodes. Adding all nodes simultaneously creates a race condition between nomad server registration and nomad client registration.
     - |
       Admins setting up cluster high availability (HA) may encounter a spokes error when running ghe-cluster-repl-status if a new organization and repositories are created before using the ghe-cluster-repl-bootstrap command. To avoid this issue, complete the cluster HA setup with ghe-cluster-repl-bootstrap before creating new organizations and repositories.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
diff --git a/data/release-notes/enterprise-server/3-15/3.yml b/data/release-notes/enterprise-server/3-15/3.yml
index e3fcfcf0e5f1..67b3b27491d1 100644
--- a/data/release-notes/enterprise-server/3-15/3.yml
+++ b/data/release-notes/enterprise-server/3-15/3.yml
@@ -88,7 +88,10 @@ sections:
       When initializing a new GHES cluster, nodes with the `consul-server` role should be added to the cluster before adding additional nodes. Adding all nodes simultaneously creates a race condition between nomad server registration and nomad client registration.
     - |
       Admins setting up cluster high availability (HA) may encounter a spokes error when running `ghe-cluster-repl-status` if a new organization and repositories are created before using the `ghe-cluster-repl-bootstrap` command. To avoid this issue, complete the cluster HA setup with `ghe-cluster-repl-bootstrap` before creating new organizations and repositories.
-  
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
   errata:
     - |
       The warning and known issues section have been updated to accurately reflect that instances installed on GCP will face issues while hotpatching to 3.15.3. Previously, the warning and known issue indicated that customers would face issues either while upgrading or hotpatching to version 3.15.3. [Updated: 2025-03-11]
diff --git a/data/release-notes/enterprise-server/3-16/0-rc1.yml b/data/release-notes/enterprise-server/3-16/0-rc1.yml
index a982351be9e7..cfdf64bab9be 100644
--- a/data/release-notes/enterprise-server/3-16/0-rc1.yml
+++ b/data/release-notes/enterprise-server/3-16/0-rc1.yml
@@ -236,6 +236,10 @@ sections:
       After a restore, existing outside collaborators cannot be added to repositories in a new organization. This issue can be resolved by running `/usr/local/share/enterprise/ghe-es-search-repair` on the appliance.
     - |
       After a geo-replica is promoted to primary by running `ghe-repl-promote`, the actions workflow of a repository does not have any suggested workflows.
+    - |
+      {% data reusables.release-notes.2025-03-03-elasticsearch-data-loss %}
+
+      [Updated: 2025-03-12]
 
   closing_down:
     # https://github.com/github/releases/issues/4683
diff --git a/data/reusables/release-notes/2025-03-03-elasticsearch-data-loss.md b/data/reusables/release-notes/2025-03-03-elasticsearch-data-loss.md
new file mode 100644
index 000000000000..688b7fc33a76
--- /dev/null
+++ b/data/reusables/release-notes/2025-03-03-elasticsearch-data-loss.md
@@ -0,0 +1,6 @@
+For appliances in a high availability configuration, Elasticsearch indices are deleted in two situations:
+
+* On failover
+* When running `ghe-repl-teardown <REPLICA_HOSTNAME>` from the primary instance
+
+All indices are recoverable, except for Audit Log indices. Since Elasticsearch itself is the source of truth for these logs, they may only be recoverable from a backup. If you need assistance, visit {% data variables.contact.contact_ent_support %}.