Update TODO list.

diff --git a/doc/TODO b/doc/TODO
index daf753b0dc59e06ccb0c81ab3477f165cadecda9..6e3efe93154b1c1c664f8950f94fad170ff51058 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,6 +1,10 @@
 TODO list for PostgreSQL
 ========================
-Last updated:      Tue Feb 13 11:11:24 EST 2001
+<<<<<<< TODO
+Last updated:      Tue Feb 13 15:53:36 EST 2001
+=======
+Last updated:      Tue Feb 13 15:53:36 EST 2001
+>>>>>>> 1.378
 
 Current maintainer:    Bruce Momjian ([email protected])
 
@@ -90,7 +94,7 @@ TYPES
 * -Add STDDEV/VARIANCE() function for standard deviation computation/variance
 * -Allow compression of large fields or a compressed field type
 * -Large objects
-   o -Fix large object mapping scheme, own typeid or reltype (Peter)
+   o -Fix large object mapping scheme, own typeid or reltype (Peter E)
    o -Not to stuff everything as files in a single directory, hash dirs
    o -Allow large object vacuuming
    o -Tables that start with xinv confused to be large objects
@@ -331,7 +335,7 @@ SOURCE CODE
 * Remove unused pg_variable, pg_inheritproc, pg_ipl tables
 * Experiment with multi-threaded backend [thread]
 * Fix problems with libpq non-blocking/async code [async]
-* Merge global and template BKI files (Peter)
+* Merge global and template BKI files (Peter E)
 * Fix username/password length limits in all areas
 * Remove compile-time upper limit on number of backends (MAXBACKENDS) (Tom)
 * Make sure all block numbers are unsigned to increase maximum table size
@@ -355,7 +359,7 @@ Developers who have claimed items are:
    * Massimo is Massimo Dal Zotto 
    * Michael is Michael Meskes 
    * Oleg is Oleg Bartunov 
-   * Peter is Peter T Mount 
+   * Peter M is Peter T Mount 
    * Peter E is Peter Eisentraut
    * Philip is Philip Warner 
    * Ross is Ross J. Reedstrom