Merge branch 'main' into patch-1

Author: Sharra-writes

Dockerfile

@@ -10,7 +10,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:20260706-152702-gdb3226338@sha256:badfd5ddfbea7896bb84dbfc20ae326234fa1cc580bb723458158e8a59cf17ec AS base
+FROM ghcr.io/github/gh-base-image/gh-base-noble:20260708-113537-g661fe65de@sha256:894162a6b21fc03da8ba889760592e6e223ba76f3067723f93bd1e49aff1c46b AS base
 
 # Install curl for Node install and determining the early access branch
 # Install git for cloning docs-early-access & translations repos

config/kubernetes/production/deployments/webapp.yaml

@@ -14,7 +14,7 @@ spec:
       # Prevents capacity loss during deploys. Safe because we're over-provisioned.
       maxUnavailable: 0
       # Percentage so it scales with replica count changes.
-      maxSurge: '25%'
+      maxSurge: '50%'
   selector:
     matchLabels:
       app: webapp

content/billing/concepts/billing-cycles.md

@@ -69,10 +69,10 @@ Changes you make mid-cycle, such as adding or removing users, seats, or resource
 
 Find product-specific guidance on how usage is calculated and billed.
 
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions)
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages)
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot)
+* [AUTOTITLE](/billing/concepts/product-billing/github-actions)
+* [AUTOTITLE](/billing/concepts/product-billing/github-codespaces)
+* [AUTOTITLE](/billing/concepts/product-billing/github-packages)
+* [AUTOTITLE](/billing/concepts/product-billing/github-copilot-licenses)
 * [AUTOTITLE](/billing/concepts/product-billing/cloud-and-local-sandboxes)
-* [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)
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)
+* [AUTOTITLE](/billing/concepts/enterprise-billing/visual-studio-subs#about-licenses-for-visual-studio-subscriptions-with-github-enterprise-cloud)
+* [AUTOTITLE](/billing/concepts/product-billing/git-lfs)

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

@@ -75,4 +75,4 @@ The maximum number of budgets per account is 10,000.
 
 ## Set up a budget
 
-To get started with budgets, see [AUTOTITLE](/billing/tutorials/set-up-budgets).
+To get started with budgets, see [AUTOTITLE](/billing/how-tos/set-up-budgets).

content/billing/concepts/discounted-plans.md

@@ -24,11 +24,11 @@ category:
 
 ## Discounts for personal accounts
 
-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).
+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).
 
 ## Discounts for schools and universities
 
-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).
+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).
 
 ## Discounts for nonprofits and libraries
 
@@ -38,4 +38,4 @@ If your organization already has a paid plan, your organization's last transacti
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-your-billing/about-billing-on-github)
+* [AUTOTITLE](/billing/get-started/how-billing-works)

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

@@ -26,7 +26,7 @@ category:
 
 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).
+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).
 
 > [!TIP]
 > {% ifversion fpt or ghec %}
@@ -35,7 +35,7 @@ If you have an enterprise account on {% data variables.product.prodname_ghe_clou
 > {% data reusables.billing.ghes-with-no-enterprise-account %}
 > {% endif %}
 
-To learn which people consume a license in your enterprise, see [AUTOTITLE](/billing/reference/license-consumption).
+To learn which people consume a license in your enterprise, see [AUTOTITLE](/billing/reference/github-license-users).
 
 ## Invoiced customers
 
@@ -51,11 +51,11 @@ There are two billing models for {% data variables.product.prodname_enterprise %
 
 {% data reusables.enterprise-licensing.unique-user-licensing-model %}
 
-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).
+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).
 
 ## Further reading
 
-* [AUTOTITLE](/admin/overview/about-enterprise-accounts)
-* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
+* [AUTOTITLE](/admin/concepts/enterprise-fundamentals/enterprise-accounts)
+* [AUTOTITLE](/billing/reference/github-license-users)
 * [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

@@ -69,8 +69,8 @@ There are two types of {% data variables.product.prodname_enterprise %} (GHE) li
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
+* [AUTOTITLE](/billing/reference/github-license-users)
 * [Pricing](https://github.com/pricing)
-* [AUTOTITLE](/billing/managing-your-billing/about-billing-for-your-enterprise)
+* [AUTOTITLE](/billing/concepts/enterprise-billing/billing-for-enterprises)
 * [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/ghes-license-files.md

@@ -23,7 +23,7 @@ If your license expires, you won't be able to access {% data variables.product.p
 
 ## Next steps
 
-* To download your license file, see [AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise).
-* 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 %}
-* 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 %}
+* To download your license file, see [AUTOTITLE](/billing/how-tos/manage-server-licenses/download-your-license).
+* 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 %}
+* 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 %}
 * If you have questions about renewing your license, contact {% data variables.contact.contact_enterprise_sales %}.

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

@@ -27,7 +27,7 @@ category:
 
 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.
 
-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).
+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).
 
 ## About licenses for {% data variables.visual_studio.prodname_vss_ghec %}
 
@@ -47,7 +47,7 @@ For more information about {% data variables.product.prodname_enterprise %}, see
 
 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.
 
-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).
+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).
 
 ## Further reading
 

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

@@ -38,7 +38,7 @@ Key takeaways:
 
 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 %}.
 
-For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github).
+For more information, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans) and [AUTOTITLE](/billing/get-started/how-billing-works).
 
 ## Examples
 
@@ -51,7 +51,7 @@ The following examples illustrate how billing rules are applied in practice:
 
 ## Further reading
 
-* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account)
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps)
-* [AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage)
-* [AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)
+* [AUTOTITLE](/billing/how-tos/manage-plan-and-licenses)
+* [AUTOTITLE](/billing/how-tos/pay-third-parties)
+* [AUTOTITLE](/billing/how-tos/products)
+* [AUTOTITLE](/billing/reference/github-license-users)