[pull] main from github:main

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

@@ -1,6 +1,7 @@
 ---
 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.'
+intro: Understand how billing works for paid {% data variables.product.prodname_marketplace %} apps, including shared billing date and payment method, proration, free trials, unit limits, and plan changes.
+permissions: '{% data reusables.permissions.marketplace-org-perms %}'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-marketplace
   - /articles/about-billing-for-github-marketplace
@@ -16,32 +17,38 @@ topics:
 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.
+
+{% 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**. This article explains the billing model, that is, what happens when you start, trial, change, or cancel a paid app subscription.
 
 {% data reusables.marketplace.marketplace-apps-only %}
 
-{% data reusables.marketplace.marketplace-org-perms %}
+## Core billing model
+
+All paid {% data variables.product.prodname_marketplace %} app subscriptions for a personal account or organization share:
+* The existing payment method on file.
+* The same monthly or yearly billing date.
+* Consolidated receipts listing all paid {% data variables.product.prodname_dotcom %} products and app subscriptions.
 
-## Payment methods and billing cycles for {% data variables.product.prodname_marketplace %} purchases
+**If no payment method exists when you first choose a paid plan**:
 
-You will have the same payment method for all paid plans and subscriptions across {% data variables.product.prodname_dotcom %}.
+* You must define a payment method for the account.
+* The billing cycle for your account starts immediately and that day is the billing date for the account.
+* The full plan amount is charged.
+* The receipt is sent to the primary or billing email address on file for your personal account or organization.
 
-If your personal account or organization doesn't have a payment method on file, when you choose a paid plan for an app:
-* Your billing date is today.
-* You must add a payment method to your personal account or the organization in which you want to install the app.
-* Your payment method is charged the full amount of your subscription.
-* Your receipt is sent to the primary or billing email address on file for your personal account or organization.
+**If a payment method already exists**:
 
-If your personal account or organization has an existing payment method, when you choose a paid plan for an app:
 * The payment method on file is immediately charged a prorated amount based on the time remaining until your next billing date.
 * The monthly or yearly billing date for your app subscription is the same as the account or organization's regular billing date.
 * On your next billing date, your receipt lists charges for your paid {% data variables.product.prodname_dotcom %} plan and your app subscription.
 
-When you choose a paid plan with a free trial:
+## Free trials
+
+**When you select a paid plan that includes a free trial:**
 * You must have an existing payment method or add a new payment method for your personal account or the organization in which you want to install the app.
-* If you don't have any other paid plans or subscriptions, you are charged the full amount of your subscription at the end of the 14-day free trial.
-* If you have other paid plans or subscriptions, once your 14-day free trial ends, the payment method on file is immediately charged a prorated amount based on the time remaining until your next billing date.
-* If you have other paid plans or subscriptions, on your next billing date, your receipt lists charges for your paid {% data variables.product.prodname_dotcom %} plan and your app subscription.
+* If this is your only paid subscription, the first full charge occurs after the 14‑day trial ends.
+* If you already have other paid subscriptions, the end of the 14‑day trial triggers an immediate prorated charge for the remainder of the current cycle, then the plan renews on the shared billing date.
+* On your next billing date, your receipt will list charges for your paid {% data variables.product.prodname_dotcom %} plan and your app subscription.
 
 {% data reusables.user-settings.context_switcher %}
 
@@ -50,17 +57,25 @@ When you choose a paid plan with a free trial:
 
 ## Unit plan limits
 
-If you choose a unit plan (for example, a plan that charges per user), and you exceed the units that you're paying for, the integrator may disable your access until you upgrade the app. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app).
-
-## Downgrading a {% data variables.product.prodname_marketplace %} app
+For plans that charge per unit (for example, per user), exceeding the purchased units can lead the developer to restrict or disable app access until you move to a plan that covers the higher usage. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app).
 
-If you downgrade your app subscription to a less expensive plan or if you cancel a paid app subscription, your changes will take effect at the end your current billing cycle. Your subscription will be moved to your new plan on your next billing date.
+## Plan changes and cancellation
 
