Skip to content

Commit d1fb304

Browse files
authored
Merge pull request #45091 from github/repo-sync
Repo sync
2 parents 1564b99 + 8477db5 commit d1fb304

233 files changed

Lines changed: 748 additions & 633 deletions

File tree

Some content is hidden

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

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# ---------------------------------------------------------------
1111
# To update the sha:
1212
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
13-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20260706-152702-gdb3226338@sha256:badfd5ddfbea7896bb84dbfc20ae326234fa1cc580bb723458158e8a59cf17ec AS base
13+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20260708-113537-g661fe65de@sha256:894162a6b21fc03da8ba889760592e6e223ba76f3067723f93bd1e49aff1c46b AS base
1414

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

config/kubernetes/production/deployments/webapp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
# Prevents capacity loss during deploys. Safe because we're over-provisioned.
1515
maxUnavailable: 0
1616
# Percentage so it scales with replica count changes.
17-
maxSurge: '25%'
17+
maxSurge: '50%'
1818
selector:
1919
matchLabels:
2020
app: webapp

content/billing/concepts/billing-cycles.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ Changes you make mid-cycle, such as adding or removing users, seats, or resource
6969

7070
Find product-specific guidance on how usage is calculated and billed.
7171

72-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions)
73-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)
74-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages)
75-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot)
72+
* [AUTOTITLE](/billing/concepts/product-billing/github-actions)
73+
* [AUTOTITLE](/billing/concepts/product-billing/github-codespaces)
74+
* [AUTOTITLE](/billing/concepts/product-billing/github-packages)
75+
* [AUTOTITLE](/billing/concepts/product-billing/github-copilot-licenses)
7676
* [AUTOTITLE](/billing/concepts/product-billing/cloud-and-local-sandboxes)
77-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise#about-licenses-for-visual-studio-subscriptions-with-github-enterprise-cloud)
78-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)
77+
* [AUTOTITLE](/billing/concepts/enterprise-billing/visual-studio-subs#about-licenses-for-visual-studio-subscriptions-with-github-enterprise-cloud)
78+
* [AUTOTITLE](/billing/concepts/product-billing/git-lfs)

content/billing/concepts/budgets-and-alerts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ The maximum number of budgets per account is 10,000.
7575

7676
## Set up a budget
7777

78-
To get started with budgets, see [AUTOTITLE](/billing/tutorials/set-up-budgets).
78+
To get started with budgets, see [AUTOTITLE](/billing/how-tos/set-up-budgets).

content/billing/concepts/discounted-plans.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ category:
2424
2525
## Discounts for personal accounts
2626

27-
In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see [AUTOTITLE](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-students/apply-to-github-global-campus-as-a-student).
27+
In addition to the unlimited public and private repositories for students and faculty with {% data variables.product.prodname_free_user %}, verified students can apply for the {% data variables.product.prodname_student_pack %} to receive additional benefits from {% data variables.product.prodname_dotcom %} partners. For more information, see [AUTOTITLE](/free-pro-team@latest/education/about-github-education/github-education-for-students/apply-to-github-education-as-a-student).
2828

2929
## Discounts for schools and universities
3030

31-
Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see [AUTOTITLE](/free-pro-team@latest/education/explore-the-benefits-of-teaching-and-learning-with-github-education).
31+
Verified academic faculty can apply for {% data variables.product.prodname_team %} for teaching or academic research. For more information, see [AUTOTITLE](/free-pro-team@latest/education/about-github-education).
3232

3333
## Discounts for nonprofits and libraries
3434

@@ -38,4 +38,4 @@ If your organization already has a paid plan, your organization's last transacti
3838

3939
## Further reading
4040

41-
* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github)
41+
* [AUTOTITLE](/billing/get-started/how-billing-works)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ category:
2626

2727
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.
2828

29-
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).
29+
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/managing-accounts-and-repositories/managing-roles-in-your-enterprise/abilities-of-roles).
3030

