Merge pull request #39555 from github/repo-sync

Repo sync

Dockerfile

@@ -8,7 +8,7 @@
 # ---------------------------------------------------------------
 # To update the sha:
 # https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
-FROM ghcr.io/github/gh-base-image/gh-base-noble:20250715-152201-gef17a3886 AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20250725-133358-gd7fe7b016 AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

content/admin/index.md

@@ -76,7 +76,7 @@ featuredLinks:
     - '{% ifversion ghec %}/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise{% endif %}'
     - /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise
     - '{% ifversion ghes %}/admin/getting-started-with-enterprise/about-upgrades-to-new-releases{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise{% endif %}'
+    - '{% ifversion ghes %}/billing/how-tos/set-up-payment/manage-enterprise-invoice{% endif %}'
   guideCards:
     - '{% ifversion ghes %}/admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server{% endif %}'
     - '{% ifversion ghes %}/admin/configuring-packages/getting-started-with-github-packages-for-your-enterprise{% endif %}'
@@ -91,7 +91,7 @@ featuredLinks:
     - '{% ifversion ghec %}/admin/configuring-settings/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise{% endif %}'
     - /admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise
     - '{% ifversion ghec %}/admin/monitoring-activity-in-your-enterprise/exploring-user-activity-in-your-enterprise/managing-global-webhooks{% endif %}'
-    - '{% ifversion ghec %}/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise{% endif %}'
+    - '{% ifversion ghec %}/billing/how-tos/set-up-payment/set-up-vs-subscription{% endif %}'
     - /support/learning-about-github-support/about-github-support
     - /admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities
 layout: product-landing

content/billing/concepts/billing-cycles.md

@@ -1,6 +1,7 @@
 ---
-title: About the billing cycle
-intro: Learn about the billing cycle for the billing platform.
+title: Billing cycles
+intro: 'Learn about the billing cycles for self-serve, Azure, and invoiced payment methods.'
+shortTitle: Billing cycles
 versions:
   feature: enhanced-billing-platform
 redirect_from:
@@ -9,11 +10,13 @@ redirect_from:
   - /billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle
   - /billing/using-the-new-billing-platform/viewing-your-subscriptions-and-billing-date
   - /billing/using-the-new-billing-platform/about-the-billing-cycle
-type: overview
+  - /billing/managing-your-billing/about-the-billing-cycle
 topics:
+  - Billing
   - Enterprise
   - Team
 product: '{% data reusables.billing.enhanced-billing-platform-product %}'
+contentType: concepts
 ---
 
 Your billing experience depends on whether your products are metered, volume-based, or a combination of both. Some products, like {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GHAS %}, can be either volume-based or metered, depending on when and how your account was created.

content/billing/concepts/discounted-plans.md

@@ -9,17 +9,19 @@ redirect_from:
   - /articles/discounted-subscriptions-for-github-accounts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
   - /billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
+  - /billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts
 versions:
   fpt: '*'
   ghec: '*'
-type: reference
 topics:
+  - Billing
   - Accounts
   - Education
   - Discounts
   - Nonprofits
   - User account
 shortTitle: Discounted plans
+contentType: concepts
 ---
 
 > [!TIP]

content/billing/concepts/enterprise-billing/billing-for-enterprises.md

@@ -0,0 +1,48 @@
+---
+title: Billing for GitHub Enterprise
+intro: 'You can view billing information for your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.'
+redirect_from:
+  - /admin/overview/managing-billing-for-your-enterprise
+  - /enterprise/admin/installation/managing-billing-for-github-enterprise
+  - /enterprise/admin/overview/managing-billing-for-github-enterprise
+  - /admin/overview/managing-billing-for-github-enterprise
+  - /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
+  - /billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
+  - /early-access/github/automatically-renew-the-billing-plan-for-your-enterprise
+  - /billing/using-the-billing-platform/about-billing-for-your-enterprise
+  - /billing/using-the-new-billing-platform/about-billing-for-your-enterprise
+  - /billing/managing-your-billing/about-billing-for-your-enterprise
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+  - Enterprise
+shortTitle: Billing for enterprises
+contentType: concepts
+---
+
+## {% data variables.product.prodname_enterprise %} plan costs
+
+Each member of your enterprise uses a license (previously known as a seat). The bill for your {% data variables.product.prodname_enterprise %} plan is based on the number of licenses consumed by your enterprise.
+
+If you have an enterprise account on {% data variables.product.prodname_ghe_cloud %}, the enterprise account is the central point for all billing within your enterprise, including the organizations that your enterprise owns. Enterprise owners and billing managers can access and manage billing for the enterprise. For more information, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise).
+
+> [!TIP]
+> {% ifversion fpt or ghec %}
+> If you use {% data variables.product.prodname_ghe_cloud %} with an individual organization and do not yet have an enterprise account, you can create an enterprise account and add your organization. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-an-enterprise-account).
+> {% elsif ghes %}
+> {% data reusables.billing.ghes-with-no-enterprise-account %}
+> {% endif %}
+
+## Invoiced customers
+
+For invoiced customers, each invoice includes a single bill that covers the cost of {% data variables.product.prodname_enterprise %} licenses used, as well as your use of paid services. For example, in addition to your usage for {% data variables.product.prodname_enterprise %}, you may also use {% data variables.product.prodname_GH_secret_protection %}.
+
+## Further reading
+
+* [AUTOTITLE](/admin/overview/about-enterprise-accounts)
+* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
+* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage)
+* [AUTOTITLE](/enterprise-cloud@latest/billing/how-tos/set-up-payment/manage-enterprise-invoice){% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}

content/billing/concepts/enterprise-billing/combined-enterprise-use.md

@@ -1,14 +1,18 @@
 ---
-title: About licenses for GitHub Enterprise
-intro: '{% ifversion ghec %}If you deploy {% data variables.product.prodname_ghe_server %} in addition to using {% data variables.product.prodname_ghe_cloud %}, you{% else %}You{% endif %} can synchronize your license usage between{% ifversion ghes %} {% data variables.product.prodname_enterprise %}{% endif %} deployments, and use a license file to unlock each {% data variables.product.prodname_ghe_server %} instance.'
+title: Combined GitHub Enterprise cloud and server use
+intro: 'Your enterprise account enables you to set up {% data variables.product.prodname_ghe_server %} with no additional cost.'
 versions:
+  fpt: '*'
   ghec: '*'
   ghes: '*'
-type: overview
 topics:
+  - Billing
   - Enterprise
   - Licensing
-shortTitle: About licenses
+shortTitle: Combined enterprise use
+redirect_from:
+  - /billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise
+contentType: concepts
 ---
 
 
