Merge pull request #38968 from github/repo-sync

Repo sync

Author: docs-bot

assets/images/help/billing/org-budget-example.png

@@ -12,17 +12,17 @@ featuredLinks:
     - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-new-billing-platform{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-your-billing/managing-your-payment-and-billing-information{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-billing-cycle{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/preventing-overspending{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/using-budgets-control-spending{% endif %}'
     - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
   popular:
     - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/about-billing-for-github-actions{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/about-billing-for-github-codespaces{% endif %}'
     - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-billing-for-your-products/viewing-your-product-usage{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
   guideCards:
     - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
@@ -43,4 +43,3 @@ children:
   - /managing-billing-for-your-products
   - /setting-up-paid-accounts-for-procurement-companies
 ---
-

assets/images/help/billing/overview-chart-download-button.png

@@ -6,14 +6,19 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/about-billing-for-github-actions
   - /billing/managing-billing-for-github-actions/about-billing-for-github-actions
   - /early-access/billing/actions-billing-update
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions
+  # Redirect for old maptopic
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-actions
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions
+  - /billing/managing-billing-for-github-actions
 versions:
   fpt: '*'
   ghec: '*'
 type: overview
 topics:
   - Actions
   - Spending limits
-shortTitle: Billing for GitHub Actions
+shortTitle: GitHub Actions
 ---
 
 ## About billing for {% data variables.product.prodname_actions %}
@@ -22,9 +27,7 @@ shortTitle: Billing for GitHub Actions
 
 {% data reusables.actions.actions-billing %}
 
-{% data reusables.actions.actions-spending-limit-brief %} For more information, see [About spending limits](#about-spending-limits).
-
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif %}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif %} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts included with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription).
+If you are an organization owner or enterprise owner, you can connect an Azure Subscription ID to your organization or enterprise account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts included with your account. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription).
 
 Minutes reset every month, while storage usage does not.
 
@@ -42,7 +45,7 @@ Minutes reset every month, while storage usage does not.
 | {% data variables.product.prodname_team %} | 2 GB | 3,000 |
 | {% data variables.product.prodname_ghe_cloud %} | 50 GB | 50,000 |
 
-If your account's storage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day.
+If your account's storage surpasses these limits and you have a valid payment method on file, you will pay $0.008 USD per GB of storage per day.
 
 ### Minute multipliers
 
@@ -131,7 +134,7 @@ At the end of the month, {% data variables.product.prodname_dotcom %} calculates
 
 ### Sample minutes cost calculation
 
-For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 5,000 minutes could have a total storage and minute overage cost of $56 USD, depending on the operating systems used to run jobs.
+For example, if your organization uses {% data variables.product.prodname_team %} and allows unlimited spending, using 5,000 minutes beyond the included quota could have a total storage and minute cost of $56 USD, depending on the operating systems used to run jobs.
 
 * 5,000 (3,000 Linux and 2,000 Windows) minutes = $56 USD ($24 USD + $32 USD).
   * 3,000 Linux minutes at $0.008 USD per minute = $24 USD.
@@ -155,10 +158,6 @@ At the end of the month, {% data variables.product.prodname_dotcom %} rounds you
 
 Your {% data variables.product.prodname_actions %} usage shares your account's existing billing date, payment method, and receipt. {% data reusables.dotcom_billing.view-all-subscriptions %}
 
-## About spending limits
-
-{% data reusables.actions.actions-spending-limit-detailed %}
-
-For information on managing and changing your account's spending limit, see [AUTOTITLE](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions).
+## Managing your budget for {% data variables.product.prodname_actions %}
 
-{% data reusables.dotcom_billing.actions-packages-unpaid-account %}
+{% data reusables.billing.default-over-quota-behavior %}

assets/images/help/billing/overview-product-summary.png

@@ -1,6 +1,6 @@
 ---
 title: About billing for GitHub Codespaces
-shortTitle: About billing
+shortTitle: GitHub Codespaces
 intro: 'Learn about the costs for using {% data variables.product.prodname_github_codespaces %}, and the monthly usage quotas included with {% data variables.product.prodname_dotcom %} personal accounts.'
 versions:
   fpt: '*'
@@ -15,8 +15,12 @@ redirect_from:
   - /codespaces/getting-started-with-codespaces/about-billing-for-codespaces
   - /codespaces/codespaces-reference/about-billing-for-codespaces
   - /codespaces/codespaces-reference/understanding-billing-for-codespaces
-  - /codespaces/codespaces-reference/understanding-billing-for-github-codespaces.md
+  - /codespaces/codespaces-reference/understanding-billing-for-github-codespaces
   - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
+  # Redirect for old maptopic
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces
+  - /billing/managing-billing-for-github-codespaces
 ---
 
 ## About {% data variables.product.prodname_github_codespaces %} pricing
@@ -69,19 +73,19 @@ A "core hour" is a measure used for included compute usage. To calculate core ho
 
 ### Using your included usage
 
-You will be notified by email when you have used 75%, 90%, and 100% of your included quotas. Notifications are also displayed in a "toast" message within {% data variables.product.prodname_vscode_shortname %} and the {% data variables.product.prodname_vscode_shortname %} web client. You can turn off email notifications if required. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-usage-and-spending-limit-email-notifications).
+You will be notified by email when you have used 75%, 90%, and 100% of your included quotas. Notifications are also displayed in a "toast" message within {% data variables.product.prodname_vscode_shortname %} and the {% data variables.product.prodname_vscode_shortname %} web client. You can turn off email notifications if required. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).
 
-When a personal account has used all of either the included storage or compute usage (whichever is reached first), and has no spending limit configured, use of {% data variables.product.prodname_github_codespaces %} will be blocked. You must set up a payment method and a spending limit to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. At the beginning of the next monthly billing cycle the included usage is reset. Storage will not be billed while use of {% data variables.product.prodname_github_codespaces %} is blocked.
+When a personal account has used all of either the included storage or compute usage (whichever is reached first), and has no payment method defined, use of {% data variables.product.prodname_github_codespaces %} will be blocked. You must set up a payment method to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. At the beginning of the next monthly billing cycle the included usage is reset. Storage will not be billed while use of {% data variables.product.prodname_github_codespaces %} is blocked.
 
 You can view details of your usage for the current month at any time. See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage).
 
 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 a spending limit greater than $0 USD.
