diff --git a/doc/TODO b/doc/TODO
index 65834cda18fd4305d5c6e1d6905c0264a6280eb5..6e209c0ab71f68dc1df46f4aed6232cef896d643 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,7 +1,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Tue Aug 19 12:39:00 EDT 2008
+Last updated: Tue Aug 19 15:19:46 EDT 2008
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -848,7 +848,7 @@ SQL Commands
http://archives.postgresql.org/pgsql-hackers/2006-12/msg00782.php
- o -Allow an existing index to be marked as a table's primary key
+ o Allow an existing index to be marked as a table's primary key
http://archives.postgresql.org/pgsql-hackers/2008-04/msg00500.php
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index e02fd3c9329b70323491b9dc42d0b71dc57a4d60..bc9ea5e3bfee538a60f57f6106bf879a632c3a74 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
<head>
<title>PostgreSQL TODO List</title>
-<meta name="generator" content="HTML::TextToHTML v2.51"/>
+<meta name="generator" content="HTML::TextToHTML v2.25"/>
</head>
<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: Tue Aug 19 12:39:00 EDT 2008
+Last updated: Tue Aug 19 15:19:46 EDT 2008
</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>.
@@ -730,7 +730,7 @@ first. There is also a developer's wiki at<br/>
storage, and permanent id for every column?
<p> <a href="http://archives.postgresql.org/pgsql-hackers/2006-12/msg00782.php">http://archives.postgresql.org/pgsql-hackers/2006-12/msg00782.php</a>
</p>
- </li><li>-<em>Allow an existing index to be marked as a table's primary key</em>
+ </li><li>Allow an existing index to be marked as a table's primary key
<p> <a href="http://archives.postgresql.org/pgsql-hackers/2008-04/msg00500.php">http://archives.postgresql.org/pgsql-hackers/2008-04/msg00500.php</a>
</p>
</li></ul>
@@ -996,7 +996,7 @@ first. There is also a developer's wiki at<br/>
widths. Perhaps the word wrapping could use the same
algorithm documented in the W3C specification.
<a href="http://archives.postgresql.org/pgsql-hackers/2008-05/msg00404.php">http://archives.postgresql.org/pgsql-hackers/2008-05/msg00404.php</a>
- <a href="http://www.w3.org/TR/CSS21/tables.html#auto-table-layout">http://www.w3.org/TR/CSS21/tables.html#auto-table-layout</a>
+ <a href="http://www.w3.org/TR/CSS21/tables.html<strong>auto-table-layout">http://www.w3.org/TR/CSS21/tables.html</strong>auto-table-layout</a>
<li>Add "auto" expanded mode that outputs in expanded format if
"wrapped" mode can't wrap the output to the screen width
<p> <a href="http://archives.postgresql.org/pgsql-hackers/2008-05/msg00417.php">http://archives.postgresql.org/pgsql-hackers/2008-05/msg00417.php</a>
@@ -1102,8 +1102,8 @@ first. There is also a developer's wiki at<br/>
</p>
</li></ul>
</li></ul>
-<h1><a name="section_11">Triggers</a></h1>
-</p>
+</p><h1><a name="section_11">Triggers</a></h1>
+
<ul>
<li>Add deferred trigger queue file
<p> Right now all deferred trigger information is stored in backend
@@ -1326,7 +1326,7 @@ first. There is also a developer's wiki at<br/>
<a href="http://archives.postgresql.org/pgsql-patches/2008-01/msg00049.php">http://archives.postgresql.org/pgsql-patches/2008-01/msg00049.php</a>
</p>
</li><li>Consider automatic caching of statements at various levels:
- Parsed query tree, query execution plan, query results
+ parsed query tree, query execution plan, query results
<p> <a href="http://archives.postgresql.org/pgsql-hackers/2008-04/msg00823.php">http://archives.postgresql.org/pgsql-hackers/2008-04/msg00823.php</a>
</p>
</li><li>Consider increasing internal areas when shared buffers is increased
@@ -1842,7 +1842,7 @@ first. There is also a developer's wiki at<br/>
<p> <a href="http://archives.postgresql.org/pgsql-hackers/2008-01/msg00893.php">http://archives.postgresql.org/pgsql-hackers/2008-01/msg00893.php</a>
</p>
</li></ul>
-<h1><a name="section_25">Features We Do _Not_ Want</a></h1>
+<h1><a name="section_25">Features We Do <u>Not</u> Want</a></h1>
<ul>
<li>All backends running as threads in a single process (not wanted)