Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4299c32

Browse files
committed
Doc: fix oversights in "Client/Server Character Set Conversions" table.
This table claimed that JOHAB could be used as a server encoding, which was true originally but hasn't been true since 8.3. It also lacked entries for EUC_JIS_2004 and SHIFT_JIS_2004. JOHAB problem noted by Lars Kanis, the others by me. Discussion: https://postgr.es/m/c0f514a1-b7a9-b9ea-1c02-c34aead56c06@greiz-reinsdorf.de
1 parent 44cac93 commit 4299c32

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

doc/src/sgml/charset.sgml

+13-2
Original file line numberDiff line numberDiff line change
@@ -1483,6 +1483,13 @@ $ <userinput>psql -l</userinput>
14831483
<literal>UTF8</literal>
14841484
</entry>
14851485
</row>
1486+
<row>
1487+
<entry><literal>EUC_JIS_2004</literal></entry>
1488+
<entry><emphasis>EUC_JIS_2004</emphasis>,
1489+
<literal>SHIFT_JIS_2004</literal>,
1490+
<literal>UTF8</literal>
1491+
</entry>
1492+
</row>
14861493
<row>
14871494
<entry><literal>EUC_KR</literal></entry>
14881495
<entry><emphasis>EUC_KR</emphasis>,
@@ -1538,8 +1545,7 @@ $ <userinput>psql -l</userinput>
15381545
</row>
15391546
<row>
15401547
<entry><literal>JOHAB</literal></entry>
1541-
<entry><emphasis>JOHAB</emphasis>,
1542-
<literal>UTF8</literal>
1548+
<entry><emphasis>not supported as a server encoding</emphasis>
15431549
</entry>
15441550
</row>
15451551
<row>
@@ -1645,6 +1651,11 @@ $ <userinput>psql -l</userinput>
16451651
<entry><emphasis>not supported as a server encoding</emphasis>
16461652
</entry>
16471653
</row>
1654+
<row>
1655+
<entry><literal>SHIFT_JIS_2004</literal></entry>
1656+
<entry><emphasis>not supported as a server encoding</emphasis>
1657+
</entry>
1658+
</row>
16481659
<row>
16491660
<entry><literal>SQL_ASCII</literal></entry>
16501661
<entry><emphasis>any (no conversion will be performed)</emphasis>

0 commit comments

Comments
 (0)