@@ -57,5 +61,5 @@ If you have any questions about renewing your license, contact {% data variables
 
 * [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise)
 * The [People that consume a license](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing#people-that-consume-a-license) section in "About per-user pricing"
-* [Setting up a {% data variables.product.prodname_ghe_server %} instance]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)
+* [AUTOTITLE]({% ifversion fpt or ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)
 * The [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website

content/billing/concepts/enterprise-billing/index.md

@@ -0,0 +1,17 @@
+---
+title: Enterprise billing
+intro: 'Understanding the concepts used in billing for the {% data variables.product.prodname_enterprise %} plan.'
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /billing-for-enterprises
+  - /usage-based-licenses
+  - /combined-enterprise-use
+  - /visual-studio-subs
+contentType: concepts
+---
+

content/billing/concepts/enterprise-billing/usage-based-licenses.md

@@ -1,6 +1,6 @@
 ---
-title: About usage-based billing for licenses
-intro: 'Learn about usage-based billing for your licenses with the new billing platform, whether you pay through {% data variables.product.company_short %} or Azure.'
+title: Usage-based billing for enterprise licenses
+intro: 'Learn about usage-based billing for licenses in your {% data variables.product.prodname_enterprise %} plan, whether you pay through {% data variables.product.company_short %} or Azure.'
 redirect_from:
   - /early-access/billing/managing-usage-based-billing-for-github-licenses-through-github
   - /early-access/billing/managing-usage-based-billing-for-github-licenses-through-azure
@@ -9,20 +9,23 @@ redirect_from:
   - /early-access/billing/managing-usage-based-billing-for-github-licenses
   - /billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses
   - /billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses
+  - /billing/managing-your-billing/about-usage-based-billing-for-licenses
 versions:
+  fpt: '*'
   ghec: '*'
   ghes: '*'
-type: overview
 topics:
+  - Billing
   - Enterprise
 permissions: Enterprise administrators
-product: '{% data reusables.billing.enhanced-billing-platform-product %}'
-shortTitle: Usage-based billing for licenses
+product: '{% data variables.product.prodname_enterprise %}'
+shortTitle: Usage-based licenses
+contentType: concepts
 ---
 
 ## About usage-based billing
 
-With the new billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_cs_and_sp %} licenses you use. You will not need to buy a predefined number of licenses in advance. Usage-based billing provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models.
+You pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_cs_and_sp %} licenses you use. You do not need to buy a predefined number of licenses in advance. Usage-based billing for licenses provides flexibility and cost savings compared to more traditional licensing models, such as volume or subscription models.
 
 {% data reusables.billing.license-type-overview %}
 {% data reusables.billing.license-models %}

content/billing/concepts/enterprise-billing/visual-studio-subs.md

@@ -11,13 +11,15 @@ redirect_from:
   - /github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
   - /billing/managing-your-license-for-github-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
   - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
+  - /billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
 versions:
   ghec: '*'
-type: overview
 topics:
+  - Billing
   - Enterprise
   - Licensing
-shortTitle: About
+shortTitle: Visual Studio subs
+contentType: concepts
 ---
 
 > [!NOTE] Usage-based billing is not currently supported for {% data variables.visual_studio.prodname_vss_ghe %}.

content/billing/concepts/impact-of-plan-changes.md

@@ -1,23 +1,27 @@
 ---
-title: How does upgrading or downgrading affect the billing process?
-intro: 'When you upgrade the subscription for your personal account or organization, changes are applied immediately. When you downgrade your subscription, changes are applied at the end of your current billing cycle.'
+title: Impact of changing your plan on billing
+intro: Learn how upgrading or downgrading your plan is reflected in billing.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /articles/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
   - /billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
+  - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Fundamentals
   - Organizations
   - Upgrades
   - User account
-shortTitle: Billing process
+shortTitle: Impact of plan changes
+contentType: concepts
 ---
-Changes to your paid personal account or organization subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features, such as {% data variables.large_files.product_name_long %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
+When you upgrade the subscription for your personal account or organization, changes are applied immediately. When you downgrade your subscription, changes are applied at the end of your current billing cycle.
+
+Making a change to your paid personal account, organization, or enterprise account does not affect billing for use of {% data variables.product.github %} features, such as {% data variables.product.prodname_copilot_short %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
 
 For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github).
 

content/billing/concepts/index.md

@@ -0,0 +1,21 @@
+---
+title: Concepts for GitHub billing
+shortTitle: Concepts
+intro: Learn the core concepts that you'll need to understand how to pay for your GitHub plan and the features you use.
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /billing-cycles
+  - /license-consumption
+  - /impact-of-plan-changes
+  - /discounted-plans
+  - /enterprise-billing
+  - /product-billing
+  - /third-party-payments
+contentType: concepts
+---
+

content/billing/concepts/license-consumption.md

@@ -1,21 +1,24 @@
 ---
-title: About per-user pricing
-intro: 'Learn about per-user pricing for organizations{% ifversion ghec or ghes %} and enterprises{% endif %}.'
+title: License consumption by organization members
+intro: 'Learn how consumption of licenses for {% data variables.product.github %} by users is determined for organizations and enterprises.'
+shortTitle: License consumption
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing
   - /articles/about-per-user-pricing
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-per-user-pricing
   - /github/billing/managing-billing-for-your-github-account/about-per-user-pricing
+  - /billing/managing-the-plan-for-your-github-account/about-per-user-pricing
 versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-type: overview
 topics:
   - Downgrades
   - Enterprise
   - Licensing
   - Organizations
+  - Billing
+contentType: concepts
 ---
 
 {% ifversion fpt %}

content/billing/concepts/product-billing/git-lfs.md

@@ -1,5 +1,5 @@
 ---
-title: About billing for Git Large File Storage
+title: Git Large File Storage billing
 intro: 'Learn about billing for {% data variables.large_files.product_name_long %} using the new billing platform.'
 versions:
   feature: enhanced-billing-platform
@@ -11,15 +11,16 @@ redirect_from:
   - /billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage
   - /billing/using-the-new-billing-platform/about-git-large-file-storage
   - /billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage
-type: overview
+  - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage
 topics:
   - Billing
   - LFS
   - Enterprise
   - Team
   - Upgrades
-shortTitle: About Git LFS billing
+shortTitle: Git LFS
 product: '{% data reusables.billing.enhanced-billing-platform-product %}'
+contentType: concepts
 ---
 
 ## About billing for {% data variables.large_files.product_name_long %}

content/billing/concepts/product-billing/github-actions.md

@@ -1,5 +1,5 @@
 ---
-title: About billing for GitHub Actions
+title: GitHub Actions billing
 intro: 'If you want to use {% data variables.product.prodname_actions %} beyond the storage or minutes included in your account, you will be billed for additional usage.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions
@@ -7,18 +7,19 @@ redirect_from:
   - /billing/managing-billing-for-github-actions/about-billing-for-github-actions
   - /early-access/billing/actions-billing-update
   - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions
-  # Redirect for old maptopic
   - /billing/managing-billing-for-your-products/managing-billing-for-github-actions
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions
   - /billing/managing-billing-for-github-actions
+  - /billing/managing-billing-for-your-products/about-billing-for-github-actions
 versions:
   fpt: '*'
   ghec: '*'
-type: overview
 topics:
   - Actions
+  - Billing
   - Spending limits
 shortTitle: GitHub Actions
+contentType: concepts
 ---
 
 ## About billing for {% data variables.product.prodname_actions %}

content/billing/concepts/product-billing/github-advanced-security.md

@@ -1,7 +1,6 @@
 ---
-title: About billing for {% data variables.product.prodname_GHAS %}
+title: '{% data variables.product.prodname_GHAS %} billing'
 intro: 'Learn about the licensing models for {% data variables.product.prodname_AS %} products and how the use of {% data variables.product.prodname_GHAS_cs_and_sp %} licenses is calculated.'
-allowTitleToDifferFromFilename: true
 product: '{% data reusables.gated-features.ghas-billing %}'
 redirect_from:
   - /admin/advanced-security/about-licensing-for-github-advanced-security
@@ -9,16 +8,18 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
   - /billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security
 versions:
   fpt: '*'
   ghes: '*'
   ghec: '*'
-type: overview
 topics:
   - Advanced Security
+  - Billing
   - Enterprise
   - Licensing
-shortTitle: Advanced Security billing
+shortTitle: GitHub Advanced Security
+contentType: concepts
 ---
 
 {% ifversion fpt or ghec %}

content/billing/concepts/product-billing/github-codespaces.md

@@ -1,11 +1,10 @@
 ---
-title: About billing for GitHub Codespaces
+title: GitHub Codespaces billing
 shortTitle: GitHub Codespaces
 intro: 'Learn about the costs for using {% data variables.product.prodname_github_codespaces %}, and the monthly usage quotas included with {% data variables.product.prodname_dotcom %} personal accounts.'
 versions:
   fpt: '*'
   ghec: '*'
-type: overview
 topics:
   - Codespaces
   - Billing
@@ -18,9 +17,10 @@ redirect_from:
   - /codespaces/codespaces-reference/understanding-billing-for-github-codespaces
   - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
   - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
-  # Redirect for old maptopic
   - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces
   - /billing/managing-billing-for-github-codespaces
+  - /billing/managing-billing-for-your-products/about-billing-for-github-codespaces
+contentType: concepts
 ---
 
 ## About {% data variables.product.prodname_github_codespaces %} pricing
@@ -216,7 +216,7 @@ The calculation used for this estimate is:
 
 `<cost for the previous 7 full days>/7 * <days remaining in the billing month, including the current day> + <cost already accrued in this billing month>`
 
-The projected usage does not take into account information such as whether {% data variables.product.prodname_github_codespaces %} is still enabled, the number or size of codespaces that currently exist, or your prebuild settings. For this reason, if all of the organization's codespaces and prebuilds were deleted today, the projected usage for the billing month would still show a figure higher than the accrued usage. However, after seven days have elapsed, with no further {% data variables.product.prodname_codespaces %} usage, the projected usage will be the same as the currently accrued usage.
+The projected usage does not take into account information such as whether {% data variables.product.prodname_github_codespaces %} is still enabled, the number or size of codespaces that currently exist, or your prebuild settings. For this reason, if all of the organization's codespaces and prebuilds were deleted today, the projected usage for the billing month would still show a figure higher than the accrued usage. However, after seven days have elapsed, with no further {% data variables.product.prodname_github_codespaces %} usage, the projected usage will be the same as the currently accrued usage.
 
 ## Limiting the machine types for organization-owned codespaces
 

content/billing/concepts/product-billing/github-copilot.md

@@ -1,17 +1,19 @@
 ---
-title: About billing for GitHub Copilot
+title: GitHub Copilot billing
 shortTitle: GitHub Copilot
 intro: '{% data variables.product.prodname_dotcom %} offers several {% data variables.product.prodname_copilot_short %} plans for enterprises, organizations, and individual developers.'
 versions:
   feature: copilot
 topics:
+  - Billing
   - Copilot
 redirect_from:
   - /billing/managing-billing-for-github-copilot/about-billing-for-github-copilot
   - /billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot
-  # Redirect for old maptopic
   - /billing/managing-billing-for-your-products/managing-billing-for-github-copilot
   - /billing/managing-billing-for-github-copilot
+  - /billing/managing-billing-for-your-products/about-billing-for-github-copilot
+contentType: concepts
 ---
 
 ## {% data variables.product.prodname_copilot %} in your enterprise

content/billing/concepts/product-billing/github-models.md

@@ -1,13 +1,15 @@
 ---
-title: About billing for GitHub Models
+title: GitHub Models billing
 shortTitle: GitHub Models
-intro: If you want to use {% data variables.product.prodname_github_models %} beyond the free usage included in your account, you can choose to opt in to paid usage.
+intro: 'If you want to use {% data variables.product.prodname_github_models %} beyond the free usage included in your account, you can choose to opt in to paid usage.'
 versions:
   feature: github-models
 topics:
   - Enterprise
   - Billing
-allowTitleToDifferFromFilename: true
+redirect_from:
+  - /billing/managing-billing-for-your-products/about-billing-for-github-models
+contentType: concepts
 ---
 
 > [!NOTE]

content/billing/concepts/product-billing/github-packages.md

@@ -1,5 +1,5 @@
 ---
-title: About billing for GitHub Packages
+title: GitHub Packages billing
 intro: 'If you want to use {% data variables.product.prodname_registry %} beyond the storage or data transfer included in your account, you will be billed for additional usage.'
 product: '{% data reusables.gated-features.packages %}'
 redirect_from:
@@ -7,18 +7,19 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/about-billing-for-github-packages
   - /billing/managing-billing-for-github-packages/about-billing-for-github-packages
   - /billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages
-  # Redirect for old maptopic
   - /billing/managing-billing-for-your-products/managing-billing-for-github-packages
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages
   - /billing/managing-billing-for-github-packages
+  - /billing/managing-billing-for-your-products/about-billing-for-github-packages
 versions:
   fpt: '*'
   ghec: '*'
-type: overview
 topics:
+  - Billing
   - Packages
   - Spending limits
 shortTitle: GitHub Packages
+contentType: concepts
 ---
 
 ## About billing for {% data variables.product.prodname_registry %}

content/billing/concepts/product-billing/index.md

@@ -0,0 +1,21 @@
+---
+title: Product billing
+shortTitle: Product billing
+intro: 'Learn how product costs are calculated if you exceed the usage included in your {% data variables.product.github %} plan.'
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /github-actions
+  - /github-advanced-security
+  - /github-codespaces
+  - /github-copilot
+  - /github-models
+  - /github-packages
+  - /git-lfs
+contentType: concepts
+---
+

content/billing/concepts/third-party-payments/github-marketplace-apps.md

@@ -1,18 +1,20 @@
 ---
-title: About billing for GitHub Marketplace
+title: GitHub Marketplace app subscriptions
 intro: 'If you install a paid app in {% data variables.product.prodname_marketplace %}, your subscription shares your account''s existing billing date, payment method, and receipt.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-marketplace
   - /articles/about-billing-for-github-marketplace
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace
   - /billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace
 versions:
   fpt: '*'
   ghec: '*'
-type: overview
 topics:
+  - Billing
   - Marketplace
-shortTitle: Billing for GitHub Marketplace
+shortTitle: GitHub Marketplace apps
+contentType: concepts
 ---
 {% data variables.product.prodname_marketplace %} includes apps with free and paid pricing plans. After you purchase and install an app, you can upgrade, downgrade, or cancel at any time.
 

content/billing/concepts/third-party-payments/github-sponsors.md

@@ -1,18 +1,20 @@
 ---
-title: About billing for GitHub Sponsors
+title: GitHub Sponsors billing
 intro: You will be billed for your sponsorships with the rest of your paid products and features.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-sponsors
   - /articles/about-billing-for-github-sponsors
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/about-billing-for-github-sponsors
   - /billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/about-billing-for-github-sponsors
 versions:
   fpt: '*'
   ghec: '*'
-type: overview
 topics:
+  - Billing
   - Sponsors
-shortTitle: About billing
+shortTitle: GitHub Sponsors
+contentType: concepts
 ---
 {% data reusables.sponsors.sponsorship-details %}
 

content/billing/concepts/third-party-payments/index.md

@@ -0,0 +1,16 @@
+---
+title: Payments to third-parties using your GitHub account
+shortTitle: Third-party payments
+intro: 'Learn how payments you choose to make to other developers on {% data variables.product.github %} are billed, for example, sponsoring developers or buying apps from the marketplace.'
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /github-sponsors
+  - /github-marketplace-apps
+contentType: concepts
+---
+

content/billing/get-started/how-billing-works.md

@@ -0,0 +1,77 @@
+---
+title: How GitHub billing works
+shortTitle: How billing works
+intro: 'Learn what you''ll be charged for, when charges occur, and how to track your usage on GitHub to avoid billing surprises.'
+redirect_from:
+  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
+  - /articles/about-billing-on-github
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/about-billing-on-github
+  - /billing/managing-your-github-billing-settings/about-billing-on-github
+  - /billing/using-the-billing-platform/about-billing-on-github
+  - /billing/using-the-new-billing-platform/about-billing-on-github
+  - /billing/managing-your-billing/about-billing-on-github
+  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts
+  - /articles/what-is-the-total-cost-of-using-an-organization-account
+  - /articles/what-are-the-costs-of-using-an-organization-account
+  - /articles/what-plan-should-i-choose
+  - /articles/do-you-have-custom-plans
+  - /articles/user-account-billing-plans
+  - /articles/organization-billing-plans
+  - /articles/github-s-billing-plans
+  - /articles/about-billing-for-github-accounts
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-billing-for-github-accounts
+  - /billing/managing-billing-for-your-github-account/about-billing-for-github-accounts
+  - /billing/managing-the-plan-for-your-github-account/about-billing-for-plans
+versions:
+  fpt: '*'
+  ghec: '*'
+topics:
+  - Billing
+  - Fundamentals
+contentType: get-started
+---
+
+<!-- 
+Audience: All users
+JTBD: When I decide I want to pay for increased access, I need to understand what and how GitHub will charge me, so that I feel confident that I have been billed correctly and don't get any surprises. -->
+
+## What {% data variables.product.github %} charges for
+
+You can use {% data variables.product.github %} without incurring any costs. If you choose a paid plan, subscribe to a paid product, or use more than the allowance included in your plan for a billed product, then you will need to pay {% data variables.product.github %} for your usage.
+
+* **{% data variables.product.github %} plans**: A fixed monthly cost for a paid {% data variables.product.github %} account (for example: {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}) or {% data variables.product.prodname_copilot_short %} plan.
+* **Subscriptions**: Fixed monthly costs for any additional products you subscribe to (for example: {% data variables.product.prodname_GH_secret_protection %})
+* **Metered usage**: Variable costs that depend on how much you use certain features above the amounts included with your {% data variables.product.github %} plan (for example: {% data variables.product.prodname_actions %}). For more information see, [AUTOTITLE](/billing/reference/product-usage-included) and [AUTOTITLE](/billing/tutorials/set-up-budgets).
+
+> [!TIP]
+> {% data variables.product.github %} has discounted plans for verified students and academic faculties, and for non-profit organizations. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts).
+
+## How does billing work?
+
+{% data variables.product.github %} bills you separately for each account you own (personal, organization, or enterprise). Each account has a separate:
+
+* Billing date
+* Billing period, monthly or yearly, for {% data variables.product.github %} and {% data variables.product.prodname_copilot_short %} plans
+* Payment method of credit card, PayPal, or a connected Azure subscription
+* Receipt
+
+If required, {% data variables.product.prodname_ghe_cloud %} accounts can request a purchase order by contacting their account manager in {% data variables.contact.contact_enterprise_sales %}.
+
+## When will I be charged?
+
+Each account has a **billing date** and a **billing cycle**.
+
+For credit card and PayPal payments, the billing date is the day you started a paid plan (not necessarily when the account was created). For example, if you started a paid plan on the 15th of a month, you will be billed on the 15th of each subsequent month. For payments using an Azure subscription ID, the billing date is available in the Azure commerce portal.
+
+Most users pay for {% data variables.product.github %} using metered billing. The billing cycle for all metered products is a fixed period from the first day to the last day of the month.
+
+## How do I see what I'm billed for?
+
+You can see the billing and usage information for your account at anytime in the "Billing and licensing" pages of your account or using the REST API. For more information, see [AUTOTITLE](/billing/how-tos/products/view-product-use).
+
+## Next steps
+
+* [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)
+* [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information)
+* [AUTOTITLE](/billing/tutorials/set-up-budgets)
+* [AUTOTITLE](/billing/how-tos/set-up-payment/add-sales-tax-certificate)

content/billing/get-started/index.md

@@ -0,0 +1,22 @@
+---
+title: Get started with billing
+shortTitle: Get started
+intro: Learn how to add payment information to expand your use of GitHub.
+redirect_from:
+  - /early-access/billing/billing-private-beta
+  - /billing/using-the-enhanced-billing-platform-for-enterprises
+  - /billing/using-the-billing-platform
+  - /billing/using-the-new-billing-platform
+  - /billing/managing-your-billing
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /how-billing-works
+  - /introduction-to-billing
+contentType: get-started
+---
+

content/billing/get-started/introduction-to-billing.md

@@ -0,0 +1,64 @@
+---
+title: Introduction to billing and licensing
+intro: 'Learn about the billing platform''s key functionalities, and how they can help you manage your spending more effectively.'
+versions:
+  feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises
+  - /billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises
+  - /billing/using-the-new-billing-platform/about-the-new-billing-platform
+  - /billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform
+  - /billing/managing-your-billing/about-the-new-billing-platform
+topics:
+  - Billing
+  - Personal account
+  - Enterprise
+  - Team
+shortTitle: Introduction to billing
+contentType: get-started
+---
+
+## Key functionalities
+
+The billing and licensing pages on {% data variables.product.github %} contain views and options to help you understand and manage the cost of using paid products, plans, and subscriptions. Key tasks you can perform are:
+
+* **Prevent overspending**: Use budgets and alerts to track and control your spending.
+* **Observe and understand spending**: Understand how your spending is distributed across products.
+* **Estimate future spending**: View trends in your spending based on the usage across cost centers (enterprise accounts only) and budgets (all accounts).
+* **Gather insights and data**: Generate usage reports to share with your team or stakeholders, and know if you're on track with your budget.
+* **Allocate costs to centers**: Improve accountability by creating and assigning organizations, repositories, and members to cost centers.
+
+## Accessing the billing pages
+
+You can only access billing information for an account where you are an owner, a billing manager, or have equivalent permissions. For more information, see [AUTOTITLE](/billing/reference/billing-roles).
+
+1. In the upper-right corner of any page on {% data variables.product.prodname_dotcom %}, click your profile picture.
+
+   * For **personal accounts**, click **Settings**: https://github.com/settings/billing.
+   * For **organizations**, click **Your organizations**, then next to the organization, click **Settings**.
+   * For **enterprises**, click **Your enterprises**, then click **Settings**.
+
+1. Click **Billing & Licensing**.
+
+   * For **personal accounts** and **organizations**, the option is displayed under "Access" in the side bar. Then click **Overview**.
+   * For **enterprises**, the **Billing & Licensing** option is displayed as a separate tab, next to the "Settings" tab.
+
+If you have questions, please contact {% data variables.contact.contact_support_page %}.
+
+{% data reusables.billing.actions-usage-delay %}
+
+## Accessing billing information programmatically
+
+You can use the REST API to download the usage report for a personal or organization account. First you will need to create a fine-grained access token with the permissions defined by the end point, see:
+
+* [Get billing usage report for a user](/rest/billing/enhanced-billing?apiVersion=2022-11-28#get-billing-usage-report-for-a-user)
+* [Get billing usage report for an organization](/rest/billing/enhanced-billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-organization)
+* [Get billing usage report for an enterprise](/rest/enterprise-admin/billing?apiVersion=2022-11-28#get-billing-usage-report-for-an-enterprise)
+
+For more information, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-billing/automating-usage-reporting).
+
+## Next steps
+
+* [AUTOTITLE](/billing/how-tos/products/view-product-use)
+* [AUTOTITLE](/billing/tutorials/set-up-budgets)
+* [AUTOTITLE](/billing/tutorials/use-cost-centers)

content/billing/how-tos/index.md

@@ -0,0 +1,21 @@
+---
+title: How-tos for billing
+shortTitle: How-tos
+intro: Learn how to use the billing platform to pay for expanded access to GitHub and paid products.
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /set-up-payment
+  - /manage-plan-and-licenses
+  - /products
+  - /manage-server-licenses
+  - /pay-third-parties
+  - /manage-for-client
+  - /troubleshooting
+contentType: how-tos
+---
+

content/billing/how-tos/manage-for-client/create-as-csp-partner.md

@@ -1,15 +1,18 @@
 ---
 title: Creating an enterprise account as a Microsoft CSP partner
-intro: 'Learn how to set up an enterprise account for your customer as a Microsoft Cloud Solution Provider partner.'
+intro: Learn how to set up an enterprise account for your customer as a Microsoft Cloud Solution Provider partner.
 versions:
   fpt: '*'
   ghec: '*'
-type: quick_start
 topics:
+  - Billing
   - User account
   - Enterprise
   - Upgrades
-shortTitle: As a Microsoft CSP partner
+shortTitle: Create as CSP partner
+redirect_from:
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-an-enterprise-account-as-a-microsoft-csp-partner
+contentType: how-tos
 ---
 
 As a Microsoft Cloud Solution Provider (CSP) partner, you can create an enterprise account on {% data variables.product.prodname_dotcom %} on behalf of your customer. You can also invite your customer to become an enterprise owner.

content/billing/how-tos/manage-for-client/create-client-enterprise.md

@@ -1,15 +1,19 @@
 ---
-title: Creating and paying for an enterprise account on behalf of a client
+title: Creating and paying for a client's enterprise account
 intro: 'You can create and pay for an enterprise account on {% data variables.product.prodname_dotcom %} on behalf of a client.'
 versions:
   fpt: '*'
   ghec: '*'
-type: quick_start
 topics:
+  - Billing
   - User account
   - Enterprise
   - Upgrades
-shortTitle: On behalf of a client
+shortTitle: Create client enterprise
+redirect_from:
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/about-enterprise-accounts-for-procurement-companies
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client
+contentType: how-tos
 ---
 
 >[!NOTE] If you are a Microsoft Cloud Solution Provider (CSP) partner and want to create an enterprise account for your customer, see [AUTOTITLE](/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-an-enterprise-account-as-a-microsoft-csp-partner).

content/billing/how-tos/manage-for-client/create-client-org.md

@@ -1,20 +1,28 @@
 ---
-title: Creating and paying for an organization on behalf of a client
+title: Creating and paying for an organization for a client
 intro: 'You can create and pay for a {% data variables.product.prodname_dotcom %} organization on behalf of a client.'
 redirect_from:
+  - /github/setting-up-and-managing-billing-and-payments-on-github/about-organizations-for-procurement-companies
+  - /articles/about-organizations-for-resellers
+  - /articles/about-organizations-for-procurement-companies
+  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
+  - /billing/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
   - /github/setting-up-and-managing-billing-and-payments-on-github/creating-and-paying-for-an-organization-on-behalf-of-a-client
   - /articles/creating-and-paying-for-an-organization-on-behalf-of-a-client
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client
   - /billing/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client
 versions:
   fpt: '*'
   ghec: '*'
-type: quick_start
 topics:
+  - Billing
   - User account
   - Organizations
   - Upgrades
-shortTitle: On behalf of a client
+shortTitle: Create client org
+contentType: how-tos
 ---
 
 ## Requirements

content/billing/how-tos/manage-for-client/index.md

@@ -0,0 +1,29 @@
+---
+title: Managing GitHub for a client
+shortTitle: Manage for client
+intro: Learn how to use the billing platform to manage GitHub accounts on behalf of a client.
+redirect_from:
+  - /billing/setting-up-paid-accounts-for-procurement-companies
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies
+  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies
+  - /articles/setting-up-and-paying-for-organizations-for-resellers
+  - /articles/setting-up-and-paying-for-organizations-for-procurement-companies
+  - /articles/setting-up-paid-organizations-for-procurement-companies
+  - /billing/setting-up-paid-organizations-for-procurement-companies
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - create-client-org
+  - create-client-enterprise
+  - create-as-csp-partner
+  - renew-client-enterprise
+  - renew-client-organization
+  - manage-client-org
+contentType: how-tos
+---
+

content/billing/how-tos/manage-for-client/manage-client-org.md

@@ -7,14 +7,17 @@ redirect_from:
   - /articles/upgrading-or-downgrading-your-clients-paid-organization
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
   - /billing/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization
+
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Organizations
   - Upgrades
-shortTitle: Upgrade or downgrade
+shortTitle: Manage client org
+contentType: how-tos
 ---
 {% data reusables.organizations.reseller-ask-to-become-billing-manager %}
 

content/billing/how-tos/manage-for-client/renew-client-enterprise.md

@@ -1,13 +1,16 @@
 ---
 title: Renewing your client's enterprise account
-intro: "You can renew your client's enterprise account by adding a payment method."
+intro: You can renew your client's enterprise account by adding a payment method.
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Enterprise
-shortTitle: Renew
+shortTitle: Renew client enterprise
+redirect_from:
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/renewing-your-clients-enterprise-account
+contentType: how-tos
 ---
 
 If your client's enterprise account has a valid payment method on file, their yearly subscription will automatically renew. If not, you can renew the enterprise account by adding a payment method.

content/billing/how-tos/manage-for-client/renew-client-organization.md

@@ -7,13 +7,15 @@ redirect_from:
   - /articles/renewing-your-clients-paid-organization
   - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
   - /billing/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
+  - /billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/renewing-your-clients-paid-organization
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Organizations
-shortTitle: Renewing paid organization
+shortTitle: Renew client organization
+contentType: how-tos
 ---
 {% data reusables.organizations.reseller-ask-to-become-billing-manager %}
 

content/billing/how-tos/manage-plan-and-licenses/add-licenses.md

@@ -1,6 +1,6 @@
 ---
 title: Adding licenses to an organization
-intro: Learn how to add {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt %} personal or organization{% elsif ghec %}enterprise{% endif %} account using the new billing platform.
+intro: 'Learn how to add {% ifversion enterprise-licensing-language %}licenses{% else %}licensed seats{% endif %} to your {% ifversion fpt %} personal or organization{% elsif ghec %}enterprise{% endif %} account using the new billing platform.'
 versions:
   feature: enhanced-billing-platform
 redirect_from:
@@ -9,13 +9,14 @@ redirect_from:
   - /billing/using-the-new-billing-platform/adding-seats-to-your-account
   - /billing/using-the-new-billing-platform/adding-licenses-to-your-account
   - /billing/using-the-new-billing-platform/managing-licenses-and-plans-for-your-account
-type: overview
+  - /billing/managing-your-billing/adding-licenses-to-an-organization
 topics:
+  - Billing
   - Enterprise
   - Team
 permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
-shortTitle: Manage licenses {% ifversion fpt %}and plans{% endif %}
-allowTitleToDifferFromFilename: true
+shortTitle: Add licenses
+contentType: how-tos
 ---
 
 {% ifversion ghec %}
@@ -45,7 +46,7 @@ You can also use the **Edit** option to remove seats and see which users are usi
 {% data reusables.billing.enterprise-billing-menu %}
 1. Click **Licensing**.
 1. Click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} and then click **Manage licenses**.
-1. Under "Total licenses", enter a number of licenses.
+1. Under "Total licenses," enter a number of licenses.
 1. Click **Update licenses**.
 
 {% endif %}

content/billing/how-tos/manage-plan-and-licenses/downgrade-plan.md

@@ -18,16 +18,19 @@ redirect_from:
   - /articles/downgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/downgrading-your-github-subscription
   - /billing/managing-billing-for-your-github-account/downgrading-your-github-subscription
+  - /billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan
 versions:
   fpt: '*'
   ghec: '*'
 topics:
+  - Billing
   - Accounts
   - Downgrades
   - Organizations
   - Repositories
   - User account
 shortTitle: Downgrade plan
+contentType: how-tos
 ---
 
 {% data reusables.billing.enhanced-billing-platform-personal-accounts %}

content/billing/how-tos/manage-plan-and-licenses/index.md

@@ -0,0 +1,32 @@
+---
+title: Managing your plan and GitHub licenses
+shortTitle: Manage plan and licenses
+intro: Learn how to use the billing platform to change your plan and to understand license use.
+redirect_from:
+  - /billing/managing-the-plan-for-your-github-account
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account
+  - /categories/97/articles
+  - /categories/paying-for-user-accounts
+  - /articles/paying-for-your-github-user-account
+  - /articles/managing-billing-on-github
+  - /articles/changing-your-personal-account-s-billing-plan
+  - /categories/billing
+  - /categories/3/articles
+  - /articles/managing-your-organization-s-paid-seats
+  - /articles/managing-billing-for-your-github-account
+  - /billing/managing-billing-for-your-github-account
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /upgrade-plan
+  - /downgrade-plan
+  - /manage-pending-changes
+  - /view-enterprise-usage
+  - /add-licenses
+contentType: how-tos
+---
+

content/billing/how-tos/manage-plan-and-licenses/manage-pending-changes.md

@@ -9,14 +9,16 @@ redirect_from:
   - /articles/viewing-and-managing-pending-changes-to-your-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
   - /billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
+  - /billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Organizations
   - User account
-shortTitle: Pending plan changes
+shortTitle: Manage pending changes
+contentType: how-tos
 ---
 
 {% data reusables.billing.enhanced-billing-platform-personal-accounts %}

content/billing/how-tos/manage-plan-and-licenses/upgrade-plan.md

@@ -20,16 +20,18 @@ redirect_from:
   - /articles/upgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/upgrading-your-github-subscription
   - /billing/managing-billing-for-your-github-account/upgrading-your-github-subscription
+  - /billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Organizations
   - Troubleshooting
   - Upgrades
   - User account
-shortTitle: Upgrade your plan
+shortTitle: Upgrade plan
+contentType: how-tos
 ---
 
 {% data reusables.billing.enhanced-billing-platform-personal-accounts %}

content/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage.md

@@ -0,0 +1,72 @@
+---
+title: Viewing usage for your GitHub Enterprise plan
+intro: 'Learn how to display the number of users in your enterprise. For {% data variables.product.prodname_ghe_cloud %} full billing information is also available.'
+permissions: Enterprise owners and billing managers (cloud only)
+product: '{% data variables.product.prodname_enterprise %}'
+redirect_from:
+  - /billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise
+  - /billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
+  - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
+  - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
+  - /articles/viewing-the-subscription-and-usage-for-your-enterprise-account
+  - /github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account
+  - /billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+  - Enterprise
+shortTitle: View enterprise usage
+contentType: how-tos
+---
+
+## Viewing subscription and usage for your enterprise
+
+You can view the subscription and usage for your enterprise and download a file with license details.
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+{% data reusables.enterprise-accounts.licensing-tab-both-platforms %}
+
+The information displayed varies according to your enterprise set up.
+
+* {% data variables.product.prodname_ghe_cloud %}, potentially with licenses synchronized from {% data variables.product.prodname_ghe_server %}
+* {% data variables.product.prodname_ghe_server %}
+
+To learn more about the license data associated with your enterprise account and how the number of consumed user licenses is calculated, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise).
+
+## Finding information on {% data variables.product.prodname_ghe_cloud %}
+
+* Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date.
+* To view details for license usage or download a CSV file with license details, to the right of "User Licenses", click **View details** or **{% octicon "download" aria-hidden="true" aria-label="download" %} CSV report**.
+* To view usage details for other features, in the left sidebar, click **Billing**.
+
+### Synchronization of {% data variables.product.prodname_ghe_server %} use
+
+The date of the last license sync occurred is shown under "Enterprise Server instances". Look for timestamps next to usage uploaded or synced events.
+
+* "Server usage uploaded" indicates license usage between environments was manually updated when a {% data variables.product.prodname_ghe_server %} license file was uploaded.
+* "{% data variables.product.prodname_github_connect %} server usage synced" indicates license usage between environments was automatically updated.
+* "{% data variables.product.prodname_github_connect %} server usage never synced" indicates that {% data variables.product.prodname_github_connect %} is configured, but license usage between environments has never updated successfully.
+
+For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
+
+### Synchronization of {% data variables.visual_studio.prodname_vss_ghe %} subscriptions
+
+If your {% data variables.product.github %} license includes {% data variables.visual_studio.prodname_vss_ghe %}, you can identify whether a user account on {% data variables.product.prodname_ghe_cloud %} has successfully matched with a {% data variables.product.prodname_vs %} subscriber by downloading the CSV file that contains additional license details. The license status will be one of the following:
+
+* "Matched": The user account on {% data variables.product.prodname_dotcom_the_website %} is linked with a {% data variables.product.prodname_vs %} subscriber.
+* "Pending Invitation": An invitation was sent to a {% data variables.product.prodname_vs %} subscriber, but the subscriber has not accepted the invitation.
+* Blank: There is no {% data variables.product.prodname_vs %} association to consider for the user account on {% data variables.product.prodname_dotcom_the_website %}.
+
+## Finding information on {% data variables.product.prodname_ghe_server %}
+
+* Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date.
+* To view details for license usage or download a JSON file with license details, click **View users** or **Export license usage**.
+* Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.
+* If you have purchased {% data variables.product.prodname_AS %}, you can review your total licenses used as well as a per-organization breakdown of active committers. See [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise).
+
+## Reporting license information using the REST API
+
+You can also use the REST API to return consumed licenses data and the status of the license sync job. See [AUTOTITLE](/rest/enterprise-admin/license).

