diff --git a/content/apps/creating-github-apps/writing-code-for-a-github-app/building-ci-checks-with-a-github-app.md b/content/apps/creating-github-apps/writing-code-for-a-github-app/building-ci-checks-with-a-github-app.md index 403a5f31ff97..1492e9aed1fd 100644 --- a/content/apps/creating-github-apps/writing-code-for-a-github-app/building-ci-checks-with-a-github-app.md +++ b/content/apps/creating-github-apps/writing-code-for-a-github-app/building-ci-checks-with-a-github-app.md @@ -1577,7 +1577,7 @@ end You should now have an app that receives API events, creates check runs, uses RuboCop to find Ruby errors, creates annotations in a pull request, and automatically fixes linter errors. Next you might want to expand your app's code, deploy your app, and make your app public. -If you have any questions, you can ask for help or advice on GitHub Community, in the "[API and Webhooks discussions](https://github.com/orgs/community/discussions/categories/api-and-webhooks)." +If you have any questions, start a [{% data variables.product.prodname_github_community %} discussion](https://github.com/orgs/community/discussions/categories/api-and-webhooks) in the API and Webhooks category. ### Modify the app code diff --git a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md b/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md index c56f7be05a2d..d1bb68b4b06c 100644 --- a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md +++ b/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md @@ -17,6 +17,8 @@ You can either set up a {% data variables.product.prodname_copilot %} subscripti {% data reusables.copilot.tp-users-trial-eligibility %}{% endif %} +{% data reusables.billing.billing-info %} + ## Pricing for {% data variables.product.prodname_copilot_for_individuals %} The {% data variables.product.prodname_copilot %} subscription is available on a monthly or yearly cycle. If you choose a monthly billing cycle, you will be billed $10 per calendar month. If you choose a yearly billing cycle, you will be billed $100 per year. You can modify your billing cycle at any time, and the modification will be reflected from the start of your next billing cycle. diff --git a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md index 9d7343068b41..238b27edf4db 100644 --- a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md +++ b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-organization-or-enterprise.md @@ -25,6 +25,12 @@ This article applies to setting up and managing a {% data variables.product.prod You can set up a {% data variables.product.prodname_copilot_business_short %} subscription for your organization or enterprise account. If you set up a subscription for your organization account, you can grant access to {% data variables.product.prodname_copilot %} for individuals and teams within your organization. If you set up a subscription for your enterprise account, you can grant access to {% data variables.product.prodname_copilot %} for organizations within your enterprise. +{% endif %} + +{% data reusables.billing.billing-info %} + +{% ifversion ghec %} + ## Setting up a {% data variables.product.prodname_copilot_business_short %} subscription for your enterprise Before you can start using {% data variables.product.prodname_copilot_business_short %} in your enterprise, you will need to set up a subscription. @@ -99,5 +105,5 @@ To cancel your {% data variables.product.prodname_copilot_business_short %} subs ## Further reading -- [About {% data variables.product.prodname_copilot_for_business %}](/copilot/overview-of-github-copilot/about-github-copilot-for-business) -- [Enabling and setting up {% data variables.product.prodname_copilot_for_business %}](/copilot/overview-of-github-copilot/enabling-and-setting-up-github-copilot-for-business) +- "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-business)" +- "[AUTOTITLE](/copilot/overview-of-github-copilot/enabling-and-setting-up-github-copilot-for-business)" diff --git a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account.md b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account.md index c2acd7a5e5c1..39b7e3c585e4 100644 --- a/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account.md +++ b/content/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account.md @@ -19,6 +19,8 @@ This article applies to setting up and managing a {% data variables.product.prod If you have access to {% data variables.product.prodname_copilot %} through a {% data variables.product.prodname_copilot_for_business %} seat, you will not be able to make administrative changes. +{% data reusables.billing.billing-info %} + {% data reusables.copilot.dotcom-settings %} ## Setting up a {% data variables.product.prodname_copilot %} trial or subscription for your personal account @@ -61,5 +63,5 @@ You can cancel your {% data variables.product.prodname_copilot_individuals_short ## Further reading -- [About {% data variables.product.prodname_copilot_for_individuals %}](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals) -- [Getting started with {% data variables.product.prodname_copilot %}](/copilot/getting-started-with-github-copilot) +- "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)" +- "[AUTOTITLE](/copilot/getting-started-with-github-copilot)" diff --git a/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md index f82dba201523..a05d7c77f2a0 100644 --- a/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md +++ b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md @@ -36,6 +36,12 @@ If you use {% data variables.product.product_name %} through a Microsoft Enterpr | {% data variables.product.prodname_registry %} usage beyond the amounts included with your plan | "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)" | "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages#about-spending-limits)" | | {% data variables.product.prodname_copilot_business_short %} usage | "[AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot#pricing-for-github-copilot-for-business)" | N/A | +## About billing through Azure + +If you link your {% data variables.product.company_short %} account to Azure, any usage-based costs starting from that point will be billed through Azure and charged on the 1st of each month. However, remaining {% data variables.product.company_short %} charges, for example charges for your {% data variables.product.prodname_dotcom %} plan, will still be billed on your usual billing date. + +For example, you link your Azure subscription to your organization {% ifversion ghec %}or enterprise{% endif%} account on June 16th and you also have a {% data variables.product.prodname_copilot_for_business %} subscription. From that date onwards, any usage costs for {% data variables.product.prodname_copilot_business_short %} will be included in your Azure bill and charged on July 1st. However, any charges incurred before June 16th for {% data variables.product.prodname_copilot_business_short %} will be billed separately through {% data variables.product.company_short %} on your account's usual billing date. + ## Prerequisites - You must have {% ifversion ghec %}either an {% endif %} organization {% ifversion ghec %}or an enterprise{% endif %} account on {% data variables.location.product_location %}. For more information about the differences between these two types of accounts, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)." @@ -46,7 +52,7 @@ If you use {% data variables.product.product_name %} through a Microsoft Enterpr - If the organization you want to connect an Azure subscription to belongs to an enterprise account, you must connect your Azure subscription to the enterprise account, not the organization. {% ifversion fpt %}For more information, see [the {% data variables.product.prodname_ghe_cloud %} version](/enterprise-cloud@latest/{{ currentArticle }}) of this article.{% endif %} - You must be an owner of the organization{% ifversion ghec %} or enterprise{% endif %} account. For more information, see {% ifversion fpt %}"[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."{% elsif ghec %}the following articles. - + - "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)" - "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)" {% endif %} @@ -104,6 +110,13 @@ To connect your Azure subscription, you must have owner permissions to the Azure 1. Click **Connect**. 1. Go back to the "Payment information" page in your enterprise billing settings. (To return to the "Payment information" page, follow steps three through five above.) 1. Under "Metered billing settings", select **Enable metered billing through Azure**, then click **Update metered billing settings**. + + {% note %} + + **Note:** If you pay for {% data variables.product.prodname_enterprise %} via invoice, you do not need to select **Enable metered billing through Azure**, as Azure will be targeted automatically. + + {% endnote %} + {% endif %} ## Disconnecting your Azure subscription from your organization account diff --git a/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md b/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md index c0f508c6e6dc..a6e42ba9c9d7 100644 --- a/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md +++ b/content/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-global-campus-for-students.md @@ -30,7 +30,7 @@ Once you are a verified {% data variables.product.prodname_global_campus %} stud - See upcoming in-person and virtual events for students, curated by {% data variables.product.prodname_education %} and student leaders. - View assignments from [GitHub Classroom](https://classroom.github.com/) with upcoming due dates. - Stay in the know on what the community is interested in by rewatching recent [Campus TV](https://www.twitch.tv/githubeducation) episodes. Campus TV is created by {% data variables.product.prodname_dotcom %} and student community leaders and can be watched live or on demand. -- Discover student-created repositories from GitHub Community Exchange. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)." +- Discover student-created repositories from {% data variables.product.prodname_community_exchange %}. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/about-github-community-exchange)." {% data variables.product.prodname_global_campus %} students also receive the following {% data variables.product.prodname_dotcom %} benefits. - **{% data variables.product.prodname_copilot %}**: Verified students receive a free subscription for {% data variables.product.prodname_copilot %}. You will be automatically notified about the free subscription when you visit the {% data variables.product.prodname_copilot %} subscription page in your account settings. For more information about subscribing to and using {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account#setting-up-a-trial-of-github-copilot)" and "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)." diff --git a/content/get-started/learning-about-github/github-language-support.md b/content/get-started/learning-about-github/github-language-support.md index 99c438dc3dbe..18d33c6d260a 100644 --- a/content/get-started/learning-about-github/github-language-support.md +++ b/content/get-started/learning-about-github/github-language-support.md @@ -24,7 +24,7 @@ Some {% data variables.product.prodname_dotcom %} products have features that ar Core languages for {% data variables.product.prodname_dotcom %} features include C, C++, C#, Go, Java, JavaScript, PHP, Python, Ruby, Scala, and TypeScript. For features that support package managers, the currently supported package managers are included in the table with their relevant languages. -Some features are supported for additional languages or package managers. If you want to know whether another language is supported for a feature or to request support for a language, visit [{% data variables.product.prodname_github_community %} discussions](https://github.com/orgs/community/discussions). +Some features are supported for additional languages or package managers. If you want to know whether another language is supported for a feature or to request support for a language, visit {% data variables.contact.community_support_forum %}. | Language {% data reusables.supported-languages.products-table-header %} {% data reusables.supported-languages.C %} diff --git a/data/reusables/billing/billing-info.md b/data/reusables/billing/billing-info.md new file mode 100644 index 000000000000..3b18cfcd5e98 --- /dev/null +++ b/data/reusables/billing/billing-info.md @@ -0,0 +1 @@ +For more information about billing in general, like adding a payment method or viewing your payment history, see "[AUTOTITLE](/billing/managing-your-github-billing-settings)." diff --git a/data/reusables/scim/ghes-beta-note.md b/data/reusables/scim/ghes-beta-note.md index 4f332215403c..f99cca885437 100644 --- a/data/reusables/scim/ghes-beta-note.md +++ b/data/reusables/scim/ghes-beta-note.md @@ -2,7 +2,7 @@ {% note %} -**Note:** SCIM for {% data variables.product.product_name %} is currently in private beta and is subject to change. For access to the beta, contact your account manager on {% data variables.contact.contact_enterprise_sales %}. Please provide feedback in the [GitHub Community discussion](https://github.com/orgs/community/discussions/36825). +**Note:** SCIM for {% data variables.product.product_name %} is currently in private beta and is subject to change. For access to the beta, contact your account manager on {% data variables.contact.contact_enterprise_sales %}. Please provide feedback in the [{% data variables.product.prodname_github_community %} discussion](https://github.com/orgs/community/discussions/36825). {% endnote %} diff --git a/data/reusables/support/prodname_support_forum_with_url.md b/data/reusables/support/prodname_support_forum_with_url.md index 1f341776790d..dd05d05e44ce 100644 --- a/data/reusables/support/prodname_support_forum_with_url.md +++ b/data/reusables/support/prodname_support_forum_with_url.md @@ -1 +1 @@ -[APIs and Integrations discussions on GitHub Community](https://github.com/orgs/community/discussions/categories/apis-and-integrations) +[APIs and Integrations discussions on {% data variables.product.prodname_github_community %}](https://github.com/orgs/community/discussions/categories/apis-and-integrations) diff --git a/data/variables/contact.yml b/data/variables/contact.yml index 41de6df32f9b..817d81aa63f9 100644 --- a/data/variables/contact.yml +++ b/data/variables/contact.yml @@ -44,8 +44,5 @@ contact_support_portal: '[GitHub Support portal](https://support.github.com/cont landing_page_portal: 'GitHub Support portal' contact_landing_page_portal: '[GitHub Support portal](https://support.github.com/)' -# The team that provides GitHub Community Support on the GitHub Community forum (for GitHub Free) -community_support: 'GitHub Community Support' - # GitHub Community discussions community_support_forum: '[GitHub Community discussions](https://github.com/orgs/community/discussions)'