summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-19 11:40:59 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-19 11:40:59 -0800
commit67ab0163d67fbfeb41c37c8a259f27eeef965520 (patch)
tree0baa678a486744cc30719841ab745fe690f5bc9d /doc/emacs
parentd6e96966e86d8eadec446788d19144bd69b1e798 (diff)
parent27ac6e7908c1d7b503ac5dca42a34ab9068d0864 (diff)
downloademacs-67ab0163d67fbfeb41c37c8a259f27eeef965520.tar.gz
Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca
Diffstat (limited to 'doc/emacs')
-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 ec57887a154..f113a7987c1 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-14 Jan Djärv <jan.h.d@swipnet.se>
* xresources.texi (X Resources): Remove *faceName and replace it with
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 914c9984c14..2f274d7a324 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -23,7 +23,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