jprdonnelly/docs
1
0
Fork 0
mirror of synced 2025-12-19 09:57:42 -05:00
Code Issues Projects Releases Wiki Activity

Update enterprise licensing terminology from seats -> licenses [GA] (#53921)

Browse Source
This commit is contained in:
Vanessa
2025-01-17 10:43:54 +10:00
committed by GitHub
parent cd99034ed6
commit a3b00ef469
22 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md
View File

@@ -39,7 +39,7 @@ If your organization is managed by an enterprise account, then you can view the
You can also view whether an enterprise owner has a specific role in the organization. Enterprise owners can also be an organization member, any other organization role, or be un-affiliated with the organization.
> [!NOTE]
> If you're an organization owner, you can also invite an enterprise owner to have a role in the organization. If an enterprise owner accepts the invitation, a seat or license in the organization is used from the available licenses for your enterprise. For more information about how licensing works, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner).
> If you're an organization owner, you can also invite an enterprise owner to have a role in the organization. If an enterprise owner accepts the invitation, a {% ifversion enterprise-licensing-language %}{% else %}seat or{% endif %} license in the organization is used from the available licenses for your enterprise. For more information about how licensing works, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner).
| **Enterprise role** | **Organization role** | **Organization access or impact** |
|----|----|----|

2
content/admin/configuring-settings/configuring-github-connect/about-github-connect.md
View File

@@ -89,7 +89,7 @@ When you enable {% data variables.product.prodname_github_connect %} or specific
* The {% data variables.product.prodname_github_connect %} features that are enabled on {% data variables.location.product_location %}, and the date and time of enablement{% endif %}
* The dormancy threshold for your enterprise
* The number of dormant users for your enterprise
* A count of license-consuming seats, which does not include suspended users
* A count of {% ifversion enterprise-licensing-language %}consumed licenses{% else %}license-consuming seats{% endif %}, which does not include suspended users
{% data variables.product.prodname_github_connect %} syncs the above connection data between {% data variables.location.product_location %} and {% data variables.product.prodname_ghe_cloud %} weekly, starting from the day and approximate time that {% data variables.product.prodname_github_connect %} was enabled.

2
content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/deleting-users-from-your-instance.md
View File

@@ -34,7 +34,7 @@ If you have enabled SCIM provisioning on your instance, you cannot delete **user
## Should I delete or suspend a user account?
{% data variables.product.prodname_dotcom %} recommends suspending users where possible, rather than deleting their accounts. Suspending user accounts on {% data variables.product.product_name %} preserves the history of resources owned by the user account, such as repositories and pull requests, and releases the licensed seat previously consumed by the user. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users).
{% data variables.product.prodname_dotcom %} recommends suspending users where possible, rather than deleting their accounts. Suspending user accounts on {% data variables.product.product_name %} preserves the history of resources owned by the user account, such as repositories and pull requests, and releases the {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} previously consumed by the user. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users).
As an alternative to deleting or suspending a user account, to stop a user's repositories being permanently removed from your enterprise you can place a legal hold on the user account. See [Placing a legal hold on a user or organization](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/placing-a-legal-hold-on-a-user-or-organization).

2
content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/managing-dormant-users.md
View File

@@ -41,7 +41,7 @@ Dormancy applies to both enterprise members and outside collaborators.
{% ifversion ghes %}
Dormant users are not automatically suspended. Consider suspending dormant users to release license seats. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users).
Dormant users are not automatically suspended. Consider suspending dormant users to release {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %}. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/suspending-and-unsuspending-users).
## Viewing dormant users

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

@@ -37,7 +37,7 @@ The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** a
* {% data variables.product.prodname_GH_advanced_security %}
* Access to the **new billing platform**. See [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises).{% endif %}
* An **enterprise account**, which allows you to manage multiple organizations. See [AUTOTITLE](/enterprise-cloud@latest/get-started/learning-about-github/types-of-github-accounts).
* Up to **50 seats** to grant access to users.
* Up to **50 licenses** to grant access to users.
## Features not included in the trial

