Merge pull request #45750 from github/repo-sync

Repo sync

Author: docs-bot

Dockerfile

@@ -10,7 +10,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:20260813-231302-ge6a10052f@sha256:5b0e63cc812202f8b958afd73ad9d7409f78df895c724701fa9e17312d2dab90 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260902-091552-ga96e4354a@sha256:5075bf9763afa1fdf20995dfa0382974a2dfec8d34e7b119b614205d013801d7 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/actions/reference/workflows-and-actions/events-that-trigger-workflows.md

@@ -1073,7 +1073,7 @@ on: workflow_call
 > [!NOTE]
 > {% data reusables.actions.branch-requirement %}
 
-To enable a workflow to be triggered manually, you need to configure the `workflow_dispatch` event. You can manually trigger a workflow run using the {% data variables.product.github %} API, {% data variables.product.prodname_cli %}, or the {% data variables.product.github %} UI. For more information, see [AUTOTITLE](/actions/how-tos/manage-workflow-runs/manually-run-a-workflow).
+To enable a workflow to be triggered manually, you need to configure the `workflow_dispatch` event. On the {% data variables.product.github %} UI, the "Run workflow" button will be present if the workflow file exists on the default branch. Once a workflow has run at least once, you can dispatch it against any branch or tag via the {% data variables.product.github %} API or {% data variables.product.prodname_cli %}. For more information, see [AUTOTITLE](/actions/how-tos/manage-workflow-runs/manually-run-a-workflow).
 
 ```yaml
 on: workflow_dispatch

content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md

@@ -35,8 +35,6 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a
 
 The 50,000 monthly {% data variables.product.prodname_actions %} minutes included with a paid {% data variables.product.prodname_ghe_cloud %} plan do not apply during the trial. The trial includes up to 3,000 minutes of standard {% data variables.product.prodname_dotcom %}-hosted runners. If your trial uses {% data variables.product.prodname_emus %}, you must link an Azure subscription to exceed this limit. If your trial doesn't use {% data variables.product.prodname_emus %}, linking an Azure subscription immediately ends the trial and begins paid usage. For more information, see [AUTOTITLE](/billing/reference/azure-subscription).
 
-Usage of available AI-powered features consumes {% data variables.product.prodname_ai_credits_short %}. For more information, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises).
-
 ## Features not included in the trial
 
 * {% data variables.product.prodname_github_codespaces %}

content/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process.md

@@ -29,7 +29,7 @@ category:
 To upgrade an instance, you must:
 1. **Plan your upgrade strategy** by choosing your upgrade version and the appropriate upgrade package, and scheduling a maintenance window.
 1. **Communicate the upgrade** before and during the upgrade process.
-1. **Prepare your backup strategy** by creating a backup and taking a virtual machine snapshot.
+1. **Prepare your backup strategy** by creating a backup and taking a VM or disk snapshot.
 1. **Install the upgrade package** using the appropriate package and method.
 1. **Complete post-upgrade tasks**.
 
@@ -94,11 +94,13 @@ Check if you need to upgrade the following applications:
 
 Ensure you have a recent, successful backup snapshot of your instance's primary node before you start the upgrade process. See [AUTOTITLE](/admin/backing-up-and-restoring-your-instance/about-the-backup-service-for-github-enterprise-server) and the [README](https://github.com/github/backup-utils#readme) in the {% data variables.product.prodname_enterprise_backup_utilities %} project documentation.
 
-### Create a VM snapshot
+### Create a VM or disk snapshot
 
-If you're upgrading to a new feature release, a virtual machine (VM) snapshot is required. If you're upgrading to a patch release, you can attach the existing data disk.
+This snapshot is separate from the backup snapshot described above. If you're upgrading to a new feature release, a VM or disk snapshot is required. If you're upgrading to a patch release, you can attach the existing data disk.
 
-Create a virtual machine (VM) snapshot of your instance's primary node immediately before upgrading, and only when maintenance mode has been enabled or the instance has been powered down. See [AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/taking-a-snapshot).
+Create the snapshot of your instance's primary node immediately before upgrading, and only when maintenance mode has been enabled or the instance has been powered down.
+
+Which type you can take depends on your platform. AWS and Google Compute Engine support disk snapshots only. See [AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/taking-a-snapshot).
 
 ## Installing an upgrade package
 
@@ -118,6 +120,6 @@ The instructions for upgrading your {% data variables.product.prodname_ghe_serve
 * Check the status of background jobs, and review the upgrade log for errors.
 * Check basic {% data variables.product.prodname_ghe_server %} functionality. For example, ensure you can sign in via the user interface, and verify that several of your organizations, repositories and issues can be reached as expected. It's also a good idea to manually run several Git fetches, clones, and pushes using SSH and/or HTTPS, and check that API requests and webhook deliveries complete successfully.
 * Reapply any custom firewall rules. See [AUTOTITLE](/admin/configuring-settings/configuring-network-settings/configuring-built-in-firewall-rules).
-* Delete any VM snapshots taken prior to upgrading. See [AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/taking-a-snapshot).
+* Delete any VM or disk snapshots taken prior to upgrading. See [AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/taking-a-snapshot).
 * Disable maintenance mode, and update any pre-upgrade communications such as announcement banners. See [AUTOTITLE](/admin/managing-accounts-and-repositories/communicating-information-to-users-in-your-enterprise/customizing-user-messages-for-your-enterprise#creating-a-global-announcement-banner) and [AUTOTITLE](/admin/administering-your-instance/configuring-maintenance-mode/enabling-and-scheduling-maintenance-mode).
 * Monitor all queued background jobs on your instance to ensure they complete successfully. See [AUTOTITLE](/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities).

content/admin/upgrading-your-instance/preparing-to-upgrade/taking-a-snapshot.md

@@ -1,6 +1,6 @@
 ---
 title: Taking a snapshot
-intro: To save your {% data variables.product.prodname_ghe_server %} data before upgrading, take a virtual machine snapshot.
+intro: To save your {% data variables.product.prodname_ghe_server %} data before upgrading, take a VM or disk snapshot.
 redirect_from:
   - /admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server#taking-a-snapshot
   - /enterprise/admin/installation/upgrading-github-enterprise-server#taking-a-snapshot
@@ -14,7 +14,7 @@ category:
 
 ## About snapshots
 
-A snapshot stores the state of a virtual machine (VM) at a point in time. {% data variables.product.company_short %} highly recommends taking a hypervisor level snapshot before upgrading your VM so that if an upgrade fails, you can revert your VM back to the snapshot.
+A snapshot stores the state of a virtual machine (VM) at a point in time. {% data variables.product.company_short %} highly recommends taking a VM or disk snapshot before upgrading your VM so that if an upgrade fails, you can restore your instance from the snapshot.
 
 ## Types of snapshots
 
@@ -39,3 +39,10 @@ The type of snapshot you can take depends on the platform you use.
 | Hyper-V | VM | [Enable or disable checkpoints in Hyper-V](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/enable-or-disable-checkpoints-in-hyper-v) in Microsoft Learn
 | Google Compute Engine | Disk | [Create and manage disk snapshots](https://cloud.google.com/compute/docs/disks/create-snapshots) in the Google Cloud documentation
 | VMware | VM | [Taking Snapshots of a Virtual Machine](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.hostclient.doc/GUID-64B866EF-7636-401C-A8FF-2B4584D9CA72.html) in VMware Docs
+
+## Restoring from a snapshot
+
+If an upgrade fails, you can restore your instance from the snapshot you took before upgrading.
+
+* If you took a VM snapshot, revert the VM to the snapshot.
+* If you took disk snapshots, deploy a new instance running the same release as the snapshots, then attach volumes created from those snapshots. See [AUTOTITLE](/admin/installing-your-enterprise-server).

content/copilot/concepts/about-enterprise-accounts-for-copilot-business.md

@@ -8,16 +8,6 @@ redirect_from:
   - /admin/copilot-business-only
   - /admin/copilot-business-only/about-enterprise-accounts-for-copilot-business
   - /early-access/copilot/managing-copilot-business-licenses-with-an-enterprise-account
-  - /billing/managing-billing-for-github-copilot/managing-your-github-copilot-business-subscription
-  - /billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise
-  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/subscribing-to-copilot-for-your-organization
-  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-subscription-for-your-organization/subscribing-to-copilot-for-your-organization
-  - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-plan-for-your-organization/subscribing-to-copilot-for-your-organization
-  - /copilot/how-tos/administer/organizations/managing-the-copilot-plan-for-your-organization/subscribing-to-copilot-for-your-organization
-  - /copilot/how-tos/administer/organizations/managing-the-copilot-plan-for-your-organization/subscribe
-  - /copilot/how-tos/administer/organizations/manage-plan/subscribe
-  - /copilot/how-tos/administer/manage-for-organization/manage-plan/subscribe
-  - /copilot/how-tos/administer-copilot/manage-for-organization/manage-plan/subscribe
 contentType: concepts
 category:
   - Learn about Copilot

content/copilot/concepts/billing/index.md

@@ -1,14 +1,13 @@
 ---
 title: GitHub Copilot billing
 shortTitle: Billing
-intro: 'Understand billing and usage for {% data variables.product.prodname_copilot %}.'
+intro: Understand billing and usage for {% data variables.product.prodname_copilot %}.
 versions:
   feature: copilot
 children:
   - /usage-based-billing-for-individuals
-  - /usage-based-billing-for-organizations-and-enterprises
-  - /budgets-for-usage-based-billing
   - /organizations-and-enterprises
+  - /budgets-for-usage-based-billing
 redirect_from:
   - /managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments
   - /copilot/managing-copilot/understanding-and-managing-copilot-usage

…billing/organizations-and-enterprises.md …izations-and-enterprises/fundamentals.mdcontent/copilot/concepts/billing/organizations-and-enterprises.md renamed to content/copilot/concepts/billing/organizations-and-enterprises/fundamentals.md content/copilot/concepts/billing/organizations-and-enterprises.md renamed to content/copilot/concepts/billing/organizations-and-enterprises/fundamentals.md

@@ -1,8 +1,8 @@
 ---
 title: About billing for GitHub Copilot in organizations and enterprises
-shortTitle: Organizations and enterprises
-intro: 'Learn about pricing and billing cycles for {% data variables.product.prodname_copilot_short %}.'
-product: 'Organizations on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan, or organizations and enterprises on {% data variables.product.prodname_ghe_cloud %}'
+shortTitle: Fundamentals
+intro: Learn about pricing and billing cycles for {% data variables.product.prodname_copilot_short %}.
+product: Organizations on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan, or organizations and enterprises on {% data variables.product.prodname_ghe_cloud %}
 versions:
   feature: copilot
 redirect_from:
@@ -16,8 +16,9 @@ redirect_from:
   - /copilot/concepts/copilot-billing/billing-for-enterprises
   - /copilot/concepts/billing/billing-for-enterprises
   - /copilot/concepts/billing/billing-for-organizations
+  - /copilot/concepts/billing/organizations-and-enterprises
 contentType: concepts
-category: 
+category:
   - Manage Copilot for a team
 ---
 
@@ -31,7 +32,7 @@ category:
 <!-- expires 2026-09-01 -->
 
 > [!NOTE]
-> Existing customers receive higher included {% data variables.product.prodname_ai_credits_short %} during the promotional period (June–August 2026). See [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises#promotional-amounts-for-existing-customers).
+> Existing customers receive higher included {% data variables.product.prodname_ai_credits_short %} during the promotional period (June–August 2026). See [AUTOTITLE](/copilot/concepts/billing/organizations-and-enterprises/usage-based-billing#promotional-amounts-for-existing-customers).
 
 <!-- end expires 2026-09-01 -->
 
@@ -51,15 +52,15 @@ For a full explanation of how {% data variables.product.prodname_ai_credits_shor
 
 A {% data variables.product.prodname_copilot_short %} seat is a license to use {% data variables.product.prodname_copilot %} for a user. Each month, your organization or enterprise is billed for the number of assigned seats.
 
-Seat assignment is managed by organization owners. With {% data variables.product.prodname_ghe_cloud %}, an enterprise owner must have enabled {% data variables.product.prodname_copilot %} for the organization before an organization owner can assign seats. See [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-organization/manage-access/grant-access).
+Seat assignment is managed by enterprise or organization owners. With {% data variables.product.prodname_ghe_cloud %}, an enterprise owner must have enabled {% data variables.product.prodname_copilot %} for the organization before an organization owner can assign seats. See [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-enterprise/manage-access/grant-access) or [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-for-organization/manage-access/grant-access).
 
 If a user receives a seat from multiple organizations in the same enterprise, the enterprise will be billed only once, and one organization is selected and billed for the seat. To determine which organization is billed for a given user, request a detailed usage report and refer to the `organization` column for the user's {% data variables.product.prodname_copilot_short %} license. See [AUTOTITLE](/billing/reference/billing-reports).
 
 ## Billing cycles
 
 Billed users are calculated at the end of each billing cycle, based on the number of {% data variables.product.prodname_copilot %} seats that are assigned. You can add or remove seats at any time during the billing cycle.
 
-When you add seats, you will be billed pro rata for those seats for the rest of the billing cycle. Included {% data variables.product.prodname_ai_credits_short %} for the seats may also be prorated.
+When you add seats, you will be billed pro rata for those seats for the rest of the billing cycle. Included {% data variables.product.prodname_ai_credits_short %} for the seats may also be prorated. If you pay by credit card or PayPal, you will need to pay a prorated amount upfront to cover the seats for the rest of the current billing cycle. 
 
 When you remove seats, billing for those seats continues until the end of the current billing cycle.
 

content/copilot/concepts/billing/organizations-and-enterprises/index.md

@@ -0,0 +1,11 @@
+---
+title: GitHub Copilot billing for organizations and enterprises
+shortTitle: Organizations and enterprises
+intro: Understand billing and usage for {% data variables.product.prodname_copilot %}.
+versions:
+  feature: copilot
+children:
+  - /fundamentals
+  - /usage-based-billing
+contentType: concepts
+---

…ing-for-organizations-and-enterprises.md …s-and-enterprises/usage-based-billing.mdcontent/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises.md renamed to content/copilot/concepts/billing/organizations-and-enterprises/usage-based-billing.md content/copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises.md renamed to content/copilot/concepts/billing/organizations-and-enterprises/usage-based-billing.md

@@ -1,13 +1,14 @@
 ---
 title: Usage-based billing for organizations and enterprises
-shortTitle: Billing for organizations and enterprises
+shortTitle: Usage-based billing
 intro: 'Under usage-based billing, {% data variables.product.prodname_copilot_short %} usage in organizations and enterprises is measured in {% data variables.product.prodname_ai_credits_short %}.'
 permissions: Enterprise and organization owners and billing managers
 versions:
   feature: copilot
 product: '{% data variables.copilot.copilot_enterprise_short %} or {% data variables.copilot.copilot_business_short %}'
 redirect_from:
   - /copilot/how-tos/manage-and-track-spending/prepare-for-usage-based-billing
+  - /copilot/concepts/billing/usage-based-billing-for-organizations-and-enterprises
 contentType: concepts
 category:
   - Manage Copilot for a team
@@ -61,7 +62,7 @@ After the promotional period, included usage returns to the standard amounts abo
 
 When your pooled {% data variables.product.prodname_ai_credits_short %} are exhausted, what happens next depends on how you have configured policies for additional usage.
 
-* **Additional usage allowed**: Usage continues at published per-credit rates. The additional spend is charged to your organization or enterprise.
+* **Additional usage allowed**: Usage continues at published per-credit rates. The additional spend is charged to your organization or enterprise. Note that additional usage **may be capped**: if you hit the cap, you'll need to pay off any additional usage you've already consumed in order to continue.
 * **Additional usage not allowed**: Usage is blocked until the next billing cycle when monthly amounts are refreshed.
 
 > [!NOTE]