fix merge conflicts

Author: MaedahBatool

README.md

@@ -1,6 +1,6 @@
 # Sourcegraph Docs
 
-<!-- Working branch for FEB 2025 Release -->
+<!-- Working branch for SG 6.3 Release -->
 
 Welcome to the Sourcegraph documentation! We're excited to have you contribute to our docs. We've recently rearchitectured our docs tech stack — powered by Next.js, TailwindCSS and deployed on Vercel. This guide will walk you through the process of contributing to our documentation using the new tech stack.
 
@@ -18,7 +18,7 @@ Navigate to the project directory by typing the following command in your termin
 cd sourcegraph-docs
 ```
 
-Before the dependencies are install make sure your local machine has the following versions of `node` and `pnpm`:
+Before the dependencies are install make sure your local machine has the following versions of `node` and `pnpm` installed:
 
 * node: `v20.8.1`
 * pnpm: `8.13.1`
@@ -148,11 +148,10 @@ As you make changes to the documentation, the development server will automatica
 
 ### Previewing Vercel Deployments
 
-When you open a PR Vercel deploys and provides you with a preview deployment link. To view your deployment, click the "Visit Preview" and then append `/docs` at the end of the URL. The original link gives you a `404`.
+When you open a PR Vercel deploys and provides you with a preview deployment link. To view your deployment, click the **Visit Preview** link from Vercel's deployment panel in your PRs and you get a preview of your docs
 
 ![CleanShot 2024-11-05 at 10 11 29@2x](https://github.com/user-attachments/assets/b0911e2e-95a7-4f56-b2ff-b659d13077d8)
 
-
 ## Submitting your Contribution
 
 Once you're satisfied with your changes, follow these steps:

baseai/memory/docs/index.ts renamed to baseai/memory/memory-sg-docs-live/index.ts

@@ -1,14 +1,14 @@
 import { MemoryI } from '@baseai/core';
 
 const memoryDocs = (): MemoryI => ({
-	name: 'docs',
-	description: 'Docs folder of sourcegraph docs repository as an auto-synced memory',
+	name: 'memory-sg-docs-live',
+	description: 'An AI memory storing all Sourcegraph docs.',
 	git: {
 		enabled: true,
 		include: ['**/*.mdx'],
 		gitignore: true,
-		deployedAt: '5f3fec8530280d01a783aadcdeb0ccc3f9cd8b70',
-		embeddedAt: ''
+		embeddedAt: '',
+		deployedAt: '1b67d5c14520a898e2b9933ab3d2a9fe28515e31'
 	},
 	documents: {
 		meta: doc => {
@@ -22,3 +22,6 @@ const memoryDocs = (): MemoryI => ({
 });
 
 export default memoryDocs;
+
+// Old
+// deployedAt: '5f3fec8530280d01a783aadcdeb0ccc3f9cd8b70',

docs.config.js

@@ -1,5 +1,5 @@
 const config = {
-	DOCS_LATEST_VERSION: '6.1'
+	DOCS_LATEST_VERSION: '6.3'
 };
 
 module.exports = config;

docs/admin/architecture.mdx

@@ -56,8 +56,7 @@ order:
   use the [OpenID Connect provider](#openid-connect).
 - If you wish to use LDAP and cannot use the GitHub/GitLab OAuth provider as described above, or if
   you wish to use another authentication mechanism that is not yet supported, please [contact
-  us](https://github.com/sourcegraph/sourcegraph/issues/new?template=feature_request) (we respond
-  promptly).
+  us](https://sourcegraph.com/contact)
 
 Most users will use only one auth provider, but you can use multiple auth providers if desired to
 enable sign-in via multiple services. Identities from different providers will be mapped to a

docs/admin/auth/index.mdx

@@ -1,4 +1,5 @@
-# Configuring SAML with Microsoft Entra ID
+# Configuring SAML with Microsoft Entra ID 
+<Callout type="note">Formerly known as Azure Active Directory, or Azure AD.</Callout>
 
 ## 1. Add an unlisted (non-gallery) application to your Microsoft Entra ID organization
 
@@ -33,4 +34,4 @@
 }
 ```
 
