diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 47a4c8da522..5ab3c1ab5b8 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-16  Juri Linkov  <juri@jurta.org>
+
+	* search.texi (Query Replace): Document multi-buffer replacement
+	keys.  (Bug#12655)
+
+	* maintaining.texi (Tags Search): Change link "Replace" to
+	"Query Replace".
+
 2012-10-13  Chong Yidong  <cyd@gnu.org>
 
 	* files.texi (File Conveniences): ImageMagick enabled by default.
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index d21e3af83dd..67214bde22c 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2221,7 +2221,7 @@ the current buffer, followed by the remaining files of the tags table.
 reads a regexp to search for and a string to replace with, just like
 ordinary @kbd{M-x query-replace-regexp}.  It searches much like @kbd{M-x
 tags-search}, but repeatedly, processing matches according to your
-input.  @xref{Replace}, for more information on query replace.
+input.  @xref{Query Replace}, for more information on query replace.
 
 @vindex tags-case-fold-search
 @cindex case-sensitivity and tags search
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index 21db02c8ab8..7e46e416219 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1239,6 +1239,19 @@ occurrences.
 @item !
 to replace all remaining occurrences without asking again.
 
+@item Y @r{(Upper-case)}
+to replace all remaining occurrences in all remaining buffers in
+multi-buffer replacements (like the Dired `Q' command which performs
+query replace on selected files).  It answers this question and all
+subsequent questions in the series with "yes", without further
+user interaction.
+
+@item N @r{(Upper-case)}
+to skip to the next buffer in multi-buffer replacements without
+replacing remaining occurrences in the current buffer.  It answers
+this question "no", gives up on the questions for the current buffer,
+and continues to the next buffer in the sequence.
+
 @item ^
 to go back to the position of the previous occurrence (or what used to
 be an occurrence), in case you changed it by mistake or want to
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96f859ec603..437f8d57c9a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-16  Juri Linkov  <juri@jurta.org>
+
+	* replace.el (query-replace-help): Mention multi-buffer replacement
+	keys in the Help message.  (Bug#12655)
+
 2012-10-15  Chong Yidong  <cyd@gnu.org>
 
 	* emacs-lisp/byte-run.el (defsubst): Doc fix.
diff --git a/lisp/replace.el b/lisp/replace.el
index e714015fccf..4013e4e5df5 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1603,9 +1603,13 @@ Comma to replace but not move point immediately,
 C-r to enter recursive edit (\\[exit-recursive-edit] to get out again),
 C-w to delete match and recursive edit,
 C-l to clear the screen, redisplay, and offer same replacement again,
-! to replace all remaining matches with no more questions,
+! to replace all remaining matches in this buffer with no more questions,
 ^ to move point back to previous match,
-E to edit the replacement string"
+E to edit the replacement string.
+In multi-buffer replacements type `Y' to replace all remaining
+matches in all remaining buffers with no more questions,
+`N' to skip to the next buffer without replacing remaining matches
+in the current buffer."
   "Help message while in `query-replace'.")
 
 (defvar query-replace-map