Merge branch 'main' into patch-2

Author: Sharra-writes

content/account-and-profile/how-tos/email-preferences/setting-your-commit-email-address.md

@@ -86,4 +86,4 @@ You can change the email address associated with commits you make in a single re
 
 For reference information, see [AUTOTITLE](/account-and-profile/reference/email-addresses-reference).
 
-To learn more about using a private email address, see [AUTOTITLE](/account-and-profile/reference/email-addresses-reference#your-noreply-email-address).
+For more information about setting your Git username, see [AUTOTITLE](/get-started/git-basics/setting-your-username-in-git).

content/actions/reference/workflows-and-actions/contexts.md

@@ -174,7 +174,7 @@ The `github` context contains information about the workflow run and the event t
 |---------------|------|-------------|
 | `github` | `object` | The top-level context available during any job or step in a workflow. This object contains all the properties listed below. |
 | `github.action` | `string` | The name of the action currently running, or the [`id`](/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsid) of a step. {% data variables.product.prodname_dotcom %} removes special characters, and uses the name `__run` when the current step runs a script without an `id`. If you use the same action more than once in the same job, the name will include a suffix with the sequence number with underscore before it. For example, the first script you run will have the name `__run`, and the second script will be named `__run_2`. Similarly, the second invocation of `actions/checkout` will be `actionscheckout2`. |
-| `github.action_path` | `string` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action, for example by changing directories to the path (using the corresponding enviroment variable): {% raw %} `cd "$GITHUB_ACTION_PATH"` {% endraw %}. For more information on evironment variables, see [AUTOTITLE](/actions/reference/security/secure-use#use-an-intermediate-environment-variable). |
+| `github.action_path` | `string` | The path where an action is located. This property is only supported in composite actions. You can use this path to access files located in the same repository as the action, for example by changing directories to the path (using the corresponding environment variable): {% raw %} `cd "$GITHUB_ACTION_PATH"` {% endraw %}. For more information on environment variables, see [AUTOTITLE](/actions/reference/security/secure-use#use-an-intermediate-environment-variable). |
 | `github.action_ref` | `string` | For a step executing an action, this is the ref of the action being executed. For example, `v2`.<br><br>{% data reusables.actions.composite-actions-unsupported-refs %} |
 | `github.action_repository` | `string` | For a step executing an action, this is the owner and repository name of the action. For example, `actions/checkout`.<br><br>{% data reusables.actions.composite-actions-unsupported-refs %} |
 | `github.action_status` | `string` | For a composite action, the current result of the composite action. |

content/apps/github-authentication-discovery-endpoints.md

@@ -0,0 +1,38 @@
+---
+title: GitHub authentication discovery endpoints
+shortTitle: OAuth 2.0 and OIDC Discovery documents
+intro: '{% data variables.product.github %} publishes OAuth 2.0 and OpenID Connect metadata documents.'
+versions:
+  fpt: '*'
+  ghes: '*'
+  ghec: '*'
+category:
+  - Understand GitHub Apps
+---
+
+> [!NOTE]
+> The {% data variables.product.github %} authentication metadata documents described in this article are in {% data variables.release-phases.public_preview %} and subject to change.
+> While the endpoints may be present on {% data variables.enterprise.data_residency %} and some versions of {% data variables.product.prodname_ghe_server %}, they contain incorrect information.
+
+{% data variables.product.github %} publishes two metadata documents used in the OAuth 2.0 and OpenID Connect protocols:
+
+* **OAuth 2.0 Authorization Server Metadata** ([RFC 8414](https://datatracker.ietf.org/doc/html/rfc8414)): `https://github.com/.well-known/oauth-authorization-server/login/oauth`
+* **OpenID Connect Discovery** ([OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html)): `https://github.com/login/oauth/.well-known/openid-configuration`
+
+These documents are used to validate tokens issued by {% data variables.product.github %} as well as programmatically determine how to sign in a user.
+
+## Intended use
+
+These documents are only published for MCP clients using [RFC 9728](https://datatracker.ietf.org/doc/html/rfc9728) to discover the OAuth 2.0 endpoints needed to get a token for the {% data variables.product.github %} MCP server.
+
+{% data variables.product.github %} does not currently implement OpenID Connect in its OAuth flows and does not issue ID tokens for users or apps.
+
+## Issuer
+
+The issuer for {% data variables.product.prodname_dotcom_the_website %} is `https://github.com/login/oauth`.
+
+This is the base URL used to find the other documents listed and an important parameter when configuring authentication libraries.
+
+## Difference from GitHub Actions tokens
+
+These metadata documents do not apply to the tokens issued for {% data variables.product.prodname_actions %} workflows. {% data variables.product.prodname_actions %} uses a separate dedicated issuer and token profile. For more information about Actions tokens, see [AUTOTITLE](/actions/concepts/security/openid-connect).

content/apps/index.md

@@ -41,6 +41,7 @@ children:
   - /maintaining-github-apps
   - /github-marketplace
   - /oauth-apps
+  - /github-authentication-discovery-endpoints
 redirect_from:
   - /developers
   - /developers/apps/getting-started-with-apps

content/copilot/concepts/billing/usage-based-billing-for-individuals.md

@@ -75,7 +75,7 @@ You will have the option to:
 * Cancel your plan and receive a prorated refund.
 * Wait to be downgraded to {% data variables.copilot.copilot_free_short %} at renewal time.
 
-Note that, starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing#model-multipliers-for-annual-copilot-pro-and-copilot-pro-subscribers).
+Note that, starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/model-multipliers-for-annual-plans).
 
 ## Next steps
 

content/copilot/reference/copilot-billing/index.md

@@ -5,7 +5,8 @@ intro: Find billing information about {% data variables.product.prodname_copilot
 versions:
   feature: copilot
 children:
-  - /models-and-pricing  
+  - /models-and-pricing
+  - /model-multipliers-for-annual-plans
   - /billing-cycle
   - /seat-assignment
   - /license-changes

content/copilot/reference/copilot-billing/model-multipliers-for-annual-plans.md

@@ -0,0 +1,60 @@
+---
+title: Model multipliers for annual plans staying on request-based billing
+intro: 'After June 1, 2026, model multipliers will change for {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers staying on annual plans under request-based billing.'
+shortTitle: Model multipliers for annual plans
+versions:
+  feature: copilot
+category:
+  - Learn about Copilot
+allowTitleToDifferFromFilename: true
+contentType: reference
+---
+
+> [!IMPORTANT] The model multiplier changes outlined in this article apply only to {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers who stay on their **existing annual plan** after June 1, 2026 and remain on the **premium request-based billing** model.
+>
+> If you choose to switch to monthly usage-based billing (with a prorated refund), these multiplier changes **do not apply** to you.
+
+## What is changing with {% data variables.product.prodname_copilot_short %} billing?
+
+{% data variables.product.github %} is changing how {% data variables.product.prodname_copilot_short %} usage is measured and billed.
+
+Today, each model interaction costs one premium request unit (PRU), and a multiplier is applied based on which model you use—more powerful models use more premium requests. Model multipliers are a concept specific to the current request-based billing system.
+
+**Starting June 1, 2026**, {% data variables.product.github %} is replacing request-based billing with usage-based billing, where the cost of an interaction depends on two things: the model and the number of tokens consumed.
+
+Under usage-based billing, each plan will come with an included allowance of {% data variables.product.prodname_ai_credits %}, with the option to set a budget for additional usage.
+
+Model multipliers **do not apply** to usage-based billing.
+
+## What are my options as a {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} user on an existing annual plan?
+
+If you're on an existing **annual plan** for {% data variables.copilot.copilot_pro_short %} or {% data variables.copilot.copilot_pro_plus_short %}, you will have the option to:
+* **Stay** on your existing annual plan under premium request-based billing. When your annual plan ends, you'll be automatically downgraded to {% data variables.copilot.copilot_free_short %}.
+* **Cancel** your plan, receive a prorated refund, and optionally, re-subscribe to the equivalent monthly paid plan.
+* **Upgrade** to a monthly paid plan and receive prorated credits for the remaining value of the annual plan. For example, if you're on a {% data variables.copilot.copilot_pro_short %} annual plan, you can upgrade to a monthly {% data variables.copilot.copilot_pro_plus_short %} plan.
+
+## What happens if I keep my annual plan?
+
+Your existing annual plan will continue to track your {% data variables.product.prodname_copilot_short %} expenditure using premium requests, combined with the model multiplier, until the plan ends.
+
+In addition, if you keep your annual plan under request-based billing, you will experience changes to model multipliers starting **June 1, 2026**. The table below shows how the multipliers for each model will adjust.
+
+## Model multipliers for annual {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers
+
+The table below shows how the multipliers for each model will change on June 1, 2026.
+
+These new multipliers will **only apply** if you remain on an annual {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} under the premium request-based billing model _after_ June 1, 2026.
+
+Model multipliers and costs are subject to change.
+
+| Model | Current multiplier | New multiplier |
+| --- | ---: | ---: |
+| {% for entry in tables.copilot.annual-subscriber-model-multipliers %} |
+| {{ entry.model }} | {{ entry.current_multiplier }} | {{ entry.new_multiplier }} |
+| {% endfor %} |
+
+## Next steps
+
+* To understand more about how usage-based billing works, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals).
+* To learn more about model prices under usage-based billing, see [AUTOTITLE](/copilot/reference/copilot-billing/models-and-pricing).
+* To compare how your expenditure will look under usage-based billing compared to request-based billing, see [AUTOTITLE](/copilot/how-tos/manage-and-track-spending/prepare-for-your-move-to-usage-based-billing).

content/copilot/reference/copilot-billing/models-and-pricing.md

@@ -112,16 +112,6 @@ You can view your current {% data variables.product.prodname_actions %} usage fo
 
 <!-- expires 2026-06-01 -->
 
-Starting **June 1, 2026**, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers on **existing annual billing plans** will experience changes to model multipliers. The table below shows how the multipliers for each model will adjust.
+Starting June 1, 2026, {% data variables.copilot.copilot_pro_short %} and {% data variables.copilot.copilot_pro_plus_short %} subscribers who choose to remain on **existing annual billing plans** and stay on the **request-based billing** model will experience changes to model multipliers. See [AUTOTITLE](/copilot/reference/copilot-billing/model-multipliers-for-annual-plans).
 
 <!-- end expires 2026-06-01 -->
-
-Model multipliers and costs are subject to change.
-
-For information about your options as an annual subscriber, see [AUTOTITLE](/copilot/concepts/billing/usage-based-billing-for-individuals#if-youre-on-an-annual-plan).
-
-| Model | Current multiplier | New multiplier |
-| --- | ---: | ---: |
-| {% for entry in tables.copilot.annual-subscriber-model-multipliers %} |
-| {{ entry.model }} | {{ entry.current_multiplier }} | {{ entry.new_multiplier }} |
-| {% endfor %} |