[EDI billing] Updates to Reference section (#57068)

isaacmbrown · Copilot · felicitymay · web-flow · commit 964b95d134d9 · 2025-08-12T16:13:51.000Z
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
Co-authored-by: Felicity Chapman &lt;felicitymay@github.com&gt;
diff --git a/content/billing/index.md b/content/billing/index.md
@@ -29,7 +29,7 @@ featuredLinks:
     - /billing/how-tos/manage-plan-and-licenses/upgrade-plan
     - /billing/concepts/impact-of-plan-changes
     - '{% ifversion ghes %}/billing/how-tos/manage-server-licenses/sync-license-usage{% endif %}'
-    - '{% ifversion ghes %}/billing/reference/license-usage-calculation{% endif %}'
+    - '{% ifversion ghes %}/billing/reference/enterprise-license-troubleshooting{% endif %}'
 changelog:
   label: account-management
 layout: product-landing
diff --git a/content/billing/reference/billing-roles.md b/content/billing/reference/billing-roles.md
@@ -1,7 +1,7 @@
 ---
-title: Roles for the new billing platform
+title: Roles for the billing platform
 shortTitle: Billing roles
-intro: Learn about the different roles that can use the new billing platform.
+intro: Learn about the different roles that can view and manage billing settings.
 versions:
   feature: enhanced-billing-platform
 redirect_from:
@@ -12,41 +12,29 @@ topics:
   - Billing
   - Enterprise
   - Team
-product: '{% data reusables.billing.enhanced-billing-platform-product %}'
 contentType: reference
 ---
 
-In an {% data variables.enterprise.enterprise_and_org %}, the following roles have access to the new billing platform: {% ifversion ghec %}enterprise owners, {% endif %}billing managers, and organization owners. {% ifversion fpt %}See [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization).{% elsif ghec %}See [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise).{% endif %}
+The following roles have access to the billing platform:
 
-{% ifversion fpt %}Personal accounts also have access to the new billing platform for their personal usage.{% endif %}
+* **Enterprise owners and enterprise billing managers**: Can manage billing for an enterprise account.
+* **Organization owners and organization billing managers**: Can manage billing for an organization on {% data variables.product.prodname_free_team %} or {% data variables.product.prodname_team %}.
+* **Personal accounts (non-managed)**: Can access the billing platform for their personal usage.
 
-{% ifversion ghec %}
+To add a billing manager, see:
 
-## Enterprise owners and enterprise billing managers
-
-You can:
-
-* View all metered usage for your account and set budgets for your {% data variables.enterprise.enterprise_and_org %}.
-* See enterprise usage, including costs for organizations and repositories.
-* Download CSV usage reports for products your enterprise is using.
-* Set budgets for your {% data variables.enterprise.enterprise_and_org %}.
-* Create cost centers for all organizations within your enterprise.
-
-{% endif %}
+* [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization#inviting-a-billing-manager)
+* [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise)
 
 ## Organization owners
 
 You have full administrative access to your organization. You can:
 
 * View metered usage and budgets for your organization and its repositories.
 * Set budgets for the organization and its repositories.
-* Download CSV usage reports.{% ifversion ghec %}
-* Create cost centers by grouping repositories you manage.
+* Download CSV usage reports.
 * View promotions and discounts.
-* View spending for pre-purchased user licenses for {% data variables.product.prodname_enterprise %} or {% data variables.product.prodname_AS %} based on your usage.
-{% endif %}
-
-{% ifversion fpt %}
+* View spending for pre-purchased user licenses for {% data variables.product.prodname_AS %} based on your usage.
 
 ## Organization billing managers
 
@@ -56,20 +44,17 @@ You can:
 * View organization-level budgets.
 * Download CSV usage reports.
 
-{% endif %}
+## Enterprise owners and enterprise billing managers
+
+You can:
 
-## Inviting a billing manager
+* View all metered usage for your account and set budgets for your {% data variables.enterprise.enterprise_and_org %}.
+* See enterprise usage, including costs for organizations and repositories.
+* Download CSV usage reports for products your enterprise is using.
+* Set budgets for your enterprise.
+* Create cost centers for all organizations within your enterprise.
 
-The invited person will receive an invitation email asking them to become a billing manager for your {% ifversion ghec %}enterprise{% endif %}{% ifversion fpt %} organization{% endif %}. Once the invited person clicks the accept link in their invitation email, they will automatically be added to the {% ifversion ghec %}enterprise{% endif %}{% ifversion fpt %} organization{% endif %} as a billing manager. If they don't already have a {% data variables.product.prodname_dotcom %} account, they will be directed to sign up for one, and they will be automatically added to the {% ifversion ghec %}enterprise{% endif %}{% ifversion fpt %} organization{% endif %} as a billing manager after they create an account.
+## Further reading
 
-{% data reusables.user-settings.access_settings %}
-1. In the "Access" section of the sidebar, click **{% octicon "organization" aria-hidden="true" aria-label="organization" %} Organizations**.
-{% data reusables.profile.org_settings %}
-1. If you are an organization owner, in the "Access" section of the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**.
-1. Click the link in the text box, **Enterprise account billing settings**, which will direct you to your organizations billing settings page.
-1. {% ifversion horizontal-nav %}At the top of the page, click {% octicon "person" aria-hidden="true" aria-label="person" %} **People**{% else %}On the left side of the page, in the enterprise account sidebar, click {% octicon "person" aria-hidden="true" aria-label="person" %} **People**{% endif %}.
-1. Under "People", click **Administrators**.
-1. Above the list of administrators, click **Invite admin**.
-1. Type the username, full name, or email address of the person you want to invite, then select the appropriate person from the results.
-1. Select **Billing Manager**.
-1. Click **Send Invitation**.
+* [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)
diff --git a/content/billing/reference/enterprise-license-troubleshooting.md b/content/billing/reference/enterprise-license-troubleshooting.md
@@ -1,45 +1,54 @@
 ---
-title: License usage for GitHub Enterprise
-intro: You can troubleshoot license usage for your enterprise by auditing license reports.
-permissions: 'Enterprise owners can review license usage for {% data variables.product.prodname_enterprise %}.'
+title: License troubleshooting information for GitHub Enterprise
+intro: Troubleshoot license usage for your enterprise by understanding consumption criteria and auditing license reports.
 versions:
   ghec: '*'
   ghes: '*'
 topics:
   - Billing
   - Enterprise
   - Licensing
-shortTitle: License usage calculation
+shortTitle: Enterprise license troubleshooting
 contentType: reference
+redirect_from:
+  - /billing/reference/license-usage-calculation
+  - /billing/reference/license-usage-reference
 ---
 
-## About the calculation of consumed licenses
-
-> [!NOTE]
-> For {% data variables.visual_studio.prodname_vs_subscriber %}s, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise).
+## People who consume a license
 
 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).
 
