Skip to content

Commit be9d282

Browse files
lecoursengithub-actionsvgrl
authored
GHEC trial with enterprise account (#29525)
Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Vanessa <vgrl@github.com>
1 parent f4ade34 commit be9d282

File tree

42 files changed

+416
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+416
-189
lines changed
Loading
Loading
74.6 KB
Loading
Loading
Binary file not shown.
Loading

content/admin/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ redirect_from:
6666
introLinks:
6767
overview: '{% ifversion ghes %}/admin/overview/about-github-enterprise-server{% elsif ghae %}/admin/overview/about-github-ae{% elsif ghec %}/admin/overview/about-github-enterprise-cloud{% endif %}'
6868
Releases: '{% ifversion ghes %}/admin/all-releases{% endif %}'
69+
Try Enterprise Cloud for free: '{% ifversion ghec %}https://github.com/account/enterprises/new{% endif %}'
6970
changelog:
7071
label: enterprise
7172
featuredLinks:

content/admin/overview/creating-an-enterprise-account.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ shortTitle: Create enterprise account
1818

1919
For more information, see "[AUTOTITLE](/admin/overview/about-enterprise-accounts)."
2020

21-
{% data reusables.enterprise.create-an-enterprise-account %} If you pay by invoice, you can create an enterprise account yourself on {% data variables.product.prodname_dotcom %}. If not, you can [contact our sales team](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards) to create an enterprise account for you.
21+
{% data reusables.enterprise.create-an-enterprise-account %}
2222

2323
When you create an enterprise account that owns your existing organization on {% data variables.product.product_name %}, the organization's resources remain accessible to members at the same URLs. After you add your organization to the enterprise account, the following changes will apply to the organization.
2424

@@ -32,9 +32,6 @@ For more information about the changes that apply to an organization after you a
3232

3333
To create an enterprise account, your organization must be using {% data variables.product.prodname_ghe_cloud %}.
3434

35-
If you pay by invoice, you can create an enterprise account directly through {% data variables.product.prodname_dotcom %}. If you do not currently pay by invoice, you can [contact our sales team](https://github.com/enterprise/contact?ref_page=/pricing&ref_cta=Contact%20Sales&ref_loc=cards) to create an enterprise account for you.
36-
37-
3835
{% data reusables.organizations.billing-settings %}
3936
1. Click **Upgrade to enterprise account**.
4037
1. Under "Enterprise name", type a name for your enterprise account.

content/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ After you add an existing organization to your enterprise, the organization's re
3838
- "[AUTOTITLE](/enterprise-server@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_server %} documentation
3939
- "[AUTOTITLE](/github-ae@latest/admin/configuration/configuring-github-connect/managing-github-connect)" in the {% data variables.product.prodname_ghe_managed %} documentation
4040
- If the organization used billed {% data variables.product.prodname_marketplace %} apps, the organization can continue to use the apps, but must pay the vendor directly. For more information, contact the app's vendor.
41+
- If your organization was sponsoring any accounts, the sponsorships will be canceled.
4142
- Any coupons will be removed from the organization. To reapply the coupon, [contact our sales team](https://github.com/enterprise/contact).
4243

4344
## Creating an organization in your enterprise account

content/billing/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ children:
5353
- /managing-billing-for-github-sponsors
5454
- /managing-billing-for-github-marketplace-apps
5555
- /managing-billing-for-git-large-file-storage
56-
- /setting-up-paid-organizations-for-procurement-companies
56+
- /setting-up-paid-accounts-for-procurement-companies
5757
---
5858

content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ When you downgrade your number of data packs, your change takes effect on your n
3333

3434
{% data reusables.organizations.billing-settings %}
3535
{% data reusables.dotcom_billing.lfs-remove-data %}
36-
{% data reusables.large_files.downgrade_data_packs %}
36+
{% data reusables.large_files.downgrade_data_packs %}

content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md

+16
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ shortTitle: Upgrade Git LFS storage
3535
{% data reusables.large_files.pack_selection %}
3636
{% data reusables.large_files.pack_confirm %}
3737

38+
{% ifversion ghec %}
39+
## Purchasing additional storage and bandwidth for an enterprise account
40+
41+
{% data reusables.enterprise-accounts.billing-perms %}
42+
43+
If your enterprise account is invoiced, you may not be able to purchase Git LFS data packs on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}.
44+
45+
{% data reusables.enterprise-accounts.access-enterprise %}
46+
{% data reusables.enterprise-accounts.settings-tab %}
47+
{% data reusables.enterprise-accounts.billing-tab %}
48+
1. To the right of "Git LFS", click **Purchase more data packs**.
49+
1. Select the "Choose an organization" dropdown menu and click the organization you want to purchase a data pack for.
50+
{% data reusables.large_files.pack_selection %}
51+
{% data reusables.large_files.pack_confirm %}
52+
{% endif %}
53+
3854
## Further reading
3955

4056
- "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)"

content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md

+25-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ shortTitle: Downgrade subscription
3030
---
3131
## Downgrading your {% data variables.product.product_name %} subscription
3232

33-
When you downgrade your personal account or organization's subscription, pricing and account feature changes take effect on your next billing date. Changes to your paid personal account or organization subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)."
33+
When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Changes to your paid account subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features. For more information, see "[AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)."
3434

3535
## Downgrading your personal account's subscription
3636

@@ -48,17 +48,14 @@ If you published a {% data variables.product.prodname_pages %} site in a private
4848

4949
{% data reusables.dotcom_billing.org-billing-perms %}
5050

51-
If you downgrade your organization from {% data variables.product.prodname_team %} to {% data variables.product.prodname_free_team %} for an organization, the account will lose access to advanced collaboration and management tools for teams.
52-
53-
If you downgrade your organization from {% data variables.product.prodname_ghe_cloud %} to {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %}, the account will lose access to advanced security, compliance, and deployment controls. {% data reusables.gated-features.more-info %}
51+
After an organization's subscription is downgraded, the organization will lose access to any functionality that is not included its new plan. If an advanced feature, such as {% data variables.product.prodname_pages %}, is not available for private repositories in your new plan, consider whether you'd like to retain access to the feature by making affected repositories public. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)."
5452

53+
Downgrading from {% data variables.product.prodname_ghe_cloud %} disables any SAML settings. If you later purchase {% data variables.product.prodname_enterprise %}, you will need to reconfigure SAML.
5554

5655

5756
{% note %}
5857

59-
**Notes:**
60-
- If your organization is owned by an enterprise account, billing cannot be managed at the organization level. To downgrade, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
61-
- If you're currently trialing {% data variables.product.prodname_ghe_cloud %}, and you don't purchase {% data variables.product.prodname_enterprise %} before the trial ends, your organization will be automatically downgraded to {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}. For more information, see "[AUTOTITLE](/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud#finishing-your-trial)."
58+
**Note:** If your organization is owned by an enterprise account, billing cannot be managed at the organization level. To downgrade, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
6259

6360
{% endnote %}
6461

@@ -90,6 +87,27 @@ To reduce the number of paid seats your organization uses, you can remove member
9087
1. Under "Remove seats", select the number of seats you'd like to downgrade to.
9188
1. Review the information about your new payment on your next billing date, then click **Remove seats**.
9289

90+
{% ifversion ghec %}
91+
## Downgrading your enterprise account's subscription
92+
93+
Enterprise accounts are only available with {% data variables.product.prodname_enterprise %}, so it's not possible to downgrade an enterprise account to another plan.
94+
95+
To downgrade the subscription of an individual organization within the enterprise account, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
96+
97+
If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether, you can [contact our sales team](https://github.com/enterprise/contact). All organizations owned by the enterprise account will removed from the enterprise, and the enterprise account will be frozen.
98+
99+
## Removing paid seats for your enterprise account
100+
101+
{% data reusables.enterprise-accounts.billing-perms %}
102+
103+
If your enterprise account is invoiced, you cannot remove seats on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}.
104+
105+
{% data reusables.enterprise-accounts.access-enterprise %}
106+
{% data reusables.enterprise-accounts.settings-tab %}
107+
{% data reusables.enterprise-accounts.billing-tab %}
108+
{% data reusables.enterprise-accounts.manage-seats %}
109+
{% endif %}
110+
93111
## Further reading
94112

95113
- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"

content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ You can upgrade your organization from {% data variables.product.prodname_free_t
7474

7575
If you upgraded your organization to {% data variables.product.prodname_ghe_cloud %}, you can set up identity and access management for your organization. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
7676

77-
If you'd like to use an enterprise account with {% data variables.product.prodname_ghe_cloud %}, contact {% data variables.contact.contact_enterprise_sales %}. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
77+
{% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
7878

7979
### Adding seats to your organization
8080

@@ -97,6 +97,19 @@ If you'd like additional users to have access to your {% data variables.product.
9797
{% data reusables.dotcom_billing.owned_by_business %}
9898
{% data reusables.dotcom_billing.finish_upgrade %}
9999

100+
{% ifversion ghec %}
101+
## Adding seats to your enterprise account
102+
103+
{% data reusables.enterprise-accounts.billing-perms %}
104+
105+
If your enterprise account is invoiced, you cannot add seats on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}.
106+
107+
{% data reusables.enterprise-accounts.access-enterprise %}
108+
{% data reusables.enterprise-accounts.settings-tab %}
109+
{% data reusables.enterprise-accounts.billing-tab %}
110+
{% data reusables.enterprise-accounts.manage-seats %}
111+
{% endif %}
112+
100113
## Troubleshooting a 500 error when upgrading
101114

102115
{% data reusables.dotcom_billing.500-error %}

content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip
5050

5151
{% endnote %}
5252

53-
5453
{% data reusables.organizations.billing-settings %}
5554
{% data reusables.user-settings.payment-info-link %}
5655
1. Under "Payment information", next to "Additional information click **Add information**.
5756

5857
![Screenshot of the "Payment information" section. A link, labeled "Add information", is highlighted with an orange outline.](/assets/images/help/billing/settings_billing_add_billing_extra.png)
5958

60-
{% data reusables.dotcom_billing.extra_info_receipt %}
59+
{% data reusables.dotcom_billing.extra_info_receipt %}

content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md

+34-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ We don't provide invoicing or support purchase orders for personal accounts. We
3434

3535
{% data reusables.user-settings.billing_plans %}
3636
{% data reusables.dotcom_billing.update_payment_method %}
37-
1. If your account has existing billing information that you want to update, click **Edit**.
38-
![Screenshot of the "Payment information" section. Next to "Billing information", a link, labeled "Edit", is highlighted with an orange outline.](/assets/images/help/billing/billing-information-edit-button.png)
37+
{% data reusables.billing.edit-billing-information %}
3938
{% data reusables.dotcom_billing.enter-billing-info %}
40-
1. If your account has an existing payment method that you want to update, click **Edit**.
41-
![Screenshot of the "Payment method" section. Next to "Payment method", a link, labeled "Edit", is highlighted with an orange outline.](/assets/images/help/billing/billing-payment-method-edit-button.png)
39+
{% data reusables.billing.edit-payment-method %}
4240
{% data reusables.dotcom_billing.enter-payment-info %}
4341

4442
## Updating your organization's payment method
@@ -52,3 +50,35 @@ If your organization is outside of the US or if you're using a corporate checkin
5250
1. If your account has an existing credit card that you want to update, click **New Card**.
5351
![Screenshot of the "Payment method" section. Below some card details, a link, labeled "New Card", is highlighted with an orange outline.](/assets/images/help/billing/billing-new-card-button.png)
5452
{% data reusables.dotcom_billing.enter-payment-info %}
53+
54+
{% ifversion ghec %}
55+
## Updating your enterprise account's payment method
56+
57+
{% data reusables.enterprise-accounts.billing-perms %}
58+
59+
You can update your enterprise account's credit card or PayPal details, or you can switch to invoicing.
60+
61+
### Updating your enterprise account's credit card or PayPal details
62+
63+
If your enterprise account is invoiced, you cannot change your payment method on {% data variables.product.prodname_dotcom %}. Instead, contact {% data variables.contact.contact_enterprise_sales %}.
64+
65+
{% data reusables.enterprise-accounts.access-enterprise %}
66+
{% data reusables.enterprise-accounts.settings-tab %}
67+
{% data reusables.enterprise-accounts.billing-tab %}
68+
{% data reusables.dotcom_billing.update_payment_method %}
69+
{% data reusables.billing.edit-billing-information %}
70+
{% data reusables.dotcom_billing.enter-billing-info %}
71+
{% data reusables.billing.edit-payment-method %}
72+
{% data reusables.dotcom_billing.enter-payment-info %}
73+
74+
### Switching to invoicing
75+
76+
{% data reusables.enterprise-accounts.access-enterprise %}
77+
{% data reusables.enterprise-accounts.settings-tab %}
78+
{% data reusables.enterprise-accounts.billing-tab %}
79+
1. Under "Payment information", click **Switch to invoice**.
80+
81+
![Screenshot of the billing page for an enterprise account. In the "Payment information" section, a link, labeled "Switch to invoice", is outlined in dark orange.](/assets/images/help/billing/switch-to-invoice.png)
82+
1. Complete the form, then click **Contact Sales**.
83+
84+
{% endif %}

content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md

+17
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,20 @@ When you change your billing cycle's duration, your {% data variables.product.pr
4242
{% data reusables.organizations.billing-settings %}
4343
4. Under "Billing overview", next to your plan, click **Change plan**.
4444
5. At the top right corner, click **Switch to monthly billing** or **Switch to yearly billing**.
45+
46+
{% ifversion ghec %}
47+
## Changing the duration of your enterprise account's billing cycle
48+
49+
{% data reusables.enterprise-accounts.billing-perms %}
50+
51+
You cannot change the duration of your billing cycle if your enterprise account is invoiced.
52+
53+
{% data reusables.enterprise-accounts.access-enterprise %}
54+
{% data reusables.enterprise-accounts.settings-tab %}
55+
{% data reusables.enterprise-accounts.billing-tab %}
56+
1. Under "Payment information", click **Switch to yearly billing and save** or **Switch to monthly billing**.
57+
58+
![Screenshot of the billing page for an enterprise account. In the "Payment information" section, a link, labeled "Switch to yearly billing and save", is outlined in dark orange.](/assets/images/help/billing/switch-to-yearly-billing.png)
59+
1. Under "How often do you want to be billed?", select a billing cycle.
60+
1. Click **Change your account's billing cycle**.
61+
{% endif %}

content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Unlocking a locked account
3-
intro: Your organization's paid features are locked if your payment is past due because of billing problems.
3+
intro: Your account's paid features are locked if your payment is past due because of billing problems.
44
redirect_from:
55
- /github/setting-up-and-managing-billing-and-payments-on-github/unlocking-a-locked-account
66
- /articles/what-happens-if-my-account-is-locked
@@ -22,12 +22,13 @@ topics:
2222
- User account
2323
shortTitle: Locked account
2424
---
25-
You can unlock and access your account by updating your organization's payment method and resuming paid status. We do not ask you to pay for the time elapsed in locked mode.
2625

27-
You can downgrade your organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
26+
You can unlock and access your account by updating your account's payment method and resuming paid status. We do not ask you to pay for the time elapsed in locked mode.
27+
28+
You can downgrade your user account or organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
2829

2930
## Unlocking an organization's features due to a declined payment
3031

31-
If your organization's advanced features are locked due to a declined payment, you'll need to update your billing information to trigger a newly authorized charge. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)."
32+
If your account's advanced features are locked due to a declined payment, you'll need to update your billing information to trigger a newly authorized charge. For more information, see "[AUTOTITLE](/articles/adding-or-editing-a-payment-method)."
3233

33-
If the new billing information is approved, we will immediately charge you for the paid product you chose. The organization will automatically unlock when a successful payment has been made.
34+
If the new billing information is approved, we will immediately charge you for the paid product you chose. The account will automatically unlock when a payment has been successfully processed. Payments may take up to 24 hours to process.

0 commit comments

Comments
 (0)