diff --git a/doc/TODO b/doc/TODO
index 6fb373cb41b..e3c99a0c77d 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:		Sat Aug 20 21:04:41 EDT 2005
+Last updated:		Tue Aug 23 19:51:09 EDT 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -638,10 +638,13 @@ Referential Integrity
 * Change foreign key constraint for array -> element to mean element
   in array?
 * Allow DEFERRABLE UNIQUE constraints?
-* Allow triggers to be disabled [trigger]
+* -Allow triggers to be disabled [trigger]
+* Allow triggers to be disabled in only the current session.
 
-  Currently the only way to disable triggers is to modify the system
-  tables.
+  This is currently possible by starting a multi-statement transaction,
+  modifying the system tables, performing the desired SQL, restoring the
+  system tables, and committing the transaction.  ALTER TABLE ...
+  TRIGGER requires a table lock so it is not idea for this usage.
 
 * With disabled triggers, allow pg_dump to use ALTER TABLE ADD FOREIGN KEY
 
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index edd160c3f77..953e9df3356 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:           Sat Aug 20 21:04:41 EDT 2005
+Last updated:           Tue Aug 23 19:51:09 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>.
@@ -580,9 +580,12 @@ first.
   </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 [<a href="http://momjian.postgresql.org/cgi-bin/pgtodo?trigger">trigger</a>]
-<p>  Currently the only way to disable triggers is to modify the system
-  tables.
+  </li><li>-<em>Allow triggers to be disabled [<a href="http://momjian.postgresql.org/cgi-bin/pgtodo?trigger">trigger</a>]</em>
+  </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
+  system tables, and committing the transaction.  ALTER TABLE ...
+  TRIGGER requires a table lock so it is not idea for this usage.
 </p>
   </li><li>With disabled triggers, allow pg_dump to use ALTER TABLE ADD FOREIGN KEY
 <p>  If the dump is known to be valid, allow foreign keys to be added