-<Callout type="note">Recommended: [add automatic provisioning of users with SCIM](/admin/scim).</Callout>
+<Callout type="note">Recommended: [add automatic provisioning of users with SCIM](/admin/scim).</Callout>

docs/admin/auth/saml/azure_ad.mdx

@@ -81,7 +81,7 @@ Error prefetching SAML service provider metadata
 
 > NOTE: Email or NameID changes in the identity provider are not automatically reflected in Sourcegraph. Admins may manually update a users email via the admin interface at `https://example-sourcegraph.com/users/<user>/settings/emails`, or remove the user and recreate a new account.
 >
-> Work is planned to support SCIM on SAML auth providers, which should automate this process. ([tracking issue](https://github.com/sourcegraph/sourcegraph/issues/22732))
+> Work is planned to support SCIM on SAML auth providers, which should automate this process.
 
 ### How to control user sign-up and sign-in
 

docs/admin/auth/saml/index.mdx

@@ -4,7 +4,7 @@ Sourcegraph often beta tests major features before we make them generally availa
 
 Exposing beta and experimental features gives you an opportunity to try our newest features sooner.
 
-In return, your feedback helps us make sure that our new features are reliable and useful, and we appreciate any and all feedback you want to provide. You can [file an issue](https://github.com/sourcegraph/sourcegraph/issues/new/choose), email it directly to [[email protected]](mailto:[email protected]), or use the in-app feedback modal.
+In return, your feedback helps us make sure that our new features are reliable and useful, and we appreciate any and all feedback you want to provide. You can email us directly to [[email protected]](mailto:[email protected]).
 
 ## Both beta and experimental features
 

docs/admin/beta_and_experimental_features.mdx

@@ -241,7 +241,7 @@ There are four fields for configuring which repositories are mirrored/synchroniz
 
 - [`repos`](/admin/code_hosts/github#repos)A list of repositories in `owner/name` format. The order determines the order in which we sync repository metadata and is safe to change.
 - [`orgs`](/admin/code_hosts/github#orgs)A list of organizations (every repository belonging to the organization will be cloned).
-- [`repositoryQuery`](/admin/code_hosts/github#repositoryQuery)A list of strings with three pre-defined options (`public`, `affiliated`, `none`, none of which are subject to result limitations), and/or a [GitHub advanced search query](https://github.com/search/advanced). Note: There is an existing limitation that requires the latter, GitHub advanced search queries, to return [less than 1000 results](#repositoryquery-returns-first-1000-results-only). See [this issue](https://github.com/sourcegraph/sourcegraph/issues/2562) for ongoing work to address this limitation.
+- [`repositoryQuery`](/admin/code_hosts/github#repositoryQuery)A list of strings with three pre-defined options (`public`, `affiliated`, `none`, none of which are subject to result limitations), and/or a [GitHub advanced search query](https://github.com/search/advanced). Note: There is an existing limitation that requires the latter, GitHub advanced search queries, to return [less than 1000 results](#repositoryquery-returns-first-1000-results-only).
 - [`exclude`](/admin/code_hosts/github#exclude)A list of repositories to exclude which takes precedence over the `repos`, `orgs`, and `repositoryQuery` fields.
 
 ## Rate limits

docs/admin/code_hosts/github.mdx

@@ -58,13 +58,6 @@ We recognize there are other code hosts including CVS, SVN, and many more. Today
 - [Non-Git code hosts](/admin/code_hosts/non-git)
   - [Perforce](/admin/repo/perforce)
   - [Plastic SCM](/admin/repo/plasticscm)
-  - [Package repository hosts](/admin/code_hosts/package-repos)
-    - [JVM dependencies](/admin/code_hosts/jvm)
-    - [Go dependencies](/admin/code_hosts/go)
-    - [npm dependencies](/admin/code_hosts/npm)
-    - [Python dependencies](/admin/code_hosts/python)
-    - [Ruby dependencies](/admin/code_hosts/ruby)
-    - [Rust dependencies](/admin/code_hosts/rust)
 
 ## Rate limits