diff --git a/doc/TODO b/doc/TODO
index a20d627689b..eb9d0b36792 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
-Last updated: Thu Oct 27 10:15:56 EDT 2005
+Last updated: Tue Nov 15 18:08:23 EST 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -371,6 +371,10 @@ SQL Commands
* Add a GUC variable to warn about non-standard SQL usage in queries
* Add MERGE command that does UPDATE/DELETE, or on failure, INSERT (rules,
triggers?)
+
+ To implement this cleanly requires that the table have a unique index
+ so duplicate checking can be easily performed.
+
* Add NOVICE output level for helpful messages like automatic sequence/index
creation
* %Add COMMENT ON for all cluster global objects (roles, databases
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 597f31cb935..ccafeb52046 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
-Last updated: Thu Oct 27 10:15:56 EDT 2005
+Last updated: Tue Nov 15 18:08:23 EST 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -341,6 +341,9 @@ first.
Add a GUC variable to warn about non-standard SQL usage in queries
Add MERGE command that does UPDATE/DELETE, or on failure, INSERT (rules,
triggers?)
+ To implement this cleanly requires that the table have a unique index
+ so duplicate checking can be easily performed.
+
Add NOVICE output level for helpful messages like automatic sequence/index
creation
%Add COMMENT ON for all cluster global objects (roles, databases