4
content/apps/creating-github-apps/about-creating-github-apps/deciding-when-to-build-a-github-app.md
View File

@@ -38,7 +38,7 @@ These security features help harden your {% data variables.product.prodname_gith
Similar to {% data variables.product.prodname_oauth_apps %}, {% data variables.product.prodname_github_apps %} can still take actions on behalf of a user. Unlike {% data variables.product.prodname_oauth_apps %}, which don't indicate that the action was performed by the app, {% data variables.product.prodname_github_apps %} indicate that the action was performed by the app on behalf of the user.
{% data variables.product.prodname_github_apps %} are not tied to a user account and do not consume a seat on {% data variables.product.product_name %}. {% data variables.product.prodname_github_apps %} remain installed even when the person who initially installed the app leaves the organization. This lets your integrations continue to work even if people leave your team.
{% data variables.product.prodname_github_apps %} are not tied to a user account and do not consume a {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} on {% data variables.product.product_name %}. {% data variables.product.prodname_github_apps %} remain installed even when the person who initially installed the app leaves the organization. This lets your integrations continue to work even if people leave your team.
### {% data variables.product.prodname_github_apps %} have scalable rate limits
@@ -62,7 +62,7 @@ For more information about the REST API endpoints that are available to {% data
If you want to access {% data variables.product.prodname_dotcom %} resources on behalf of a user or in an organization, or you anticipate a long-lived integration, we recommend building a {% data variables.product.prodname_github_app %}.
You can use {% data variables.product.pat_generic_plural %} for API testing or short-lived scripts. Since a {% data variables.product.pat_generic %} is associated with a user, your automation could break if the user no longer has access to the resources you need. A {% data variables.product.prodname_github_app %} installed in an organization is not dependent on a user. Additionally, unlike a user, a {% data variables.product.prodname_github_app %} does not consume a {% data variables.product.company_short %} seat.
You can use {% data variables.product.pat_generic_plural %} for API testing or short-lived scripts. Since a {% data variables.product.pat_generic %} is associated with a user, your automation could break if the user no longer has access to the resources you need. A {% data variables.product.prodname_github_app %} installed in an organization is not dependent on a user. Additionally, unlike a user, a {% data variables.product.prodname_github_app %} does not consume a {% data variables.product.company_short %} {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}.
{% data variables.product.company_short %} supports two types of {% data variables.product.pat_generic_plural %}, but recommends that you use {% data variables.product.pat_v2 %}s instead of {% data variables.product.pat_v1_plural %} whenever possible. For more information about {% data variables.product.pat_generic_plural %}, see [AUTOTITLE](/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token#types-of-personal-access-tokens).

2
content/apps/oauth-apps/building-oauth-apps/differences-between-github-apps-and-oauth-apps.md
View File

@@ -131,5 +131,5 @@ Bot accounts are specific to GitHub Apps and are built into every GitHub App.
| GitHub Apps | {% data variables.product.prodname_oauth_apps %} |
| ----- | ----------- |
| GitHub App bots do not consume a {% data variables.product.prodname_enterprise %} seat. | A machine user account consumes a {% data variables.product.prodname_enterprise %} seat. |
| GitHub App bots do not consume a {% data variables.product.prodname_enterprise %} {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}. | A machine user account consumes a {% data variables.product.prodname_enterprise %} {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}. |
| Because a GitHub App bot is never granted a password, a customer can't sign into it directly. | A machine user account is granted a username and password to be managed and secured by the customer. |

2
content/authentication/connecting-to-github-with-ssh/managing-deploy-keys.md
View File

@@ -139,7 +139,7 @@ Since {% data variables.product.prodname_github_apps %} are a first class actor
* Tightly-scoped tokens with well-defined permission sets and expiration times (1 hour, or less if revoked manually using the API)
* Dedicated rate limits that grow with your organization
* Decoupled from {% data variables.product.prodname_dotcom %} user identities, so they do not consume any licensed seats
* Decoupled from {% data variables.product.prodname_dotcom %} user identities, so they do not consume any {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %}
* Never granted a password, so cannot be directly signed in to
### Cons of installation access tokens

12
content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
View File

@@ -34,7 +34,7 @@ The foundation of your bill is the number of user accounts using your{% ifversio
To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. See [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise).
In addition to licensed seats, your bill may include other charges, such as {% data variables.product.prodname_GH_advanced_security %}. See [AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise).
In addition to {% ifversion enterprise-licensing-language %}showing billable {% data variables.product.prodname_enterprise %} licenses{% else %}licensed seats{% endif %}, your bill may include other charges, such as {% data variables.product.prodname_GH_advanced_security %}. See [AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise).
{% endif %}
{% ifversion metered-ghe-ghas %}
@@ -94,7 +94,7 @@ If your enterprise does not use {% data variables.product.prodname_emus %}, you
> [!NOTE]
> * {% data variables.product.company_short %} counts each member or outside collaborator once for billing purposes, even if the user account has membership in multiple organizations in an enterprise or access to multiple repositories owned by your organization.
> * {% data reusables.organizations.org-invite-scim %}
> * Inviting an outside collaborator to a repository using their email address temporarily uses an available seat, even if they already have access to other repositories. After they accept the invite, the seat will be freed up again. However, inviting them using their username does not temporarily use a seat.
> * Inviting an outside collaborator to a repository using their email address temporarily uses an available {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}, even if they already have access to other repositories. After they accept the invite, the {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} will be freed up again. However, inviting them using their username does not temporarily use a {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}.
{% data variables.product.company_short %} does not bill for any of the following accounts:
@@ -110,11 +110,11 @@ If your enterprise does not use {% data variables.product.prodname_emus %}, you
### Accounts that consume a license on {% data variables.product.prodname_ghe_server %}
After a user successfully authenticates to a {% data variables.product.prodname_ghe_server %} instance for the first time, the user consumes a seat.
After a user successfully authenticates to a {% data variables.product.prodname_ghe_server %} instance for the first time, the user consumes a {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}.
Suspended users are not counted when calculating the number of licensed users consuming seats. For more information, see [Suspending and unsuspending users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %}
Suspended users are not counted when calculating the number of {% ifversion enterprise-licensing-language %}consumed licenses{% else %}licensed users consuming seats{% endif %}. For more information, see [Suspending and unsuspending users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/suspending-and-unsuspending-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %}
Dormant users do occupy a seat license. Administrators can suspend dormant users to free licenses. For more information, see [Managing dormant users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %}
Dormant users do occupy a {% ifversion enterprise-licensing-language %}license{% else %}seat license{% endif %}. Administrators can suspend dormant users to free licenses. For more information, see [Managing dormant users]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users){% ifversion not ghes %} in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}.{% endif %}
{% endif %}
@@ -130,7 +130,7 @@ You can change your {% data variables.product.prodname_dotcom %} subscription at
{% ifversion ghec %}If you use usage-based billing, you can reduce the number of licenses you use by removing users from your enterprise account. See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/removing-a-member-from-your-enterprise).
{% else %}You can add more licensed seats to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more seats than are being used, you can also reduce the number of seats. This only applies if you currently pay for your {% data variables.product.prodname_enterprise %} licenses through a volume, subscription, or prepaid agreement.{% endif %}{% ifversion fpt %} See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan) and [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan).
{% else %}You can add more {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} than are being used, you can also reduce the number of {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %}. This only applies if you currently pay for your {% data variables.product.prodname_enterprise %} licenses through a volume, subscription, or prepaid agreement.{% endif %}{% ifversion fpt %} See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan) and [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan).
If you have questions about your subscription, you can contact {% data variables.contact.contact_support %}.

