Skip to content

Commit 104eece

Browse files
authored
Merge pull request #36094 from github/repo-sync
Repo sync
2 parents ef877fc + 8a16e75 commit 104eece

File tree

48 files changed

+56
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+56
-55
lines changed

content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/extending-the-capabilities-of-github-copilot-in-your-personal-account.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ redirect_from:
1818

1919
{% data reusables.copilot.copilot-extensions.copilot-extensions-on-marketplace %}
2020

21-
Anyone can install {% data variables.product.prodname_copilot_extensions_short %} for their personal account, but you must have an active {% data variables.product.prodname_copilot_pro_short %} subscription to use a {% data variables.product.prodname_copilot_extension_short %} you install.
21+
Anyone can install {% data variables.product.prodname_copilot_extensions_short %} for their personal account, but you must set up {% data variables.product.prodname_copilot_free_short %}, or have an active {% data variables.product.prodname_copilot_pro_short %} subscription, to use a {% data variables.product.prodname_copilot_extension_short %} you install.
2222

2323
> [!NOTE] If you have 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, {% data variables.product.prodname_copilot_extensions_short %} are installed by organization owners at the organization level, and you do not need to install the extension on your personal account. To start using {% data variables.product.prodname_copilot_extensions_short %} installed in your organization, see [AUTOTITLE](/copilot/github-copilot-chat/github-copilot-extensions/using-github-copilot-extensions).
2424

content/copilot/using-github-copilot/getting-code-suggestions-in-your-ide-with-github-copilot.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The examples in this guide use Java, however other languages will work similarly
4949

5050
## Prerequisites
5151

52-
* **Subscription to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in JetBrains, you must have an active {% data variables.product.prodname_copilot %} subscription. {% data reusables.copilot.subscription-prerequisite %}
52+
* **Access to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in JetBrains, you need either an active {% data variables.product.prodname_copilot_short %} subscription (such as {% data variables.product.prodname_copilot_pro_short %}, {% data variables.product.prodname_copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_business_short %}) or access through {% data variables.product.prodname_copilot_free_short %}, which provides limited functionality. {% data reusables.copilot.subscription-prerequisite %}
5353

5454
* **Compatible JetBrains IDE**. To use {% data variables.product.prodname_copilot %} in JetBrains, you must have a compatible JetBrains IDE installed. {% data variables.product.prodname_copilot %} is compatible with the following IDEs:
5555

