diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 550c664d58974f7c26570c98349dbba9233e93ee..3e687c835873ea63bfe78c140279eef637ecca54 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.52 2005/03/13 01:30:59 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.53 2005/03/13 02:02:44 momjian Exp $ -->
<chapter id="charset">
<title>Localization</>
@@ -316,24 +316,24 @@ initdb --locale=sv_SE
<tbody>
<row>
<entry><literal>BIG5</literal></entry>
- <entry>Chinese</entry>
+ <entry>Traditional Chinese</entry>
<entry>Aliases: WIN950, Windows950</entry>
</row>
<row>
<entry><literal>EUC_CN</literal></entry>
- <entry>Chinese <acronym>EUC</></entry>
+ <entry>Extended UNIX Code-CN (Chinese)</entry>
</row>
<row>
<entry><literal>EUC_JP</literal></entry>
- <entry>Japanese <acronym>EUC</></entry>
+ <entry>Extended UNIX Code-JP (Japanese)</></entry>
</row>
<row>
<entry><literal>EUC_KR</literal></entry>
- <entry>Korean <acronym>EUC</></entry>
+ <entry>Extended UNIX Code-KR (Korean)</entry>
</row>
<row>
<entry><literal>EUC_TW</literal></entry>
- <entry>Taiwan <acronym>EUC</acronym></entry>
+ <entry>Extended UNIX Code-TW (Taiwanese)</entry>
</row>
<row>
<entry><literal>GB18030</literal></entry>
@@ -341,7 +341,7 @@ initdb --locale=sv_SE
</row>
<row>
<entry><literal>GBK</literal></entry>
- <entry>Chinese <acronym>EUC</acronym></entry>
+ <entry>"Extended National Standard" (Chinese)</entry>
<entry>Aliases: WIN936, Windows936</entry>
</row>
<row>
@@ -425,7 +425,7 @@ initdb --locale=sv_SE
</row>
<row>
<entry><literal>SJIS</literal></entry>
- <entry>SJIS (Japanese)</entry>
+ <entry>Shift JIS (Japanese)</entry>
<entry>Aliases: Mskanji, ShiftJIS, WIN932, Windows932</entry>
</row>
<row>
@@ -589,8 +589,13 @@ $ <userinput>psql -l</userinput>
</thead>
<tbody>
<row>
- <entry><literal>SQL_ASCII</literal></entry>
- <entry><literal>SQL_ASCII</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>BIG5</literal></entry>
+ <entry><literal>BIG5</literal>, <literal>EUC_TW</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>EUC_CN</literal></entry>
+ <entry><literal>EUC_CN</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
@@ -600,13 +605,52 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
- <entry><literal>EUC_CN</literal></entry>
- <entry><literal>EUC_CN</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>EUC_KR</literal></entry>
+ <entry><literal>EUC_KR</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
- <entry><literal>EUC_KR</literal></entry>
- <entry><literal>EUC_KR</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>EUC_TW</literal></entry>
+ <entry><literal>EUC_TW</literal>, <literal>BIG5</literal>,
+ <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>GB18030</literal></entry>
+ <entry><literal>GB18030</literal>, <literal>UTF8</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>GBK</literal></entry>
+ <entry><literal>GBK</literal>, <literal>UTF8</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>ISO_8859_5</literal></entry>
+ <entry><literal>ISO_8859_5</literal>,
+ <literal>UTF8</literal>,
+ <literal>MULE_INTERNAL</literal>,
+ <literal>WIN1251</literal>,
+ <literal>WIN866</literal>,
+ <literal>KOI8</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>ISO_8859_6</literal></entry>
+ <entry><literal>ISO_8859_6</literal>,
+ <literal>UTF8</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>ISO_8859_7</literal></entry>
+ <entry><literal>ISO_8859_7</literal>,
+ <literal>UTF8</literal>
+ </entry>
+ </row>
+ <row>
+ <entry><literal>ISO_8859_8</literal></entry>
+ <entry><literal>ISO_8859_8</literal>,
+ <literal>UTF8</literal>
</entry>
</row>
<row>
@@ -615,8 +659,9 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
- <entry><literal>EUC_TW</literal></entry>
- <entry><literal>EUC_TW</literal>, <literal>BIG5</literal>,
+ <entry><literal>KOI8</literal></entry>
+ <entry><literal>ISO_8859_5</literal>, <literal>WIN1251</literal>,
+ <literal>WIN866</literal>, <literal>KOI8</literal>,
<literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
@@ -681,31 +726,27 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
- <entry><literal>ISO_8859_5</literal></entry>
- <entry><literal>ISO_8859_5</literal>,
- <literal>UTF8</literal>,
- <literal>MULE_INTERNAL</literal>,
- <literal>WIN1251</literal>,
- <literal>WIN866</literal>,
- <literal>KOI8</literal>
- </entry>
+ <entry><literal>MULE_INTERNAL</literal></entry>
+ <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>, <literal>EUC_KR</literal>, <literal>EUC_CN</literal>,
+ <literal>EUC_TW</literal>, <literal>BIG5</literal>, <literal>LATIN1</literal> to <literal>LATIN5</literal>,
+ <literal>WIN1251</literal>, <literal>WIN866</literal>,
+ <literal>WIN1250</literal>,
+ <literal>BIG5</literal>, <literal>ISO_8859_5</literal>, <literal>KOI8</literal></entry>
</row>
- <row>
- <entry><literal>ISO_8859_6</literal></entry>
- <entry><literal>ISO_8859_6</literal>,
- <literal>UTF8</literal>
+ <row>
+ <entry><literal>SJIS</literal></entry>
+ <entry><literal>SJIS</literal>, <literal>UTF8</literal>,
+ <literal>EUC_JP</literal>
</entry>
</row>
<row>
- <entry><literal>ISO_8859_7</literal></entry>
- <entry><literal>ISO_8859_7</literal>,
- <literal>UTF8</literal>
+ <entry><literal>SQL_ASCII</literal></entry>
+ <entry><literal>SQL_ASCII</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
- <entry><literal>ISO_8859_8</literal></entry>
- <entry><literal>ISO_8859_8</literal>,
- <literal>UTF8</literal>
+ <entry><literal>UHC</literal></entry>
+ <entry><literal>UHC</literal>, <literal>UTF8</literal>
</entry>
</row>
<row>
@@ -729,21 +770,6 @@ $ <userinput>psql -l</userinput>
<literal>WIN1250</literal>
</entry>
</row>
- <row>
- <entry><literal>MULE_INTERNAL</literal></entry>
- <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>, <literal>EUC_KR</literal>, <literal>EUC_CN</literal>,
- <literal>EUC_TW</literal>, <literal>BIG5</literal>, <literal>LATIN1</literal> to <literal>LATIN5</literal>,
- <literal>WIN1251</literal>, <literal>WIN866</literal>,
- <literal>WIN1250</literal>,
- <literal>BIG5</literal>, <literal>ISO_8859_5</literal>, <literal>KOI8</literal></entry>
- </row>
- <row>
- <entry><literal>KOI8</literal></entry>
- <entry><literal>ISO_8859_5</literal>, <literal>WIN1251</literal>,
- <literal>WIN866</literal>, <literal>KOI8</literal>,
- <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
- </entry>
- </row>
<row>
<entry><literal>WIN866</literal></entry>
<entry><literal>ISO_8859_5</literal>, <literal>WIN1251</literal>,