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>

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: '*'

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

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

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:

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

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

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

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

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

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: '*'

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: '*'

data/reusables/dependabot/github-presets-availability.md

@@ -0,0 +1 @@
+**{% data variables.dependabot.github_presets %}** are available for all repository types.

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:
 
-* 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 %}
 
-{% elsif ghes %}
-Organization-owned repositories with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
+{%- 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_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 %}

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 %}

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 %}

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 %}  

data/reusables/gated-features/dependency-review.md

@@ -1,10 +1,12 @@
-{% ifversion fpt or ghec %}
 Dependency review 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 %}{% endif %}
+
+{%- ifversion 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{% 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_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}

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 %}

data/reusables/gated-features/ghas.md

@@ -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 %}

data/reusables/gated-features/partner-pattern-validity-check-ghas.md

@@ -1,7 +1,10 @@
+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 %}
+
 {% 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 %}.
+* 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 %}
 
-{% 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 %}.
-
-{% 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 %}

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 %}

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 %}

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 %}

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 %}
+{%- 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 %}

data/reusables/gated-features/security-campaigns.md

@@ -1,7 +1,8 @@
+{% 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 %}
+
 {% 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
+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 %}
 
-{% elsif ghes %}
-Organizations with [{% data variables.product.prodname_GH_advanced_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled
-
-{% endif %}
+{% ifversion ghes %}
+Organizations with [{% data variables.product.prodname_GH_code_security %}](/get-started/learning-about-github/about-github-advanced-security) enabled{% endif %}

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 %}

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 %}