Merge branch 'main' into dtacci-patch-2

content/benefits-pay-perks/benefits-perks/celebrate.md

@@ -188,9 +188,7 @@ Managers are welcome to acknowledge or celebrate teammate life events at each te
 
 Our recommended gifting platform is [Loop & Tie](https://sourcegraph.loopandtie.com/). Loop & Tie offers curated collections of gifts organized by price and shipping location (US and International). Then our teammates get to select the gift they truly want from whichever collection they were gifted. Loop & Tie also offers sustainability and social impact options that allow teammates who don't want to redeem a gift to donate their gift amount ($) toward a charity or environmental support organization.
 
-Managers must have a Loop & Tie account to send a gift. To create a Loop & Tie account, please reach out to the People team in the #swag slack channel and a current Loop & Tie admin (Kemper or Fabiana) will invite you to create an account.
-
-Once you have an account, here is [how to send a Loop & Tie gift](https://guides.loopandtie.com/knowledge/how-to-send-a-gift-on-loop-tie).
+If you want to send a Loop & Tie gift, please reach out to Kemper and she will facilitate.
 
 **Budget:** All birthday and anniversary gifting will be coming from the _individual’s team budget_. When you’re sending a Loop & Tie gift, you will use credits already in the company Loop & Tie account. Then the People + Finance team will reclass the charges into the correct team budgets on a monthly cadence.
 

content/benefits-pay-perks/pay-expenses/compensation/total-rewards.md

@@ -1 +1,3 @@
 # Total Rewards
+
+Moved this content [here](../../../departments/people-talent/total-rewards.md)

content/company-info-and-process/working-at-sourcegraph/teammate-development/index.md

@@ -65,7 +65,7 @@ At Sourcegraph, we have a formal performance (impact) review process that takes
 - 1st review period of the year: launches in February
 - 2nd review period of the year: launches in August
 
-The purpose of our semi-annual reviews, which take place via Lattice, is to gather formal feedback from the Teammate, their Manager, and their Peers. The purpose of our semi-annual reviews, which take place via Lattice, is to gather formal feedback from the Teammate, their Manager, and their Peers.
+The purpose of our annual reviews, which take place via Lattice, is to gather formal feedback from the Teammate, their Manager, and their Peers. The purpose of our annual reviews, which take place via Lattice, is to gather formal feedback from the Teammate, their Manager, and their Peers.
 
 Our impact review process is explained in detail [here](../../../departments/people-talent/people-ops/process/teammate-sentiment/impact-reviews/index.md)
 
@@ -88,7 +88,7 @@ We believe that regular feedback and self-reflection are crucial for individual
 
 **Monthly, managers will complete 1 question only:**
 
-- [visible to teammate] In 2-3 bullets, share feedback with this teammate, including things that are working well and/or areas this teammate can focus on next month.
+- [visible to teammate] In 2-3 bullets, describe 1) what this teammate did well last month and 2) what this teammate can focus on next month.
 
 **At the end of each quarter, managers will complete three questions:**
 

content/departments/cloud/technical-docs/v2.0/disaster_recovery_process.md

@@ -1,4 +1,4 @@
-# Distaster recovery process of a Cloud instance
+# Disaster recovery process of a Cloud instance
 
 <span class="badge badge-note">SOC2/CI-82</span>
 

content/departments/data-analytics/cody_analytics.md

@@ -62,7 +62,7 @@ All retention calculations and charts (except when specifically marked) will use
 
 ### Cody Billing DAU
 
