(dired-buffers, dired-subdir-alist): Add defvars.

[gnu-emacs] / man / ediff.texi

diff --git a/man/ediff.texi b/man/ediff.texi
index 318ac9e5c3f5bac5dac1541608ccd263a654e4d8..1991aa642d36871d1f15946ff69f9f51f5aec0ae 100644 (file)
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -25,8 +25,8 @@
 This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
-Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -155,6 +155,12 @@ Compare, Merge, and Apply Patch.
 @findex ediff
 Compare two files.
 
+@item ediff-backup
+@findex ediff-backup
+Compare a file with its backup. If there are several numerical backups, use
+the latest. If the file is itself a backup, then compare it with its
+original.
+
 @item ediff-buffers
 @findex ediff-buffers
 Compare two buffers.
@@ -2260,7 +2266,7 @@ version control, Ediff first tries to check the file out.
 
 @item ediff-make-buffers-readonly-at-startup nil
 @vindex ediff-make-buffers-readonly-at-startup
-If t, all variant buffers are made read-only at Ediff startup.
+If @code{t}, all variant buffers are made read-only at Ediff startup.
 
 @item ediff-keep-variants
 @vindex @code{ediff-keep-variants}