; Documentation updates

2 files changed, 9 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index a018bc39563..34151d8caad 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -506,6 +506,11 @@ Control whether Flymake starts checking the buffer on save.
 This enables more efficient backends.  See the docstring of
 'flymake-diagnostic-functions' or the Flymake manual for details.
 
+** Ruby
+
+*** The Rubocop Flymake diagnostic function will only run Lint cops if
+it can't find the config file.
+
 ** Package
 
 *** New function 'package-get-version' lets packages query their own version.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 2a50374765c..351dac2f852 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2301,7 +2301,10 @@ It will be properly highlighted even when the call omits parens.")
 
 (defcustom ruby-flymake-use-rubocop-if-available t
   "Non-nil to use the RuboCop Flymake backend.
-Only takes effect if RuboCop is installed."
+Only takes effect if RuboCop is installed.
+
+If there is no Rubocop config file, Rubocop will be passed a flag
+'--lint' to only show syntax errors and important problems."
   :version "26.1"
   :type 'boolean
   :safe 'booleanp)