Billing UI updates

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

@@ -59,7 +59,7 @@ Downgrading to {% data variables.product.prodname_free_team %} for organizations
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% 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**.

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

@@ -28,8 +28,8 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip
 ### Adding information to your personal account's receipts
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.payment-info-tab %}
+{% data reusables.user_settings.payment-info-link %}
 {% data reusables.dotcom_billing.extra_info_receipt %}
 
 ### Adding information to your organization's receipts
@@ -43,6 +43,6 @@ Your receipts include your {% data variables.product.prodname_dotcom %} subscrip
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.payment-info-tab %}
+{% data reusables.user_settings.payment-info-link %}
 {% 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

@@ -27,7 +27,7 @@ We don't provide invoicing or support purchase orders for personal accounts. We
 ### Updating your personal account's payment method
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.update_payment_method %}
 {% data reusables.dotcom_billing.enter-payment-info %}
 
@@ -40,6 +40,6 @@ If your organization is outside of the US or if you're using a corporate checkin
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.update_payment_method %}
 {% data reusables.dotcom_billing.enter-payment-info %}

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

@@ -20,16 +20,14 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca
 ### Canceling an app for your personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.marketplace.cancel-app-billing-settings %}
 {% data reusables.marketplace.cancel-app %}
 
 ### Canceling a free trial for an app for your personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.marketplace.cancel-free-trial-billing-settings %}
 {% data reusables.marketplace.cancel-app %}
 
@@ -40,8 +38,7 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.marketplace.cancel-app-billing-settings %}
 {% data reusables.marketplace.cancel-app %}
 
@@ -52,7 +49,6 @@ When you cancel a free trial on a paid plan, your subscription is immediately ca
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.marketplace.cancel-free-trial-billing-settings %}
 {% data reusables.marketplace.cancel-app %}

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

@@ -17,7 +17,7 @@ When you change your billing cycle's duration, your {% data variables.product.pr
 ### Changing the duration of your personal account's billing cycle
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.change_plan_duration %}
 {% data reusables.dotcom_billing.confirm_duration_change %}
 
@@ -29,7 +29,7 @@ When you change your billing cycle's duration, your {% data variables.product.pr
 
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.change_plan_duration %}
 {% data reusables.dotcom_billing.confirm_duration_change %}
 
@@ -37,7 +37,7 @@ When you change your billing cycle's duration, your {% data variables.product.pr
 
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 4. Under "Billing overview", click **Change plan**.
   ![Billing overview change plan button](/assets/images/help/billing/billing_overview_change_plan.png)
 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

@@ -47,16 +47,12 @@ If you already have a personal {% data variables.product.prodname_dotcom %} user
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.upgrade_org %}
 {% data reusables.dotcom_billing.choose_org_plan %} (You can add more seats to the organization in the next step.)
 6. Under "Upgrade summary", select **Pay yearly** to pay for the organization yearly.
 ![Radio button for yearly billing](/assets/images/help/billing/choose-annual-billing-org-resellers.png)
-{% data reusables.dotcom_billing.show-plan-details %}
+{% data reusables.dotcom_billing.enter-payment-info %}
-{% data reusables.dotcom_billing.add-payment-method %}
-1. Under "Pay with", type your credit card information.
-![Form for entering credit card information](/assets/images/help/billing/settings_billing_upgrade_with_credit_card.png)
-1. Click **Update credit card**.
 {% data reusables.dotcom_billing.finish_upgrade %}
 
 ### Step 4: Upgrade the number of paid seats in the organization
@@ -64,7 +60,7 @@ If you already have a personal {% data variables.product.prodname_dotcom %} user
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.add-seats %}
 {% data reusables.dotcom_billing.number-of-seats %}
 {% data reusables.dotcom_billing.confirm-add-seats %}

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

@@ -16,8 +16,7 @@ When you downgrade your number of data packs, your change takes effect on your n
 ### Downgrading storage and bandwidth for a personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.lfs-remove-data %}
 {% data reusables.large_files.downgrade_data_packs %}
 
