Skip to content

Commit 2631441

Browse files
peterepetere
committed
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.
1 parent 606f5d1 commit 2631441

File tree

2 files changed

+36
-18
lines changed

2 files changed

+36
-18
lines changed

‎doc/src/sgml/charset.sgml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.94 2009/05/06 16:15:20 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.95 2009/05/18 08:59:28 petere Exp $ -->
22

33
<chapter id="charset">
44
<title>Localization</>
@@ -875,7 +875,7 @@ $ <userinput>psql -l</userinput>
875875
<row>
876876
<entry><literal>ISO_8859_5</literal></entry>
877877
<entry><emphasis>ISO_8859_5</emphasis>,
878-
<literal>KOI8</literal>,
878+
<literal>KOI8R</literal>,
879879
<literal>MULE_INTERNAL</literal>,
880880
<literal>UTF8</literal>,
881881
<literal>WIN866</literal>,
@@ -907,15 +907,21 @@ $ <userinput>psql -l</userinput>
907907
</entry>
908908
</row>
909909
<row>
910-
<entry><literal>KOI8</literal></entry>
911-
<entry><emphasis>KOI8</emphasis>,
910+
<entry><literal>KOI8R</literal></entry>
911+
<entry><emphasis>KOI8R</emphasis>,
912912
<literal>ISO_8859_5</literal>,
913913
<literal>MULE_INTERNAL</literal>,
914914
<literal>UTF8</literal>,
915915
<literal>WIN866</literal>,
916916
<literal>WIN1251</literal>
917917
</entry>
918918
</row>
919+
<row>
920+
<entry><literal>KOI8U</literal></entry>
921+
<entry><emphasis>KOI8U</emphasis>,
922+
<literal>UTF8</literal>
923+
</entry>
924+
</row>
919925
<row>
920926
<entry><literal>LATIN1</literal></entry>
921927
<entry><emphasis>LATIN1</emphasis>,
@@ -990,7 +996,7 @@ $ <userinput>psql -l</userinput>
990996
<literal>EUC_KR</literal>,
991997
<literal>EUC_TW</literal>,
992998
<literal>ISO_8859_5</literal>,
993-
<literal>KOI8</literal>,
999+
<literal>KOI8R</literal>,
9941000
<literal>LATIN1</literal> to <literal>LATIN4</literal>,
9951001
<literal>SJIS</literal>,
9961002
<literal>WIN866</literal>,
@@ -1022,7 +1028,7 @@ $ <userinput>psql -l</userinput>
10221028
<entry><literal>WIN866</literal></entry>
10231029
<entry><emphasis>WIN866</emphasis>,
10241030
<literal>ISO_8859_5</literal>,
1025-
<literal>KOI8</literal>,
1031+
<literal>KOI8R</literal>,
10261032
<literal>MULE_INTERNAL</literal>,
10271033
<literal>UTF8</literal>,
10281034
<literal>WIN1251</literal>
@@ -1046,7 +1052,7 @@ $ <userinput>psql -l</userinput>
10461052
<entry><literal>WIN1251</literal></entry>
10471053
<entry><emphasis>WIN1251</emphasis>,
10481054
<literal>ISO_8859_5</literal>,
1049-
<literal>KOI8</literal>,
1055+
<literal>KOI8R</literal>,
10501056
<literal>MULE_INTERNAL</literal>,
10511057
<literal>UTF8</literal>,
10521058
<literal>WIN866</literal>

‎doc/src/sgml/func.sgml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.479 2009/05/13 21:53:41 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.480 2009/05/18 08:59:29 petere Exp $ -->
22

33
<chapter id="functions">
44
<title>Functions and Operators</title>
@@ -1997,7 +1997,7 @@
19971997
<row>
19981998
<entry><literal>iso_8859_5_to_koi8_r</literal></entry>
19991999
<entry><literal>ISO_8859_5</literal></entry>
2000-
<entry><literal>KOI8</literal></entry>
2000+
<entry><literal>KOI8R</literal></entry>
20012001
</row>
20022002

