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

Commit 25fb6ba

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 8269804 commit 25fb6ba

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

doc/src/sgml/charset.sgml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,13 @@ $ <userinput>psql -l</userinput>
11351135
<literal>UTF8</literal>
11361136
</entry>
11371137
</row>
1138+
<row>
1139+
<entry><literal>EUC_JIS_2004</literal></entry>
1140+
<entry><emphasis>EUC_JIS_2004</emphasis>,
1141+
<literal>SHIFT_JIS_2004</literal>,
1142+
<literal>UTF8</literal>
1143+
</entry>
1144+
</row>
11381145
<row>
11391146
<entry><literal>EUC_KR</literal></entry>
11401147
<entry><emphasis>EUC_KR</emphasis>,
@@ -1190,8 +1197,7 @@ $ <userinput>psql -l</userinput>
11901197
</row>
11911198
<row>
11921199
<entry><literal>JOHAB</literal></entry>
1193-
<entry><emphasis>JOHAB</emphasis>,
1194-
<literal>UTF8</literal>
1200+
<entry><emphasis>not supported as a server encoding</emphasis>
11951201
</entry>
11961202
</row>
11971203
<row>
@@ -1297,6 +1303,11 @@ $ <userinput>psql -l</userinput>
12971303
<entry><emphasis>not supported as a server encoding</emphasis>
12981304
</entry>
12991305
</row>
1306+
<row>
1307+
<entry><literal>SHIFT_JIS_2004</literal></entry>
1308+
<entry><emphasis>not supported as a server encoding</emphasis>
1309+
</entry>
1310+
</row>
13001311
<row>
13011312
<entry><literal>SQL_ASCII</literal></entry>
13021313
<entry><emphasis>any (no conversion will be performed)</emphasis>

0 commit comments

Comments
 (0)