Merge branch 'main' into codespaces-universe-megabranch

2022-10-13 14:19:18 +01:00 · 2022-10-13 14:19:18 +01:00 · 38a5697f5e
--- a/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md
+++ b/content/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance.md
@ -93,7 +93,7 @@ Optionally, if you use {% data variables.product.prodname_registry %} on your pr

 {% warning %}

-**Warning**: If you don't configure {% data variables.product.prodname_actions %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance.
+**Warning**: If you don't configure {% data variables.product.prodname_registry %} on the staging instance before restoring your production backup, your staging instance will use your production instance's external storage, which could result in loss of data. We strongly recommended that you use different external storage for your staging instance.

 {% endwarning %}

@ -128,7 +128,7 @@ Optionally, if you use {% data variables.product.prodname_registry %} on your pr

 Use the `ghe-restore` command to restore the rest of the data from the backup. For more information, see "[Restoring a backup](/admin/configuration/configuring-backups-on-your-appliance#restoring-a-backup)."

-If the staging instance is already configured and you're about to overwrite settings, certificate, and license data, add the `-c` option to the command. For more information about the option, see [Using the backup and restore commands](https://github.com/github/backup-utils/blob/master/docs/usage.md#restoring-settings-tls-certificate-and-license) in the {% data variables.product.prodname_enterprise_backup_utilities %} documentation.
+If the staging instance is already configured and you want to overwrite settings, certificate, and license data, add the `-c` option to the command. For more information about the option, see [Using the backup and restore commands](https://github.com/github/backup-utils/blob/master/docs/usage.md#restoring-settings-tls-certificate-and-license) in the {% data variables.product.prodname_enterprise_backup_utilities %} documentation.

 ### 6. Review the instance's configuration

--- a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
@ -3,6 +3,7 @@ title: About billing for GitHub Codespaces
 shortTitle: About billing
 intro: 'View pricing and see how to manage {% data variables.product.prodname_github_codespaces %} billing for your organization.'
 permissions: 'To manage billing for {% data variables.product.prodname_github_codespaces %} for an organization, you must be an organization owner or a billing manager.'
+miniTocMaxHeadingLevel: 3
 versions:
  fpt: '*'
  ghec: '*'
@ -13,40 +14,105 @@ topics:
  - Billing
 redirect_from:
  - /billing/managing-billing-for-github-codespaces/about-billing-for-codespaces
+  - /github/developing-online-with-codespaces/about-billing-for-codespaces
+  - /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
 ---

 ## {% data variables.product.prodname_github_codespaces %} pricing

-Charges are incurred for the use of {% data variables.product.prodname_github_codespaces %} for repositories owned by organization and enterprise accounts on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %}. These accounts do not include any free minutes or storage for {% data variables.product.prodname_github_codespaces %}. Repositories in personal accounts are not currently billed for {% data variables.product.prodname_github_codespaces %} usage.
+Charges are incurred for the use of {% data variables.product.prodname_github_codespaces %} for repositories owned by organization and enterprise accounts on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %}. These accounts do not include any free minutes or storage for {% data variables.product.prodname_github_codespaces %}. Personal accounts are not currently billed for {% data variables.product.prodname_github_codespaces %} usage.
+
+A {% data variables.product.prodname_github_codespaces %} instance (a "codespace") incurs charges for compute time, while it is active, and for the amount of storage it uses on disk.

 {% data variables.product.prodname_github_codespaces %} usage is billed according to the units of measure in the following table:

-| Product             | SKU      | Unit of measure | Price |
-| ------------------- | -------- | --------------- | ----- |
-| Codespaces Compute  |  2 core  | 1 hour          | $0.18 |
-|                     |  4 core  | 1 hour          | $0.36 |
-|                     |  8 core  | 1 hour          | $0.72 |
-|                     |  16 core | 1 hour          | $1.44 |
-|                     |  32 core | 1 hour          | $2.88 |
-| Codespaces Storage  |  Storage | 1 GB-month      | $0.07 |
+| Component           | Machine type | Unit of measure | Price |
+| ------------------- | ------------ | --------------- | ----- |
+| Codespaces compute  |  2 core      | 1 hour          | $0.18 |
+|                     |  4 core      | 1 hour          | $0.36 |
+|                     |  8 core      | 1 hour          | $0.72 |
+|                     |  16 core     | 1 hour          | $1.44 |
+|                     |  32 core     | 1 hour          | $2.88 |
+| Codespaces storage  |  Storage     | 1 GB-month<sup>*</sup>    | $0.07 |
+
+<sup>*</sup> See "[Billing for storage usage](#billing-for-storage-usage)" below for details of the GB-month unit of measure.
+
+If you enable prebuilding of codespaces this will incur additional charges. For more information, see "[Billing for {% data variables.product.prodname_codespaces %} prebuilds](#billing-for-codespaces-prebuilds)."

 ## About billing for {% data variables.product.prodname_github_codespaces %}

-{% data reusables.codespaces.codespaces-billing %}
+{% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to their compute and storage usage. {% data reusables.codespaces.codespaces-monthly-billing %} xxx

-Your {% data variables.product.prodname_github_codespaces %} usage shares your organization or enterprise account's existing billing date, payment method, and receipt. {% data reusables.dotcom_billing.view-all-subscriptions %}
+Your {% data variables.product.prodname_github_codespaces %} usage shares your organization or enterprise account's existing payment method, and receipt. For more information, see "[Viewing your subscriptions and billing date](/articles/viewing-your-subscriptions-and-billing-date)."

 {% ifversion ghec %}
 If you purchased {% data variables.product.prodname_enterprise %} through a Microsoft Enterprise Agreement, you can connect your Azure Subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[Connecting an Azure subscription to your enterprise](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)."
 {% endif %}

-{% data reusables.dotcom_billing.pricing_calculator.pricing_cal_codespaces %}
+### Billing for compute usage
+The compute usage of a codespace is the number of minutes for which that codespace is active. Total compute usage is calculated by summing the number of minutes used by all codespaces that are billable to the organization or enterprise. These totals are reported to the billing service every hour, and are billed monthly.
+
+As an example, if a codespace is active for 1 hour and 15 minutes, then the compute cost will be the hourly cost of the codespace, as determined by its machine type, multiplied by 1.25.
+
+You can restrict compute usage by stopping your codespaces. For information, see "[Stopping and starting a codespace](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. For more information, see "[Setting your timeout period for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-timeout-period-for-github-codespaces)" and "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)."
+
+### Billing for storage usage
+For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces and prebuilds in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. Storage is billed for all of your existing codespaces, regardless of whether they are active or stopped. The storage billing for a codespace ends when it is deleted. 
+
+Codespace storage is reported in GB-months. Your billing month runs from a fixed day in one month until the same day in the next month. In most cases the day of the month is determined by the day you started on your current {% data variables.product.prodname_dotcom %} plan. Your GB-month storage, is calculated as follows. Once every hour, the storage used by all of your currently active and stopped codespaces is assessed. This figure is then divided by the number of hours in the current billing month: `total storage size / hours this month`. The result is added to the running total for codespace storage for the month.
+
+For example, if you have one codespace that uses 100 GB of storage and has existed for one hour you will have used `100 / (24 * 30) = 0.1388` GB-months of storage in a 30-day month. If your use of GitHub Codespaces during a 30-day month consists of two 100 GB codespaces that both existed for three full days then there will be `24 * 3` hourly reports for the storage of these codespaces, giving a total of: `(24 * 3) * 200 / (24 * 30) = 20` GB-months.
+
+For each hourly report, the storage usage for the previous hour is calculated in seconds. As a result, you won't be charged for a full hour of storage if a codespace did not exist for the full 60 minutes. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your storage to the nearest MB.
+
+As an organization owner, you can:
+- List the currently active and stopped codespaces for your organization. For more information, see "[Listing the codespaces in your organization](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization)." In addition to the cost of these codespaces, the cost of {% data variables.product.prodname_github_codespaces %} for the current month may include costs for codespaces that existed earlier in the current month but have since been deleted. 
+- See the total {% data variables.product.prodname_github_codespaces %} compute and storage usage for your organization for the current month to date. For more information, see "[Viewing your {% data variables.product.prodname_github_codespaces %} usage](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+- Configure your organization settings to manage the cost of {% data variables.product.prodname_github_codespaces %}. For more information, see "[Managing the cost of {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)."
+
+To estimate the costs for metered services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces).

 ### Billing for {% data variables.product.prodname_codespaces %} prebuilds

-{% data reusables.codespaces.billing-for-prebuilds-default %} 
+{% data reusables.codespaces.prebuilds-definition %} For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."