content/billing/how-tos/manage-server-licenses/download-your-license.md

@@ -5,11 +5,26 @@ permissions: 'Enterprise owners can download license files for {% data variables
 versions:
   ghec: '*'
   ghes: '*'
-type: how_to
 topics:
+  - Billing
   - Enterprise
   - Licensing
 shortTitle: Download your license
+redirect_from:
+  - /free-pro-team@latest/billing/managing-your-license-for-github-enterprise
+  - /enterprise/admin/installation/managing-your-github-enterprise-license
+  - /enterprise/admin/categories/licenses
+  - /enterprise/admin/articles/license-files
+  - /enterprise/admin/installation/about-license-files
+  - /enterprise/admin/articles/downloading-your-license
+  - /enterprise/admin/installation/downloading-your-license
+  - /enterprise/admin/articles/upgrading-your-license
+  - /enterprise/admin/installation/updating-your-license
+  - /enterprise/admin/installation/managing-your-github-enterprise-server-license
+  - /enterprise/admin/overview/managing-your-github-enterprise-license
+  - /billing/managing-your-license-for-github-enterprise
+  - /billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise
+contentType: how-tos
 ---
 
 

content/billing/how-tos/manage-server-licenses/index.md

@@ -0,0 +1,17 @@
+---
+title: Manage Enterprise Server licenses for your enterprise account
+shortTitle: Manage server licenses
+intro: 'Learn how to set up an instance of {% data variables.product.prodname_ghe_server %} that synchronizes license information with your enterprise account on {% data variables.product.prodname_ghe_cloud %}.'
+versions:
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+  - Enterprise
+children:
+  - /download-your-license
+  - /upload-new-license
+  - /sync-license-usage
+contentType: how-tos
+---
+

