Merge branch 'main' into python-settings-updates

Author: cwebster-99

docs/azure/gettingstarted.md

@@ -31,7 +31,7 @@ In the Command Palette, type `Azure` to list the commands that are specific to A
 
 **Review settings.** To edit or review your current settings in VS Code, use (`kb(workbench.action.openSettings)`), to open the Settings editor. It is helpful to review settings that any of the extensions may contribute.
 
-**Identify and customize keyboard shortcuts.** You can use the Keyboard Shortcuts editor (`kb(workbench.action.openGlobalKeybindings)`) to find and configure keyboard shortcuts in VS Code. Get more info about [Keyboard Shortcuts editor](/docs/getstarted/keybindings.md#keyboard-shortcuts-editor).
+**Identify and customize keyboard shortcuts.** You can use the Keyboard Shortcuts editor (`kb(workbench.action.openGlobalKeybindings)`) to find and configure keyboard shortcuts in VS Code. Get more info about [Keyboard Shortcuts editor](/docs/editor/keybindings.md#keyboard-shortcuts-editor).
 
 **Redisplay notifications.** You can right-click the bell icon in the bottom right of the Status Bar in VS Code to see missed notifications.
 

docs/copilot/ai-powered-suggestions.md

@@ -79,9 +79,8 @@ Copilot NES is currently in preview. You can enable it via the VS Code setting `
 1. Search for `github.copilot.nextEditSuggestions.enabled`
 1. Enable the setting
 
-If you are a Copilot Business or Enterprise user, an administrator of your organization must opt in to the use of Copilot "Editor Preview Features," in addition to you setting `setting(github.copilot.nextEditSuggestions.enabled)` in your editor.
-
-You can learn more about [managing policies for Copilot in your organization](https://docs.github.com/en/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization#enabling-copilot-features-in-your-organization).
+> [!IMPORTANT]
+> If you are a Copilot Business or Enterprise user, an administrator of your organization must opt in to the use of Copilot Editor Preview Features, in addition to you setting `setting(github.copilot.nextEditSuggestions.enabled)` in your editor. Learn more about [managing policies for Copilot in your organization](https://docs.github.com/en/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-policies-for-copilot-in-your-organization#enabling-copilot-features-in-your-organization).
 
 ### Navigate and accept edit suggestions
 
@@ -139,16 +138,16 @@ If an edit suggestion is below the current editor view, the arrow will point dow
 
 * **Matching code style**. After copy-pasting some code, Copilot will suggest how to adjust it to match the current code where the paste happened.
 
-### Further configuring edit suggestions
+### Edit suggestions configuration options
 
-To use Copilot NES, you must set `setting(github.copilot.nextEditSuggestions.enabled)`. There are a couple of additional settings you can also use to configure your Copilot NES experience:
+To further configure edit suggestions, configure these settings:
 
-* `setting(editor.inlineSuggest.edits.codeShifting)`: You can disable this setting if you never want Copilot NES to shift your code to show a suggestion.
+* `setting(editor.inlineSuggest.edits.codeShifting)`: disable this setting if you never want Copilot NES to shift your code when showing a suggestion.
 
 * `setting(editor.inlineSuggest.edits.renderSideBySide)`:
 
-     * **auto (default)**: Show larger suggestions side-by-side if there is enough space in the viewport, otherwise the suggestions are shown below the relevant code.
-     * **never**: Always show larger suggestions below the relevant code.
+     * **auto (default)**: show larger edit suggestions side-by-side if there is enough space in the viewport, otherwise the suggestions are shown below the relevant code.
+     * **never**: never show suggestions side-by-side, always show suggestions below the relevant code.
 
 ## Tips & tricks
 
@@ -160,33 +159,32 @@ To give you relevant inline suggestions, Copilot looks at the current and open f
 
 You can temporarily enable or disable code completions either for all languages, or for specific languages only.
 
-1. To enable or disable Copilot completions, select **Configure Code Completions...** from the Copilot menu in the VS Code title bar.
-
-   ![Screenshot showing Copilot menu, highlighting Configure Code Completions.](./images/overview/configure-completions.png)
+To enable completions:
 
-1. If you are disabling GitHub Copilot, you are asked whether you want to disable suggestions globally, or for the language of the file you are currently editing.
+1. Select **Configure Code Completions...** from the Copilot menu in the VS Code title bar.
+1. Select **Enable Completions**.
 
-    * To disable suggestions from GitHub Copilot globally, select **Disable Globally**.
-    * To disable suggestions from GitHub Copilot for the specified language, select **Disable for \<language\>**.
+To disable completions:
 
-    ![Screenshot showing the VS Code command menu for Copilot, highlighting the options to disable completions.](./images/inline-suggestions/copilot-disable-completions.png)
+1. Select **Configure Code Completions...** from the Copilot menu in the VS Code title bar.
+1. To disable completions globally, select **Disable Globally**.
+1. To disable completions for the language of the file you are currently editing, select **Disable for \<language\>**.
 
 ### Change the AI model
 
-Different Large Language Models (LLMs) are trained on different types of data and might have different capabilities and strengths. With Copilot, you can change the language model that is used to generate completions. To change the current model:
-
-1. Select **Configure Code Completions...** from the Copilot menu in the VS Code title bar.
-
-    ![Screenshot showing Copilot menu, highlighting Configure Code Completions.](./images/overview/configure-completions.png)
+Different Large Language Models (LLMs) are trained on different types of data and might have different capabilities and strengths. You can change the language model that is used to generate code completions.
 
-1. Select **Change Completions Model...** from the Configure Copilot Completions menu.
+To change the model that is used for code completions:
 
-    ![Screenshot showing Copilot Completions menu, highlighting option to change completions model](./images/overview/change-completions-model.png)
+1. Select **Configure Code Completions...** from the Copilot menu in the VS Code title bar.
+1. Select **Change Completions Model...**, and then select one of the models.
 
 > [!NOTE]
-> The list of available models might vary and change over time. If you are a Copilot Business or Enterprise user, you will also need your Administrator to enable certain models for your organization by opting in to `Editor Preview Features` in the [Copilot policy settings](https://docs.github.com/en/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) on GitHub.com.
+> The list of available models might vary and change over time. If you are a Copilot Business or Enterprise user, your Administrator needs to enable certain models for your organization by opting in to `Editor Preview Features` in the [Copilot policy settings](https://docs.github.com/en/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) on GitHub.com.
+
+## Settings
 
-### Settings
+### Code completions settings
 
 * `setting(editor.inlineSuggest.enabled)` - enable or disable inline completions.
 
@@ -196,6 +194,8 @@ Different Large Language Models (LLMs) are trained on different types of data an
 
 * `setting(editor.inlineSuggest.syntaxHighlightingEnabled)` - enable or disable syntax highlighting for inline completions.
 
+### Next Edit Suggestions settings
+
 * `setting(github.copilot.nextEditSuggestions.enabled)` - enable Copilot Next Edit Suggestions (Copilot NES).
 
 * `setting(editor.inlineSuggest.edits.codeShifting)` - configure if Copilot NES is able to shift your code to show a suggestion.
@@ -204,12 +204,8 @@ Different Large Language Models (LLMs) are trained on different types of data an
 
 ## Next steps
 
-* Get started with the introductory [Copilot tutorial](/docs/copilot/getting-started-chat.md) to get set up with Copilot in VS Code and experience Copilot hands-on.
-
-* Learn how you can use AI chat conversations with [Copilot Chat](/docs/copilot/copilot-chat.md).
-
-## Additional resources
+* Discover the key features with the [Copilot Quickstart](/docs/copilot/getting-started-chat.md).
 
-You can read more about [Copilot](https://github.com/features/copilot) and how to use it in VS Code in the [GitHub Copilot documentation](https://docs.github.com/copilot/getting-started-with-github-copilot?tool=vscode).
+* Use AI chat conversations with [Copilot Chat](/docs/copilot/copilot-chat.md).
 
-Or check out the [VS Code Copilot Series](https://www.youtube.com/playlist?list=PLj6YeMhvp2S5_hvBl2SE-7YCHYlLQ0bPt) on YouTube, where you can find more introductory content and programming-specific videos for using Copilot with [Python](https://www.youtube.com/watch?v=DSHfHT5qnGc), [C#](https://www.youtube.com/watch?v=VsUQlSyQn1E), [Java](https://www.youtube.com/watch?v=zhCB95cE0HY), [PowerShell](https://www.youtube.com/watch?v=EwtRzAFiXEM), [C++](https://www.youtube.com/watch?v=ZfT2CXY5-Dc), and more.
+* Watch the videos in our [VS Code Copilot Series](https://www.youtube.com/playlist?list=PLj6YeMhvp2S5_hvBl2SE-7YCHYlLQ0bPt) on YouTube.

docs/copilot/copilot-customization.md

@@ -35,7 +35,7 @@ Copilot can help you generate code, for example as part of a refactoring, genera
 
 ### Use settings
 
-You can configure custom code-generation instructions by using the `setting(github.copilot.chat.codeGeneration.instructions)` setting. You can define custom instructions at the User or Workspace level, and you can also specify language-specific instructions. Get more information about [language-specific settings](/docs/getstarted/settings.md#language-specific-editor-settings).
+You can configure custom code-generation instructions by using the `setting(github.copilot.chat.codeGeneration.instructions)` setting. You can define custom instructions at the User or Workspace level, and you can also specify language-specific instructions. Get more information about [language-specific settings](/docs/editor/settings.md#language-specific-editor-settings).
 
 The following code snippet shows how to define a set of instructions in the `settings.json` file. To define instruction directly in settings, configure the `text` property. To reference an external file, configure the `file` property.
 

docs/copilot/copilot-settings.md

@@ -10,12 +10,12 @@ MetaSocialImage: images/shared/github-copilot-social.png
 ---
 # GitHub Copilot in VS Code settings reference
 
-This article lists the configuration settings for GitHub Copilot in Visual Studio Code. For general information about working with settings in VS Code, refer to [User and workspace settings](/docs/getstarted/settings.md), as well as the [Variables reference](/docs/editor/variables-reference.md) for information about predefined variable support.
+This article lists the configuration settings for GitHub Copilot in Visual Studio Code. For general information about working with settings in VS Code, refer to [User and workspace settings](/docs/editor/settings.md), as well as the [Variables reference](/docs/reference/variables-reference.md) for information about predefined variable support.
 
 > [!TIP]
 > If you don't yet have a Copilot subscription, you can use Copilot for free by signing up for the [Copilot Free plan](https://github.com/github-copilot/signup) and get a monthly limit of completions and chat interactions.
 
-The team is continuously working on improving Copilot in VS Code and adding new features. Some features are still experimental. Try them out and share your feedback in [our issues](https://github.com/microsoft/vscode-copilot-release/issues). Get more info about the [feature lifecycle in VS Code](/docs/getstarted/settings.md#feature-lifecycle).
+The team is continuously working on improving Copilot in VS Code and adding new features. Some features are still experimental. Try them out and share your feedback in [our issues](https://github.com/microsoft/vscode-copilot-release/issues). Get more info about the [feature lifecycle in VS Code](/docs/editor/settings.md#feature-lifecycle).
 
 ## General settings
 

docs/copilot/images/inline-suggestions/copilot-disable-completions.png

@@ -17,7 +17,7 @@ The Visual Studio Code C/C++ extension now supports semantic colorization, when
 
 ## Themes
 
-Colors can be associated using the existing support for theming and color customization in VS Code.  See the [VS Code Themes documentation](/docs/getstarted/themes.md) for more information.
+Colors can be associated using the existing support for theming and color customization in VS Code.  See the [VS Code Themes documentation](/docs/editor/themes.md) for more information.
 
 Colors are associated with [semantic tokens](https://code.visualstudio.com/api/extension-guides/color-theme#semantic-colors) as well as [TextMate scopes](https://macromates.com/manual/en/language_grammars#naming_conventions).
 

docs/copilot/images/overview/change-completions-model.png

@@ -163,7 +163,7 @@ Here is a sample of a `tasks.json` file on macOS:
 }
 ```
 
->**Note**: You can learn more about `tasks.json` variables in the [variables reference](/docs/editor/variables-reference.md).
+>**Note**: You can learn more about `tasks.json` variables in the [variables reference](/docs/reference/variables-reference.md).
 
 The `command` setting specifies the program to run. In this case, that is`clang++`.
 

docs/copilot/images/overview/configure-completions.png

@@ -164,7 +164,7 @@ Your new `tasks.json` file should look similar to the JSON below:
 }
 ```
 
->**Note**: You can learn more about `tasks.json` variables in the [variables reference](/docs/editor/variables-reference.md).
+>**Note**: You can learn more about `tasks.json` variables in the [variables reference](/docs/reference/variables-reference.md).
 
 The `command` setting specifies the program to run; in this case that is g++.
 The `args` array specifies the command-line arguments that will be passed to g++. These arguments must be specified in the order expected by the compiler.