2
content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
View File

@@ -21,7 +21,7 @@ shortTitle: About licenses
{% data reusables.enterprise.about-deployment-methods %}
{% data reusables.enterprise-licensing.unique-user-licensing-model %} To understand how {% data variables.product.company_short %} bills you for consumed licensed seats, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). For more about the price of {% data variables.product.prodname_enterprise %} licenses, see [Pricing](https://github.com/pricing) on the {% data variables.product.prodname_dotcom %} website.
{% data reusables.enterprise-licensing.unique-user-licensing-model %} To understand how {% data variables.product.company_short %} bills you for consumed {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %}, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing). For more about the price of {% data variables.product.prodname_enterprise %} licenses, see [Pricing](https://github.com/pricing) on the {% data variables.product.prodname_dotcom %} website.
To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} deployments.

8
content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
View File

@@ -27,7 +27,7 @@ For privacy reasons, enterprise owners cannot directly access the details of use
A person consumes a license for {% data variables.product.prodname_enterprise %} depending on specific criteria. If a user has not yet accepted an invitation to join your enterprise, the user still consumes a license. For more information about the people in your enterprise who consume a license, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing).
For each user to consume a single seat regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
For each user to consume a single {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
After you synchronize license usage, {% data variables.product.prodname_dotcom %} matches user accounts on {% data variables.product.prodname_ghe_server %} with user accounts on {% data variables.product.prodname_ghe_cloud %} by email address.
@@ -91,14 +91,14 @@ Your {% data variables.product.prodname_ghe_server %} license usage is a JSON fi
## Troubleshooting consumed licenses
To ensure that the each user is only consuming a single seat for different deployments and subscriptions, try the following troubleshooting steps.
To ensure that the each user is only consuming a single {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} for different deployments and subscriptions, try the following troubleshooting steps.
1. To help identify users that are consuming multiple seats, if your enterprise uses verified domains for {% data variables.product.prodname_ghe_cloud %}, review the list of enterprise members who do not have an email address from a verified domain associated with their account on {% data variables.product.prodname_ghe_cloud %}. Often, these are the users who erroneously consume more than one licensed seat. For more information, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-without-an-email-address-from-a-verified-domain).
1. To help identify users that are consuming multiple {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %}, if your enterprise uses verified domains for {% data variables.product.prodname_ghe_cloud %}, review the list of enterprise members who do not have an email address from a verified domain associated with their account on {% data variables.product.prodname_ghe_cloud %}. Often, these are the users who erroneously consume more than one {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %}. For more information, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-without-an-email-address-from-a-verified-domain).
> [!NOTE]
> To make troubleshooting easier, we recommend using verified domains with your enterprise account on {% data variables.product.prodname_ghe_cloud %}. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise).
1. After you identify users who are consuming multiple seats, make sure that the same email address is associated with all of the user's accounts. For more information about which email addresses must match, see [About the calculation of consumed licenses](#about-the-calculation-of-consumed-licenses).
1. After you identify users who are consuming multiple {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %}, make sure that the same email address is associated with all of the user's accounts. For more information about which email addresses must match, see [About the calculation of consumed licenses](#about-the-calculation-of-consumed-licenses).
1. If an email address was recently updated or verified to correct a mismatch, view the timestamp of the last license sync job. If a job hasn't run since the correction was made, manually trigger a new job. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
If you still have questions about your consumed licenses after reviewing the troubleshooting information above, you can contact {% data variables.contact.github_support %} through the {% data variables.contact.contact_enterprise_portal %}.