content/billing/how-tos/manage-server-licenses/sync-license-usage.md

@@ -1,15 +1,18 @@
 ---
-title: Syncing license usage between GitHub Enterprise Server and GitHub Enterprise Cloud
-intro: 'You can sync license usage from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %} to view all license usage across your enterprise in one place and ensure that people with accounts in both environments only consume one user license.'
+title: Syncing license usage from GitHub Enterprise Server to Cloud
+intro: 'You can sync license usage from GitHub Enterprise Server to GitHub Enterprise Cloud to view all license usage across your enterprise in one place and ensure that people with accounts in both environments only consume one user license.'
 permissions: 'Enterprise owners can sync license usage between enterprise accounts on {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}.'
 versions:
   ghec: '*'
   ghes: '*'
-type: how_to
 topics:
+  - Billing
   - Enterprise
   - Licensing
 shortTitle: Sync license usage
+redirect_from:
+  - /billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud
+contentType: how-tos
 ---
 
 ## About synchronization of license usage

content/billing/how-tos/manage-server-licenses/upload-new-license.md

@@ -3,11 +3,14 @@ title: Uploading a new license to GitHub Enterprise Server
 intro: 'You can upload your license file for {% data variables.product.prodname_enterprise %} to {% data variables.location.product_location_enterprise %} to validate your application.'
 versions:
   ghes: '*'
-type: how_to
 topics:
+  - Billing
   - Enterprise
   - Licensing
-shortTitle: Upload a new license
+shortTitle: Upload new license
+redirect_from:
+  - /billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server
+contentType: how-tos
 ---
 
 ## About license files for {% data variables.product.prodname_enterprise %}

content/billing/how-tos/pay-third-parties/cancel-marketplace-app.md

@@ -8,17 +8,19 @@ redirect_from:
   - /articles/canceling-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
   - /billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Cancellation
   - Marketplace
   - Organizations
   - Trials
   - User account
-shortTitle: Cancel a Marketplace app
+shortTitle: Cancel Marketplace app
+contentType: how-tos
 ---
 
 {% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}

content/billing/how-tos/pay-third-parties/downgrade-marketplace-app.md

@@ -8,16 +8,18 @@ redirect_from:
   - /articles/downgrading-the-billing-plan-for-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
   - /billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Downgrades
   - Marketplace
   - Organizations
   - User account
-shortTitle: Downgrade billing plan
+shortTitle: Downgrade Marketplace app
+contentType: how-tos
 ---
 
 {% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}

content/billing/how-tos/pay-third-parties/downgrade-sponsorship.md

@@ -6,14 +6,17 @@ redirect_from:
   - /articles/downgrading-a-sponsorship
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/downgrading-a-sponsorship
   - /billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/downgrading-a-sponsorship
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Cancellation
   - Downgrades
   - Sponsors
+shortTitle: Downgrade sponsorship
+contentType: how-tos
 ---
 
 ## About sponsorship downgrades

content/billing/how-tos/pay-third-parties/end-sponsorship.md

@@ -6,10 +6,12 @@ versions:
   ghec: '*'
 redirect_from:
   - /billing/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship
-type: how_to
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship
 topics:
+  - Billing
   - Sponsors
-shortTitle: Setting an end date
+shortTitle: End sponsorship
+contentType: how-tos
 ---
 
 You can set an end date to your sponsorship. The end date assigned will be the last date for which you will be charged for that sponsorship, but the sponsorship will show active for another month. For example, if October 2023 is set as the end date, the last sponsorship will be charged in October 2023, but the sponsorship will be shown as active until November 2023. For more information about setting an end date to a new sponsorship, see [AUTOTITLE](/sponsors/sponsoring-open-source-contributors/sponsoring-an-open-source-contributor).

content/billing/how-tos/pay-third-parties/index.md

@@ -0,0 +1,27 @@
+---
+title: Making payments to third-parties through GitHub
+shortTitle: Pay third-parties
+intro: 'You can upgrade, downgrade, or cancel {% data variables.product.prodname_marketplace %} apps and sponsorships.'
+redirect_from:
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps
+  - /articles/managing-your-personal-account-s-apps
+  - /articles/managing-your-organization-s-apps
+  - /articles/managing-billing-for-github-marketplace-apps
+  - /billing/managing-billing-for-github-marketplace-apps
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors
+  - /articles/managing-billing-for-github-sponsors
+  - /billing/managing-billing-for-github-sponsors
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-sponsors
+versions:
+  fpt: '*'
+  ghec: '*'
+children:
+  - /upgrade-marketplace-app
+  - /downgrade-marketplace-app
+  - /cancel-marketplace-app
+  - /upgrade-sponsorship
+  - /downgrade-sponsorship
+  - /end-sponsorship
+contentType: how-tos
+---

content/billing/how-tos/pay-third-parties/upgrade-marketplace-app.md

@@ -8,16 +8,18 @@ redirect_from:
   - /articles/upgrading-the-billing-plan-for-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
   - /billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Marketplace
   - Organizations
   - Upgrades
   - User account
-shortTitle: Upgrade billing plan
+shortTitle: Upgrade Marketplace app
+contentType: how-tos
 ---
 
 {% ifversion fpt %}{% data reusables.marketplace.marketplace-app-page %}{% endif %}

content/billing/how-tos/pay-third-parties/upgrade-sponsorship.md

@@ -6,13 +6,16 @@ redirect_from:
   - /articles/upgrading-a-sponsorship
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/upgrading-a-sponsorship
   - /billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/upgrading-a-sponsorship
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Sponsors
   - Upgrades
+shortTitle: Upgrade sponsorship
+contentType: how-tos
 ---
 
 ## About sponsorship upgrades

content/billing/how-tos/products/add-advanced-security.md

@@ -1,19 +1,20 @@
 ---
-title: Signing up for {% data variables.product.prodname_GHAS %}
-intro: "You can sign up for {% data variables.product.prodname_GHAS %} products from your {% data variables.enterprise.enterprise_or_org %} account's settings to prevent data leaks and keep vulnerabilities out of your codebase."
-allowTitleToDifferFromFilename: true
+title: Adding GitHub Advanced Security to your organization or enterprise
+intro: 'You can sign up for GitHub Advanced Security products from the settings for your organization or enterprise account to prevent data leaks and keep vulnerabilities out of your codebase.'
 permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}'
 product: '{% data reusables.gated-features.ghas-billing %}'
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 redirect_from:
   - /billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security
 topics:
+  - Billing
   - Advanced Security
   - Enterprise
-shortTitle: Sign up for Advanced Security
+shortTitle: Add Advanced Security
+contentType: how-tos
 ---
 
 ## Checking your current plan

content/billing/how-tos/products/downgrade-git-lfs-storage.md

@@ -8,15 +8,17 @@ redirect_from:
   - /articles/downgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
   - /billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
+  - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - LFS
   - Organizations
   - User account
 shortTitle: Downgrade Git LFS storage
+contentType: how-tos
 ---
 
 <!--expires 2025-09-30-->

content/billing/how-tos/products/download-ghas-license-use.md

@@ -1,18 +1,20 @@
 ---
-title: Downloading licensed use of {% data variables.product.prodname_AS %}
+title: 'Downloading licensed use of Advanced Security'
 intro: 'You can download consumption of {% data variables.product.prodname_GHAS %} licenses by your {% data variables.enterprise.enterprise_or_org %}: volume/subscription licenses or metered usage.'
-allowTitleToDifferFromFilename: true
 permissions: '{% ifversion fpt %}Organization{% else %}Enterprise{% endif %} owners with {% data variables.product.prodname_AS %}'
 product: '{% data reusables.gated-features.ghas-billing %}'
 versions:
   fpt: '*'
   ghes: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Advanced Security
   - Enterprise
 shortTitle: Download GHAS license use
+redirect_from:
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage
+contentType: how-tos
 ---
 
 ## Downloading {% data variables.product.prodname_AS %} license usage information

content/billing/how-tos/products/index.md

@@ -0,0 +1,37 @@
+---
+title: View and manage paid use of GitHub products
+shortTitle: Products
+intro: Learn how to use the billing platform to pay for expanded access to GitHub products.
+redirect_from:
+  - /billing/managing-billing-for-your-products
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage
+  - /articles/managing-large-file-storage-and-bandwidth-for-your-personal-account
+  - /articles/managing-large-file-storage-and-bandwidth-for-your-organization
+  - /articles/managing-storage-and-bandwidth-usage
+  - /articles/managing-billing-for-git-large-file-storage
+  - /billing/managing-billing-for-git-large-file-storage/index
+  - /billing/managing-billing-for-git-large-file-storage
+  - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage
+  - /billing/managing-licensing-for-github-advanced-security
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security
+  - /billing/managing-billing-for-github-advanced-security
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - view-product-use
+  - download-ghas-license-use
+  - trial-advanced-security
+  - add-advanced-security
+  - manage-ghas-license
+  - migrate-from-ghas
+  - view-ghas-committers
+  - upgrade-git-lfs-storage
+  - downgrade-git-lfs-storage
+contentType: how-tos
+---
+

content/billing/how-tos/products/manage-ghas-license.md

@@ -1,17 +1,18 @@
 ---
-title: Managing volume/subscription licenses for {% data variables.product.prodname_AS %}
+title: 'Managing volume licenses for GitHub Advanced Security'
 intro: 'You can monitor and control the availability and consumption of licenses for {% data variables.product.prodname_AS %} in repositories in your enterprise.'
-allowTitleToDifferFromFilename: true
 permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}. </br>For metered usage on the new platform, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).'
 versions:
   ghec: '*'
-type: how_to
 redirect_from:
   - /billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing
 topics:
+  - Billing
   - Advanced Security
   - Enterprise
-shortTitle: Volume/subscription GHAS license
+shortTitle: Manage GHAS license
+contentType: how-tos
 ---
 
 There are two different ways to pay for {% data variables.product.prodname_GHAS_cs_and_sp %} licenses: volume/subscription licenses purchased in advance or usage-based metered billing paid in arrears. This article is about volume/subscription licenses. For information about the two different billing models, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).

content/billing/how-tos/products/migrate-from-ghas.md

@@ -1,19 +1,21 @@
 ---
-title: Migrating from {% data variables.product.prodname_GHAS %} to {% data variables.product.prodname_cs_and_sp %}
+title: 'Migrating from GHAS to Code Security and Secret Protection'
 intro: 'Learn how you can migrate from a combined license for {% data variables.product.prodname_AS %} features to one of the new SKUs.'
-allowTitleToDifferFromFilename: true
 product: '{% data reusables.gated-features.ghas-billing %}'
 versions:
   ghec: '*'
   ghes: '> 3.16'
-type: how_to
 topics:
+  - Billing
   - Advanced Security
   - Enterprise
   - Licensing
   - Code Security
   - Secret Protection
-shortTitle: Migrating to new GHAS SKUs
+shortTitle: Migrate from GHAS
+redirect_from:
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/migrating-from-ghas-to-cs-and-sp
+contentType: how-tos
 ---
 
 ## New SKUs for {% data variables.product.prodname_AS %} features
