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.

2 files changed, 34 insertions, 16 deletions

diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 99f8d98d6a..f942b537a0 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -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>,
@@ -917,6 +917,12 @@ $ <userinput>psql -l</userinput>
          </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>,
          <literal>MULE_INTERNAL</literal>,
@@ -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 293285e79e..0042b76417 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -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,35 +2056,41 @@
 
       <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>
        <entry><literal>SQL_ASCII</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>