merge trunk

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

diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index c0f18f6363aaac0d0331012d054010037b3b6d0f..3ee080f50e09a3a96f1a417d8f6280140b43716f 100644 (file)
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -20,10 +20,11 @@
 @c @footnotestyle separate
 @c @paragraphindent 2
 @c @@smallbook
+@documentencoding UTF-8
 @c %**end of header
 
 @copying
-Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2013
+Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2014
 Free Software Foundation, Inc.
 
 @c Since we are both GNU manuals, we do not need to ack each other here.
@@ -130,7 +131,7 @@ June 1985, Report No. UCB/CSD 85/251.
 
 @item
 For generating the lookahead sets, Wisent uses the well-known
-technique of F. DeRemer and A. Pennello described in:
+technique of F. DeRemer and T. Pennello described in:
 @quotation
 @cite{Efficient Computation of LALR(1) Look-Ahead Sets}@*
 October 1982, ACM TOPLAS Vol 4 No 4, 615--49,