Merge branch 'main' into prompt_builder

Author: MuyangAmigo

docs/copilot/copilot-customization.md

@@ -65,7 +65,7 @@ Always add comments.
 
 ### Use a `.github/copilot-instructions.md` file
 
-You can also store custom instructions in your workspace or repository in a `.github/copilot-instructions.md` file and have VS Code automatically picks up this file.
+You can also store custom instructions in your workspace or repository in a `.github/copilot-instructions.md` file and have VS Code automatically pick up this file.
 
 If you define custom instructions in both the `.github/copilot-instructions.md` file and in settings, Copilot tries to combine instructions from both sources.
 

docs/copilot/copilot-edits.md

@@ -59,7 +59,7 @@ In edit mode, you select which files to edit and provide the relevant context an
 
     Copilot automatically adds the active editor as context. Use the `setting(chat.implicitContext.enabled)` setting to configure if the active editor should be added automatically.
 
-    When you add one or more files to the prompt, Copilot Edits proposes other relevant files based on the Git history. Configure this with the `setting(`github.copilot.chat.edits.suggestRelatedFilesFromGitHistory`)` setting.
+    When you add one or more files to the prompt, Copilot Edits proposes other relevant files based on the Git history. Configure this with the `setting(github.copilot.chat.edits.suggestRelatedFilesFromGitHistory)` setting.
 
     > [!TIP]
     > Let Copilot find the right files automatically by adding `#codebase` in your prompt. Make sure to enable the `setting(github.copilot.chat.codesearch.enabled)` _(preview)_ setting to get the best results. Learn more about [adding context to your Copilot prompt](/docs/copilot/copilot-chat-context.md).

docs/cpp/config-mingw.md

@@ -432,7 +432,7 @@ You must follow the steps on the [MSYS2 website](https://www.msys2.org/) to use
 
 UCRT on Windows machines is only included in Windows 10 or later. If you are using another version of Windows, run the following command that does not use UCRT:
 
-```MSYS2
+```bash
 pacman -S --needed base-devel mingw-w64-x86_64-toolchain
 ```
 

docs/reference/variables-reference.md

@@ -299,6 +299,7 @@ One easy way to check a variable's runtime value is to create a VS Code [task](/
         }
     ]
 }
+```
 
 ## Related resources
 

release-notes/images/1_98/copilot-release-highlights.png

@@ -70,9 +70,9 @@ Learn more about [Copilot Edits agent mode](https://code.visualstudio.com/docs/c
 
 #### Notebook support in Copilot Edits (Preview)
 
-We are introducing notebook support in Copilot Edits. You can now use Copilot to edit notebook files with the same intuitive experience as editing code files. Create new notebooks from scratch, modify content across multiple cells, insert and delete cells, and change cell types. This preview feature provides a seamless workflow when working with data science or documentation notebooks.
+We are introducing notebook support in Copilot Edits as a preview feature in [VS Code Insiders](https://code.visualstudio.com/insiders). You can now use Copilot to edit notebook files with the same intuitive experience as editing code files. Create new notebooks from scratch, modify content across multiple cells, insert and delete cells, and change cell types. This preview feature provides a seamless workflow when working with data science or documentation notebooks.
 
-> For the best notebook editing experience with Copilot, we recommend using [VS Code Insiders](https://code.visualstudio.com/insiders/) and the pre-release version of GitHub Copilot Chat, where you'll get the latest improvements to this feature as they're developed.
+> **Note**: This feature is currently only available in [VS Code Insiders](https://code.visualstudio.com/insiders/) with the pre-release version of GitHub Copilot Chat. We'll continue to improve the experience before bringing it to VS Code Stable in a future release.
 
 <video src="images/1_98/notebook_copilot_edits.mp4" title="Video that shows using Copilot Edits to modify a notebook." autoplay loop controls muted></video>
 
@@ -601,7 +601,7 @@ Here's an example that leverages `detail` and the `learnMore` proposal:
 
 ### Refined Snippet API
 
-You can now control the whitespace normalization when inserting snippets. This applies to the [`insertSnippet`](https://github.com/microsoft/vscode/blob/c202fb0bcfc7ac863f90756bdf668e801b96901d/src/vscode-dts/vscode.d.ts#L1306)-API and to the [`SnippetTextEdit`](https://github.com/microsoft/vscode/blob/c202fb0bcfc7ac863f90756bdf668e801b96901d/src/vscode-dts/vscode.d.ts#L3753)-API and control is the indentation of additional lines of snippets are adjusted or not
+You can now control the whitespace normalization when inserting snippets. This applies to the [`insertSnippet`](https://github.com/microsoft/vscode/blob/c202fb0bcfc7ac863f90756bdf668e801b96901d/src/vscode-dts/vscode.d.ts#L1306)-API and to the [`SnippetTextEdit`](https://github.com/microsoft/vscode/blob/c202fb0bcfc7ac863f90756bdf668e801b96901d/src/vscode-dts/vscode.d.ts#L3753)-API and control if the indentation of additional lines of snippets are adjusted or not.
 
 ```js
 const snippet = `This is an indented