@@ -28,7 +27,6 @@ When you downgrade your number of data packs, your change takes effect on your n
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.lfs-remove-data %}
 {% 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

@@ -18,7 +18,7 @@ When you downgrade an app, your subscription remains active until the end of you
 ### Downgrading an app for your personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.marketplace.downgrade-app-billing-settings %}
 {% data reusables.marketplace.choose-new-plan %}
 {% data reusables.marketplace.choose-new-quantity %}
@@ -31,7 +31,7 @@ When you downgrade an app, your subscription remains active until the end of you
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.marketplace.downgrade-app-billing-settings %}
 {% data reusables.marketplace.choose-new-plan %}
 {% data reusables.marketplace.choose-new-quantity %}

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

@@ -30,9 +30,8 @@ When you downgrade your user account or organization's subscription, pricing and
 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 %}
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
+1. Under "Current plan", use the **Edit** drop-down and click **Downgrade to Free**.
-4. Use the **Edit** drop-down and click **Downgrade to Free**.
   ![Downgrade to free button](/assets/images/help/billing/downgrade-to-free.png)
 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**.
   ![Continue with downgrade button](/assets/images/help/billing/continue-with-downgrade.png)
@@ -50,9 +49,8 @@ If you downgrade your organization from {% data variables.product.prodname_ghe_c
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
+1. Under "Current plan", use the **Edit** drop-down and click the downgrade option you want.
-6. Use the **Edit** drop-down and click the downgrade option you want.
   ![Downgrade button](/assets/images/help/billing/downgrade-option-button.png)
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}
 
@@ -65,7 +63,7 @@ If you downgrade your organization from {% data variables.product.prodname_ghe_c
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 5. Under "Subscriptions", select the "Edit" drop-down, and click **Edit plan**.
     ![Edit Plan dropdown](/assets/images/help/billing/edit-plan-dropdown.png)
 1. Under "Billing/Plans",  next to the plan you want to change, click **Downgrade**.
@@ -83,9 +81,8 @@ To reduce the number of paid seats your organization uses, you can remove member
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
+1. Under "Current plan", se the **Edit** drop-down and click **Remove seats**.
-6. Use the **Edit** drop-down and click **Remove seats**.
   ![remove seats dropdown](/assets/images/help/billing/remove-seats-dropdown.png)
 1. Under "Remove seats", select the number of seats you'd like to downgrade to.
   ![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

@@ -27,8 +27,8 @@ Because you have not enabled overages, your next attempt to create a workflow ar
 Anyone can manage the spending limit for {% data variables.product.prodname_actions %} for their own user account.
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.cost-management-tab %}
+{% data reusables.dotcom_billing.manage-spending-limit %}
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}
 
@@ -39,8 +39,8 @@ Organizations owners and billing managers can manage the spending limit for {% d
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.cost-management-tab %}
+{% data reusables.dotcom_billing.manage-spending-limit %}
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}
 
@@ -51,7 +51,7 @@ Enterprise owners and billing managers can manage the spending limit for {% data
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.billing-tab %}
-1. Under "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Cost management**.
+1. Above "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Spending Limit**.
-  ![Cost management tab](/assets/images/help/settings/cost-management-tab-enterprise.png)
+  ![Spending limit tab](/assets/images/help/settings/spending-limit-tab-enterprise.png)
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% 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

@@ -27,8 +27,8 @@ Because you have not enabled overages, your next attempt to publish a version of
 Anyone can manage the spending limit for {% data variables.product.prodname_registry %} for their own user account.
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.cost-management-tab %}
+{% data reusables.dotcom_billing.manage-spending-limit %}
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}
 
@@ -39,8 +39,8 @@ Organizations owners and billing managers can manage the spending limit for {% d
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.cost-management-tab %}
+{% data reusables.dotcom_billing.manage-spending-limit %}
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}
 