20032003
<row>
@@ -2056,34 +2056,40 @@
20562056

20572057
<row>
20582058
<entry><literal>koi8_r_to_iso_8859_5</literal></entry>
2059-
<entry><literal>KOI8</literal></entry>
2059+
<entry><literal>KOI8R</literal></entry>
20602060
<entry><literal>ISO_8859_5</literal></entry>
20612061
</row>
20622062

20632063
<row>
20642064
<entry><literal>koi8_r_to_mic</literal></entry>
2065-
<entry><literal>KOI8</literal></entry>
2065+
<entry><literal>KOI8R</literal></entry>
20662066
<entry><literal>MULE_INTERNAL</literal></entry>
20672067
</row>
20682068

20692069
<row>
20702070
<entry><literal>koi8_r_to_utf8</literal></entry>
2071-
<entry><literal>KOI8</literal></entry>
2071+
<entry><literal>KOI8R</literal></entry>
20722072
<entry><literal>UTF8</literal></entry>
20732073
</row>
20742074

20752075
<row>
20762076
<entry><literal>koi8_r_to_windows_1251</literal></entry>
2077-
<entry><literal>KOI8</literal></entry>
2077+
<entry><literal>KOI8R</literal></entry>
20782078
<entry><literal>WIN1251</literal></entry>
20792079
</row>
20802080

20812081
<row>
20822082
<entry><literal>koi8_r_to_windows_866</literal></entry>
2083-
<entry><literal>KOI8</literal></entry>
2083+
<entry><literal>KOI8R</literal></entry>
20842084
<entry><literal>WIN866</literal></entry>
20852085
</row>
20862086

2087+
<row>
2088+
<entry><literal>koi8_u_to_utf8</literal></entry>
2089+
<entry><literal>KOI8U</literal></entry>
2090+
<entry><literal>UTF8</literal></entry>
2091+
</row>
2092+
20872093
<row>
20882094
<entry><literal>mic_to_ascii</literal></entry>
20892095
<entry><literal>MULE_INTERNAL</literal></entry>
@@ -2153,7 +2159,7 @@
21532159
<row>
21542160
<entry><literal>mic_to_koi8_r</literal></entry>
21552161
<entry><literal>MULE_INTERNAL</literal></entry>
2156-
<entry><literal>KOI8</literal></entry>
2162+
<entry><literal>KOI8R</literal></entry>
21572163
</row>
21582164

21592165
<row>
@@ -2351,7 +2357,13 @@
23512357
<row>
23522358
<entry><literal>utf8_to_koi8_r</literal></entry>
23532359
<entry><literal>UTF8</literal></entry>
2354-
<entry><literal>KOI8</literal></entry>
2360+
<entry><literal>KOI8R</literal></entry>
2361+
</row>
2362+
2363+
<row>
2364+
<entry><literal>utf8_to_koi8_u</literal></entry>
2365+
<entry><literal>UTF8</literal></entry>
2366+
<entry><literal>KOI8U</literal></entry>
23552367
</row>
23562368

23572369
<row>
@@ -2459,7 +2471,7 @@
24592471
<row>
24602472
<entry><literal>windows_1251_to_koi8_r</literal></entry>
24612473
<entry><literal>WIN1251</literal></entry>
2462-
<entry><literal>KOI8</literal></entry>
2474+
<entry><literal>KOI8R</literal></entry>
24632475
</row>
24642476

24652477
<row>
@@ -2501,7 +2513,7 @@
25012513
<row>
25022514
<entry><literal>windows_866_to_koi8_r</literal></entry>
25032515
<entry><literal>WIN866</literal></entry>
2504-
<entry><literal>KOI8</literal></entry>
2516+
<entry><literal>KOI8R</literal></entry>
25052517
</row>
25062518

25072519
<row>

0 commit comments

Comments
 (0)