Skip to content

Commit 097eb0b

Browse files
docs-botdocs-bot
authored
Merge pull request #39555 from github/repo-sync
Repo sync
2 parents a4e0862 + cfa45be commit 097eb0b

File tree

111 files changed

+1126
-1068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1126
-1068
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ---------------------------------------------------------------
99
# To update the sha:
1010
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
11-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250715-152201-gef17a3886 AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20250725-133358-gd7fe7b016 AS base
1212

1313
# Install curl for Node install and determining the early access branch
1414
# Install git for cloning docs-early-access & translations repos

‎content/admin/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ featuredLinks:
7676
- '{% ifversion ghec %}/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise{% endif %}'
7777
- /admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/best-practices-for-structuring-organizations-in-your-enterprise
7878
- '{% ifversion ghes %}/admin/getting-started-with-enterprise/about-upgrades-to-new-releases{% endif %}'
79-
- '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise{% endif %}'
79+
- '{% ifversion ghes %}/billing/how-tos/set-up-payment/manage-enterprise-invoice{% endif %}'
8080
guideCards:
8181
- '{% 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 %}'
8282
- '{% ifversion ghes %}/admin/configuring-packages/getting-started-with-github-packages-for-your-enterprise{% endif %}'
@@ -91,7 +91,7 @@ featuredLinks:
9191
- '{% ifversion ghec %}/admin/configuring-settings/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise{% endif %}'
9292
- /admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise
9393
- '{% ifversion ghec %}/admin/monitoring-activity-in-your-enterprise/exploring-user-activity-in-your-enterprise/managing-global-webhooks{% endif %}'
94-
- '{% 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 %}'
94+
- '{% ifversion ghec %}/billing/how-tos/set-up-payment/set-up-vs-subscription{% endif %}'
9595
- /support/learning-about-github-support/about-github-support
9696
- /admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities
9797
layout: product-landing

‎content/billing/managing-your-billing/about-the-billing-cycle.md renamed to ‎content/billing/concepts/billing-cycles.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2-
title: About the billing cycle
3-
intro: Learn about the billing cycle for the billing platform.
2+
title: Billing cycles
3+
intro: 'Learn about the billing cycles for self-serve, Azure, and invoiced payment methods.'
4+
shortTitle: Billing cycles
45
versions:
56
feature: enhanced-billing-platform
67
redirect_from:
@@ -9,11 +10,13 @@ redirect_from:
910
- /billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle
1011
- /billing/using-the-new-billing-platform/viewing-your-subscriptions-and-billing-date
1112
- /billing/using-the-new-billing-platform/about-the-billing-cycle
12-
type: overview
13+
- /billing/managing-your-billing/about-the-billing-cycle
1314
topics:
15+
- Billing
1416
- Enterprise
1517
- Team
1618
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
19+
contentType: concepts
1720
---
1821

1922
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/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md renamed to ‎content/billing/concepts/discounted-plans.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ redirect_from:
99
- /articles/discounted-subscriptions-for-github-accounts
1010
- /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
1111
- /billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
12+
- /billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts
1213
versions:
1314
fpt: '*'
1415
ghec: '*'
15-
type: reference
1616
topics:
17+
- Billing
1718
- Accounts
1819
- Education
1920
- Discounts
2021
- Nonprofits
2122
- User account
2223
shortTitle: Discounted plans
24+
contentType: concepts
2325
---
2426

