Merge pull request github#37595 from github/repo-sync

Repo sync

Author: docs-bot

content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md

@@ -1,7 +1,7 @@
 ---
 title: About billing for GitHub Copilot
 shortTitle: Billing for GitHub Copilot
-intro: '{% data variables.product.prodname_dotcom %} offers multiple subscription options for enterprises, organizations, and individuals to use {% data variables.product.prodname_copilot %}.'
+intro: '{% data variables.product.prodname_dotcom %} offers several {% data variables.product.prodname_copilot_short %} plans for enterprises, organizations, and individual developers.'
 versions:
   feature: copilot
 topics:
@@ -12,15 +12,15 @@ redirect_from:
 
 ## {% data variables.product.prodname_copilot %} in your enterprise
 
-Enterprises on {% data variables.product.prodname_ghe_cloud %} can subscribe to either {% data variables.product.prodname_copilot_for_business %} or {% data variables.product.prodname_copilot_enterprise %}, or a mixture of both across different organizations within an enterprise. Both subscriptions are available on a monthly cycle, and pricing varies. For more information, 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).
+Enterprises on {% data variables.product.prodname_ghe_cloud %} can subscribe to either {% data variables.product.prodname_copilot_for_business %} or {% data variables.product.prodname_copilot_enterprise %}, or a mixture of both across different organizations within an enterprise. Both plans are available on a monthly cycle, and pricing varies. For more information, 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).
 
 ## {% data variables.product.prodname_copilot %} in your organization
 
-Subscriptions to {% data variables.product.prodname_copilot_for_business %} are available on a monthly cycle, for {% data variables.copilot.cfb_price_per_month %} per user per month. For more information, see [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-subscription-for-your-organization/about-billing-for-github-copilot-in-your-organization).
+{% data variables.product.github %} bills {% data variables.product.prodname_copilot_business_short %} on a monthly cycle, for {% data variables.copilot.cfb_price_per_month %} per user per month. For more information, see [AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-the-copilot-subscription-for-your-organization/about-billing-for-github-copilot-in-your-organization).
 
 ## {% data variables.product.prodname_copilot %} as an individual
 
-Subscriptions to {% data variables.product.prodname_copilot_pro %} and {% data variables.product.prodname_copilot_pro_plus %} are available on a monthly or yearly cycle:
+{% data variables.product.prodname_copilot_pro %} and {% data variables.product.prodname_copilot_pro_plus %} plans are available on a monthly or yearly cycle:
 
 * **{% data variables.product.prodname_copilot_pro_short %}**: {% data variables.copilot.cfi_price_per_month %} per calendar month or {% data variables.copilot.cfi_price_per_year %} per year.
 * **{% data variables.product.prodname_copilot_pro_plus_short %}**: {% data variables.copilot.cpp_price_per_month %} per calendar month or {% data variables.copilot.cpp_price_per_year %} per year.
@@ -43,7 +43,7 @@ If you see a trial expiration notice but have an active paid subscription, this
 
 Some migrations cannot be completed through self-service options.
 
-* **Non-enterprise to enterprise environment migrations**: When moving from standalone {% data variables.product.prodname_copilot_short %} subscriptions to a {% data variables.product.prodname_enterprise %} environment, contact {% data variables.contact.contact_support_page %} or your account manager for assistance to avoid service interruption.
+* **Non-enterprise to enterprise environment migrations**: When moving from standalone {% data variables.product.prodname_copilot_short %} plans to a {% data variables.product.prodname_enterprise %} environment, contact {% data variables.contact.contact_support_page %} or your account manager for assistance to avoid service interruption.
 
 * **Changing between {% data variables.product.prodname_copilot_business_short %} and {% data variables.product.prodname_copilot_enterprise_short %}**: If you need to migrate between these plans within your enterprise and the option isn't available in your "Billing & Licensing" settings, contact {% data variables.contact.contact_support_page %} or your account manager for assistance.
 

content/copilot/about-github-copilot/github-copilot-features.md