@@ -151,7 +151,7 @@ The examples in this guide use C#, however other languages will work similarly.
151151
152152
## Prerequisites
153153
154-
* **Subscription to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in Visual Studio, you must have an active {% data variables.product.prodname_copilot %} subscription. {% data reusables.copilot.subscription-prerequisite %}
154+
* **Access to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in Visual Studio, you need either an active {% data variables.product.prodname_copilot_short %} subscription (such as {% data variables.product.prodname_copilot_pro_short %}, {% data variables.product.prodname_copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_business_short %}) or access through {% data variables.product.prodname_copilot_free_short %}, which provides limited functionality. {% data reusables.copilot.subscription-prerequisite %}
155155
156156
{% data reusables.copilot.visual-studio-prerequisites %}
157157
@@ -211,7 +211,7 @@ The examples in this guide use JavaScript, however other languages will work sim
211211
212212
## Prerequisites
213213
214-
* **Subscription to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vscode %}, you must have an active {% data variables.product.prodname_copilot %} subscription. {% data reusables.copilot.subscription-prerequisite %}
214+
* **Access to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vscode %}, you need either an active {% data variables.product.prodname_copilot_short %} subscription (such as {% data variables.product.prodname_copilot_pro_short %}, {% data variables.product.prodname_copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_business_short %}) or access through {% data variables.product.prodname_copilot_free_short %}, which provides limited functionality. {% data reusables.copilot.subscription-prerequisite %}
215215
216216
* **{% data variables.product.prodname_vscode %}**. To use {% data variables.product.prodname_copilot %} in {% data variables.product.prodname_vscode %}, you must have {% data variables.product.prodname_vscode %} installed. For more information, see the [{% data variables.product.prodname_vscode %} download page](https://code.visualstudio.com/Download).
217217
@@ -310,7 +310,7 @@ This guide demonstrates how to get coding suggestions from {% data variables.pro
310310

311311
## Prerequisites
312312

313-
* **Subscription to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in Vim/Neovim, you must have an active {% data variables.product.prodname_copilot %} subscription. {% data reusables.copilot.subscription-prerequisite %}
313+
* **Access to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in Vim/Neovim, you need either an active {% data variables.product.prodname_copilot_short %} subscription (such as {% data variables.product.prodname_copilot_pro_short %}, {% data variables.product.prodname_copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_business_short %}) or access through {% data variables.product.prodname_copilot_free_short %}, which provides limited functionality. {% data reusables.copilot.subscription-prerequisite %}
314314

315315
* **Compatible version of Vim/Neovim**. To use {% data variables.product.prodname_copilot %} in Vim/Neovim you must have Vim version 9.0.0185 / Neovim version 0.6 or above and Node.js version 18 or above installed. For more information, see the [Vim](https://vimhelp.org/) / [Neovim documentation](https://neovim.io/doc/) and the [Node.js website](https://nodejs.org/en/).
316316

@@ -336,7 +336,7 @@ This guide demonstrates how to get coding suggestions from {% data variables.pro
336336

337337
## Prerequisites
338338

339-
* **Subscription to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in Azure Data Studio, you must have an active {% data variables.product.prodname_copilot %} subscription. {% data reusables.copilot.subscription-prerequisite %}
339+
* **Access to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} in Azure Data Studio, you need either an active {% data variables.product.prodname_copilot_short %} subscription (such as {% data variables.product.prodname_copilot_pro_short %}, {% data variables.product.prodname_copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_business_short %}) or access through {% data variables.product.prodname_copilot_free_short %}, which provides limited functionality. {% data reusables.copilot.subscription-prerequisite %}
340340

341341
* **Compatible version of Azure Data Studio**. To use {% data variables.product.prodname_copilot %} in Azure Data Studio, you must have Azure Data Studio version 1.44.0 or later installed. For more information, see the [Azure Data Studio download page](https://docs.microsoft.com/sql/azure-data-studio/download-azure-data-studio) in the Azure Data Studio documentation.
342342

@@ -434,7 +434,7 @@ This guide demonstrates how to get coding suggestions from {% data variables.pro
434434

435435
## Prerequisites
436436

437-
* **Subscription to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} for Xcode, you must have an active {% data variables.product.prodname_copilot %} subscription. {% data reusables.copilot.subscription-prerequisite %}
437+
* **Access to {% data variables.product.prodname_copilot_short %}**. To use {% data variables.product.prodname_copilot %} for Xcode, you need either an active {% data variables.product.prodname_copilot_short %} subscription (such as {% data variables.product.prodname_copilot_pro_short %}, {% data variables.product.prodname_copilot_enterprise_short %}, or {% data variables.product.prodname_copilot_business_short %}) or access through {% data variables.product.prodname_copilot_free_short %}, which provides limited functionality. {% data reusables.copilot.subscription-prerequisite %}
438438

439439
* **Compatible versions of Xcode and macOS**. To use {% data variables.product.prodname_copilot %} for Xcode you must have Xcode version 8.0 or above and macOS Monterey (12.0) or above installed. See [Xcode](https://developer.apple.com/xcode/) on the Apple Developer site.
440440

content/copilot/using-github-copilot/using-github-copilot-for-pull-requests/using-copilot-to-help-you-work-on-a-pull-request.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ After you create a pull request, you can continue working on the PR on the {% da
4040

4141
Using {% data variables.product.prodname_copilot_workspace %} requires:
4242

43-
* A {% data variables.product.prodname_copilot_short %} subscription. For more information, see [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot).
44-
* Admission to the {% data variables.release-phases.public_preview %} from the waitlist. To apply to join the waitlist, see [Join the Copilot code review waitlist](https://gh.io/copilot-code-review-waitlist).
43+
* Access to {% data variables.product.prodname_copilot_short %}. For more information, see [AUTOTITLE](/copilot/about-github-copilot/subscription-plans-for-github-copilot).
44+
* Admission to the {% data variables.release-phases.public_preview %} from the waitlist. To apply to join the waitlist, see [Join the {% data variables.product.prodname_copilot_short %} code review waitlist](https://gh.io/copilot-code-review-waitlist).
4545
* An existing pull request on the {% data variables.product.github %} website. If you need help on creating a pull request, see [AUTOTITLE](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
4646

4747
Without access {% data variables.product.prodname_copilot_workspace %} you can still edit the files in pull requests by going to the **Files changed** tab, clicking the ellipsis (**...**) next to the file you want to edit, and then clicking **Edit file**.

content/get-started/writing-on-github/working-with-advanced-formatting/creating-a-permanent-link-to-a-code-snippet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ shortTitle: Permanent links to code
1818

1919
## Linking to code
2020

21-
This type of permanent link will render as a code snippet only in the repository it originated in. In other repositories, the permalink code snippet will render as a URL.
21+
This type of permanent link will render as a code snippet only in the repository it originated in. In other repositories, the permalink code snippet will render as a URL. This does not work in Markdown files, only in comments.
2222

2323
![Screenshot of an issue comment. A code snippet has a header that lists the file name and line numbers, and a body that lists the code on those lines.](/assets/images/help/repository/rendered-code-snippet.png)
2424

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
You'll need a {% data variables.product.prodname_copilot %} subscription. For more information, see [AUTOTITLE](/copilot/about-github-copilot/what-is-github-copilot#getting-access-to-copilot).
1+
You'll need access to {% data variables.product.prodname_copilot %}. For more information, see [AUTOTITLE](/copilot/about-github-copilot/what-is-github-copilot#getting-access-to-copilot).
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
you must already have an account on {% data variables.product.github %}.{% ifversion fpt or ghec %} For more information, see [AUTOTITLE](/get-started/start-your-journey/creating-an-account-on-github).{% endif %}{% ifversion ghec %} If you're part of an organization that uses {% data variables.product.prodname_emus %} and you do not have an account, contact your enterprise administrator.{% elsif ghes %} If you're a member of an organization that uses {% data variables.product.product_name %} and you do not have an account, contact your {% data variables.product.prodname_enterprise %} site administrator.{% endif %}
1+
you must already have an account on {% data variables.product.github %}.{% ifversion fpt or ghec %} For more information, see [AUTOTITLE](/get-started/start-your-journey/creating-an-account-on-github).{% endif %}{% ifversion ghec %} If you're part of an organization that uses {% data variables.product.prodname_emus %} and you do not have an account, contact your enterprise administrator.{% elsif ghes %} If you're a member of an organization that uses {% data variables.product.prodname_ghe_server %} and you do not have an account, contact your {% data variables.product.prodname_enterprise %} site administrator.{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If the commits you make in {% data variables.product.prodname_desktop %} are associated with the wrong account on {% data variables.product.product_name %}, update the email address in your Git configuration using {% data variables.product.prodname_desktop %}.
1+
If the commits you make in {% data variables.product.prodname_desktop %} are associated with the wrong account on {% data variables.product.github %}, update the email address in your Git configuration using {% data variables.product.prodname_desktop %}.

data/reusables/developer-site/pull_request_forked_repos_link.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Workflows don't run in forked repositories by default. You must enable GitHub Ac
66

77
#### Pull request events for forked repositories
88

9-
For pull requests from a forked repository to the base repository, {% data variables.product.product_name %} sends the `pull_request`, `issue_comment`, `pull_request_review_comment`, `pull_request_review`, and `pull_request_target` events to the base repository. No pull request events occur on the forked repository.
9+
For pull requests from a forked repository to the base repository, {% data variables.product.github %} sends the `pull_request`, `issue_comment`, `pull_request_review_comment`, `pull_request_review`, and `pull_request_target` events to the base repository. No pull request events occur on the forked repository.
1010

1111
{% ifversion fpt or ghec %}
1212
When a first-time contributor submits a pull request to a public repository, a maintainer with write access may need to approve running workflows on the pull request. For more information, see [AUTOTITLE](/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks).
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{% data variables.product.prodname_discussions %} is an open forum for conversation among maintainers and the community for a repository or organization on {% data variables.product.product_name %}.
1+
{% data variables.product.prodname_discussions %} is an open forum for conversation among maintainers and the community for a repository or organization on {% data variables.product.github %}.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
You can read documentation that reflects the features available to you on {% data variables.product.product_name %}. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-versions-of-github-docs).
1+
You can read documentation that reflects the {% data variables.product.github %} product you're currently using. For more information, see [AUTOTITLE](/get-started/learning-about-github/about-versions-of-github-docs).

data/reusables/dotcom_billing/payment-methods.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ If your {% data variables.product.prodname_ghe_cloud %} account uses metered bil
88
99
{% else %}
1010

11-
You can pay for {% data variables.product.product_name %} with a credit card or with a PayPal account.
11+
You can pay for {% data variables.product.company_short %} with a credit card or with a PayPal account.
1212

1313
{% endif %}

data/reusables/education/educator-requirements.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ To apply for teacher benefits and {% data variables.product.prodname_global_camp
33
* Be an educator, faculty member, or researcher.
44
* Have a verifiable school-issued email address.
55
* Upload documents that prove your school affiliation.
6-
* Have a personal account on {% data variables.product.product_name %}.
6+
* Have a personal account on {% data variables.product.github %}.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1. After {% data variables.product.product_name %} redirects you to your IdP, sign in, then follow the instructions to give consent and install the {% data variables.product.prodname_emu_idp_oidc_application %} application. After Entra ID asks for permissions for {% data variables.product.company_short %} {% data variables.product.prodname_emus %} with OIDC, enable **Consent on behalf of your organization**, then click **Accept**.
1+
1. After {% data variables.product.github %} redirects you to your IdP, sign in, then follow the instructions to give consent and install the {% data variables.product.prodname_emu_idp_oidc_application %} application. After Entra ID asks for permissions for {% data variables.product.company_short %} {% data variables.product.prodname_emus %} with OIDC, enable **Consent on behalf of your organization**, then click **Accept**.
22

33
> [!WARNING]
44
> You must sign in to Entra ID as a user with global admin rights in order to consent to the installation of the {% data variables.product.prodname_emu_idp_oidc_application %} application.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
If you choose to use {% data variables.product.prodname_emus %}, you have increased control over your enterprise's members and resources. With {% data variables.product.prodname_emus %}, all members are provisioned and managed through your identity provider (IdP) instead of users creating their own accounts on {% data variables.product.product_name %}. Organization and team membership can be managed using groups on your IdP. {% data variables.enterprise.prodname_managed_users_caps %} are restricted to their enterprise and are unable to push code, collaborate, or interact with users, repositories, and organizations outside of their enterprise. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
1+
If you choose to use {% data variables.product.prodname_emus %}, you have increased control over your enterprise's members and resources. With {% data variables.product.prodname_emus %}, all members are provisioned and managed through your identity provider (IdP) instead of users creating their own accounts on {% data variables.product.github %}. Organization and team membership can be managed using groups on your IdP. {% data variables.enterprise.prodname_managed_users_caps %} are restricted to their enterprise and are unable to push code, collaborate, or interact with users, repositories, and organizations outside of their enterprise. For more information, see [AUTOTITLE](/enterprise-cloud@latest/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users){% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
When assigning users, you can use the "Roles" attribute in the application on your IdP to set a user's role in your enterprise on {% data variables.product.product_name %}. For more information about the roles available to assign, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise).
1+
When assigning users, you can use the "Roles" attribute in the application on your IdP to set a user's role in your enterprise. For more information about the roles available to assign, see [AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise).

0 commit comments

Comments
 (0)