diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md index c37e497ac859..d3ac1fc3d7a9 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md @@ -20,8 +20,6 @@ topics: shortTitle: Downgrade Git LFS storage --- -{% data reusables.billing.enhanced-billing-platform %} - When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage). ## Downgrading storage and bandwidth for a personal account diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md index 634678536022..4768138e9629 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md @@ -20,4 +20,3 @@ children: - /downgrading-git-large-file-storage --- -{% data reusables.billing.enhanced-billing-platform %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md index 5f6f90a73cd7..7a8d9585562a 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md @@ -20,8 +20,6 @@ topics: shortTitle: Upgrade Git LFS storage --- -{% data reusables.billing.enhanced-billing-platform %} - ## Purchasing additional storage and bandwidth for a personal account {% data reusables.user-settings.access_settings %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md index fb36e35b6f2f..3b8580b88fc5 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md @@ -19,8 +19,6 @@ topics: shortTitle: View Git LFS usage --- -{% data reusables.billing.enhanced-billing-platform %} - {% data reusables.large_files.owner_quota_only %} {% data reusables.large_files.does_not_carry %} ## Viewing storage and bandwidth usage for a personal account diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md index 2018cfe34039..e56d5f427294 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md @@ -16,8 +16,6 @@ topics: shortTitle: Billing for GitHub Actions --- -{% data reusables.billing.enhanced-billing-platform %} - ## About billing for {% data variables.product.prodname_actions %} {% data reusables.billing.authorization-charge %} @@ -33,7 +31,7 @@ Minutes reset every month, while storage usage does not. ### Included storage and minutes > [!NOTE] -> * Included minutes cannot be used for larger runners. These runners will always be charged for, including in public repositories. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates). +> * Included minutes cannot be used for larger runners. These runners will always be charged for, including in public repositories. For more information, see [Per-minute rates](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates). > * Logs and job summaries do not count towards storage usage. |Plan | Storage | Minutes (per month)| @@ -44,13 +42,11 @@ Minutes reset every month, while storage usage does not. | {% data variables.product.prodname_team %} | 2 GB | 3,000 | | {% data variables.product.prodname_ghe_cloud %} | 50 GB | 50,000 | -The storage used by a repository is the total storage used by {% data variables.product.prodname_actions %} artifacts and {% data variables.product.prodname_registry %}. Your storage cost is the total usage for all repositories owned by your account. For more information about pricing for {% data variables.product.prodname_registry %}, see [AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages). - -If your account's usage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day and per-minute usage depending on the operating system used by the {% data variables.product.prodname_dotcom %}-hosted runner. {% data variables.product.prodname_dotcom %} rounds the minutes and partial minutes each job uses up to the nearest whole minute. +If your account's storage surpasses these limits and you have set a spending limit above $0 USD, you will pay $0.008 USD per GB of storage per day. ### Minute multipliers -Jobs that run on Windows and macOS runners that {% data variables.product.prodname_dotcom %} hosts consume minutes at 2 and 10 times the rate that jobs on Linux runners consume. For example, using 1,000 Windows minutes would consume 2,000 of the minutes included in your account. Using 1,000 macOS minutes, would consume 10,000 minutes included in your account. +Jobs that run on Windows and macOS runners that {% data variables.product.prodname_dotcom %} hosts consume minutes at 2 and 10 times the rate that jobs on Linux runners consume. | Operating system | Minute multiplier | |----------------- | ------------------| @@ -59,10 +55,12 @@ Jobs that run on Windows and macOS runners that {% data variables.product.prodna | macOS | 10 | > [!NOTE] -> Minute multipliers do not apply to the per-minute rates shown below. +> The billing dashboard may show your Actions usage as a dollar amount ("spend") rather than raw minutes. This amount already reflects the minute multipliers above. If you're using macOS or Windows runners, you will use up your included minutes more quickly ### Per-minute rates +{% data variables.product.github %} rounds the minutes and partial minutes each job uses up to the nearest whole minute. + #### Per-minute rates for standard runners | Operating system | Per-minute rate (USD) | diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md index d6df0778cea5..953b0302c685 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md @@ -14,4 +14,3 @@ children: - /managing-your-spending-limit-for-github-actions --- -{% data reusables.billing.enhanced-billing-platform %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md index 5c700f5dd9d5..7aa905ff6c51 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md @@ -18,8 +18,6 @@ topics: shortTitle: Spending limits for Actions --- -{% data reusables.billing.enhanced-billing-platform %} - ## About spending limits for {% data variables.product.prodname_actions %} {% data reusables.actions.actions-billing %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md index 51a2f6907b46..b580e426da48 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md @@ -32,11 +32,11 @@ You need pay to use {% data variables.product.prodname_AS %} features in private ## License types for {% data variables.product.prodname_AS %} products -Licensing for {% data variables.product.prodname_AS %} products is flexible, making it easy for you to choose options that fit your business needs. {% ifversion ghec or ghes %}You can buy volume/subscription licenses for any combination of the following products or use metered billing to pay for your use:{% endif %} +{% data variables.product.prodname_AS %} consists of two main products: {% data reusables.advanced-security.ghas-products-bullets+ghas %} -For example, you might start by using {% data variables.product.prodname_GH_secret_protection %} across all repositories, and pilot {% data variables.product.prodname_GH_code_security %} in high-risk repositories. You {% ifversion ghec or ghes %}buy or {% endif %}pay only for the products you need, and expand as you see the benefits to the security of your code. +Licensing for {% data variables.product.prodname_AS %} products is flexible, making it easy for you to choose options that fit your business needs. For example, you might start by using {% data variables.product.prodname_GH_secret_protection %} across all repositories, and pilot {% data variables.product.prodname_GH_code_security %} in high-risk repositories. You buy or pay only for the products you need, and expand as you see the benefits to the security of your code. For more information, see [feature summary and pricing information](https://github.com/enterprise/advanced-security#pricing) and [AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security). @@ -51,7 +51,7 @@ Each active committer to at least one repository with an {% data variables.produ There are two different ways to pay for licenses. -* **Metered billing** {% ifversion ghec %}introduced from June 2024 onward{% elsif ghes %}available from {% data variables.product.prodname_ghe_server %} 3.13 onward with {% data variables.product.prodname_github_connect %}{% endif %} +* **Metered billing** {% ifversion ghes %}available from {% data variables.product.prodname_ghe_server %} 3.13 onward with {% data variables.product.prodname_github_connect %}{% endif %} * Users can enable {% data variables.product.prodname_GH_cs_or_sp %} independently. * Monthly bill for the number of licenses used by active committers. @@ -64,10 +64,11 @@ There are two different ways to pay for licenses. * **Volume/subscription billing** available for {% data variables.product.prodname_enterprise %} plans only - * Users must ask the sales team to set up billing. * Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year. * If the usage of {% data variables.product.prodname_AS %} by active committers exceeds the number of licenses purchased, you need to purchase additional licenses to cover this overage usage. + If you want to purchase volume/subscription-based licenses, contact your account manager in {% data variables.contact.contact_enterprise_sales %} or contact {% data variables.contact.contact_support_page %}. + ## Managing committers and costs {% ifversion fpt %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md index 7d5e4e42f494..532c57ebb635 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp.md @@ -63,9 +63,7 @@ If you already pay to use {% data variables.product.prodname_AS %} features, the {% ifversion ghec %} -If you are an existing self-serve customer, instructions on how to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %} SKUs will be announced over the next 30 days. - -You'll receive an email notification when the new plans are available to your enterprise. Transitioning to the two separate products will be self-serve and optional. +If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:support@github.com). {% elsif ghes %} @@ -77,7 +75,8 @@ If you have a hybrid {% data variables.product.prodname_ghe_cloud %} and {% data ### Volume/subscription billing users -When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing. +* **Invoiced**: When your license is due for renewal, you can choose to continue with licenses for {% data variables.product.prodname_GHAS %}, migrate to {% data variables.product.prodname_cs_or_sp %} subscription licenses, or migrate to metered billing. +* **Self-serve**: If you are an existing self-serve customer and wish to transition from the combined {% data variables.product.prodname_GHAS %} product to the new {% data variables.product.prodname_GH_cs_and_sp %}, contact [GitHub Support](mailto:support@github.com). ### Questions? diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md index 398d6181d926..5ffff1dae63a 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md @@ -30,7 +30,6 @@ To set up a trial of {% data variables.product.prodname_GHAS %} using this metho ## Setting up your trial of {% data variables.product.prodname_GHAS %} {% data reusables.enterprise-accounts.access-enterprise %} -{% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.licensing-tab-both-platforms %} 1. To the right of "{% data variables.product.prodname_GHAS %}", click **Start free trial**. 1. Click **Start trial**. diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md index 63a615bf4054..e30e0cb5f25f 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md @@ -38,14 +38,27 @@ If you use volume/subscription billing, then you will need to purchase licenses If your enterprise uses metered billing, then you are ready to start enabling {% data variables.product.prodname_GH_cs_and_sp %} at the enterprise, organization, and repository level. Whenever you enable a feature or apply a configuration, a modal dialog shows detailed information with estimated billing changes. You can confirm your change or return to the page without making changes. -## Purchasing licenses for {% data variables.product.prodname_GH_cs_or_sp %} +{% endif %} + +## Purchasing licenses for organizations + +{% data reusables.profile.access_org %} +{% data reusables.profile.org_settings %} +{% data reusables.organizations.billing_plans_or_licensing %} +1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**. + + ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) + +{% ifversion ghec %} + +## Purchasing licenses for enterprises {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.licensing-tab-both-platforms %} -1. To the right of "GitHub Advanced Security", click **Buy Advanced Security**. +1. To the right of "{% data variables.product.prodname_GHAS %}", click **Buy {% data variables.product.prodname_AS %}**. - ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy Advanced Security" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) + ![Screenshot of the {% data variables.product.prodname_AS %} section of the enterprise licensing screen. The "Buy {% data variables.product.prodname_AS %}" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png) {% data reusables.advanced-security.purchase-ghas %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md index 40b063e68632..96006b2c255c 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md @@ -99,14 +99,14 @@ You can use this information for insights into your {% data variables.product.pr You can download a CSV report of license usage through the {% data variables.product.github %} user interface or the REST API. -### Downloading license usage information from the UI +## Using the UI to download license and metered usage {% ifversion fpt %}You can download a CSV report for a repository or an organization.{% endif %} {% ifversion ghec %}You can download a CSV report for a repository, an organization, or an enterprise.{% endif %} {% ifversion fpt or ghec %} -#### For a repository +### For a repository {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} @@ -115,32 +115,38 @@ You can download a CSV report of license usage through the {% data variables.pro ![Screenshot of the table for {% data variables.product.prodname_GH_secret_protection %} usage. The horizontal kebab icon and "Download CSV report" button are outlined in orange.](/assets/images/help/billing/ghas-billing-table-repository-csv.png) -#### For an organization +### For an organization {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} -1. In the "Access" section of the sidebar click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** and then **Usage**. -1. Filter the metered usage to show `product:ghas` and choose "Group: SKU". -1. Optionally, use the "Time Frame" field to set the period to report on. -1. Click **{% octicon "download" aria-hidden="true" aria-label="download" %}Get usage report** to download the report. +1. In the "Access" section of the sidebar click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** to display an overview. +1. For metered usage, in the sidebar click **Usage**. + 1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**. + 1. To further filter the usage graph, use the dropdown menus: + * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}. + * To filter by time, select **Time Frame**, then click a time period. + * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged). + 1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**. +1. For license consumption, in the sidebar click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**. + 1. Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**. {% endif %} {% ifversion ghec %} -#### For an enterprise +### For an enterprise {% data reusables.enterprise-accounts.access-enterprise %} 1. Click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** to display an overview. - - **License consumption:** - 1. Click **{% octicon "law" aria-hidden="true" aria-label="law" %} Licensing**. - 1. Under "{% data variables.product.prodname_GHAS %}," click the **Download report** dropdown and then click either **{% octicon "download" aria-hidden="true" aria-label="download" %} {% data variables.product.prodname_code_security %}** or **{% octicon "download" aria-hidden="true" aria-label="download" %} {% data variables.product.prodname_secret_protection %}**. - - **Metered usage:** - 1. Scroll to the tabbed usage information at the bottom of the "Overview" page and click **{% data variables.product.prodname_AS %}** to show usage. - 1. In the summary box, click "View details" to show metered usage for {% data variables.product.prodname_AS %} grouped by SKU. - 1. Select a time frame and click **{% octicon "download" aria-hidden="true" aria-label="download" %}Get usage report** to download a detailed report. +1. For metered usage, click {% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} **Usage**. + 1. To display only {% data variables.product.prodname_AS %} usage within the graph, click the search bar, then click **Product**. Within the list of products displayed, click **GHAS**. + 1. To further filter the usage graph, use the dropdown menus: + * To view usage by SKU, select the **Group** dropdown, then click **SKU**. This will allow you to view usage for both {% data variables.product.prodname_GH_cs_and_sp %}. + * To filter by time, select **Time Frame**, then click a time period. + * Below the graph, you can see a more granular overview of the usage. Click the arrow next to a specific date to see a nested table with usage per SKU, units, price/unit, gross amount (the amount actually used), and billed amount (the amount you are charged). + 1. To download the data, click **{% octicon "download" aria-hidden="true" aria-label="download" %} Get usage report**. +1. For license consumption, click {% octicon "law" aria-hidden="true" aria-label="law" %} **Licensing**. + * Under "{% data variables.product.prodname_GHAS %}," click the **{% octicon "download" aria-hidden="true" aria-label="download" %} Download CSV report** dropdown and then click either **{% data variables.product.prodname_code_security %}** or **{% data variables.product.prodname_secret_protection %}**. {% elsif ghes %} @@ -152,7 +158,7 @@ You can download a CSV report of license usage through the {% data variables.pro {% endif %} -### Downloading {% data variables.product.prodname_AS %} license usage information through the REST API +## Using the REST API to download license and metered usage You can retrieve {% data variables.product.prodname_AS %} usage information via the billing API. diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md index 16aafd2b4f8c..173bde22c642 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md @@ -19,8 +19,6 @@ redirect_from: - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces --- -{% data reusables.billing.enhanced-billing-platform %} - ## About {% data variables.product.prodname_github_codespaces %} pricing {% data reusables.billing.authorization-charge %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md index fdf733c0c8e1..6990128b83ed 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md @@ -13,4 +13,3 @@ children: - /managing-the-spending-limit-for-github-codespaces --- -{% data reusables.billing.enhanced-billing-platform %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md index f8aae5886241..bcdc79cb2bd4 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md @@ -18,8 +18,6 @@ redirect_from: - /billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces --- -{% data reusables.billing.enhanced-billing-platform %} - ## About the {% data variables.product.prodname_github_codespaces %} spending limit {% data reusables.codespaces.codespaces-free-for-personal-intro %} See [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces). diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md index 9f41e33c7ca9..c0b32c8cdb61 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md @@ -10,4 +10,3 @@ children: - /about-billing-for-github-copilot --- -{% data reusables.billing.enhanced-billing-platform %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md index 46f2a0ba80e0..7fc4a8ea699c 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md @@ -16,8 +16,6 @@ topics: shortTitle: About billing --- -{% data reusables.billing.enhanced-billing-platform %} - ## About billing for {% data variables.product.prodname_registry %} {% data reusables.billing.authorization-charge %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md index e7fb5adf8e7b..66ce91ab08c0 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md @@ -14,4 +14,3 @@ children: - /managing-your-spending-limit-for-github-packages --- -{% data reusables.billing.enhanced-billing-platform %} diff --git a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md index c215c1481cc8..17a0ba03d29a 100644 --- a/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md +++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md @@ -19,8 +19,6 @@ topics: shortTitle: Your spending limit --- -{% data reusables.billing.enhanced-billing-platform %} - ## About spending limits for {% data variables.product.prodname_registry %} {% data reusables.package_registry.packages-billing %} diff --git a/content/billing/managing-your-billing/about-billing-on-github.md b/content/billing/managing-your-billing/about-billing-on-github.md index dea442259cb0..e9c024af55c4 100644 --- a/content/billing/managing-your-billing/about-billing-on-github.md +++ b/content/billing/managing-your-billing/about-billing-on-github.md @@ -1,6 +1,6 @@ --- title: About billing on GitHub -intro: "Your bill is a combination of charges for your subscriptions, including your account's plan, and usage-based billing." +intro: "GitHub bills you separately for each account you own. Your bill combines subscription costs and usage-based billing." redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github - /articles/about-billing-on-github @@ -18,24 +18,32 @@ topics: ## About billing on {% data variables.product.prodname_dotcom %} -{% data variables.product.company_short %} bills separately for each account. This means that you will receive a separate bill for your personal account and for each organization or enterprise account you own. For more information about account types, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts). +{% data variables.product.company_short %} bills you separately for each account you own (personal, organization, or enterprise). Your bill combines: -You can switch between the billing settings for each of your accounts by using the context switcher. See [Switching between settings for your different accounts](#switching-between-settings-for-your-different-accounts). +* **Subscriptions**: Fixed monthly costs for account plans (for example: {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}) and paid products (for example: {% data variables.product.prodname_copilot %}) +* **Usage-based billing**: Variable costs that depend on how much you use certain features (for example: {% data variables.product.prodname_actions %}) -The bill for each account is a combination of subscriptions and usage-based billing. Subscriptions include your account's plan, such as {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}, as well as paid products that have a consistent monthly cost, such as {% data variables.product.prodname_copilot %} and apps from {% data variables.product.prodname_marketplace %}. +Each account type has its own billing settings that you manage separately. -Usage-based billing applies when the cost of a paid product depends on how much you use the product. For example, the cost of {% data variables.product.prodname_actions %} depends on how many minutes your jobs spend running and how much storage your artifacts use. +* **For you personal account**: Your bill includes subscriptions for your personal account and charges for any usage that exceeds the included amounts. -Your plan may come with included amounts of usage-based products. For example, with {% data variables.product.prodname_pro %}, your personal account gets 3,000 minutes of {% data variables.product.prodname_actions %} usage for free each month. You can control usage beyond the included amounts by setting spending limits. +* **For your organization**: Your organization's bill is separate from your personal account bill. It includes subscriptions for your organization and charges for any usage that exceeds the included amounts. +{% ifversion ghec %} +* **For your enterprise**: Enterprise accounts are billed separately from personal accounts and standalone organizations. The bill includes the subscription to {% data variables.product.prodname_enterprise %} and the costs of all the organizations it owns. +{% endif %} + +For more information about account types, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts). {% data reusables.billing.us-sales-tax %} ## Included amounts by plan +The table below shows what's included with each plan. When you exceed these amounts, you'll be charged for additional usage unless you've set a spending limit. + - + @@ -96,22 +104,25 @@ Your plan may come with included amounts of usage-based products. For example, w - -
ProductUsageUsage type {% data variables.product.prodname_free_user %} {% data variables.product.prodname_pro %} {% data variables.product.prodname_free_team %} for organizations
{% data variables.large_files.product_name_long %} Storage (per month)1 GB - 1 GB - 1 GB - 1 GB - 1 GB + 10 GB + 10 GB + 10 GB + 250 GB + 250 GB
Bandwidth (per month)1 GB - 1 GB - 1 GB - 1 GB - 1 GB + 10 GB + 10 GB + 10 GB + 250 GB + 250 GB
+> [!TIP] +> For information about included requests for {% data variables.product.prodname_copilot %} plans, see [AUTOTITLE](/copilot/about-github-copilot/plans-for-github-copilot). + ## Managing billing settings You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account. All subscriptions and usage-based billing associated with an account shares a billing date, payment method, and receipt. diff --git a/content/billing/managing-your-billing/about-the-billing-cycle.md b/content/billing/managing-your-billing/about-the-billing-cycle.md index 50346787ba31..4c538244aa3b 100644 --- a/content/billing/managing-your-billing/about-the-billing-cycle.md +++ b/content/billing/managing-your-billing/about-the-billing-cycle.md @@ -1,6 +1,6 @@ --- title: About the billing cycle -intro: Learn about the billing cycle for the new billing platform. +intro: Learn about the billing cycle for the billing platform. versions: feature: enhanced-billing-platform redirect_from: @@ -22,7 +22,7 @@ Your billing experience depends on whether your products are metered, volume-bas ## Billing cycles for metered products -If your {% data variables.enterprise.enterprise_or_org %} {% ifversion fpt %}or personal account{% endif %} uses the new billing platform for **metered** products, you have a fixed **billing period** that runs from the first day of each month to the last day of the month. +Metered products have a fixed **billing period** that runs from the first day of each month to the last day of the month. At the end of each month, your metered usage is calculated and scheduled to be billed on your **bill cycle day**. @@ -32,7 +32,7 @@ At the end of each month, your metered usage is calculated and scheduled to be b ## Billing cycles for volume-based products -Volume-based licenses may follow a different billing cycle, even if your account is on the new billing platform. These products are often billed based on the anniversary date of your subscription rather than by calendar month. +Volume-based licenses may follow a different billing cycle. These products are often billed based on the anniversary date of your subscription rather than by calendar month. ## How mid-cycle changes affect your billing diff --git a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-access-to-copilot-in-your-enterprise/viewing-copilot-license-usage-in-your-enterprise.md b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-access-to-copilot-in-your-enterprise/viewing-copilot-license-usage-in-your-enterprise.md index 307c966a590f..50b19d92a191 100644 --- a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-access-to-copilot-in-your-enterprise/viewing-copilot-license-usage-in-your-enterprise.md +++ b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-access-to-copilot-in-your-enterprise/viewing-copilot-license-usage-in-your-enterprise.md @@ -15,12 +15,6 @@ redirect_from: - /copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-access-to-copilot-in-your-enterprise/viewing-copilot-usage-for-your-enterprise --- -{% ifversion enhanced-billing-platform %} - -{% data reusables.billing.enhanced-billing-platform %} - -{% endif %} - ## About your {% data variables.product.prodname_copilot %} usage If you have a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} plan, you can view usage information for {% data variables.product.prodname_copilot_short %} in your {% ifversion ghec %}enterprise, broken down by organization, or in your{% endif %} organization, broken down by seat assignment status. {% ifversion ghec %}At the enterprise level, this information includes the number of seats assigned in each organization, and the total spending associated with each organization, for the current billing cycle.{% endif %} At the organization level, this information includes the total number of seats, seats carried over from the previous billing cycle, new seats added during the current cycle, and seats to be removed at the end of the current cycle. diff --git a/content/discussions/managing-discussions-for-your-community/managing-discussions.md b/content/discussions/managing-discussions-for-your-community/managing-discussions.md index 714321eb8065..bf55a80773ed 100644 --- a/content/discussions/managing-discussions-for-your-community/managing-discussions.md +++ b/content/discussions/managing-discussions-for-your-community/managing-discussions.md @@ -159,8 +159,16 @@ To transfer a discussion, you must have permissions to create discussions in the 1. At the bottom of the discussion, below the comment box, click **Close discussion**. 1. Optionally, to change the reason for closing the discussion, select the {% octicon "triangle-down" aria-label="The down triangle octicon" %} dropdown next to "Close discussion" and click a reason. + + + + +{% ifversion fpt or ghec %} + ## Converting issues based on labels +>[!WARNING] Starting June 6, 2025, {% data variables.product.company_short %} will deprecate bulk converting of issues based on labels. + You can convert all issues with the same label to discussions in bulk. Future issues with this label will also automatically convert to the discussion and category you configure. 1. Navigate to the main page of the repository or, for organization discussions, the source repository. @@ -169,3 +177,6 @@ You can convert all issues with the same label to discussions in bulk. Future is 1. Next to the label you want to convert to issues, click **Convert issues**. 1. Select the **Choose a category** drop-down menu, and click a category for your discussion. 1. Click **I understand, convert this issue to a discussion**. + +{% endif %} + diff --git a/data/reusables/advanced-security/ghas-products-bullets+ghas.md b/data/reusables/advanced-security/ghas-products-bullets+ghas.md index 768c8da06336..6a6e5a069380 100644 --- a/data/reusables/advanced-security/ghas-products-bullets+ghas.md +++ b/data/reusables/advanced-security/ghas-products-bullets+ghas.md @@ -1,2 +1,4 @@ -{% data reusables.advanced-security.ghas-products-bullets %}{% ifversion ghec or ghes %} -* **{% data variables.product.prodname_GHAS %}**, which includes all features in {% data variables.product.prodname_GH_secret_protection %} and {% data variables.product.prodname_GH_code_security %}.{% endif %} +{% data reusables.advanced-security.ghas-products-bullets %} + +{% ifversion ghec or ghes %} +Alternatively, you may have a {% data variables.product.prodname_GHAS %} license that includes all features in {% data variables.product.prodname_GH_secret_protection %} and {% data variables.product.prodname_GH_code_security %}.{% endif %} diff --git a/data/reusables/enterprise-accounts/licensing-tab-both-platforms.md b/data/reusables/enterprise-accounts/licensing-tab-both-platforms.md index 9653b0298b54..926d29f2fe83 100644 --- a/data/reusables/enterprise-accounts/licensing-tab-both-platforms.md +++ b/data/reusables/enterprise-accounts/licensing-tab-both-platforms.md @@ -1,2 +1,2 @@ -1. {% ifversion horizontal-nav %}At the top of the page, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** (visible if you use the new billing platform). Alternatively, click **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**.{% else %}On the left side of the page, in the enterprise account sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing** (visible if you use the new billing platform). Alternatively, click **{% octicon "gear" aria-hidden="true" aria-label="gear" %} Settings**.{% endif %} +1. At the top of the page, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**. 1. Click **Licensing** to show detailed information on license use. diff --git a/data/reusables/organizations/billing_plans_or_licensing.md b/data/reusables/organizations/billing_plans_or_licensing.md index 1ac9a4df74fd..283d910fa50d 100644 --- a/data/reusables/organizations/billing_plans_or_licensing.md +++ b/data/reusables/organizations/billing_plans_or_licensing.md @@ -1 +1 @@ -1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & licensing** and then **Licensing** (new platform). Alternatively, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans** (original platform). +1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing** and then **Licensing**.