diff --git a/doc/TODO b/doc/TODO
index 8ea7baa0ba2cf06b04c1b3a45f865b1d79bae518..cf2c45a7c941dac3172b4f3c0f8f715b9a64557f 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:		Wed May 17 22:32:10 EDT 2006
+Last updated:		Mon May 22 16:39:01 EDT 2006
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -616,6 +616,14 @@ SQL Commands
 	  This is basically the same as SET search_path.
 
 
+* Referential Integrity
+
+	o Add MATCH PARTIAL referential integrity
+	o Change foreign key constraint for array -> element to mean element
+	  in array?
+	o Enforce referential integrity for system tables
+
+
 * Server-Side Languages
 
 	o Fix PL/pgSQL RENAME to work on variables other than OLD/NEW
@@ -771,18 +779,14 @@ Clients
 	  non-E strings are used
 
 
-Referential Integrity
-=====================
-
-* Add MATCH PARTIAL referential integrity
+Triggers
+========
 * Add deferred trigger queue file
 
   Right now all deferred trigger information is stored in backend
   memory.  This could exhaust memory for very large trigger queues.
   This item involves dumping large queues into files.
 
-* Change foreign key constraint for array -> element to mean element
-  in array?
 * Allow DEFERRABLE UNIQUE constraints?
 * Allow triggers to be disabled in only the current session.
 
@@ -798,7 +802,6 @@ Referential Integrity
 
 * Allow statement-level triggers to access modified rows
 * Support triggers on columns (Greg Sabino Mullane)
-* Enforce referential integrity for system tables
 * Allow AFTER triggers on system tables
 
   System tables are modified in many places in the backend without going
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index d79ec029e13af8631ae107df2688a3ff1e1abebf..5ccb9e3eade3e5656248d05fb1fb606445b84d39 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:           Wed May 17 22:32:10 EDT 2006
+Last updated:           Mon May 22 16:39:01 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>.
@@ -561,6 +561,13 @@ first.
 <p>          This is basically the same as SET search_path.
 </p>
   </li></ul>
+  </li><li>Referential Integrity
+  <ul>
+    <li>Add MATCH PARTIAL referential integrity
+    </li><li>Change foreign key constraint for array -&gt; element to mean element
+          in array?
+    </li><li>Enforce referential integrity for system tables
+  </li></ul>
   </li><li>Server-Side Languages
   <ul>
     <li>Fix PL/pgSQL RENAME to work on variables other than OLD/NEW
@@ -701,17 +708,13 @@ first.
           non-E strings are used
   </li></ul>
 </li></ul>
-<h1><a name="section_10">Referential Integrity</a></h1>
-
+<h1><a name="section_10">Triggers</a></h1>
 <ul>
-  <li>Add MATCH PARTIAL referential integrity
-  </li><li>Add deferred trigger queue file
+  <li>Add deferred trigger queue file
 <p>  Right now all deferred trigger information is stored in backend
   memory.  This could exhaust memory for very large trigger queues.
   This item involves dumping large queues into files.
 </p>
-  </li><li>Change foreign key constraint for array -&gt; element to mean element
-  in array?
   </li><li>Allow DEFERRABLE UNIQUE constraints?
   </li><li>Allow triggers to be disabled in only the current session.
 <p>  This is currently possible by starting a multi-statement transaction,
@@ -725,7 +728,6 @@ first.
 </p>
   </li><li>Allow statement-level triggers to access modified rows
   </li><li>Support triggers on columns (Greg Sabino Mullane)
-  </li><li>Enforce referential integrity for system tables
   </li><li>Allow AFTER triggers on system tables
 <p>  System tables are modified in many places in the backend without going
   through the executor and therefore not causing triggers to fire. To