Skip to content

Commit 76f9c05

Browse files
authored
Merge branch 'main' into repo-sync
2 parents 6aba61a + 919054f commit 76f9c05

File tree

69 files changed

+2046
-3065
lines changed

Some content is hidden

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

69 files changed

+2046
-3065
lines changed
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading
Loading

content/github/getting-started-with-github/setting-up-a-trial-of-github-enterprise-cloud.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Downgrading to {% data variables.product.prodname_free_team %} for organizations
5959

6060
{% data reusables.profile.access_org %}
6161
{% data reusables.organizations.org_settings %}
62-
{% data reusables.organizations.billing %}
62+
{% data reusables.organizations.billing_plans %}
6363
5. Under "{% data variables.product.prodname_ghe_cloud %} Free Trial", click **Buy Enterprise** or **Downgrade to Team**.
6464
![Buy Enterprise and Downgrade to Team buttons](/assets/images/help/organizations/finish-trial-buttons.png)
6565
6. Follow the prompts to enter your payment method, then click **Submit**.

content/github/setting-up-and-managing-billing-and-payments-on-github/adding-information-to-your-receipts.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip
2828
### Adding information to your personal account's receipts
2929

3030
{% data reusables.user_settings.access_settings %}
31-
{% data reusables.user_settings.billing %}
32-
{% data reusables.user_settings.payment-info-tab %}
31+
{% data reusables.user_settings.billing_plans %}
32+
{% data reusables.user_settings.payment-info-link %}
3333
{% data reusables.dotcom_billing.extra_info_receipt %}
3434

3535
### Adding information to your organization's receipts
@@ -43,6 +43,6 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip
4343

4444
{% data reusables.profile.access_org %}
4545
{% data reusables.organizations.org_settings %}
46-
{% data reusables.organizations.billing %}
47-
{% data reusables.user_settings.payment-info-tab %}
46+
{% data reusables.organizations.billing_plans %}
47+
{% data reusables.user_settings.payment-info-link %}
4848
{% data reusables.dotcom_billing.extra_info_receipt %}

content/github/setting-up-and-managing-billing-and-payments-on-github/adding-or-editing-a-payment-method.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ We don't provide invoicing or support purchase orders for personal accounts. We
2727
### Updating your personal account's payment method
2828

2929
{% data reusables.user_settings.access_settings %}
30-
{% data reusables.user_settings.billing %}
30+
{% data reusables.user_settings.billing_plans %}
3131
{% data reusables.dotcom_billing.update_payment_method %}
32+
1. If your account has an existing credit card that you want to update, click **New Card**.
33+
![Billing New Card button](/assets/images/help/billing/billing-new-card-button.png)
3234
{% data reusables.dotcom_billing.enter-payment-info %}
3335

3436
### Updating your organization's payment method
@@ -40,6 +42,8 @@ If your organization is outside of the US or if you're using a corporate checkin
4042

4143
{% data reusables.profile.access_org %}
4244
{% data reusables.organizations.org_settings %}
43-
{% data reusables.organizations.billing %}
45+
{% data reusables.organizations.billing_plans %}
4446
{% data reusables.dotcom_billing.update_payment_method %}
47+
1. If your account has an existing credit card that you want to update, click **New Card**.
48+
![Billing New Card button](/assets/images/help/billing/billing-new-card-button.png)
4549
{% data reusables.dotcom_billing.enter-payment-info %}

content/github/setting-up-and-managing-billing-and-payments-on-github/canceling-a-github-marketplace-app.md

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,14 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca
2020
### Canceling an app for your personal account
2121

2222
{% data reusables.user_settings.access_settings %}
23-
{% data reusables.user_settings.billing %}
24-
{% data reusables.user_settings.subscriptions-tab %}
23+
{% data reusables.user_settings.billing_plans %}
2524
{% data reusables.marketplace.cancel-app-billing-settings %}
2625
{% data reusables.marketplace.cancel-app %}
2726

2827
### Canceling a free trial for an app for your personal account
2928

3029
{% data reusables.user_settings.access_settings %}
31-
{% data reusables.user_settings.billing %}
32-
{% data reusables.user_settings.subscriptions-tab %}
30+
{% data reusables.user_settings.billing_plans %}
3331
{% data reusables.marketplace.cancel-free-trial-billing-settings %}
3432
{% data reusables.marketplace.cancel-app %}
3533

