From c4bad214f55809ed942854baf3a31fe83caad992 Mon Sep 17 00:00:00 2001 From: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:46:01 +0100 Subject: [PATCH 1/2] [EDI follow-up] Remove duplicated content from Copilot billing concepts articles (#56920) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: mc <42146119+mchammer01@users.noreply.github.com> --- .../billing/billing-for-enterprises.md | 78 ------------------- .../billing/billing-for-organizations.md | 63 --------------- content/copilot/concepts/billing/index.md | 3 +- .../billing/organizations-and-enterprises.md | 51 ++++++++++++ 4 files changed, 52 insertions(+), 143 deletions(-) delete mode 100644 content/copilot/concepts/billing/billing-for-enterprises.md delete mode 100644 content/copilot/concepts/billing/billing-for-organizations.md create mode 100644 content/copilot/concepts/billing/organizations-and-enterprises.md diff --git a/content/copilot/concepts/billing/billing-for-enterprises.md b/content/copilot/concepts/billing/billing-for-enterprises.md deleted file mode 100644 index 47a87884c0c4..000000000000 --- a/content/copilot/concepts/billing/billing-for-enterprises.md +++ /dev/null @@ -1,78 +0,0 @@ ---- -title: About billing for GitHub Copilot in your enterprise -shortTitle: Billing for enterprises -intro: 'Learn about pricing and billing cycles for {% data variables.product.prodname_copilot_short %} in your enterprise.' -permissions: Enterprise owners -product: '{% data variables.copilot.copilot_for_business %} and {% data variables.copilot.copilot_enterprise %}' -versions: - feature: copilot -topics: - - Copilot -redirect_from: - - /copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-subscription-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise - - /copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-plan-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise - - /copilot/concepts/copilot-billing/about-billing-for-github-copilot-in-your-enterprise - - /copilot/concepts/copilot-billing/billing-for-enterprises -contentType: concepts ---- - -## About {% data variables.product.prodname_copilot_short %} plans for your enterprise - -{% data variables.product.company_short %} offers the following plans for enterprise accounts: -* **{% data variables.copilot.copilot_business_short %}** at {% data variables.copilot.cfb_price_per_month %} per user per month -* **{% data variables.copilot.copilot_enterprise_short %}** at {% data variables.copilot.ce_price_per_month %} per user per month - -When you subscribe to {% data variables.copilot.copilot_enterprise_short %} at the enterprise level, you can choose which plan to enable for each organization in your enterprise. - -For guidance, see [AUTOTITLE](/copilot/rolling-out-github-copilot-at-scale/choosing-your-enterprises-plan-for-github-copilot). - -## Premium requests - -Paid {% data variables.product.prodname_copilot_short %} plans include premium requests. Premium requests use advanced models and features and are subject to monthly allowances or potential overage costs. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs). - -## About the billing cycle for {% data variables.product.prodname_copilot_short %} in your enterprise - -Billed users are calculated at the end of each billing cycle, based on the number of {% data variables.product.prodname_copilot %} seats that are assigned. You can add or remove seats at any time during the billing cycle. - -* **Any seat assigned part way through the billing cycle** is prorated based on the number of days remaining in the cycle. -* **Any seat assignment cancellation during a billing cycle** takes effect at the beginning of the next cycle. The user can access {% data variables.product.prodname_copilot_short %} until the end of the cycle. -* **Any user removed from an organization with {% data variables.product.prodname_copilot_short %} during a billing cycle** loses access to {% data variables.product.prodname_copilot_short %} immediately. Billing for that user stops at the end of the cycle. If the user is restored to the organization during the billing cycle, they regain access to {% data variables.product.prodname_copilot_short %} immediately. -* **When {% data variables.product.prodname_copilot_short %} is disabled at the enterprise or organization level** any user with a {% data variables.product.prodname_copilot_short %} license will lose access to {% data variables.product.prodname_copilot_short %} immediately. Billing for that user stops at the end of the cycle. If the user is restored to the organization during the billing cycle, they regain access to {% data variables.product.prodname_copilot_short %} immediately. - -Your enterprise will be charged on whichever payment method you’ve set up for the enterprise account, such as a credit card or a Microsoft Azure subscription. - -{% data reusables.billing.authorization-charge %} - -> [!NOTE] {% data variables.product.prodname_copilot %} billing operates in Coordinated Universal Time (UTC), but it calculates your bill according to the timezone of your billing cycle. For example, if you're billed through Azure and your current billing cycle ends at 11:59 PM EST on December 1st, canceling a seat at 7:00 PM EST on December 1st might show the seat cancellation at 12:00 AM UTC on December 2nd. However, the seat would end within the billing cycle that you requested the cancellation, and you would not pay for that seat in the following cycle. - -### About seat assignment for {% data variables.product.prodname_copilot_short %} in your enterprise - -A {% data variables.product.prodname_copilot %} seat is a license to use {% data variables.product.prodname_copilot %}, which is granted to a unique user account through an enterprise's {% data variables.copilot.copilot_for_business %} or {% data variables.copilot.copilot_enterprise %} plan. Each month, the enterprise is charged for the number of assigned seats. - -If a single user receives a seat from multiple organizations in the same enterprise, the enterprise will only be billed once per billing cycle for that unique user. One of the organizations that assigned {% data variables.product.prodname_copilot_short %} to the user will be chosen at random each month to be billed for the seat. - -Seat assignment is managed by owners of organizations that have been granted access to {% data variables.product.prodname_copilot %} at the enterprise level. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/granting-access-to-copilot-for-members-of-your-organization). - -If you are a member of an organization or enterprise with a {% data variables.product.prodname_copilot %} plan, to use the plan, you will need to be assigned a seat by an organization owner. - -### About billing through Azure - -When you connect an Azure subscription to your organization or enterprise account and enable metered billing via Azure, metered usage will start to be sent to Azure. You will be billed through {% data variables.product.prodname_dotcom %} for usage from the start of the current billing cycle to when you enabled metered billing via Azure, on your next billing date. The period between the date you connected your Azure subscription and enabled metered billing via Azure, and the end of the calendar month will be charged in Azure on the first of the month. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). - -> [!NOTE] Usage data is sent to Azure daily, but you are billed at the end of the month based on the number of seats used. This means that although you can track your daily spending (number of seats in this case), actual payments are processed monthly. - -## About changes to your {% data variables.product.prodname_copilot_short %} plan - -If you upgrade an organization from {% data variables.copilot.copilot_business_short %} to {% data variables.copilot.copilot_enterprise_short %}, all users who currently have a seat for {% data variables.copilot.copilot_business_short %} will immediately receive access to {% data variables.copilot.copilot_enterprise_short %}. You will be charged for each {% data variables.copilot.copilot_enterprise %} seat pro rata for the rest of the cycle. - -If you downgrade an organization's {% data variables.copilot.copilot_enterprise %} plan during a billing cycle, the users will have access to {% data variables.copilot.copilot_enterprise %} for the rest of the cycle, and the change to your bill will take effect from the following cycle. - -Disabling {% data variables.product.prodname_copilot %} for all organizations in your enterprise will cancel your enterprise's {% data variables.product.prodname_copilot_short %} plan. All users with a seat in those organizations will lose access to {% data variables.product.prodname_copilot_short %} immediately. You will be billed for those seats until the end of the current billing cycle. - -{% data reusables.copilot.copilot-one-account %} - -## Further reading - -* [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise) -* [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-subscription-for-your-enterprise) -* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information) diff --git a/content/copilot/concepts/billing/billing-for-organizations.md b/content/copilot/concepts/billing/billing-for-organizations.md deleted file mode 100644 index d14fc58ede1c..000000000000 --- a/content/copilot/concepts/billing/billing-for-organizations.md +++ /dev/null @@ -1,63 +0,0 @@ ---- -title: About billing for GitHub Copilot in your organization -shortTitle: Billing for organizations -intro: 'Learn about pricing and billing cycles for {% data variables.product.prodname_copilot_short %} in your organization.' -permissions: Organization owners -product: '{% data variables.copilot.copilot_for_business %}' -versions: - feature: copilot -topics: - - Copilot -redirect_from: - - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-subscription-for-your-organization/about-billing-for-github-copilot-in-your-organization - - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-plan-for-your-organization/about-billing-for-github-copilot-in-your-organization - - /copilot/concepts/copilot-billing/about-billing-for-github-copilot-in-your-organization - - /copilot/concepts/copilot-billing/billing-for-organizations -contentType: concepts ---- - -## About pricing for {% data variables.product.prodname_copilot_short %} in your organization - -{% data variables.copilot.copilot_business_short %} plans are available on a monthly cycle. The plans are billed at the end of each cycle, at {% data variables.copilot.cfb_price_per_month %} per user per month. - -## Premium requests - -Paid {% data variables.product.prodname_copilot_short %} plans include premium requests. Premium requests use advanced models and features and are subject to monthly allowances or potential overage costs. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs). - -## About the billing cycle for {% data variables.product.prodname_copilot_short %} in your organization - -Billed users are calculated at the end of each billing cycle, based on the number of {% data variables.product.prodname_copilot %} seats that are assigned. You can add or remove seats at any time during the billing cycle. - -* **Any seat assigned part way through the billing cycle** is prorated based on the number of days remaining in the cycle. -* **Any seat assignment cancellation during a billing cycle** takes effect at the beginning of the next cycle. The user can access {% data variables.product.prodname_copilot %} until the end of the cycle. -* **Any user removed from the organization during a billing cycle** loses access to {% data variables.product.prodname_copilot %} immediately. Billing for that user stops at the end of the cycle. If the user is restored to the organization during the billing cycle, they will regain access to {% data variables.product.prodname_copilot %} immediately. - -If your organization belongs to an enterprise, your enterprise will be charged on whichever payment method you’ve set up for the organization account, such as a credit card or a Microsoft Azure subscription. If an organization with {% data variables.product.prodname_copilot %} seats is removed from an enterprise, billing for those seats will stop at the end of the billing cycle. The users who had seats assigned by the removed organization will lose access to {% data variables.product.prodname_copilot %} unless they receive a seat through another organization. - -{% data reusables.billing.authorization-charge %} - -> [!NOTE] {% data variables.product.prodname_copilot %} billing operates in Coordinated Universal Time (UTC), but it calculates your bill according to the timezone of your billing cycle. For example, if you're billed through Azure and your current billing cycle ends at 11:59 PM EST on December 1st, canceling a seat at 7:00 PM EST on December 1st might show the seat cancellation at 12:00 AM UTC on December 2nd. However, the seat would end within the billing cycle that you requested the cancellation, and you would not pay for that seat in the following cycle. - -### About seat assignment for {% data variables.product.prodname_copilot_short %} in your organization - -A {% data variables.product.prodname_copilot_short %} seat is a license to use {% data variables.product.prodname_copilot_short %}, which is granted to a unique user account through an organization's {% data variables.copilot.copilot_business_short %} plan. Each month, the organization is charged for the number of assigned seats. - -Removing all assigned {% data variables.product.prodname_copilot_short %} seats in your organization will cancel your organization's {% data variables.product.prodname_copilot_short %} plan. - -Seat assignment is managed by organization owners. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/granting-access-to-copilot-for-members-of-your-organization). - -If you are a member of an organization with a {% data variables.product.prodname_copilot_short %} plan, to use {% data variables.product.prodname_copilot_short %}, you will need to be assigned a seat by an organization owner. - -{% data reusables.copilot.copilot-one-account %} - -### About billing through Azure - -When you connect an Azure subscription to your organization account and enable metered billing via Azure, metered usage will start to be sent to Azure. You will be billed through {% data variables.product.prodname_dotcom %} for usage from the start of the current billing cycle to when you enabled metered billing via Azure, on your next billing date. The period between the date you connected your Azure subscription and enabled metered billing via Azure, and the end of the calendar month will be charged in Azure on the first of the month. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription). - -> [!NOTE] Usage data is sent to Azure daily, but you are billed at the end of the month based on the number of seats used. This means that although you can track your daily spending (number of seats in this case), actual payments are processed monthly. - -## Further reading - -* [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot) -* [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-subscription-for-your-organization) -* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information) diff --git a/content/copilot/concepts/billing/index.md b/content/copilot/concepts/billing/index.md index 2ce64f8f62b0..d47bc7cdc1e3 100644 --- a/content/copilot/concepts/billing/index.md +++ b/content/copilot/concepts/billing/index.md @@ -10,8 +10,7 @@ children: - /copilot-requests - /individual-plans - /billing-for-individuals - - /billing-for-organizations - - /billing-for-enterprises + - /organizations-and-enterprises - /billing-for-spark redirect_from: - /managing-copilot/managing-copilot-as-an-individual-subscriber/billing-and-payments diff --git a/content/copilot/concepts/billing/organizations-and-enterprises.md b/content/copilot/concepts/billing/organizations-and-enterprises.md new file mode 100644 index 000000000000..d706c1887ab7 --- /dev/null +++ b/content/copilot/concepts/billing/organizations-and-enterprises.md @@ -0,0 +1,51 @@ +--- +title: About billing for GitHub Copilot in organizations and enterprises +shortTitle: Organizations and enterprises +intro: 'Learn about pricing and billing cycles for {% data variables.product.prodname_copilot_short %}.' +product: 'Organizations on a {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %} plan, or organizations and enterprises on {% data variables.product.prodname_ghe_cloud %}' +versions: + feature: copilot +topics: + - Copilot +redirect_from: + - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-subscription-for-your-organization/about-billing-for-github-copilot-in-your-organization + - /copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-plan-for-your-organization/about-billing-for-github-copilot-in-your-organization + - /copilot/concepts/copilot-billing/about-billing-for-github-copilot-in-your-organization + - /copilot/concepts/copilot-billing/billing-for-organizations + - /copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-subscription-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise + - /copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-plan-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise + - /copilot/concepts/copilot-billing/about-billing-for-github-copilot-in-your-enterprise + - /copilot/concepts/copilot-billing/billing-for-enterprises + - /copilot/concepts/billing/billing-for-enterprises + - /copilot/concepts/billing/billing-for-organizations +contentType: concepts +--- + +## Available plans + +{% data variables.product.company_short %} offers the following plans for organization accounts: + +* **{% data variables.copilot.copilot_business_short %}** at {% data variables.copilot.cfb_price_per_month %} per user per month +* **{% data variables.copilot.copilot_enterprise_short %}** at {% data variables.copilot.ce_price_per_month %} per user per month ({% data variables.product.prodname_ghe_cloud %} only) + +With {% data variables.product.prodname_ghe_cloud %}, an enterprise owner chooses the plan for each organization in the enterprise. For guidance on choosing a plan, see [AUTOTITLE](/copilot/rolling-out-github-copilot-at-scale/choosing-your-enterprises-plan-for-github-copilot). + +## Premium requests + +Paid {% data variables.product.prodname_copilot_short %} plans include premium requests. Premium requests use advanced models and features and are subject to monthly allowances or potential overage costs. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/monitoring-usage-and-entitlements/avoiding-unexpected-copilot-costs). + +## Seat assignment + +A {% data variables.product.prodname_copilot_short %} seat is a license to use {% data variables.product.prodname_copilot %} for a user. Each month, your organization or enterprise is billed for the number of assigned seats. + +Seat assignment is managed by organization owners. With {% data variables.product.prodname_ghe_cloud %}, an enterprise owner must have enabled {% data variables.product.prodname_copilot %} for the organization before an organization owner can assign seats. See [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-access-to-github-copilot-in-your-organization/granting-access-to-copilot-for-members-of-your-organization). + +If a single user receives a seat from multiple organizations in the same enterprise, the enterprise will only be billed once per billing cycle for that unique user. One of the organizations that assigned {% data variables.product.prodname_copilot_short %} to the user will be chosen at random each month to be billed for the seat. + +## Billing cycles + +Billed users are calculated at the end of each billing cycle, based on the number of {% data variables.product.prodname_copilot %} seats that are assigned. You can add or remove seats at any time during the billing cycle. + +## Reference + +For detailed reference information about billing options and the effects of changes during a billing cycle, see [AUTOTITLE](/copilot/reference/copilot-billing). From 55f203478969f3b0bf8d7af1991a9ac416f8a8bb Mon Sep 17 00:00:00 2001 From: Sunbrye Ly <56200261+sunbrye@users.noreply.github.com> Date: Fri, 1 Aug 2025 07:33:41 -0700 Subject: [PATCH 2/2] [Improvement]: GPT-4.1 missing from "How Copilot serves AI models" (#56756) --- content/copilot/reference/ai-models/model-hosting.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/copilot/reference/ai-models/model-hosting.md b/content/copilot/reference/ai-models/model-hosting.md index cb571a85ef0e..3536a1f0ec87 100644 --- a/content/copilot/reference/ai-models/model-hosting.md +++ b/content/copilot/reference/ai-models/model-hosting.md @@ -18,10 +18,11 @@ contentType: reference Used for: +* {% data variables.copilot.copilot_gpt_41 %} * {% data variables.copilot.copilot_o3 %} * {% data variables.copilot.copilot_o4_mini %} -These models are hosted by OpenAI and {% data variables.product.github %}'s Azure tenant when used in {% data variables.product.prodname_copilot %}. OpenAI makes the [following data commitment](https://openai.com/enterprise-privacy/): _We [OpenAI] do not train our models on your business data by default_. {% data variables.product.github %} maintains a [zero data retention agreement](https://platform.openai.com/docs/guides/your-data) with OpenAI. +{% data variables.copilot.copilot_gpt_41 %} is hosted by {% data variables.product.github %}'s Azure tenant when used in {% data variables.product.prodname_copilot %}. {% data variables.copilot.copilot_o3 %} and {% data variables.copilot.copilot_o4_mini %} models are hosted by OpenAI and {% data variables.product.github %}'s Azure tenant. OpenAI makes the [following data commitment](https://openai.com/enterprise-privacy/): _We [OpenAI] do not train our models on your business data by default_. {% data variables.product.github %} maintains a [zero data retention agreement](https://platform.openai.com/docs/guides/your-data) with OpenAI. When using OpenAI's models, input requests and output responses continue to run through {% data variables.product.prodname_copilot %}'s content filters for public code matching, when applied, along with those for harmful or offensive content.