Merge branch 'main' into dependabot-update-terraform-version

Author: Sharra-writes

Dockerfile

@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20250929-093120-g65a62eb8c AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20251002-210935-gc0c2a3725 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

assets/images/help/copilot/coding-agent/assign-to-copilot-dialog.png

@@ -378,11 +378,12 @@ The `job` context contains information about the currently running job.
 
 ### Example contents of the `job` context
 
-This example `job` context uses a PostgreSQL service container with mapped ports. If there are no containers or service containers used in a job, the `job` context only contains the `status` property.
+This example `job` context uses a PostgreSQL service container with mapped ports. If there are no containers or service containers used in a job, the `job` context only contains the `status` and `check_run_id` properties.
 
 ```json
 {
   "status": "success",
+  {% ifversion fpt or ghec %}"check_run_id": 51725241954,{% endif %}
   "container": {
     "network": "github_network_53269bd575974817b43f4733536b200c"
   },

content/actions/reference/workflows-and-actions/contexts.md

@@ -27,7 +27,6 @@ The following features are currently unavailable on {% data variables.enterprise
 | {% data variables.product.prodname_importer %} (the "Import repository" button on {% data variables.product.prodname_dotcom_the_website %}) | Instead, the **{% data variables.product.prodname_importer_proper_name %}** is available to migrate data. See [AUTOTITLE](/migrations/using-github-enterprise-importer/understanding-github-enterprise-importer/about-github-enterprise-importer). | [AUTOTITLE](/migrations/importing-source-code/using-github-importer/about-github-importer) |
 | {% data variables.product.prodname_copilot_short %} Metrics API | Currently unavailable | [AUTOTITLE](/rest/copilot/copilot-metrics) |
 | {% data variables.product.prodname_spark_short %} | Unavailable due to dependency on {% data variables.product.prodname_github_codespaces %} | [AUTOTITLE](/copilot/concepts/spark) |
-| Restricting {% data variables.product.prodname_actions %} policies to verified creators | Currently unavailable | [AUTOTITLE](/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise#allow-enterprise-and-select-non-enterprise-actions-and-reusable-workflows) |
 | {% data variables.product.prodname_github_models %} |  Currently unavailable | [AUTOTITLE](/github-models/about-github-models) |
 | Some features currently in {% data variables.release-phases.public_preview %} or {% data variables.release-phases.private_preview %} | Certain features that are in a preview phase on {% data variables.product.prodname_dotcom_the_website %} may not be available on {% data variables.enterprise.data_residency_site %} | |
 

content/admin/data-residency/feature-overview-for-github-enterprise-cloud-with-data-residency.md

@@ -23,9 +23,13 @@ shortTitle: Usage-based licenses
 contentType: concepts
 ---
 
-With usage-based billing, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_cs_and_sp %} licenses you use. You do not need to buy a predefined number of licenses in advance.
+Usage-based billing means you pay each month for the number of licenses actually consumed in your enterprise account, instead of committing to a fixed number in advance. This model provides flexibility and can be more cost-efficient than traditional volume licensing.
 
-Usage-based billing for licenses provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models.
+{% ifversion enhanced-billing-platform %}
+
+For how billing cycles work and how mid-cycle changes (such as adding or removing seats) affect charges, see [AUTOTITLE](/billing/concepts/billing-cycles) and [AUTOTITLE](/billing/concepts/impact-of-plan-changes).
+
+{% endif %}
 
 ## Do I have usage-based billing?
 

content/billing/concepts/enterprise-billing/usage-based-licenses.md

@@ -20,38 +20,38 @@ shortTitle: Impact of plan changes
 contentType: concepts
 ---
 
-## Upgrades and downgrades
+## How plan changes affect billing
 
-When you upgrade the subscription for your personal account or organization, changes are applied immediately. When you downgrade your subscription, changes are applied at the end of your current billing cycle.
+When you change your paid plan, the impact on billing depends on the type of change:
 
-{% data reusables.accounts.accounts-billed-separately %}
-
-Making a change to your paid personal account, organization, or enterprise account does not affect billing for use of {% data variables.product.github %} features, such as {% data variables.product.prodname_copilot_short %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
-
-For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github).
+| Scenario                        | When is billing affected? | Is proration applied? | When does access change? |
+|---------------------------------|---------------------------|----------------------|--------------------------|
+| Upgrade plan                    | Immediate                 | Yes                  | Immediately              |
+| Downgrade or cancel plan        | End of current cycle      | No                   | End of current cycle     |
+| Add paid seats/licenses         | Immediate (prorated)      | Yes                  | Immediately              |
+| Remove paid seats/licenses      | Next billing cycle        | No                   | End of current cycle (unless access revoked) |
 
-## Examples of plan changes
+Key takeaways:
 
-* [Example of canceling a paid subscription for a personal account or organization](#example-of-canceling-a-paid-subscription-for-a-personal-account-or-organization)
-* [Example of changing from a yearly to a monthly subscription for a personal account or organization](#example-of-changing-from-a-yearly-to-a-monthly-subscription-for-a-personal-account-or-organization)
-* [Example of adding paid seats to your organization](#example-of-adding-paid-seats-to-your-organization)
-* [Example of removing paid seats from your organization](#example-of-removing-paid-seats-from-your-organization)
+* Upgrades are billed and applied immediately.
+* Downgrades and cancellations take effect only after the current billing cycle ends.
+* Adding seats is prorated and grants immediate access.
+* Removing seats takes effect in the next cycle, unless access is manually revoked.
 
-### Example of canceling a paid subscription for a personal account or organization
-
-Kumiko pays for a monthly subscription on the 5th of every month. If Kumiko downgrades from the paid subscription to {% data variables.product.prodname_free_user %} on October 10th, her paid subscription will remain in effect until the end of her current billing cycle on November 4th. On November 5th, her account will move to {% data variables.product.prodname_free_user %}.
-
-### Example of changing from a yearly to a monthly subscription for a personal account or organization
+{% data reusables.accounts.accounts-billed-separately %}
 
-Ravi pays for a yearly subscription on October 5th every year. If Ravi switches from a yearly to monthly billing on December 10th, his account remains on the yearly subscription until the end of its current billing cycle on October 4th the next year. On October 5th of the next year, Ravi will be charged for a month of service. His next billing date will be November 5th.
+Making a change to the {% data variables.product.github %} plan for your personal account, organization, or enterprise account does not affect billing for use of {% data variables.product.github %} features, such as {% data variables.product.prodname_copilot_short %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
 
-### Example of adding paid seats to your organization
+For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github).
 
-Mada's organization pays for 25 seats on the 15th of every month. If Mada adds ten paid seats on June 4th, her organization is immediately charged a prorated amount for ten additional seats for the time between June 4th and June 14th, and the seats are available to use immediately. On June 15th, Mada's organization will pay for 35 seats.
+## Examples
 
-### Example of removing paid seats from your organization
+The following examples illustrate how billing rules are applied in practice:
 
-Stefan's organization pays for 50 seats every year on May 20th. If Stefan removes 20 seats and downgrades to a new total of 30 paid seats on September 30, his organization can still access its 50 paid seats until the end of its current billing cycle on May 19th. On May 20th, the downgrade will take effect - Stefan's organization will pay for 30 seats and will have access to 30 paid seats.
+* **Canceling a monthly subscription:** Kumiko pays on the 5th of each month. She cancels on October 10th. Her subscription remains active until November 4th, then downgrades on November 5th.
+* **Switching from yearly to monthly:** Ravi has a yearly subscription billed October 5th. He switches on December 10th, but the change won’t apply until the next renewal on October 5th the following year.
+* **Adding paid seats:** Mada’s organization pays for 25 seats on the 15th. She adds 10 more on June 4th. She’s immediately charged a prorated amount for June 4–14, and billed for 35 seats starting June 15th.
+* **Removing paid seats:** Stefan’s organization pays for 50 seats annually on May 20th. On September 30th, he removes 20 seats. The change takes effect on the next renewal (May 20th), when the organization will pay for 30 seats.
 
 ## Further reading
 

content/billing/concepts/impact-of-plan-changes.md

@@ -0,0 +1,44 @@
+---
+title: Billing through Azure subscriptions
+shortTitle: Azure billing
+intro: 'Learn how billing works when you connect your {% data variables.product.github %} account to an Azure subscription.'
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+  - Enterprise
+allowTitleToDifferFromFilename: true
+contentType: reference
+---
+
+You can connect an Azure subscription to your {% data variables.product.github %} account. When you do, charges for {% data variables.product.github %} products (such as {% data variables.product.prodname_copilot_short %}, {% data variables.product.prodname_actions %}, or {% data variables.product.prodname_codespaces %}) are billed through Azure instead of directly through {% data variables.product.github %}.
+
+Connecting an Azure subscription allows you to consolidate invoices and manage {% data variables.product.github %} spending within your organization’s existing Azure billing processes.
+
+For details on how to connect, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription).
+
+## Billing cycles and invoicing
+
+* Azure billing periods run on a **calendar month**: from the first day to the last day of each month.
+* Usage data from {% data variables.product.github %} is transmitted to Azure **daily**.
+* Your charges for the month appear on your **Azure invoice at the start of the next month**.
+
+If you enable Azure subscription billing in the middle of a {% data variables.product.github %} billing cycle:
+
+* Usage before the switch is charged by {% data variables.product.github %} on your next {% data variables.product.github %} bill.
+* Usage after the switch is charged by Azure, beginning from the date metered billing is enabled.
+
+## Usage tracking
+
+* Usage is measured daily and sent to Azure.
+* The usage metric depends on the product:
+
+  * **Copilot:** Number of active seats.
+  * **Actions:** Minutes used.
+  * **Codespaces:** Compute hours used.
+
+## Payment methods
+
+When you pay through Azure, your organization’s standard Azure payment methods apply. You will not be billed separately by {% data variables.product.github %} for the connected products.

content/billing/reference/azure-billing.md

@@ -41,6 +41,8 @@ The detailed usage report includes the same fields as the summarized report and
 
 This report sums the `quantity`, `gross_amount`, `discount_amount`, and `net_amount` fields based on the combination of the following values:  `date`, `sku`, `organization`, `repository`, `cost_center_name`, `username`, `workflow_path`.
 
+{% data reusables.billing.usage-reports-api-limitation %}
+
 ### Premium request analytics usage reports
 
 This report includes each recorded use of a premium request and includes the following fields: `Timestamp`,`User`,`Model`,`Requests Used`,`Exceeds Monthly Quota`, and `Total Monthly Quota`.

content/billing/reference/billing-reports.md

@@ -13,6 +13,7 @@ children:
   - /actions-minute-multipliers
   - /billing-reports
   - /supported-payment-methods
+  - /azure-billing
   - /azure-subscription
   - /billing-roles
   - /cost-center-allocation

content/billing/reference/index.md

@@ -87,6 +87,8 @@ You can view the usage of your personal account and download the usage data for
 
    >[!TIP] The premium request usage report includes all premium requests, both within and beyond the allowance.
 
+{% data reusables.billing.usage-reports-api-limitation %}
+
 ## Viewing license usage
 
 You can view the license usage of your {% data variables.enterprise.enterprise_or_org %} members and download the usage data for further analysis.