diff --git a/doc/TODO b/doc/TODO
index 202b78f0ed66e56ebf9a04793bd381b70d61f2e9..074b7007c99e8fbd21b70d740c9d6d0595fab66b 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 15:41:03 EDT 2005
+Last updated:		Fri Aug 26 16:38:55 EDT 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -80,6 +80,9 @@ Administration
 	o %Allow postgresql.conf file values to be changed via an SQL
 	  API, perhaps using SET GLOBAL
 	o Allow the server to be stopped/restarted via an SQL API
+	o Issue a warning if a change-on-restart-only postgresql.conf value
+	  is modified  and the server config files are reloaded
+	o Mark change-on-restart-only values in postgresql.conf
 
 
 * Tablespaces
@@ -203,6 +206,7 @@ Data Types
 	  If the TIMESTAMP value is stored with a time zone name, interval 
 	  computations should adjust based on the time zone rules.
 
+	o Fix SELECT '0.01 years'::interval, '0.01 months'::interval
 	o Add ISO INTERVAL handling
 		o Add support for day-time syntax, INTERVAL '1 2:03:04' DAY TO 
 		  SECOND
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index cb43147fb236229c59bc8242d98e825d0551b7fc..5e0dcb20ed5074928e5a60ae1a6cfb4deebd3de5 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 15:41:03 EDT 2005
+Last updated:           Fri Aug 26 16:38:55 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>.
@@ -76,6 +76,9 @@ first.
     </li><li>%Allow postgresql.conf file values to be changed via an SQL
           API, perhaps using SET GLOBAL
     </li><li>Allow the server to be stopped/restarted via an SQL API
+    </li><li>Issue a warning if a change-on-restart-only postgresql.conf value
+          is modified  and the server config files are reloaded
+    </li><li>Mark change-on-restart-only values in postgresql.conf
   </li></ul>
   </li><li>Tablespaces
   <ul>
@@ -187,6 +190,7 @@ first.
 <p>          If the TIMESTAMP value is stored with a time zone name, interval 
           computations should adjust based on the time zone rules.
 </p>
+    </li><li>Fix SELECT '0.01 years'::interval, '0.01 months'::interval
     </li><li>Add ISO INTERVAL handling
     <ul>
       <li>Add support for day-time syntax, INTERVAL '1 2:03:04' DAY TO