Merge branch 'main' into sg-next-jan1-2025

docs/admin/deploy/docker-single-container/index.mdx

@@ -138,6 +138,11 @@ SELECT * FROM users;
 
 ## Upgrade
 
+> Warning: The 5.11 release updates the database container images from Postgres 12 to Postgres 16. Customers are advised to have a database backup before upgrading! See our [postgres 12 end of life](https://sourcegraph.com/docs/admin/postgres12_end_of_life_notice#postgres-12-end-of-life) notice!
+>
+> Single-container *does not* support auto migration to postgres 16. If you are planning to upgrade to 5.11.0 and beyond on single-container, you will need to dump the postgres databases and restore them after the upgrade.
+> In this event, we highly recommend you migrate to a production supported deployment method, or switch to our cloud offering.
+
 ### Standard upgrades
 
 A [standard upgrade](/admin/updates/#standard-upgrades) occurs between two minor versions of Sourcegraph. If you are looking to jump forward several versions, you must perform a [multi-version upgrade](#multi-version-upgrades) instead.

docs/admin/workers.mdx

@@ -62,7 +62,7 @@ This job periodically compares index records against retention policies and mark
 
 #### `codeintel-package-filter-applicator`
 
-This job periodically updates the blocked status of package repo references and versions when package repo fitlers are updated or deleted.
+This job periodically updates the blocked status of package repo references and versions when package repo filters are updated or deleted.
 
 #### `insights-job`
 

docs/batch-changes/update-a-batch-change.mdx

@@ -60,6 +60,7 @@ Here are some examples:
 - When the [`changesetTemplate.title`](/batch-changes/batch-spec-yaml-reference#changesettemplatetitle) or the [`changesetTemplate.body`](/batch-changes/batch-spec-yaml-reference#changesettemplatecommitauthor) are changed and the changeset has been published, the changeset on the code host will be updated accordingly
 - When the [`changesetTemplate.branch`](/batch-changes/batch-spec-yaml-reference#changesettemplatetitle) is changed after the changeset has been published on the code host, the existing changeset will be closed on the code host and the new one, with the new branch, will be created
 - When the batch spec is changed in such a way that no diff is produced in a repository in which the batch change has already created and published a changeset, the existing changeset will be closed on the code host and archived in the batch change
+- When the changeset has been published and the batch spec is changed in such a way that a commit on the code host will be overwritten, any commits that have been manually added to the changeset on the code host will be deleted 
 
 <Callout type="note">See the [Batch Changes design](/batch-changes/design) docs for more information on the declarative nature of the Batch Changes system.</Callout>
 

docs/code-search/features.mdx

@@ -65,7 +65,7 @@ The Sourcegraph search language supports [RE2](https://golang.org/s/re2syntax) s
 - It's well-supported in Go, allowing us to take advantage of a rich ecosystem (notably including [Zoekt](https://github.com/sourcegraph/zoekt))
 - Our API and tooling makes it straightforward to use Sourcegraph with other tools that provide facilities not built in to the search language.
 
-As an example of how you can use Sourcegraph tooling with other tools, we can use `jq` (which supports Perl regexes) along with `src` to post-filter search results. In this case, we want to use backreferences to find go functions take a single pointer argument and return a non-pointer of the same type as the input.
+As an example of how you can use Sourcegraph tooling with other tools, we can use `jq` (which supports Perl regexes) along with `src` to post-filter search results. In this case, we want to use backreferences to find go functions that take a single pointer argument and return a non-pointer of the same type as the input.
 
 ```shell
 re2_regex='func \w+\(\w+ \*\w+\) \w+'

docs/cody/clients/install-eclipse.mdx

@@ -74,3 +74,7 @@ When you have both a repository and files @-mentioned, Cody will search the repo
 ## Prompts
 
 Cody offers a variety of [pre-built prompts](/cody/capabilities/commands) to help you get the most out of your chat experience. You can access these prompts from the chat input field.
+
+## Feedback
+
+While Cody for Eclipse is currently in the experimental stage, we are open to feedback [in our forum](https://community.sourcegraph.com/c/cody/eclipse/13).

docs/cody/core-concepts/cody-gateway.mdx

@@ -8,7 +8,7 @@ Cody Gateway powers the default `"provider": "sourcegraph"` and Cody completions
 
 ## Supported Models
 
-For a full list of supported models and providers, read our [Supported LLMs] (/Cody/capabilities/supported-models) docs.
+For a full list of supported models and providers, read our [Supported LLMs](/Cody/capabilities/supported-models) docs.
 
 ## Setting up Cody Gateway in Sourcegraph Enterprise
 

docs/cody/troubleshooting.mdx

@@ -180,7 +180,7 @@ Following these steps will help the team understand and resolve the performance
 
 JetBrains logs can be accessed via the **Output** panel. To access logs, you must first enable Cody logs from the Settings menu.  To do so:
 
-- Open the Settings panel (`⌘,` for macOS) (`Ctrl+Alt+S` for Windows)
+- Open the Settings panel (`⌘,` for macOS) (`Ctrl+Alt+S` for Windows/Linux)
 - Go to `Sourcegraph & Cody`
 - Click on `Cody`
 - Check the box to Enable debug
@@ -251,3 +251,76 @@ You can open the Cody Log view using the same steps as above, but instead, selec
 This will include more information about what Cody is doing, including any errors. There is a copy button at the top right of the log view that you can use to copy the log to your clipboard and send it to us. Be careful not to include any sensitive information, as the log communication is verbose and may contain tokens.
 
 Additionally, Eclipse's built-in Error Log can be used to view any uncaught exceptions and their stack traces. You can open the Error Log using the **Window > Show View > Error Log** menu.
+
+## OpenAI o1
+
+### Context Deadline Exceeded Error
+
+Symptoms:
+
+- "Request Failed: Request to... failed with 500 Internal Server Error: context deadline exceeded"
+- Occurs with both o1-mini and o1-preview
+- Happens even with relatively small inputs (~220 lines)
+
+Solutions:
+
+- Keep input context smaller - aim for less than 200 lines of code initially
+- Break down larger requests into smaller chunks
+- Start a new chat session if errors persist
+- Add "Keep your answer brief!" to prompts when possible
+
+Prevention:
+
+- Import only the most relevant files
+- Use file range syntax (e.g., @file:1-100) to limit context
+- Focus on specific sections rather than entire codebases
+
+### Truncated Outputs
+
+Symptoms:
+
+- Response cuts off mid-sentence
+- Unable to get complete code examples
+- "Continue" requests also result in truncation
+
+Solutions:
+
+- For `o1-preview`: Copy the last line and ask to "continue from last line"
+- Switch to `o1-mini` for more reliable complete outputs
+- Break down complex requests into smaller steps
+- Consider using Sonnet 3.5 for tasks requiring longer outputs
+
+Limits:
+
+- Input tokens: 45k
+- Output tokens: 4k
+
+### Model Switching Issues
+
+Symptoms:
+
+- Model reverts to Sonnet 3.5 unexpectedly
+- "On waitlist" message appears after previously having access
+- Unable to select o1 models in command palette
+
+Solutions:
+
+- Restart IDE/VS Code
+- Sign out and sign back in
+- Check Pro subscription status
+- Contact support if issues persist
+
+### Response Format Errors
+
+Symptoms:
+
+- "Request Failed: Unexpected response format"
+- Model stops responding
+- Inconsistent output formatting
+
+Solutions:
+
+- Cancel and retry the request
+- Start a new chat session
+- Reduce context complexity
+- Use one-shot prompts with clear requirements

docs/sla/index.mdx

@@ -33,8 +33,6 @@ The following policy applies to both our cloud-based (managed instance) and on-p
 
 <Callout type="note">Cody Free users are not eligible for email Support but can get assistance through our Community Discord.</Callout>
 
->NOTE: Slack Account Management Package not offered on new contracts after January 10, 2023
-
 ### Minimum Supported Version for Self-Hosted Instances
 
 We support the current major version of the Software and the immediately preceding major version (N minus 1). 
@@ -117,13 +115,13 @@ First response times remain the same according to our SLAs. However, Emergency a
 
 This service is provided for all GA products Sourcegraph offers, not for any [Experimental or Beta features](/admin/beta_and_experimental_features).
 
->NOTE: This package includes access to Slack Support & Slack Account Management
+>NOTE: This package includes access to Slack Support
 
 ### Dedicated Support
 
 Access to named senior support engineers who will have knowledge of your infrastructure and can help reduce the time needed to triage, diagnose, and resolve an issue in your instance.
 
->NOTE: This package includes access to Slack Support & Slack Account Management
+>NOTE: This package includes access to Slack Support
 
 ### Slack Support