-A billing DAU represents a user who interacts with the Cody product, regardless of intention and result. This is inclusive of a broader set of product usage. This includes pages that provide in-product information about Cody (such as the site-admin Cody page).
+A billing DAU represents a user who interacts with the Cody product, regardless of intention and result. This includes all [product DAU](#cody-product-dau) actions, and a broader set of product usage. For example, users who see Cody autocomplete suggestions (regardless of whether they accept them) and users who see pages that provide in-product information about Cody (such as the site-admin Cody page) are included as billing DAUs.
 
 By default, any events that contain the text “cody” and that come from the Sourcegraph web app or Sourcegraph editor extensions (i.e., event source is `WEB` or `IDEEXTENSION`) are included. We also maintain a deny list of events that are excluded (for example, interactions with CTAs on marketing pages).
 

content/departments/data-analytics/reports.md

@@ -180,6 +180,10 @@ Redash is connected to our BigQuery data warehouse, so you'll be able to query a
 - dotcom_events.events_usage: managed instance data
 - sourcegraph_analytics.update_checks: pings
 - dotcom_events.cody: all cody-specific event data
+- salesforce_data: salesforce data (accouts, leads, campaign)
+- stripe: stripe charges, accounts, invoice, etc data
+- sams: sourcegraph account management system
+- ssc: self-serve-cody
 
 ### **Is this for me?**
 

content/departments/engineering/dev/index.md

@@ -14,7 +14,6 @@
   - [Customer Issues](../../technical-success/support/process/engaging-other-teams.md)
   - [Incidents](process/incidents/index.md)
   - [Pull requests](process/pull-requests.md)
-  - [Product documentation](process/product_documentation.md)
   - [Continuous releasability](tools/continuous_releasability.md)
   - [Releases](process/releases/index.md)
     - [Release issue template](https://github.com/sourcegraph/sourcegraph/blob/main/dev/release/templates/release_issue_template.md)

content/departments/engineering/dev/process/deployments/index.md

@@ -2,20 +2,19 @@
 
 For a complete list of Sourcegraph instances we manage, see our [instances documentation](instances.md).
 
-- [Deployments](#deployments)
-  - [Deployment basics](#deployment-basics)
-    - [Images](#images)
-    - [Renovate](#renovate)
-    - [ArgoCD](#argocd)
-    - [Infrastructure](#infrastructure)
-  - [deploy-sourcegraph](#deploy-sourcegraph)
-    - [Merging changes from deploy-sourcegraph](#merging-changes-from-deploy-sourcegraph)
-  - [Relationship between deploy-sourcegraph repositories](#relationship-between-deploy-sourcegraph-repositories)
-    - [Merging upstream `deploy-sourcegraph` into `deploy-sourcegraph` forks](#merging-upstream-deploy-sourcegraph-into-deploy-sourcegraph-forks)
-  - [Sourcegraph Cloud](#sourcegraph-cloud)
-    - [Continuous Deployment Process](#continuous-deployment-process)
-  - [Deployment observability](#deployment-observability)
-    - [Deployment traces](#deployment-traces)
+- [Deployment basics](#deployment-basics)
+  - [Images](#images)
+  - [Renovate](#renovate)
+  - [ArgoCD](#argocd)
+  - [Infrastructure](#infrastructure)
+- [deploy-sourcegraph](#deploy-sourcegraph)
+  - [Merging changes from deploy-sourcegraph](#merging-changes-from-deploy-sourcegraph)
+- [Relationship between deploy-sourcegraph repositories](#relationship-between-deploy-sourcegraph-repositories)
+  - [Merging upstream `deploy-sourcegraph` into `deploy-sourcegraph` forks](#merging-upstream-deploy-sourcegraph-into-deploy-sourcegraph-forks)
+- [DotCom](#dotcom)
+  - [Continuous Deployment Process](#continuous-deployment-process)
+- [Deployment observability](#deployment-observability)
+  - [Deployment traces](#deployment-traces)
 
 Additional resources:
 
@@ -37,7 +36,7 @@ Each Sourcegraph service is provided as a Docker image. Every commit to `main` i
 
 When [a new semver release](../releases/index.md) is cut the pipelines, will build a release image with the same tag as the latest [release version](https://github.com/sourcegraph/sourcegraph/tags) as well. These are used by customer deployments.
 
-For pushing custom images, refer to [building Docker images for specific branches](#building-docker-images-for-a-specific-branch).
+For pushing custom images, see `sg ci docs`.
 
 ### Renovate
 

content/departments/engineering/dev/process/deployments/instances.md

@@ -18,13 +18,15 @@ Also see [playbooks](./playbooks.md) for common actions related to operating our
 
 [![Build status](https://badge.buildkite.com/ef1289610fdd05b606bf1e57a034af2365c7b09c95ac6121f9.svg)](https://buildkite.com/sourcegraph/deploy-sourcegraph-cloud)
 
-This deployment is also colloquially referred to as 'DotCom' and 'sourcegraph.com'. It is the public deployment available to the public at [sourcegraph.com/search](https://sourcegraph.com/search).
+This deployment is also colloquially referred to as 'DotCom' and 'sourcegraph.com'.
+It is the public deployment available to the public at [sourcegraph.com/search](https://sourcegraph.com/search), and is currently operated by the [Core Services team](../../../teams/core-services/index.md).
 
 `sourcegraph.com` deploys the latest changes from [`sourcegraph/sourcegraph`](https://github.com/sourcegraph/sourcegraph) on a [daily basis](index.md#continuous-deployment-process).
 
-This deployment also includes our [documentation](https://docs.sourcegraph.com/) and [about](https://about.sourcegraph.com/) sites.
+This deployment **does not** include the [about](https://about.sourcegraph.com/) site and the [new documentation site at sourcegraph.com/docs](https://sourcegraph.com/docs).
+It currently still includes the legacy [docs.sourcegraph.com](https://docs.sourcegraph.com/) site, however.
 
-> 🐶 For dogfooding changes, use [k8s.sgdev.org](#k8ssgdevorg) instead, which generally receives updates faster.
+> [!NOTE] 🐶 For dogfooding changes, use [sourcegraph.sourcegraph.com](#sourcegraphsourcegraphcom-s2) instead, which generally receives updates faster.
 
 - [DotCom cluster on GCP](https://console.cloud.google.com/kubernetes/clusters/details/us-central1-f/cloud?project=sourcegraph-dev)
   ```
@@ -34,12 +36,14 @@ This deployment also includes our [documentation](https://docs.sourcegraph.com/)
 - [Infrastructure configuration](https://github.com/sourcegraph/infrastructure/tree/main/cloud)
 - Alerts: #alerts-cloud and [OpsGenie](../incidents/on_call.md)
 - [Playbooks](./playbooks.md#sourcegraphcom)
+- [Observability](../../tools/observability/dotcom.md)
+- [Domain routing rules](https://sourcegraph.sourcegraph.com/github.com/sourcegraph/infrastructure/-/blob/gfe/envs/prod/project/routes.tf)
 
 ## k8s.sgdev.org
 
 [![Build status](https://badge.buildkite.com/65c9b6f836db6d041ea29b05e7310ebb81fa36741c78f207ce.svg?branch=release)](https://buildkite.com/sourcegraph/deploy-sourcegraph-dogfood-k8s-2)
 
-**NO LONGER PRIMARY DOGFOODING INSTANCE, SEE [S2](#sourcegraphsourcegraphcom-s2) BELOW**
+> [!WARNING] **THIS IS NO LONGER PRIMARY DOGFOODING INSTANCE, SEE [S2](#sourcegraphsourcegraphcom-s2) BELOW**
 
 This deployment is also colloquially referred to as "dogfood", "dogfood-k8s", or just "k8s".
 This is the Sourcegraph instance to use for dogfooding changes to Sourcegraph.

content/departments/engineering/dev/process/deployments/kubernetes.md

@@ -1,4 +1,4 @@
-# Kubernetes
+# Working with Kubernetes deployments
 
 This section contains tips and advice for interacting with our Kubernetes deployments (most notably [sourcegraph.com](#sourcegraph-cloud) and [k8s.sgdev.org](#k8s-sgdev-org)).