Add URLs for:

* Add REPLACE or UPSERT command that does UPDATE, or on failure, INSERT
  [merge]

diff --git a/doc/TODO b/doc/TODO
index 465106c81b73f59abef23f500a6783be57a81c35..f33d846a431861da73022f8bb8794c9a158fd62f 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:    Bruce Momjian ([email protected])
-Last updated:      Tue Feb 20 20:08:47 EST 2007
+Last updated:      Fri Mar  2 22:08:41 EST 2007
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -505,6 +505,9 @@ SQL Commands
   so duplicate checking can be easily performed.  It is possible to
   do it without a unique index if we require the user to LOCK the table
   before the MERGE.
+  http://archives.postgresql.org/pgsql-hackers/2005-11/msg00501.php
+  http://archives.postgresql.org/pgsql-hackers/2005-11/msg00536.php
+
 
 * Add NOVICE output level for helpful messages like automatic sequence/index
   creation

diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index e7b3f60651722bb23a4ba65d1cca6c482f4d9fba..6a7de9afd5739e86c6306691be3d1bf6ffb2dd3e 100644 (file)
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
 
 PostgreSQL TODO List
 Current maintainer:     Bruce Momjian ([email protected])
-Last updated:           Tue Feb 20 20:08:47 EST 2007
+Last updated:           Fri Mar  2 22:08:41 EST 2007
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -454,6 +454,8 @@ first.  There is also a developer's wiki at
   so duplicate checking can be easily performed.  It is possible to
   do it without a unique index if we require the user to LOCK the table
   before the MERGE.
+  http://archives.postgresql.org/pgsql-hackers/2005-11/msg00501.php
+  http://archives.postgresql.org/pgsql-hackers/2005-11/msg00536.php
 
   Add NOVICE output level for helpful messages like automatic sequence/index
   creation