diff --git a/doc/TODO b/doc/TODO
index d8c0adf5b1574751092502e1c1e5e9806678377f..3e0531c1f63ff39881607dc585bba680f5df68fa 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 Sep 2 15:51:34 EDT 2005
+Last updated: Fri Sep 2 16:11:27 EDT 2005
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1023,6 +1023,8 @@ Source Code
* Fix sgmltools so PDFs can be generated with bookmarks
* %Clean up compiler warnings (especially with gcc version 4)
* Add function to return the thread safety status of libpq and ecpg
+* Use UTF8 encoding for NLS messages so all server encodings can
+ read them properly
* Win32
@@ -1037,12 +1039,6 @@ Source Code
o Re-enable timezone output on log_line_prefix '%t' when a
shorter timezone string is available
o Fix problem with shared memory on the Win32 Terminal Server
- o %Add support for Unicode
-
- To fix this, the data needs to be converted to/from UTF16/UTF8
- so the Win32 wcscoll() can be used, and perhaps other functions
- like towupper(). However, UTF8 already works with normal
- locales but provides no ordering or character set classes.
* Wire Protocol Changes
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 50d99eb575b43c034b73d14f65f9cdebe820951d..45ca3d2ba197d0cf3267ec28fdd1a854d887e678 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 Sep 2 15:51:34 EDT 2005
+Last updated: Fri Sep 2 16:11:27 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>.
@@ -925,6 +925,8 @@ first.
</li><li>Fix sgmltools so PDFs can be generated with bookmarks
</li><li>%Clean up compiler warnings (especially with gcc version 4)
</li><li>Add function to return the thread safety status of libpq and ecpg
+ </li><li>Use UTF8 encoding for NLS messages so all server encodings can
+ read them properly
</li><li>Win32
<ul>
<li>Remove configure.in check for link failure when cause is found
@@ -937,12 +939,6 @@ first.
</li><li>Re-enable timezone output on log_line_prefix '%t' when a
shorter timezone string is available
</li><li>Fix problem with shared memory on the Win32 Terminal Server
- </li><li>%Add support for Unicode
-<p> To fix this, the data needs to be converted to/from UTF16/UTF8
- so the Win32 wcscoll() can be used, and perhaps other functions
- like towupper(). However, UTF8 already works with normal
- locales but provides no ordering or character set classes.
-</p>
</li></ul>
</li><li>Wire Protocol Changes
<ul>