Skip to content

Commit 2fe9125

Browse files
authored
Merge pull request #37026 from github/repo-sync
Repo sync
2 parents 0466180 + 82aa30f commit 2fe9125

File tree

18 files changed

+51
-44
lines changed

18 files changed

+51
-44
lines changed

content/code-security/trialing-github-advanced-security/explore-trial-code-scanning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ When you have finished exploring these options and {% data variables.product.pro
128128
* [AUTOTITLE](/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions)
129129
* [AUTOTITLE](/admin/enforcing-policies/enforcing-policies-for-your-enterprise)
130130
* [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/governing-how-people-use-repositories-in-your-enterprise)
131-
* [Enforce {% data variables.product.prodname_GHAS %} at Scale](https://wellarchitected.github.com/library/application-security/scenarios-and-recommendations/enforce-ghas-at-scale/)
131+
* [Enforce {% data variables.product.prodname_GHAS %} at Scale](https://wellarchitected.github.com/library/application-security/recommendations/enforce-ghas-at-scale/)

content/code-security/trialing-github-advanced-security/explore-trial-secret-scanning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ When you have enabled the additional controls for {% data variables.product.prod
6666

6767
## Further reading
6868

69-
* [Enforce {% data variables.product.prodname_GHAS %} at Scale](https://wellarchitected.github.com/library/application-security/scenarios-and-recommendations/enforce-ghas-at-scale/)
69+
* [Enforce {% data variables.product.prodname_GHAS %} at Scale](https://wellarchitected.github.com/library/application-security/recommendations/enforce-ghas-at-scale/)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ Bringing the power of industry leading large and small language models to users
5454

5555
AI-generated code review suggestions to help you write better code. For more information, see [AUTOTITLE](/copilot/using-github-copilot/code-review/using-copilot-code-review).
5656

57-
### {% data variables.product.prodname_copilot_edits_vscode_short %}
57+
### {% data variables.product.prodname_copilot_edits_short %}
5858

59-
{% data variables.product.prodname_copilot_edits_vscode_short %} is available in {% data variables.product.prodname_vscode %}. {% data reusables.copilot.about-copilot-edits %}
59+
{% data variables.product.prodname_copilot_edits_short %} is available in {% data variables.product.prodname_vscode %} and JetBrains IDEs. {% data reusables.copilot.copilot-edits.about-copilot-edits %}
6060

61-
For more information, see [{% data variables.product.prodname_copilot_edits_vscode_short %}](https://code.visualstudio.com/docs/copilot/copilot-edits) in the {% data variables.product.prodname_vscode %} documentation.
61+
For more information about {% data variables.product.prodname_copilot_edits_short %} in {% data variables.product.prodname_vscode %}, see [{% data variables.product.prodname_copilot_edits_short %}](https://code.visualstudio.com/docs/copilot/copilot-edits) in the {% data variables.product.prodname_vscode %} documentation.
6262

6363
### {% data variables.product.prodname_copilot_short %} knowledge bases _({% data variables.product.prodname_copilot_enterprise_short %} only)_
6464

content/copilot/managing-copilot/managing-copilot-as-an-individual-subscriber/managing-copilot-free/about-github-copilot-free.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ redirect_from:
2626

2727
* Code completion in {% data variables.product.prodname_vscode %}, {% data variables.product.prodname_vs %}, JetBrains IDEs, Vim/Neovim, Xcode, and Azure Data Studio
2828
* {% data variables.copilot.next_edit_suggestions_caps %}, which will predict the location of the next edit you are likely to make and suggest a completion for it. (**only in {% data variables.product.prodname_vscode_shortname %}**)
29-
* {% data variables.product.prodname_copilot_edits_vscode_short %} to make changes across multiple files. {% data variables.product.prodname_copilot_edits_vscode_short %} is available in two modes: edit mode and agent mode. (**only in {% data variables.product.prodname_vscode_shortname %}**)
29+
* {% data variables.product.prodname_copilot_edits_short %} to make changes across multiple files. {% data variables.product.prodname_copilot_edits_short %} is available in two modes: edit mode and agent mode. **(edit mode in {% data variables.product.prodname_vscode %} and JetBrains IDEs, agent mode only in {% data variables.product.prodname_vscode %})**
3030
* {% data variables.product.prodname_copilot_chat_short %} in {% data variables.product.prodname_vscode %}, {% data variables.product.prodname_vs %}, JetBrains IDEs, {% data variables.product.prodname_mobile %}, and {% data variables.product.prodname_dotcom_the_website %}
3131
* Custom instructions (**only in {% data variables.product.prodname_vs %}, {% data variables.product.prodname_vscode_shortname %}, and {% data variables.product.prodname_dotcom_the_website %}**)
3232
* Prompt files (**only in {% data variables.product.prodname_vscode_shortname %}**)

content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ Processing new telemetry events and updating a user's `last_activity_at` date ca
6464

6565
If you believe a user's `last_activity_at` date should be more recent than shown in the CSV or API report, please wait 24 hours and check again. If their recent Copilot usage is still not reflected in their `last_activity_at` date, have the user check that telemetry is enabled in their IDE settings.
6666

67-
For more information about enabling telemetry in various IDEs, see:
68-
69-
* [Enable or disable usage data collection for Azure Data Studio](https://learn.microsoft.com/azure-data-studio/usage-data-collection) in the Microsoft documentation
70-
* [Data Sharing](https://www.jetbrains.com/help/idea/settings-usage-statistics.html) in the JetBrains documentation
71-
* [Telemetry](https://code.visualstudio.com/docs/getstarted/telemetry) in the {% data variables.product.prodname_vscode_shortname %} documentation
72-
7367
## Further reading
7468

7569
{% ifversion ghec %}

content/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-github.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,17 @@ On {% data variables.product.github %}, you can use {% data variables.product.pr
2626

2727
The quality of the results from {% data variables.product.prodname_copilot_chat_short %} may, in some situations, be degraded if very large files, or a large number of files, are used as a context for a question.
2828

29-
### Viewing generated files within {% data variables.product.prodname_copilot_chat_short %}
29+
### Viewing and editing generated files within {% data variables.product.prodname_copilot_chat_short %}
3030

3131
> [!NOTE]
3232
> This feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
3333
34-
When you ask a question, {% data variables.product.prodname_copilot_short %} may generate one or more files as part of its response. In the {% data variables.product.prodname_copilot_chat_short %} panel, the files are displayed inline, within the chat response. In immersive view (that is, at [https://github.com/copilot](https://github.com/copilot)), the generated files are displayed in a side panel. You can view the files in the panel, or download them to your computer.
34+
When you ask a question, {% data variables.product.prodname_copilot_short %} may generate one or more files as part of its response. In the {% data variables.product.prodname_copilot_chat_short %} panel, the files are displayed inline, within the chat response. In immersive view (that is, at [https://github.com/copilot](https://github.com/copilot)), the generated files are displayed in a side panel. You can view and edit the files in the panel, or download them to your computer.
3535

3636
For example, asking `Generate a simple calculator using HTML, CSS, and JavaScript` may generate multiple files, such as `index.html`, `styles.css`, and `script.js`.
3737

38+
In immersive view, you can also preview how some file formats, such as Markdown, render by toggling to the "Preview" tab in the side panel.
39+
3840
## Powered by skills
3941

4042
When using the GPT-4o and {% data variables.copilot.copilot_claude_sonnet %} models, {% data variables.product.prodname_copilot_short %} has access to a collection of skills to fetch data from {% data variables.product.github %}, which are dynamically selected based on the question you ask. You can tell which skill {% data variables.product.prodname_copilot_short %} used by clicking {% octicon "chevron-down" aria-label="the down arrow" %} to expand the status information in the chat window.

content/copilot/using-github-copilot/copilot-chat/asking-github-copilot-questions-in-your-ide.md

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,29 +114,29 @@ In addition to submitting prompts through the chat view, you can submit prompts
114114

115115
See [inline chat](https://code.visualstudio.com/docs/copilot/copilot-chat#_inline-chat), [quick chat](https://code.visualstudio.com/docs/copilot/copilot-chat#_quick-chat), and [chat smart actions](https://code.visualstudio.com/docs/copilot/copilot-chat#_chat-smart-actions) in the {% data variables.product.prodname_vscode %} documentation for more details.
116116

117-
## {% data variables.product.prodname_copilot_edits_vscode_short %}
117+
## {% data variables.product.prodname_copilot_edits_short %}
118118

119-
{% data reusables.copilot.about-copilot-edits %}
119+
{% data reusables.copilot.copilot-edits.about-copilot-edits %}
120120

121121
### Using edit mode
122122

123-
1. To start an edit session, select **Open {% data variables.product.prodname_copilot_edits_vscode_short %}** from the {% data variables.product.prodname_copilot_chat_short %} menu.
123+
1. To start an edit session, select **Open {% data variables.product.prodname_copilot_edits_short %}** from the {% data variables.product.prodname_copilot_chat_short %} menu.
124124
1. Optionally, add relevant files to the _working set_ to indicate to {% data variables.product.prodname_copilot %} which files you want to work on.
125-
1. Submit a prompt. In response to your prompt, {% data variables.product.prodname_copilot_edits_vscode_short %} determines which files in your _working set_ to change and adds a short description of the change.
125+
1. Submit a prompt. In response to your prompt, {% data variables.product.prodname_copilot_edits_short %} determines which files in your _working set_ to change and adds a short description of the change.
126126
1. Review the changes and **Apply** or **Discard** the edits for each file.
127127

128-
For more detailed instructions, see [{% data variables.product.prodname_copilot_edits_vscode_short %}](https://code.visualstudio.com/docs/copilot/copilot-edits) in the {% data variables.product.prodname_vscode %} documentation.
128+
For more detailed instructions, see [{% data variables.product.prodname_copilot_edits_short %}](https://code.visualstudio.com/docs/copilot/copilot-edits) in the {% data variables.product.prodname_vscode %} documentation.
129129

130130
### Using agent mode
131131

132132
{% data reusables.copilot.agent-mode-public-preview-note %}
133133

134-
1. To start an edit session, select **Open {% data variables.product.prodname_copilot_edits_vscode_short %}** from the {% data variables.product.prodname_copilot_chat_short %} menu.
134+
1. To start an edit session, select **Open {% data variables.product.prodname_copilot_edits_short %}** from the {% data variables.product.prodname_copilot_chat_short %} menu.
135135
1. Select **Agent** from the mode dropdown menu.
136136
1. Submit a prompt. In response to your prompt, {% data variables.product.prodname_copilot_short %} streams the edits in the editor, updates the working set, and if necessary, suggests terminal commands to run.
137137
1. Review the changes. If {% data variables.product.prodname_copilot_short %} suggested terminal commands, confirm whether or not {% data variables.product.prodname_copilot_short %} can run them. In response, {% data variables.product.prodname_copilot_short %} iterates and performs additional actions to complete the task in your original prompt.
138138

139-
For more information, see [{% data variables.product.prodname_copilot_edits_vscode_short %}](https://aka.ms/vscode-copilot-agent) in the {% data variables.product.prodname_vscode %} documentation.
139+
For more information, see [{% data variables.product.prodname_copilot_edits_short %}](https://aka.ms/vscode-copilot-agent) in the {% data variables.product.prodname_vscode %} documentation.
140140

141141
## Vision
142142

@@ -353,6 +353,18 @@ By default, {% data variables.product.prodname_copilot_chat_short %} will refere
353353
* **Inline**. You can submit a chat prompt inline, and scope it to a highlighted code block or your current file.
354354
* To start an inline chat, right click on a code block or anywhere in your current file, hover over **{% data variables.product.prodname_copilot %}**, then select **{% octicon "plus" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}: Inline Chat**, or enter <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>I</kbd>.
355355

356+
## {% data variables.product.prodname_copilot_edits_short %}
357+
358+
{% data reusables.copilot.copilot-edits.about-copilot-edits-jetbrains %}
359+
360+
### Using edit mode
361+
362+
1. To start an edit session, click **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}** in the menu bar, then select **Open {% data variables.product.prodname_copilot_chat %}**.
363+
1. At the top of the chat panel, click **{% data variables.product.prodname_copilot_edits_short %}**.
364+
1. Add relevant files to the _working set_ to indicate to {% data variables.product.prodname_copilot %} which files you want to work on. You can add all open files by clicking **Add all open files** or individually search for single files.
365+
1. Submit a prompt. In response to your prompt, {% data variables.product.prodname_copilot_edits_short %} determines which files in your _working set_ to change and adds a short description of the change.
366+
1. Review the changes and **Accept** or **Discard** the edits for each file.
367+
356368
## Sharing feedback
357369

358370
To share feedback about {% data variables.product.prodname_copilot_chat_short %}, you can use the **share feedback** link in JetBrains.

content/desktop/configuring-and-customizing-github-desktop/configuring-a-default-editor-in-github-desktop.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ shortTitle: Configure default editor
3535
* [JetBrains GoLand](https://www.jetbrains.com/go/)
3636
* [JetBrains Fleet](https://www.jetbrains.com/fleet/)
3737
* [JetBrains DataSpell](https://www.jetbrains.com/dataspell/)
38-
* [TextMate](https://macromates.com/)
3938
* [Brackets](http://brackets.io/)
4039
* To use Brackets with {% data variables.product.prodname_desktop %}, you must install the Command Line shortcut. To install the shortcut, open Brackets, click **File** in the menu bar, then click **Install Command Line Shortcut**.
4140
* [Typora](https://typora.io/)

content/get-started/git-basics/associating-text-editors-with-git.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,6 @@ shortTitle: Associate text editors
9393

9494
{% endlinux %}
9595

96-
{% mac %}
97-
98-
## Using TextMate as your editor
99-
100-
1. Install [TextMate](https://macromates.com/).
101-
1. Install TextMate's `mate` shell utility. For more information, see [`mate` and `rmate`](https://macromates.com/blog/2011/mate-and-rmate/) in the TextMate documentation.
102-
{% data reusables.command_line.open_the_multi_os_terminal %}
103-
1. Type this command:
104-
105-
```shell
106-
git config --global core.editor "mate -w"
107-
```
108-
109-
{% endmac %}
110-
11196
{% windows %}
11297

11398
## Using Notepad++ as your editor

data/reusables/copilot/about-copilot-edits.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)