Sync ERC 5.3 release.

[gnu-emacs] / doc / misc / ediff.texi

diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 6bb2605e0c6165d98e9fdf08aaefc1ec02bb7616..bc42df25b09b9bed670ac28836feb50aec1931cc 100644 (file)
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -7,7 +7,7 @@
 @comment Using ediff.info instead of ediff in setfilename breaks DOS.
 @comment @setfilename ediff
 @comment @setfilename ediff.info
-@setfilename ../info/ediff
+@setfilename ../../info/ediff
 
 @settitle Ediff User's Manual
 @synindex vr cp
@@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document