diff --git a/docs/batch-changes/configuring-credentials.mdx b/docs/batch-changes/configuring-credentials.mdx
index 05c001b9e..e455ce5bc 100644
--- a/docs/batch-changes/configuring-credentials.mdx
+++ b/docs/batch-changes/configuring-credentials.mdx
@@ -201,6 +201,14 @@ GitHub apps follow the same concepts as [personal and global access tokens](#typ
 - GitHub apps can only be used with GitHub code hosts.
 - The forking mechanism (`fork:true`) is only supported if the GitHub app has access to all repositories of the installation, and if the origin repository and the fork are in the same organization that the GitHub app is installed to ([GitHub Docs](https://docs.github.com/en/rest/repos/forks?apiVersion=2022-11-28#create-a-fork)).
 
+### Migrating from PATs to GitHub Apps
+
+You can migrate your credentials from PATs to GitHub Apps by deleting the PAT credential and creating a GitHub app credential.
+
+Batch Changes will look at the available credentials, and pick one that matches the targeted namespace (e.g. organization).
+
+You can continue to use existing batch changes without modifications.
+
 ### Adding a GitHub app
 
 Adding a GitHub app is done through the Batch Changes section of your user settings:
diff --git a/docs/cody/clients/cody-with-sourcegraph.mdx b/docs/cody/clients/cody-with-sourcegraph.mdx
index 11bc54870..17b46f521 100644
--- a/docs/cody/clients/cody-with-sourcegraph.mdx
+++ b/docs/cody/clients/cody-with-sourcegraph.mdx
@@ -2,12 +2,10 @@
 
 <p className="subtitle">Learn how to use Cody in the web interface with your Sourcegraph.com instance.</p>
 
-<Callout type="info"> The new chat UI for Cody for web is currently in Beta and is available to users on Sourcegraph versions >=5.5.</Callout>
-
 In addition to the Cody extensions for [VS Code](/cody/clients/install-vscode), [JetBrains](/cody/clients/install-jetbrains) IDEs, and [Neovim](/cody/clients/install-neovim), Cody is also available in the Sourcegraph web app. Community users can use Cody for free by logging into their accounts on Sourcegraph.com, and enterprise users can use Cody within their Sourcegraph instance.
 
 <LinkCards>
-    <LinkCard href="https://sourcegraph.com/cody/chat" imgSrc="https://sourcegraph.com/.assets/img/sourcegraph-mark.svg" imgAlt="Cody for Web" title="Cody for Web (Beta)" description="Use Cody in the Sourcegraph Web App." />
+    <LinkCard href="https://sourcegraph.com/cody/chat" imgSrc="https://sourcegraph.com/.assets/img/sourcegraph-mark.svg" imgAlt="Cody for Web" title="Cody for Web" description="Use Cody in the Sourcegraph Web App." />
 </LinkCards>
 
 ## Initial setup
@@ -27,13 +25,15 @@ The chat interface for Cody on the web is similar to the one you get with the [V
 
 The chat interface with your Code Search queries is operated per chat. You cannot run multiple chats and store them in parallel. A new chat window opens whenever you click the Cody button from the query editor or the top header.
 
+<Callout type="info"> The new and improved chat UI for Cody for web is currently available to users on Sourcegraph versions >=5.5. It's recommeded to update your Sourcegraph instance to the latest version to use this new chat interface. </Callout>
+
 ## LLM Selection
 
-Sourcegraph.com users with Cody **Free** and **Pro** can choose from a list of supported LLM models for a chat. Claude Sonnet 3 is the default LLM model, but users can select the LLM of their choice from the drop-down menu.
+Sourcegraph.com users with Cody **Free** and **Pro** can choose from a list of supported LLM models for a chat. Claude Sonnet 3.5 is the default LLM model, but users can select the LLM of their choice from the drop-down menu.
 
 ![llm-select-web](https://storage.googleapis.com/sourcegraph-assets/Docs/llm-select-web-0724.jpg)
 
-Users on an Enterprise Sourcegraph instance do not have the option to choose an LLM model. Their site admin will configure the default LLM model for chat.
+Users on an Enterprise Sourcegraph instance do not have the option to choose an LLM model. Their site admin will configure the default LLM model for chat. However, Enterprise users with the new [model configuration](/cody/clients/model-configuration) can use the LLM selection dropdown to choose a chat model.
 
 ## Selecting Context with @-mentions
 
diff --git a/docs/cody/clients/feature-reference.mdx b/docs/cody/clients/feature-reference.mdx
index 4b2855ea4..ad7206622 100644
--- a/docs/cody/clients/feature-reference.mdx
+++ b/docs/cody/clients/feature-reference.mdx
@@ -21,7 +21,7 @@
 | Local context                            | ✅           | ✅             | ❌                    |
 | OpenCtx context providers (experimental) | ✅           | ❌             | ❌                    |
 | **Prompts and Commands**                 |             |               |                      |
-| Access to prompts and Prompt library     | ✅           | ❌             | ✅                    |
+| Access to prompts and Prompt library     | ✅           | ✅             | ✅                    |
 | Custom commands                          | ✅           | ❌             | ❌                    |
 | Edit code                                | ✅           | ✅             | ❌                    |
 | Generate unit test                       | ✅           | ✅             | ❌                    |
diff --git a/docs/cody/clients/install-jetbrains.mdx b/docs/cody/clients/install-jetbrains.mdx
index 72c3452f5..5dc584737 100644
--- a/docs/cody/clients/install-jetbrains.mdx
+++ b/docs/cody/clients/install-jetbrains.mdx
@@ -66,122 +66,105 @@ Once Cody is successfully connected, you'll see that the sign-in panel has been
 Cody provides intelligent code suggestions and context-aware autocompletions for numerous programming languages like JavaScript, Python, TypeScript, Go, etc.
 
 - Create a new file in IntelliJ, for example, `code.js`
-- Next, type the following algorithm function to sort an array of numbers
-
-```js
-function bubbleSort(array)
-```
-
 - As you start typing, Cody will automatically provide suggestions and context-aware completions based on your coding patterns and the code context
 - These autocomplete suggestions appear as grayed text. To accept the suggestion, press the `Tab` key
 
 <video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
-  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jb-suggest-062024.mp4" type="video/mp4"/>
+  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jetbrains-cody-v6-autocomplete.mp4" type="video/mp4"/>
 </video>
 
-## Autocomplete
+## Chat
 
-Cody provides multi-line autocomplete as you type. Autocomplete suggestions appear as inlay suggestions and are enabled by default in your JetBrains IntelliJ editor. With this setting, there is a list of programming languages supported and enabled by default.
+Cody chat in JetBrains is available in a unified interface opened right next to your code. Once connected to Sourcegraph, a new chat input field is opened with a default `@-mention` [context chips](#context-retrieval).
 
-To manually configure the Autocomplete feature,
+All your previous and existing chats are stored for later use and can be accessed via the **History** icon from the top menu. You can download them to share or use later in a `.json` file or delete them altogether.
 
-- Go to the **Cody Settings...** from the Cody icon in the sidebar
-- Next, click the **Sourcegraph & Cody** dropdown and select **Cody**
-- The **Autocomplete** settings will appear with the list of **Enabled Languages**
+### Chat interface
 
-Autocomplete suggestions use the same color as inline parameter hints according to your configured editor theme. However, you can optionally enable the **Custom color for completions** checkbox to customize the color of your choice.
-
-In addition, you can use the following keyboard shortcuts to interact with Cody's autocomplete suggestions:
+The chat interface is designed intuitively. Your very first chat input lives at the top of the panel, and the first message in any chat log will stay pinned to the top of the chat. After your first message, the chat input window moves to the bottom of the sidebar.
 
-- `Tab` to accept a suggestion
-- `Alt + [` (Windows) or `Opt + [` (macOS) to cycle suggestions
-- `Alt + \` (Windows) or `Opt + \` (macOS) to manually trigger autocomplete if no suggestions have been returned
+Since your first message to Cody anchors the conversation, you can return to the top chat box anytime, edit your prompt, or re-run it using a different LLM model.
 
-<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
-  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jetbrains-cody-v6-autocomplete.mp4" type="video/mp4"/>
+<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/jb-chat-interface-0824.mp4" type="video/mp4" />
 </video>
 
-## Commands
+<Callout type="info"> Users should be on the Cody for JetBrains extension v2023.2 or more to get this new and improved chat UI.</Callout>
 
-Cody with JetBrains offers quick, ready-to-use Commands for common actions to write, describe, fix, and smell code. These allow you to run predefined actions with smart context-fetching anywhere in the editor.
+### Changing LLM model for chat
 
-These are broadly categorized into the Edit Commands and Chat Commands.
+<Callout type="note"> You need to be a Cody Free or Pro user to have multi-model selection capability. Enterprise users with the new [model configuration](/cody/clients/model-configuration) can use the LLM selection dropdown to choose a chat model.</Callout>
 
-- **Edit Code**: Makes inline code edits. You also get the option to select LLM for edit suggestions
-- **Document Code**: Create inline documentation for your code
-- **Generate Unit Test**: Creates inline unit tests for your code-
-- **Smell Code**: Finds code smells in your file
-- **Explain Code**: Expains code in your file
+For Chat:
 
-![jetbrains-commands](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-commands-new-ga.png)
+- Open chat or toggle between editor and chat
+- Click on the model selector (which by default indicates Claude 3.5 Sonnet)
+- See the selection of models and click the model you desire. This model will now be the default model going forward on any new chats
 
-Let's learn about how to use some of these commands:
+For Edit:
 
-### Inline code edits
+- On any file, select some code and a right-click
+- Select **Cody > Edit Code**
+- Select the default model available (this is Claude Sonnet 3.5)
+- See the selection of models and click the model you desire. This model will now be the default model going forward on any new edits
 
-You can make edits to your code directly in your file without opening the chat window. The **Edit Code** command makes direct code edits, refactors, or bug fixes.
+## Supported LLM models
 
-You can run the inline edit command on a selected code snippet, an entire file, or to generate code on a new line. To do so, use the **Edit Code** command in the Cody sidebar or context menu, or the `Shift + Ctrl + Enter` shortcut. This opens a floating editor where you can describe the change you want to make.
+Users on Cody **Free** and **Pro** can choose from a list of supported LLM models for Chat and Commands. Both Cody Free and Pro users can choose from a list of supported LLM models for Chat and Commands.
 
-Once you enter your prompt, Cody will perform inline edits that you can **Accept**, **Undo**, or **Show diff** for the change. You can also click **Edit & Retry** to iterate your prompt and get alternate suggestions.
+![llm-selection-cody](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-llm-select-0824.jpg)
 
-<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
-  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jetbrains-cody-edit-code.mp4" type="video/mp4"/>
-</video>
+Enterprise users get Claude 3 (Opus and Sonnet) as the default LLM models without extra cost. Moreover, Enterprise users can use Claude 3.5 models through Cody Gateway, Anthropic BYOK, AWS Bedrock (limited availability), and GCP Vertex.
 
-### Inline unit tests
+<Callout type="info">For enterprise users on AWS Bedrock: 3.5 Sonnet is unavailable in `us-west-2` but available in `us-east-1`. Check the current model availability on AWS and your customer's instance location before switching. Provisioned throughput via AWS is not supported for 3.5 Sonnet.</Callout>
 
-The Generate Unit Test command uses the code edit functionality to create unit tests. To generate unit tests for your code, type `Shift + Ctrl + T` or click the **Generate Unit Test** command in the Cody sidebar or from the context menu.
+You also get additional capabilities like BYOLLM (Bring Your Own LLM), supporting Single-Tenant and Self Hosted setups for flexible coding environments. Your site administrator determines the LLM, and cannot be changed within the editor. However, Cody Enterprise users when using Cody Gateway have the ability to [configure custom models](/cody/core-concepts/cody-gateway#configuring-custom-models) Anthropic (like Claude 3 Opus and Claude Haiku), OpenAI (GPT 3.5 Turbo and GPT 4 Turbo) and Google Gemini 1.5 models (Flash and Pro).
 
-When you run this command, it performs the following actions:
+<Callout type="note">Read and learn more about the [supported LLMs](/cody/capabilities/supported-models) and [token limits](/cody/core-concepts/token-limits) on Cody Free, Pro and Enterprise.</Callout>
 
-- Check if you’re using a test framework
-- Check if you already have a test file created
-- Insert new unit tests directly in the existing test file or create a new file if none exists
+## Ollama model support
 
-Here, you can **Accept**, **Undo**, or **Show diff** for the change.
+<Callout type="note">Ollama support for JetBrains is in the Experimental stage and is available on Cody Free and Pro.</Callout>
 
-### Inline code fix
+You can use Ollama models locally for Cody’s chat and commands. This lets you chat without sending messages over the internet to an LLM provider so that you can use Cody offline. To use Ollama locally, you’ll need to install Ollama and download a chat model such as CodeGemma or Llama3. [Read here for detailed instructions](https://sourcegraph.com/github.com/sourcegraph/jetbrains/-/blob/README.md#use-ollama-models-for-chat--commands).
 
-Cody with JetBrains can also propose fixes and updates to errors in your code. The inline **Ask Cody to Fix** functionality alerts a user when it notices an issue and provides a workflow to suggest a fix, review the suggestion, and accept the change, all within the editor.
+## Smart Apply code suggestions
 
-All you need to do is select and highlight the code line with the error and click the lightbulb icon. Then select **Ask Cody to Fix**. You can then view the diff and accept or undo the suggested change.
+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.
 
-### Document your code
+For chat messages where Cody provides multiple code suggestions, you can apply each in sequence to go from chat suggestions to written code.
 
-Like the Edit Code and Generate Unit Test commands, you can generate inline documentation for your code without opening the chat window. Doc command is available via hotkey, context menu, and Cody sidebar. Type `Shift + Ctrl + H`, and Cody will start generating documentation for your selected code snippet or the entire file.
+### Context retrieval
 
-<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
-  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jetbrains-cody-v6-document-code.mp4" type="video/mp4"/>
-</video>
+When you start a new Cody chat, the chat input window opens with a default `@-mention` context chips for all the context it intends to use. This context is based on your current repository and current file (or a file selection if you have code highlighted).
 
-## Supported LLM models
+![jb-context-retrieval](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-context-retrieval-0824.jpg)
 
-Users on Cody **Free** and **Pro** can choose from a list of supported LLM models for Chat and Commands. Both Cody Free and Pro users can choose from a list of supported LLM models for Chat and Commands.
+At any point in time, you can edit these context chips or remove them completely if you do not want to use these as context. Any chat without a context chip will instruct Cody to use no codebase context. However, you can always provide an alternate `@-mention` file to let Cody use it as a new source of context.
 
-![llm-selection-cody](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-llm-select-0724.png)
+When you have both a repository and files @-mentioned, Cody will search the repository for context while prioritizing the mentioned files.
 
-Enterprise users get Claude 3 (Opus and Sonnet) as the default LLM models without extra cost. Moreover, Enterprise users can use Claude 3.5 models through Cody Gateway, Anthropic BYOK, AWS Bedrock (limited availability), and GCP Vertex.
+### Selecting Context with @-mentions
 
-<Callout type="info">For enterprise users on AWS Bedrock: 3.5 Sonnet is unavailable in `us-west-2` but available in `us-east-1`. Check the current model availability on AWS and your customer's instance location before switching. Provisioned throughput via AWS is not supported for 3.5 Sonnet.</Callout>
+Cody's chat allows you to add files as context in your messages. Type `@-file` and then a filename to include a file as a context.
 
-You also get additional capabilities like BYOLLM (Bring Your Own LLM), supporting Single-Tenant and Self Hosted setups for flexible coding environments. Your site administrator determines the LLM, and cannot be changed within the editor. However, Cody Enterprise users when using Cody Gateway have the ability to [configure custom models](/cody/core-concepts/cody-gateway#configuring-custom-models) Anthropic (like Claude 3 Opus and Claude Haiku), OpenAI (GPT 3.5 Turbo and GPT 4 Turbo) and Google Gemini 1.5 models (Flash and Pro).
+The `@-file` also supports line numbers to query the context of large files. You can add ranges of large files to your context by @-mentioning a large file and appending a number range to the filename, for example, `@filepath/filename:1-10`.
 
-<Callout type="note">Read and learn more about the [supported LLMs](/cody/capabilities/supported-models) and [token limits](/cody/core-concepts/token-limits) on Cody Free, Pro and Enterprise.</Callout>
+When you `@-mention` files to add to Cody’s context window, the file lookup takes `files.exclude`, `search.exclude`, and `.gitgnore` files into account. This makes the file search faster as a result up to 100ms.
 
-## Ollama model support
+Moreover, when you `@-mention` files, Cody will track the number of characters in those files against the context window limit of the selected chat model. As you `@-mention` multiple files, Cody will calculate how many tokens of the context window remain. When the remaining context window size becomes too small, you get **File too large** errors for further more `@-mention` files.
 
-<Callout type="note">Ollama support for JetBrains is in the Experimental stage and is available on Cody Free and Pro.</Callout>
+Cody defaults to showing @-mention context chips for all the context it intends to use. When you open a new chat, Cody will show context chips for your current repository and current file (or file selection if you have code highlighted).
 
-You can use Ollama models locally for Cody’s chat and commands. This lets you chat without sending messages over the internet to an LLM provider so that you can use Cody offline. To use Ollama locally, you’ll need to install Ollama and download a chat model such as CodeGemma or Llama3. [Read here for detailed instructions](https://sourcegraph.com/github.com/sourcegraph/jetbrains/-/blob/README.md#use-ollama-models-for-chat--commands).
+### Rerun prompts with different context
 
-<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/jb-ollama.mp4" type="video/mp4" />
- </video>
+If Cody's answer isn't helpful, you can try asking again with different context:
 
-## Chat history
+- **Public knowledge only**: Cody will not use your own code files as context; it’ll only use knowledge trained into the base model.
+- **Current file only**: Re-run the prompt again using just the current file as context.
+- **Add context**: Provides @-mention context options to improve the response by explicitly including files, remote repositories, or even web pages (by URL).
 
-Next to the **Chat** tab is **Chat History**, which displays Cody's previous chat interactions. You can revisit any previous chat interactions to get the context of the conversation. You can export your chat history as JSON files for later use.
+![jb-rerun-context](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-rerun-context-0824.jpg)
 
 ## Context fetching mechanism
 
@@ -199,20 +182,14 @@ JetBrains users on the Free or Pro plan get single-repo support in chat and can
 
 Cody automatically understands the context of your codebase for all Cody Free, Pro, and Enterprise users based on the project opened in your workspace. Enterprise users can add up to **9 additional repos (10 total, including the default project)** to use as context. The multi-repo context for Enterprise is powered by Sourcegraph code search and allows Cody to use the selected codebase to answer your questions.
 
-![context-selector](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-chat-context.png)
-
 Moreover, Cody's chat allows you to add files as context in your messages. Type `@-file` in the Cody chat window and then a filename to include a file as context.
 
 ### Chat with multi-repo context
 
-The chat sidebar has an interface for selecting **chat context**. For Cody Free and Cody Pro users, you can turn the local chat context on or off. When the local project is turned off, Cody doesn't search your local project for context and sends your prompt to the selected LLM.
+For Cody Free and Cody Pro users, if you delete all the context from the chat input, Cody will not use any local context. When this happens, Cody doesn't search your local project for context and sends your prompt to the selected LLM.
 
 Cody Enterprise users can add remote repositories from your Sourcegraph instance. You can type the name of your repositories into this interface and select up to **9 additional repos (10 total, including the default project)**. Cody will then search against those repositories and retrieve relevant files to answer your chat prompts.
 
-<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
-  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jetbrains-cody-v6-multi-repo-context%20(1).mp4" type="video/mp4"/>
-</video>
-
 ### Cody Context Filters
 
 <Callout type="note">Context Filters is available for all Cody Enterprise users running Cody JetBrains extension version `>=6.0.0`.</Callout>
@@ -221,11 +198,81 @@ Admins on the Sourcegraph Enterprise instance can use the Cody Context Filters t
 
 For repos mentioned in the `exclude` field, Cody's commands are disabled, and you cannot use them for context fetching. If you try running any of these, you'll be prompted with an error message. However, Cody chat will still work, and you can use it to ask questions.
 
+[Read more about the Cody Context Filters here →](/cody/capabilities/ignore-context)
+
+## Prompts and Commands
+
+Cody with JetBrains offers quick, ready-to-use [prompts and commands](/cody/capabilities/commands) for common actions to write, describe, fix, and smell code. These allow you to run predefined actions with smart context-fetching anywhere in the editor. These allow you to run predefined actions with smart context-fetching anywhere in the editor, like:
+
+- **Edit Code**: Makes inline code edits. You also get the option to select LLM for edit suggestions
+- **Document Code**: Create inline documentation for your code
+- **Generate Unit Test**: Creates inline unit tests for your code
+- **Smell Code**: Finds code smells in your file
+- **Explain Code**: Expains code in your file
+
+![jetbrains-prompts-commands](https://storage.googleapis.com/sourcegraph-assets/Docs/jb-prompts-commands-0824.jpg)
+
+Let's learn about how to use some of these commands:
+
+### Inline code edits
+
+You can make edits to your code directly in your file without opening the chat window. The **Edit Code** command makes direct code edits, refactors, or bug fixes.
+
+You can run the inline edit command on a selected code snippet, an entire file, or to generate code on a new line. To do so, use the **Edit Code** command in the Cody sidebar or context menu, or the `Shift + Ctrl + Enter` shortcut. This opens a floating editor where you can describe the change you want to make.
+
+Once you enter your prompt, Cody will perform inline edits that you can **Accept**, **Undo**, or **Show diff** for the change. You can also click **Edit & Retry** to iterate your prompt and get alternate suggestions.
+
 <video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
-  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jb-context-filters.mp4" type="video/mp4"/>
+  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jb-code-edits-0824.mp4" type="video/mp4"/>
 </video>
 
-[Read more about the Cody Context Filters here →](/cody/capabilities/ignore-context)
+### Inline unit tests
+
+The Generate Unit Test command uses the code edit functionality to create unit tests. To generate unit tests for your code, type `Shift + Ctrl + T` or click the **Generate Unit Test** command in the Cody sidebar or from the context menu.
+
+When you run this command, it performs the following actions:
+
+- Check if you’re using a test framework
+- Check if you already have a test file created
+- Insert new unit tests directly in the existing test file or create a new file if none exists
+
+Here, you can **Accept**, **Undo**, or **Show diff** for the change.
+
+### Inline code fix
+
+Cody with JetBrains can also propose fixes and updates to errors in your code. The inline **Ask Cody to Fix** functionality alerts a user when it notices an issue and provides a workflow to suggest a fix, review the suggestion, and accept the change, all within the editor.
+
+All you need to do is select and highlight the code line with the error and click the lightbulb icon. Then select **Ask Cody to Fix**. You can then view the diff and accept or undo the suggested change.
+
+### Document your code
+
+Like the Edit Code and Generate Unit Test commands, you can generate inline documentation for your code without opening the chat window. Doc command is available via hotkey, context menu, and Cody sidebar. Type `Shift + Ctrl + H`, and Cody will start generating documentation for your selected code snippet or the entire file.
+
+<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
+  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jb-document-code-0824.mp4" type="video/mp4"/>
+</video>
+
+## Autocomplete
+
+Cody provides multi-line autocomplete as you type. Autocomplete suggestions appear as inlay suggestions and are enabled by default in your JetBrains IntelliJ editor. With this setting, there is a list of programming languages supported and enabled by default.
+
+To manually configure the Autocomplete feature,
+
+- Go to the **Cody Settings...** from the Cody icon in the sidebar
+- Next, click the **Sourcegraph & Cody** dropdown and select **Cody**
+- The **Autocomplete** settings will appear with the list of **Enabled Languages**
+
+Autocomplete suggestions use the same color as inline parameter hints according to your configured editor theme. However, you can optionally enable the **Custom color for completions** checkbox to customize the color of your choice.
+
+In addition, you can use the following keyboard shortcuts to interact with Cody's autocomplete suggestions:
+
+- `Tab` to accept a suggestion
+- `Alt + [` (Windows) or `Opt + [` (macOS) to cycle suggestions
+- `Alt + \` (Windows) or `Opt + \` (macOS) to manually trigger autocomplete if no suggestions have been returned
+
+<video width="1920" height="1080" loop playsInline controls style={{ width: '100%', height: 'auto' }}>
+  <source src="https://storage.googleapis.com/sourcegraph-assets/Docs/Media/jetbrains-cody-v6-autocomplete.mp4" type="video/mp4"/>
+</video>
 
 ## Add or remove account
 
@@ -237,6 +284,7 @@ To add or remove an account you can do the following:
 1. To remove, select your account and hit `-`. To add click `+` and choose the appropriate login method
 
 ## Change update channel for stable or nightly releases
+
 Our nightly release channel gets updated much more frequently and might be helpful to verify bug fixes that will come in the next stable release.
 To update your update channel you can do the following:
 
diff --git a/docs/cody/clients/install-vscode.mdx b/docs/cody/clients/install-vscode.mdx
index 32b30b5ec..d7133e2ab 100644
--- a/docs/cody/clients/install-vscode.mdx
+++ b/docs/cody/clients/install-vscode.mdx
@@ -138,12 +138,12 @@ A chat history icon at the top of your chat input window allows you to navigate
 
 ### Changing LLM model for chat
 
-<Callout type="note"> You need to be a Cody Free or Pro user to have multi-model selection capability. This is not available for Cody Enterprise users.</Callout>
+<Callout type="note"> You need to be a Cody Free or Pro user to have multi-model selection capability. Enterprise users with the new [model configuration](/cody/clients/model-configuration) can use the LLM selection dropdown to choose a chat model.</Callout>
 
 For Chat:
 
 - Open chat or toggle between editor and chat (Opt+L/Alt+L)
-- Click on the model selector (which by default indicates Claude 3 Sonnet)
+- Click on the model selector (which by default indicates Claude 3.5 Sonnet)
 - See the selection of models and click the model you desire. This model will now be the default model going forward on any new chats
 
 For Edit:
diff --git a/docs/cody/usage-and-pricing.mdx b/docs/cody/usage-and-pricing.mdx
index c66eef2e6..4cd51c315 100644
--- a/docs/cody/usage-and-pricing.mdx
+++ b/docs/cody/usage-and-pricing.mdx
@@ -10,7 +10,7 @@ The free plan is designed for individuals to get started with Cody. It comes wit
 
 The free plan provides access to local context with keyword search and embeddings on open-source code via Sourcegraph.com. You get **200 MB** of embeddings over your lifetime and can manage these from the user settings in VS Code, with JetBrains IDE support coming soon. If you embed 150 MB of code, you can only embed another 50 MB of code. If you delete that 150 MB of code embedding, the original 200 MB of code embeddings will be available again.
 
-The free plan ensures local context utilization and allows you to seamlessly integrate Cody into your preferred client, whether it's VSCode, JetBrains, or Neovim. Finally, you'll have default support with Anthropic (Claude 3 Sonnet for Chat and Commands) and StarCoder as the officially supported LLMs.
+The free plan ensures local context utilization and allows you to seamlessly integrate Cody into your preferred client, whether it's VSCode, JetBrains, or Neovim. Finally, you'll have default support with Anthropic (Claude 3.5 Sonnet for Chat and Commands) and StarCoder as the officially supported LLMs.
 
 ### Billing cycle