diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 34806dd542f82e4508adf8778e79b09d183da1e0..f64c5f5298e6adfd05188fb14471fa12ad4e337d 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.50 2005/03/12 06:28:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.51 2005/03/13 01:26:30 momjian Exp $ -->
<chapter id="charset">
<title>Localization</>
@@ -318,6 +318,11 @@ initdb --locale=sv_SE
<entry><literal>SQL_ASCII</literal></entry>
<entry><acronym>ASCII</acronym></entry>
</row>
+ <row>
+ <entry><literal>BIG5</literal></entry>
+ <entry>Chinese</entry>
+ <entry>Aliases: WIN950, Windows950</entry>
+ </row>
<row>
<entry><literal>EUC_JP</literal></entry>
<entry>Japanese <acronym>EUC</></entry>
@@ -338,9 +343,19 @@ initdb --locale=sv_SE
<entry><literal>EUC_TW</literal></entry>
<entry>Taiwan <acronym>EUC</acronym></entry>
</row>
+ <row>
+ <entry><literal>GBK</literal></entry>
+ <entry>Chinese <acronym>EUC</acronym></entry>
+ <entry>Aliases: WIN936, Windows936</entry>
+ </row>
+ <row>
+ <entry><literal>GB18030</literal></entry>
+ <entry>Chinese </entry>
+ </row>
<row>
<entry><literal>UTF8</literal></entry>
<entry>UTF-8 (Unicode, 8-bit)</entry>
+ <entry>Aliases: Unicode</entry>
</row>
<row>
<entry><literal>MULE_INTERNAL</literal></entry>
@@ -349,42 +364,52 @@ initdb --locale=sv_SE
<row>
<entry><literal>LATIN1</literal></entry>
<entry>ISO 8859-1/<acronym>ECMA</> 94 (Western European)</entry>
+ <entry>Aliases: ISO88591</entry>
</row>
<row>
<entry><literal>LATIN2</literal></entry>
<entry>ISO 8859-2/<acronym>ECMA</> 94 (Central European)</entry>
+ <entry>Aliases: ISO88592</entry>
</row>
<row>
<entry><literal>LATIN3</literal></entry>
<entry>ISO 8859-3/<acronym>ECMA</> 94 (South European)</entry>
+ <entry>Aliases: ISO88593</entry>
</row>
<row>
<entry><literal>LATIN4</literal></entry>
<entry>ISO 8859-4/<acronym>ECMA</> 94 (North European)</entry>
+ <entry>Aliases: ISO88594</entry>
</row>
<row>
<entry><literal>LATIN5</literal></entry>
<entry>ISO 8859-9/<acronym>ECMA</> 128 (Turkish)</entry>
+ <entry>Aliases: ISO88599</entry>
</row>
<row>
<entry><literal>LATIN6</literal></entry>
<entry>ISO 8859-10/<acronym>ECMA</> 144 (Nordic)</entry>
+ <entry>Aliases: ISO885910</entry>
</row>
<row>
<entry><literal>LATIN7</literal></entry>
<entry>ISO 8859-13 (Baltic)</entry>
+ <entry>Aliases: ISO885913</entry>
</row>
<row>
<entry><literal>LATIN8</literal></entry>
<entry>ISO 8859-14 (Celtic)</entry>
+ <entry>Aliases: ISO885914</entry>
</row>
<row>
<entry><literal>LATIN9</literal></entry>
<entry>ISO 8859-15 (LATIN1 with Euro and accents)</entry>
+ <entry>Aliases: ISO885915</entry>
</row>
<row>
<entry><literal>LATIN10</literal></entry>
<entry>ISO 8859-16/<acronym>ASRO</> SR 14111 (Romanian)</entry>
+ <entry>Aliases: ISO885916</entry>
</row>
<row>
<entry><literal>ISO_8859_5</literal></entry>
@@ -405,10 +430,22 @@ initdb --locale=sv_SE
<row>
<entry><literal>KOI8</literal></entry>
<entry><acronym>KOI</acronym>8-R(U) (Cyrillic)</entry>
+ <entry>Aliases: KOI8</entry>
+ </row>
+ <row>
+ <entry><literal>SJIS</literal></entry>
+ <entry>SJIS (Japanese)</entry>
+ <entry>Aliases: Mskanji, ShiftJIS, WIN932, Windows932</entry>
+ </row>
+ <row>
+ <entry><literal>UHC</literal></entry>
+ <entry>Unified Hangul Code (Korean)</entry>
+ <entry>Aliases: WIN949, Windows949</entry>
</row>
<row>
<entry><literal>WIN866</literal></entry>
<entry>Windows CP866 (Cyrillic)</entry>
+ <entry>Aliases: ALT</entry>
</row>
<row>
<entry><literal>WIN874</literal></entry>
@@ -421,6 +458,7 @@ initdb --locale=sv_SE
<row>
<entry><literal>WIN1251</literal></entry>
<entry>Windows CP1251 (Cyrillic)</entry>
+ <entry>Aliases: WIN</entry>
</row>
<row>
<entry><literal>WIN1256</literal></entry>
@@ -429,6 +467,7 @@ initdb --locale=sv_SE
<row>
<entry><literal>WIN1258</literal></entry>
<entry>Windows CP1258 (Vietnamese)/<acronym>TCVN</>-5712</entry>
+ <entry>Aliases: ABC, TCVN, TCVN5712, VSCII</entry>
</row>
</tbody>
</tgroup>
diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c
index 14db569553728e50226538a22fe248bd7a29140a..b04866ec769ef9c2aa0b6a51a0af83d18e20e101 100644
--- a/src/backend/utils/mb/encnames.c
+++ b/src/backend/utils/mb/encnames.c
@@ -2,7 +2,7 @@
* Encoding names and routines for work with it. All
* in this file is shared bedween FE and BE.
*
- * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.23 2005/03/07 04:30:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.24 2005/03/13 01:26:30 momjian Exp $
*/
#ifdef FRONTEND
#include "postgres_fe.h"
@@ -177,9 +177,6 @@ pg_encname pg_encname_tbl[] =
{
"unicode", PG_UTF8
}, /* alias for UTF8 */
- {
- "utf-8", PG_UTF8
- }, /* UTF8; RFC2279 */
{
"utf8", PG_UTF8
}, /* alias for UTF8 */