2
content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
View File

@@ -32,7 +32,7 @@ If you use {% data variables.product.product_name %} with an individual organiza
{% elsif ghes %}
Each user on {% data variables.location.product_location %} consumes a seat on your license. {% data variables.product.company_short %} bills monthly for the total number of seats consumed on your license.
Each user on {% data variables.location.product_location %} consumes a {% ifversion enterprise-licensing-language %}license{% else %}seat on your license{% endif %}. {% data variables.product.company_short %} bills monthly for the total number of {% ifversion enterprise-licensing-language %}consumed licenses{% else %}seats consumed on your license{% endif %}.
{% endif %}

2
content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md
View File

@@ -20,7 +20,7 @@ shortTitle: Usage-based billing for licenses
With the enhanced billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance.
If a user starts consuming a license seat during the month, you will pay pro rata for the user's license usage that month. If a user stops consuming a license seat during the month, your bill for the following month will reflect the change.
If a user starts consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} during the month, you will pay pro rata for the user's license usage that month. If a user stops consuming a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} during the month, your bill for the following month will reflect the change.
Pending invitations to join an organization that belongs to your enterprise on {% data variables.product.github %} do not consume a license.

17
content/billing/using-the-new-billing-platform/adding-seats-to-your-account.md → content/billing/using-the-new-billing-platform/adding-licenses-to-your-account.md
View File