-{% data reusables.codespaces.billing-for-prebuilds-reducing %} 
+#### {% data variables.product.prodname_actions %} costs for prebuilds
+
+Prebuilds are created and updated by running a {% data variables.product.prodname_actions %} workflow on a {% data variables.product.prodname_dotcom %}-hosted runner. By default, prebuilds are updated every time you modify the prebuild configuration, or push changes to a prebuild-enabled branch. As with other workflows, while prebuild workflows are running they will either consume some of the Actions minutes included with your account, if you have any, or they will incur charges for Actions minutes. For more information about pricing for Actions minutes, see "[About billing for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)." There is no associated {% data variables.product.prodname_codespaces %} compute cost for creating or updating prebuilds.
+
+To reduce consumption of Actions minutes, you can set a prebuild to be updated only when you make a change to your dev container configuration files, or only on a custom schedule. You can also manage your storage usage by adjusting the number of previous versions of each prebuild that are retained. For more information, see "[Configuring prebuilds](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-a-prebuild)."
+
+If you are an organization or enterprise owner, you can track usage of prebuild workflows and storage by downloading a usage report for your organization or enterprise. You can identify workflow runs for prebuilds by filtering the CSV output to only include the workflow called "Create {% data variables.product.prodname_github_codespaces %} Prebuilds." For more information, see "[Viewing your {% data variables.product.prodname_actions %} usage](/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage#viewing-github-actions-usage-for-your-organization)."
+
+#### Storage costs for prebuilds
+
+In addition to {% data variables.product.prodname_actions %} minutes, you will also be billed for the storage of prebuilds associated with each prebuild configuration for a given repository and region. Storage of prebuilds is billed at the same rate as storage of codespaces.
+
+The storage cost for a prebuild in a single region will be similar to the storage cost that will be incurred for storing a single codespace created from that prebuild. The storage cost for the generated codespace may be more than the cost for the prebuild if, for example, the `updateContentCommand` and `postCreateCommand` commands are used during codespace creation to download more files to the dev container.
+
+The total storage costs associated with a prebuild template will depend on:
+
+* The price of storage per GB. See the table above.
+* The size of the generated prebuild in GB.
+* The number of regions in which the prebuild is available (because a copy of the prebuild is stored in each region).
+* The number of older versions of the prebuild that are retained.
+
+The storage cost for a prebuild is therefore calculated as: `price per GB * size (GB) * regions * versions`.
+
+To limit the storage costs associated with prebuilds, you can choose to create prebuilds only in selected regions, and you can specify the number of older versions of prebuilds that will be retained. For more information, see "[Configuring prebuilds](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-a-prebuild)."
+
+{% note %}
+
+**Note**: Prebuilds may be updated several times during a billing month. Newer versions of a prebuild may be larger or smaller than the previous versions. This will affect the storage charges. For details of how storage is calculated during a billing month, see "[Billing for storage usage](#billing-for-storage-usage)" above.
+
+{% endnote %}
+
+#### Cost of codespaces created from prebuilds
+
+Use of codespaces created using prebuilds is charged at the same rate as regular codespaces.

 ## Setting a spending limit

@ -72,7 +138,7 @@ For example, a user in an organization can fork a repository within that organiz
  
 ## How billing is handled when a repository is transferred

-Usage is billed and reported on every hour. As such, you pay for any usage when a repository is within your organization. When a repository is transferred out of your organization, any codespaces in that repository are removed as part of the transfer process.
+Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. For more information, see "[Enabling GitHub Codespaces for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly.

 ## What happens when users are removed

--- a/content/billing/managing-billing-for-github-codespaces/index.md
+++ b/content/billing/managing-billing-for-github-codespaces/index.md
@ -11,4 +11,3 @@ children:
  - /viewing-your-github-codespaces-usage
  - /managing-spending-limits-for-github-codespaces
 ---
-
--- a/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces.md
@ -21,6 +21,8 @@ redirect_from:

 {% data reusables.codespaces.codespaces-spending-limit-requirement %}

+{% data reusables.codespaces.codespaces-monthly-billing %} 
+
 Once you've reached your spending limit, your organization or repository will no longer be able to create new codespaces, and won't be able to start existing codespaces. Any existing codespaces that are still running will not be shutdown; if you don't change the spending limit, you will not be charged for the amount that exceeds the limit.

 For more information about pricing for {% data variables.product.prodname_github_codespaces %} usage, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
@ -67,4 +69,4 @@ You can disable these notifications anytime by navigating to the bottom of the *
 ## Further reading

 - "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)"