@@ -51,7 +51,7 @@ Enterprise owners and billing managers can manage the spending limit for {% data
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
 {% data reusables.enterprise-accounts.billing-tab %}
-1. Under "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Cost management**.
+1. Above "{% data variables.product.prodname_actions %} and Packages monthly usage", click **Spending Limit**.
-  ![Cost management tab](/assets/images/help/settings/cost-management-tab-enterprise.png)
+  ![Spending limit tab](/assets/images/help/settings/spending-limit-tab-enterprise.png)
 {% data reusables.dotcom_billing.monthly-spending-limit %}
 {% data reusables.dotcom_billing.update-spending-limit %}

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

@@ -26,8 +26,8 @@ If you're paying for your {% data variables.product.product_name %} subscription
 ### Removing your personal account's payment method
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.payment-info-tab %}
+{% data reusables.user_settings.payment-info-link %}
 {% data reusables.dotcom_billing.remove-payment-method %}
 {% data reusables.dotcom_billing.remove_payment_info %}
 
@@ -38,7 +38,7 @@ If you're paying for your {% data variables.product.product_name %} subscription
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.payment-info-tab %}
+{% data reusables.user_settings.payment-info-link %}
 {% data reusables.dotcom_billing.remove-payment-method %}
 {% data reusables.dotcom_billing.remove_payment_info %}

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

@@ -23,8 +23,6 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.update_payment_method %}
-1. Type your new credit card information in the secure form.
+{% data reusables.dotcom_billing.enter-payment-info %}
- ![Credit card information form](/assets/images/help/settings/creditcard-billing-form.png)
-1. Click **Update credit card** or **Save credit card**.

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

@@ -44,7 +44,7 @@ If you have users that want to receive billing reports, you can add their email
 
 {% data reusables.organizations.navigate-to-org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 1. Under "Billing management", to the right of "Email recipients", click **Add**.
   ![Add recipient](/assets/images/help/billing/billing-add-email-recipient.png)
 1. Type the email address of the recipient, then click **Add**.
@@ -56,7 +56,7 @@ One address must always be designated as the primary recipient. The address with
 
 {% data reusables.organizations.navigate-to-org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 1. Under "Billing management", find the email address you want to set as the primary recipient.
 1. To the right of the email address, use the "Edit" drop-down menu, and click **Mark as primary**.
   ![Mark primary recipient](/assets/images/help/billing/billing-change-primary-email-recipient.png)
@@ -65,7 +65,7 @@ One address must always be designated as the primary recipient. The address with
 
 {% data reusables.organizations.navigate-to-org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 1. Under "Email recipients", find the email address you want to remove.
 1. For the user's entry in the list, click **Edit**.
   ![Edit recipient](/assets/images/help/billing/billing-edit-email-recipient.png)

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

@@ -14,8 +14,7 @@ topics:
 ### Purchasing additional storage and bandwidth for a personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.lfs-add-data %}
 {% data reusables.large_files.pack_selection %}
 {% data reusables.large_files.pack_confirm %}
@@ -27,8 +26,7 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.lfs-add-data %}
 {% data reusables.large_files.pack_selection %}
 {% data reusables.large_files.pack_confirm %}

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

@@ -25,8 +25,7 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.add-seats %}
 {% data reusables.dotcom_billing.number-of-seats %}
 {% data reusables.dotcom_billing.confirm-add-seats %}
@@ -38,7 +37,6 @@ After you add seats, the payment method on file for the organization will be cha
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.downgrade-org-to-free %}
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}

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

@@ -16,8 +16,7 @@ When you upgrade an app, your payment method is charged a prorated amount based
 ### Upgrading an app for your personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.marketplace.upgrade-app-billing-settings %}
 {% data reusables.marketplace.choose-new-plan %}
 {% data reusables.marketplace.choose-new-quantity %}
@@ -30,8 +29,7 @@ When you upgrade an app, your payment method is charged a prorated amount based
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.marketplace.upgrade-app-billing-settings %}
 {% data reusables.marketplace.choose-new-plan %}
 {% data reusables.marketplace.choose-new-quantity %}

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

@@ -28,10 +28,10 @@ topics:
 You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories. {% data reusables.gated-features.more-info %}
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
+1. Next to "Current plan", click **Upgrade**.
-4. Next to "{% data variables.product.prodname_free_user %}", click **Upgrade**.
   ![Upgrade button](/assets/images/help/billing/settings_billing_user_upgrade.png)
