* lisp/progmodes/grep.el (grep, rgrep): Doc fix.

Fixes: debbugs:11268

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16cf1e347a131bbf9ef3acbf13ed2e2fe343e6b2..7ef7628b6d6c4cfc3fa3bceb347b1961e8f2aa51 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-18  Chong Yidong  <cyd@gnu.org>
+
+       * progmodes/grep.el (grep, rgrep): Doc fix (Bug#11268).
+
 2012-04-18  Glenn Morris  <rgm@gnu.org>
 
        * net/network-stream.el (open-network-stream): Doc fix.

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 54d678323f60e5ca57ae44086c685ee2d73b352b..79c351003678ed1f7e26b32f1de8d97301ce87bf 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -728,9 +728,9 @@ This function is called from `compilation-filter-hook'."
 (defun grep (command-args)
   "Run grep, with user-specified args, and collect output in a buffer.
 While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
-or \\<grep-mode-map>\\[compile-goto-error] in the grep \
-output buffer, to go to the lines where grep
-found matches.
+or \\<grep-mode-map>\\[compile-goto-error] in the *grep* \
+buffer, to go to the lines where grep found
+matches.  To kill the grep job before it finishes, type \\[kill-compilation].
 
 For doing a recursive `grep', see the `rgrep' command.  For running
 `grep' in a specific directory, see `lgrep'.
@@ -957,10 +957,11 @@ With \\[universal-argument] prefix, you can edit the constructed shell command l
 before it is executed.
 With two \\[universal-argument] prefixes, directly edit and run `grep-find-command'.
 
-Collect output in a buffer.  While find runs asynchronously, you
-can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
+Collect output in a buffer.  While the recursive grep is running,
+you can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \
 in the grep output buffer,
-to go to the lines where grep found matches.
+to visit the lines where matches were found.  To kill the job
+before it finishes, type \\[kill-compilation].
 
 This command shares argument histories with \\[lgrep] and \\[grep-find].