Merge branch 'main' into docs-chatbot

MaedahBatool · web-flow · commit 894e04c168df · 2025-03-19T12:26:44.000-07:00
diff --git a/docs/admin/code_hosts/github.mdx b/docs/admin/code_hosts/github.mdx
@@ -109,6 +109,11 @@ Once public, App can be installed in additional namespaces either from Sourcegra
 
 5. To sync repositories from this installation, click **Add connection** under your new installation.
 
+### Configuring Multiple Private GitHub Apps for Sourcegraph
+If you prefer not to make your GitHub App public and instead create separate private GitHub Apps for each organizations, users will need to authorize each GitHub App individually to ensure proper repository access and permissions syncing. This is because GitHub Apps have narrowly scoped permissions and do not share authentication across multiple installations. To streamline this process, users can go to `User Settings` > `Account Security` in Sourcegraph and connect all necessary GitHub Apps from there. Once authorized, Sourcegraph will use the user's GitHub identity to determine access across all configured GitHub Apps. 
+
+For customers using GitHub Enterprise Cloud, an alternative approach is to create an Enterprise GitHub App, which can be installed across multiple organizations within an enterprise account while maintaining private visibility. More details on this approach can be found in [GitHub's documentation](https://docs.github.com/en/enterprise-cloud@latest/admin/managing-your-enterprise-account/creating-github-apps-for-your-enterprise).
+
 ### Uninstalling an App
 
 You can uninstall a GitHub App from a namespace or remove it altogether at any time.
diff --git a/docs/cody/capabilities/ollama.mdx b/docs/cody/capabilities/ollama.mdx
@@ -2,8 +2,7 @@
 
 {/* Internal docs only. Offloading from our production docs for now. */}
 
-
-<Callout type="info">Support with Ollama is currently in the Experimental stage and is available for Cody Free and Pro plans.</Callout>
+<Callout type="info">Compatibility with Ollama is currently in the Experimental stage and is available for Cody Free and Pro plans. The support is for Ollama is limited feel free to contact us for any questions or feedback.</Callout>
 
 ## Cody Autocomplete with Ollama
 
diff --git a/docs/cody/clients/cody-with-sourcegraph.mdx b/docs/cody/clients/cody-with-sourcegraph.mdx
@@ -5,7 +5,7 @@
 In addition to the Cody extensions for [VS Code](/cody/clients/install-vscode), [JetBrains](/cody/clients/install-jetbrains), and [Visual Studio](/cody/clients/install-visual-studio ) IDEs, 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://storage.googleapis.com/sourcegraph-assets/Docs/new-chat-icon.svg" imgAlt="Cody for Web" title="Cody for Web" description="Use Cody in the Sourcegraph Web App." />
+    <LinkCard href="https://sourcegraph.com/cody/chat" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Cody for Web" title="Cody for Web" description="Use Cody in the Sourcegraph Web App." />
 </LinkCards>
 
 ## Initial setup
diff --git a/docs/cody/clients/install-eclipse.mdx b/docs/cody/clients/install-eclipse.mdx
@@ -2,7 +2,7 @@
 
 <p className="subtitle">Learn how to use Cody and its features with the Eclipse editor.</p>
 
-<Callout type="info">Cody for Eclipse is currently in the Experimental stage. It is compatible with Eclipse version 2024-03 (4.31.0) and runs on Windows 11. At this time, it only supports chat functionality.</Callout>
+<Callout type="info">Cody for Eclipse is currently in the Experimental stage and supports only chat. It is compatible with Eclipse version 2024-03 (4.31.0) and runs on Windows 11. The support is also limited feel free to contact us for any questions or feedback.</Callout>
 
 Cody extension for Eclipse enhances your coding experience by providing intelligent and contextually aware answers to your questions. This guide will walk you through installing and setting Cody within your Eclipse editor.
 
diff --git a/docs/cody/clients/install-jetbrains.mdx b/docs/cody/clients/install-jetbrains.mdx
@@ -5,7 +5,7 @@
 The Cody plugin by Sourcegraph enhances your coding experience in your IDE by providing intelligent code suggestions, context-aware completions, and advanced code analysis. This guide will walk you through the steps to install and set up Cody within your JetBrains environment.
 
 <LinkCards>
-   <LinkCard href="https://plugins.jetbrains.com/plugin/9682-cody-ai-by-sourcegraph" imgSrc="https://storage.googleapis.com/sourcegraph-assets/docs/images/cody/jb_beam.svg" imgAlt="Cody for JetBrains" title="JetBrains Extension" description="Install Cody's free extension for JetBrains." />
+   <LinkCard href="https://plugins.jetbrains.com/plugin/9682-cody-ai-by-sourcegraph" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Cody for JetBrains" title="JetBrains Extension" description="Install Cody's free extension for JetBrains." />
 </LinkCards>
 
 ## Prerequisites
diff --git a/docs/cody/clients/install-visual-studio.mdx b/docs/cody/clients/install-visual-studio.mdx
@@ -2,12 +2,12 @@
 
 <p className="subtitle">Learn how to use Cody and its features with the Visual Studio editor.</p>
 
-<Callout type="info">Cody for Visual Studio is currently in the Experimental stage and currently only supports chat.</Callout>
+<Callout type="info">Cody for Visual Studio is currently in the Experimental stage and currently supports chat and autocomplete.</Callout>
 
 Cody extension for Visual Studio enhances your coding experience by providing intelligent and contextually aware answers to your questions. This guide will walk you through installing and setting Cody within your Visual Studio editor.
 
 <LinkCards>
-  <LinkCard href="https://github.com/sourcegraph/cody-vs/" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/visual-studio-Product-Icon.svg" imgAlt="Cody for Visual Studio" title="Cody for Visual Studio (Experimental)" description="Install Cody's free extension for Visual Studio." />
+  <LinkCard href="https://marketplace.visualstudio.com/items?itemName=sourcegraph.cody-vs" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Cody for Visual Studio" title="Cody for Visual Studio (Experimental)" description="Install Cody's free extension for Visual Studio." />
 </LinkCards>
 
 ## Prerequisites
diff --git a/docs/cody/clients/install-vscode.mdx b/docs/cody/clients/install-vscode.mdx
@@ -5,7 +5,7 @@
 The Cody extension by Sourcegraph enhances your coding experience in VS Code by providing intelligent code suggestions, context-aware autocomplete, and advanced code analysis. This guide will walk you through the steps to install and set up Cody within your VS Code environment.
 
 <LinkCards>
-  <LinkCard href="https://marketplace.visualstudio.com/items?itemName=sourcegraph.cody-ai" imgSrc="https://storage.googleapis.com/sourcegraph-assets/docs/images/cody/vscode.svg" imgAlt="Cody for VS Code" title="Cody for VS Code" description="Install Cody's free extension for VS Code." />
+  <LinkCard href="https://marketplace.visualstudio.com/items?itemName=sourcegraph.cody-ai" imgSrc="https://storage.googleapis.com/sourcegraph-assets/Docs/sg-new-logo.svg" imgAlt="Cody for VS Code" title="Cody for VS Code" description="Install Cody's free extension for VS Code." />
 </LinkCards>
 
 ## Prerequisites
diff --git a/docs/releases.mdx b/docs/releases.mdx
@@ -12,7 +12,10 @@ Currently supported versions of Sourcegraph:
 
 | **Release**  | **General Availability Date** | **Supported** | **Release Notes**                                                  | **Install**                                          |
 |--------------|-------------------------------|---------------|--------------------------------------------------------------------|------------------------------------------------------|
-| 6.1 Patch 1  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v61376)     | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 6.1 Patch 4  | March 2025                    | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v614020)  | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 6.1 Patch 3  | March 2025                    | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v612889)  | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 6.1 Patch 2  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v611295)  | [Install](https://sourcegraph.com/docs/admin/deploy) |
+| 6.1 Patch 1  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v61376)   | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.1 Patch 0  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v610)     | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.0 Patch 1  | February 2025                 | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v602687)  | [Install](https://sourcegraph.com/docs/admin/deploy) |
 | 6.0 Patch 0  | January 2025                  | ✅             | [Notes](https://sourcegraph.com/docs/technical-changelog#v600)     | [Install](https://sourcegraph.com/docs/admin/deploy) |
diff --git a/docs/technical-changelog.mdx b/docs/technical-changelog.mdx
@@ -4,6 +4,32 @@ This page documents all notable changes to Sourcegraph. For more detailed change
 
 {/* CHANGELOG_START */}
 
+# 6.1 Patch 4
+
+## v6.1.4020
+
+- [sourcegraph](https://github.com/sourcegraph/sourcegraph/releases/tag/v6.1.4020)
+
+- [docker-compose](https://github.com/sourcegraph/deploy-sourcegraph-docker/releases/tag/v6.1.4020)
+
+- [helm](https://github.com/sourcegraph/deploy-sourcegraph-helm/releases/tag/v6.1.4020)
+
+- [kustomize](https://github.com/sourcegraph/deploy-sourcegraph-k8s/releases/tag/v6.1.4020)
+
+### Features
+
+#### Source
+
+- sub-repo-perms: add limited support for IPv4 wildcard semantics `(PR #4018)`
+  -  Backport 04606e20fbc8f13ad473533820b8f5df71e20ad7 from #3989
+
+### Reverts
+
+  There were no reverts for this release
+
+{/* RSS={"version":"v6.1.4020", "releasedAt": "2025-03-12"} */}
+
+
 # 6.1 Patch 3
 
 ## v6.1.2889
