Merge branch 'main' into repo-sync

Author: Octomerger

assets/images/help/organizations/enterprise-cloud-trial-option.png

@@ -15,7 +15,9 @@ versions:
 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 %}
-Environment protection rules and environment secrets are only available on public repositories and private repositories on an enterprise plan. If you convert a repository from public to private on a non-enterprise plan, 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.
+Environment protection rules and environment secrets are only available on private repositories with {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
+
+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.
 {% endif %}
 
 ### Environment protection rules

assets/images/help/organizations/start-a-free-trial-button.png

@@ -7,6 +7,8 @@ versions:
 
 This guide will walk you through setting up, configuring and managing your {% data variables.product.prodname_ghe_cloud %} account as an organization or enterprise owner.
 
+{% data reusables.enterprise.ghec-cta-button %}
+
 ## Part 1: Choosing your account type
 
 {% data variables.product.prodname_dotcom %} provides two types of Enterprise products:

content/actions/reference/environments.md

@@ -12,37 +12,38 @@ topics:
   - Accounts
 shortTitle: Enterprise Cloud trial
 ---
+
+{% data reusables.enterprise.ghec-cta-button %}
+
+
+## About {% data variables.product.prodname_ghe_cloud %}
+
+{% data reusables.organizations.about-organizations %}
+
+You can use organizations for free with {% data variables.product.prodname_free_team %}, which includes limited features. For additional features, such as SAML single sign-on (SSO), access control for {% data variables.product.prodname_pages %}, and included {% data variables.product.prodname_actions %} minutes, you can upgrade to {% data variables.product.prodname_ghe_cloud %}. For a detailed list of the features available with {% data variables.product.prodname_ghe_cloud %}, see our [Pricing](https://github.com/pricing) page.
+
+{% data reusables.saml.saml-accounts %} For more information, see "<a href="/organizations/managing-saml-single-sign-on-for-your-organization/about-identity-and-access-management-with-saml-single-sign-on" class="dotcom-only">About identity and access management with SAML single sign-on</a>."
+
+{% data reusables.products.which-product-to-use %}
+
 ## About trials of {% data variables.product.prodname_ghe_cloud %}
 
-You can set up a 14-day trial to evaluate {% data variables.product.prodname_ghe_cloud %} on a new organization account. You do not need to provide a payment method during the trial unless you add {% data variables.product.prodname_marketplace %} apps to your organization that require a payment method. For more information, see "<a href="/articles/about-billing-for-github-marketplace/" class="dotcom-only">About billing for {% data variables.product.prodname_marketplace %}</a>."
+You can set up a 14-day trial to evaluate {% data variables.product.prodname_ghe_cloud %}. You do not need to provide a payment method during the trial unless you add {% data variables.product.prodname_marketplace %} apps to your organization that require a payment method. For more information, see "<a href="/articles/about-billing-for-github-marketplace/" class="dotcom-only">About billing for {% data variables.product.prodname_marketplace %}</a>."
 
 Your trial includes 50 seats. If you need more seats to evaluate {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. At the end of the trial, you can choose a different number of seats.
 
 Trials are also available for {% data variables.product.prodname_ghe_server %}. For more information, see "[Setting up a trial of {% data variables.product.prodname_ghe_server %}](/articles/setting-up-a-trial-of-github-enterprise-server)."
 
-{% data reusables.products.which-product-to-use %}
-
 ## Setting up your trial of {% data variables.product.prodname_ghe_cloud %}
 
-Before you can start your trial of {% data variables.product.prodname_ghe_cloud %}, you must have an existing user account or create a new user account. For more information, see "<a href="/articles/signing-up-for-a-new-github-account" class="dotcom-only">Signing up for a new {% data variables.product.prodname_dotcom %} account</a>."
-
-{% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.organizations %}
-{% data reusables.organizations.new-organization %}
-4. Under "Enterprise", click **Start your 14-day free trial**.
-  ![Button to start your trial](/assets/images/help/organizations/start-trial-button.png)
-5. Type your company name.
-  ![Company name field](/assets/images/help/organizations/company-name-field.png)
-{% data reusables.organizations.organization-name %}
-7. Under "Full name", type your full name.
-  ![Full name field](/assets/images/help/organizations/full-name-field.png)
-8. Under "Work email", type the email address you use for work.
-  ![Work email field](/assets/images/help/organizations/work-email-field.png)
-8. Use the **Industry** drop-down menu, and select the industry your company is in.
-  ![Industry drop-down menu](/assets/images/help/organizations/industry-drop-down.png)
-9. Use the **Number of employees** drop-down menu, and select the number of employees at your company.
- ![Number of employees drop-down menu](/assets/images/help/organizations/employees-drop-down.png)
-10. Review the <a href="/articles/github-enterprise-cloud-evaluation-agreement" class="dotcom-only">Evaluation License Agreement</a>, then click **Next**.
+Before you can try {% data variables.product.prodname_ghe_cloud %}, you must be signed into a user account. If you don't already have a user account on {% data variables.product.prodname_dotcom_the_website %}, you must create one. For more information, see "<a href="/articles/signing-up-for-a-new-github-account" class="dotcom-only">Signing up for a new {% data variables.product.prodname_dotcom %} account</a>."
+
+1. Navigate to [{% data variables.product.prodname_dotcom %} for enterprises](https://github.com/enterprise).
+1. Click **Start a free trial**.
+   !["Start a free trial" button](/assets/images/help/organizations/start-a-free-trial-button.png)
+1. Click **Enterprise Cloud**.
+   !["Enterprise Cloud" button](/assets/images/help/organizations/enterprise-cloud-trial-option.png)
+1. Follow the prompts to configure your trial.
 
 ## Exploring {% data variables.product.prodname_ghe_cloud %}
 
@@ -58,14 +59,9 @@ If you don't purchase {% data variables.product.prodname_enterprise %} or {% dat
 
 Downgrading to {% data variables.product.prodname_free_team %} for organizations also disables any SAML settings configured during the trial period. Once you purchase {% data variables.product.prodname_enterprise %} or {% data variables.product.prodname_team %}, your SAML settings will be enabled again for users in your organization to authenticate.
 
-
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.billing_plans %}
 5. Under "{% data variables.product.prodname_ghe_cloud %} Free Trial", click **Buy Enterprise** or **Downgrade to Team**.
   ![Buy Enterprise and Downgrade to Team buttons](/assets/images/help/organizations/finish-trial-buttons.png)
 6. Follow the prompts to enter your payment method, then click **Submit**.
-
-## Further reading
-
-- "[Setting up a trial of {% data variables.product.prodname_ghe_server %}](/articles/setting-up-a-trial-of-github-enterprise-server)"

content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md

@@ -13,6 +13,8 @@ topics:
   - Teams
 ---
 
+{% data reusables.organizations.about-organizations %}
+
 {% data reusables.organizations.organizations_include %}
 
 {% ifversion fpt %}

content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -120,6 +120,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 the REST API{% endif %}.
 
 {% ifversion fpt %}
+The audit log API requires {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
 
 ### Using the GraphQL API
 

content/organizations/collaborating-with-groups-in-organizations/about-organizations.md

@@ -14,6 +14,8 @@ topics:
 shortTitle: Add outside collaborator
 ---
 
+## About outside collaborators
+
 {% data reusables.organizations.owners-and-admins-can %} add outside collaborators to a repository, unless an organization owner has restricted the ability to invite collaborators. For more information, see "[Setting permissions for adding outside collaborators](/articles/setting-permissions-for-adding-outside-collaborators)."
 
 {% data reusables.organizations.outside-collaborators-use-seats %}
@@ -24,6 +26,12 @@ If your organization [requires members and outside collaborators to use two-fact
 
 {% data reusables.organizations.outside_collaborator_forks %}
 
+{% 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 %}
+
+## Adding outside collaborators to a repository
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% ifversion fpt %}
@@ -40,9 +48,4 @@ If your organization [requires members and outside collaborators to use two-fact
 ![The Collaborators section with the Octocat's username entered in the search field](/assets/images/help/repository/org-repo-collaborators-find-name.png)
 7. Next to the new collaborator's name, choose the appropriate permission level: *Write*, *Read*, or *Admin*.
 ![The repository permissions picker](/assets/images/help/repository/org-repo-collaborators-choose-permissions.png)
-{% endif %}
-
-## Further reading
-
-- "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)"
-- "[Removing an outside collaborator from an organization repository](/articles/removing-an-outside-collaborator-from-an-organization-repository)"
+{% endif %}

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

@@ -14,9 +14,9 @@ topics:
   - Organizations
   - Teams
 shortTitle: Repository permissions
----
+permissions: People with admin permissions can manage individual and team access to an organization-owned repository.
 
-People with admin permissions can manage individual and team access to an organization-owned repository.
+---
 
 ## Permission levels for repositories owned by an organization
 
@@ -29,12 +29,6 @@ From least access to most access, the permission levels for an organization repo
 - **Maintain**: Recommended for project managers who need to manage the repository without access to sensitive or destructive actions
 - **Admin**: Recommended for people who need full access to the project, including sensitive and destructive actions like managing security or deleting a repository
 
-{% ifversion fpt %}
-
-{% endif %}
-
-For more information about giving people and teams access to repositories, see "[Managing access to your organization's repositories](/articles/managing-access-to-your-organizations-repositories)."
-
 Organization owners can set base permissions that apply to all members of an organization when accessing any of the organization's repositories. For more information, see "[Setting base permissions for an organization](/organizations/managing-access-to-your-organizations-repositories/setting-base-permissions-for-an-organization#setting-base-permissions)."
 
 Organization owners can also choose to further limit access to certain settings and actions across the organization. For more information on options for specific settings, see "[Managing organization settings](/articles/managing-organization-settings)."
@@ -48,6 +42,11 @@ In addition to managing organization-level settings, organization owners have ad
 {% endwarning %}
 
 ## Repository access for each permission level
+
+{% 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 %}
+
 {% ifversion fpt or ghes > 2.21 %}
 {% note %}
 

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

@@ -27,7 +27,7 @@ If your organization is owned by an enterprise account, a "Verified" badge will
 
 {% data reusables.organizations.verified-domains-details %}
 
-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)."
+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 %}
 
 ## About domain approval
 

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

@@ -25,6 +25,10 @@ Organization members can have *owner*{% ifversion fpt %}, *billing manager*,{% e
 {% endif %}
 - **Members** are the default role for everyone else.
 
+{% 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 %}
+
 {% ifversion fpt %}
 <!--Dotcom version has extra column for Billing managers-->
 

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

@@ -17,10 +17,12 @@ shortTitle: IAM with SAML SSO
 
 {% data reusables.saml.dotcom-saml-explanation %}
 
-After you configure SAML SSO, members of your {% data variables.product.prodname_dotcom %} organization will continue to log into their user accounts on {% data variables.product.prodname_dotcom %}. When a member accesses resources within your organization that uses SAML SSO, {% data variables.product.prodname_dotcom %} redirects the member to your IdP to authenticate. After successful authentication, your IdP redirects the member back to {% data variables.product.prodname_dotcom %}, where the member can access your organization's resources.
+{% data reusables.saml.saml-accounts %}
 
 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 "[Enforcing SAML single sign-on for organizations in your enterprise account](/github/setting-up-and-managing-your-enterprise/configuring-identity-and-access-management-for-your-enterprise-account/enforcing-saml-single-sign-on-for-organizations-in-your-enterprise-account)."
 
+{% data reusables.saml.saml-requires-ghec %} {% data reusables.enterprise.link-to-ghec-trial %}
+
 {% data reusables.saml.outside-collaborators-exemption %}
 
 Before enabling SAML SSO for your organization, you'll need to connect your IdP to your organization. For more information, see "[Connecting your identity provider to your organization](/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization)."

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

@@ -13,13 +13,19 @@ topics:
 shortTitle: Enable & test SAML SSO
 ---
 
+## About SAML single sign-on
+
 You can enable SAML SSO in your organization without requiring all members to use it. Enabling but not enforcing SAML SSO in your organization can help smooth your organization's SAML SSO adoption. Once a majority of your organization's members use SAML SSO, you can enforce it within your organization.
 
 If you enable but don't enforce SAML SSO, organization members who choose not to use SAML SSO can still be members of the organization. For more information on enforcing SAML SSO, see "[Enforcing SAML single sign-on for your organization](/articles/enforcing-saml-single-sign-on-for-your-organization)."
 
 {% data reusables.saml.outside-collaborators-exemption %}
 
-Prior to enforcing 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)."
+## Enabling and testing SAML single sign-on for your organization
+
+{% data reusables.saml.saml-requires-ghec %} {% data reusables.enterprise.link-to-ghec-trial %}
+
+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)."
 
 For more information about the identity providers (IdPs) that {% data variables.product.company_short %} supports for SAML SSO, see "[Connecting your identity provider to your organization](/organizations/managing-saml-single-sign-on-for-your-organization/connecting-your-identity-provider-to-your-organization)."
 

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

@@ -12,16 +12,19 @@ topics:
   - Organizations
   - Teams
 shortTitle: Code review assignment
+permissions: Team maintainers and organization owners can configure code review assignments.
 ---
 
-Team maintainers and organization owners can configure code review assignments.
-
 ## About code review assignments
 
 By using code review assignments, any time your team has been requested to review a pull request, the team is removed as a reviewer and a specified subset of team members are assigned in the team's place. Code review assignments allow you to decide whether the whole team or just a subset of team members are notified when a team is requested for review.
 
 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 %}
+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 %}
+
 ## Routing algorithms
 
 Code review assignments automatically choose and assign reviewers based on one of two possible algorithms. 

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

@@ -13,6 +13,8 @@ topics:
 shortTitle: OAuth App access
 ---
 
+## About OAuth App access restrictions
+
 When {% data variables.product.prodname_oauth_app %} access restrictions are enabled, organization members cannot authorize {% data variables.product.prodname_oauth_app %} access to organization resources. Organization members can request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use, and organization owners receive a notification of pending requests.
 
 {% data reusables.organizations.oauth_app_restrictions_default %}
@@ -23,6 +25,8 @@ When {% data variables.product.prodname_oauth_app %} access restrictions are ena
 
 {% endtip %}
 
+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 %}
+
 ## Setting up {% data variables.product.prodname_oauth_app %} access restrictions
 
 When an organization owner sets up {% data variables.product.prodname_oauth_app %} access restrictions for the first time: