diff --git a/assets/settings/default.json b/assets/settings/default.json
index ff118d721ec94edd43735119b8edc52c5b456dc5..141e0abd444b3be94ae21470bee30f0a432e1c1c 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -256,7 +256,7 @@
     "search_results": true,
     // Whether to show selected symbol occurrences in the scrollbar.
     "selected_symbol": true,
-    // Which diagnostic indicator levels to show in the scrollbar:
+    // Which diagnostic indicators to show in the scrollbar:
     //  - "none" or false: do not show diagnostics
     //  - "error": show only errors
     //  - "warning": show only errors and warnings
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 2f98b0626e9eabb18505c64837fa808017a1fca5..52b69833ec71dd5a350a29192ec03a82d7cfd9c3 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -150,7 +150,7 @@ pub struct ScrollbarAxes {
     pub vertical: bool,
 }
 
-/// Which diagnostic indicator levels to show in the scrollbar.
+/// Which diagnostic indicators to show in the scrollbar.
 ///
 /// Default: all
 #[derive(Copy, Clone, Debug, Serialize, JsonSchema, PartialEq, Eq)]
@@ -415,12 +415,7 @@ pub struct ScrollbarContent {
     ///
     /// Default: true
     pub selected_symbol: Option<bool>,
-    /// Which diagnostic indicator levels to show in the scrollbar:
-    ///  - "none" or false: do not show diagnostics
-    ///  - "error": show only errors
-    ///  - "warning": show only errors and warnings
-    ///  - "information": show only errors, warnings, and information
-    ///  - "all" or true: show all diagnostics
+    /// Which diagnostic indicators to show in the scrollbar:
     ///
     /// Default: all
     pub diagnostics: Option<ScrollbarDiagnostics>,
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index fb729e96b055da384328c0ed01c217a7a800cbec..25f0823fbd9ad54ee3deb5377274f6ebb23368dd 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -534,7 +534,7 @@ List of `string` values
   "git_diff": true,
   "search_results": true,
   "selected_symbol": true,
-  "diagnostics": true,
+  "diagnostics": "all",
   "axes": {
     "horizontal": true,
     "vertical": true,
@@ -624,13 +624,51 @@ List of `string` values
 
 ### Diagnostics
 
-- Description: Whether to show diagnostic indicators in the scrollbar.
+- Description: Which diagnostic indicators to show in the scrollbar.
 - Setting: `diagnostics`
-- Default: `true`
+- Default: `all`
 
 **Options**
 
-`boolean` values
+1. Show all diagnostics:
+
+```json
+{
+  "diagnostics": "all"
+}
+```
+
+2. Do not show any diagnostics:
+
+```json
+{
+  "diagnostics": "none"
+}
+```
+
+3. Show only errors:
+
+```json
+{
+  "diagnostics": "error"
+}
+```
+
+4. Show only errors and warnings:
+
+```json
+{
+  "diagnostics": "warning"
+}
+```
+
+5. Show only errors, warnings, and information:
+
+```json
+{
+  "diagnostics": "information"
+}
+```
 
 ### Axes