@@ -38,7 +40,7 @@ To get started, apply the GitHub-recommended security configuration or a custom
 
 For more information, see:
 
-* [Metered billing](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#metered-billing)
+* [Metered billing](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security#metered-billing)
 * [AUTOTITLE](/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-the-github-recommended-security-configuration-in-your-organization)
 * [AUTOTITLE](/code-security/securing-your-organization/enabling-security-features-in-your-organization/applying-a-custom-security-configuration)
 * [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)

content/billing/how-tos/products/trial-advanced-security.md

@@ -1,18 +1,19 @@
 ---
-title: Setting up a trial of {% data variables.product.prodname_GHAS %}
+title: Setting up a trial of GitHub Advanced Security
 intro: 'You can try the full set of {% data variables.product.prodname_GHAS %} features for free.'
 product: 'Enterprise owners <br> Otherwise, you need a trial of {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_GHAS %}. See [AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud) in the {% data variables.product.prodname_ghe_cloud %} docs.'
-allowTitleToDifferFromFilename: true
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 redirect_from:
   - /billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security
 topics:
+  - Billing
   - Advanced Security
   - Enterprise
-shortTitle: Set up an Advanced Security trial
+shortTitle: Trial Advanced Security
+contentType: how-tos
 ---
 
 ## Prerequisites

content/billing/how-tos/products/upgrade-git-lfs-storage.md

@@ -8,15 +8,17 @@ redirect_from:
   - /articles/upgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
   - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
+  - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - LFS
   - Organizations
   - User account
 shortTitle: Upgrade Git LFS storage
+contentType: how-tos
 ---
 
 <!--expires 2025-09-30-->

content/billing/how-tos/products/view-ghas-committers.md

@@ -1,18 +1,19 @@
 ---
-title: Viewing committer information for volume/subscription licenses for GitHub Advanced Security
+title: Viewing committer information for Advanced Security licenses
 intro: 'You can view information about the {% data variables.product.prodname_GH_cs_and_sp %} committers for your enterprise and calculate the cost for additional committers with the site admin dashboard.'
-allowTitleToDifferFromFilename: true
-permissions: 'Site administrators'
+permissions: Site administrators
 product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   ghes: '*'
-type: how_to
 redirect_from:
   - /billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security
 topics:
+  - Billing
   - Advanced Security
   - Enterprise
-shortTitle: View Advanced Security committers
+shortTitle: View GHAS committers
+contentType: how-tos
 ---
 
 ## About the "Advanced Security Committers" dashboard

content/billing/how-tos/products/view-product-use.md

@@ -1,9 +1,7 @@
 ---
-title: 'Viewing your usage of metered products'
-intro: 'You can explore your use of different products that are billed by usage and see how each product contributes to your bill.'
-allowTitleToDifferFromFilename: true
+title: Viewing your usage of metered products
+intro: You can explore your use of different products that are billed by usage and see how each product contributes to your bill.
 redirect_from:
-# Git LFS redirects
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-git-large-file-storage-usage
   - /articles/viewing-storage-and-bandwidth-usage-for-a-personal-account
   - /articles/viewing-storage-and-bandwidth-usage-for-an-organization
@@ -11,12 +9,10 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
   - /billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
   - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
-# Actions redirects
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/viewing-your-github-actions-usage
   - /billing/managing-billing-for-github-actions/viewing-your-github-actions-usage
   - /billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage
-# Advanced security redirects
   - /billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
   - /admin/advanced-security/viewing-your-github-advanced-security-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
@@ -24,22 +20,21 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage
   - /billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
   - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
-# Codespaces redirects
   - /billing/managing-billing-for-github-codespaces/viewing-your-codespaces-usage
   - /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage
   - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage
-# Packages redirects
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/viewing-your-github-packages-usage
   - /billing/managing-billing-for-github-packages/viewing-your-github-packages-usage
   - /billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage
+  - /billing/managing-billing-for-your-products/viewing-your-product-usage
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
   - Billing
 shortTitle: View product use
+contentType: how-tos
 ---
 
 ## Viewing a summary of usage for billed products

content/billing/how-tos/set-up-payment/add-sales-tax-certificate.md

@@ -4,15 +4,17 @@ intro: 'If you''re a customer in the United States with a {% data variables.prod
 redirect_from:
   - /billing/managing-your-github-billing-settings/adding-a-sales-tax-certificate
   - /billing/using-the-billing-platform/adding-a-sales-tax-certificate
+  - /billing/managing-your-billing/adding-a-sales-tax-certificate
 versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-type: how_to
 topics:
+  - Billing
   - Organizations
   - User account
-shortTitle: Add a sales tax certificate
+shortTitle: Add sales tax certificate
+contentType: how-tos
 ---
 
 If you're a {% data variables.product.company_short %} customer in the United States, you need to ensure that your account is set up to calculate sales tax correctly. If you're exempt from sales tax, you can upload a certificate to your account. The format of the certificate you upload must be one of the following:

content/billing/how-tos/set-up-payment/connect-azure-sub.md

@@ -7,11 +7,15 @@ redirect_from:
   - /github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise
   - /billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
   - /billing/managing-billing-for-your-github-account/connecting-an-azure-subscription
+  - /billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription
 versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-shortTitle: Connect an Azure subscription
+shortTitle: Connect Azure sub
+topics:
+  - Billing
+contentType: how-tos
 ---
 
 

content/billing/how-tos/set-up-payment/index.md

@@ -0,0 +1,21 @@
+---
+title: Setting up and managing payment
+shortTitle: Set up payment
+intro: Learn how to change your payment method and manage invoices.
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /manage-payment-info
+  - /connect-azure-sub
+  - /set-up-vs-subscription
+  - /redeem-coupon
+  - /add-sales-tax-certificate
+  - /manage-enterprise-invoice
+  - /india-one-time-payments
+contentType: how-tos
+---
+

content/billing/how-tos/set-up-payment/india-one-time-payments.md

@@ -4,6 +4,7 @@ intro: Customers in India who have been impacted by the Reserve Bank of India's
 redirect_from:
   - /early-access/billing/india-rbi-regulation
   - /billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india
+  - /billing/managing-the-plan-for-your-github-account/one-time-payments-for-customers-in-india
 versions:
   fpt: '*'
   ghec: '*'
@@ -12,6 +13,7 @@ topics:
   - Sponsors
   - Policy
 shortTitle: India one-time payments
+contentType: how-tos
 ---
 
 

content/billing/how-tos/set-up-payment/manage-enterprise-invoice.md

@@ -1,15 +1,17 @@
 ---
 title: Managing invoices for your enterprise
-shortTitle: Manage invoices
+shortTitle: Manage enterprise invoice
 intro: 'You can view, pay, or download a current invoice for your enterprise, and you can view your payment history.'
 redirect_from:
   - /billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
+  - /billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise
 versions:
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Enterprise
   - Licensing
+contentType: how-tos
 ---
 
 ## About invoices for your enterprise

content/billing/how-tos/set-up-payment/manage-payment-info.md

@@ -14,14 +14,16 @@ redirect_from:
   - /billing/managing-your-github-billing-settings/adding-information-to-your-receipts
   - /billing/managing-your-github-billing-settings/setting-your-billing-email
   - /billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts
-type: how_to
+  - /billing/managing-your-billing/managing-your-payment-and-billing-information
 topics:
+  - Billing
   - Enterprise
   - Team
   - Receipts
 permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
 product: '{% data reusables.billing.enhanced-billing-platform-product %}'
-shortTitle: Manage your payment information
+shortTitle: Manage payment info
+contentType: how-tos
 ---
 
 You can view your payment information and history, and update your billing contacts.

content/billing/how-tos/set-up-payment/redeem-coupon.md

@@ -11,15 +11,18 @@ redirect_from:
   - /billing/managing-your-github-billing-settings/redeeming-a-coupon
   - /billing/using-the-billing-platform/redeeming-a-coupon
   - /billing/using-the-new-billing-platform/redeeming-a-coupon
+  - /billing/managing-your-billing/redeeming-a-coupon
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Discounts
   - Fundamentals
   - Organizations
   - User account
+shortTitle: Redeem coupon
+contentType: how-tos
 ---
 {% data variables.product.company_short %} can't issue a refund if you pay for an account before applying a coupon. We also can't transfer a redeemed coupon or give you a new coupon if you apply it to the wrong account. Confirm that you're applying the coupon to the correct account before you redeem a coupon.
 

content/billing/how-tos/set-up-payment/set-up-vs-subscription.md

@@ -5,11 +5,15 @@ versions:
   ghec: '*'
 redirect_from:
   - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise
-type: how_to
+  - /billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise
+  - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
+  - /billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
 topics:
+  - Billing
   - Enterprise
   - Licensing
-shortTitle: Set up
+shortTitle: Set up VS subscription
+contentType: how-tos
 ---
 
 ## About setup of {% data variables.visual_studio.prodname_vss_ghe %}

content/billing/how-tos/troubleshooting/declined-card.md

@@ -9,13 +9,15 @@ redirect_from:
   - /billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge
   - /billing/using-the-billing-platform/troubleshooting-a-declined-credit-card-charge
   - /billing/using-the-new-billing-platform/troubleshooting-a-declined-credit-card-charge
+  - /billing/managing-your-billing/troubleshooting-a-declined-credit-card-charge
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Troubleshooting
-shortTitle: Declined credit card charge
+shortTitle: Declined card
+contentType: how-tos
 ---
 If your card is declined, we'll send you an email about why the payment was declined. You'll have a few days to resolve the problem before we try charging you again.
 

content/billing/how-tos/troubleshooting/enterprise-license-usage.md

@@ -0,0 +1,41 @@
+---
+title: Troubleshooting 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 %}.'
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+  - Enterprise
+  - Licensing
+shortTitle: Enterprise license usage
+redirect_from:
+  - /billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise
+contentType: how-tos
+---
+
+## About unexpected license usage
+
+If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise) and [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account).
+
+If you find errors, you can try troubleshooting steps.
+
+For privacy reasons, enterprise owners cannot directly access the details of user accounts unless you use {% data variables.product.prodname_emus %}.
+
+See [AUTOTITLE](/billing/reference/license-usage-calculation) for detailed information about how consumed licenses are calculated
+
+## Troubleshooting consumed licenses
+
+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 {% 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 {% 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 [AUTOTITLE](/billing/reference/license-usage-calculation).
+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 %}.

content/billing/how-tos/troubleshooting/index.md

@@ -0,0 +1,17 @@
+---
+title: Billing troubleshooting
+shortTitle: Troubleshooting
+intro: Learn how to debug billing problems and resolve them.
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /declined-card
+  - /locked-account
+  - /enterprise-license-usage
+contentType: how-tos
+---
+

content/billing/how-tos/troubleshooting/locked-account.md

@@ -14,16 +14,18 @@ redirect_from:
   - /billing/managing-your-github-billing-settings/unlocking-a-locked-account
   - /billing/using-the-billing-platform/unlocking-a-locked-account
   - /billing/using-the-new-billing-platform/unlocking-a-locked-account
+  - /billing/managing-your-billing/unlocking-a-locked-account
 versions:
   fpt: '*'
   ghec: '*'
-type: how_to
 topics:
+  - Billing
   - Accounts
   - Downgrades
   - Organizations
   - User account
 shortTitle: Locked account
+contentType: how-tos
 ---
 
 You can unlock and access your account by updating your account's payment method and resuming paid status. We do not ask you to pay for the time elapsed in locked mode.

content/billing/index.md

@@ -6,29 +6,32 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github
   - /categories/setting-up-and-managing-billing-and-payments-on-github
 introLinks:
-  overview: '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-billing-on-github{% elsif ghes%}/billing/managing-your-billing/about-billing-for-your-enterprise{% endif %}'
+  overview: '{% ifversion fpt or ghec %}/billing/get-started/how-billing-works {% elsif ghes %}/billing/concepts/license-consumption {% endif %}'
 featuredLinks:
   startHere:
-    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-new-billing-platform{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/managing-your-payment-and-billing-information{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/about-the-billing-cycle{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-your-billing/using-budgets-control-spending{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/get-started/introduction-to-billing{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/get-started/how-billing-works{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/how-tos/set-up-payment/manage-payment-info{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/tutorials/set-up-budgets{% endif %}'
+    - '{% ifversion ghes %}/billing/concepts/license-consumption{% endif %}'
+    - '{% ifversion ghes %}/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage{% endif %}'
+    - '{% ifversion ghes %}/billing/concepts/enterprise-billing/combined-enterprise-use{% endif %}'
   popular:
-    - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/about-billing-for-github-actions{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/about-billing-for-github-codespaces{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-your-products/viewing-your-product-usage{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
+    - '{% ifversion ghec %}/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/how-tos/products/view-product-use{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/concepts/product-billing/github-actions{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/concepts/product-billing/github-copilot{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/concepts/product-billing/github-codespaces{% endif %}'
+    - '{% ifversion ghes %}/billing/how-tos/manage-server-licenses/download-your-license{% endif %}'
+    - '{% ifversion ghes %}/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage{% endif %}'
+    - '{% ifversion ghes %}/billing/concepts/product-billing/github-advanced-security{% endif %}'
   guideCards:
-    - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
-    - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
-    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud{% endif %}'
+    - /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 %}'
+changelog:
+  label: account-management
 layout: product-landing
 versions:
   fpt: '*'
@@ -37,9 +40,10 @@ versions:
 topics:
   - Billing
 children:
-  - /managing-your-billing
-  - /managing-the-plan-for-your-github-account
-  - /managing-your-license-for-github-enterprise
-  - /managing-billing-for-your-products
-  - /setting-up-paid-accounts-for-procurement-companies
+  - /get-started
+  - /concepts
+  - /how-tos
+  - /reference
+  - /tutorials
+contentType: landing
 ---

content/billing/managing-billing-for-your-products/index.md

@@ -1,24 +0,0 @@
----
-title: Managing billing for your products
-shortTitle: Product billing
-intro: "Learn how to view usage and manage billing for your specific products."
-versions:
-  fpt: '*'
-  ghes: '*'
-  ghec: '*'
-topics:
-  - Billing
-children:
-  - /viewing-your-product-usage
-  - /about-billing-for-github-actions
-  - /about-billing-for-github-codespaces
-  - /about-billing-for-github-copilot
-  - /about-billing-for-github-packages
-  - /about-billing-for-github-models
-  - /managing-billing-for-github-advanced-security
-  - /managing-billing-for-git-large-file-storage
-  - /managing-billing-for-github-marketplace-apps
-  - /managing-billing-for-github-sponsors
-  - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
-
----

content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md

@@ -1,20 +0,0 @@
----
-title: Managing billing for Git Large File Storage
-shortTitle: Git Large File Storage
-intro: 'You can view usage for, upgrade, and downgrade {% data variables.large_files.product_name_long %}.'
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage
-  - /articles/managing-large-file-storage-and-bandwidth-for-your-personal-account
-  - /articles/managing-large-file-storage-and-bandwidth-for-your-organization
-  - /articles/managing-storage-and-bandwidth-usage
-  - /articles/managing-billing-for-git-large-file-storage
-  - /billing/managing-billing-for-git-large-file-storage/index
-  - /billing/managing-billing-for-git-large-file-storage
-versions:
-  fpt: '*'
-  ghec: '*'
-children:
-  - /about-billing-for-git-large-file-storage
-  - /upgrading-git-large-file-storage
-  - /downgrading-git-large-file-storage
----

content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md

@@ -1,22 +0,0 @@
----
-title: 'Managing billing for {% data variables.product.prodname_GHAS %} products'
-shortTitle: '{% data variables.product.prodname_GHAS %}'
-intro: 'You can view and manage the cost of {% data variables.product.prodname_GHAS %} products{% ifversion ghec %}, whether you have volume/subscription licenses or are using the new metered-billing license consumption model{% endif %}.'
-redirect_from:
-  - /billing/managing-licensing-for-github-advanced-security
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security
-  - /billing/managing-billing-for-github-advanced-security
-versions:
-  fpt: '*'
-  ghes: '*'
-  ghec: '*'
-children:
-  - /about-billing-for-github-advanced-security
-  - /setting-up-a-trial-of-github-advanced-security
-  - /signing-up-for-github-advanced-security
-  - /downloading-your-github-advanced-security-usage
-  - /migrating-from-ghas-to-cs-and-sp
-  - /viewing-committer-information-for-github-advanced-security
-  - /managing-your-github-advanced-security-licensing
-
----

content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/index.md

@@ -1,20 +0,0 @@
----
-title: Managing billing for GitHub Marketplace apps
-shortTitle: GitHub Marketplace apps
-intro: 'You can upgrade, downgrade, or cancel {% data variables.product.prodname_marketplace %} apps at any time.'
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps
-  - /articles/managing-your-personal-account-s-apps
-  - /articles/managing-your-organization-s-apps
-  - /articles/managing-billing-for-github-marketplace-apps
-  - /billing/managing-billing-for-github-marketplace-apps
-versions:
-  fpt: '*'
-  ghec: '*'
-children:
-  - /about-billing-for-github-marketplace
-  - /upgrading-the-billing-plan-for-a-github-marketplace-app
-  - /downgrading-the-billing-plan-for-a-github-marketplace-app
-  - /canceling-a-github-marketplace-app
----
-

content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/index.md

@@ -1,17 +0,0 @@
----
-title: Managing billing for GitHub Sponsors
-shortTitle: GitHub Sponsors
-intro: You can upgrade or downgrade the tier for each of your sponsorships.
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors
-  - /articles/managing-billing-for-github-sponsors
-  - /billing/managing-billing-for-github-sponsors
-versions:
-  fpt: '*'
-  ghec: '*'
-children:
-  - /about-billing-for-github-sponsors
-  - /upgrading-a-sponsorship
-  - /downgrading-a-sponsorship
-  - /setting-an-end-date-to-a-sponsorship
----

content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md

@@ -1,13 +0,0 @@
----
-title: Managing licenses for Visual Studio subscriptions with GitHub Enterprise
-shortTitle: Visual Studio & GitHub Enterprise
-intro: '{% data reusables.enterprise-accounts.vss-ghe-description %}'
-versions:
-  ghec: '*'
-redirect_from:
-  - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
-children:
-  - /about-visual-studio-subscriptions-with-github-enterprise
-  - /setting-up-visual-studio-subscriptions-with-github-enterprise
----
-

content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md

@@ -1,43 +0,0 @@
----
-title: About billing for plans
-intro: '{% data variables.product.company_short %} offers free and paid plans for every developer or team.'
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts
-  - /articles/what-is-the-total-cost-of-using-an-organization-account
-  - /articles/what-are-the-costs-of-using-an-organization-account
-  - /articles/what-plan-should-i-choose
-  - /articles/do-you-have-custom-plans
-  - /articles/user-account-billing-plans
-  - /articles/organization-billing-plans
-  - /articles/github-s-billing-plans
-  - /articles/about-billing-for-github-accounts
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-billing-for-github-accounts
-  - /billing/managing-billing-for-your-github-account/about-billing-for-github-accounts
-versions:
-  fpt: '*'
-  ghec: '*'
-type: overview
-topics:
-  - Accounts
-  - Discounts
-  - Fundamentals
-  - Upgrades
-shortTitle: About billing for plans
----
-
-{% data reusables.billing.about-billing %} This article discusses the "plan" component of your bill, specifically. For more information about the other components, see [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github).
-
-For more information about the plans available for your account, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans).
-
-You can see pricing and a full list of features for each plan at {% data variables.product.pricing_url %}. {% data variables.product.company_short %} does not offer custom products or plans.
-
-You can choose monthly or yearly billing, and you can upgrade or downgrade your plan at any time. For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account).
-
-You can purchase other subscriptions and usage-based billing with your existing payment information. For more information, see [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github).
-
-{% data reusables.accounts.accounts-billed-separately %}
-
-{% data reusables.user-settings.context_switcher %}
-
-> [!TIP]
-> {% data variables.product.prodname_dotcom %} has programs for verified students and academic faculty, which include academic discounts. For more information, visit [{% data variables.product.prodname_education %}](https://education.github.com/).

content/billing/managing-the-plan-for-your-github-account/index.md

@@ -1,35 +0,0 @@
----
-title: Managing the plan for your GitHub account
-shortTitle: Manage your plan
-intro: "{% ifversion fpt %}You can upgrade, downgrade, and view pending changes to your account's plan at any time.{% elsif ghec or ghes %}You can manage billing for {% data variables.product.prodname_enterprise %} from your enterprise account on {% data variables.product.prodname_dotcom %}.{% endif %}"
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account
-  - /categories/97/articles
-  - /categories/paying-for-user-accounts
-  - /articles/paying-for-your-github-user-account
-  - /articles/managing-billing-on-github
-  - /articles/changing-your-personal-account-s-billing-plan
-  - /categories/billing
-  - /categories/3/articles
-  - /articles/managing-your-organization-s-paid-seats
-  - /articles/managing-billing-for-your-github-account
-  - /billing/managing-billing-for-your-github-account
-versions:
-  fpt: '*'
-  ghec: '*'
-  ghes: '*'
-children:
-  - /about-billing-for-plans
-  - /about-per-user-pricing
-  - /viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /upgrading-your-accounts-plan
-  - /viewing-and-managing-pending-changes-to-your-plan
-  - /downgrading-your-accounts-plan
-  - /managing-invoices-for-your-enterprise
-  - /connecting-an-azure-subscription
-  - /how-does-upgrading-or-downgrading-affect-the-billing-process
-  - /one-time-payments-for-customers-in-india
-  - /discounted-plans-for-github-accounts
----
-
-{% ifversion fpt %}{% data reusables.billing.enhanced-billing-platform-personal-accounts %}{% endif %}

content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md

@@ -1,60 +0,0 @@
----
-title: Viewing the subscription and usage for your enterprise account
-intro: 'You can view the current {% ifversion ghec %}subscription, {% endif %}license usage{% ifversion ghec %}, invoices, payment history, and other billing information{% endif %} for {% ifversion ghec %}your enterprise account{% elsif ghes %}{% data variables.location.product_location_enterprise %}{% endif %}.'
-permissions: 'Enterprise owners {% ifversion ghec %}and billing managers {% endif %}can access and manage all billing settings for enterprise accounts.'
-redirect_from:
-  - /billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /articles/viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /github/setting-up-and-managing-your-enterprise/viewing-the-subscription-and-usage-for-your-enterprise-account
-versions:
-  ghec: '*'
-  ghes: '*'
-topics:
-  - Enterprise
-shortTitle: View subscription & usage
----
-
-{% ifversion enhanced-billing-platform %}
-
-{% data reusables.billing.enhanced-billing-platform-licenses %}
-
-{% endif %}
-
-## About billing for enterprise accounts
-
-You can view an overview of {% ifversion ghec %}your subscription and paid{% elsif ghes %}the license{% endif %} usage for {% ifversion ghec %}your{% elsif ghes %}the{% endif %} enterprise account on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}.{% ifversion ghec %} {% data reusables.enterprise.create-an-enterprise-account %} For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-an-enterprise-account).{% endif %}
-
-For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% data variables.product.prodname_enterprise %}, you may have usage for {% data variables.product.prodname_AS %}{% ifversion ghec %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see [Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise){% ifversion ghec %}.{% elsif ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
-
-{% ifversion ghec %}
-
-In addition to enterprise owners, billing managers can view the subscription and usage for your enterprise account. For more information, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#billing-manager) and [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise).
-
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription).
-
-{% endif %}
-
-{% ifversion ghes %}
-
-If you want to view an overview of your subscription and usage for {% data variables.product.prodname_enterprise %} and any related services on {% data variables.product.prodname_dotcom_the_website %}, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account) in the {% data variables.product.prodname_ghe_cloud %} documentation.
-
-{% endif %}
-
-{% data reusables.billing.usage-based-billing %}
-
-## Viewing the subscription and usage for your enterprise account
-
-You can view the subscription and usage for your enterprise and download a file with license details.
-
-{% data reusables.billing.license-statuses %}
-
-{% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.license-tab %}
-1. Under "User licenses", view your total licenses, number of consumed licenses, and your subscription expiration date.
-1. Optionally, to view details for license usage or download a {% ifversion ghec %}CSV{% elsif ghes %}JSON{% endif %} file with license details{% ifversion ghec %}, to the right of "User Licenses"{% endif %}, click **View {% ifversion ghec %}details{% elsif ghes %}users{% endif %}** or {% ifversion ghec %}**{% octicon "download" aria-hidden="true" aria-label="download" %} CSV report**{% elsif ghes %}**Export license usage**{% endif %}.
-{%- ifversion ghec %}
-1. Optionally, to view usage details for other features, in the left sidebar, click **Billing**.
-{% endif %}

content/billing/managing-your-billing/about-billing-for-your-enterprise.md

@@ -1,66 +0,0 @@
----
-title: About billing for your enterprise
-intro: 'You can view billing information for your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.'
-redirect_from:
-  - /admin/overview/managing-billing-for-your-enterprise
-  - /enterprise/admin/installation/managing-billing-for-github-enterprise
-  - /enterprise/admin/overview/managing-billing-for-github-enterprise
-  - /admin/overview/managing-billing-for-github-enterprise
-  - /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
-  - /billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
-  - /early-access/github/automatically-renew-the-billing-plan-for-your-enterprise
-  - /billing/using-the-billing-platform/about-billing-for-your-enterprise
-  - /billing/using-the-new-billing-platform/about-billing-for-your-enterprise
-versions:
-  ghec: '*'
-  ghes: '*'
-type: overview
-topics:
-  - Enterprise
-shortTitle: Billing for your enterprise
----
-
-## About billing for your enterprise
-
-{% ifversion ghec %}
-
-When you use an enterprise account on {% data variables.product.prodname_dotcom %}, the enterprise account is the central point for all billing within your enterprise, including the organizations that your enterprise owns.
-
-If you use {% data variables.product.prodname_ghe_cloud %} with an individual organization and do not yet have an enterprise account, you create an enterprise account and add your organization. For more information, see [AUTOTITLE](/admin/managing-your-enterprise-account/creating-an-enterprise-account).
-
-{% data reusables.billing.usage-based-billing %}
-
-{% elsif ghes %}
-
-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 %}
-
-{% ifversion ghec %}For {% data variables.product.prodname_ghe_cloud %} customers with an enterprise account, {% data variables.product.company_short %} bills through your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. For invoiced customers, each{% elsif ghes %}For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each{% endif %} invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information about {% ifversion ghes %}licensing, usage, and invoices{% elsif ghec %}usage and invoices{% endif %}, see the following{% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
-
-{%- ifversion ghes %}
-* [AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
-{%- endif %}
-* [Viewing the subscription and usage for your enterprise account]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)
-* [Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise)
-
-Administrators for your enterprise account on {% data variables.product.prodname_dotcom_the_website %} can access and manage billing for the enterprise. For more information, see [Roles in an enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise){% ifversion ghec %}.{% elsif ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
-
-{% ifversion ghec %}
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} See [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription).
-{% endif %}
-
-{% ifversion ghes %}
-{% data reusables.billing.ghes-with-no-enterprise-account %}
-{% endif %}
-
-## Accessing the billing platform for your enterprise
-
-To access the billing platform for your enterprise:
-
-{% data reusables.enterprise-accounts.access-enterprise %}
-1. {% ifversion horizontal-nav %}At the top of the page,{% else %}In the enterprise account sidebar,{% endif %} click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**.
-
-## Further reading
-
-* [AUTOTITLE](/admin/overview/about-enterprise-accounts)

content/billing/managing-your-billing/about-billing-on-github.md

@@ -1,153 +0,0 @@
----
-title: About billing on GitHub
-intro: "GitHub bills you separately for each account you own. Your bill combines subscription costs and usage-based billing."
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
-  - /articles/about-billing-on-github
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/about-billing-on-github
-  - /billing/managing-your-github-billing-settings/about-billing-on-github
-  - /billing/using-the-billing-platform/about-billing-on-github
-  - /billing/using-the-new-billing-platform/about-billing-on-github
-versions:
-  fpt: '*'
-  ghec: '*'
-type: overview
-topics:
-  - Fundamentals
----
-
-## About billing on {% data variables.product.prodname_dotcom %}
-
-{% data variables.product.company_short %} bills you separately for each account you own (personal, organization, or enterprise). Your bill combines:
-
-* **Subscriptions**: Fixed monthly costs for account plans (for example: {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}) and paid products (for example: {% data variables.product.prodname_copilot %})
-* **Usage-based billing**: Variable costs that depend on how much you use certain features (for example: {% data variables.product.prodname_actions %})
-
-Each account type has its own billing settings that you manage separately.
-
-* **For you personal account**: Your bill includes subscriptions for your personal account and charges for any usage that exceeds the included amounts.
-
-* **For your organization**: Your organization's bill is separate from your personal account bill. It includes subscriptions for your organization and charges for any usage that exceeds the included amounts.
-{% ifversion ghec %}
-* **For your enterprise**: Enterprise accounts are billed separately from personal accounts and standalone organizations. The bill includes the subscription to {% data variables.product.prodname_enterprise %} and the costs of all the organizations it owns.
-{% endif %}
-
-For more information about account types, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts).
-
-{% data reusables.billing.us-sales-tax %}
-
-## Included amounts by plan
-
-The table below shows what's included with each plan. When you exceed these amounts, you'll be charged for additional usage unless you've set a budget with the setting "Stop usage when budget limit is reached" enabled.
-
-<table>
-  <tr>
-    <th><b>Product</b></th>
-    <th><b>Usage type</b></th>
-    <th><b>{% data variables.product.prodname_free_user %}</b></th>
-    <th><b>{% data variables.product.prodname_pro %}</b></th>
-    <th><b>{% data variables.product.prodname_free_team %} for organizations</b></th>
-    <th><b>{% data variables.product.prodname_team %}</b></th>
-    <th><b>{% data variables.product.prodname_ghe_cloud %}</b></th>
-  </tr>
-  <tr>
-    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_actions %}</b></th>
-    <th><b>Storage</b></th>
-    <td>500 MB</th>
-    <td>1 GB</th>
-    <td>500 MB</th>
-    <td>2 GB</th>
-    <td>50 GB</th>
-  </tr>
-  <tr>
-    <th><b>Minutes (per month)</b></th>
-    <td>2,000</th>
-    <td>3,000</th>
-    <td>2,000</th>
-    <td>3,000</th>
-    <td>50,000</th>
-  </tr>
-   <tr>
-    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_github_codespaces %}</b></th>
-    <th><b>Storage (per month)</b></th>
-    <td>15 GB</th>
-    <td>20 GB</th>
-    <td>None</th>
-    <td>None</th>
-    <td>None</th>
-  </tr>
-  <tr>
-    <th><b>Core hours (per month)</b></th>
-    <td>120</th>
-    <td>180</th>
-    <td>None</th>
-    <td>None</th>
-    <td>None</th>
-  </tr>
-  <tr>
-    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_registry %}</b></th>
-    <th><b>Storage</b></th>
-    <td>500 MB</th>
-    <td>2 GB</th>
-    <td>500 MB</th>
-    <td>2 GB</th>
-    <td>50 GB</th>
-  </tr>
-  <tr>
-    <th><b>Data transfer (per month)</b></th>
-    <td>1 GB</th>
-    <td>10 GB</th>
-    <td>1 GB</th>
-    <td>10 GB</th>
-    <td>100 GB</th>
-  </tr>
-  <tr>
-    <th rowspan="2" scope="rowgroup"><b>{% data variables.large_files.product_name_long %}</b></th>
-    <th><b>Storage (per month)</b></th>
-    <td>10 GB</th>
-    <td>10 GB</th>
-    <td>10 GB</th>
-    <td>250 GB</th>
-    <td>250 GB</th>
-  </tr>
-  <tr>
-    <th><b>Bandwidth (per month)</b></th>
-    <td>10 GB</th>
-    <td>10 GB</th>
-    <td>10 GB</th>
-    <td>250 GB</th>
-    <td>250 GB</th>
-  </tr>
-</table>
-
-> [!TIP]
-> For information about included requests for {% data variables.product.prodname_copilot %} plans, see [AUTOTITLE](/copilot/about-github-copilot/plans-for-github-copilot).
-
-## Managing billing settings
-
-You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account. All subscriptions and usage-based billing associated with an account shares a billing date, payment method, and receipt.
-
-{% ifversion fpt %}{% data reusables.dotcom_billing.payment-methods %} {% data reusables.dotcom_billing.same-payment-method %}
-
-For qualifying usage-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
-
-{% ifversion ghec %}
-
-{% data reusables.billing.usage-based-billing %}
-
-Payments can be made via credit card, PayPal, or Azure subscription. When you update the payment method for your account's plan, your new payment method is automatically added to your other subscriptions and usage-based billing.
-
-{% endif %}
-
-See [AUTOTITLE](/billing/managing-your-billing/managing-your-payment-and-billing-information).
-
-## Switching between settings for your different accounts
-
-If you're an organization or enterprise owner, you can switch between settings for your different accounts using the context switcher in your settings.
-
-{% data reusables.user-settings.access_settings %}
-1. At the top of the page, to the right of your name, click **Switch settings context**.
-
-   ![Screenshot of the "Public profile" settings for The Octocat. Next to "Your personal profile," a "Switch settings context" link is outlined in orange.](/assets/images/help/settings/context-switcher-button.png)
-1. Start typing the name of the account you want to switch to, then click the name of the account.
-1. In the left sidebar, click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing and plans**.

content/billing/managing-your-billing/about-the-new-billing-platform.md

@@ -1,96 +0,0 @@
----
-title: About the new billing platform
-intro: Learn about the billing platform's key functionalities, and how it can help you manage your spending more effectively.
-versions:
-  feature: enhanced-billing-platform
-redirect_from:
-  - /billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises
-  - /billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises
-  - /billing/using-the-new-billing-platform/about-the-new-billing-platform
-  - /billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform
-type: overview
-topics:
-  - Enterprise
-  - Team
-product: '{% data reusables.billing.enhanced-billing-platform-product %}'
-shortTitle: About the new billing platform
----
-
-The new billing platform provides better spending control and detailed usage insights with granular controls.
-
-## Available products
-
-The products shown in the new billing platform are determined by your {% data variables.product.github %} plan and subscriptions.
-
-{% ifversion fpt %}
-
-### Personal accounts on {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}
-
-* {% data variables.product.prodname_actions %}
-* {% data variables.product.prodname_github_codespaces %}
-* {% data variables.product.prodname_copilot %}
-* {% data variables.product.prodname_registry %}
-* {% data variables.large_files.product_name_long %}
-* {% data variables.product.prodname_marketplace %}
-* {% data variables.product.prodname_github_models %}
-* {% data variables.product.prodname_sponsors %}
-
-{% endif %}
-
-### Organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_free_team %}
-
-* {% data variables.product.prodname_actions %}
-* {% data variables.product.prodname_GH_cs_and_sp %} (only available with {% data variables.product.prodname_team %})
-* {% data variables.product.prodname_github_codespaces %}
-* {% data variables.product.prodname_copilot %}
-* {% data variables.product.prodname_github_models %}
-* {% data variables.product.prodname_registry %}
-* {% data variables.large_files.product_name_long %}
-
-{% ifversion ghec %}
-
-### {% data variables.product.prodname_ghe_cloud %}
-
-* {% data variables.product.prodname_actions %}
-* {% data variables.product.prodname_GH_cs_and_sp %}
-* {% data variables.product.prodname_github_codespaces %}
-* {% data variables.product.prodname_copilot %}
-* {% data variables.product.prodname_enterprise %}
-* {% data variables.product.prodname_github_models %}
-* {% data variables.product.prodname_registry %}
-* {% data variables.large_files.product_name_long %}
-
-{% data reusables.billing.actions-usage-delay %}
-
-{% endif %}
-
-## Key functionalities
-
-With the new billing platform, you can:
-
-* **Estimate spending:** Understand where your (annual, monthly, etc.) spending is trending based on the usage across {% ifversion ghec %}cost centers and {% endif %}budgets.
-* **Gather insights and data:** Generate usage reports to share with your team or stakeholders, and know if you're on track with your budget.
-{%- ifversion ghec %}
-* **Charge business units:** Improve accountability by creating and assigning organizations, repositories, and members to cost centers.
-{%- endif %}
-* **Prevent overspending:** Use budgets and alerts to track and control your spending.
-* **Observe and understand spending:** Understand how your spending changes over time and across which products.
-
-## How do I access the new billing platform?
-
-{% ifversion fpt %}
-
-1. In the upper-right corner of any page on {% data variables.product.prodname_dotcom %}, click your profile picture.
-
-   * For **personal accounts**, click **Settings**.
-   * For **organizations**, click **Your organizations**, then next to the organization, click **Settings**.
-1. In the left sidebar, click **Billing & Licensing**.
-
-{% elsif ghec %}
-
-{% data reusables.enterprise-accounts.access-enterprise %}
-1. {% ifversion horizontal-nav %}At the top of the page,{% else %}In the enterprise account sidebar,{% endif %} click **{% octicon "credit-card" aria-hidden="true" aria-label="credit-card" %} Billing & Licensing**.
-
-{% endif %}
-
-If you have questions, please contact {% data variables.contact.contact_support_page %}.

content/billing/managing-your-billing/index.md

@@ -1,32 +0,0 @@
----
-title: Managing your billing
-shortTitle: Manage your billing
-intro: 'The new, enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.'
-redirect_from:
-  - /early-access/billing/billing-private-beta
-  - /billing/using-the-enhanced-billing-platform-for-enterprises
-  - /billing/using-the-billing-platform
-  - /billing/using-the-new-billing-platform
-product: '{% data reusables.billing.enhanced-billing-platform-product %}'
-versions:
-  feature: enhanced-billing-platform
-children:
-  - /about-billing-on-github
-  - /about-billing-for-your-enterprise
-  - /about-the-new-billing-platform
-  - /about-the-billing-cycle
-  - /about-usage-based-billing-for-licenses
-  - /adding-licenses-to-an-organization
-  - /roles-for-the-new-billing-platform
-  - /estimating-spending
-  - /about-usage-reports
-  - /gathering-insights-on-your-spending
-  - /using-budgets-control-spending
-  - /charging-business-units
-  - /managing-your-payment-and-billing-information
-  - /automating-usage-reporting
-  - /adding-a-sales-tax-certificate
-  - /redeeming-a-coupon
-  - /troubleshooting-a-declined-credit-card-charge
-  - /unlocking-a-locked-account
----

content/billing/managing-your-license-for-github-enterprise/index.md

@@ -1,28 +0,0 @@
----
-title: Managing your license for GitHub Enterprise
-shortTitle: GitHub Enterprise license
-intro: '{% data variables.product.prodname_enterprise %} includes both cloud and self-hosted deployment options. If you host a {% data variables.product.prodname_ghe_server %} instance, you must unlock the instance with a license file. You can view, manage, and update the license file.'
-redirect_from:
-  - /free-pro-team@latest/billing/managing-your-license-for-github-enterprise
-  - /enterprise/admin/installation/managing-your-github-enterprise-license
-  - /enterprise/admin/categories/licenses
-  - /enterprise/admin/articles/license-files
-  - /enterprise/admin/installation/about-license-files
-  - /enterprise/admin/articles/downloading-your-license
-  - /enterprise/admin/installation/downloading-your-license
-  - /enterprise/admin/articles/upgrading-your-license
-  - /enterprise/admin/installation/updating-your-license
-  - /enterprise/admin/installation/managing-your-github-enterprise-server-license
-  - /enterprise/admin/overview/managing-your-github-enterprise-license
-versions:
-  ghec: '*'
-  ghes: '*'
-children:
-  - /about-licenses-for-github-enterprise
-  - /downloading-your-license-for-github-enterprise
-  - /uploading-a-new-license-to-github-enterprise-server
-  - /viewing-license-usage-for-github-enterprise
-  - /syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud
-  - /troubleshooting-license-usage-for-github-enterprise
----
-

content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md

@@ -1,81 +0,0 @@
----
-title: Viewing license usage for GitHub Enterprise
-intro: 'You can view license usage for your enterprise on {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}.'
-permissions: 'Enterprise owners{% ifversion ghec %} and billing managers{% endif %}'
-versions:
-  ghec: '*'
-  ghes: '*'
-type: how_to
-topics:
-  - Enterprise
-  - Licensing
-shortTitle: View license usage
----
-
-{% ifversion enhanced-billing-platform %}
-
-{% data reusables.billing.enhanced-billing-platform-licenses %}
-
-{% endif %}
-
-## About license usage for {% data variables.product.prodname_enterprise %}
-
-You can view license usage for {% data variables.product.prodname_enterprise %} on {% data variables.product.github %}.
-
-If you use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %} and sync license usage between the products, you can view license usage for both on {% data variables.product.prodname_ghe_cloud %}. For more information about license sync, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
-
-{% ifversion ghes %}
-
-For more information about viewing license usage on {% data variables.product.prodname_ghe_cloud %} and identifying when the last license sync occurred, see [AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise) in the {% data variables.product.prodname_ghe_cloud %} documentation.
-
-{% endif %}
-
-You can also use the REST API to return consumed licenses data and the status of the license sync job. See [AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/license).
-
-To learn more about the license data associated with your enterprise account and how the number of consumed user licenses are calculated, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise).
-
-{% ifversion enterprise-member-csv %}
-
-The licensing report includes all users who currently hold a {% data variables.product.prodname_enterprise %} (GHE) license or will be billed in this month's billing cycle. This report is ideal for tracking current and billable license usage, ensuring accurate license counts, and identifying users consuming GHE licenses. For a full list of all members associated with the enterprise, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise).
-
-{% endif %}
-
-## Viewing license usage on {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}
-
-{% ifversion ghec %}
-
-You can view the license usage for your enterprise and download a file with license details. If you're not seeing expected license counts in this report, it's possible that the subscriber’s assigned {% data variables.product.prodname_vs %} subscription email address and {% data variables.product.prodname_dotcom_the_website %} email address aren't exactly the same. For further information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise).
-
-{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.license-tab %}
-1. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.
-
-   * If you purchased {% data variables.product.prodname_AS %}, you can review your total license usage. To learn about the information displayed, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage).
-
-1. To download a CSV report of the license usage, click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} to the right of the usage you want to download, then click **{% octicon "download" aria-hidden="true" aria-label="download" %} CSV report**.
-
-{% elsif ghes %}
-
-{% data reusables.enterprise-accounts.access-enterprise %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.license-tab %}
-1. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.
-
-   If you have purchased {% data variables.product.prodname_AS %}, you can review your total licenses used as well as a per-organization breakdown of active committers. See [AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise).
-
-{% endif %}
-
-{% ifversion ghec %}
-
-## Viewing the last license sync date
-
-{% data reusables.enterprise-accounts.access-enterprise-on-dotcom %}
-{% data reusables.enterprise-accounts.settings-tab %}
-{% data reusables.enterprise-accounts.license-tab %}
-1. To identify when the last license sync occurred, under "Enterprise Server instances", look for timestamps next to usage uploaded or synced events.
-   * "Server usage uploaded" indicates license usage between environments was manually updated when a {% data variables.product.prodname_ghe_server %} license file was uploaded.
-   * "{% data variables.product.prodname_github_connect %} server usage synced" indicates license usage between environments was automatically updated.
-   * "{% data variables.product.prodname_github_connect %} server usage never synced" indicates that {% data variables.product.prodname_github_connect %} is configured, but license usage between environments has never updated successfully.
-
-{% endif %}