@@ -1,24 +1,25 @@
---
title: Adding seats to your account
intro: Learn how to add seats to your {% ifversion fpt %}organization{% elsif ghec %}enterprise{% endif %} account using the enhanced billing platform.
title: Adding licenses to your account
intro: Learn how to add {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt %}organization{% elsif ghec %}enterprise{% endif %} account using the enhanced billing platform.
versions:
feature: enhanced-billing-platform
redirect_from:
- /billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account
- /billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account
- /billing/using-the-new-billing-platform/adding-seats-to-your-account
type: overview
topics:
- Enterprise
- Team
permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
shortTitle: Add seats to your account
shortTitle: Add licenses to your account
---
{% ifversion ghec %}
>[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add seats to your enterprise account.
>[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add licenses to your enterprise account.
{% endif %}
If you have access to the new billing platform, you can add seats to your account through the "Licensing" page. To check if you have access, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform).
If you have access to the new billing platform, you can add {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} to your account through the "Licensing" page. To check if you have access, see [AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform).
{% ifversion fpt %}
{% data reusables.profile.access_org %}
@@ -37,8 +38,8 @@ You can also use the **Edit** option to remove seats and see which users are usi
{% data reusables.enterprise-accounts.settings-tab %}
{% data reusables.billing.enterprise-billing-menu %}
1. Click **Licensing**.
1. Click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} and then click **Manage seats**.
1. Under "Total Seats", enter a number of seats.
1. Click **Update seats**.
1. Click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} and then click **Manage licenses**.
1. Under "Total licenses", enter a number of licenses.
1. Click **Update licenses**.
{% endif %}

14
content/billing/using-the-new-billing-platform/charging-business-units.md
View File