2527
> [!TIP]

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
title: Billing for GitHub Enterprise
3+
intro: 'You can view billing information for your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.'
4+
redirect_from:
5+
- /admin/overview/managing-billing-for-your-enterprise
6+
- /enterprise/admin/installation/managing-billing-for-github-enterprise
7+
- /enterprise/admin/overview/managing-billing-for-github-enterprise
8+
- /admin/overview/managing-billing-for-github-enterprise
9+
- /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
10+
- /billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
11+
- /early-access/github/automatically-renew-the-billing-plan-for-your-enterprise
12+
- /billing/using-the-billing-platform/about-billing-for-your-enterprise
13+
- /billing/using-the-new-billing-platform/about-billing-for-your-enterprise
14+
- /billing/managing-your-billing/about-billing-for-your-enterprise
15+
versions:
16+
fpt: '*'
17+
ghec: '*'
18+
ghes: '*'
19+
topics:
20+
- Billing
21+
- Enterprise
22+
shortTitle: Billing for enterprises
23+
contentType: concepts
24+
---
25+
26+
## {% data variables.product.prodname_enterprise %} plan costs
27+
28+
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.
29+
30+
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).
31+
32+
> [!TIP]
33+
> {% ifversion fpt or ghec %}
34+
> 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).
35+
> {% elsif ghes %}
36+
> {% data reusables.billing.ghes-with-no-enterprise-account %}
37+
> {% endif %}
38+
39+
## Invoiced customers
40+
41+
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 %}.
42+
43+
## Further reading
44+
45+
* [AUTOTITLE](/admin/overview/about-enterprise-accounts)
46+
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
47+
* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage)
48+
* [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/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md renamed to ‎content/billing/concepts/enterprise-billing/combined-enterprise-use.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
---
2-
title: About licenses for GitHub Enterprise
3-
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.'
2+
title: Combined GitHub Enterprise cloud and server use
3+
intro: 'Your enterprise account enables you to set up {% data variables.product.prodname_ghe_server %} with no additional cost.'
44
versions:
5+
fpt: '*'
56
ghec: '*'
67
ghes: '*'
7-
type: overview
88
topics:
9+
- Billing
910
- Enterprise
1011
- Licensing
11-
shortTitle: About licenses
12+
shortTitle: Combined enterprise use
13+
redirect_from:
14+
- /billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise
15+
contentType: concepts
1216
---
1317

1418

@@ -57,5 +61,5 @@ If you have any questions about renewing your license, contact {% data variables
5761

5862
* [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise)
5963
* 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"
60-
* [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)
64+
* [AUTOTITLE]({% ifversion fpt or ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)
6165
* The [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
title: Enterprise billing
3+
intro: 'Understanding the concepts used in billing for the {% data variables.product.prodname_enterprise %} plan.'
4+
versions:
5+
fpt: '*'
6+
ghec: '*'
7+
ghes: '*'
8+
topics:
9+
- Billing
10+
children:
11+
- /billing-for-enterprises
12+
- /usage-based-licenses
13+
- /combined-enterprise-use
14+
- /visual-studio-subs
15+
contentType: concepts
16+
---
17+

‎content/billing/managing-your-billing/about-usage-based-billing-for-licenses.md renamed to ‎content/billing/concepts/enterprise-billing/usage-based-licenses.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: About usage-based billing for licenses
3-
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.'
2+
title: Usage-based billing for enterprise licenses
3+
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.'
44
redirect_from:
55
- /early-access/billing/managing-usage-based-billing-for-github-licenses-through-github
66
- /early-access/billing/managing-usage-based-billing-for-github-licenses-through-azure
@@ -9,20 +9,23 @@ redirect_from:
99
- /early-access/billing/managing-usage-based-billing-for-github-licenses
1010
- /billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses
1111
- /billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses
12+
- /billing/managing-your-billing/about-usage-based-billing-for-licenses
1213
versions:
14+
fpt: '*'
1315
ghec: '*'
1416
ghes: '*'
15-
type: overview
1617
topics:
18+
- Billing
1719
- Enterprise
1820
permissions: Enterprise administrators
19-
product: '{% data reusables.billing.enhanced-billing-platform-product %}'
20-
shortTitle: Usage-based billing for licenses
21+
product: '{% data variables.product.prodname_enterprise %}'
22+
shortTitle: Usage-based licenses
23+
contentType: concepts
2124
---
2225

2326
## About usage-based billing
2427

25-
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.
28+
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.
2629

2730
{% data reusables.billing.license-type-overview %}
2831
{% data reusables.billing.license-models %}

‎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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ redirect_from:
1111
- /github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
1212
- /billing/managing-your-license-for-github-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
1313
- /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
14+
- /billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
1415
versions:
1516
ghec: '*'
16-
type: overview
1717
topics:
18+
- Billing
1819
- Enterprise
1920
- Licensing
20-
shortTitle: About
21+
shortTitle: Visual Studio subs
22+
contentType: concepts
2123
---
2224

2325
> [!NOTE] Usage-based billing is not currently supported for {% data variables.visual_studio.prodname_vss_ghe %}.

‎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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
---
2-
title: How does upgrading or downgrading affect the billing process?
3-
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.'
2+
title: Impact of changing your plan on billing
3+
intro: Learn how upgrading or downgrading your plan is reflected in billing.
44
redirect_from:
55
- /github/setting-up-and-managing-billing-and-payments-on-github/how-does-upgrading-or-downgrading-affect-the-billing-process
66
- /articles/how-does-upgrading-or-downgrading-affect-the-billing-process
77
- /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
88
- /billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
9+
- /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
910
versions:
1011
fpt: '*'
1112
ghec: '*'
12-
type: how_to
1313
topics:
14+
- Billing
1415
- Fundamentals
1516
- Organizations
1617
- Upgrades
1718
- User account
18-
shortTitle: Billing process
19+
shortTitle: Impact of plan changes
20+
contentType: concepts
1921
---
20-
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 %}.
22+
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.
23+
24+
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 %}.
2125

2226
For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github).
2327

0 commit comments

Comments
 (0)