-If you cancel an app on a free plan, your subscription will immediately end and you'll lose access to the app.
+* **Upgrading or adding capacity** takes effect immediately; a prorated amount may be charged for the rest of the cycle (if applicable).
+* **Downgrading a paid plan or canceling a paid app** takes effect at the end of the current billing cycle; access continues until then. Your subscription will be moved to your new plan on your next billing date.
+  To learn how to downgrade a paid plan or cancel a paid app, see [AUTOTITLE](/billing/how-tos/pay-third-parties/downgrade-marketplace-app) and [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app).
+* **Cancelling a free plan** ends the subscription immediately with loss of access.
+* **Canceling a free trial** on a paid plan ends the trial immediately and access stops.
 
 {% data reusables.marketplace.downgrade-marketplace-only %}
 
-If you cancel a free trial on a paid plan, your subscription is immediately canceled and you will lose access to the app. For more information, see [AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app).
+## Privacy
+
+Publishers get only what they need to provision service, such as purchaser context (user or organization), plan identifier, effective dates, seat or unit counts, required usage metrics.
+
+Publishers don't see your full payment details, other product invoices, or unrelated account data.
+
+GitHub processes payments and issues receipts. Publishers cannot directly charge your payment method outside the standard plan billing flow.
 
 ## Further reading
 

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

@@ -1,6 +1,6 @@
 ---
 title: GitHub Sponsors billing
-intro: You will be billed for your sponsorships with the rest of your paid products and features.
+intro: Understand how sponsorship payments appear in your billing, how they align with your existing payment method and billing date, and what fees apply.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-sponsors
   - /articles/about-billing-for-github-sponsors
@@ -16,14 +16,42 @@ topics:
 shortTitle: GitHub Sponsors
 contentType: concepts
 ---
+
+This article describes the billing model for {% data variables.product.prodname_sponsors %} from the sponsor’s point of view.
+
 {% data reusables.sponsors.sponsorship-details %}
 
-{% data reusables.sponsors.no-fees %}
+## What a sponsorship billing entry represents
+
+A sponsorship is a monetary commitment you make to a sponsored developer or organization through {% data variables.product.github %}. Each active recurring sponsorship produces a charge on its renewal date; one‑time sponsorships produce a single charge. For more information, see [AUTOTITLE](/sponsors/getting-started-with-github-sponsors/about-github-sponsors).
 
-{% data reusables.dotcom_billing.view-all-subscriptions %}
+## Unified payment method and billing date
+
+Your sponsorships use the same stored payment method as your other paid products for the relevant personal account or organization. They follow the existing billing date/cycle for that account.
+
+You can review active sponsorships alongside other paid subscriptions for the account to understand total ongoing commitments and historical charges.
+
+If you sponsor from multiple accounts (personal vs organization), each account’s sponsorship charges stay separate and align with that account’s own billing cycle.
 
 {% data reusables.user-settings.context_switcher %}
 
+## Fees
+
+{% data reusables.sponsors.no-fees %}
+
+## Privacy
+
+Sponsored parties see sponsorship details required for recognition or fulfillment, not your underlying payment method details.
+
+## How sponsorship billing works
+
+1. You create a one‑time or recurring sponsorship at a chosen amount (tier or custom amount if permitted).
+1. The amount is charged (immediately for one‑time, and on each renewal cycle for recurring).
+1. Changes to amount or cancelation affect future cycles (the current paid period continues until the next renewal unless you selected a one‑time sponsorship).
+1. Ended sponsorships stop appearing as future charges but remain in historical billing records.
+
+Proration is generally not part of sponsorship billing: changing an amount updates future renewals rather than retroactively adjusting the in‑progress period.
+
 ## Further reading
 
 * [AUTOTITLE](/sponsors/getting-started-with-github-sponsors/about-github-sponsors)

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