@@ -18,29 +18,29 @@ If your account is billed to Azure, you will have the option to add an Azure sub
{% ifversion metered-ghe-ghas %}
## Cost center billing for seat-based products
## Cost center billing for {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}-based products
For seat-based products like {% data variables.product.prodname_enterprise %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_copilot %}, cost centers are based on **users**. Changes to users (additions or deletions) will affect billing as follows:
For {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}-based products like {% data variables.product.prodname_enterprise %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_copilot %}, cost centers are based on **users**. Changes to users (additions or deletions) will affect billing as follows:
* Any new usage after the change will be billed to the cost center immediately.
* Seats added before a user is added to a cost center are only reflected at the start of the next month.
* {% ifversion enterprise-licensing-language %}Licenses{% else %}Seats{% endif %} added before a user is added to a cost center are only reflected at the start of the next month.
* Deletion of a user from a cost center is reflected at the start of the next month.
For example, if you add a user to a cost center, any new usage for that user will be billed to the cost center right away. However, if the usage (seat) for the user was added _before_ the user was added to the cost center, then the user’s seat will only start being billed to the cost center at the start of the next billing cycle.
For example, if you add a user to a cost center, any new usage for that user will be billed to the cost center right away. However, if the usage ({% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}) for the user was added _before_ the user was added to the cost center, then the user’s {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} will only start being billed to the cost center at the start of the next billing cycle.
{% endif %}
## Creating a cost center
Create cost centers to monitor and manage expenses for specific organizations or repositories. Multiple organizations and repositories can be assigned to one cost center.
This method can be used to track only non-seat based products usage such as:
This method can be used to track only non-{% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %} based products usage such as:
* {% data variables.product.prodname_actions %}
* {% data variables.product.prodname_github_codespaces %}
* {% data variables.product.prodname_registry %}
* {% data variables.large_files.product_name_short %}
For seat-based products like usage-based billing for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_copilot %}, assign users to the cost center via the API.
For {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}-based products like usage-based billing for {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_copilot %}, assign users to the cost center via the API.
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.billing.enterprise-billing-menu %}
@@ -78,7 +78,7 @@ To add or remove members from a cost center, you can use the API. See [AUTOTITLE
### Effects of removing a member from a cost center
If you add a member to a cost center, any usage accrued (for example, a seat) will immediately start being billed against the cost center. If you remove a member from a cost center, any usage from that point will be billed against the enterprise. For example:
If you add a member to a cost center, any usage accrued (for example, a {% ifversion enterprise-licensing-language %}license{% else %}seat{% endif %}) will immediately start being billed against the cost center. If you remove a member from a cost center, any usage from that point will be billed against the enterprise. For example:
* On May 1st, an enterprise has three {% data variables.product.prodname_copilot_short %} users. The charges for all three users ($39 each) are billed to the enterprise.
* On May 10th, you create two cost centers: Cost Center 1 and Cost Center 2. User A and User B are assigned to Cost Center 1, and User C to Cost Center 2. Future charges for Users A and B go to Cost Center 1, and for User C to Cost Center 2.

4
content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md
View File

@@ -48,7 +48,7 @@ You can view the usage of your {% data variables.enterprise.enterprise_or_org %}
>[!NOTE] The usage graph is configured to represent the start of the month to the end of the month, not your specific billing period.
1. To request a CSV usage report, select **Get usage report** in the upper-right corner of the page. You can choose a pre-selected option or use the Custom range option to specify a date range of up to 31 days.
1. To request a CSV usage report, select **Get usage report** in the upper-right corner of the page. You can choose a pre-selected option or use the Custom range option to specify a date range of up to 31 days.
## Viewing license usage
@@ -82,4 +82,4 @@ You can also view your active {% data variables.product.prodname_enterprise %} i
{% ifversion ghec %}
* [AUTOTITLE](/rest/enterprise-admin/billing){% endif %}
* [AUTOTITLE](/billing/using-the-new-billing-platform/adding-seats-to-your-account)
* [AUTOTITLE](/billing/using-the-new-billing-platform/adding-licenses-to-your-account)

2
content/billing/using-the-new-billing-platform/index.md
View File

@@ -13,7 +13,7 @@ children:
- /getting-started-with-the-new-billing-platform
- /about-the-billing-cycle
- /about-usage-based-billing-for-licenses
- /adding-seats-to-your-account
- /adding-licenses-to-your-account
- /roles-for-the-new-billing-platform
- /estimating-spending
- /gathering-insights-on-your-spending

2
content/billing/using-the-new-billing-platform/preventing-overspending.md
View File

@@ -20,7 +20,7 @@ The budget only applies to expenses incurred from the date of its creation onwar
Budgets are not applicable to:
* Seat-based products such as {% data variables.product.prodname_copilot %}{% ifversion fpt %} and {% data variables.product.prodname_team %}{% elsif ghec %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_enterprise %}.
* {% ifversion enterprise-licensing-language %}License{% else %}Seat{% endif %}-based products such as {% data variables.product.prodname_copilot %}{% ifversion fpt %} and {% data variables.product.prodname_team %}{% elsif ghec %}, {% data variables.product.prodname_GH_advanced_security %}, and {% data variables.product.prodname_enterprise %}.
* Pre-paid volume licenses{% endif %}.
## Viewing budgets

2
content/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization.md
View File

@@ -32,7 +32,7 @@ You can also require two-factor authentication for organizations in an enterpris
> Some of the users in your organization may have been selected for mandatory two-factor authentication enrollment by {% data variables.product.prodname_dotcom %}, but it has no impact on how you enable the 2FA requirement for your organization. If you enable the 2FA requirement in your organization, all users without 2FA currently enabled will be removed from your organization, including those that are required to enable it by {% data variables.product.prodname_dotcom %}.
> [!WARNING]
> * When you require use of two-factor authentication for your organization, members and billing managers who do not use 2FA will not be able to access your organization's resources until they enable 2FA on their account. They will retain membership even without 2FA, including occupying seats in your organization.
> * When you require use of two-factor authentication for your organization, members and billing managers who do not use 2FA will not be able to access your organization's resources until they enable 2FA on their account. They will retain membership even without 2FA, including consuming {% ifversion enterprise-licensing-language %}licenses{% else %}seats{% endif %} in your organization.
> * When you require use of two-factor authentication for your organization, outside collaborators who do not use 2FA will be removed from the organization and lose access to its repositories. They will also lose access to their forks of the organization's private repositories. You can reinstate their access privileges and settings if they enable 2FA for their personal account within three months of their removal from your organization. For more information, see [AUTOTITLE](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization).
> * You will also need to enable two-factor authentication for unattended or shared access accounts that are outside collaborators, such as bots and service accounts. If you do not configure 2FA for these unattended outside collaborator accounts after you've enabled required 2FA, the accounts will be removed from the organization and lose access to their repositories. For more information, see [AUTOTITLE](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/managing-bots-and-service-accounts-with-two-factor-authentication).
> * If an outside collaborator disables two-factor authentication for their personal account after you've enabled required 2FA, they will automatically be removed from the organization.

5
data/features/enterprise-licensing-language.yml Normal file
View File

@@ -0,0 +1,5 @@
# Reference: #16845
# Documentation for Update enterprise licensing terminology from seats -> licenses [GA]
versions:
ghec: '*'
ghes: '>=3.17'

2
data/reusables/audit_log/audit-log-action-categories.md
View File

@@ -185,6 +185,6 @@
| {% endif %} |
| `user` | Contains activities related to users in an enterprise or organization. |
| {% ifversion ghec or ghes %} |
| `user_license` | Contains activities related to a user occupying a licensed seat in, and being a member of, an enterprise. |
| `user_license` | Contains activities related to a user occupying a {% ifversion enterprise-licensing-language %}license{% else %}licensed seat{% endif %} in, and being a member of, an enterprise. |
| {% endif %} |
| `workflows` | Contains activities related to {% data variables.product.prodname_actions %} workflows. |

2
data/reusables/enterprise-licensing/unique-user-licensing-model.md
View File

@@ -1,3 +1,3 @@
{% data variables.product.company_short %} uses a unique-user licensing model. With the {% data variables.product.prodname_enterprise %} plan, you're entitled to use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. Your {% data variables.product.prodname_ghe_cloud %} allowance includes **one** deployment, on either {% data variables.product.prodname_dotcom_the_website %} or {% data variables.enterprise.data_residency_site %}.
{% data variables.product.company_short %} determines how many licensed seats you're consuming based on the number of unique users across your deployments. Each user only consumes one license, no matter how many {% data variables.product.prodname_ghe_server %} instances the user uses, or how many organizations the user is a member of on your {% data variables.product.prodname_ghe_cloud %} deployment. This model allows each person to use multiple {% data variables.product.prodname_enterprise %} deployments without incurring extra costs.
{% data variables.product.company_short %} determines how many {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} you're consuming based on the number of unique users across your deployments. Each user only consumes one license, no matter how many {% data variables.product.prodname_ghe_server %} instances the user uses, or how many organizations the user is a member of on your {% data variables.product.prodname_ghe_cloud %} deployment. This model allows each person to use multiple {% data variables.product.prodname_enterprise %} deployments without incurring extra costs.