Commit 26314414 authored by Peter Eisentraut's avatar Peter Eisentraut

Some documentation cleanup for the addition of the KOI8U encoding. Change

all (remaining) mentions of KOI8 to the new canonical form KOI8R.  Add
information about the available conversions for KOI8U.
parent 606f5d17
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.94 2009/05/06 16:15:20 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.95 2009/05/18 08:59:28 petere Exp $ -->
<chapter id="charset"> <chapter id="charset">
<title>Localization</> <title>Localization</>
...@@ -875,7 +875,7 @@ $ <userinput>psql -l</userinput> ...@@ -875,7 +875,7 @@ $ <userinput>psql -l</userinput>
<row> <row>
<entry><literal>ISO_8859_5</literal></entry> <entry><literal>ISO_8859_5</literal></entry>
<entry><emphasis>ISO_8859_5</emphasis>, <entry><emphasis>ISO_8859_5</emphasis>,
<literal>KOI8</literal>, <literal>KOI8R</literal>,
<literal>MULE_INTERNAL</literal>, <literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>, <literal>UTF8</literal>,
<literal>WIN866</literal>, <literal>WIN866</literal>,
...@@ -907,8 +907,8 @@ $ <userinput>psql -l</userinput> ...@@ -907,8 +907,8 @@ $ <userinput>psql -l</userinput>
</entry> </entry>
</row> </row>
<row> <row>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
<entry><emphasis>KOI8</emphasis>, <entry><emphasis>KOI8R</emphasis>,
<literal>ISO_8859_5</literal>, <literal>ISO_8859_5</literal>,
<literal>MULE_INTERNAL</literal>, <literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>, <literal>UTF8</literal>,
...@@ -916,6 +916,12 @@ $ <userinput>psql -l</userinput> ...@@ -916,6 +916,12 @@ $ <userinput>psql -l</userinput>
<literal>WIN1251</literal> <literal>WIN1251</literal>
</entry> </entry>
</row> </row>
<row>
<entry><literal>KOI8U</literal></entry>
<entry><emphasis>KOI8U</emphasis>,
<literal>UTF8</literal>
</entry>
</row>
<row> <row>
<entry><literal>LATIN1</literal></entry> <entry><literal>LATIN1</literal></entry>
<entry><emphasis>LATIN1</emphasis>, <entry><emphasis>LATIN1</emphasis>,
...@@ -990,7 +996,7 @@ $ <userinput>psql -l</userinput> ...@@ -990,7 +996,7 @@ $ <userinput>psql -l</userinput>
<literal>EUC_KR</literal>, <literal>EUC_KR</literal>,
<literal>EUC_TW</literal>, <literal>EUC_TW</literal>,
<literal>ISO_8859_5</literal>, <literal>ISO_8859_5</literal>,
<literal>KOI8</literal>, <literal>KOI8R</literal>,
<literal>LATIN1</literal> to <literal>LATIN4</literal>, <literal>LATIN1</literal> to <literal>LATIN4</literal>,
<literal>SJIS</literal>, <literal>SJIS</literal>,
<literal>WIN866</literal>, <literal>WIN866</literal>,
...@@ -1022,7 +1028,7 @@ $ <userinput>psql -l</userinput> ...@@ -1022,7 +1028,7 @@ $ <userinput>psql -l</userinput>
<entry><literal>WIN866</literal></entry> <entry><literal>WIN866</literal></entry>
<entry><emphasis>WIN866</emphasis>, <entry><emphasis>WIN866</emphasis>,
<literal>ISO_8859_5</literal>, <literal>ISO_8859_5</literal>,
<literal>KOI8</literal>, <literal>KOI8R</literal>,
<literal>MULE_INTERNAL</literal>, <literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>, <literal>UTF8</literal>,
<literal>WIN1251</literal> <literal>WIN1251</literal>
...@@ -1046,7 +1052,7 @@ $ <userinput>psql -l</userinput> ...@@ -1046,7 +1052,7 @@ $ <userinput>psql -l</userinput>
<entry><literal>WIN1251</literal></entry> <entry><literal>WIN1251</literal></entry>
<entry><emphasis>WIN1251</emphasis>, <entry><emphasis>WIN1251</emphasis>,
<literal>ISO_8859_5</literal>, <literal>ISO_8859_5</literal>,
<literal>KOI8</literal>, <literal>KOI8R</literal>,
<literal>MULE_INTERNAL</literal>, <literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>, <literal>UTF8</literal>,
<literal>WIN866</literal> <literal>WIN866</literal>
......
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.479 2009/05/13 21:53:41 tgl Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.480 2009/05/18 08:59:29 petere Exp $ -->
<chapter id="functions"> <chapter id="functions">
<title>Functions and Operators</title> <title>Functions and Operators</title>
...@@ -1997,7 +1997,7 @@ ...@@ -1997,7 +1997,7 @@
<row> <row>
<entry><literal>iso_8859_5_to_koi8_r</literal></entry> <entry><literal>iso_8859_5_to_koi8_r</literal></entry>
<entry><literal>ISO_8859_5</literal></entry> <entry><literal>ISO_8859_5</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
</row> </row>
<row> <row>
...@@ -2056,34 +2056,40 @@ ...@@ -2056,34 +2056,40 @@
<row> <row>
<entry><literal>koi8_r_to_iso_8859_5</literal></entry> <entry><literal>koi8_r_to_iso_8859_5</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
<entry><literal>ISO_8859_5</literal></entry> <entry><literal>ISO_8859_5</literal></entry>
</row> </row>
<row> <row>
<entry><literal>koi8_r_to_mic</literal></entry> <entry><literal>koi8_r_to_mic</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry> <entry><literal>MULE_INTERNAL</literal></entry>
</row> </row>
<row> <row>
<entry><literal>koi8_r_to_utf8</literal></entry> <entry><literal>koi8_r_to_utf8</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
<entry><literal>UTF8</literal></entry> <entry><literal>UTF8</literal></entry>
</row> </row>
<row> <row>
<entry><literal>koi8_r_to_windows_1251</literal></entry> <entry><literal>koi8_r_to_windows_1251</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
<entry><literal>WIN1251</literal></entry> <entry><literal>WIN1251</literal></entry>
</row> </row>
<row> <row>
<entry><literal>koi8_r_to_windows_866</literal></entry> <entry><literal>koi8_r_to_windows_866</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
<entry><literal>WIN866</literal></entry> <entry><literal>WIN866</literal></entry>
</row> </row>
<row>
<entry><literal>koi8_u_to_utf8</literal></entry>
<entry><literal>KOI8U</literal></entry>
<entry><literal>UTF8</literal></entry>
</row>
<row> <row>
<entry><literal>mic_to_ascii</literal></entry> <entry><literal>mic_to_ascii</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry> <entry><literal>MULE_INTERNAL</literal></entry>
...@@ -2153,7 +2159,7 @@ ...@@ -2153,7 +2159,7 @@
<row> <row>
<entry><literal>mic_to_koi8_r</literal></entry> <entry><literal>mic_to_koi8_r</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry> <entry><literal>MULE_INTERNAL</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
</row> </row>
<row> <row>
...@@ -2351,7 +2357,13 @@ ...@@ -2351,7 +2357,13 @@
<row> <row>
<entry><literal>utf8_to_koi8_r</literal></entry> <entry><literal>utf8_to_koi8_r</literal></entry>
<entry><literal>UTF8</literal></entry> <entry><literal>UTF8</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
</row>
<row>
<entry><literal>utf8_to_koi8_u</literal></entry>
<entry><literal>UTF8</literal></entry>
<entry><literal>KOI8U</literal></entry>
</row> </row>
<row> <row>
...@@ -2459,7 +2471,7 @@ ...@@ -2459,7 +2471,7 @@
<row> <row>
<entry><literal>windows_1251_to_koi8_r</literal></entry> <entry><literal>windows_1251_to_koi8_r</literal></entry>
<entry><literal>WIN1251</literal></entry> <entry><literal>WIN1251</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
</row> </row>
<row> <row>
...@@ -2501,7 +2513,7 @@ ...@@ -2501,7 +2513,7 @@
<row> <row>
<entry><literal>windows_866_to_koi8_r</literal></entry> <entry><literal>windows_866_to_koi8_r</literal></entry>
<entry><literal>WIN866</literal></entry> <entry><literal>WIN866</literal></entry>
<entry><literal>KOI8</literal></entry> <entry><literal>KOI8R</literal></entry>
</row> </row>
<row> <row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment