From 263144140fbe75dfae488bdbd9177d8a277e273b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 18 May 2009 08:59:29 +0000
Subject: [PATCH] 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.
---
doc/src/sgml/charset.sgml | 20 +++++++++++++-------
doc/src/sgml/func.sgml | 34 +++++++++++++++++++++++-----------
2 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index d6ab34f9e3d..287cabc33b4 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.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">
<title>Localization</>
@@ -875,7 +875,7 @@ $ <userinput>psql -l</userinput>
<row>
<entry><literal>ISO_8859_5</literal></entry>
<entry><emphasis>ISO_8859_5</emphasis>,
- <literal>KOI8</literal>,
+ <literal>KOI8R</literal>,
<literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>,
<literal>WIN866</literal>,
@@ -907,8 +907,8 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
- <entry><literal>KOI8</literal></entry>
- <entry><emphasis>KOI8</emphasis>,
+ <entry><literal>KOI8R</literal></entry>
+ <entry><emphasis>KOI8R</emphasis>,
<literal>ISO_8859_5</literal>,
<literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>,
@@ -916,6 +916,12 @@ $ <userinput>psql -l</userinput>
<literal>WIN1251</literal>
</entry>
</row>
+ <row>
+ <entry><literal>KOI8U</literal></entry>
+ <entry><emphasis>KOI8U</emphasis>,
+ <literal>UTF8</literal>
+ </entry>
+ </row>
<row>
<entry><literal>LATIN1</literal></entry>
<entry><emphasis>LATIN1</emphasis>,
@@ -990,7 +996,7 @@ $ <userinput>psql -l</userinput>
<literal>EUC_KR</literal>,
<literal>EUC_TW</literal>,
<literal>ISO_8859_5</literal>,
- <literal>KOI8</literal>,
+ <literal>KOI8R</literal>,
<literal>LATIN1</literal> to <literal>LATIN4</literal>,
<literal>SJIS</literal>,
<literal>WIN866</literal>,
@@ -1022,7 +1028,7 @@ $ <userinput>psql -l</userinput>
<entry><literal>WIN866</literal></entry>
<entry><emphasis>WIN866</emphasis>,
<literal>ISO_8859_5</literal>,
- <literal>KOI8</literal>,
+ <literal>KOI8R</literal>,
<literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>,
<literal>WIN1251</literal>
@@ -1046,7 +1052,7 @@ $ <userinput>psql -l</userinput>
<entry><literal>WIN1251</literal></entry>
<entry><emphasis>WIN1251</emphasis>,
<literal>ISO_8859_5</literal>,
- <literal>KOI8</literal>,
+ <literal>KOI8R</literal>,
<literal>MULE_INTERNAL</literal>,
<literal>UTF8</literal>,
<literal>WIN866</literal>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 01e56925947..faf0e30b157 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-<!-- $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">
<title>Functions and Operators</title>
@@ -1997,7 +1997,7 @@
<row>
<entry><literal>iso_8859_5_to_koi8_r</literal></entry>
<entry><literal>ISO_8859_5</literal></entry>
- <entry><literal>KOI8</literal></entry>
+ <entry><literal>KOI8R</literal></entry>
</row>
<row>
@@ -2056,34 +2056,40 @@
<row>
<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>
</row>
<row>
<entry><literal>koi8_r_to_mic</literal></entry>
- <entry><literal>KOI8</literal></entry>
+ <entry><literal>KOI8R</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
</row>
<row>
<entry><literal>koi8_r_to_utf8</literal></entry>
- <entry><literal>KOI8</literal></entry>
+ <entry><literal>KOI8R</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>KOI8R</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>KOI8R</literal></entry>
<entry><literal>WIN866</literal></entry>
</row>
+ <row>
+ <entry><literal>koi8_u_to_utf8</literal></entry>
+ <entry><literal>KOI8U</literal></entry>
+ <entry><literal>UTF8</literal></entry>
+ </row>
+
<row>
<entry><literal>mic_to_ascii</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
@@ -2153,7 +2159,7 @@
<row>
<entry><literal>mic_to_koi8_r</literal></entry>
<entry><literal>MULE_INTERNAL</literal></entry>
- <entry><literal>KOI8</literal></entry>
+ <entry><literal>KOI8R</literal></entry>
</row>
<row>
@@ -2351,7 +2357,13 @@
<row>
<entry><literal>utf8_to_koi8_r</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>
@@ -2459,7 +2471,7 @@
<row>
<entry><literal>windows_1251_to_koi8_r</literal></entry>
<entry><literal>WIN1251</literal></entry>
- <entry><literal>KOI8</literal></entry>
+ <entry><literal>KOI8R</literal></entry>
</row>
<row>
@@ -2501,7 +2513,7 @@
<row>
<entry><literal>windows_866_to_koi8_r</literal></entry>
<entry><literal>WIN866</literal></entry>
- <entry><literal>KOI8</literal></entry>
+ <entry><literal>KOI8R</literal></entry>
</row>
<row>
--
GitLab