summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorTom Lane2018-09-01 20:02:47 +0000
committerTom Lane2018-09-01 20:02:47 +0000
commit25fb6ba11575515d754477492a5ff83ef0c126c4 (patch)
tree57f7ca327aff93849bfac68987a219e0165be613 /doc/src
parent826980424538cb149670f9c89eedf34387ff674f (diff)
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
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/charset.sgml15
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index f8c7ac3b169..15d17c4988c 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1136,6 +1136,13 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
+ <entry><literal>EUC_JIS_2004</literal></entry>
+ <entry><emphasis>EUC_JIS_2004</emphasis>,
+ <literal>SHIFT_JIS_2004</literal>,
+ <literal>UTF8</literal>
+ </entry>
+ </row>
+ <row>
<entry><literal>EUC_KR</literal></entry>
<entry><emphasis>EUC_KR</emphasis>,
<literal>MULE_INTERNAL</literal>,
@@ -1190,8 +1197,7 @@ $ <userinput>psql -l</userinput>
</row>
<row>
<entry><literal>JOHAB</literal></entry>
- <entry><emphasis>JOHAB</emphasis>,
- <literal>UTF8</literal>
+ <entry><emphasis>not supported as a server encoding</emphasis>
</entry>
</row>
<row>
@@ -1298,6 +1304,11 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
+ <entry><literal>SHIFT_JIS_2004</literal></entry>
+ <entry><emphasis>not supported as a server encoding</emphasis>
+ </entry>
+ </row>
+ <row>
<entry><literal>SQL_ASCII</literal></entry>
<entry><emphasis>any (no conversion will be performed)</emphasis>
</entry>