+## {% data variables.visual_studio.prodname_vs_subscriber %}s
+
+If the verified email address for the personal account of an enterprise member on {% data variables.product.prodname_dotcom %} matches the User Principal Name (UPN) for a subscriber to your {% data variables.product.prodname_vs %} account, the {% data variables.product.prodname_vs %} subscriber will automatically consume one license for {% data variables.visual_studio.prodname_vss_ghec %}.
+
+> [!NOTE] For {% data variables.product.prodname_emu %} only, to make sure a user account consumes a {% data variables.product.prodname_vs %} license, ensure the {% data variables.product.prodname_vs %} UPN matches the SCIM `userName` attribute or the email address from the linked identity on the {% data variables.product.prodname_dotcom %} account.
+
+For more information, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise).
+
+## Users of {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}
+
 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.
 
-First, we check the primary email address of each user on {% data variables.product.prodname_ghe_server %}. Then, we attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}. If your enterprise on {% data variables.product.prodname_ghe_cloud %} or any of the enterprise's organizations use SAML authentication or SCIM provisioning, we first check the linked SAML or SCIM identities to see if the identity contains one of the attributes below. We attempt to match the values of these attributes to the primary email address of each {% data variables.product.prodname_ghe_server %} user.
+1. We check the primary email address of each user on {% data variables.product.prodname_ghe_server %}.
+1. We attempt to match that address with the email address for a user account on {% data variables.product.prodname_ghe_cloud %}.
+
+### With SAML or SCIM
+
+If your enterprise on {% data variables.product.prodname_ghe_cloud %} or any of the enterprise's organizations use SAML authentication or SCIM provisioning, we first check the linked SAML or SCIM identities to see if the identity contains one of the attributes below. We attempt to match the values of these attributes to the primary email address of each {% data variables.product.prodname_ghe_server %} user.
 
 * `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name`
 * `http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress`
 * `username`
 * `NameID`
 * `emails`
 
