summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/charset.sgml104
-rw-r--r--doc/src/sgml/func.sgml310
-rw-r--r--doc/src/sgml/ref/alter_conversion.sgml10
-rw-r--r--doc/src/sgml/ref/comment.sgml4
-rw-r--r--doc/src/sgml/ref/create_conversion.sgml6
5 files changed, 217 insertions, 217 deletions
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 0b9aa697f32..f8e347c65e2 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.48 2005/01/04 00:05:44 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.49 2005/03/07 04:30:48 momjian Exp $ -->
<chapter id="charset">
<title>Localization</>
@@ -285,7 +285,7 @@ initdb --locale=sv_SE
allows you to store text in a variety of character sets, including
single-byte character sets such as the ISO 8859 series and
multiple-byte character sets such as <acronym>EUC</> (Extended Unix
- Code), Unicode, and Mule internal code. All character sets can be
+ Code), UTF8, and Mule internal code. All character sets can be
used transparently throughout the server. (If you use extension
functions from other sources, it depends on whether they wrote
their code correctly.) The default character set is selected while
@@ -339,8 +339,8 @@ initdb --locale=sv_SE
<entry>Taiwan <acronym>EUC</acronym></entry>
</row>
<row>
- <entry><literal>UNICODE</literal></entry>
- <entry>Unicode (<acronym>UTF</acronym>-8)</entry>
+ <entry><literal>UTF8</literal></entry>
+ <entry>UTF-8 (Unicode, 8-bit)</entry>
</row>
<row>
<entry><literal>MULE_INTERNAL</literal></entry>
@@ -407,7 +407,7 @@ initdb --locale=sv_SE
<entry><acronym>KOI</acronym>8-R(U)</entry>
</row>
<row>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
<entry>Windows CP866</entry>
</row>
<row>
@@ -419,7 +419,7 @@ initdb --locale=sv_SE
<entry>Windows CP1250</entry>
</row>
<row>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
<entry>Windows CP1251</entry>
</row>
<row>
@@ -427,8 +427,8 @@ initdb --locale=sv_SE
<entry>Windows CP1256 (Arabic)</entry>
</row>
<row>
- <entry><literal>TCVN</literal></entry>
- <entry><acronym>TCVN</>-5712/Windows CP1258 (Vietnamese)</entry>
+ <entry><literal>WIN1258</literal></entry>
+ <entry>Windows CP1258 (Vietnamese)/<acronym>TCVN</>-5712</entry>
</row>
</tbody>
</tgroup>
@@ -504,7 +504,7 @@ $ <userinput>psql -l</userinput>
regression | t-ishii | SQL_ASCII
template1 | t-ishii | EUC_JP
test | t-ishii | EUC_JP
- unicode | t-ishii | UNICODE
+ utf8 | t-ishii | UTF8
(9 rows)
</screen>
</para>
@@ -561,126 +561,126 @@ $ <userinput>psql -l</userinput>
<tbody>
<row>
<entry><literal>SQL_ASCII</literal></entry>
- <entry><literal>SQL_ASCII</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>SQL_ASCII</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>EUC_JP</literal></entry>
<entry><literal>EUC_JP</literal>, <literal>SJIS</literal>,
- <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>EUC_CN</literal></entry>
- <entry><literal>EUC_CN</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>EUC_CN</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>EUC_KR</literal></entry>
- <entry><literal>EUC_KR</literal>, <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>EUC_KR</literal>, <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>JOHAB</literal></entry>
- <entry><literal>JOHAB</literal>, <literal>UNICODE</literal>
+ <entry><literal>JOHAB</literal>, <literal>UTF8</literal>
</entry>
</row>
<row>
<entry><literal>EUC_TW</literal></entry>
<entry><literal>EUC_TW</literal>, <literal>BIG5</literal>,
- <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN1</literal></entry>
- <entry><literal>LATIN1</literal>, <literal>UNICODE</literal>
+ <entry><literal>LATIN1</literal>, <literal>UTF8</literal>
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN2</literal></entry>
<entry><literal>LATIN2</literal>, <literal>WIN1250</literal>,
- <literal>UNICODE</literal>,
+ <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN3</literal></entry>
- <entry><literal>LATIN3</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN3</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN4</literal></entry>
- <entry><literal>LATIN4</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN4</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN5</literal></entry>
- <entry><literal>LATIN5</literal>, <literal>UNICODE</literal>
+ <entry><literal>LATIN5</literal>, <literal>UTF8</literal>
</entry>
</row>
<row>
<entry><literal>LATIN6</literal></entry>
- <entry><literal>LATIN6</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN6</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN7</literal></entry>
- <entry><literal>LATIN7</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN7</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN8</literal></entry>
- <entry><literal>LATIN8</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN8</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN9</literal></entry>
- <entry><literal>LATIN9</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN9</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>LATIN10</literal></entry>
- <entry><literal>LATIN10</literal>, <literal>UNICODE</literal>,
+ <entry><literal>LATIN10</literal>, <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
<entry><literal>ISO_8859_5</literal></entry>
<entry><literal>ISO_8859_5</literal>,
- <literal>UNICODE</literal>,
+ <literal>UTF8</literal>,
<literal>MULE_INTERNAL</literal>,
- <literal>WIN</literal>,
- <literal>ALT</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>UNICODE</literal>
+ <literal>UTF8</literal>
</entry>
</row>
<row>
<entry><literal>ISO_8859_7</literal></entry>
<entry><literal>ISO_8859_7</literal>,
- <literal>UNICODE</literal>
+ <literal>UTF8</literal>
</entry>
</row>
<row>
<entry><literal>ISO_8859_8</literal></entry>
<entry><literal>ISO_8859_8</literal>,
- <literal>UNICODE</literal>
+ <literal>UTF8</literal>
</entry>
</row>
<row>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry>
<literal>EUC_JP</literal>, <literal>SJIS</literal>,
<literal>EUC_KR</literal>, <literal>UHC</literal>, <literal>JOHAB</literal>,
@@ -691,10 +691,10 @@ $ <userinput>psql -l</userinput>
<literal>ISO_8859_6</literal>,
<literal>ISO_8859_7</literal>,
<literal>ISO_8859_8</literal>,
- <literal>WIN</literal>, <literal>ALT</literal>,
+ <literal>WIN1251</literal>, <literal>WIN866</literal>,
<literal>KOI8</literal>,
<literal>WIN1256</literal>,
- <literal>TCVN</literal>,
+ <literal>WIN1258</literal>,
<literal>WIN874</literal>,
<literal>GB18030</literal>,
<literal>WIN1250</literal>
@@ -704,53 +704,53 @@ $ <userinput>psql -l</userinput>
<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>WIN</literal>, <literal>ALT</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>WIN</literal>,
- <literal>ALT</literal>, <literal>KOI8</literal>,
- <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <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>ALT</literal></entry>
- <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>,
- <literal>ALT</literal>, <literal>KOI8</literal>,
- <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>WIN866</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>WIN874</literal></entry>
<entry><literal>WIN874</literal>,
- <literal>UNICODE</literal>
+ <literal>UTF8</literal>
</entry>
</row>
<row>
<entry><literal>WIN1250</literal></entry>
<entry><literal>LATIN2</literal>, <literal>WIN1250</literal>,
- <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <literal>UTF8</literal>, <literal>MULE_INTERNAL</literal>
</entry>
</row>
<row>
- <entry><literal>WIN</literal></entry>
- <entry><literal>ISO_8859_5</literal>, <literal>WIN</literal>,
- <literal>ALT</literal>, <literal>KOI8</literal>,
- <literal>UNICODE</literal>, <literal>MULE_INTERNAL</literal>
+ <entry><literal>WIN1251</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>WIN1256</literal></entry>
<entry><literal>WIN1256</literal>,
- <literal>UNICODE</literal>
+ <literal>UTF8</literal>
</entry>
</row>
<row>
- <entry><literal>TCVN</literal></entry>
- <entry><literal>TCVN</literal>,
- <literal>UNICODE</literal>
+ <entry><literal>WIN1258</literal></entry>
+ <entry><literal>WIN1258</literal>,
+ <literal>UTF8</literal>
</entry>
</row>
</tbody>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f6c33eaa0e3..7da2e8ad4a0 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.239 2005/02/28 03:45:20 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.240 2005/03/07 04:30:49 momjian Exp $
PostgreSQL documentation
-->
@@ -933,8 +933,8 @@ PostgreSQL documentation
linkend="conversion-names"> for available conversion
names.
</entry>
- <entry><literal>convert('PostgreSQL' using iso_8859_1_to_utf_8)</literal></entry>
- <entry><literal>'PostgreSQL'</literal> in Unicode (UTF-8) encoding</entry>
+ <entry><literal>convert('PostgreSQL' using iso_8859_1_to_utf8)</literal></entry>
+ <entry><literal>'PostgreSQL'</literal> in UTF8 (Unicode, 8-bit) encoding</entry>
</row>
<row>
@@ -1105,8 +1105,8 @@ PostgreSQL documentation
<parameter>src_encoding</parameter> is omitted, database
encoding is assumed.
</entry>
- <entry><literal>convert( 'text_in_unicode', 'UNICODE', 'LATIN1')</literal></entry>
- <entry><literal>text_in_unicode</literal> represented in ISO 8859-1 encoding</entry>
+ <entry><literal>convert( 'text_in_utf8', 'UTF8', 'LATIN1')</literal></entry>
+ <entry><literal>text_in_utf8</literal> represented in ISO 8859-1 encoding</entry>
</row>
<row>
@@ -1421,9 +1421,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>ascii_to_utf_8</literal></entry>
+ <entry><literal>ascii_to_utf8</literal></entry>
<entry><literal>SQL_ASCII</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1439,9 +1439,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>big5_to_utf_8</literal></entry>
+ <entry><literal>big5_to_utf8</literal></entry>
<entry><literal>BIG5</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1451,9 +1451,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>euc_cn_to_utf_8</literal></entry>
+ <entry><literal>euc_cn_to_utf8</literal></entry>
<entry><literal>EUC_CN</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1469,9 +1469,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>euc_jp_to_utf_8</literal></entry>
+ <entry><literal>euc_jp_to_utf8</literal></entry>
<entry><literal>EUC_JP</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1481,9 +1481,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>euc_kr_to_utf_8</literal></entry>
+ <entry><literal>euc_kr_to_utf8</literal></entry>
<entry><literal>EUC_KR</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1499,51 +1499,51 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>euc_tw_to_utf_8</literal></entry>
+ <entry><literal>euc_tw_to_utf8</literal></entry>
<entry><literal>EUC_TW</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>gb18030_to_utf_8</literal></entry>
+ <entry><literal>gb18030_to_utf8</literal></entry>
<entry><literal>GB18030</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>gbk_to_utf_8</literal></entry>
+ <entry><literal>gbk_to_utf8</literal></entry>
<entry><literal>GBK</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_10_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_10_to_utf8</literal></entry>
<entry><literal>LATIN6</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_13_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_13_to_utf8</literal></entry>
<entry><literal>LATIN7</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_14_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_14_to_utf8</literal></entry>
<entry><literal>LATIN8</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_15_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_15_to_utf8</literal></entry>
<entry><literal>LATIN9</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_16_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_16_to_utf8</literal></entry>
<entry><literal>LATIN10</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1553,9 +1553,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>iso_8859_1_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_1_to_utf8</literal></entry>
<entry><literal>LATIN1</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1565,9 +1565,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>iso_8859_2_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_2_to_utf8</literal></entry>
<entry><literal>LATIN2</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1583,9 +1583,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>iso_8859_3_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_3_to_utf8</literal></entry>
<entry><literal>LATIN3</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1595,9 +1595,9 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>iso_8859_4_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_4_to_utf8</literal></entry>
<entry><literal>LATIN4</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1613,51 +1613,51 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>iso_8859_5_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_5_to_utf8</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
<entry><literal>iso_8859_5_to_windows_1251</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
</row>
<row>
<entry><literal>iso_8859_5_to_windows_866</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_6_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_6_to_utf8</literal></entry>
<entry><literal>ISO_8859_6</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_7_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_7_to_utf8</literal></entry>
<entry><literal>ISO_8859_7</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_8_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_8_to_utf8</literal></entry>
<entry><literal>ISO_8859_8</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>iso_8859_9_to_utf_8</literal></entry>
+ <entry><literal>iso_8859_9_to_utf8</literal></entry>
<entry><literal>LATIN5</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>johab_to_utf_8</literal></entry>
+ <entry><literal>johab_to_utf8</literal></entry>
<entry><literal>JOHAB</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
@@ -1673,21 +1673,21 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>koi8_r_to_utf_8</literal></entry>
+ <entry><literal>koi8_r_to_utf8</literal></entry>
<entry><literal>KOI8</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
<entry><literal>koi8_r_to_windows_1251</literal></entry>
<entry><literal>KOI8</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
</row>
<row>
<entry><literal>koi8_r_to_windows_866</literal></entry>
<entry><literal>KOI8</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
</row>
<row>
@@ -1777,13 +1777,13 @@ PostgreSQL documentation
<row>
<entry><literal>mic_to_windows_1251</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
</row>
<row>
<entry><literal>mic_to_windows_866</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
</row>
<row>
@@ -1799,212 +1799,212 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>sjis_to_utf_8</literal></entry>
+ <entry><literal>sjis_to_utf8</literal></entry>
<entry><literal>SJIS</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>tcvn_to_utf_8</literal></entry>
- <entry><literal>TCVN</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>tcvn_to_utf8</literal></entry>
+ <entry><literal>WIN1258</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>uhc_to_utf_8</literal></entry>
+ <entry><literal>uhc_to_utf8</literal></entry>
<entry><literal>UHC</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_ascii</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_ascii</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>SQL_ASCII</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_big5</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_big5</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>BIG5</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_euc_cn</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_euc_cn</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>EUC_CN</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_euc_jp</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_euc_jp</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>EUC_JP</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_euc_kr</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_euc_kr</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>EUC_KR</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_euc_tw</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_euc_tw</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>EUC_TW</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_gb18030</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_gb18030</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>GB18030</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_gbk</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_gbk</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>GBK</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_1</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_1</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN1</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_10</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_10</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN6</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_13</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_13</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN7</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_14</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_14</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN8</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_15</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_15</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN9</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_16</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_16</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN10</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_2</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_2</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN2</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_3</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_3</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN3</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_4</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_4</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN4</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_5</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_5</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_6</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_6</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>ISO_8859_6</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_7</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_7</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>ISO_8859_7</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_8</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_8</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>ISO_8859_8</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_iso_8859_9</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_iso_8859_9</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>LATIN5</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_johab</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_johab</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>JOHAB</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_koi8_r</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_koi8_r</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>KOI8</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_sjis</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_sjis</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>SJIS</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_tcvn</literal></entry>
- <entry><literal>UNICODE</literal></entry>
- <entry><literal>TCVN</literal></entry>
+ <entry><literal>utf8_to_tcvn</literal></entry>
+ <entry><literal>UTF8</literal></entry>
+ <entry><literal>WIN1258</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_uhc</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_uhc</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>UHC</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_windows_1250</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_windows_1250</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>WIN1250</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_windows_1251</literal></entry>
- <entry><literal>UNICODE</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>utf8_to_windows_1251</literal></entry>
+ <entry><literal>UTF8</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_windows_1256</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_windows_1256</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>WIN1256</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_windows_866</literal></entry>
- <entry><literal>UNICODE</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>utf8_to_windows_866</literal></entry>
+ <entry><literal>UTF8</literal></entry>
+ <entry><literal>WIN866</literal></entry>
</row>
<row>
- <entry><literal>utf_8_to_windows_874</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>utf8_to_windows_874</literal></entry>
+ <entry><literal>UTF8</literal></entry>
<entry><literal>WIN874</literal></entry>
</row>
@@ -2021,81 +2021,81 @@ PostgreSQL documentation
</row>
<row>
- <entry><literal>windows_1250_to_utf_8</literal></entry>
+ <entry><literal>windows_1250_to_utf8</literal></entry>
<entry><literal>WIN1250</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
<entry><literal>windows_1251_to_iso_8859_5</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
</row>
<row>
<entry><literal>windows_1251_to_koi8_r</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
<entry><literal>KOI8</literal></entry>
</row>
<row>
<entry><literal>windows_1251_to_mic</literal></entry>
- <entry><literal>WIN</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
</row>
<row>
- <entry><literal>windows_1251_to_utf_8</literal></entry>
- <entry><literal>WIN</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>windows_1251_to_utf8</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
<entry><literal>windows_1251_to_windows_866</literal></entry>
- <entry><literal>WIN</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN1251</literal></entry>
+ <entry><literal>WIN866</literal></entry>
</row>
<row>
- <entry><literal>windows_1256_to_utf_8</literal></entry>
+ <entry><literal>windows_1256_to_utf8</literal></entry>
<entry><literal>WIN1256</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
<entry><literal>windows_866_to_iso_8859_5</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
</row>
<row>
<entry><literal>windows_866_to_koi8_r</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
<entry><literal>KOI8</literal></entry>
</row>
<row>
<entry><literal>windows_866_to_mic</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
</row>
<row>
- <entry><literal>windows_866_to_utf_8</literal></entry>
- <entry><literal>ALT</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>windows_866_to_utf8</literal></entry>
+ <entry><literal>WIN866</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
<row>
<entry><literal>windows_866_to_windows_1251</literal></entry>
- <entry><literal>ALT</literal></entry>
+ <entry><literal>WIN866</literal></entry>
<entry><literal>WIN</literal></entry>
</row>
<row>
- <entry><literal>windows_874_to_utf_8</literal></entry>
+ <entry><literal>windows_874_to_utf8</literal></entry>
<entry><literal>WIN874</literal></entry>
- <entry><literal>UNICODE</literal></entry>
+ <entry><literal>UTF8</literal></entry>
</row>
</tbody>
@@ -3372,7 +3372,7 @@ substring('foobar' from 'o(.)b') <lineannotation>o</lineannotation>
<row>
<entry> <literal>\u</><replaceable>wxyz</> </entry>
<entry> (where <replaceable>wxyz</> is exactly four hexadecimal digits)
- the Unicode character <literal>U+</><replaceable>wxyz</>
+ the UTF16 (Unicode, 16-bit) character <literal>U+</><replaceable>wxyz</>
in the local byte ordering </entry>
</row>
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml
index 024d03212cb..dc86fcf6816 100644
--- a/doc/src/sgml/ref/alter_conversion.sgml
+++ b/doc/src/sgml/ref/alter_conversion.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.5 2004/06/25 21:55:50 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/alter_conversion.sgml,v 1.6 2005/03/07 04:30:51 momjian Exp $
PostgreSQL documentation
-->
@@ -72,18 +72,18 @@ ALTER CONVERSION <replaceable>name</replaceable> OWNER TO <replaceable>newowner<
<title>Examples</title>
<para>
- To rename the conversion <literal>iso_8859_1_to_utf_8</literal> to
+ To rename the conversion <literal>iso_8859_1_to_utf8</literal> to
<literal>latin1_to_unicode</literal>:
<programlisting>
-ALTER CONVERSION iso_8859_1_to_utf_8 RENAME TO latin1_to_unicode;
+ALTER CONVERSION iso_8859_1_to_utf8 RENAME TO latin1_to_unicode;
</programlisting>
</para>
<para>
- To change the owner of the conversion <literal>iso_8859_1_to_utf_8</literal> to
+ To change the owner of the conversion <literal>iso_8859_1_to_utf8</literal> to
<literal>joe</literal>:
<programlisting>
-ALTER CONVERSION iso_8859_1_to_utf_8 OWNER TO joe;
+ALTER CONVERSION iso_8859_1_to_utf8 OWNER TO joe;
</programlisting>
</para>
</refsect1>
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 4355e5fe2a1..961623c3da3 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.26 2005/01/04 00:39:53 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/comment.sgml,v 1.27 2005/03/07 04:30:51 momjian Exp $
PostgreSQL documentation
-->
@@ -195,7 +195,7 @@ COMMENT ON TABLE mytable IS NULL;
COMMENT ON AGGREGATE my_aggregate (double precision) IS 'Computes sample variance';
COMMENT ON CAST (text AS int4) IS 'Allow casts from text to int4';
COMMENT ON COLUMN my_table.my_column IS 'Employee ID number';
-COMMENT ON CONVERSION my_conv IS 'Conversion to Unicode';
+COMMENT ON CONVERSION my_conv IS 'Conversion to UTF8';
COMMENT ON DATABASE my_database IS 'Development Database';
COMMENT ON DOMAIN my_domain IS 'Email Address Domain';
COMMENT ON FUNCTION my_function (timestamp) IS 'Returns Roman Numeral';
diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml
index 371b5185dca..3b941b80bb1 100644
--- a/doc/src/sgml/ref/create_conversion.sgml
+++ b/doc/src/sgml/ref/create_conversion.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.14 2003/11/29 19:51:38 pgsql Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.15 2005/03/07 04:30:51 momjian Exp $ -->
<refentry id="SQL-CREATECONVERSION">
<refmeta>
@@ -136,10 +136,10 @@ conv_proc(
<title>Examples</title>
<para>
- To create a conversion from encoding <literal>UNICODE</literal> to
+ To create a conversion from encoding <literal>UTF8</literal> to
<literal>LATIN1</literal> using <function>myfunc</>:
<programlisting>
-CREATE CONVERSION myconv FOR 'UNICODE' TO 'LATIN1' FROM myfunc;
+CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc;
</programlisting>
</para>
</refsect1>
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-02 17:45:51 +0000