+2. Under "Pro" on the "Compare plans" page, click **Upgrade to Pro**.
 {% data reusables.dotcom_billing.choose-monthly-or-yearly-billing %}
 {% data reusables.dotcom_billing.show-plan-details %}
 {% data reusables.dotcom_billing.enter-payment-info %}
@@ -46,8 +46,7 @@ You can upgrade your organization from {% data variables.product.prodname_free_t
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.upgrade_org %}
 {% data reusables.dotcom_billing.choose_org_plan %}
 {% data reusables.dotcom_billing.choose-monthly-or-yearly-billing %}
@@ -69,8 +68,7 @@ If you'd like additional users to have access to your {% data variables.product.
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.add-seats %}
 {% data reusables.dotcom_billing.number-of-seats %}
 {% data reusables.dotcom_billing.confirm-add-seats %}
@@ -82,7 +80,7 @@ If you'd like additional users to have access to your {% data variables.product.
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 5. To the right of your plan name, use the **Edit** drop-down menu, and select **Edit plan**.
   ![Edit drop-down menu](/assets/images/help/billing/per-user-upgrade-button.png)
 6. To the right of "Advanced tools for teams", click **Upgrade now**.

content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-and-managing-pending-changes-to-your-subscription.md

@@ -19,8 +19,7 @@ When you cancel a pending change, your subscription will not change on your next
 ### Viewing and managing pending changes to your personal account's subscription
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.review-pending-changes %}
 {% data reusables.dotcom_billing.cancel-pending-changes %}
 {% data reusables.dotcom_billing.confirm-cancel-pending-changes %}
@@ -30,8 +29,7 @@ When you cancel a pending change, your subscription will not change on your next
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.review-pending-changes %}
 {% data reusables.dotcom_billing.cancel-pending-changes %}
 {% data reusables.dotcom_billing.confirm-cancel-pending-changes %}

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

@@ -16,8 +16,7 @@ topics:
 ### Viewing storage and bandwidth usage for a personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.lfs-data %}
 
 ### Viewing storage and bandwidth usage for an organization
@@ -27,8 +26,7 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-{% data reusables.user_settings.subscriptions-tab %}
 {% data reusables.dotcom_billing.lfs-data %}
 
 ### Further reading

content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage.md

@@ -15,7 +15,7 @@ You can also view the billable job execution minutes for an individual workflow
 Anyone can view {% data variables.product.prodname_actions %} usage for their own user account.
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.actions-minutes %}
 {% data reusables.dotcom_billing.actions-packages-storage %}
 {% data reusables.dotcom_billing.actions-packages-report-download %}
@@ -27,7 +27,7 @@ Organization owners and billing managers can view {% data variables.product.prod
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.actions-minutes %}
 {% data reusables.dotcom_billing.actions-packages-storage %}
 {% data reusables.dotcom_billing.actions-packages-report-download %}

content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage.md

@@ -13,7 +13,7 @@ topics:
 Anyone can view {% data variables.product.prodname_registry %} usage for their own user account.
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.packages-data %}
 {% data reusables.dotcom_billing.actions-packages-storage %}
 {% data reusables.dotcom_billing.actions-packages-report-download %}
@@ -25,7 +25,7 @@ Organization owners and billing managers can view {% data variables.product.prod
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.packages-data %}
 {% data reusables.dotcom_billing.actions-packages-storage %}
 {% data reusables.dotcom_billing.actions-packages-report-download %}

content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-payment-history-and-receipts.md

@@ -15,7 +15,7 @@ topics:
 ### Viewing receipts for your personal account
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.view-payment-history %}
 {% data reusables.dotcom_billing.download_receipt %}
 
@@ -26,6 +26,6 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.view-payment-history %}
 {% data reusables.dotcom_billing.download_receipt %}

content/github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-subscriptions-and-billing-date.md

