Relicense all texi files under FDL 1.3 or later.

[bpt/emacs.git] / doc / misc / ediff.texi

diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index bc42df2..1988344 100644 (file)
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -30,21 +30,15 @@ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
+under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual'', and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
-
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-this GNU Manual, like GNU software.  Copies published by the Free
-Software Foundation raise funds for GNU development.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
@@ -56,9 +50,9 @@ license to the document, as described in section 6 of the license.
 @titlepage
 @title Ediff User's Manual
 @sp 4
-@subtitle Ediff version 2.81.1
+@subtitle Ediff version 2.81.2
 @sp 1
-@subtitle April 2007
+@subtitle November 2008
 @sp 5
 @author Michael Kifer
 @page
@@ -1158,7 +1152,7 @@ packages also use this method).
 Regular files are treated by the @code{patch} utility in the usual manner,
 i.e., the original is renamed into @file{source-name.orig} and the result
 of the patch is placed into the file source-name (@file{_orig} is used
-on systems like VMS, DOS, etc.)
+on systems like DOS, etc.)
 
 @node Customization, Credits, Remote and Compressed Files, Top
 @chapter Customization
@@ -2507,6 +2501,7 @@ Andy Scott (ascott@@pcocd2.intel.com),
 Axel Seibert (axel@@tumbolia.ppp.informatik.uni-muenchen.de),
 Vin Shelton (acs@@xemacs.org),
 Scott O. Sherman (Scott.Sherman@@mci.com),
+Nikolaj Schumacher (n_schumacher@@web.de),
 Richard Stallman (rms@@gnu.org),
 Richard Stanton (stanton@@haas.berkeley.edu),
 Sam Steingold (sds@@goems.com),