diff --git a/doc/TODO b/doc/TODO
index 2fc6ed38850402ac69efb19864cba076a662c71e..a9b86c0b4f2ed2df56742d28c18a4ae83cc1d1cb 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
 PostgreSQL TODO List
 ====================
 Current maintainer:	Bruce Momjian (bruce@momjian.us)
-Last updated:		Fri Aug 25 19:43:59 EDT 2006
+Last updated:		Mon Aug 28 19:20:20 EDT 2006
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -873,7 +873,13 @@ Triggers
   memory.  This could exhaust memory for very large trigger queues.
   This item involves dumping large queues into files.
 
-* Allow DEFERRABLE UNIQUE constraints?
+* Allow DEFERRABLE and end-of-statement UNIQUE constraints?
+
+  This would allow UPDATE tab SET col = col + 1 to work if col has
+  a unique index.  Currently, uniqueness checks are done while the
+  command is being executed, rather than at the end of the statement
+  or transaction.
+
 * Allow triggers to be disabled in only the current session.
 
   This is currently possible by starting a multi-statement transaction,
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 826fc056ada008d9a69526f9c6c3d5e2fcaf00ab..eee26db97b6a35b72361793b0f0f9798c073739b 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
 <body bgcolor="#FFFFFF" text="#000000" link="#FF0000" vlink="#A00000" alink="#0000FF">
 <h1><a name="section_1">PostgreSQL TODO List</a></h1>
 <p>Current maintainer:     Bruce Momjian (<a href="mailto:bruce@momjian.us">bruce@momjian.us</a>)<br/>
-Last updated:           Fri Aug 25 19:43:59 EDT 2006
+Last updated:           Mon Aug 28 19:20:20 EDT 2006
 </p>
 <p>The most recent version of this document can be viewed at<br/>
 <a href="http://www.postgresql.org/docs/faqs.TODO.html">http://www.postgresql.org/docs/faqs.TODO.html</a>.
@@ -794,7 +794,12 @@ first.
   memory.  This could exhaust memory for very large trigger queues.
   This item involves dumping large queues into files.
 </p>
-  </li><li>Allow DEFERRABLE UNIQUE constraints?
+  </li><li>Allow DEFERRABLE and end-of-statement UNIQUE constraints?
+<p>  This would allow UPDATE tab SET col = col + 1 to work if col has
+  a unique index.  Currently, uniqueness checks are done while the
+  command is being executed, rather than at the end of the statement
+  or transaction.
+</p>
   </li><li>Allow triggers to be disabled in only the current session.
 <p>  This is currently possible by starting a multi-statement transaction,
   modifying the system tables, performing the desired SQL, restoring the