Make most emulation packages obsolete. [Backport]

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

diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index bb315fc41ef762b4a7ac8e598e6021324dd48bef..ea4bcc8f5b92d62ff3c744cc23d512ae97262fc0 100644 (file)
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -10,6 +10,7 @@
 @setfilename ../../info/ediff
 
 @settitle Ediff User's Manual
+@documentencoding UTF-8
 @synindex vr cp
 @synindex fn cp
 @synindex pg cp
@@ -25,13 +26,13 @@
 This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
-Copyright @copyright{} 1995--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1995--2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 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'',
+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''.