diff --git a/doc/TODO b/doc/TODO
index 7443007ce4..2afd206387 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Fri Dec 15 08:28:38 EST 2006
+Last updated: Fri Dec 15 10:40:41 EST 2006
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1400,6 +1400,14 @@ Features We Do _Not_ Want
optional and continue to use bison.
http://archives.postgresql.org/pgsql-sql/2006-08/msg00164.php
+* Embedded server (not wanted)
+
+ While PostgreSQL clients runs fine limited-resource environments, the
+ server requires multiple processes and a stable pool of resources to
+ run reliabily and efficiently. Stripping down the PostgreSQL server
+ to run in the same process address space as the client application
+ would add too much complexity and failure cases.
+
---------------------------------------------------------------------------
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 1daa8a94d8..d9d7cdff0a 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Fri Dec 15 08:28:38 EST 2006
+Last updated: Fri Dec 15 10:40:41 EST 2006
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1262,6 +1262,13 @@ first.
Because we support postfix operators, it isn't possible to make AS
optional and continue to use bison.
http://archives.postgresql.org/pgsql-sql/2006-08/msg00164.php
+
+ Embedded server (not wanted)
+ While PostgreSQL clients runs fine limited-resource environments, the
+ server requires multiple processes and a stable pool of resources to
+ run reliabily and efficiently. Stripping down the PostgreSQL server
+ to run in the same process address space as the client application
+ would add too much complexity and failure cases.