Merge branch 'main' into discussions-edits

Author: Sharra-writes

assets/images/help/billing/copilot-tab.png

@@ -79,4 +79,8 @@ If the command returns `true`, a direct upgrade from 3.14 to 3.16.0 will fail, a
 
 Alternatively, you can move to 3.16.0 now by first upgrading from 3.14 to 3.15, then from 3.15 to 3.16.0.
 
+## Upgrading to 3.16.0 and 3.17.0 includes a slow data migration for code scanning
+
+Customers who have code scanning enabled may experience slower transitions when upgrading to version 3.16.0, due to changes in the data model that require data migration. We recommend testing this upgrade in a non-production environment first, as it could result in longer downtime than expected. [Updated: 2025-06-12]
+
 {% endif %}

assets/images/help/billing/download-usage-report.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/org-budget-example.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 %}