merge emacs-23

51a12115 · Kenichi Handa · 16bc9688 · 8c62c205 · 51a12115 · 51a12115
Commit 51a12115 authored Feb 19, 2011 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

doc/emacs/ChangeLog doc/emacs/ChangeLog +4 -0

doc/emacs/dired.texi doc/emacs/dired.texi +1 -1

No files found.
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
+2011-02-19  Glenn Morris  <rgm@gnu.org>
+
+	* dired.texi (Dired): Dired-X version number was dropped.
+
 2011-02-05  Chong Yidong  <cyd@stupidchicken.com>

 	* rmail.texi (Rmail Display): Document Rmail MIME support more

--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -24,7 +24,7 @@ files.  You first mark certain files in order to operate on all of
 them with one command.

  The Dired-X package provides various extra features for Dired mode.
-@xref{Top, Dired-X,,dired-x, Dired Extra Version 2 User's Manual}.
+@xref{Top, Dired-X,,dired-x, Dired Extra User's Manual}.

  You can also view a list of files in a directory with @kbd{C-x C-d}
 (@code{list-directory}).  Unlike Dired, this command does not allow