From 6606afff9c43b39c5842c9aa34962d7d9dd73e13 Mon Sep 17 00:00:00 2001
From: David Cramer <dcramer@gmail.com>
Date: Thu, 10 Mar 2022 09:36:03 -0800
Subject: [PATCH 1/2] feat: Disable relay by default in devservices

---
 src/components/sidebar.tsx     | 8 ++++----
 src/docs/environment/index.mdx | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/sidebar.tsx b/src/components/sidebar.tsx
index 7fb5b79213..e80631e9a1 100644
--- a/src/components/sidebar.tsx
+++ b/src/components/sidebar.tsx
@@ -50,14 +50,14 @@ export default () => {
           <h6>Development</h6>
         </div>
         <ul className="list-unstyled" data-sidebar-tree>
-          <SidebarLink to="/commit-messages/">Commit Messages</SidebarLink>
-          <SidebarLink to="/code-review/">Code Review</SidebarLink>
-          <SidebarLink to="/workflow/">Workflow</SidebarLink>
-          <SidebarLink to="/environment/" title="Environment">
+        <SidebarLink to="/environment/" title="Environment">
             <Children
               tree={tree.find(n => n.name === "environment").children}
             />
           </SidebarLink>
+          <SidebarLink to="/commit-messages/">Commit Messages</SidebarLink>
+          <SidebarLink to="/code-review/">Code Review</SidebarLink>
+          <SidebarLink to="/workflow/">Workflow</SidebarLink>
           <SidebarLink to="/continuous-integration/">
             Continuous Integration
           </SidebarLink>
diff --git a/src/docs/environment/index.mdx b/src/docs/environment/index.mdx
index 0de7384cb8..17ae0f36fe 100644
--- a/src/docs/environment/index.mdx
+++ b/src/docs/environment/index.mdx
@@ -267,6 +267,12 @@ If you would like to be able to run `devserver` outside of your root checkout, y
   displayed correctly.
 </Alert>
 
+### A Note on Relay
+
+Some services are not run in all situations, and one of those is <Link to="/services/relay/">Relay</Link>. If you need a more production-like environment
+in development, you can set `SENTRY_USE_RELAY=True` in `~/.sentry/sentry.conf.py`. This will launch relay as part of the
+`devserver` workflow.
+
 ## Setting up Getsentry
 
 <Alert title="Employees Only" level="warning">

From 3bf9ea219a2e7bbab3e92fb161ce660598a268e8 Mon Sep 17 00:00:00 2001
From: David Cramer <dcramer@users.noreply.github.com>
Date: Thu, 10 Mar 2022 12:32:09 -0800
Subject: [PATCH 2/2] Update src/docs/environment/index.mdx

Co-authored-by: Jan Michael Auer <mail@jauer.org>
---
 src/docs/environment/index.mdx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/docs/environment/index.mdx b/src/docs/environment/index.mdx
index 17ae0f36fe..72e5eac35c 100644
--- a/src/docs/environment/index.mdx
+++ b/src/docs/environment/index.mdx
@@ -267,11 +267,13 @@ If you would like to be able to run `devserver` outside of your root checkout, y
   displayed correctly.
 </Alert>
 
-### A Note on Relay
+### Ingestion Pipeline (Relay)
 
-Some services are not run in all situations, and one of those is <Link to="/services/relay/">Relay</Link>. If you need a more production-like environment
-in development, you can set `SENTRY_USE_RELAY=True` in `~/.sentry/sentry.conf.py`. This will launch relay as part of the
-`devserver` workflow.
+Some services are not run in all situations, among those are <Link to="/services/relay/">Relay</Link> and the ingest workers. If you need
+a more production-like environment in development, you can set `SENTRY_USE_RELAY=True` in `~/.sentry/sentry.conf.py`. This will launch Relay
+as part of the `devserver` workflow.
+
+Additionally you can explicitly control this during `devserver` usage with the `--relay` and `--no-relay` flags.
 
 ## Setting up Getsentry