3131
> [!TIP]
3232
> {% ifversion fpt or ghec %}
@@ -35,7 +35,7 @@ If you have an enterprise account on {% data variables.product.prodname_ghe_clou
3535
> {% data reusables.billing.ghes-with-no-enterprise-account %}
3636
> {% endif %}
3737
38-
To learn which people consume a license in your enterprise, see [AUTOTITLE](/billing/reference/license-consumption).
38+
To learn which people consume a license in your enterprise, see [AUTOTITLE](/billing/reference/github-license-users).
3939

4040
## Invoiced customers
4141

@@ -51,11 +51,11 @@ There are two billing models for {% data variables.product.prodname_enterprise %
5151

5252
{% data reusables.enterprise-licensing.unique-user-licensing-model %}
5353

54-
To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. See [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise).
54+
To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. See [AUTOTITLE](/billing/concepts/enterprise-billing/combined-enterprise-use).
5555

5656
## Further reading
5757

58-
* [AUTOTITLE](/admin/overview/about-enterprise-accounts)
59-
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
58+
* [AUTOTITLE](/admin/concepts/enterprise-fundamentals/enterprise-accounts)
59+
* [AUTOTITLE](/billing/reference/github-license-users)
6060
* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses/view-enterprise-usage)
6161
* [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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ There are two types of {% data variables.product.prodname_enterprise %} (GHE) li
6969

7070
## Further reading
7171

72-
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
72+
* [AUTOTITLE](/billing/reference/github-license-users)
7373
* [Pricing](https://github.com/pricing)
74-
* [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise)
74+
* [AUTOTITLE](/billing/concepts/enterprise-billing/billing-for-enterprises)
7575
* [AUTOTITLE]({% ifversion fpt or ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)
7676
* The [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website

content/billing/concepts/enterprise-billing/ghes-license-files.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If your license expires, you won't be able to access {% data variables.product.p
2323

2424
## Next steps
2525

26-
* To download your license file, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise).
27-
* To upload your license file to {% data variables.product.prodname_ghe_server %}, see {% ifversion fpt or ghec %}[AUTOTITLE](/enterprise-server@latest/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server).{% endif %}
28-
* To back up your {% data variables.product.prodname_ghe_server %} instance, see {% ifversion fpt or ghec %}[Configuring backups on your appliance](/enterprise-server@latest/admin/guides/installation/configuring-backups-on-your-appliance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-backups-on-your-appliance).{% endif %}
26+
* To download your license file, see [AUTOTITLE](/billing/how-tos/manage-server-licenses/download-your-license).
27+
* To upload your license file to {% data variables.product.prodname_ghe_server %}, see {% ifversion fpt or ghec %}[AUTOTITLE](/enterprise-server@latest/billing/how-tos/manage-server-licenses/upload-new-license) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/billing/how-tos/manage-server-licenses/upload-new-license).{% endif %}
28+
* To back up your {% data variables.product.prodname_ghe_server %} instance, see {% ifversion fpt or ghec %}[Configuring backups on your appliance](/enterprise-server@latest/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance) in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}[AUTOTITLE](/admin/backing-up-and-restoring-your-instance/configuring-backups-on-your-instance).{% endif %}
2929
* If you have questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ category:
2727

2828
To use the {% data variables.product.prodname_enterprise %} portion of the license, each subscriber's personal account on {% data variables.product.prodname_dotcom %} must be or become a member of an organization owned by your enterprise on {% data variables.product.prodname_dotcom %}. To accomplish this, organization owners can invite new members to an organization by email address. The subscriber can accept the invitation with an existing personal account or create a new account.
2929

30-
For more information about the setup of {% data variables.visual_studio.prodname_vss_ghe %}, see [AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise).
30+
For more information about the setup of {% data variables.visual_studio.prodname_vss_ghe %}, see [AUTOTITLE](/billing/how-tos/set-up-payment/set-up-vs-subscription).
3131

3232
## About licenses for {% data variables.visual_studio.prodname_vss_ghec %}
3333

@@ -47,7 +47,7 @@ For more information about {% data variables.product.prodname_enterprise %}, see
4747

4848
For users only on {% data variables.product.prodname_ghe_server %}, each {% data variables.product.prodname_vs %} subscriber will only consume one license as long as the email address associated with their {% data variables.product.prodname_ghe_server %} account matches their {% data variables.product.prodname_vs %} UPN. This does not apply if you have switched to **usage-based billing**, in which case users must also be on {% data variables.product.prodname_ghe_cloud %} to consume a bundled license.
4949

50-
For users on both {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}, only one license will be consumed as long as you follow the instructions in the 'About licenses for {% data variables.visual_studio.prodname_vss_ghec %}' section, and the user's accounts are linked as described in [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud).
50+
For users on both {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}, only one license will be consumed as long as you follow the instructions in the 'About licenses for {% data variables.visual_studio.prodname_vss_ghec %}' section, and the user's accounts are linked as described in [AUTOTITLE](/billing/how-tos/manage-server-licenses/sync-license-usage).
5151

5252
## Further reading
5353

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Key takeaways:
3838

3939
Making a change to the {% data variables.product.github %} plan for your 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 %}.
4040

41-
For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github).
41+
For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/get-started/how-billing-works).
4242

4343
## Examples
4444

@@ -51,7 +51,7 @@ The following examples illustrate how billing rules are applied in practice:
5151

5252
## Further reading
5353

54-
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account)
55-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps)
56-
* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage)
57-
* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
54+
* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses)
55+
* [AUTOTITLE](/billing/how-tos/pay-third-parties)
56+
* [AUTOTITLE](/billing/how-tos/products)
57+
* [AUTOTITLE](/billing/reference/github-license-users)

0 commit comments

Comments
 (0)