summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2011-02-19 19:46:49 +0900
committerKenichi Handa <handa@m17n.org>2011-02-19 19:46:49 +0900
commit51a12115438e8efb629fcc3f5abde282aa650572 (patch)
tree38d34a979b76d676db45971fba51d7165cd08b60
parent16bc9688d8ab5e237b2151bc9d16d0ad7f577519 (diff)
parent8c62c205ff72c7d964ff574dc6f84f1b825ed263 (diff)
downloademacs-51a12115438e8efb629fcc3f5abde282aa650572.tar.gz
merge emacs-23
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/dired.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b89f9226c3b..9f45fa31cc2 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+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
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 3d33006dcac..0b3cd7aac0e 100644
--- 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