diff --git a/doc/TODO b/doc/TODO
index 992545485e3b301eb9b07e1eb17ab8f3d1ac9fcd..5f8cd01b1c0c1108e5f4c4487822dd19f2b375a7 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:		Fri Aug 26 14:59:39 EDT 2005
+Last updated:		Fri Aug 26 15:10:29 EDT 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -686,7 +686,8 @@ Indexes
 * Add fillfactor to control reserved free space during index creation
 * Allow the creation of indexes with mixed ascending/descending specifiers
 * Allow constraint_exclusion to work for UNIONs like it does for
-  inheritance, and allow it to work for UPDATE and DELETE queries
+  inheritance, allow it to work for UPDATE and DELETE queries, and allow
+  it to be used for all queries with little performance impact
 
 
 * GIST
@@ -913,10 +914,6 @@ Optimizer / Executor
 
 * Log queries where the optimizer row estimates were dramatically
   different from the number of rows actually found?
-* Allow constraint_elimination to be automatically performed
-
-  This requires additional code to reduce the performance loss caused by
-  constraint elimination.
 
 
 Miscellaneous Performance
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index f96793750162c05a93df1842cd38a095bb99b09c..4b84782b7378ac06b05509c2a3e4f042488bc759 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:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</a>)<br/>
-Last updated:           Fri Aug 26 14:59:39 EDT 2005
+Last updated:           Fri Aug 26 15:10:29 EDT 2005
 </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>.
@@ -622,7 +622,8 @@ first.
   </li><li>Add fillfactor to control reserved free space during index creation
   </li><li>Allow the creation of indexes with mixed ascending/descending specifiers
   </li><li>Allow constraint_exclusion to work for UNIONs like it does for
-  inheritance, and allow it to work for UPDATE and DELETE queries
+  inheritance, allow it to work for UPDATE and DELETE queries, and allow
+  it to be used for all queries with little performance impact
   </li><li>GIST
   <ul>
     <li>Add more GIST index support for geometric data types
@@ -822,10 +823,6 @@ first.
 </p>
   </li><li>Log queries where the optimizer row estimates were dramatically
   different from the number of rows actually found?
-  </li><li>Allow constraint_elimination to be automatically performed
-<p>  This requires additional code to reduce the performance loss caused by
-  constraint elimination.
-</p>
 </li></ul>
 <h1><a name="section_21">Miscellaneous Performance</a></h1>