@@ -16,7 +16,7 @@ topics:
 ### Finding your personal account's next billing date
 
 {% data reusables.user_settings.access_settings %}
-{% data reusables.user_settings.billing %}
+{% data reusables.user_settings.billing_plans %}
 {% data reusables.dotcom_billing.next_billing_date %}
 
 ### Finding your organization's next billing date
@@ -26,7 +26,7 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
 {% data reusables.dotcom_billing.next_billing_date %}
 
 ### Further reading

content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md

@@ -52,8 +52,8 @@ The invited person will receive an invitation email asking them to become a bill
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-5. Next to Billing managers, click **Add a billing manager**.
+1. Under "Billing management", next to "Billing managers", click **Add**.
   ![Invite billing manager](/assets/images/help/billing/settings_billing_managers_list.png)
 6. Type the username or email address of the person you want to add and click **Send invitation**.
   ![Invite billing manager page](/assets/images/help/billing/billing_manager_invite.png)

content/organizations/managing-peoples-access-to-your-organization-with-roles/removing-a-billing-manager-from-your-organization.md

@@ -21,6 +21,6 @@ topics:
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.organizations.billing %}
+{% data reusables.organizations.billing_plans %}
-5. In the Billing managers list, next to the name of the person you want to remove, click {% octicon "x" aria-label="X symbol" %}.
+1. In the "Billing managers" list under "Billing management", next to the name of the person you want to remove, click **Remove**.
 ![Remove billing manager](/assets/images/help/billing/settings_billing_managers_remove_manager.png)

data/reusables/dotcom_billing/actions-packages-report-download.md

@@ -1,2 +1,2 @@
-1. Optionally, click **Get usage report** to email a CSV report of storage use for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} to the account's primary email address.
+1. Optionally, next to "Usage this month", click **Get usage report** to email a CSV report of storage use for {% data variables.product.prodname_actions %} and {% data variables.product.prodname_registry %} to the account's primary email address.
   ![Download CSV report](/assets/images/help/billing/actions-packages-report-download.png)

data/reusables/dotcom_billing/change_plan_duration.md

@@ -1,2 +1,2 @@
-1. Under "Billing overview", click **Change to yearly billing** or **Change to monthly billing**.
+1. Under "Current monthly bill" or "Current yearly bill", click **Switch to yearly billing** or **Switch to monthly billing**.
 ![Billing overview change plan button](/assets/images/help/billing/change-plan-duration-link.png)

data/reusables/dotcom_billing/choose_org_plan.md

@@ -1,2 +1,2 @@
-1. If you're upgrading from {% data variables.product.prodname_free_team %}, under "Upgrading to", select a product.
+Under "Compare plans", you can compare the features of each plan. Depending on your current plan and what plan you have chosen, click either **Upgrade to Team** or **Upgrade to Enterprise**.
-  ![Upgrade button](/assets/images/help/billing/upgrade-to-product.png)
+![Compare plans and upgrade](/assets/images/help/billing/settings-compare-and-upgrade-plans.png)

data/reusables/dotcom_billing/enter-payment-info.md

@@ -1,3 +1,3 @@
-1. Under "Billing information", choose to pay with a credit card or PayPal.
+1. Under "Payment method", choose to pay with a credit card or PayPal.
   ![Switch Billing payment methods](/assets/images/help/billing/billing_switch_payments.png)
 1. Complete the payment information form, then click **Submit**.

data/reusables/dotcom_billing/lfs-add-data.md

@@ -1,2 +1,2 @@
-1. Next to "{% data variables.large_files.product_name_short %} Data", click **Add more data** or use the Edit drop-down and click **Add more data packs**.
+1. Next to "{% data variables.large_files.product_name_short %} Data", click **Add more data** or use the **Edit** drop-down and click **Add more data packs**.
   ![Add more data button](/assets/images/help/billing/data-pack-purchase-more.png)

data/reusables/dotcom_billing/manage-spending-limit.md

@@ -0,0 +1,2 @@
+1. At the top of the page, under "Payment information", click **Manage spending limit**.
+![Manage spending limit link](/assets/images/help/billing/manage-spending-limit-link.png)

