diff --git a/README.md b/README.md
index ee72af1f..2e7ef9e0 100644
--- a/README.md
+++ b/README.md
@@ -2560,8 +2560,10 @@ let g:ycm_autoclose_preview_window_after_insertion = 0
 ### The `g:ycm_max_diagnostics_to_display` option
 
 This option controls the maximum number of diagnostics shown to the user when
-errors or warnings are detected in the file. This option is only relevant if you
-are using the C-family semantic completion engine.
+errors or warnings are detected in the file. This option is only relevant for
+the C-family, C#, Java, JavaScript, and TypeScript languages.
+
+A special value of `0` means there is no limit.
 
 Default: `30`
 
diff --git a/doc/youcompleteme.txt b/doc/youcompleteme.txt
index eab09d2d..98174c62 100644
--- a/doc/youcompleteme.txt
+++ b/doc/youcompleteme.txt
@@ -2787,8 +2787,10 @@ Default: '0'
 The *g:ycm_max_diagnostics_to_display* option
 
 This option controls the maximum number of diagnostics shown to the user when
-errors or warnings are detected in the file. This option is only relevant if
-you are using the C-family semantic completion engine.
+errors or warnings are detected in the file. This option is only relevant for
+the C-family, C#, Java, JavaScript, and TypeScript languages.
+
+A special value of '0' means there is no limit.
 
 Default: '30'
 >