Skip to content

Commit 90e621d

Browse files
authored
Merge branch 'main' into repo-sync
2 parents c23b4b5 + 3c6a72f commit 90e621d

File tree

23 files changed

+88
-54
lines changed

23 files changed

+88
-54
lines changed
Loading
Loading

content/actions/reference/environments.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ versions:
1515
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.
1616

1717
{% ifversion fpt %}
18-
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.
18+
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 %}
19+
20+
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.
1921
{% endif %}
2022

2123
### Environment protection rules

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ versions:
77

88
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.
99

10+
{% data reusables.enterprise.ghec-cta-button %}
11+
1012
## Part 1: Choosing your account type
1113

1214
{% data variables.product.prodname_dotcom %} provides two types of Enterprise products:

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

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,38 @@ topics:
1212
- Accounts
1313
shortTitle: Enterprise Cloud trial
1414
---
15+
16+
{% data reusables.enterprise.ghec-cta-button %}
17+
18+
19+
## About {% data variables.product.prodname_ghe_cloud %}
20+
21+
{% data reusables.organizations.about-organizations %}
22+
23+
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.
24+
25+
{% 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>."
26+
27+
{% data reusables.products.which-product-to-use %}
28+
1529
## About trials of {% data variables.product.prodname_ghe_cloud %}
1630

17-
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>."
31+
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>."
1832

1933
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.
2034

2135
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)."
2236

23-
{% data reusables.products.which-product-to-use %}
24-
2537
## Setting up your trial of {% data variables.product.prodname_ghe_cloud %}
2638

27-
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>."
28-
29-
{% data reusables.user_settings.access_settings %}
30-
{% data reusables.user_settings.organizations %}
31-
{% data reusables.organizations.new-organization %}
32-
4. Under "Enterprise", click **Start your 14-day free trial**.
33-
![Button to start your trial](/assets/images/help/organizations/start-trial-button.png)
34-
5. Type your company name.
35-
![Company name field](/assets/images/help/organizations/company-name-field.png)
36-
{% data reusables.organizations.organization-name %}
37-
7. Under "Full name", type your full name.
38-
![Full name field](/assets/images/help/organizations/full-name-field.png)
39-
8. Under "Work email", type the email address you use for work.
40-
![Work email field](/assets/images/help/organizations/work-email-field.png)
41-
8. Use the **Industry** drop-down menu, and select the industry your company is in.
42-
![Industry drop-down menu](/assets/images/help/organizations/industry-drop-down.png)
43-
9. Use the **Number of employees** drop-down menu, and select the number of employees at your company.
44-
![Number of employees drop-down menu](/assets/images/help/organizations/employees-drop-down.png)
45-
10. Review the <a href="/articles/github-enterprise-cloud-evaluation-agreement" class="dotcom-only">Evaluation License Agreement</a>, then click **Next**.
39+
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>."
40+
41+
1. Navigate to [{% data variables.product.prodname_dotcom %} for enterprises](https://github.com/enterprise).
42+
1. Click **Start a free trial**.
43+
!["Start a free trial" button](/assets/images/help/organizations/start-a-free-trial-button.png)
44+
1. Click **Enterprise Cloud**.
45+
!["Enterprise Cloud" button](/assets/images/help/organizations/enterprise-cloud-trial-option.png)
46+
1. Follow the prompts to configure your trial.
4647

4748
## Exploring {% data variables.product.prodname_ghe_cloud %}
4849

@@ -58,14 +59,9 @@ If you don't purchase {% data variables.product.prodname_enterprise %} or {% dat
5859

5960
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.
6061

61-
6262
{% data reusables.profile.access_org %}
6363
{% data reusables.profile.org_settings %}
6464
{% data reusables.organizations.billing_plans %}
6565
5. Under "{% data variables.product.prodname_ghe_cloud %} Free Trial", click **Buy Enterprise** or **Downgrade to Team**.
6666
![Buy Enterprise and Downgrade to Team buttons](/assets/images/help/organizations/finish-trial-buttons.png)
6767
6. Follow the prompts to enter your payment method, then click **Submit**.
68-
69-
## Further reading
70-
71-
- "[Setting up a trial of {% data variables.product.prodname_ghe_server %}](/articles/setting-up-a-trial-of-github-enterprise-server)"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ topics:
1313
- Teams
1414
---
1515

16+
{% data reusables.organizations.about-organizations %}
17+
1618
{% data reusables.organizations.organizations_include %}
1719

1820
{% ifversion fpt %}

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

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

122122
{% ifversion fpt %}
123+
The audit log API requires {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
123124

124125
### Using the GraphQL API
125126

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ topics:
1414
shortTitle: Add outside collaborator
1515
---
1616

17+
## About outside collaborators
18+
1719
{% 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)."
1820

1921
{% data reusables.organizations.outside-collaborators-use-seats %}
@@ -24,6 +26,12 @@ If your organization [requires members and outside collaborators to use two-fact
2426

2527
{% data reusables.organizations.outside_collaborator_forks %}
2628

29+
{% ifversion fpt %}
30+
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 %}
31+
{% endif %}
32+
33+
## Adding outside collaborators to a repository
34+
2735
{% data reusables.repositories.navigate-to-repo %}
2836
{% data reusables.repositories.sidebar-settings %}
2937
{% ifversion fpt %}
@@ -40,9 +48,4 @@ If your organization [requires members and outside collaborators to use two-fact
4048
![The Collaborators section with the Octocat's username entered in the search field](/assets/images/help/repository/org-repo-collaborators-find-name.png)
4149
7. Next to the new collaborator's name, choose the appropriate permission level: *Write*, *Read*, or *Admin*.
4250
![The repository permissions picker](/assets/images/help/repository/org-repo-collaborators-choose-permissions.png)
43-
{% endif %}
44-
45-
## Further reading
46-
47-
- "[Converting an organization member to an outside collaborator](/articles/converting-an-organization-member-to-an-outside-collaborator)"
48-
- "[Removing an outside collaborator from an organization repository](/articles/removing-an-outside-collaborator-from-an-organization-repository)"
51+
{% endif %}

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ topics:
1414
- Organizations
1515
- Teams
1616
shortTitle: Repository permissions
17-
---
17+
permissions: People with admin permissions can manage individual and team access to an organization-owned repository.
1818

19-
People with admin permissions can manage individual and team access to an organization-owned repository.
19+
---
2020

2121
## Permission levels for repositories owned by an organization
2222

@@ -29,12 +29,6 @@ From least access to most access, the permission levels for an organization repo
2929
- **Maintain**: Recommended for project managers who need to manage the repository without access to sensitive or destructive actions
3030
- **Admin**: Recommended for people who need full access to the project, including sensitive and destructive actions like managing security or deleting a repository
3131

32-
{% ifversion fpt %}
33-
34-
{% endif %}
35-
36-
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)."
37-
3832
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)."
3933

4034
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
4842
{% endwarning %}
4943

5044
## Repository access for each permission level
45+
46+
{% ifversion fpt %}
47+
Some of the features listed below are limited to organizations using {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
48+
{% endif %}
49+
5150
{% ifversion fpt or ghes > 2.21 %}
5251
{% note %}
5352

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
@@ -27,7 +27,7 @@ If your organization is owned by an enterprise account, a "Verified" badge will
2727

2828
{% data reusables.organizations.verified-domains-details %}
2929

30-
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)."
30+
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 %}
3131

3232
## About domain approval
3333

0 commit comments

Comments
 (0)