@@ -1,20 +1,20 @@
 ---
 title: Buying Advanced Security for your organization or enterprise
-intro: 'How to buy licenses for {% data variables.product.prodname_GHAS %} whether you have usage-based or volume/subscription billing.'
-permissions: 'Organization or enterprise owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}'
+intro: How to buy licenses for {% data variables.product.prodname_GHAS %} whether you have usage-based or volume/subscription billing.
+permissions: Organization or enterprise owners can sign up for {% data variables.product.prodname_GH_cs_or_sp %}
 product: '{% data reusables.gated-features.ghas-billing %}'
 versions:
   fpt: '*'
   ghec: '*'
 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
+  - /billing/how-tos/products/add-advanced-security
 topics:
   - Billing
   - Advanced Security
   - Enterprise
 shortTitle: Buy Advanced Security
-allowTitleToDifferFromFilename: true
 contentType: how-tos
 ---
 

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

@@ -1,6 +1,6 @@
 ---
-title: 'Downloading license use for your enterprise or organization'
-intro: 'Get data on consumption of {% data variables.product.github %}, {% data variables.product.prodname_copilot_short %}, and {% data variables.product.prodname_AS %} licenses.'
+title: Downloading license use for your enterprise or organization
+intro: Get data on consumption of {% data variables.product.github %}, {% data variables.product.prodname_copilot_short %}, and {% data variables.product.prodname_AS %} licenses.
 permissions: '{% data reusables.permissions.enhanced-billing-enterprise %}'
 versions:
   fpt: '*'
@@ -11,9 +11,9 @@ topics:
   - Advanced Security
   - Enterprise
 shortTitle: Download license use
-allowTitleToDifferFromFilename: true
 redirect_from:
   - /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/downloading-your-github-advanced-security-usage
+  - /billing/how-tos/products/download-ghas-license-use
 contentType: how-tos
 ---
 

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

@@ -23,10 +23,11 @@ versions:
 topics:
   - Billing
 children:
-  - /view-product-use
-  - /download-ghas-license-use
-  - /add-advanced-security
-  - /manage-ghas-license
+  - /view-productlicense-use
+  - /download-license-use
+  - /buy-advanced-security
+  - /manage-ghas-licenses
   - /view-ghas-committers
 contentType: how-tos
 ---
+

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

@@ -1,19 +1,19 @@
 ---
-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.'
-permissions: 'Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}. </br>For metered usage, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).'
+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.
+permissions: Enterprise owners with **volume/subscription licenses** for {% data variables.product.prodname_AS %}. </br>For metered usage, see [AUTOTITLE](/billing/managing-your-billing/using-budgets-control-spending).
 versions:
   fpt: '*'
   ghec: '*'
 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
+  - /billing/how-tos/products/manage-ghas-license
 topics:
   - Billing
   - Advanced Security
   - Enterprise
 shortTitle: Manage GHAS licenses
-allowTitleToDifferFromFilename: true
 contentType: how-tos
 ---
 

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

@@ -28,16 +28,16 @@ redirect_from:
   - /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
+  - /billing/how-tos/products/view-product-use
 versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
 topics:
   - Billing
 shortTitle: View product/license use
-allowTitleToDifferFromFilename: true
 permissions: '{% data reusables.permissions.enhanced-billing-cloud-all %}'
-product: 'Cloud only'
+product: Cloud only
 contentType: how-tos
 ---
 

content/billing/index.md

@@ -18,7 +18,7 @@ featuredLinks:
     - '{% ifversion ghes %}/billing/concepts/enterprise-billing/combined-enterprise-use{% endif %}'
   popular:
     - '{% 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/how-tos/products/view-productlicense-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 %}'

content/billing/reference/models-multipliers-and-costs.md → content/billing/reference/costs-for-github-models.md

@@ -1,13 +1,14 @@
 ---
 title: Costs and multipliers for using GitHub Models directly
 shortTitle: Costs for GitHub Models
