Merge pull request #39555 from github/repo-sync

Repo sync

Author: docs-bot

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

…-your-billing/about-the-billing-cycle.md …ntent/billing/concepts/billing-cycles.mdcontent/billing/managing-your-billing/about-the-billing-cycle.md renamed to content/billing/concepts/billing-cycles.md content/billing/managing-your-billing/about-the-billing-cycle.md renamed to 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.

…/discounted-plans-for-github-accounts.md …ent/billing/concepts/discounted-plans.mdcontent/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md renamed to content/billing/concepts/discounted-plans.md content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md renamed to 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 %}

…/about-licenses-for-github-enterprise.md …prise-billing/combined-enterprise-use.mdcontent/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md renamed to content/billing/concepts/enterprise-billing/combined-enterprise-use.md content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md renamed to 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
+---
+

…bout-usage-based-billing-for-licenses.md …terprise-billing/usage-based-licenses.mdcontent/billing/managing-your-billing/about-usage-based-billing-for-licenses.md renamed to content/billing/concepts/enterprise-billing/usage-based-licenses.md content/billing/managing-your-billing/about-usage-based-billing-for-licenses.md renamed to 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 %}

…-subscriptions-with-github-enterprise.md …enterprise-billing/visual-studio-subs.mdcontent/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md renamed to content/billing/concepts/enterprise-billing/visual-studio-subs.md content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md renamed to 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 %}.

…owngrading-affect-the-billing-process.md …lling/concepts/impact-of-plan-changes.mdcontent/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md renamed to content/billing/concepts/impact-of-plan-changes.md content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md renamed to 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).