diff --git a/content/billing/concepts/product-billing/git-lfs.md b/content/billing/concepts/product-billing/git-lfs.md index fdee23dab2..ba3fbc6dfd 100644 --- a/content/billing/concepts/product-billing/git-lfs.md +++ b/content/billing/concepts/product-billing/git-lfs.md @@ -70,6 +70,8 @@ In this example, {% data variables.product.company_short %} would bill for 1.5 G {% data reusables.billing.default-over-quota-behavior %} +{% data reusables.billing.migrated-budgets %} + ## Further reading * [AUTOTITLE](/repositories/working-with-files/managing-large-files/about-git-large-file-storage) diff --git a/content/billing/concepts/product-billing/github-actions.md b/content/billing/concepts/product-billing/github-actions.md index 902d49edf4..906afab336 100644 --- a/content/billing/concepts/product-billing/github-actions.md +++ b/content/billing/concepts/product-billing/github-actions.md @@ -162,3 +162,5 @@ Your {% data variables.product.prodname_actions %} usage shares your account's e ## Managing your budget for {% data variables.product.prodname_actions %} {% data reusables.billing.default-over-quota-behavior %} + +{% data reusables.billing.migrated-budgets %} diff --git a/content/billing/concepts/product-billing/github-codespaces.md b/content/billing/concepts/product-billing/github-codespaces.md index fa640398af..3b73ddec9d 100644 --- a/content/billing/concepts/product-billing/github-codespaces.md +++ b/content/billing/concepts/product-billing/github-codespaces.md @@ -81,7 +81,7 @@ You can view details of your usage for the current month at any time. See [AUTOT If you are blocked from resuming a codespace and you want to continue to work on changes you have made in your codespace, you can do any of the following: -* Add a payment method and set a budget greater than $0 USD. +* Add a payment method and review your budget settings to ensure they meet your usage needs. See [AUTOTITLE](/billing/tutorials/set-up-budgets#viewing-budgets). * Export the changes from the codespace to a branch. See [AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch). * Wait for your monthly included usage to reset at the start of the next monthly billing cycle. @@ -204,6 +204,8 @@ Use of codespaces created using prebuilds is charged at the same rate as regular {% data reusables.billing.default-over-quota-behavior %} +{% data reusables.billing.migrated-budgets %} + {% data reusables.codespaces.exporting-changes %} ## Viewing projected usage for an organization diff --git a/content/billing/concepts/product-billing/github-models.md b/content/billing/concepts/product-billing/github-models.md index 45b0a383f6..aacb3710d0 100644 --- a/content/billing/concepts/product-billing/github-models.md +++ b/content/billing/concepts/product-billing/github-models.md @@ -65,7 +65,9 @@ For accounts that use a custom model with a third-party model provider, billing Enterprises and organizations can opt in to paid usage to access expanded model capabilities, including increased request allowances and larger context windows. You can manage their spending by setting a budget. -By default, organizations and personal accounts that opt in to paid usage have a spending limit of $0 US dollars (USD) until the budget is increased. +Organizations and personal accounts may have default budgets to limit spending. Check the budgets for your account to ensure they are appropriate for your usage needs. See [AUTOTITLE](/billing/tutorials/set-up-budgets#viewing-budgets). + +{% data reusables.billing.migrated-budgets %} For more information, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). @@ -105,24 +107,24 @@ The following table displays how the total cost is calculated for a request usin The following steps demonstrate how the total cost is calculated: -1. **Calculate input tokens:** - Multiply the number of input tokens by the input multiplier. +1. **Calculate input tokens:** + Multiply the number of input tokens by the input multiplier. `1,000,000 tokens × 0.25 = 250,000 input token units` -1. **Calculate billable output tokens:** - Multiply the number of output tokens by the output multiplier. +1. **Calculate billable output tokens:** + Multiply the number of output tokens by the output multiplier. `1,000,000 tokens × 1 = 1,000,000 output token units` -1. **Add billable tokens:** - Add the billable input and output tokens. +1. **Add billable tokens:** + Add the billable input and output tokens. `250,000 (input) + 1,000,000 (output) = 1,250,000 total token units` -1. **Charges by type:** - * **Input charge:** `250,000 × $0.00001 = $2.50` +1. **Charges by type:** + * **Input charge:** `250,000 × $0.00001 = $2.50` * **Output charge:** `1,000,000 × $0.00001 = $10.00` -1. **Calculate the total cost:** - Multiply the total token units by the token unit price. +1. **Calculate the total cost:** + Multiply the total token units by the token unit price. `1,250,000 × $0.00001 = $12.50 for this request` ## Opting out of paid usage diff --git a/content/billing/concepts/product-billing/github-packages.md b/content/billing/concepts/product-billing/github-packages.md index a72132a2ce..42b0a70cf0 100644 --- a/content/billing/concepts/product-billing/github-packages.md +++ b/content/billing/concepts/product-billing/github-packages.md @@ -91,3 +91,5 @@ Your {% data variables.product.prodname_registry %} usage shares your account's ## Managing your budget for {% data variables.product.prodname_registry %} {% data reusables.billing.default-over-quota-behavior %} + +{% data reusables.billing.migrated-budgets %} diff --git a/content/billing/tutorials/set-up-budgets.md b/content/billing/tutorials/set-up-budgets.md index 7a5280d10b..b6b53a622d 100644 --- a/content/billing/tutorials/set-up-budgets.md +++ b/content/billing/tutorials/set-up-budgets.md @@ -34,9 +34,9 @@ Budgets and alerts allow you to track spending on metered products for your acco If your account does not have a valid payment method on file, usage is blocked once you use up your quota. -By default, if you have a valid payment method on file, spending is limited to $0 USD until you set a budget. You can set and manage a budget to limit spending for a product or SKU. +If you have a valid payment method on file, spending may be limited by one or more budgets. Check the budgets set for your account to ensure they are appropriate for your usage needs. - +{% data reusables.billing.migrated-budgets %} ## About budgets @@ -126,7 +126,7 @@ As the owner of an enterprise or organization account, or as a billing manager, ### Editing or deleting a budget ->[!IMPORTANT] Deleting a budget may remove any limits on spending, depending on your other existing budgets. For example, deleting the default $0 budget for {% data variables.product.prodname_copilot_short %} premium requests allows for unlimited usage. +>[!IMPORTANT] Deleting a budget may remove any limits on spending, depending on your other existing budgets. For example, deleting the only budget that limits {% data variables.product.prodname_copilot_short %} premium requests allows for unlimited usage. You can edit or delete a budget at any time, but you cannot change the scope of a budget after creating it. diff --git a/content/codespaces/about-codespaces/what-are-codespaces.md b/content/codespaces/about-codespaces/what-are-codespaces.md index 4b3305a863..b205c202fe 100644 --- a/content/codespaces/about-codespaces/what-are-codespaces.md +++ b/content/codespaces/about-codespaces/what-are-codespaces.md @@ -67,6 +67,6 @@ See [AUTOTITLE](/codespaces/customizing-your-codespace). For information on pricing, storage, and usage for {% data variables.product.prodname_github_codespaces %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces). -{% data reusables.codespaces.codespaces-spending-limit-requirement %} +{% data reusables.billing.default-over-quota-behavior %} {% data reusables.codespaces.codespaces-monthly-billing %} For information on how organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_github_codespaces %} for an organization, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces). diff --git a/content/packages/learn-github-packages/introduction-to-github-packages.md b/content/packages/learn-github-packages/introduction-to-github-packages.md index 205541d3ff..95b39b5b04 100644 --- a/content/packages/learn-github-packages/introduction-to-github-packages.md +++ b/content/packages/learn-github-packages/introduction-to-github-packages.md @@ -47,7 +47,11 @@ The permissions for a package are either inherited from the repository where the ## About billing for {% data variables.product.prodname_registry %} -{% data reusables.package_registry.packages-billing %} {% data reusables.package_registry.packages-spending-limit-brief %} For more information, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages). +{% data reusables.package_registry.packages-billing %} + +{% data reusables.billing.default-over-quota-behavior %} + +For more information, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages). {% endif %} diff --git a/data/reusables/actions/actions-spending-limit-brief.md b/data/reusables/actions/actions-spending-limit-brief.md index 8005a32b08..6b5f9fdcbc 100644 --- a/data/reusables/actions/actions-spending-limit-brief.md +++ b/data/reusables/actions/actions-spending-limit-brief.md @@ -1,3 +1 @@ -If you are a monthly-billed customer, your account will have a default budget of 0 US dollars (USD), which prevents additional usage of minutes or storage for private repositories beyond the quota included with your account. If you pay your account by invoice, your account will have an unlimited default spending limit. - - +Monthly-billed customers may have budgets that prevent additional usage of minutes or storage for private repositories beyond the quota included with your account. Invoice-billed customers typically have unlimited spending. Check your account's budgets to ensure they are appropriate for your usage needs. See [AUTOTITLE](/billing/tutorials/set-up-budgets#viewing-budgets). diff --git a/data/reusables/billing/default-over-quota-behavior.md b/data/reusables/billing/default-over-quota-behavior.md index 5b6dd38d52..65ad13891e 100644 --- a/data/reusables/billing/default-over-quota-behavior.md +++ b/data/reusables/billing/default-over-quota-behavior.md @@ -1,5 +1,3 @@ If your account does not have a valid payment method on file, usage is blocked once you use up your quota. -By default, if you have a valid payment method on file, spending is limited to $0 USD until you set a budget. You can set and manage a budget to limit spending for a product or SKU. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). - - +If you have a valid payment method on file, spending may be limited by one or more budgets. Check the budgets set for your account to ensure they are appropriate for your usage needs. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). diff --git a/data/reusables/billing/migrated-budgets.md b/data/reusables/billing/migrated-budgets.md new file mode 100644 index 0000000000..1248985af1 --- /dev/null +++ b/data/reusables/billing/migrated-budgets.md @@ -0,0 +1,6 @@ + + + +Accounts that have migrated from the old billing platform may contain automatically generated budgets that mirror their previous spending limits. + + diff --git a/data/reusables/codespaces/codespaces-spending-limit-requirement.md b/data/reusables/codespaces/codespaces-spending-limit-requirement.md index a34b251d76..aafcb78e7a 100644 --- a/data/reusables/codespaces/codespaces-spending-limit-requirement.md +++ b/data/reusables/codespaces/codespaces-spending-limit-requirement.md @@ -1,3 +1 @@ ->[!NOTE] You must set a non-zero spending limit on your personal, organization, or enterprise account before the account can be billed for use of {% data variables.product.prodname_github_codespaces %}. - -By default, all accounts have a {% data variables.product.prodname_github_codespaces %} spending limit of $0 USD. This prevents new codespaces being created, or existing codespaces being opened, if doing so would incur a billable cost to your personal, organization, or enterprise account. For personal accounts, if you have access to create a codespace, you can do so as long as the account has not reached the limit of its monthly included usage. For organizations and enterprises, the default spending limit means that, to allow people to create codespaces that are billed to the organization, or its parent enterprise, the limit must be changed to a value above $0 USD. +Accounts may have spending limits that prevent new codespaces being created, or existing codespaces being opened, if doing so would incur a billable cost to your personal, organization, or enterprise account. Check your account's budgets to ensure they are appropriate for your usage needs. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending). diff --git a/data/reusables/package_registry/packages-spending-limit-brief.md b/data/reusables/package_registry/packages-spending-limit-brief.md index 72ed6e5ffc..b9ab7fc8b3 100644 --- a/data/reusables/package_registry/packages-spending-limit-brief.md +++ b/data/reusables/package_registry/packages-spending-limit-brief.md @@ -1 +1 @@ -If you are a monthly-billed customer, your account will have a default spending limit of 0 US dollars (USD), which prevents additional usage of storage or data transfer after you reach the included amounts. If you pay your account by invoice, your account will have an unlimited default spending limit. +Monthly-billed customers may have spending limits in place that prevent additional usage of storage or data transfer after you reach the included amounts. Invoice-billed customers typically have unlimited spending. Check your account's budgets to ensure they are appropriate for your usage needs. See [AUTOTITLE](/billing/tutorials/set-up-budgets#viewing-budgets).