diff --git a/doc/TODO b/doc/TODO
index 57233b1a29a064b3886eed4360b8613df88dc619..0f5dfda214c941076961dadcfd0acef3243cb513 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Fri Sep 29 22:59:01 EDT 2006
+Last updated: Fri Sep 29 23:55:30 EDT 2006
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -63,7 +63,12 @@ Administration
partition selection.
* Allow auto-selection of partitioned tables for min/max() operations
+* Allow more complex user/database default GUC settings
+ Currently, ALTER USER and ALTER DATABASE support per-user and
+ per-database defaults. Consider adding per-user-and-database
+ defaults so things like search_path can be defaulted for a
+ specific user connecting to a specific database.
* Improve replication solutions
@@ -793,6 +798,7 @@ Clients
Triggers
========
+
* Add deferred trigger queue file
Right now all deferred trigger information is stored in backend
@@ -872,6 +878,7 @@ Exotic Features
http://archives.postgresql.org/pgsql-hackers/2004-04/msg00818.php
+
Indexes
=======
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index abe86f570697b2b34d2f8585de79524c6c9228ff..f75d1a43e8c635e80bd412dda86095483c5a2201 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 Sep 29 22:59:01 EDT 2006
+Last updated: Fri Sep 29 23:55:30 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>.
@@ -63,6 +63,12 @@ first.
partition selection.
</p>
</li><li>Allow auto-selection of partitioned tables for min/max() operations
+ </li><li>Allow more complex user/database default GUC settings
+<p> Currently, ALTER USER and ALTER DATABASE support per-user and
+ per-database defaults. Consider adding per-user-and-database
+ defaults so things like search_path can be defaulted for a
+ specific user connecting to a specific database.
+</p>
</li><li>Improve replication solutions
<ul>
<li>Load balancing
@@ -718,6 +724,7 @@ first.
</li></ul>
</li></ul>
<h1><a name="section_10">Triggers</a></h1>
+
<ul>
<li>Add deferred trigger queue file
<p> Right now all deferred trigger information is stored in backend