Merge branch 'main' into repo-sync

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

@@ -22,7 +22,7 @@ Environments are used to describe a general deployment target like `production`,
 
 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.
 
-{% ifversion fpt or ghec %}
+{% ifversion fpt %}
 {% note %}
 
 **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

@@ -123,7 +123,7 @@ Using the qualifier `country`, you can filter events in the audit log based on t
 You can interact with the audit log using the GraphQL API{% ifversion fpt or ghec %} or the REST API{% endif %}.
 
 {% ifversion fpt or ghec %}
-The audit log API requires {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
+The audit log API requires {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
 
 ### Using the GraphQL API
 

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

@@ -27,7 +27,7 @@ If your organization [requires members and outside collaborators to use two-fact
 
 {% data reusables.organizations.outside_collaborator_forks %}
 
-{% ifversion fpt or ghec %}
+{% ifversion fpt %}
 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 %}
 {% endif %}
 

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

@@ -43,7 +43,7 @@ In addition to managing organization-level settings, organization owners have ad
 
 ## Repository access for each permission level
 
-{% ifversion fpt or ghec %}
+{% ifversion fpt %}
 Some of the features listed below are limited to organizations using {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
 {% endif %}
 

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

@@ -29,7 +29,7 @@ After verifying ownership of your organization's domains, a "Verified" badge wil
 
 {% data reusables.organizations.verified-domains-details %}
 
-{% 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 %}
+{% 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 %}
 
 ## About domain approval
 

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

@@ -26,7 +26,7 @@ Organization members can have *owner*{% ifversion fpt or ghec %}, *billing manag
 {% endif %}
 - **Members** are the default role for everyone else.
 
-{% ifversion fpt or ghec %}
+{% ifversion fpt %}
 Some of the features listed below are limited to organizations using {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
 {% endif %}
 

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

@@ -24,7 +24,7 @@ shortTitle: IAM with SAML SSO
 
 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)."
 
-{% data reusables.saml.saml-requires-ghec %} {% data reusables.enterprise.link-to-ghec-trial %}
+{% data reusables.saml.saml-requires-ghec %}{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
 
 {% data reusables.saml.outside-collaborators-exemption %}
 

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

@@ -24,7 +24,7 @@ If you enable but don't enforce SAML SSO, organization members who choose not to
 
 ## Enabling and testing SAML single sign-on for your organization
 
-{% data reusables.saml.saml-requires-ghec %} {% data reusables.enterprise.link-to-ghec-trial %}
+{% data reusables.saml.saml-requires-ghec %}{% ifversion fpt %} {% data reusables.enterprise.link-to-ghec-trial %}{% endif %}
 
 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)."
 

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

@@ -22,7 +22,7 @@ By using code review assignments, any time your team has been requested to revie
 
 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)."
 
-{% ifversion fpt or ghec %}
+{% ifversion fpt %}
 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 %}
 {% endif %}
 

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

@@ -26,7 +26,9 @@ When {% data variables.product.prodname_oauth_app %} access restrictions are ena
 
 {% endtip %}
 
+{% ifversion fpt %}
 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 %}
+{% endif %}
 
 ## Setting up {% data variables.product.prodname_oauth_app %} access restrictions
 

data/reusables/gated-features/private-pages.md

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

@@ -12,5 +12,7 @@ For additional features, including sophisticated user authentication and managem
 
 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 %}
 
+{% ifversion fpt %}
 {% data reusables.enterprise.link-to-ghec-trial %}
 {% endif %}
+{% endif %}