diff --git a/doc/TODO b/doc/TODO
index e60941194c60fa193bd80555a81f477a758cd5fb..202b78f0ed66e56ebf9a04793bd381b70d61f2e9 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:32:39 EDT 2005
+Last updated: Fri Aug 26 15:41:03 EDT 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -539,6 +539,16 @@ Clients
o Consistently display privilege information for all objects in psql
o Improve psql's handling of multi-line queries
+ Currently, while \e saves a single query as one entry, interactive
+ queries are saved one line at a time. Ideally all queries
+ whould be saved like \e does.
+
+ o Allow multi-line column values to align in the proper columns
+
+ If the second output column value is 'a\nb', the 'b' should appear
+ in the second display column, rather than the first column as it
+ does now.
+
* pg_dump
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 4a3a825286b225d9f5cd80e2130994c8c0b86fbc..cb43147fb236229c59bc8242d98e825d0551b7fc 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:32:39 EDT 2005
+Last updated: Fri Aug 26 15:41:03 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>.
@@ -488,6 +488,15 @@ first.
than toggle
</li><li>Consistently display privilege information for all objects in psql
</li><li>Improve psql's handling of multi-line queries
+<p> Currently, while \e saves a single query as one entry, interactive
+ queries are saved one line at a time. Ideally all queries
+ whould be saved like \e does.
+</p>
+ </li><li>Allow multi-line column values to align in the proper columns
+<p> If the second output column value is 'a\nb', the 'b' should appear
+ in the second display column, rather than the first column as it
+ does now.
+</p>
</li></ul>
</li><li>pg_dump
<ul>