+* Add a payment method and set a budget greater than $0 USD.
 * 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.
 
-If you have used all of either your included storage usage or your included compute usage, and you have set up a payment method and a spending limit, any further use of codespaces owned by your personal account will incur charges for whichever type of usage has no remaining included quota. You will not be charged for the other type of usage until you have also used all of its included quota.
+If you have used all of either your included storage usage or your included compute usage, and you have set up a payment method, any further use of codespaces owned by your personal account will incur charges for whichever type of usage has no remaining included quota. You will not be charged for the other type of usage until you have also used all of its included quota. See [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).
 
 {% data reusables.codespaces.tips-included-usage %}
 
@@ -122,7 +126,7 @@ You can control compute usage by stopping your codespaces. For information, see
 
 ## About billing for storage usage
 
-For {% data variables.product.prodname_github_codespaces %} billing purposes, storage comprises the disk space used by all of the codespaces and prebuilds in your account. This includes any files you use in a codespace, such as cloned repositories, configuration files, data loaded to the codespace (for example as input or output of the software running in the repository), and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or inactive with the exception of blocked usage due to exhausted included usage quota or reaching your spending limit. The storage billing for a codespace ends when it is deleted. However, deleting a codespace does not reduce your used storage amount for the current billing month as this is a cumulative figure.
+For {% data variables.product.prodname_github_codespaces %} billing purposes, storage comprises the disk space used by all of the codespaces and prebuilds in your account. This includes any files you use in a codespace, such as cloned repositories, configuration files, data loaded to the codespace (for example as input or output of the software running in the repository), and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or inactive with the exception of blocked usage due to exhausted included usage quota or reaching your budget limit. The storage billing for a codespace ends when it is deleted. However, deleting a codespace does not reduce your used storage amount for the current billing month as this is a cumulative figure.
 
 ### Storage billing for containers based on the default image
 
@@ -196,11 +200,9 @@ Prebuilds can be updated multiple times during a billing month. Each update may
 
 Use of codespaces created using prebuilds is charged at the same rate as regular codespaces.
 
-## Setting a spending limit
+## Managing your budget for {% data variables.product.prodname_github_codespaces %}
 
-{% data reusables.codespaces.codespaces-spending-limit-requirement %}
-
-For information on managing and changing your account's spending limit, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces).
+{% data reusables.billing.default-over-quota-behavior %}
 
 {% data reusables.codespaces.exporting-changes %}
 
@@ -244,7 +246,7 @@ Usage is calculated every hour. An organization pays for usage of codespaces cre
 
 You can get started on a new project by creating a codespace from a template. Codespaces created from templates aren't initially associated with a repository, but you can publish the codespace to a repository owned by your personal account. See [AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-from-a-template).
 
-Any organization can maintain a template repository for use with {% data variables.product.prodname_github_codespaces %}. As with any other repository in an organization, a codespace created from a template repository is billed to the organization if the organization has set a spending limit for {% data variables.product.prodname_github_codespaces %} and allowed the user creating the codespace to do so at the organization's expense. Otherwise, the codespace is billed to the user who creates the codespace.
+Any organization can maintain a template repository for use with {% data variables.product.prodname_github_codespaces %}. As with any other repository in an organization, a codespace created from a template repository is billed to the organization if the organization allows the user creating the codespace to do so at the organization's expense. Otherwise, the codespace is billed to the user who creates the codespace.
 
 If a user publishes a codespace created from a template, the codespace is published to a new repository owned by the user's personal account. If the codespace is currently billed to an organization, ownership and billing of the codespace transfer to the user who created the codespace.
 

assets/images/help/billing/product-usage-chart.png

@@ -1,13 +1,17 @@
 ---
 title: About billing for GitHub Copilot
-shortTitle: Billing for GitHub Copilot
+shortTitle: GitHub Copilot
 intro: '{% data variables.product.prodname_dotcom %} offers several {% data variables.product.prodname_copilot_short %} plans for enterprises, organizations, and individual developers.'
 versions:
   feature: copilot
 topics:
   - Copilot
 redirect_from:
   - /billing/managing-billing-for-github-copilot/about-billing-for-github-copilot
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot
+  # Redirect for old maptopic
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-copilot
+  - /billing/managing-billing-for-github-copilot
 ---
 
 ## {% data variables.product.prodname_copilot %} in your enterprise
@@ -73,7 +77,7 @@ For more information about {% data variables.copilot.copilot_coding_agent %}, se
 
 ### What happens if you have used up your monthly quota?
 
-If you run out of free Actions minutes or free premium requests, and you have set up billing and a spending limit, you will be charged at the normal rates for additional minutes and premium requests. See [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#additional-premium-requests).
+If you run out of free Actions minutes or free premium requests, and you have set up a payment method for billing, you will be charged at the normal rates for additional minutes and premium requests. See [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions) and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests#additional-premium-requests).
 
 If you run out of free minutes or premium requests, and you have _not_ set up billing, a message is displayed explaining why {% data variables.product.prodname_copilot_short %} cannot work on the task.