@@ -40,8 +38,7 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca
4038

4139
{% data reusables.profile.access_org %}
4240
{% data reusables.organizations.org_settings %}
43-
{% data reusables.organizations.billing %}
44-
{% data reusables.user_settings.subscriptions-tab %}
41+
{% data reusables.organizations.billing_plans %}
4542
{% data reusables.marketplace.cancel-app-billing-settings %}
4643
{% data reusables.marketplace.cancel-app %}
4744

@@ -52,7 +49,6 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca
5249

5350
{% data reusables.profile.access_org %}
5451
{% data reusables.organizations.org_settings %}
55-
{% data reusables.organizations.billing %}
56-
{% data reusables.user_settings.subscriptions-tab %}
52+
{% data reusables.organizations.billing_plans %}
5753
{% data reusables.marketplace.cancel-free-trial-billing-settings %}
5854
{% data reusables.marketplace.cancel-app %}

content/github/setting-up-and-managing-billing-and-payments-on-github/changing-the-duration-of-your-billing-cycle.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ When you change your billing cycle's duration, your {% data variables.product.pr
1717
### Changing the duration of your personal account's billing cycle
1818

1919
{% data reusables.user_settings.access_settings %}
20-
{% data reusables.user_settings.billing %}
20+
{% data reusables.user_settings.billing_plans %}
2121
{% data reusables.dotcom_billing.change_plan_duration %}
2222
{% data reusables.dotcom_billing.confirm_duration_change %}
2323

@@ -29,15 +29,15 @@ When you change your billing cycle's duration, your {% data variables.product.pr
2929

3030
{% data reusables.profile.access_profile %}
3131
{% data reusables.profile.access_org %}
32-
{% data reusables.organizations.billing %}
32+
{% data reusables.organizations.billing_plans %}
3333
{% data reusables.dotcom_billing.change_plan_duration %}
3434
{% data reusables.dotcom_billing.confirm_duration_change %}
3535

3636
#### Changing the duration of a legacy per-repository plan
3737

3838
{% data reusables.profile.access_profile %}
3939
{% data reusables.profile.access_org %}
40-
{% data reusables.organizations.billing %}
40+
{% data reusables.organizations.billing_plans %}
4141
4. Under "Billing overview", click **Change plan**.
4242
![Billing overview change plan button](/assets/images/help/billing/billing_overview_change_plan.png)
4343
5. At the top right corner, click **Switch to monthly billing** or **Switch to yearly billing**.

content/github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client.md

+3-7
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,19 @@ If you already have a personal {% data variables.product.prodname_dotcom %} user
4747

4848
{% data reusables.profile.access_org %}
4949
{% data reusables.organizations.org_settings %}
50-
{% data reusables.organizations.billing %}
50+
{% data reusables.organizations.billing_plans %}
5151
{% data reusables.dotcom_billing.upgrade_org %}
5252
{% data reusables.dotcom_billing.choose_org_plan %} (You can add more seats to the organization in the next step.)
5353
6. Under "Upgrade summary", select **Pay yearly** to pay for the organization yearly.
5454
![Radio button for yearly billing](/assets/images/help/billing/choose-annual-billing-org-resellers.png)
55-
{% data reusables.dotcom_billing.show-plan-details %}
56-
{% data reusables.dotcom_billing.add-payment-method %}
57-
1. Under "Pay with", type your credit card information.
58-
![Form for entering credit card information](/assets/images/help/billing/settings_billing_upgrade_with_credit_card.png)
59-
1. Click **Update credit card**.
55+
{% data reusables.dotcom_billing.enter-payment-info %}
6056
{% data reusables.dotcom_billing.finish_upgrade %}
6157

6258
### Step 4: Upgrade the number of paid seats in the organization
6359

6460
{% data reusables.profile.access_org %}
6561
{% data reusables.organizations.org_settings %}
66-
{% data reusables.organizations.billing %}
62+
{% data reusables.organizations.billing_plans %}
6763
{% data reusables.dotcom_billing.add-seats %}
6864
{% data reusables.dotcom_billing.number-of-seats %}
6965
{% data reusables.dotcom_billing.confirm-add-seats %}

content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-git-large-file-storage.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ When you downgrade your number of data packs, your change takes effect on your n
1616
### Downgrading storage and bandwidth for a personal account
1717