@@ -72,7 +72,7 @@ Create and manage collections of documentation to use as context for chatting wi
 
 ## {% data variables.product.prodname_copilot %} features for administrators
 
-The following features are available to organization and enterprise owners with a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} subscription.
+The following features are available to organization and enterprise owners with a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} plan.
 
 ### Policy management
 
@@ -96,5 +96,5 @@ Configure {% data variables.product.prodname_copilot_short %} to ignore certain
 
 ## Next steps
 
-* To learn more about the subscription plans available for {% data variables.product.prodname_copilot %}, see [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot).
+* To learn more about the plans available for {% data variables.product.prodname_copilot %}, see [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot).
 * To start using {% data variables.product.prodname_copilot_short %}, see [AUTOTITLE](/copilot/setting-up-github-copilot).

content/copilot/about-github-copilot/index.md

@@ -9,5 +9,5 @@ topics:
 children:
   - /what-is-github-copilot
   - /github-copilot-features
-  - /subscription-plans-for-github-copilot
+  - /plans-for-github-copilot
 ---

content/copilot/about-github-copilot/subscription-plans-for-github-copilot.md renamed to content/copilot/about-github-copilot/plans-for-github-copilot.md

@@ -1,11 +1,13 @@
 ---
-title: Subscription plans for GitHub Copilot
-intro: 'Learn about the subscription options for {% data variables.product.prodname_copilot_short %}.'
+title: Plans for GitHub Copilot
+intro: 'Learn about the available plans for {% data variables.product.prodname_copilot_short %}.'
 versions:
   feature: copilot
 topics:
   - Copilot
-shortTitle: Subscriptions
+shortTitle: Plans for Copilot
+redirect_from:
+  - /copilot/about-github-copilot/subscription-plans-for-github-copilot
 ---
 
 <!-- expires 2025-05-05 -->

content/copilot/about-github-copilot/what-is-github-copilot.md

@@ -55,10 +55,10 @@ There are a few ways you can start using {% data variables.product.prodname_copi
 
 ### For individuals
 
-* **Try {% data variables.product.prodname_copilot_short %} for free**: Use {% data variables.product.prodname_copilot_free_short %} to explore core {% data variables.product.prodname_copilot_short %} features with no subscription required.
+* **Try {% data variables.product.prodname_copilot_short %} for free**: Use {% data variables.product.prodname_copilot_free_short %} to explore core {% data variables.product.prodname_copilot_short %} features with no paid plan required.
 * **Subscribe to a paid plan**: Upgrade to {% data variables.product.prodname_copilot_pro_short %} or {% data variables.product.prodname_copilot_pro_plus_short %} for full access to premium features and more generous usage limits. You can <a href="https://github.com/github-copilot/signup?ref_cta=Copilot+trial&ref_loc=about+github+copilot&ref_page=docs" target="_blank"><span>try {% data variables.product.prodname_copilot_pro_short %} for free</span></a> with a one-time 30-day trial.
 * **Eligible for free {% data variables.product.prodname_copilot_pro_short %} access?** Students, teachers, and open source maintainers may qualify for {% data variables.product.prodname_copilot_pro_short %} at no cost. See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/getting-free-access-to-copilot-as-a-student-teacher-or-maintainer).