data/reusables/dotcom_billing/next_billing_date.md

@@ -1,2 +1,2 @@
-1. Under "Billing overview", review when your next payment is due.
+1. At the top of the page, under "Next payment due", review when your next payment is due.
 ![Next billing date](/assets/images/help/billing/settings_billing_next_payment.png)

data/reusables/dotcom_billing/review-pending-changes.md

@@ -1,2 +1,2 @@
-1. Under "Subscriptions," review your pending changes.
+1. Under "Current plan", review your pending changes.
   ![Subscriptions section of billing settings listing any pending subscription changes](/assets/images/help/billing/review-pending-subscription-changes.png)

data/reusables/dotcom_billing/update_payment_method.md

@@ -1,2 +1,2 @@
-1. Under "Billing overview", click **Update payment method**.
+1. At the top of the page, under "Payment information", click **Update payment method**.
  ![Update payment method button](/assets/images/help/billing/update_payment_method.png)

data/reusables/dotcom_billing/upgrade_org.md

@@ -1,2 +1 @@
-1. If you're upgrading from {% data variables.product.prodname_free_team %}, click **Upgrade options**. If you're upgrading from {% data variables.product.prodname_team %}, use the **Edit** drop-down and click **Upgrade**.
+1. Click **Upgrade** next to "Current plan".
-  ![Upgrade options button](/assets/images/help/billing/choose-monthly-or-yearly-billing.png)

data/reusables/dotcom_billing/view-payment-history.md

@@ -1,2 +1,2 @@
-1. Under "Billing overview", click **View payment history**.
+1. At the top of the page, under "Next payment due", click **View payment history**.
 ![View payment history link](/assets/images/help/billing/view-payment-history-link.png)

data/reusables/marketplace/cancel-app-billing-settings.md

@@ -1,2 +1,2 @@
-1. Use the **Edit** drop-down and click **Cancel plan**.
+1. Next to the app you want to cancel, use the **Edit** drop-down and click **Cancel plan**.
   ![Cancel link in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png)

data/reusables/marketplace/cancel-free-trial-billing-settings.md

@@ -1 +1 @@
-1. Under "Subscriptions", next to the free trial you'd like to cancel, use the Edit drop-down and click **Cancel plan**.
+1. Next to the free trial you'd like to cancel, use the **Edit** drop-down and click **Cancel plan**.

data/reusables/marketplace/downgrade-app-billing-settings.md

@@ -1,2 +1,2 @@
-1. Under "Your subscriptions", next to the app you'd like to downgrade, use the Edit drop-down and click **Change plan** or **Cancel plan**.
+1. Next to the app you'd like to downgrade, use the **Edit** drop-down and click **Change plan** or **Cancel plan**.
   ![Edit link in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png)

data/reusables/marketplace/upgrade-app-billing-settings.md

@@ -1,2 +1,2 @@
-1. Use the **Edit** drop-down and click **Change plan**.
+1. Next to the app you want to upgrade, use the **Edit** drop-down and click **Change plan**.
   ![Edit drop-down in the Marketplace Purchases section of your personal account's billing settings](/assets/images/help/marketplace/marketplace-edit-app-billing-settings.png)

data/reusables/organizations/billing_plans.md

@@ -1,2 +1,2 @@
-1. In your organization's Settings sidebar, click **Billing & planning**.
+1. In your organization's Settings sidebar, click **Billing & plans**.
-![Billing settings](/assets/images/help/billing/settings_organization_billing_planning_tab.png)
+![Billing settings](/assets/images/help/billing/settings_organization_billing_plans_tab.png)

data/reusables/user_settings/payment-info-link.md

@@ -0,0 +1,2 @@
+1. At the top of the page, click **Payment information**.
+  ![Payment information link](/assets/images/help/settings/payment-info-link.png)

data/reusables/user_settings/payment-info-tab.md

@@ -1,2 +0,0 @@
-1. Click **Payment information**.
-  ![Payment information tab](/assets/images/help/settings/payment-info-tab.png)