diff --git a/doc/TODO b/doc/TODO
index c95a1c46f8bf59ac1f97363b2740d895d354cd28..ee0ce7d9bd9176e9fabe226e205b7b0afdf02ec5 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:		Mon Oct 24 14:08:49 EDT 2005
+Last updated:		Tue Oct 25 14:50:55 EDT 2005
 
 The most recent version of this document can be viewed at
 http://www.postgresql.org/docs/faqs.TODO.html.
@@ -584,6 +584,11 @@ Clients
 	  It probably requires psql to output newlines in the proper
 	  column, which is already on the TODO list.
 
+	o Add auto-expanded mode so expanded output is used if the row
+	  length is wider than the screen width.  
+
+	  Consider using auto-expanded mode for backslash commands like \df+.
+
 
 * pg_dump
 
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 9ce08ef0045a1f23772e26a545786528eef5930f..e284f15ff28862c686bfea8b331afa2d62b38f54 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:           Mon Oct 24 14:08:49 EDT 2005
+Last updated:           Tue Oct 25 14:50: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>.
@@ -530,6 +530,10 @@ first.
     </li><li>Display IN, INOUT, and OUT parameters in \df+
 <p>          It probably requires psql to output newlines in the proper
           column, which is already on the TODO list.
+</p>
+    </li><li>Add auto-expanded mode so expanded output is used if the row
+          length is wider than the screen width.  
+<p>          Consider using auto-expanded mode for backslash commands like \df+.
 </p>
   </li></ul>
   </li><li>pg_dump