content/billing/reference/billing-roles.md

@@ -1,16 +1,19 @@
 ---
 title: Roles for the new billing platform
-intro: 'Learn about the different roles that can use the new billing platform.'
+shortTitle: Billing roles
+intro: Learn about the different roles that can use the new billing platform.
 versions:
   feature: enhanced-billing-platform
 redirect_from:
   - /billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform
   - /billing/using-the-new-billing-platform/roles-for-the-new-billing-platform
-type: reference
+  - /billing/managing-your-billing/roles-for-the-new-billing-platform
 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 %}

content/billing/reference/index.md

@@ -0,0 +1,18 @@
+---
+title: Reference for billing
+shortTitle: Reference
+intro: Find information to support your use of billing.
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '*'
+topics:
+  - Billing
+children:
+  - /product-usage-included
+  - /usage-reports
+  - /billing-roles
+  - /license-usage-calculation
+contentType: reference
+---
+

content/billing/reference/license-usage-calculation.md

@@ -1,25 +1,18 @@
 ---
-title: Troubleshooting license usage for GitHub Enterprise
+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 %}.'
 versions:
   ghec: '*'
   ghes: '*'
-type: how_to
 topics:
+  - Billing
   - Enterprise
   - Licensing
-shortTitle: Troubleshoot license usage
+shortTitle: License usage calculation
+contentType: reference
 ---
 