-If there is no match, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
-
-{% ifversion scim-for-ghes-ga %}
-
-> [!NOTE]
-> If SAML with SCIM is enabled, the `scim-admin` setup user will not consume a license. For more information, see [AUTOTITLE](/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users#1-create-a-built-in-setup-user).
+### Without SAML or SCIM
 
-{% endif %}
+If there is no match with a SAML or SCIM attribute, or if SAML authentication or SCIM provisioning is not in use, we attempt to match the primary email address on {% data variables.product.prodname_ghe_server %} with a verified email address for a user account on {% data variables.product.prodname_ghe_cloud %}. For more information about verification of email addresses on {% data variables.product.prodname_ghe_cloud %}, see [AUTOTITLE](/enterprise-cloud@latest/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/verifying-your-email-address){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
 
 ## Fields in the consumed license files
 
@@ -89,6 +98,6 @@ Your {% data variables.product.prodname_ghe_server %} license usage is a JSON fi
 | Server ID | UUID generated for your {% data variables.product.prodname_ghe_server %} instance.
 | Version | The version of your {% data variables.product.prodname_ghe_server %} instance.
 
-## Troubleshooting
+## Troubleshooting steps
 
 For troubleshooting steps, see [AUTOTITLE](/billing/how-tos/troubleshooting/enterprise-license-usage).
diff --git a/content/billing/reference/index.md b/content/billing/reference/index.md
@@ -14,6 +14,7 @@ children:
   - /supported-payment-methods
   - /azure-subscription
   - /billing-roles
-  - /license-usage-calculation
+  - /enterprise-license-troubleshooting
 contentType: reference
 ---
+
diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/adding-a-billing-manager-to-your-organization.md
@@ -46,25 +46,14 @@ Billing managers **are not** able to:
 
 ## Inviting a billing manager
 
-{% ifversion enhanced-billing-platform %}
-
->[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the new billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the new billing platform.
->
-> If you are on the new billing platform, the process for adding a billing manager is different. See [AUTOTITLE](/billing/managing-your-billing/roles-for-the-new-billing-platform#inviting-a-billing-manager).
-
-{% endif %}
-
-{% ifversion ghec %}
-
-If your organization is owned by an enterprise account, you cannot invite billing managers at the organization level. For more information, see [AUTOTITLE](/admin/overview/about-enterprise-accounts).
-
-{% endif %}
+>[!NOTE] If your organization is owned by an enterprise account, you cannot invite billing managers at the organization level. For more information, see [AUTOTITLE](/admin/overview/about-enterprise-accounts).
 
 The invited person will receive an invitation email asking them to become a billing manager for your organization. Once the invited person clicks the accept link in their invitation email, they will automatically be added to the organization as a billing manager. If they don't already have a {% data variables.product.prodname_dotcom %} account, they will be directed to sign up for one, and they will be automatically added to the organization as a billing manager after they create an account.
 
-{% data reusables.organizations.billing-settings %}
-1. Under "Billing management", next to "Billing managers", click **Add**.
-1. Type the username or email address of the person you want to add and click **Send invitation**.
+{% data reusables.organizations.navigate-to-org %}
+{% data reusables.organizations.org_settings %}
+1. In the sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and licensing**, then click **Additional billing details**.
+1. Next to "Billing managers", click **Invite**.
 
 ## Further reading
 