-* **Organization members**: If your organization or enterprise has a subscription to {% data variables.product.prodname_copilot %}, you can request access to {% data variables.product.prodname_copilot_short %} by going to [https://github.com/settings/copilot](https://github.com/settings/copilot) and requesting access under "Get {% data variables.product.prodname_copilot_short %} from an organization."
+* **Organization members**: If your organization or enterprise has a {% data variables.product.prodname_copilot %} plan, you can request access to {% data variables.product.prodname_copilot_short %} by going to [https://github.com/settings/copilot](https://github.com/settings/copilot) and requesting access under "Get {% data variables.product.prodname_copilot_short %} from an organization."
 
 See [AUTOTITLE](/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/getting-started-with-copilot-on-your-personal-account/getting-started-with-a-copilot-plan) for more information.
 

content/copilot/customizing-copilot/adding-repository-custom-instructions-for-github-copilot.md

@@ -117,7 +117,7 @@ For an overview of the methods you can use to customize {% data variables.produc
 {% webui %}
 
 * Your personal choice of whether to use custom instructions must be set to enabled. This is enabled by default. See [Enabling or disabling repository custom instructions](#enabling-or-disabling-repository-custom-instructions) later in this article.
-* During the {% data variables.release-phases.public_preview %}, if you have a {% data variables.product.prodname_copilot_business_short %} {% ifversion ghec %}or {% data variables.product.prodname_copilot_enterprise_short %}{% endif %} subscription, then the organization {% ifversion ghec %}or enterprise{% endif %} from which you receive your subscription must have the **Opt in to preview features** setting enabled. See [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization#enabling-copilot-features-in-your-organization){% ifversion ghec %} and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise#copilot-in-githubcom){% endif %}.
+* During the {% data variables.release-phases.public_preview %}, if you're using a {% data variables.product.prodname_copilot_business_short %} {% ifversion ghec %}or {% data variables.product.prodname_copilot_enterprise_short %}{% endif %} plan, the organization {% ifversion ghec %}or enterprise{% endif %} that provides your plan must have the **Opt in to preview features** setting enabled. See [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization#enabling-copilot-features-in-your-organization){% ifversion ghec %} and [AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise#copilot-in-githubcom){% endif %}.
 
 {% endwebui %}
 
@@ -280,6 +280,6 @@ To enable prompt files, configure the workspace settings.
 
 1. Submit the chat prompt.
 
-For more information about prompt files, see [Custom instructions for GitHub Copilot in VS Code](https://code.visualstudio.com/docs/copilot/copilot-customization#_reusable-prompt-files-experimental) in the {% data variables.product.prodname_vscode %} documentation.
+For more information about prompt files, see [Custom instructions for {% data variables.product.prodname_copilot %} in VS Code](https://code.visualstudio.com/docs/copilot/copilot-customization#_reusable-prompt-files-experimental) in the {% data variables.product.prodname_vscode %} documentation.
 
 {% endvscode %}

content/copilot/customizing-copilot/creating-a-custom-model-for-github-copilot.md

@@ -22,7 +22,7 @@ The code on which you want to train a custom model must be hosted in repositorie
 ## Limitations
 
 * For the {% data variables.release-phases.public_preview %}, an enterprise can deploy one custom model in a single organization.
-* Code completion suggestions based on the custom model are only available to managed users who get a {% data variables.product.prodname_copilot_enterprise_short %} subscription from the organization in which the custom model is deployed. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/managing-iam/understanding-iam-for-enterprises/about-enterprise-managed-users).
+* Code completion suggestions based on the custom model are only available to managed users who get a {% data variables.product.prodname_copilot_enterprise_short %} plan from the organization in which the custom model is deployed. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/managing-iam/understanding-iam-for-enterprises/about-enterprise-managed-users).
 * The custom model is not used for code suggested in responses by {% data variables.product.prodname_copilot_chat %}.
 
 ## About {% data variables.product.prodname_copilot_short %} custom models
@@ -125,9 +125,9 @@ Retraining the model updates it to include any new code that has been added to t
 1. Go to your organization's settings for {% data variables.product.prodname_copilot_short %} custom models. See [Creating a custom model](#creating-a-custom-model) above.
 1. On the model training page, click the first ellipsis button (**...**), then click either **Retrain model** or **Delete model**.
 
-If you retrain the model, {% data variables.product.prodname_copilot_short %} will continue to use the current model to generate code completion suggestions until the new model is ready. Once the new model is ready, it will be automatically be used for code completion suggestions for all managed users who get a {% data variables.product.prodname_copilot_enterprise_short %} subscription from the organization.
+If you retrain the model, {% data variables.product.prodname_copilot_short %} will continue to use the current model to generate code completion suggestions until the new model is ready. Once the new model is ready, it will be automatically be used for code completion suggestions for all managed users who get a {% data variables.product.prodname_copilot_enterprise_short %} plan from the organization.
 
-If you delete the custom model, {% data variables.product.prodname_copilot_short %} will use the base model for generating code completion suggestions for all users who get a {% data variables.product.prodname_copilot_short %} subscription from the organization.
+If you delete the custom model, {% data variables.product.prodname_copilot_short %} will use the base model for generating code completion suggestions for all users who get a {% data variables.product.prodname_copilot_short %} plan from the organization.
 
 ## Telemetry data collection and usage for custom models
 

content/copilot/customizing-copilot/extending-the-capabilities-of-github-copilot-in-your-organization.md

@@ -20,9 +20,9 @@ redirect_from:
 
 {% data reusables.copilot.copilot-extensions.copilot-extensions-on-marketplace %}
 
-Any organization owner can install {% data variables.product.prodname_copilot_extensions_short %} for their organization, but your organization must have an active {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} subscription.
+Any organization owner can install {% data variables.product.prodname_copilot_extensions_short %} for their organization, but your organization must have an active {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} plan.
 
-> [!NOTE] Anyone can install a {% data variables.product.prodname_copilot_extension_short %} on their personal account. However, if they get access to {% data variables.product.prodname_copilot_short %} through a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} subscription, they will only be able to use the extension if it is installed at the organization level.
+> [!NOTE] Anyone can install a {% data variables.product.prodname_copilot_extension_short %} on their personal account. However, if they get access to {% data variables.product.prodname_copilot_short %} through a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} plan, they will only be able to use the extension if it is installed at the organization level.
 
 You can also create your own custom {% data variables.product.prodname_copilot_extensions_short %} for your organization. For more information, see [AUTOTITLE](/copilot/building-copilot-extensions/about-building-copilot-extensions).
 
@@ -35,7 +35,7 @@ Before you install any {% data variables.product.prodname_copilot_extensions_sho
 1. Open [{% data variables.product.prodname_marketplace %}](https://github.com/marketplace?type=apps&copilot_app=true).
 1. In the left sidebar, click **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}**.
 1. In the list of {% data variables.product.prodname_copilot_extensions_short %}, locate an app you'd like to install.
-1. To install the {% data variables.product.prodname_copilot_extension_short %} on an organization with a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} subscription, see [AUTOTITLE](/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations).
+1. To install the {% data variables.product.prodname_copilot_extension_short %} on an organization with a {% data variables.product.prodname_copilot_business_short %} or {% data variables.product.prodname_copilot_enterprise_short %} plan, see [AUTOTITLE](/apps/using-github-apps/installing-a-github-app-from-github-marketplace-for-your-organizations).
 {% data reusables.copilot.copilot-extensions.extension-specific-onboarding-steps %}
 
 ## Next steps

content/copilot/customizing-copilot/managing-copilot-knowledge-bases.md

@@ -38,7 +38,7 @@ For more information on how to use knowledge bases in {% data variables.product.
 
 You can create a knowledge base from a single repository or a selection of repositories. You can create a knowledge base using public, private, and/or internal repositories.
 
-Knowledge bases you create will be accessible by all organization members with a {% data variables.product.prodname_copilot_enterprise %} subscription. When an organization member uses a knowledge base as context in {% data variables.product.prodname_copilot_chat %}, the response will only use data from repositories that the organization member has read access to.
+Knowledge bases you create will be accessible by all organization members with a {% data variables.product.prodname_copilot_enterprise_short %} plan. When an organization member uses a knowledge base as context in {% data variables.product.prodname_copilot_chat %}, the response will only use data from repositories that the organization member has read access to.
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}

content/copilot/managing-copilot/configure-personal-settings/configuring-network-settings-for-github-copilot.md

@@ -2,7 +2,6 @@
 title: Configuring network settings for GitHub Copilot
 shortTitle: Network settings
 intro: 'You can connect to {% data variables.product.prodname_copilot_short %} through an HTTP proxy and use custom certificates.'
-product: '{% data reusables.gated-features.copilot %}'
 topics:
   - Copilot
 versions: