Mention Dired VC diff and log in manual.

* dired.texi (Misc Dired Features): Mention VC diff and log.
* maintaining.texi (Old Revisions, VC Change Log):
Mention that diff and log work in Dired buffers.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d156d35faa249cae1da3ec0dd74541e3f148eb3e..a27d5bac6e7d4130b621deb6c2bcd23022aac525 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-15  Glenn Morris  <rgm@gnu.org>
 
+       * dired.texi (Misc Dired Features): Mention VC diff and log.
+       * maintaining.texi (Old Revisions, VC Change Log):
+       Mention that diff and log work in Dired buffers.
+
        * help.texi (Help Summary): Mention M-x info-finder.
 
        * ack.texi (Acknowledgments): Add mpc.el

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index f1a8b0aa9c161ba8a2f472d94a1239d7bfff4d5a..f6a4572f8dd3bc4b2d273f8dcec38dba088b1786 100644 (file)
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1,6 +1,7 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Dired, Calendar/Diary, Rmail, Top
 @chapter Dired, the Directory Editor
@@ -1339,6 +1340,11 @@ names into arguments for other Emacs commands.  It also displays what
 it added to the kill ring, so you can use it to display the list of
 currently marked files in the echo area.
 
+@cindex Dired and version control
+  If the directory you are visiting is under version control
+(@pxref{Version Control}), then the normal VC diff and log commands
+will operate on the selected files.
+
 @findex dired-compare-directories
   The command @kbd{M-x dired-compare-directories} is used to compare
 the current Dired buffer with another directory.  It marks all the files

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 8cc5b97d9195ec6ec4eb4528be9e67d362f7c3a7..f8e918ad8e3ceee248b0e77c3c5cd60c15bc8291 100644 (file)
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -653,7 +653,8 @@ its own (@code{vc-revision-other-window}).
 @item C-x v =
 Compare the files in the current fileset with the working revision(s)
 you started from (@code{vc-diff}).  With a prefix argument, prompt for
-two revisions of the current fileset and compare them.
+two revisions of the current fileset and compare them.  You can call
+this command from a Dired buffer (@pxref{Dired}).
 
 @item C-x v D
 Compare the entire tree corresponding to the current fileset with the
@@ -895,6 +896,7 @@ i.e. the ones you enter via the @samp{*VC-Log*} buffer.  @xref{Log
 Buffer}.)  Point is centered at the revision of the file currently
 being visited.  With a prefix argument, the command prompts for the
 revision to center on, and the maximum number of revisions to display.
+You can call this command from a Dired buffer (@pxref{Dired}).
 
 @findex vc-print-root-log
   Type @kbd{C-x v L} (@code{vc-print-root-log}) to display a

diff --git a/etc/NEWS b/etc/NEWS
index 1c168090d6f42cace7fb964dafa31e48f516fac6..c3dd62c0944fd7348fea4f791e2ed8a2e67a2322 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -333,7 +333,7 @@ instead of redisplaying the full log.  The RCS, CVS and SCCS VC
 backends do not support this.
 ---
 *** When a file is not found, VC will not try to check it out of RCS anymore.
-
++++
 *** Diff and log operations can be used from Dired buffers.
 
 *** vc-git changes