Merge branch 'main' into patch-5

Author: Sharra-writes

assets/images/help/copilot/code-review/xcode-ccr-button.png

@@ -96,10 +96,7 @@ There are two different ways to pay for licenses.
   * Purchase a specific number of {% data variables.product.prodname_GHAS_cs_or_sp %} licenses that last for a defined period, typically at least a year, see {% ifversion fpt or ghec %}[AUTOTITLE](/billing/how-tos/products/add-advanced-security){% elsif ghes %}[AUTOTITLE](/enterprise-cloud@latest/billing/how-tos/products/add-advanced-security) in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}.
   * If the usage of {% data variables.product.prodname_AS %} by active committers exceeds the number of licenses purchased, you need to purchase additional licenses to cover this overage usage.
 
-<!-- expires 2025-08-31 -->
-<!--This versioning is not needed once the related EDI PR for this article is merged (#57129).-->
-{% ifversion fpt or ghec %}To view your current license usage, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage).{% endif %}
-<!-- end expires 2025-08-31 -->
+To view your current license usage, see [AUTOTITLE](/billing/managing-billing-for-your-products/viewing-your-product-usage).
 
 ### Understanding usage
 

assets/images/help/copilot/code-review/xcode-review-popup.png

@@ -37,7 +37,7 @@ To ensure your cost centers reflect spending as intended, it's important to unde
 ### {% data variables.product.prodname_copilot %}
 
 * If a user belongs to a cost center, all usage associated with the user is charged to the cost center.
-* If a user does not belong to any cost center, if the organization that provides the user their {% data variables.product.prodname_copilot_short %} license belongs to a cost center, all usage associated with the user is charged to the cost center.
+* If a user does not belong to any cost center but the organization that is billed for the {% data variables.product.prodname_copilot_short %} license does, all usage associated with the user is charged to that cost center.
 * If the user receives access to {% data variables.product.prodname_copilot_short %} through **multiple organizations**, only one of the organizations is billed, and any cost center containing that organization is charged accordingly. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-the-copilot-subscription-for-your-enterprise/about-billing-for-github-copilot-in-your-enterprise#about-seat-assignment-for-copilot-in-your-enterprise).
 
 ### {% data variables.product.prodname_GH_cs_and_sp %}

content/billing/concepts/product-billing/github-advanced-security.md

@@ -119,7 +119,7 @@ When creating a secret in an organization, you can use a policy to limit which r
 
 You can add {% data variables.product.prodname_dependabot %}-related IP addresses to your registries IP allow list.
 
-If your private registry is configured with an IP allow list, you can find the IP addresses {% data variables.product.prodname_dependabot %} uses to access the registry in the meta API endpoint, under the `dependabot` key. If you run {% data variables.product.prodname_dependabot %} on {% data variables.product.prodname_actions %} self-hosted runners, you should instead use the IP addresses under the `actions` key. For more information, see [AUTOTITLE](/rest/meta/meta) and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners).
+If your private registry is configured with an IP allow list, you can find the IP addresses {% data variables.product.prodname_dependabot %} uses to access the registry in the meta API endpoint, under the `actions` key. For more information, see [AUTOTITLE](/rest/meta/meta) and [AUTOTITLE](/code-security/dependabot/working-with-dependabot/about-dependabot-on-github-actions-runners).
 
 {% endif %}
 

content/billing/reference/cost-center-allocation.md

