diff --git a/doc/TODO b/doc/TODO
index ffd01c8ebecd65521660c4f5e97e7cf4ab27da9f..8adb6716d7dc9228a7abbfbaee56d9cdd2fcb4b7 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: Tue Jun 7 10:12:04 EDT 2005
+Last updated: Wed Jun 8 23:00:21 EDT 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -473,15 +473,11 @@ Commands
o Disallow dropping of an inherited constraint
o Allow objects to be moved to different schemas
o Allow ALTER TABLESPACE to move to different directories
- o Allow databases and schemas to be moved to different tablespaces
-
- One complexity is whether moving a schema should move all existing
- schema objects or just define the location for future object creation.
-
+ o Allow databases to be moved to different tablespaces
o Allow moving system tables to other tablespaces, where possible
Currently non-global system tables must be in the default database
- schema. Global system tables can never be moved.
+ tablespace. Global system tables can never be moved.
o Prevent child tables from altering constraints like CHECK that were
inherited from the parent table
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 31fcfcbc3c2cf4b75f8ad4902169420bb86e4b66..3920887c12004d39ca8f89fb32effe18f9f2bab1 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: Tue Jun 7 10:12:04 EDT 2005
+Last updated: Wed Jun 8 23:00:21 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>.
@@ -436,13 +436,10 @@ first.
</li><li>Disallow dropping of an inherited constraint
</li><li>Allow objects to be moved to different schemas
</li><li>Allow ALTER TABLESPACE to move to different directories
- </li><li>Allow databases and schemas to be moved to different tablespaces
-<p> One complexity is whether moving a schema should move all existing
- schema objects or just define the location for future object creation.
-</p>
+ </li><li>Allow databases to be moved to different tablespaces
</li><li>Allow moving system tables to other tablespaces, where possible
<p> Currently non-global system tables must be in the default database
- schema. Global system tables can never be moved.
+ tablespace. Global system tables can never be moved.
</p>
</li><li>Prevent child tables from altering constraints like CHECK that were
inherited from the parent table