Skip to content

Commit 851e3fe

Browse files
authored
Do not mention trial in GHEC case (#22250)
1 parent 05196f8 commit 851e3fe

File tree

12 files changed

+14
-10
lines changed

12 files changed

+14
-10
lines changed

content/actions/deployment/using-environments-for-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Environments are used to describe a general deployment target like `production`,
2222

2323
You can configure environments with protection rules and secrets. When a workflow job references an environment, the job won't start until all of the environment's protection rules pass. A job also cannot access secrets that are defined in an environment until all the environment protection rules pass.
2424

25-
{% ifversion fpt or ghec %}
25+
{% ifversion fpt %}
2626
{% note %}
2727

2828
**Note:** If you don't use {% data variables.product.prodname_ghe_cloud %} and convert a repository from public to private, any configured protection rules or environment secrets will be ignored, and you will not be able to configure any environments. If you convert your repository back to public, you will have access to any previously configured protection rules and environment secrets. {% data reusables.enterprise.link-to-ghec-trial %}

content/organizations/keeping-your-organization-secure/reviewing-the-audit-log-for-your-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Using the qualifier `country`, you can filter events in the audit log based on t
123123
You can interact with the audit log using the GraphQL API{% ifversion fpt or ghec %} or the REST API{% endif %}.
124124

125125
{% ifversion fpt or ghec %}
126-
The audit log API requires {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
126+
The audit log API requires {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
127127

128128
### Using the GraphQL API
129129

content/organizations/managing-access-to-your-organizations-repositories/adding-outside-collaborators-to-repositories-in-your-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If your organization [requires members and outside collaborators to use two-fact
2727

2828
{% data reusables.organizations.outside_collaborator_forks %}
2929

30-
{% ifversion fpt or ghec %}
30+
{% ifversion fpt %}
3131
To further support your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}
3232
{% endif %}
3333

content/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ In addition to managing organization-level settings, organization owners have ad
4343

4444
## Repository access for each permission level
4545

46-
{% ifversion fpt or ghec %}
46+
{% ifversion fpt %}
4747
Some of the features listed below are limited to organizations using {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
4848
{% endif %}
4949

content/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ After verifying ownership of your organization's domains, a "Verified" badge wil
2929

3030
{% data reusables.organizations.verified-domains-details %}
3131

32-
{% ifversion fpt or ghec %}On {% data variables.product.prodname_ghe_cloud %}, after verifying ownership of your organization's domain, you can restrict email notifications for the organization to that domain. For more information, see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)." {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
32+
{% ifversion fpt or ghec %}On {% data variables.product.prodname_ghe_cloud %}, after verifying ownership of your organization's domain, you can restrict email notifications for the organization to that domain. For more information, see "[Restricting email notifications for your organization](/organizations/keeping-your-organization-secure/restricting-email-notifications-for-your-organization)." {% ifversion fpt %}{% data reusables.enterprise.link-to-ghec-trial %}{% endif %}{% endif %}
3333

3434
## About domain approval
3535

content/organizations/managing-peoples-access-to-your-organization-with-roles/permission-levels-for-an-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Organization members can have *owner*{% ifversion fpt or ghec %}, *billing manag
2626
{% endif %}
2727
- **Members** are the default role for everyone else.
2828

29-
{% ifversion fpt or ghec %}
29+
{% ifversion fpt %}
3030
Some of the features listed below are limited to organizations using {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
3131
{% endif %}
3232

content/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ shortTitle: IAM with SAML SSO
2424

2525
Organization owners can enforce SAML SSO for an individual organization, or enterprise owners can enforce SAML SSO for all organizations in an enterprise account. For more information, see "[Configuring SAML single sign-on for your enterprise](/enterprise-cloud@latest/admin/authentication/managing-identity-and-access-for-your-enterprise/configuring-saml-single-sign-on-for-your-enterprise)."
2626

27-
{% data reusables.saml.saml-requires-ghec %} {% data reusables.enterprise.link-to-ghec-trial %}
27+
{% data reusables.saml.saml-requires-ghec %}{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
2828

2929
{% data reusables.saml.outside-collaborators-exemption %}
3030

content/organizations/managing-saml-single-sign-on-for-your-organization/enabling-and-testing-saml-single-sign-on-for-your-organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you enable but don't enforce SAML SSO, organization members who choose not to
2424

2525
## Enabling and testing SAML single sign-on for your organization
2626

27-
{% data reusables.saml.saml-requires-ghec %} {% data reusables.enterprise.link-to-ghec-trial %}
27+
{% data reusables.saml.saml-requires-ghec %}{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
2828

2929
Before your enforce SAML SSO in your organization, ensure that you've prepared the organization. For more information, see "[Preparing to enforce SAML single sign-on in your organization](/articles/preparing-to-enforce-saml-single-sign-on-in-your-organization)."
3030

content/organizations/organizing-members-into-teams/managing-code-review-assignment-for-your-team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ By using code review assignments, any time your team has been requested to revie
2222

2323
When code owners are automatically requested for review, the team is still removed and replaced with individuals. The individual approvals don't satisfy the requirement for code owner approval in a protected branch. For more information, see "[About code owners](/github/creating-cloning-and-archiving-repositories/about-code-owners)."
2424

25-
{% ifversion fpt or ghec %}
25+
{% ifversion fpt %}
2626
To further enhance your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like protected branches and code owners on private repositories. {% data reusables.enterprise.link-to-ghec-trial %}
2727
{% endif %}
2828

content/organizations/restricting-access-to-your-organizations-data/about-oauth-app-access-restrictions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ When {% data variables.product.prodname_oauth_app %} access restrictions are ena
2626

2727
{% endtip %}
2828

29+
{% ifversion fpt %}
2930
To further protect your organization's resources, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes security features like SAML single sign-on. {% data reusables.enterprise.link-to-ghec-trial %}
31+
{% endif %}
3032

3133
## Setting up {% data variables.product.prodname_oauth_app %} access restrictions
3234

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Access control for {% data variables.product.prodname_pages %} sites is available in private repositories with {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
1+
Access control for {% data variables.product.prodname_pages %} sites is available in private repositories with {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}

data/reusables/organizations/organizations_include.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ For additional features, including sophisticated user authentication and managem
1212

1313
If you use {% data variables.product.prodname_ghe_cloud %}, you have the option to purchase a license for {% data variables.product.prodname_GH_advanced_security %} and use the features on private repositories. {% data reusables.advanced-security.more-info-ghas %}
1414

15+
{% ifversion fpt %}
1516
{% data reusables.enterprise.link-to-ghec-trial %}
1617
{% endif %}
18+
{% endif %}

0 commit comments

Comments
 (0)