1818
{% data reusables.user_settings.access_settings %}
19-
{% data reusables.user_settings.billing %}
20-
{% data reusables.user_settings.subscriptions-tab %}
19+
{% data reusables.user_settings.billing_plans %}
2120
{% data reusables.dotcom_billing.lfs-remove-data %}
2221
{% data reusables.large_files.downgrade_data_packs %}
2322

@@ -27,7 +26,6 @@ When you downgrade your number of data packs, your change takes effect on your n
2726

2827
{% data reusables.profile.access_org %}
2928
{% data reusables.organizations.org_settings %}
30-
{% data reusables.organizations.billing %}
31-
{% data reusables.user_settings.subscriptions-tab %}
29+
{% data reusables.organizations.billing_plans %}
3230
{% data reusables.dotcom_billing.lfs-remove-data %}
3331
{% data reusables.large_files.downgrade_data_packs %}

content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-the-billing-plan-for-a-github-marketplace-app.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ When you downgrade an app, your subscription remains active until the end of you
1818
### Downgrading an app for your personal account
1919

2020
{% data reusables.user_settings.access_settings %}
21-
{% data reusables.user_settings.billing %}
21+
{% data reusables.user_settings.billing_plans %}
2222
{% data reusables.marketplace.downgrade-app-billing-settings %}
2323
{% data reusables.marketplace.choose-new-plan %}
2424
{% data reusables.marketplace.choose-new-quantity %}
@@ -30,7 +30,7 @@ When you downgrade an app, your subscription remains active until the end of you
3030

3131
{% data reusables.profile.access_org %}
3232
{% data reusables.organizations.org_settings %}
33-
{% data reusables.organizations.billing %}
33+
{% data reusables.organizations.billing_plans %}
3434
{% data reusables.marketplace.downgrade-app-billing-settings %}
3535
{% data reusables.marketplace.choose-new-plan %}
3636
{% data reusables.marketplace.choose-new-quantity %}

content/github/setting-up-and-managing-billing-and-payments-on-github/downgrading-your-github-subscription.md

+7-10
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ When you downgrade your user account or organization's subscription, pricing and
3030
If you downgrade your user account from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, the account will lose access to advanced code review tools on private repositories. {% data reusables.gated-features.more-info %}
3131