-## About unexpected license usage
-
-If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. For more information, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise) and [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account).
-
-If you find errors, you can try troubleshooting steps.
-
-For privacy reasons, enterprise owners cannot directly access the details of user accounts unless you use {% data variables.product.prodname_emus %}.
-
 ## About the calculation of consumed licenses
 
 > [!NOTE]
@@ -42,8 +35,10 @@ First, we check the primary email address of each user on {% data variables.prod
 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).
+
 {% endif %}
 
 ## Fields in the consumed license files
@@ -94,16 +89,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 consumed licenses
+## Troubleshooting
 
-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 {% 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 {% 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 %}.
+For troubleshooting steps, see [AUTOTITLE](/billing/how-tos/troubleshooting/enterprise-license-usage).

content/billing/reference/product-usage-included.md

@@ -0,0 +1,100 @@
+---
+title: Product usage included with each plan
+shortTitle: Product usage included
+intro: Check the size of the allowance for usage-based products included in each GitHub plan.
+versions:
+  fpt: '*'
+  ghec: '*'
+topics:
+  - Billing
+  - Actions
+  - Codespaces
+  - Packages
+  - LFS
+contentType: reference
+---
+
+The table below shows the usage available in each plan. When you exceed these amounts, you'll be charged for additional usage unless you've set a budget with the setting "Stop usage when budget limit is reached" enabled. For more information, see [AUTOTITLE](/billing/tutorials/set-up-budgets).
+
+<table>
+  <tr>
+    <th><b>Product</b></th>
+    <th><b>Usage type</b></th>
+    <th><b>{% data variables.product.prodname_free_user %}</b></th>
+    <th><b>{% data variables.product.prodname_pro %}</b></th>
+    <th><b>{% data variables.product.prodname_free_team %} for organizations</b></th>
+    <th><b>{% data variables.product.prodname_team %}</b></th>
+    <th><b>{% data variables.product.prodname_ghe_cloud %}</b></th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_actions %}</b></th>
+    <th><b>Storage</b></th>
+    <td>500 MB</td>
+    <td>1 GB</td>
+    <td>500 MB</td>
+    <td>2 GB</td>
+    <td>50 GB</td>
+  </tr>
+  <tr>
+    <th><b>Minutes (per month)</b></th>
+    <td>2,000</td>
+    <td>3,000</td>
+    <td>2,000</td>
+    <td>3,000</td>
+    <td>50,000</td>
+  </tr>
+   <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_github_codespaces %}</b></th>
+    <th><b>Storage (per month)</b></th>
+    <td>15 GB</td>
+    <td>20 GB</td>
+    <td>None</td>
+    <td>None</td>
+    <td>None</td>
+  </tr>
+  <tr>
+    <th><b>Core hours (per month)</b></th>
+    <td>120</td>
+    <td>180</td>
+    <td>None</td>
+    <td>None</td>
+    <td>None</td>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_registry %}</b></th>
+    <th><b>Storage</b></th>
+    <td>500 MB</td>
+    <td>2 GB</td>
+    <td>500 MB</td>
+    <td>2 GB</td>
+    <td>50 GB</td>
+  </tr>
+  <tr>
+    <th><b>Data transfer (per month)</b></th>
+    <td>1 GB</td>
+    <td>10 GB</td>
+    <td>1 GB</td>
+    <td>10 GB</td>
+    <td>100 GB</td>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.large_files.product_name_long %}</b></th>
+    <th><b>Storage (per month)</b></th>
+    <td>10 GB</td>
+    <td>10 GB</td>
+    <td>10 GB</td>
+    <td>250 GB</td>
+    <td>250 GB</td>
+  </tr>
+  <tr>
+    <th><b>Bandwidth (per month)</b></th>
+    <td>10 GB</td>
+    <td>10 GB</td>
+    <td>10 GB</td>
+    <td>250 GB</td>
+    <td>250 GB</td>
+  </tr>
+</table>
+
+> [!TIP]
+> For information about included requests for {% data variables.product.prodname_copilot %} plans, see [AUTOTITLE](/copilot/about-github-copilot/plans-for-github-copilot).