@@ -551,7 +551,7 @@ For presenting keyboard shortcuts, follow the [Microsoft Style Guide](https://do
 
 ### Usage highlights
 
-Below are some usage highlights for how we present keyboard shortcuts in our documentation:
+Here are some usage highlights for how we present keyboard shortcuts in our documentation:
 
 * The basic syntax is to show keys with `+` between key combinations, without any spaces.
 
@@ -592,7 +592,7 @@ Below are some usage highlights for how we present keyboard shortcuts in our doc
 
 Do not create reusables for license attributions. We must use the exact license a project is licensed under, so any attributions must be accurately written for the articles that they appear in.
 
-If you are unsure of the legality of reusing any content, contact legal. If you are adding content with a license that is not listed below, you must receive a legal review before you can publish the content.
+If you are unsure of the legality of reusing any content, contact legal. If you are adding content with a license that is not listed here, you must receive a legal review before you can publish the content.
 
 ### Attributing MIT-licensed content
 
@@ -1270,6 +1270,14 @@ To signal to readers that you've added or changed a note, or to indicate the pub
 
 To signal that we have removed a release note, add an "Errata" section detailing which note you removed and (if relevant) which version the removed note actually pertains to. See [Writing errata](#writing-errata).
 
+## Release references
+
+When referring to a range of releases starting from a particular release, use "or later."
+
+* **Use:** "release 0.41.0 or later"
+* **Avoid:** "release 0.41.0 or above"
+* **Avoid:** "release 0.41.0 or greater"
+
 ## Reusables and variables
 
 Use reusable strings for individual nouns (e.g. product names) or for complete sentences or paragraphs. Sentence fragments and phrases should not be contained in reusable strings as they can cause problems when content is localized. For more information, see the [data directory](https://github.com/github/docs/tree/main/data) in the [`github/docs`](https://github.com/github/docs) repository, [Creating reusable content](/contributing/writing-for-github-docs/creating-reusable-content), and the [Product names](#product-names) section of this document.

content/code-security/dependabot/working-with-dependabot/configuring-access-to-private-registries-for-dependabot.md

@@ -22,6 +22,14 @@ This article provides an overview of {% data variables.copilot.copilot_code-revi
 
 ## Availability
 
+{% data variables.copilot.copilot_code-review_short %} is supported in:
+
+* {% data variables.product.prodname_dotcom_the_website %}
+* {% data variables.product.prodname_mobile %}
+* {% data variables.product.prodname_vscode_shortname %}
+* {% data variables.product.prodname_vs %}
+* Xcode
+
 {% data variables.copilot.copilot_code-review_short %} is—with one exception—a premium feature, available with the {% data variables.copilot.copilot_pro_short %}, {% data variables.copilot.copilot_pro_plus_short %}, {% data variables.copilot.copilot_business_short %}, and {% data variables.copilot.copilot_enterprise_short %} plans.
 
 The exception is the review of a selection of code within a file in {% data variables.product.prodname_vscode %}. This is a standard feature available to all {% data variables.product.prodname_copilot_short %} users in {% data variables.product.prodname_vscode_shortname %}.

content/contributing/style-guide-and-content-model/style-guide.md

@@ -487,7 +487,7 @@ To share feedback about {% data variables.copilot.copilot_chat_short %}, you can
 
 You can ask {% data variables.copilot.copilot_chat_short %} to give you code suggestions, explain code, generate unit tests, and suggest code fixes.
 
-1. To open the chat view, click **Editor** in the menu bar, then click **{% octicon "copilot" aria-hidden="true" aria-label="copilot" %} {% data variables.product.prodname_copilot_short %}** then **Open Chat**. {% data variables.copilot.copilot_chat_short %} opens in a new window.
+1. To open the chat view, click **Editor** in the menu bar, then click **{% data variables.product.prodname_copilot %}** then **Open Chat**. {% data variables.copilot.copilot_chat_short %} opens in a new window.
 
 1. Enter a prompt in the prompt box. For example prompts, see [AUTOTITLE](/copilot/get-started/getting-started-with-prompts-for-copilot-chat).
 

content/copilot/concepts/code-review/code-review.md

@@ -28,7 +28,7 @@ For a full introduction to {% data variables.copilot.copilot_code-review %}, see
 
 ## Using {% data variables.copilot.copilot_code-review_short %}
 
-These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in the {% data variables.product.github %} website. To see instructions for other popular coding environments, use the tool switcher at the top of the page.
+These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in the {% data variables.product.github %} website. To see instructions for other popular coding environments, click the appropriate tab at the top of the page.
 
 1. On {% data variables.product.prodname_dotcom_the_website %}, create a pull request or navigate to an existing pull request.
 1. Open the **Reviewers** menu, then select **{% data variables.product.prodname_copilot_short %}**.
@@ -89,12 +89,6 @@ By default, you manually request a review from {% data variables.product.prodnam
 
 {% vscode %}
 
-## Using {% data variables.copilot.copilot_code-review_short %}
-
-These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in {% data variables.product.prodname_vscode %}. To see instructions for other popular coding environments, use the tool switcher at the top of the page.
-
-> [!NOTE] {% data variables.copilot.copilot_code-review_short %} is available in {% data variables.product.prodname_vscode %} with version 0.22 or later of the {% data variables.copilot.copilot_chat %} extension.
-
 ### Reviewing a selection of code
 
 You can request an initial review of a highlighted selection of code in {% data variables.product.prodname_vscode %}.
@@ -160,7 +154,7 @@ To use {% data variables.copilot.copilot_code-review_short %}, you must use {% d
 
 ## Using {% data variables.copilot.copilot_code-review_short %}
 
-These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in {% data variables.product.prodname_vs %}. To see instructions for other popular coding environments, use the tool switcher at the top of the page.
+These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in {% data variables.product.prodname_vs %}. To see instructions for other popular coding environments, click the appropriate tab at the top of the page.
 
 1. In the Git Changes window, click **Review changes with {% data variables.product.prodname_copilot_short %}**.
    This button appears as a comment icon with a sparkle.
@@ -182,7 +176,7 @@ For more information on enabling and configuring {% data variables.copilot.copil
 
 ## Using {% data variables.copilot.copilot_code-review_short %}
 
-These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in {% data variables.product.prodname_mobile %}. To see instructions for other popular coding environments, use the tool switcher at the top of the page.
+These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in {% data variables.product.prodname_mobile %}. To see instructions for other popular coding environments, click the appropriate tab at the top of the page.
 
 1. In {% data variables.product.prodname_mobile %}, open a pull request.
 1. Scroll down to the **Reviews** section and expand it.
@@ -192,3 +186,34 @@ These instructions explain how to use {% data variables.copilot.copilot_code-rev
 {% data variables.product.prodname_copilot_short %} will review the changes and provide feedback.
 
 {% endmobile %}
+
+{% xcode %}
+
+## Prerequisite
+
+To use {% data variables.copilot.copilot_code-review_short %} in Xcode, you must use version 0.41.0 or later of the {% data variables.copilot.copilot_chat %} extension. Download the latest release from the [`github/CopilotForXcode` repository](https://github.com/github/CopilotForXcode/releases/latest).
+
+## Using {% data variables.copilot.copilot_code-review_short %}
+
+These instructions explain how to use {% data variables.copilot.copilot_code-review_short %} in Xcode. To see instructions for other popular coding environments, click the appropriate tab at the top of the page.
+
+1. In Xcode, make some changes to one or more files.
+1. Open the {% data variables.product.prodname_copilot_short %} chat window by clicking **Editor** in the menu bar, clicking **{% data variables.product.prodname_copilot %}** then **Open Chat**.
+1. Near the bottom right of the prompt box in the {% data variables.product.prodname_copilot_short %} chat window, click the **Code Review** button (a speech bubble icon).
+
+   ![Screenshot of the {% data variables.product.prodname_copilot_short %} chat window in Xcode, with the 'Code Review' button outlined in dark orange.](/assets/images/help/copilot/code-review/xcode-ccr-button.png)
+
+1. Click either **Review Staged Changes** or **Review Unstaged Changes**.
+1. A list of files containing changes is displayed in the chat window. Click the check boxes to deselect any files you don't want {% data variables.product.prodname_copilot_short %} to review.
+1. Click **Continue** to start the review process.
+1. If {% data variables.product.prodname_copilot_short %} finds things to comment on, it displays a **Reviewed Changes** list in the chat window, listing the files it has commented on. Click a file in this list to see the comments.
+
+   Each comment is shown in a popup, overlaid over the editor.
+
+   ![Screenshot of a {% data variables.copilot.copilot_code-review_short %} review comment.](/assets/images/help/copilot/code-review/xcode-review-popup.png)
+
+1. If there is more than one comment in the file, use the up and down arrows, at the top right of the popup, to navigate between comments.
+1. {% data variables.product.prodname_copilot_short %} may suggest replacement code. You can apply the suggested change by clicking **Accept** or reject it by clicking **Dismiss**.
+1. Click another file in the **Reviewed Changes** list in the chat window, to see the review comments for another file.
+
+{% endxcode %}

content/copilot/how-tos/use-chat/use-chat-in-ide.md

@@ -40,7 +40,9 @@ What you need to know about the following actions:
   * Billing for that user stops at the end of the cycle.
   * Reduced seat count takes effect at the start of the **next billing cycle**.
   * **No refunds are issued for unused time in the current cycle.**
-* **Access:** If a seat is unassigned during a billing cycle, the affected user can still access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
+* **Access:**
+  * If a seat is unassigned during a billing cycle, the affected user can still access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
+  * If a seat is revoked, users lose access **immediately.**
 
 Additionally:
 
@@ -58,9 +60,12 @@ What you need to know about the following actions:
 ### Removing seats
 
 * **Billing:**
-  * The reduced seat count is effective in the **next billing cycle**.
-  * **There are no refunds for the current cycle.**
-* **Access:** Users lose access **immediately** if their seat is removed, but seats can be reassigned within the current cycle until the new count applies.
+  * Billing for that user stops at the end of the cycle.
+  * Reduced seat count takes effect at the start of the **next billing cycle.**
+  * **No refunds are issued for unused time in the current cycle.**
+* **Access:**
+  * If a seat is unassigned during a billing cycle, the affected user can still access {% data variables.product.prodname_copilot_short %} until the end of the cycle.
+  * If a seat is revoked, users lose access **immediately.**
 
 Additionally:
 
@@ -72,8 +77,7 @@ Additionally:
 
 * **Proration:** Applies when adding seats/licenses or upgrading plans. You pay only for the portion of the billing cycle remaining.
 * **Access:** Assignments and plan changes are effective immediately for affected users.
-* **Removing or canceling:** No refunds are issued for unused time; access continues until the end of the cycle paid for, unless a seat/license is unassigned.
-* **Reassignment:** In {% data variables.copilot.copilot_for_business %} and {% data variables.copilot.copilot_enterprise %} plans, unassigned seats/licenses can be immediately reassigned to another user during the current billing cycle.
+* **Removing or canceling:** No refunds are issued for unused time; access continues until the end of the cycle paid for, unless a seat/license is revoked.
 
 | Scenario                        | Plan                | When is billing affected? | Is proration applied? | When does access change? | Refund for unused time? |
 |----------------------------------|---------------------|--------------------------|----------------------|--------------------------|-------------------------|