*** empty log message ***

3 files changed, 59 insertions, 3 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 983dd5287e3..8fad296c2ba 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1372,9 +1372,10 @@ the next/previous matching line found by M-x occur.
 +++
 *** The new command `multi-occur' is just like `occur', except it can
 search multiple buffers.  There is also a new command
-`multi-occur-by-filename-regexp' which allows you to specify the
-buffers to search by their filename.  Internally, Occur mode has been
-rewritten, and now uses font-lock, among other changes.
+`multi-occur-in-matching-buffers' which allows you to specify the
+buffers to search by their filenames or buffer names.  Internally,
+Occur mode has been rewritten, and now uses font-lock, among other
+changes.
 
 ** Grep changes:
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5206ad873ab..f02daadfa4a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-31  Richard M. Stallman  <rms@gnu.org>
+
+        * replace.el (multi-occur): Doc fix.
+        (multi-occur-in-matching-buffers): Renamed from
+        multi-occur-by-filename-regexp.  Prefix arg says match
+        buffer names instead of file names.
+
 2006-01-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * bs.el: Allow non-default values of `bs-header-lines-length'.
diff --git a/man/ChangeLog b/man/ChangeLog
index 7e611e171d8..8fc41f40f11 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,51 @@
+2006-01-31  Richard M. Stallman  <rms@gnu.org>
+
+        * display.texi (Scrolling, Horizontal Scrolling, Follow Mode):
+        Nodes moved to top.
+
+        * display.texi: Minor clarifications.
+        (Display): Rearrange menu.
+        (Standard Faces): Mention query-replace face.
+        (Faces): Simplify.
+        (Font Lock): Simplify face customization info.
+        (Highlight Changes): Node merged into Highlight Interactively.
+        (Highlight Interactively): Much rewriting and cleanup.
+        (Optional Mode Line): Narrowed line number not good for goto-line.
+        Simplify face customization advice.
+        (Text Display): Mention use of escape-glyph face.
+        Move ctl-arrow and tab-width here.
+        (Display Custom): Move no-redraw-on-reenter to end of node.
+
+        * search.texi: Minor clarifications.
+        (Isearch Scroll): Simplify.
+        (Other Repeating Search): Document multi-occur-in-matching-buffers.
+
+        * regs.texi (Registers): Mention bookmarks here.
+
+        * mark.texi: Minor clarifications.
+        (Selective Undo): Node deleted.
+
+        * m-x.texi: Minor clarifications
+
+        * killing.texi: Minor clarifications.
+        Refer to "graphical" terminals, rather than window systems.
+
+        * help.texi: Clarifications.
+        (Help): Don't describe C-h F and C-h K here.
+        (Key Help): Describe C-h K here.
+        (Name Help): Mention Emacs Lisp Intro.
+        Describe C-h F here.
+        (Misc Help): Mention C-h F and C-h K only briefly.
+
+        * fixit.texi (Undo): New node, mostly copied from basic.texi.
+        Selective undo text merged in.
+        (Spelling): Mention Aspell along with Ispell.
+
+        * emacs.texi (Top): Update subnode menus.
+
+        * basic.texi (Basic Undo): Renamed from Undo.  Most of text
+        moved to new Undo node.
+
 2006-01-30  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (clean): Add newsticker, sieve, pgg, erc and