-allowTitleToDifferFromFilename: true
-intro: 'Reference information for calculating the cost of using different {% data variables.product.prodname_github_models %} directly (outside {% data variables.product.prodname_copilot %}).'
+intro: Reference information for calculating the cost of using different {% data variables.product.prodname_github_models %} directly (outside {% data variables.product.prodname_copilot %}).
 versions:
   feature: github-models
 topics:
   - Billing
 contentType: reference
+redirect_from:
+  - /billing/reference/models-multipliers-and-costs
 ---
 
 ## Use of models in {% data variables.product.github %}

content/billing/reference/license-consumption.md → content/billing/reference/github-license-users.md

@@ -1,15 +1,15 @@
 ---
 title: People who consume a license in an organization
-intro: 'Learn how consumption of {% data variables.product.github %} licenses is determined for paid organizations and enterprises.'
+intro: Learn how consumption of {% data variables.product.github %} licenses is determined for paid organizations and enterprises.
 shortTitle: GitHub license users
-allowTitleToDifferFromFilename: true
 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
   - /billing/concepts/license-consumption
+  - /billing/reference/license-consumption
 versions:
   fpt: '*'
   ghec: '*'

content/billing/reference/index.md

@@ -17,9 +17,10 @@ children:
   - /billing-roles
   - /cost-center-allocation
   - /roles-for-visual-studio
-  - /license-consumption
+  - /github-license-users
   - /license-reports
-  - /models-multipliers-and-costs
+  - /costs-for-github-models
   - /enterprise-license-troubleshooting
 contentType: reference
 ---
+

content/billing/reference/license-reports.md

@@ -2,7 +2,6 @@
 title: License reports reference
 shortTitle: License reports
 intro: 'License reports show details of the users consuming licenses that you pay for.'
-allowTitleToDifferFromFilename: true
 versions:
   fpt: '*'
   ghec: '*'

content/billing/reference/usage-reports.md

@@ -2,7 +2,6 @@
 title: Usage reports reference
 shortTitle: Usage reports
 intro: 'Usage reports show detailed {% data variables.product.github %} usage and billing information for your account.'
-allowTitleToDifferFromFilename: true
 versions:
   fpt: '*'
   ghec: '*'

content/copilot/concepts/chat.md

@@ -43,6 +43,16 @@ For more information, see [AUTOTITLE](/copilot/customizing-copilot/adding-reposi
 
 {% data reusables.copilot.change-the-ai-model %}
 
-## Extending {% data variables.copilot.copilot_chat_dotcom_short %}
+## Extending {% data variables.copilot.copilot_chat_short %}
+
+{% data variables.copilot.copilot_chat_short %} can be extended in a variety of ways to enhance its functionality and integrate it with other tools and services. This can include using the Model Context Protocol (MCP) to provide context-aware AI assistance, or connecting third-party tools to leverage {% data variables.product.github %}’s AI capabilities.
+
+### Extending {% data variables.copilot.copilot_chat_short %} with MCP
+
+MCP is an open standard that defines how applications share context with large language models (LLMs). MCP provides a standardized way to connect AI models to different data sources and tools, enabling them to work together more effectively.
+
+You can configure MCP servers to provide context to {% data variables.copilot.copilot_chat_short %} in various IDEs, such as {% data variables.product.prodname_vscode %} and JetBrains IDEs. For {% data variables.copilot.copilot_chat_dotcom_short %}, the {% data variables.product.github %} MCP server is automatically configured, enabling {% data variables.copilot.copilot_chat_short %} to perform a limited set of tasks, at your request, such as creating branches or merging pull requests. For more information, see [AUTOTITLE](/copilot/how-tos/context/model-context-protocol/extending-copilot-chat-with-mcp) and [AUTOTITLE](/copilot/how-tos/context/model-context-protocol/using-the-github-mcp-server).
+
+### Extending {% data variables.copilot.copilot_chat_short %} with external tools
 
 {% data reusables.copilot.copilot-extensions.extending-copilot-chat %}