content/billing/reference/usage-reports.md

@@ -1,14 +1,19 @@
 ---
-title: About usage reports
+title: Usage reports reference
+shortTitle: Usage reports
 intro: 'Learn how to request and understand a report that shows detailed {% data variables.product.github %} usage and billing information for your account.'
+allowTitleToDifferFromFilename: true
 versions:
   feature: enhanced-billing-platform
-type: how_to
 topics:
+  - Billing
   - Enterprise
   - Team
 permissions: '{% data reusables.permissions.enhanced-billing-platform %}'
 product: '{% data reusables.billing.enhanced-billing-platform-product %}'
+redirect_from:
+  - /billing/managing-your-billing/about-usage-reports
+contentType: reference
 ---
 
 The usage report shows detailed information about your account’s {% data variables.product.github %} usage, including how much of each SKU was used and the resulting billable amount.  

content/billing/setting-up-paid-accounts-for-procurement-companies/index.md

@@ -1,12 +0,0 @@
----
-title: Setting up paid accounts for procurement companies
-shortTitle: Paid accounts for procurement companies
-intro: 'If you pay for {% data variables.product.github %} on behalf of a client, you can configure their organization or enterprise account and payment settings to optimize convenience and security.'
-versions:
-  fpt: '*'
-  ghec: '*'
-children:
-  - /setting-up-paid-organizations-for-procurement-companies
-  - /setting-up-enterprise-accounts-for-procurement-companies
----
-

content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/about-enterprise-accounts-for-procurement-companies.md

@@ -1,34 +0,0 @@
----
-title: About enterprise accounts for procurement companies
-intro: 'You can create an enterprise account for your client, make a payment on their behalf, then pass ownership of the enterprise account to your client.'
-versions:
-  fpt: '*'
-  ghec: '*'
-type: overview
-topics:
-  - Enterprise
-shortTitle: About enterprise accounts
----
-
-## About enterprise accounts
-
-An enterprise account allows your client to manage and enforce policies for multiple organizations. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-enterprise-accounts).
-
-To access an enterprise account, each member must sign into their own personal account. Enterprise members can have different roles, including owner and billing manager:
-
-* Owners have complete administrative access to an enterprise.
-* Billing managers can only manage billing settings, and cannot access enterprise resources.
-
-For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise).
-
-Alternatively, you can set up a single organization for your client. For more information, see [AUTOTITLE](/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies).
-
-## Payments and pricing for enterprise accounts
-
-We don't provide quotes for pricing. You can see our published pricing on our [pricing page](https://github.com/pricing). We do not provide discounts for procurement companies or for renewal orders.
-
-We accept payment in US dollars, although end users may be located anywhere in the world.
-
-We accept payment by credit card and PayPal. We don't accept payment by purchase order or invoice.
-
-For easier and more efficient purchasing, we recommend that procurement companies set up yearly billing for their clients' enterprise accounts.

content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/index.md

@@ -1,13 +0,0 @@
----
-title: Setting up enterprise accounts for procurement companies
-shortTitle: Enterprise accounts
-intro: 'If you pay for {% data variables.product.github %} on behalf of a client, you can configure their enterprise account and payment settings to optimize convenience and security.'
-versions:
-  fpt: '*'
-  ghec: '*'
-children:
-  - /about-enterprise-accounts-for-procurement-companies
-  - /creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client
-  - /renewing-your-clients-enterprise-account
-  - /creating-an-enterprise-account-as-a-microsoft-csp-partner
----

content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies.md

@@ -1,38 +0,0 @@
----
-title: About organizations for procurement companies
-intro: 'Businesses use organizations to collaborate on shared projects with multiple owners and administrators. You can create an organization for your client, make a payment on their behalf, then pass ownership of the organization to your client.'
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/about-organizations-for-procurement-companies
-  - /articles/about-organizations-for-resellers
-  - /articles/about-organizations-for-procurement-companies
-  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
-  - /billing/setting-up-paid-organizations-for-procurement-companies/about-organizations-for-procurement-companies
-versions:
-  fpt: '*'
-  ghec: '*'
-type: overview
-topics:
-  - Organizations
-shortTitle: About organizations
----
-
-## About organizations
-
-To access an organization, each member must sign into their own personal account.
-
-Organization members can have different roles, such as _owner_ or _billing manager_:
-
-* **Owners** have complete administrative access to an organization and its contents.
-* **Billing managers** can manage billing settings, and cannot access organization contents. Billing managers are not shown in the list of organization members.
-
-You can also set up an enterprise account for your client. For more information, see [AUTOTITLE](/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies).
-
-## Payments and pricing for organizations
-
-We don't provide quotes for organization pricing. You can see our published pricing for [organizations](https://github.com/pricing) and [Git Large File Storage](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage). We do not provide discounts for procurement companies or for renewal orders.
-
-We accept payment in US dollars, although end users may be located anywhere in the world.
-
-We accept payment by credit card and PayPal. We don't accept payment by purchase order or invoice.
-
-For easier and more efficient purchasing, we recommend that procurement companies set up yearly billing for their clients' organizations.

content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/index.md

@@ -1,20 +0,0 @@
----
-title: Setting up paid organizations for procurement companies
-shortTitle: Organizations
-intro: 'If you pay for {% data variables.product.github %} on behalf of a client, you can configure their organization and payment settings to optimize convenience and security.'
-redirect_from:
-  - /github/setting-up-and-managing-billing-and-payments-on-github/setting-up-paid-organizations-for-procurement-companies
-  - /articles/setting-up-and-paying-for-organizations-for-resellers
-  - /articles/setting-up-and-paying-for-organizations-for-procurement-companies
-  - /articles/setting-up-paid-organizations-for-procurement-companies
-  - /billing/setting-up-paid-organizations-for-procurement-companies
-versions:
-  fpt: '*'
-  ghec: '*'
-children:
-  - /about-organizations-for-procurement-companies
-  - /creating-and-paying-for-an-organization-on-behalf-of-a-client
-  - /upgrading-or-downgrading-your-clients-paid-organization
-  - /renewing-your-clients-paid-organization
----
-

content/billing/tutorials/automate-usage-reporting.md

@@ -1,19 +1,19 @@
 ---
 title: Automating usage reporting with the REST API
 intro: Learn how to automate reporting on your use of paid features using the REST API.
-allowTitleToDifferFromFilename: true
 shortTitle: Automate usage reporting
 redirect_from:
   - /billing/using-the-new-billing-platform/automating-usage-reporting
+  - /billing/managing-your-billing/automating-usage-reporting
 versions:
   ghec: '*'
-type: how_to
 topics:
   - Enterprise
   - Billing
   - REST
 permissions: 'Enterprise owners, organization owners, and billing managers'
 product: '{% data reusables.billing.enhanced-billing-platform-product %}'
+contentType: tutorials
 ---
 
 You can automatically pull data from {% data variables.product.github %} to populate the business systems you use to monitor costs and usage using the REST API. If you haven't used the {% data variables.product.github %} REST API before, the following articles are a good starting point, see [AUTOTITLE](/rest/using-the-rest-api).