3232
{% data reusables.user_settings.access_settings %}
33-
{% data reusables.user_settings.billing %}
34-
{% data reusables.user_settings.subscriptions-tab %}
35-
4. Use the **Edit** drop-down and click **Downgrade to Free**.
33+
{% data reusables.user_settings.billing_plans %}
34+
1. Under "Current plan", use the **Edit** drop-down and click **Downgrade to Free**.
3635
![Downgrade to free button](/assets/images/help/billing/downgrade-to-free.png)
3736
5. Read the information about the features your user account will no longer have access to on your next billing date, then click **I understand. Continue with downgrade**.
3837
![Continue with downgrade button](/assets/images/help/billing/continue-with-downgrade.png)
@@ -49,9 +48,8 @@ If you downgrade your organization from {% data variables.product.prodname_ghe_c
4948

5049
{% data reusables.profile.access_org %}
5150
{% data reusables.organizations.org_settings %}
52-
{% data reusables.organizations.billing %}
53-
{% data reusables.user_settings.subscriptions-tab %}
54-
6. Use the **Edit** drop-down and click the downgrade option you want.
51+
{% data reusables.organizations.billing_plans %}
52+
1. Under "Current plan", use the **Edit** drop-down and click the downgrade option you want.
5553
![Downgrade button](/assets/images/help/billing/downgrade-option-button.png)
5654
{% data reusables.dotcom_billing.confirm_cancel_org_plan %}
5755

@@ -63,7 +61,7 @@ If you downgrade your organization from {% data variables.product.prodname_ghe_c
6361

6462
{% data reusables.profile.access_org %}
6563
{% data reusables.organizations.org_settings %}
66-
{% data reusables.organizations.billing %}
64+
{% data reusables.organizations.billing_plans %}
6765
5. Under "Subscriptions", select the "Edit" drop-down, and click **Edit plan**.
6866
![Edit Plan dropdown](/assets/images/help/billing/edit-plan-dropdown.png)
6967
1. Under "Billing/Plans", next to the plan you want to change, click **Downgrade**.
@@ -80,9 +78,8 @@ To reduce the number of paid seats your organization uses, you can remove member
8078

8179
{% data reusables.profile.access_org %}
8280
{% data reusables.organizations.org_settings %}
83-
{% data reusables.organizations.billing %}
84-
{% data reusables.user_settings.subscriptions-tab %}
85-
6. Use the **Edit** drop-down and click **Remove seats**.
81+
{% data reusables.organizations.billing_plans %}
82+
1. Under "Current plan", use the **Edit** drop-down and click **Remove seats**.
8683
![remove seats dropdown](/assets/images/help/billing/remove-seats-dropdown.png)
8784
1. Under "Remove seats", select the number of seats you'd like to downgrade to.
8885
![remove seats option](/assets/images/help/billing/remove-seats-amount.png)

content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Because you have not enabled overages, your next attempt to create a workflow ar
2727
Anyone can manage the spending limit for {% data variables.product.prodname_actions %} for their own user account.
2828

2929
{% data reusables.user_settings.access_settings %}
30-
{% data reusables.user_settings.billing %}
31-
{% data reusables.user_settings.cost-management-tab %}
30+
{% data reusables.user_settings.billing_plans %}
31+
{% data reusables.dotcom_billing.manage-spending-limit %}
3232
{% data reusables.dotcom_billing.monthly-spending-limit %}
3333
{% data reusables.dotcom_billing.update-spending-limit %}
3434

@@ -38,8 +38,8 @@ Organizations owners and billing managers can manage the spending limit for {% d
3838

3939
{% data reusables.profile.access_org %}
4040
{% data reusables.organizations.org_settings %}
41-
{% data reusables.organizations.billing %}
42-
{% data reusables.user_settings.cost-management-tab %}
41+
{% data reusables.organizations.billing_plans %}
42+
{% data reusables.dotcom_billing.manage-spending-limit %}
4343
{% data reusables.dotcom_billing.monthly-spending-limit %}
4444
{% data reusables.dotcom_billing.update-spending-limit %}
4545

@@ -50,7 +50,7 @@ Enterprise owners and billing managers can manage the spending limit for {% data
5050
{% data reusables.enterprise-accounts.access-enterprise %}
5151
{% data reusables.enterprise-accounts.settings-tab %}
5252
{% data reusables.enterprise-accounts.billing-tab %}
53-
1. Under "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Cost management**.
54-
![Cost management tab](/assets/images/help/settings/cost-management-tab-enterprise.png)
53+
1. Above "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Spending Limit**.
54+
![Spending limit tab](/assets/images/help/settings/spending-limit-tab-enterprise.png)
5555
{% data reusables.dotcom_billing.monthly-spending-limit %}
5656
{% data reusables.dotcom_billing.update-spending-limit %}

content/github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Because you have not enabled overages, your next attempt to publish a version of
2727
Anyone can manage the spending limit for {% data variables.product.prodname_registry %} for their own user account.
2828

2929
{% data reusables.user_settings.access_settings %}
30-
{% data reusables.user_settings.billing %}
31-
{% data reusables.user_settings.cost-management-tab %}
30+
{% data reusables.user_settings.billing_plans %}
31+
{% data reusables.dotcom_billing.manage-spending-limit %}
3232
{% data reusables.dotcom_billing.monthly-spending-limit %}
3333
{% data reusables.dotcom_billing.update-spending-limit %}
3434

@@ -38,8 +38,8 @@ Organizations owners and billing managers can manage the spending limit for {% d
3838

3939
{% data reusables.profile.access_org %}
4040
{% data reusables.organizations.org_settings %}
41-
{% data reusables.organizations.billing %}
42-
{% data reusables.user_settings.cost-management-tab %}
41+
{% data reusables.organizations.billing_plans %}
42+
{% data reusables.dotcom_billing.manage-spending-limit %}
4343
{% data reusables.dotcom_billing.monthly-spending-limit %}
4444
{% data reusables.dotcom_billing.update-spending-limit %}
4545

@@ -50,7 +50,7 @@ Enterprise owners and billing managers can manage the spending limit for {% data
5050
{% data reusables.enterprise-accounts.access-enterprise %}
5151
{% data reusables.enterprise-accounts.settings-tab %}
5252
{% data reusables.enterprise-accounts.billing-tab %}
53-
1. Under "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Cost management**.
54-
![Cost management tab](/assets/images/help/settings/cost-management-tab-enterprise.png)
53+
1. Above "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Spending Limit**.
54+
![Spending limit tab](/assets/images/help/settings/spending-limit-tab-enterprise.png)
5555
{% data reusables.dotcom_billing.monthly-spending-limit %}
5656
{% data reusables.dotcom_billing.update-spending-limit %}

content/github/setting-up-and-managing-billing-and-payments-on-github/removing-a-payment-method.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ If you're paying for your {% data variables.product.product_name %} subscription
2626
### Removing your personal account's payment method
2727

2828
{% data reusables.user_settings.access_settings %}
29-
{% data reusables.user_settings.billing %}
30-
{% data reusables.user_settings.payment-info-tab %}
29+
{% data reusables.user_settings.billing_plans %}
30+
{% data reusables.user_settings.payment-info-link %}
3131
{% data reusables.dotcom_billing.remove-payment-method %}
3232
{% data reusables.dotcom_billing.remove_payment_info %}
3333

@@ -37,7 +37,7 @@ If you're paying for your {% data variables.product.product_name %} subscription
3737

3838
{% data reusables.profile.access_org %}
3939
{% data reusables.organizations.org_settings %}
40-
{% data reusables.organizations.billing %}
41-
{% data reusables.user_settings.payment-info-tab %}
40+
{% data reusables.organizations.billing_plans %}
41+
{% data reusables.user_settings.payment-info-link %}
4242
{% data reusables.dotcom_billing.remove-payment-method %}
4343
{% data reusables.dotcom_billing.remove_payment_info %}

content/github/setting-up-and-managing-billing-and-payments-on-github/renewing-your-clients-paid-organization.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ topics:
2222

2323
{% data reusables.profile.access_org %}
2424
{% data reusables.organizations.org_settings %}
25-
{% data reusables.organizations.billing %}
25+
{% data reusables.organizations.billing_plans %}
2626
{% data reusables.dotcom_billing.update_payment_method %}
27-
1. Type your new credit card information in the secure form.
28-
![Credit card information form](/assets/images/help/settings/creditcard-billing-form.png)
29-
1. Click **Update credit card** or **Save credit card**.
27+
1. Under "Payment method", click **New Card**.
28+
![Billing New Card button](/assets/images/help/billing/billing-new-card-button.png)
29+
{% data reusables.dotcom_billing.enter-payment-info %}

content/github/setting-up-and-managing-billing-and-payments-on-github/setting-your-billing-email.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If you have users that want to receive billing reports, you can add their email
4343

4444
{% data reusables.organizations.navigate-to-org %}
4545
{% data reusables.organizations.org_settings %}
46-
{% data reusables.organizations.billing %}
46+
{% data reusables.organizations.billing_plans %}
4747
1. Under "Billing management", to the right of "Email recipients", click **Add**.
4848
![Add recipient](/assets/images/help/billing/billing-add-email-recipient.png)
4949
1. Type the email address of the recipient, then click **Add**.
@@ -55,7 +55,7 @@ One address must always be designated as the primary recipient. The address with
5555

5656
{% data reusables.organizations.navigate-to-org %}
5757
{% data reusables.organizations.org_settings %}
58-
{% data reusables.organizations.billing %}
58+
{% data reusables.organizations.billing_plans %}
5959
1. Under "Billing management", find the email address you want to set as the primary recipient.
6060
1. To the right of the email address, use the "Edit" drop-down menu, and click **Mark as primary**.
6161
![Mark primary recipient](/assets/images/help/billing/billing-change-primary-email-recipient.png)
@@ -64,10 +64,10 @@ One address must always be designated as the primary recipient. The address with
6464

6565
{% data reusables.organizations.navigate-to-org %}
6666
{% data reusables.organizations.org_settings %}
67-
{% data reusables.organizations.billing %}
67+
{% data reusables.organizations.billing_plans %}
6868
1. Under "Email recipients", find the email address you want to remove.
6969
1. For the user's entry in the list, click **Edit**.
7070
![Edit recipient](/assets/images/help/billing/billing-edit-email-recipient.png)
71-
1. To the right of the email address, use the "Edit" drop-down menu, and click *Remove**.
71+
1. To the right of the email address, use the "Edit" drop-down menu, and click **Remove**.
7272
![Remove recipient](/assets/images/help/billing/billing-remove-email-recipient.png)
7373
1. Review the confirmation prompt, then click **Remove**.

0 commit comments

Comments
 (0)