- "[Managing billing for {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization)"
+- "[Managing the cost of {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)"
--- a/content/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
+++ b/content/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
@ -21,8 +21,21 @@ Organization owners and billing managers can view {% data variables.product.prod

 {% data reusables.organizations.billing-settings %}
 1. Under "{% data variables.product.prodname_codespaces %}", view the details of the compute hours and storage used so far this month.
-  ![Details of minute usage](/assets/images/help/billing/codespaces-compute-storage.png)
+
+   ![Details of minute usage](/assets/images/help/billing/codespaces-compute-storage.png)
+
+   You can also see and update your current spending limit. For more information, see "[Managing spending limits for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces)."
+
+   {% note %}
+
+   **Notes**: 
+   * The costs shown here are the cumulative costs within the current monthly billing period. The metered costs for {% data variables.product.prodname_github_codespaces %} shown on this page are reset to zero at the start of each monthly billing period. Outstanding costs from previous months are not shown.
+   * The figures on this page are updated every hour.
+
+   {% endnote %}
+
 {% data reusables.dotcom_billing.actions-packages-report-download-org-account %}
+   The data used for this report is updated daily. 
 1. Filter the report to show only rows that mention "Codespaces" in the `Product` field.

   ![A usage report filtered for Codespaces](/assets/images/help/codespaces/CSV-usage-report.png)
@ -38,3 +51,7 @@ Enterprise owners and billing managers can view {% data variables.product.prodna
 1. Under "{% data variables.product.prodname_codespaces %} monthly usage", view the usage details of each organization in your enterprise account.
 {% data reusables.enterprise-accounts.actions-packages-report-download-enterprise-accounts %}
 {% endif %}
+
+## Further reading
+
+- "[Listing the codespaces in your organization](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization)"
--- a/content/codespaces/codespaces-reference/index.md
+++ b/content/codespaces/codespaces-reference/index.md
@ -6,7 +6,6 @@ versions:
  ghec: '*'
 product: '{% data reusables.gated-features.codespaces %}'
 children:
-  - /understanding-billing-for-github-codespaces
  - /allowing-your-codespace-to-access-a-private-image-registry
  - /using-github-copilot-in-github-codespaces
  - /using-the-github-codespaces-plugin-for-jetbrains
--- a/content/codespaces/codespaces-reference/understanding-billing-for-github-codespaces.md
+++ b/content/codespaces/codespaces-reference/understanding-billing-for-github-codespaces.md
@ -1,63 +0,0 @@
---
-title: Understanding billing for GitHub Codespaces
-intro: 'Learn how your {% data variables.product.prodname_github_codespaces %} usage is billed.'
-versions:
-  fpt: '*'
-  ghec: '*'
-redirect_from:
-  - /github/developing-online-with-codespaces/about-billing-for-codespaces
-  - /codespaces/getting-started-with-codespaces/about-billing-for-codespaces
-  - /codespaces/codespaces-reference/about-billing-for-codespaces
-  - /codespaces/codespaces-reference/understanding-billing-for-codespaces
-type: reference
-topics:
-  - Codespaces
-  - Billing
-product: '{% data reusables.gated-features.codespaces %}'
-shortTitle: Understanding billing
---
-
-This article explains how billing works for your codespaces, and explains how your organization's billing manager can help.
-
-## Getting access to {% data variables.product.prodname_github_codespaces %}
-
-Your organization's administrator might limit {% data variables.product.prodname_github_codespaces %} usage to only specific personal accounts. To get access, you will need to contact your billing manager. For more information, see "[Managing access to other repositories within your codespace](/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces)."
-
-## How much it costs to use {% data variables.product.prodname_codespaces %}
-
-To see the pricing for {% data variables.product.prodname_github_codespaces %} usage, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-codespaces#codespaces-pricing)."
-
-## How your codespace usage is billed
-
-Your codespace is billed for its compute minutes and for the amount of storage it uses on disk.
-
-If you enable prebuilding of codespaces this will incur additional charges. For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds#about-billing-for-codespaces-prebuilds)."
-
-### Understanding what compute minutes are
-Your codespace is billed for the number of minutes that it's active. If your codespaces window is left idle for 30 minutes, it will automatically shutdown, and compute billing for the codespace will end until you start the codespace again.
-
-### Understanding how codespace storage is billed
-For {% data variables.product.prodname_github_codespaces %}, storage is defined to include any files relating to your codespace, such as the cloned repository, configuration files, and extensions, among others. This storage is billed while your codespace is shutdown. The storage billing for a codespace ends when you manually delete it from https://github.com/codespaces.
-
-## How spending limits work
-
-Before your organization can use {% data variables.product.prodname_github_codespaces %}, your billing manager will need to set a spending limit. For more information, see "[Managing spending limits for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces)." 
-
-## Exporting changes when you have reached your spending limit
-
-{% data reusables.codespaces.exporting-changes %}
-
-## Checking your current usage and limits
-If you need to check your current usage or spending limit, contact your organization's billing manager. For more information, see "[Viewing your {% data variables.product.prodname_github_codespaces %} usage](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
-
-## Codespaces can be automatically deleted
-
-Your codespace will be automatically deleted when you are removed from an organization or repository.
-
-## Deleting your unused codespaces
-
-You can manually delete your codespaces in https://github.com/codespaces and from within {% data variables.product.prodname_vscode %}. To reduce the size of a codespace, you can manually delete files using the terminal or from within {% data variables.product.prodname_vscode %}.
-
-## Further reading
-
- "[Managing billing for {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization)"
--- a/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md
+++ b/content/codespaces/developing-in-codespaces/codespaces-lifecycle.md
@ -71,7 +71,7 @@ If you try to delete a codespace with unpushed git commits, your editor will not

 Codespaces that have been stopped and remain inactive for a specified period of time will be deleted automatically. By default, inactive codespaces are deleted after 30 days, but you can customize your codespace retention period. For more information, see "[Configuring automatic deletion of your codespaces](/codespaces/customizing-your-codespace/configuring-automatic-deletion-of-your-codespaces)."

-You will be charged for the storage of all your codespaces. When you delete a codespace, you will no longer be charged.
+If you create a codespace, it will continue to accrue storage charges until it is deleted, irrespective of whether it is active or stopped. For more information, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#billing-for-storage-usage)." Deleting a codespace does not reduce the current billable amount for {% data variables.product.prodname_github_codespaces %}, which accumulates during each monthly billing cycle. For more information, see "[Viewing your {% data variables.product.prodname_github_codespaces %} usage](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."

 For more information on deleting a codespace, see "[Deleting a codespace](/codespaces/developing-in-codespaces/deleting-a-codespace)."

--- a/content/codespaces/developing-in-codespaces/index.md
+++ b/content/codespaces/developing-in-codespaces/index.md
@ -11,12 +11,12 @@ children:
  - /codespaces-lifecycle
  - /developing-in-a-codespace
  - /creating-a-codespace
+  - /deleting-a-codespace
  - /opening-an-existing-codespace
  - /using-source-control-in-your-codespace
  - /using-github-codespaces-for-pull-requests
  - /stopping-and-starting-a-codespace
  - /renaming-a-codespace
-  - /deleting-a-codespace
  - /forwarding-ports-in-your-codespace
  - /default-environment-variables-for-your-codespace
  - /connecting-to-a-private-network
--- a/content/codespaces/getting-started/deep-dive.md
+++ b/content/codespaces/getting-started/deep-dive.md
@ -148,6 +148,6 @@ If you work on your codespaces in a JetBrains IDE, you can add plugins from the
 ## Further reading

 - "[Enabling {% data variables.product.prodname_github_codespaces %} for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization)"
- "[Managing billing for {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization)"
+- "[Managing the cost of {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)"
 - "[Add a dev container configuration to your repository](/codespaces/setting-up-your-project-for-codespaces/setting-up-your-project-for-codespaces)"
 - "[Codespaces lifecycle](/codespaces/developing-in-codespaces/codespaces-lifecycle)"
--- a/content/codespaces/getting-started/quickstart.md
+++ b/content/codespaces/getting-started/quickstart.md
@ -109,8 +109,8 @@ You've successfully created, personalized, and run your first application within
 ## Further reading

 * "[Enabling {% data variables.product.prodname_github_codespaces %} for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization)"
-* "[Managing billing for {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization)"
 * "[Using {% data variables.product.prodname_github_codespaces %} in {% data variables.product.prodname_vscode %}](/codespaces/developing-in-codespaces/using-github-codespaces-in-visual-studio-code)"
 * "[Using {% data variables.product.prodname_github_codespaces %} in your JetBrains IDE](/codespaces/developing-in-codespaces/using-github-codespaces-in-your-jetbrains-ide)"
 * "[Using {% data variables.product.prodname_github_codespaces %} with {% data variables.product.prodname_cli %}](/codespaces/developing-in-codespaces/using-github-codespaces-with-github-cli)"
 * "[Setting your default editor for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-default-editor-for-github-codespaces)."
+* "[Managing the cost of {% data variables.product.prodname_github_codespaces %} in your organization](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)"
--- a/content/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization.md
@ -19,7 +19,7 @@ topics:

 ## About enabling {% data variables.product.prodname_github_codespaces %} for your organization

-Organization owners can control which users in your organization can create and use codespaces at the organization's expense.
+Organization owners can control which users in your organization can create and use codespaces at the organization's expense. For information about pricing, see "[About billing for GitHub Codespaces](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."

 Only people who can clone a repository can create a codespace for that repository. To allow people to create codespaces for repositories owned by your organization, you must:

--- a/content/codespaces/managing-codespaces-for-your-organization/index.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/index.md
@ -12,7 +12,7 @@ topics:
 children:
  - /enabling-github-codespaces-for-your-organization
  - /listing-the-codespaces-in-your-organization
-  - /managing-billing-for-github-codespaces-in-your-organization
+  - /managing-the-cost-of-github-codespaces-in-your-organization
  - /managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces
  - /managing-repository-access-for-your-organizations-codespaces
  - /reviewing-your-organizations-audit-logs-for-github-codespaces
--- a/content/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization.md
@ -15,10 +15,12 @@ topics:

 ## Overview

-As an organization owner, you can list all of the currently active and stopped codespaces for your organization. You might want to do this to check how many codespaces users are creating, to make sure they aren't incurring unnecessary costs.
+As an organization owner, you can list all of the currently active and stopped codespaces for your organization. You might want to do this to check how many codespaces users are creating, to make sure they aren't incurring unnecessary costs. For information about pricing, see "[About billing for GitHub Codespaces](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."

 The easiest way to list the codespaces for an organization is by using {% data variables.product.prodname_cli %}. You can also use the REST API, which provides more information about each codespace.

+For information on how to see the current total {% data variables.product.prodname_codespaces %} usage for your organization or enterprise, and generate a detailed report, see "[Viewing your {% data variables.product.prodname_github_codespaces %} usage](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+
 ### Using {% data variables.product.prodname_cli %} to list codespaces

 To list all of the current codespaces for a specified organization, use the following command.
--- a/content/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization.md
@ -1,62 +0,0 @@
---
-title: Managing billing for GitHub Codespaces in your organization
-shortTitle: Manage billing
-intro: 'You can check your {% data variables.product.prodname_github_codespaces %} usage and set usage limits.'
-product: '{% data reusables.gated-features.codespaces %}'
-permissions: 'To manage billing for {% data variables.product.prodname_github_codespaces %} for an organization, you must be an organization owner or a billing manager.'
-versions:
-  fpt: '*'
-  ghec: '*'
-type: reference
-topics:
-  - Codespaces
-  - Billing
-redirect_from:
-  - /codespaces/managing-codespaces-for-your-organization/managing-billing-for-codespaces-in-your-organization
---
-
-## Overview
-
-To learn about pricing for {% data variables.product.prodname_github_codespaces %}, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
-
-{% data reusables.codespaces.codespaces-billing %}
-
- As an organization owner or a billing manager, you can manage {% data variables.product.prodname_github_codespaces %} billing for your organization: ["About billing for Codespaces"](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)
- As an organization owner, you can list the currently active and stopped codespaces for your organization. In addition to these codespaces, costs for the current month may include costs for codespaces that existed earlier in the current month but have since been deleted.
- For users, there is a guide that explains how billing works: ["Understanding billing for {% data variables.product.prodname_github_codespaces %}"](/codespaces/codespaces-reference/understanding-billing-for-github-codespaces)
-
-## Usage limits
-
-You can set a usage limit for the codespaces in your organization or repository. This limit is applied to the compute and storage usage for {% data variables.product.prodname_github_codespaces %}:
- 
- **Compute minutes:** Compute usage is calculated by the actual number of minutes used by all {% data variables.product.prodname_github_codespaces %} instances while they are active. These totals are reported to the billing service daily, and is billed monthly. You can set a spending limit for {% data variables.product.prodname_github_codespaces %} usage in your organization. For more information, see "[Managing spending limits for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces)."
-
- **Storage usage:** For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces in your account. This includes resources such as cloned repositories, configuration files, and extensions, among others. These totals are reported to the billing service daily, and is billed monthly. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your storage to the nearest MB. To check how many compute minutes and storage GB have been used by {% data variables.product.prodname_github_codespaces %}, see "[Viewing your {% data variables.product.prodname_github_codespaces %} usage"](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
-
-## Disabling or limiting {% data variables.product.prodname_codespaces %}
-
-You can disable all use of {% data variables.product.prodname_github_codespaces %} that would be billed to your organization. Alternatively, you can specify which organization members or collaborators can use {% data variables.product.prodname_codespaces %} at your organization's expense. For more information, see "[Enabling {% data variables.product.prodname_github_codespaces %} for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization)."
-
-{% data reusables.codespaces.codespaces-disabling-org-billing %}
-
-You can configure which repositories can be accessed from codespaces created for a particular repository. For more information, see "[Managing access to other repositories within your codespace](/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces)."
-
-You can limit the choice of types of machine that are available for codespaces created from repositories owned by your organization. This allows you to prevent people using overly resourced machines for their codespaces, and incurring unnecessary charges. For more information, see "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
-
-You can also restrict how long a codespace can remain unused before it is automatically deleted. This can help to reduce storage costs for {% data variables.product.prodname_codespaces %}. For more information, see "[Restricting the retention period for codespaces](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)."
-
-## Deleting unused codespaces
-
-Your users can delete their own codespaces in https://github.com/codespaces and from within {% data variables.product.prodname_vscode %}. To reduce the size of a codespace, users can manually delete files using the terminal or from within {% data variables.product.prodname_vscode_shortname %}. 
-
-As an organization owner, you can delete any codespace in your organization. For more information, see "[Deleting a codespace](/codespaces/developing-in-codespaces/deleting-a-codespace#deleting-codespaces-in-your-organization)."
-
-{% note %}
-
-**Note:** Codespaces are automatically deleted after they have been stopped and have remained inactive for a defined number of days. For more information, see "[Restricting the retention period for codespaces](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)." A codespace can only be manually deleted by the person who created the codespace.
-
-{% endnote %}
-
-## Further reading
-
- "[Listing the codespaces in your organization](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization)"
--- a/content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md
@ -0,0 +1,71 @@
+---
+title: Managing the cost of GitHub Codespaces in your organization
+shortTitle: Manage Codespaces costs
+intro: 'You can check your {% data variables.product.prodname_github_codespaces %} usage and set usage limits.'
+product: '{% data reusables.gated-features.codespaces %}'
+permissions: 'To manage billing for {% data variables.product.prodname_github_codespaces %} for an organization, you must be an organization owner or a billing manager.'
+versions:
+  fpt: '*'
+  ghec: '*'
+type: reference
+topics:
+  - Codespaces
+  - Billing
+redirect_from:
+  - /codespaces/managing-codespaces-for-your-organization/managing-billing-for-codespaces-in-your-organization
+  - /codespaces/managing-codespaces-for-your-organization/managing-billing-for-github-codespaces-in-your-organization
+---
+
+## Overview
+
+Your organization is billed according to its compute and storage usage for {% data variables.product.prodname_github_codespaces %}. This article explains the ways in which you, as an organization owner, can manage these costs.
+
+To learn about pricing for {% data variables.product.prodname_github_codespaces %}, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
+
+## Spending limits
+
+You can set a spending limit for {% data variables.product.prodname_github_codespaces %} for your organization. This limit is applied to the total compute and storage cost for {% data variables.product.prodname_github_codespaces %}. For more information, see "[Managing spending limits for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces)."
+ 
+- **Compute usage:** This is the total time during which all {% data variables.product.prodname_github_codespaces %} instances ("codespaces") were active in a billing month. 
+
+- **Storage usage:** For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all files used by all codespaces and prebuilds in your account. This includes resources such as cloned repositories, configuration files, and extensions, among others. 
+
+You can check the compute and storage usage for {% data variables.product.prodname_github_codespaces %} for the current billing month. For information, see "[Viewing your {% data variables.product.prodname_github_codespaces %} usage"](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+
+{% note %}
+
+**Note**: Prebuilds for {% data variables.product.prodname_github_codespaces %} are created and updated using {% data variables.product.prodname_actions %}. This may incur billable costs for {% data variables.product.prodname_actions %}. You can set a spending limit for {% data variables.product.prodname_actions %}. For more information, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#billing-for-codespaces-prebuilds)" and "[Managing your spending limit for GitHub Actions](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions)." Storage of the generated prebuilds is charged at the same rate as your codespaces, and is included in your {% data variables.product.prodname_github_codespaces %} spending limit.
+
+{% endnote %}
+
+## Disabling or limiting {% data variables.product.prodname_codespaces %}
+
+You can disable all use of {% data variables.product.prodname_github_codespaces %} that would be billed to your organization. Alternatively, you can specify which organization members or collaborators can use {% data variables.product.prodname_codespaces %} at your organization's expense. For more information, see "[Enabling {% data variables.product.prodname_github_codespaces %} for your organization](/codespaces/managing-codespaces-for-your-organization/enabling-github-codespaces-for-your-organization)."
+
+{% data reusables.codespaces.codespaces-disabling-org-billing %}
+
+You can configure which repositories can be accessed from codespaces created for a particular repository. For more information, see "[Managing access to other repositories within your codespace](/codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces)."
+
+You can limit the choice of types of machine that are available for codespaces created from repositories owned by your organization. This allows you to prevent people using overly resourced machines for their codespaces, and incurring unnecessary charges. For more information, see "[Restricting access to machine types](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
+
+You can set a maximum idle timeout constraint to limit the maximum timeout that people can set for codespaces that are billable to your organization. This can reduce the compute usage charges generated by codespaces that are left running in an idle state, by stopping active codespace after a shorter timeout period. For more information, see "[Restricting the idle timeout period](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)."
+
+You can also restrict how long stopped codespaces can remain unused before they are automatically deleted. This can help to reduce storage costs for {% data variables.product.prodname_codespaces %}. For more information, see "[Restricting the retention period for codespaces](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)."
+
+Repository owners who set up prebuilds for their repository can reduce the storage costs of prebuilds by configuring these to be created only in selected regions. For more information, see "[Configuring prebuilds](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-a-prebuild)."
+
+## Deleting unused codespaces
+
+Your users can delete their own codespaces in https://github.com/codespaces and from within {% data variables.product.prodname_vscode %}. To reduce the size of a codespace, users can manually delete files using the terminal or from within {% data variables.product.prodname_vscode_shortname %}. 
+
+As an organization owner, you can delete any codespace in your organization. For more information, see "[Deleting a codespace](/codespaces/developing-in-codespaces/deleting-a-codespace#deleting-codespaces-in-your-organization)."
+
+{% note %}
+
+**Note:** Codespaces are automatically deleted after they have been stopped and have remained inactive for a user-definable number of days. For more information, see "[Configuring automatic deletion of your codespaces](/codespaces/customizing-your-codespace/configuring-automatic-deletion-of-your-codespaces)." As an organization owner, you can set the maximum retention period for codespaces owned by your organization. This will override a user's personal retention setting. For more information, see "[Restricting the retention period for codespaces](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)."
+
+{% endnote %}
+
+## Further reading
+
+- "[Listing the codespaces in your organization](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization)"
--- a/content/codespaces/overview.md
+++ b/content/codespaces/overview.md
@ -42,6 +42,8 @@ For more information, see "[Customizing your codespace](/codespaces/customizing-

 For information on pricing, storage, and usage for {% data variables.product.prodname_github_codespaces %}, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."

-{% data reusables.codespaces.codespaces-spending-limit-requirement %} 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 "[Managing spending limits for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces)."
+{% data reusables.codespaces.codespaces-spending-limit-requirement %} 
+
+{% 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 "[Managing spending limits for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces)."

 You can see who will pay for a codespace before you create it. For more information, see "[Creating a codespace](/codespaces/developing-in-codespaces/creating-a-codespace#creating-a-codespace)."
--- a/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
@ -14,7 +14,9 @@ redirect_from:

 ## Overview

-Prebuilding your codespaces allows you to be more productive and access your codespace faster, particularly if your repository is large or complex and new codespaces currently take more than 2 minutes to start. This is because any source code, editor extensions, project dependencies, commands, and configurations have already been downloaded, installed, and applied before you create a codespace for your project. Think of a prebuild as a "ready-to-go" template for a codespace. 
+{% data reusables.codespaces.prebuilds-definition %}
+
+If it currently takes more than 2 minutes to create a codespace for a repository, you are likely to benefit from using prebuilds. This is because, with a prebuild, any source code, editor extensions, project dependencies, commands, and configurations have already been downloaded, installed, and applied before you create a codespace. 

 By default, whenever you push changes to your repository, {% data variables.product.prodname_github_codespaces %} uses {% data variables.product.prodname_actions %} to automatically update your prebuilds.

@ -28,16 +30,10 @@ To create a prebuild you set up a prebuild configuration. When you save the conf

 When a prebuild configuration workflow runs, {% data variables.product.prodname_dotcom %} creates a temporary codespace, performing setup operations up to and including any `onCreateCommand` and `updateContentCommand` commands in the `devcontainer.json` file. No `postCreateCommand` commands are run during the creation of a prebuild. For more information about these commands, see the [`devcontainer.json` reference](https://code.visualstudio.com/docs/remote/devcontainerjson-reference#_devcontainerjson-properties) in the {% data variables.product.prodname_vscode_shortname %} documentation. A snapshot of the generated container is then taken and stored.

+As with other Actions workflows, running a prebuild configuration workflow will either consume some of the Actions minutes included with your account, if you have any, or it will incur charges for Actions minutes. Storage of codespace prebuilds is billed in the same way as storage of active or stopped codespaces. For more information, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#billing-for-codespaces-prebuilds)."
+
 When you create a codespace from a prebuild, {% data variables.product.prodname_dotcom %} downloads the existing container snapshot from storage and deploys it on a fresh virtual machine, completing the remaining commands specified in the dev container configuration. Since many operations have already been performed, such as cloning the repository, creating a codespace from a prebuild can be substantially quicker than creating one without a prebuild. This is true where the repository is large and/or `onCreateCommand` commands take a long time to run.

-## About billing for {% data variables.product.prodname_codespaces %} prebuilds
-
-{% data reusables.codespaces.billing-for-prebuilds-default %} For details of {% data variables.product.prodname_github_codespaces %} storage pricing, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)." 
-
-{% data reusables.codespaces.billing-for-prebuilds-reducing %} 
-
-Use of codespaces created using prebuilds is charged at the same rate as regular codespaces.
-
 ## About pushing changes to prebuild-enabled branches

 By default, each push to a branch that has a prebuild configuration results in a {% data variables.product.prodname_dotcom %}-managed Actions workflow run to update the prebuild. The prebuild workflow has a concurrency limit of one workflow run at a time for a given prebuild configuration, unless changes were made that affect the dev container configuration for the associated repository. For more information, see "[Introduction to dev containers](/codespaces/setting-up-your-project-for-codespaces/introduction-to-dev-containers)." If a run is already in progress, the workflow run that was queued most recently queued will run next, after the current run completes. 
--- a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
@ -61,7 +61,7 @@ Before you can configure prebuilds for your project the following must be true:
   {% note %}

   **Notes**: 
-   * The prebuild for each region will incur individual charges. You should, therefore, only enable prebuilds for regions in which you know they'll be used. For more information, see "[About {% data variables.product.prodname_github_codespaces %} prebuilds](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds#about-billing-for-codespaces-prebuilds)."
+   * The prebuild for each region will incur individual charges. You should, therefore, only enable prebuilds for regions in which you know they'll be used. For more information, see "[About billing for {% data variables.product.prodname_github_codespaces %}](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#billing-for-codespaces-prebuilds)."
   * Developers can set their default region for {% data variables.product.prodname_github_codespaces %}, which can allow you to enable prebuilds for fewer regions. For more information, see "[Setting your default region for {% data variables.product.prodname_github_codespaces %}](/codespaces/customizing-your-codespace/setting-your-default-region-for-github-codespaces)."

   {% endnote %}
--- a/content/site-policy/github-terms/github-corporate-terms-of-service.md
+++ b/content/site-policy/github-terms/github-corporate-terms-of-service.md
@ -126,7 +126,7 @@ Customer’s use of the Products must not violate any applicable laws, including
 Customer’s use of the Service must comply with [GitHub's Acceptable Use Policies](/articles/github-acceptable-use-policies) and [GitHub’s Community Guidelines](/articles/github-community-guidelines). Customer must not use the Service in any jurisdiction for unlawful, obscene, offensive or fraudulent Content or activity, such as advocating or causing harm, interfering with or violating the integrity or security of a network or system, evading filters, sending unsolicited, abusive, or deceptive messages, viruses or harmful code, or violating third party rights.

 ### 3. Privacy
-The [GitHub Privacy Statement](/articles/github-privacy-statement) and the [GitHub Data Protection Agreement](/github/site-policy/github-data-protection-agreement-non-enterprise-customers) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the GitHub Privacy Statement, particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any personal information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users.
+The [GitHub Privacy Statement](/articles/github-privacy-statement) and the [GitHub Data Protection Agreement](https://github.com/customer-terms) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the GitHub Privacy Statement, particularly in regards to the collection of personal data (as defined in the GitHub Privacy Statement). If Customer collects any personal information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users.

 ## D. Content Responsibility; Ownership; License Rights

--- a/content/site-policy/privacy-policies/github-data-protection-agreement.md
+++ b/content/site-policy/privacy-policies/github-data-protection-agreement.md
--- a/content/site-policy/privacy-policies/index.md
+++ b/content/site-policy/privacy-policies/index.md
@ -8,9 +8,14 @@ topics:
 children:
  - /github-privacy-statement
  - /global-privacy-practices
-  - /github-data-protection-agreement
+
  - /github-subprocessors-and-cookies
  - /github-codespaces-privacy-statement
  - /github-candidate-privacy-policy
+redirect_from:
+  - /github/site-policy/github-data-protection-addendum
+  - /github/site-policy-deprecated/github-data-protection-addendum
+  - /github/site-policy/github-data-protection-agreement-non-enterprise-customers
+  - /site-policy/privacy-policies/github-data-protection-agreement
 ---

--- a/content/site-policy/site-policy-deprecated/github-enterprise-subscription-agreement.md
+++ b/content/site-policy/site-policy-deprecated/github-enterprise-subscription-agreement.md
@ -283,7 +283,7 @@ Customer’s use of the Service must not violate any applicable laws, including
 Customer’s use of the Service must comply with [GitHub's Acceptable Use Policies](/articles/github-acceptable-use-policies) and [GitHub’s Community Guidelines](/articles/github-community-guidelines). Customer must not use the Service in any jurisdiction for unlawful, obscene, offensive or fraudulent Content or activity, such as advocating or causing harm, interfering with or violating the integrity or security of a network or system, evading filters, sending unsolicited, abusive, or deceptive messages, viruses or harmful code, or violating third party rights.

 #### 3.2.3 Privacy.
-[The GitHub Privacy Statement](/articles/github-privacy-statement) and the [GitHub Data Protection Addendum](/github/site-policy/github-data-protection-addendum) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the [GitHub Privacy Statement](/articles/github-privacy-statement), particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any User Personal Information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users.
+[The GitHub Privacy Statement](/articles/github-privacy-statement) and the [GitHub Data Protection Addendum](https://github.com/customer-terms) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the [GitHub Privacy Statement](/articles/github-privacy-statement), particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any User Personal Information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users.

 ### 3.3 Content Responsibility; Ownership; License Rights.

--- a/content/site-policy/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md
+++ b/content/site-policy/site-policy-deprecated/github-supplemental-terms-for-microsoft-volume-licensing.md
@ -125,7 +125,7 @@ Customer’s use of the Service must not violate any applicable laws, including
 Customer’s use of the Service must comply with [GitHub's Acceptable Use Policies](/github/site-policy/github-acceptable-use-policies) and [GitHub’s Community Guidelines](/github/site-policy/github-community-guidelines). Customer must not use the Service in any jurisdiction for unlawful, obscene, offensive or fraudulent Content or activity, such as advocating or causing harm, interfering with or violating the integrity or security of a network or system, evading filters, sending unsolicited, abusive, or deceptive messages, viruses or harmful code, or violating third party rights.

 #### 2.2.3 Privacy.
-[The GitHub Privacy Statement](/github/site-policy/github-privacy-statement) and the [GitHub Data Protection Addendum](/github/site-policy/github-data-protection-addendum) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the [GitHub Privacy Statement](/github/site-policy/github-privacy-statement), particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any User Personal Information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users.
+[The GitHub Privacy Statement](/github/site-policy/github-privacy-statement) and the [GitHub Data Protection Addendum](https://github.com/customer-terms) provide detailed notice of GitHub's privacy and data use practices as well as GitHub's processing and security obligations with respect to Customer Personal Data. Any person, entity, or service collecting data from the Service must comply with the [GitHub Privacy Statement](/github/site-policy/github-privacy-statement), particularly in regards to the collection of Users' Personal Information (as defined in the GitHub Privacy Statement). If Customer collects any User Personal Information from GitHub, Customer will only use it for the purpose for which the External User has authorized it. Customer will reasonably secure any such Personal Information, and Customer will respond promptly to complaints, removal requests, and "do not contact" requests from GitHub or External Users.

 ### 2.3 Content Responsibility; Ownership; License Rights.

--- a/data/reusables/codespaces/billing-for-prebuilds-default.md
+++ b/data/reusables/codespaces/billing-for-prebuilds-default.md
@ -1,3 +0,0 @@
-By default, a {% data variables.product.prodname_actions %} workflow is triggered every time you create or update a prebuild, or push to a prebuild-enabled branch. As with other workflows, while prebuild workflows are running they will either consume some of the Actions minutes included with your account, if you have any, or they will incur charges for Actions minutes. For more information about pricing for Actions minutes, see "[About billing for {% data variables.product.prodname_actions %}](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)." 
-
-Alongside {% data variables.product.prodname_actions %} minutes, you will also be billed for the storage of prebuilds associated with each prebuild configuration for a given repository and region. Storage of prebuilds is billed at the same rate as storage of codespaces.
--- a/data/reusables/codespaces/billing-for-prebuilds-reducing.md
+++ b/data/reusables/codespaces/billing-for-prebuilds-reducing.md
@ -1,3 +0,0 @@
-To reduce consumption of Actions minutes, you can set a prebuild to be updated only when you make a change to your dev container configuration files, or only on a custom schedule. You can also manage your storage usage by adjusting the number of template versions to be retained for your prebuild configurations. For more information, see "[Configuring prebuilds](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-a-prebuild)."
-
-If you are an organization or enterprise owner, you can track usage of prebuild workflows and storage by downloading a {% data variables.product.prodname_actions %} usage report for your organization or enterprise. You can identify workflow runs for prebuilds by filtering the CSV output to only include the workflow called "Create {% data variables.product.prodname_github_codespaces %} Prebuilds." For more information, see "[Viewing your {% data variables.product.prodname_actions %} usage](/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage#viewing-github-actions-usage-for-your-organization)."
--- a/data/reusables/codespaces/codespaces-billing.md
+++ b/data/reusables/codespaces/codespaces-billing.md
@ -1,9 +0,0 @@
-{% data variables.product.prodname_codespaces %} are billed in US dollars (USD) according to their compute and storage usage.
-
-### Calculating compute usage
-Compute usage is defined as the total number of uptime minutes for which a {% data variables.product.prodname_github_codespaces %} instance is active. Compute usage is calculated by summing the actual number of minutes used by all codespaces that are billable to the organization or enterprise. These totals are reported to the billing service daily, and are billed monthly.
-
-Uptime is controlled by stopping your codespace, which can be done manually or automatically after a developer specified period of inactivity. For more information, see "[Closing or stopping your codespace](/codespaces/getting-started/deep-dive#closing-or-stopping-your-codespace)".
-
-### Calculating storage usage
-For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all storage used by all codespaces in your account. This includes any files used by the codespaces, such as cloned repositories, configuration files, and extensions, among others. These totals are reported to the billing service daily, and are billed monthly. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your storage to the nearest MB. 
--- a/data/reusables/codespaces/codespaces-disabling-org-billing.md
+++ b/data/reusables/codespaces/codespaces-disabling-org-billing.md
@ -1,5 +1,5 @@
 {% note %}

-**Note**:  If you disable billable codespaces use for your organization, anyone who can create codespaces as an individual user, and can clone a repository in your organization, will still be able to create a codespace for that repository. However, this will not incur any charge for your organization. For information about restricting access to a repository, see "[Managing teams and people with access to your repository](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."
+**Note**:  If you disable billable codespaces use for your organization, anyone who can clone a repository in your organization, will still be able to create a codespace for that repository by using their personal account. However, this will not incur any charge for your organization. For information about restricting access to a repository, see "[Managing teams and people with access to your repository](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-teams-and-people-with-access-to-your-repository)."

 {% endnote %}
--- a/data/reusables/codespaces/codespaces-monthly-billing.md
+++ b/data/reusables/codespaces/codespaces-monthly-billing.md
@ -0,0 +1 @@
+Costs for {% data variables.product.prodname_github_codespaces %} are always billed monthly, even if your account is otherwise billed annually.
--- a/data/reusables/codespaces/codespaces-spending-limit-requirement.md
+++ b/data/reusables/codespaces/codespaces-spending-limit-requirement.md
@ -5,5 +5,3 @@
 {% endnote %}

 By default, your organization or enterprise will have a {% data variables.product.prodname_github_codespaces %} spending limit of $0. This prevents new codespaces from being created, or existing codespaces from being opened, if this would incur a billable cost to your organization or enterprise. To allow your users to create codespaces in your organization, set the limit to a value higher than $0.
-
-{% data reusables.billing.overages-billed-monthly %}
--- a/data/reusables/codespaces/creating-a-codespace-in-vscode.md
+++ b/data/reusables/codespaces/creating-a-codespace-in-vscode.md
@ -1,11 +1,5 @@
 After you connect your account on {% data variables.product.product_location %} to the {% data variables.product.prodname_github_codespaces %} extension, you can create a new codespace. For more information about the {% data variables.product.prodname_github_codespaces %} extension, see the [{% data variables.product.prodname_vs_marketplace_shortname %} marketplace](https://marketplace.visualstudio.com/items?itemName=GitHub.codespaces).

-{% note %}
-
-**Note**: Currently, {% data variables.product.prodname_vscode_shortname %} doesn't allow you to choose a dev container configuration when you create a codespace. If you want to choose a specific dev container configuration, use the {% data variables.product.prodname_dotcom %} web interface to create your codespace. For more information, click the **Web browser** tab at the top of this page.
-
-{% endnote %}
-
 {% data reusables.codespaces.click-remote-explorer-icon-vscode %}
 2. Click the Add icon: {% octicon "plus" aria-label="The plus icon" %}.

--- a/data/reusables/codespaces/exporting-changes.md
+++ b/data/reusables/codespaces/exporting-changes.md
@ -1 +1 @@
-If you hit a spending limit, you will no longer be able to create or resume your codespaces. You can still [export any work in progress changes to a new branch](/codespaces/troubleshooting/exporting-changes-to-a-branch). 
+If your organization reaches its spending limit, people will no longer be able to create or resume codespaces that are billable to your organization. However, they can still [export any work in progress changes to a new branch](/codespaces/troubleshooting/exporting-changes-to-a-branch).
--- a/data/reusables/codespaces/prebuilds-definition.md
+++ b/data/reusables/codespaces/prebuilds-definition.md
@ -0,0 +1 @@
+A prebuild assembles the main components of a codespace for a particular combination of repository, branch, and `devcontainer.json` configuration file. It provides a quick way to create a new codespace. For complex and/or large repositories in particular, you can create a new codespace more quickly by using a prebuild.
--- a/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md
+++ b/data/reusables/dotcom_billing/pricing_calculator/pricing_cal_codespaces.md
@ -1 +0,0 @@
-To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces).
--- a/lib/search/indexes/github-docs-3.2-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3337f502268d39fb00cac7d3b2c92b4ad2b3b9329e13fd54c842413af2428f5
-size 785792
+oid sha256:c4b810ba5e9dfac2a18bde3929ecf72beeca793aaa80038fc00f83850293c05a
+size 785820
--- a/lib/search/indexes/github-docs-3.2-cn.json.br
+++ b/lib/search/indexes/github-docs-3.2-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6f33647ebd5323232c6660277e75d65431ce548facc623b4b50f4862d47a0f3
-size 1638014
+oid sha256:22766e741bdf33d0959a74e5cb68f294271aa98f7da51a7137a92cf6af041c0a
+size 1637595
--- a/lib/search/indexes/github-docs-3.2-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5762b7accf53bd01842e6f41129e5cfe30588a86f9c395f9f7d6f3c05e59a7f
-size 1100546
+oid sha256:6e5813d7598158689930c0701dd189bde6bb4da4aa9a36bf7fce3b63a5cb30f8
+size 1100588
--- a/lib/search/indexes/github-docs-3.2-en.json.br
+++ b/lib/search/indexes/github-docs-3.2-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3849b289dced75fa8b31853c76f7c12ce6353aaff8cd0e2f8dc0f95fb4f22002
-size 4482669
+oid sha256:1ab53e754174a0d9162bfb24e097f82cb83cc09d4864d5783d7dc241dd7e7092
+size 4482703
--- a/lib/search/indexes/github-docs-3.2-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:452e86d5533ccb3cef463a1d7331d73a7992cbbdb73e9069bca3e9d39ab17239
-size 746044
+oid sha256:b7ebf010bc7c3c5c8a6082102179ddc7ff9ef1f4f5e82d37a33cc5015ce3141c
+size 746824
--- a/lib/search/indexes/github-docs-3.2-es.json.br
+++ b/lib/search/indexes/github-docs-3.2-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:970995438a0659edbbd085692c02abb262c6fdcec33bbae1a9f67df6ba159b88
-size 3141561
+oid sha256:d6c183854931043e1decb358cb7852de3104fb08594b557d236638070e82739a
+size 3149441
--- a/lib/search/indexes/github-docs-3.2-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-ja-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2177add6f5e5b86af5a28dd93bf19fd1359375f6465b3140bfd70661c7f86f3
-size 827391
+oid sha256:d4a8ae260c48370eefa41da4a67380fce01bed5c9e542107a574fa4fca576cfa
+size 827403
--- a/lib/search/indexes/github-docs-3.2-ja.json.br
+++ b/lib/search/indexes/github-docs-3.2-ja.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e9b204a4ea983ff4228f6f41cc07f138c287e180c4c705424f2df62c2831e92
-size 4411342
+oid sha256:e59140a1ee9da06b73ad5b93b1a50f43638d8b8876f28102fe1f2996f8a906ff
+size 4411380
--- a/lib/search/indexes/github-docs-3.2-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.2-pt-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da79154b9e898c6daf75892c3dc6a4092613c950ae690c7f16aeed976a60c85d
-size 733267
+oid sha256:5d037943a5aca636441fb1fa0623e2eb64560ede01eff015752663af764d4eee
+size 733293
--- a/lib/search/indexes/github-docs-3.2-pt.json.br
+++ b/lib/search/indexes/github-docs-3.2-pt.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90718e28d4039003ee4f1bf91e3f285ac1a68fcaca1c4ee1c8bf87ab4fe3bda9
-size 3129162
+oid sha256:850422094c149634f0ca67eac9d916d80ebb0b6c0551b247da3c60381fc68e69
+size 3129130
--- a/lib/search/indexes/github-docs-3.3-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.3-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5923ade9c95a9cde3df8d409b3ec1929f6ef4459fd5280590932b5e28ddd0721
-size 810225
+oid sha256:c72b4be3611cd0de641cc10964a784d794b57af23e413a4cb93ecb7064b68385
+size 810274
--- a/lib/search/indexes/github-docs-3.3-cn.json.br
+++ b/lib/search/indexes/github-docs-3.3-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4045e61bb5df9ec00684ef8cf4cb5e02db0b9f3a020bdb8df4667ca5b6ff07a
-size 1692440
+oid sha256:651f5531c1c7fc97343dce7e082692196d96fc68aaaea587a680484dc17def38
+size 1692427
--- a/lib/search/indexes/github-docs-3.3-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.3-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b547e4dab5e263d38bb43d3e265c0a7e43bc9cc00026a3fbd39290cf25fff74c
-size 1136187
+oid sha256:5842022974f3e9d90da627da2391271beb8f07ecbaa699a5bff9bf5894361af2
+size 1136383
--- a/lib/search/indexes/github-docs-3.3-en.json.br
+++ b/lib/search/indexes/github-docs-3.3-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d9c0dd5120b89971a2eafd1028269975fade4409de6f396d1e5e6fa747d52e62
-size 4587661
+oid sha256:f9a5093303d9c75b82da67be8ec205b32db91f8a669eed89c5704f1045038d06
+size 4587223
--- a/lib/search/indexes/github-docs-3.3-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.3-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d373b957a01b0327d2c541825b1e5394b20e480a6a4bd4d58eb49d92e39f17d4
-size 767911
+oid sha256:5275ef1828e8c9dd2a6b40bd944b58c78779be5fce85d8efdbae407987b95d2c
+size 768746
--- a/lib/search/indexes/github-docs-3.3-es.json.br
+++ b/lib/search/indexes/github-docs-3.3-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17c72e78b46b74c65f75ab5d52e7e697e51808f13f0f0c2dc301d768672fb5ce
-size 3237827
+oid sha256:c902488174f85e8b61b257512ad089488a95d04f7f38ef81a0f6d40ae3e3c71b
+size 3245397
--- a/lib/search/indexes/github-docs-3.3-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.3-ja-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56b9a4884bbe4ca85c0a0cd07dbe7dd5c2b9eb6dd1e71aa5984e7b35444051c2
-size 851382
+oid sha256:57e9fbc67b811f719cf3bdcb69965c95ccdc2fb4012635f8b2aa5d0ae993ad7f
+size 851368
--- a/lib/search/indexes/github-docs-3.3-ja.json.br
+++ b/lib/search/indexes/github-docs-3.3-ja.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e3fc1f95cca587876890217aac6a0cbbce525c44f5083d231d6d94bb728aa5b
-size 4542530
+oid sha256:e715fbac42c2965488ad1a4065149552ea5c4ed3c67232344e1651bde0099bcd
+size 4542564
--- a/lib/search/indexes/github-docs-3.3-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.3-pt-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4442d4e9dfbc51aea51604571ae255c7aa3867a2a6fb15830213534e9df906f3
-size 755353
+oid sha256:14ee00e316369200647537d60aaeaec5cdc6747948d94ac41995d6eb0722c5a5
+size 755444
--- a/lib/search/indexes/github-docs-3.3-pt.json.br
+++ b/lib/search/indexes/github-docs-3.3-pt.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cc5bf7ff22eff172f3d6a36c3cbca68d65e8cb5393a0af466019d68061558ee
-size 3224926
+oid sha256:8909b569adcd53130c02598ece69a4371fcc4e0ae43b31ff5f431849cdb6f3a7
+size 3224774
--- a/lib/search/indexes/github-docs-3.4-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.4-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbcd9f92528219cc625c4cc5f42d96a3bc5a1b83357fe65e5cba31cf9cfd9aa3
-size 812639
+oid sha256:dfcc12174ccceeabadd3719d9f43ba6f3998ea8a7457c6fda01146d538f64104
+size 812594
--- a/lib/search/indexes/github-docs-3.4-cn.json.br
+++ b/lib/search/indexes/github-docs-3.4-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f77cf3854a977218aab4b619e0eee8fbf10395ebc08c1195ae6fe18cf78ec8a3
-size 1705165
+oid sha256:23316b801b75ffcf081781f23da523ca7020bb79df6d00d9904d17f631be25e9
+size 1705727
--- a/lib/search/indexes/github-docs-3.4-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.4-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e8d742054ea3c1a31e2d7de30eec9676c37210f6a0b7ffcd5a560a5152c30cb
-size 1148099
+oid sha256:20ff7a53cfdae827c28fe13921ee752abcc6f7569e614626ad107d0a7765fdb2
+size 1147534
--- a/lib/search/indexes/github-docs-3.4-en.json.br
+++ b/lib/search/indexes/github-docs-3.4-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bd281be76840d903d97ed582b09cbb92745f2daf2f06d11447248701bb64dae
-size 4648724
+oid sha256:8e353148317ea02fddcf9f55106bcd74eb94170023b603de7bcbdb2c0def670c
+size 4649066
--- a/lib/search/indexes/github-docs-3.4-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.4-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:289aeca42f0779e938debf79b0dcc890b8d93d99b74a36c58ee431e77559e18b
-size 772262
+oid sha256:32d0e6b73754567a0d6942ca11c2cb7d0788ed00e283463c0fe89ee57928d00a
+size 773144
--- a/lib/search/indexes/github-docs-3.4-es.json.br
+++ b/lib/search/indexes/github-docs-3.4-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0811c80d6fb1c3ae7c4b4a82d3f0ca17962a8ef713aaa65ec56bca119b903b1
-size 3264921
+oid sha256:ee65882ace27b556afa1da22f131812581b6d15cca88c858ba9c400aeb947b2a
+size 3271985
--- a/lib/search/indexes/github-docs-3.4-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.4-ja-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd5b5961acab7183175222780aac627d202ec174e7c9fa0b4624b3510a450b81
-size 853387
+oid sha256:19906631cf066b04bb84dcad8ad6d3c86020c6f13d8ef232f31aed162f539110
+size 853298
--- a/lib/search/indexes/github-docs-3.4-ja.json.br
+++ b/lib/search/indexes/github-docs-3.4-ja.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a34817a47c789dfc68a2bb36fc5606ef058a07f8f8cff63e5b109f16a0fe78a
-size 4570550
+oid sha256:459540a5c1b478d9e4f13610b6b562bdf26ee6328026e7e728b599c663fc1d9e
+size 4570475
--- a/lib/search/indexes/github-docs-3.4-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.4-pt-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fc9779a23c39f7e54a9f2a5e5022d909c5e9d13f1d0815826a30279f9a3bda8
-size 759699
+oid sha256:625d53713f954f67956109ef467033813b3332d91955bb5bb4670db3bc7fd7e2
+size 759703
--- a/lib/search/indexes/github-docs-3.4-pt.json.br
+++ b/lib/search/indexes/github-docs-3.4-pt.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b8b18f480045173ed73d39c18de8f164cd498707e2ecf0a12f4d5c4f9734857
-size 3252156
+oid sha256:e12550f1a2ef5dc8b23ebe250dbb7de35a83df2f97e57db243c2c77c54546fc8
+size 3252146
--- a/lib/search/indexes/github-docs-3.5-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.5-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1303ed5ef099d89d438a5908cc4b50097a5db0f5cc41d7509ff86e9cb710236e
-size 843003
+oid sha256:7c541b5d9be25a761c5b02e4d7db7722a6e9b5d6901d86d69b5a49e134383908
+size 843067
--- a/lib/search/indexes/github-docs-3.5-cn.json.br
+++ b/lib/search/indexes/github-docs-3.5-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb1c86f031c5031a5dfd46a2f7a615f656724937861b32167ca7269e4ab8f625
-size 1772730
+oid sha256:9851566311359a73ba5f80c503fb556bd2fd81e4d8225860dbf8697dc597b833
+size 1772774
--- a/lib/search/indexes/github-docs-3.5-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.5-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36c9b86da28da29b6f01aba1c5d4bbbe6845a12c90d01637dfb4570243aeed0e
-size 1188580
+oid sha256:3d4eab484c271ef4924b408efda68dc65b7b249b340f576f8bce6a4a1d689ae1
+size 1188474
--- a/lib/search/indexes/github-docs-3.5-en.json.br
+++ b/lib/search/indexes/github-docs-3.5-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5993965d46d722314526978073f94febeb0e94691dbaa34afec22e848d9699a
-size 4815131
+oid sha256:2ed35a3beed4edeb7db00a50561585ded796c82bd1904ee255f6d91075af9df6
+size 4815435
--- a/lib/search/indexes/github-docs-3.5-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.5-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c38f1532f24a3773359cbceaa726ce60302d9ac42a717eac4f824277cbfeac4d
-size 797234
+oid sha256:a8061ec65782c88fc8c437a182b350e86cbfba68416ac96083c86e294acd2b5f
+size 798059
--- a/lib/search/indexes/github-docs-3.5-es.json.br
+++ b/lib/search/indexes/github-docs-3.5-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:722675f82df860f8a33fe7dc4112d3d225ee4f452929cff1c41010ef7a74b28a
-size 3378885
+oid sha256:155ab77837d9ce855da37df04aa210634191f38c9945f2c51feabb0d46d8887c
+size 3386219
--- a/lib/search/indexes/github-docs-3.5-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.5-ja-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0de5f148b11b0d5992240461a60099139edb2a5f1f9dcc0460c2852c82a0d03d
-size 883437
+oid sha256:235d327c3ea9e2b627acba1145f1ae13b9d52f52d22c4d05b346ab96807594b4
+size 883427
--- a/lib/search/indexes/github-docs-3.5-ja.json.br
+++ b/lib/search/indexes/github-docs-3.5-ja.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7552b90afcadc9ebf2d0c3c7ecc65dd1bead061aa0a859fec0785f21202d4214
-size 4739901
+oid sha256:348d0f04baeaea1a0a576733bc68d748210995b724ee1d5088ea80f040731d40
+size 4739924
--- a/lib/search/indexes/github-docs-3.5-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.5-pt-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a101dbe68f7c67f48996525becd9be401f68cb64f2575539d33de2cbda7e6d25
-size 784871
+oid sha256:0bb434d457dd89dcbdc4928e19b5ebfa4f2308aabfb3fdd3a1308e4a11b45f97
+size 784870
--- a/lib/search/indexes/github-docs-3.5-pt.json.br
+++ b/lib/search/indexes/github-docs-3.5-pt.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4afa9d28aa0c2a37502cf4b54713590e9ab10f9b08d40e4ccc10306e62070749
-size 3368220
+oid sha256:27fac92b5801f18f187b39e8b7195041ee11b48d50e0091406e707ff6fc44dc1
+size 3368246
--- a/lib/search/indexes/github-docs-3.6-cn-records.json.br
+++ b/lib/search/indexes/github-docs-3.6-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e48834c77e75a328a6563af6993e2fe358277805ab9164db7db9c4d2c90074c
-size 866217
+oid sha256:c4577edc495b805542370b75a732e7122a30aabd24ef92e40fc5b33a44dadb55
+size 866226
--- a/lib/search/indexes/github-docs-3.6-cn.json.br
+++ b/lib/search/indexes/github-docs-3.6-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f9c144f23a8c31c7c15d089c91f7d7585c1c3f8ce14c9a4a44814513db17b07
-size 1814534
+oid sha256:5160bdd5f27fc89e8030a20bf12d51fcb0d1b63634a32168f3736aa0b91908f1
+size 1814531
--- a/lib/search/indexes/github-docs-3.6-en-records.json.br
+++ b/lib/search/indexes/github-docs-3.6-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70779311088c2496d68b7f90d5817bde76e34b3b3789c188a663928d21b9e5eb
-size 1223030
+oid sha256:04317f88ce1915fa2b8014540ee6fdf730dcc89af511b0d57093e3fc1e5051fa
+size 1222601
--- a/lib/search/indexes/github-docs-3.6-en.json.br
+++ b/lib/search/indexes/github-docs-3.6-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:785e5ab9eaac5f5a1f6df8da5a8c50bd7764467c1dbd2f74a0708a79531e475e
-size 4952533
+oid sha256:4ff29bd1ecb88fd251b0522bc019c1fc1a9ebaf04bcad90af7dc349f9f2db31a
+size 4952320
--- a/lib/search/indexes/github-docs-3.6-es-records.json.br
+++ b/lib/search/indexes/github-docs-3.6-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:03d26aa9cfb112ecdb7053fed2dc01c2262096965e4c43c9e6f4c1e4a0009e68
-size 821186
+oid sha256:88318f3080b587179fabc8b435d69184b531d2e530c3da4f7ea8636c266b62be
+size 821926
--- a/lib/search/indexes/github-docs-3.6-es.json.br
+++ b/lib/search/indexes/github-docs-3.6-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fc5d70be211d1329ea09351e8f7abfd921d2fedb7b5cd7c55027ef50fd83e0e
-size 3486385
+oid sha256:afc01a8cfc0289216661b1f217f3b3f05d095c4c136cf6e78700c4aba543c864
+size 3493999
--- a/lib/search/indexes/github-docs-3.6-ja-records.json.br
+++ b/lib/search/indexes/github-docs-3.6-ja-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be5220ce5532c308310b8abded79da6bd2c04d5a1c1e891c757876e21504771c
-size 909519
+oid sha256:0c263187b4665fd988392697d1f930454b5f4ea6b5f79bc6d9de02e0f5723a8f
+size 909488
--- a/lib/search/indexes/github-docs-3.6-ja.json.br
+++ b/lib/search/indexes/github-docs-3.6-ja.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7876603c54c051db03ea57354a3e889382415cb979c1ce6e4dcaa6aee9d4b8d6
-size 4881098
+oid sha256:9c424aec3356d37c9881caf782d80c3f057e9ebed39f168e0e77737047448bf2
+size 4881114
--- a/lib/search/indexes/github-docs-3.6-pt-records.json.br
+++ b/lib/search/indexes/github-docs-3.6-pt-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ef80e117f85802edab3973fd19b2573e991bd4c7eece40aee8c534a3d48ae04
-size 807731
+oid sha256:abe3b5bec0f3156923dbf217c114f41d73ae0a402484fa6e316f057005eb3e83
+size 807709
--- a/lib/search/indexes/github-docs-3.6-pt.json.br
+++ b/lib/search/indexes/github-docs-3.6-pt.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5afa94c328289993078435483e53ef57db525f6e99dd4edb98ff940122b13305
-size 3469206
+oid sha256:544d50792242132e18256bb3395c2f96a16a84886393534e047f4d42e348cf6b
+size 3469412
--- a/lib/search/indexes/github-docs-dotcom-cn-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b94c3b09a47e355ef510ffc333a176df6fed405b89a0679c1c4a61457dd1b803
-size 1016271
+oid sha256:8ce6b1692ab5efe1e24c6c4fbe744535269e1194943fe22b503f8fe199402b1f
+size 1016230
--- a/lib/search/indexes/github-docs-dotcom-cn.json.br
+++ b/lib/search/indexes/github-docs-dotcom-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e3bcc2d5bc4b4363399fc207d7103793da6232a2a9265bc815789f5867e15c4f
-size 1906120
+oid sha256:37273392c398e0e229815f500182a0d152b8e8c302015d45606fe8e22ff29907
+size 1905951
--- a/lib/search/indexes/github-docs-dotcom-en-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8b61e3ce9767e40fe0231c70875d923063fba68954644c35701bddf7216a76e
-size 1465501
+oid sha256:6389bcf652b0c64a09e7f8cf619285bd1d8822738b348c5b0e6f294abf79bb3a
+size 1465046
--- a/lib/search/indexes/github-docs-dotcom-en.json.br
+++ b/lib/search/indexes/github-docs-dotcom-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60b91efc1991ba5dc3cc9613d7ac6e096fc7f4221e30e51b8fd942de383fa4cf
-size 5688763
+oid sha256:4466a036f80f31655f0ba6d77a0af7aed6d1839206089a9fc92a54be595d1fd5
+size 5688623
--- a/lib/search/indexes/github-docs-dotcom-es-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0aec5b609de458e4a5f3c413b2d1b76d61e1766af52c6a7fd037acb22c4da12
-size 950827
+oid sha256:c0fc1aacc78bcfbbf534f2e33c228e3de4fa01d407c73adf2bdbe7127fa3b9ea
+size 950990
--- a/lib/search/indexes/github-docs-dotcom-es.json.br
+++ b/lib/search/indexes/github-docs-dotcom-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:740c6b101d30e362ec0d61ab100a4faa293e2f36bb155bbe08cacb90ba6178f6
-size 3948939
+oid sha256:62a1332512768c05533d09f89469e20d1c7d7dc07c1f42ccd202399009299137
+size 3952720
--- a/lib/search/indexes/github-docs-dotcom-ja-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-ja-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dbd39e4a47da7aa5d38eec10ab871aca475891020306972e5ccef18aa52d705
-size 1063648
+oid sha256:1e43dbf39515ac367429b616c94ada63bcda7f495a86663ca589fe97a5b9da35
+size 1063661
--- a/lib/search/indexes/github-docs-dotcom-ja.json.br
+++ b/lib/search/indexes/github-docs-dotcom-ja.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70a7f3a41e4575cad760d53faa2bf4164c0a66b763146c69740e5d383b1a291f
-size 5549526
+oid sha256:192a1e1877368fc570c820223592f77f38f08057b1e44f415f86d75ef4930f71
+size 5549597
--- a/lib/search/indexes/github-docs-dotcom-pt-records.json.br
+++ b/lib/search/indexes/github-docs-dotcom-pt-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a78e02008be657c6978c9180f7779e62dbcf5e78af1af467be3388115f7fb844
-size 933959
+oid sha256:00b7eaa5917a6c255045e61cbd950bdee0db946425c68108f9d04b076f6faa84
+size 933987
--- a/lib/search/indexes/github-docs-dotcom-pt.json.br
+++ b/lib/search/indexes/github-docs-dotcom-pt.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f77c9e1898dbc2168925e0fabdad21d1993516f14888bcb7380308f2ef57624
-size 3908799
+oid sha256:85b1e0a98b6bbf47b708ecb5788ced5ada2992cc37c68c3cbe17d8cb5e127933
+size 3909253
--- a/lib/search/indexes/github-docs-ghae-cn-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-cn-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2ad1675d8bd0e380fa15be98199089dc3f7084d5f2e4e669b0d2eb7081581f8
+oid sha256:c8b45305ad9698f299dd0faa988c920385de098896349a1ddceb36c7c0d7e320
 size 649661
--- a/lib/search/indexes/github-docs-ghae-cn.json.br
+++ b/lib/search/indexes/github-docs-ghae-cn.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dce87a3db3d213f270f1d75e09249406dd5968301d85caee3d3bbf37f03afce2
-size 1379197
+oid sha256:53c51519f7eb449cc1954390182d560d2efbd1583c9e2cd1e58f2e73483da8ac
+size 1379193
--- a/lib/search/indexes/github-docs-ghae-en-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-en-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83285b6acc47388b64dbfb1ac941b17ee4c86e0ed7541cfd5ebe640d1c583b3e
-size 943853
+oid sha256:d6a0db6d8d6ef767d3fbd9a8cd5b1783abbb1ed4657489a219095e000a8a4601
+size 943600
--- a/lib/search/indexes/github-docs-ghae-en.json.br
+++ b/lib/search/indexes/github-docs-ghae-en.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa36f8cd00dece9165452f365a280d6b748c30d567fd59fc0194e33e1800afe6
-size 3776585
+oid sha256:3812a8b30b8601c1a9bd2686b911d78cf60f8b9eab714bca8ef71ab522a68ea2
+size 3776427
--- a/lib/search/indexes/github-docs-ghae-es-records.json.br
+++ b/lib/search/indexes/github-docs-ghae-es-records.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f070967208d1de9187be3ad5c77b6d39a87e69799fa9a04e2f2adcc30c8cfd89
-size 627027
+oid sha256:e800ec91bf9fc233f38abb095aa5f653376bd24be7781522a39ee4c9bdad5288
+size 627257
--- a/lib/search/indexes/github-docs-ghae-es.json.br
+++ b/lib/search/indexes/github-docs-ghae-es.json.br
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:498a55e8f7302963965a572b2d270faeaad2f4f0cdcf21cf8e83da9c874e73a0
-size 2582507
+oid sha256:ef2929061332ead6ae0f80a7b9d4851e71631f23b0e92c79b40d992a60dccae9
+size 2586213
--- a/Показать больше
+++ b/Показать больше
				`@ -0,0 +1 @@`
				`Costs for {% data variables.product.prodname_github_codespaces %} are always billed monthly, even if your account is otherwise billed annually.`
				`@ -0,0 +1 @@`
				A prebuild assembles the main components of a codespace for a particular combination of repository, branch, and `devcontainer.json` configuration file. It provides a quick way to create a new codespace. For complex and/or large repositories in particular, you can create a new codespace more quickly by using a prebuild.
				`@ -1 +0,0 @@`
				`To estimate the costs for consumptive services, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces).`