Merge branch 'main' into sg-next-oct2024

Author: MaedahBatool

docs/admin/deploy/docker-compose/upgrade.mdx

@@ -10,7 +10,9 @@ This document describes the process to update a Docker Compose Sourcegraph insta
 
 A [standard upgrade](/admin/updates/#upgrade-types) occurs between a Sourcegraph version and the minor or major version released immediately after it. If you would like to jump forward several versions, you must perform a [multi-version upgrade](#multi-version-upgrades) instead.
 
-If you've [configured Docker Compose with a release branch](/admin/deploy/docker-compose/#step-1-prepare-the-deployment-repository), please merge the upstream release tag for the next minor version into your `release` branch. In the following example, the release branch is being upgraded to {CURRENT_VERSION_STRING}.
+If you've [configured Docker Compose with a release branch](/admin/deploy/docker-compose/#step-1-prepare-the-deployment-repository), please merge the upstream release tag for the next minor version into your `release` branch.
+
+In the following example, the release branch is being upgraded to {CURRENT_VERSION_STRING()}.
 
 ```sh
 # first, checkout the release branch
@@ -26,7 +28,7 @@ git merge {CURRENT_VERSION}
 
 For each conflict, you need to reconcile any customizations you made with the updates from the new version. Use the information you gathered earlier from the change log and changes list to interpret the merge conflict and to ensure that it doesn't over-write your customizations. You may need to update your customizations to accommodate the new version.
 
-> NOTE: If you have made no changes or only very minimal changes to your configuration, you can also ask git to always select incoming changes in the event of merge conflicts. In the following example merges will be accepted from the upstream version {CURREN_VERSION_STRING()}:
+> NOTE: If you have made no changes or only very minimal changes to your configuration, you can also ask git to always select incoming changes in the event of merge conflicts. In the following example merges will be accepted from the upstream version {CURRENT_VERSION_STRING()}:
 >
 > `git merge -X theirs {CURRENT_VERSION_STRING}`
 >

docs/cody/clients/install-vscode.mdx

@@ -273,9 +273,13 @@ For customization and advanced use cases, you can create **Custom Commands** tai
 
 ## Smart Apply code suggestions
 
-Cody lets you dynamically insert code from chat into your files with **Smart Apply**. Every time Cody provides you with a code suggestion, you can click the **Apply** button. Cody will then analyze your open code file, find where that relevant code should live, and add a diff.
+Cody lets you dynamically insert code from chat into your files with **Smart Apply**. Every time Cody provides you with a code suggestion, you can click the **Apply** button. Cody will then analyze your open code file, find where that relevant code should live, and add a diff. For chat messages where Cody provides multiple code suggestions, you can apply each in sequence to go from chat suggestions to written code.
 
-For chat messages where Cody provides multiple code suggestions, you can apply each in sequence to go from chat suggestions to written code.
+Smart Apply also supports the executing of commands in the terminal. When you ask Cody a question related to terminal commands, you can now execute the suggestion in your terminal by clicking the `Execute` button in the chat window.
+
+<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto', aspectRatio: '1920 / 1080' }}>
+    <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/cody-vscode-1.36-command-execute.mp4" type="video/mp4" />
+ </video>
 
 ## Keyboard shortcuts
 

docs/cody/clients/model-configuration.mdx

@@ -42,7 +42,10 @@ This requires site-admin privileges. To do so,
 ```json
     {
       // [...]
-      "cody.enabled": true
+      "cody.enabled": true,
+      "completions": {
+        "provider": "sourcegraph"
+      }
     }
 ```
 
@@ -319,6 +322,7 @@ The simplest way to configure your Sourcegraph Enterprise would be to add the fo
 
 ```json
   ...
+  "cody.enabled": true,
   "modelConfiguration": {
     "sourcegraph": {}
   },
@@ -360,6 +364,7 @@ The `"allow"` and `"deny"` fields, are arrays of [model references](#model-confi
 The following examples illustrate how to use all these settings in conjunction:
 
 ```json
+"cody.enabled": true,
 "modelConfiguration": {
   "sourcegraph": {
     "modelFilters": {
@@ -390,6 +395,7 @@ The `"modelConfiguration"` setting also contains a `"defaultModels"` field that
 
 ```json
   ...
+  "cody.enabled": true,
   "modelConfiguration": {
     "defaultModels": {
       "chat": "anthropic::2023-06-01::claude-3.5-sonnet",
@@ -421,6 +427,7 @@ By defining a provider override in your Sourcegraph site configuration, you are
 The following configuration shippet defines a single provider override with the ID `"anthropic"`.
 
 ```json
+"cody.enabled": true,
 "modelConfiguration": {
   // Do not use any Sourcegraph-supplied models.
   "sourcegraph": null,
@@ -487,6 +494,7 @@ With a provider defined, we can now specify custom models using that provider by
 The following configuration snippet defines a custom model, using the `"anthropic"` provider from the previous example.
 
 ```json
+"cody.enabled": true,
 "modelConfiguration": {
   ...
   "modelOverrides": [