--- a/doc/interpreter/preface.txi	Tue Dec 28 03:36:14 2004 +0000
+++ b/doc/interpreter/preface.txi	Wed Jan 12 01:33:28 2005 +0000
@@ -66,16 +66,21 @@
 
 @itemize @bullet
 @item
+Andy Adler @email{adler@@site.uottawa.ca} wrote the initial implementation of
+the sparse matrix data type.
+
+@item
 Thomas Baier @email{baier@@ci.tuwien.ac.at} wrote the original versions
 of @code{popen}, @code{pclose}, @code{execute}, @code{sync_system}, and
 @code{async_system}.
 
 @item
-David Bateman @email{dbateman@@free.fr} improved the sort and min/max
-functions, made many functions N-d aware, converted several built-in
-functions to use Lapack instead of Linpack, split the functionality of
-@file{load-save.cc} out into the @code{octave_value} classes, and has
-contributed in many other ways.
+David Bateman @email{dbateman@@free.fr} improved the @code{sort} and
+@code{min}/@code{max} functions, made many functions N-d aware,
+converted several built-in functions to use Lapack instead of Linpack,
+split the functionality of @file{load-save.cc} out into the
+@code{octave_value} classes, provided much of the code for the sparse
+matrix data type, and has contributed in many other ways.
 
 @item
 Karl Berry @email{karl@@cs.umb.edu} wrote the @code{kpathsea} library
@@ -124,6 +129,11 @@
 new ideas for improving Octave.
 
 @item
+Teemu Ikonen @email{tpikonen@@pcu.helsinki.fi} contributed changes to
+separate the @code{gnuplot} command parser from the main Octave language
+parser.
+
+@item
 Cai Jianming @email{caijianming@@yahoo.co.uk} contributed the inital
 cell array implementation.
 

--- a/src/ChangeLog	Tue Dec 28 03:36:14 2004 +0000
+++ b/src/ChangeLog	Wed Jan 12 01:33:28 2005 +0000
@@ -1,3 +1,13 @@
+2005-01-11  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/gplot.l (UNOP): Avoid trailing comment.
+
+2005-01-10  John W. Eaton  <jwe@octave.org>
+
+	* ls-oct-ascii.cc (extract_keyword (std::istream&, const
+	string_vector&, std::string&, int&, const bool)):
+	Remove duplicate definition.
+
 2004-12-27  Martin Dalecki  <martin@dalecki.de>
 
 	* Cell.cc, c-file-ptr-stream.cc, comment-list.cc, oct-map.cc,

--- a/src/DLD-FUNCTIONS/gplot.l	Tue Dec 28 03:36:14 2004 +0000
+++ b/src/DLD-FUNCTIONS/gplot.l	Wed Jan 12 01:33:28 2005 +0000
@@ -108,7 +108,8 @@
 NOT	((\~)|(\!))
 /* NOT is not strictly a binary operator, but is close enough for us. */
 BINOP   (({NOT})|(\.?([\*/\\^+-]|\*\*)=?)|([<=~!>&|]=)|([=&|<>]{1,2})|(<<=)|(>>=)|(\.))
-UNOP    ((\+\+)|(\-\-)|(\.'))   /* ' */
+/* single quote (') transpose operator is handled separately. */
+UNOP    ((\+\+)|(\-\-)|(\.'))
 
 %%