aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-03-14 18:31:25 +0000
committerBruce Momjian <bruce@momjian.us>2005-03-14 18:31:25 +0000
commite7fb9f18bfe545070f7b1761b2ff7779c19f331f (patch)
tree6d8ae9c0aa3b19cc3ac31119172a2e93f59dfa6c /doc/src
parent2b0bb797ec259acc01dbadb3450e566cc479e2d5 (diff)
downloadpostgresql-e7fb9f18bfe545070f7b1761b2ff7779c19f331f.tar.gz
postgresql-e7fb9f18bfe545070f7b1761b2ff7779c19f331f.zip
Add support for Win1252 encoding.
Roland Volkmann
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/charset.sgml25
-rw-r--r--doc/src/sgml/func.sgml14
2 files changed, 32 insertions, 7 deletions
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 9832f948b4a..9bfd78e9111 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.68 2005/03/14 06:49:48 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.69 2005/03/14 18:31:19 momjian Exp $ -->
<chapter id="charset">
<title>Localization</>
@@ -537,6 +537,13 @@ initdb --locale=sv_SE
<row>
<entry><literal>WIN1251</literal></entry>
<entry>Windows CP1251</entry>
+ <entry>Western European</entry>
+ <entry>1</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><literal>WIN1252</literal></entry>
+ <entry>Windows CP1252</entry>
<entry>Cyrillic</entry>
<entry>1</entry>
<entry><literal>WIN</></entry>
@@ -676,7 +683,7 @@ $ <userinput>psql -l</userinput>
<tbody>
<row>
<entry><literal>BIG5</literal></entry>
- <entry><emphasis>not available as a server encoding</emphasis>
+ <entry><emphasis>not supported as a server encoding</emphasis>
</entry>
</row>
<row>
@@ -711,12 +718,12 @@ $ <userinput>psql -l</userinput>
</row>
<row>
<entry><literal>GB18030</literal></entry>
- <entry><emphasis>not available as a server encoding</emphasis>
+ <entry><emphasis>not supported as a server encoding</emphasis>
</entry>
</row>
<row>
<entry><literal>GBK</literal></entry>
- <entry><emphasis>not available as a server encoding</emphasis>
+ <entry><emphasis>not supported as a server encoding</emphasis>
</entry>
</row>
<row>
@@ -847,7 +854,7 @@ $ <userinput>psql -l</userinput>
</row>
<row>
<entry><literal>SJIS</literal></entry>
- <entry><emphasis>not available as a server encoding</emphasis>
+ <entry><emphasis>not supported as a server encoding</emphasis>
</entry>
</row>
<row>
@@ -859,7 +866,7 @@ $ <userinput>psql -l</userinput>
</row>
<row>
<entry><literal>UHC</literal></entry>
- <entry><emphasis>not available as a server encoding</emphasis>
+ <entry><emphasis>not supported as a server encoding</emphasis>
</entry>
</row>
<row>
@@ -902,6 +909,12 @@ $ <userinput>psql -l</userinput>
</entry>
</row>
<row>
+ <entry><literal>WIN1252</literal></entry>
+ <entry><emphasis>WIN1252</emphasis>,
+ <literal>UTF8</literal>
+ </entry>
+ </row>
+ <row>
<entry><literal>WIN1256</literal></entry>
<entry><emphasis>WIN1256</emphasis>,
<literal>UTF8</literal>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 7da2e8ad4a0..c96ef83b165 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
<!--
-$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.240 2005/03/07 04:30:49 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.241 2005/03/14 18:31:19 momjian Exp $
PostgreSQL documentation
-->
@@ -1991,6 +1991,12 @@ PostgreSQL documentation
</row>
<row>
+ <entry><literal>utf8_to_windows_1252</literal></entry>
+ <entry><literal>UTF8</literal></entry>
+ <entry><literal>WIN1252</literal></entry>
+ </row>
+
+ <row>
<entry><literal>utf8_to_windows_1256</literal></entry>
<entry><literal>UTF8</literal></entry>
<entry><literal>WIN1256</literal></entry>
@@ -2057,6 +2063,12 @@ PostgreSQL documentation
</row>
<row>
+ <entry><literal>windows_1252_to_utf8</literal></entry>
+ <entry><literal>WIN1252</literal></entry>
+ <entry><literal>UTF8</literal></entry>
+ </row>
+
+ <row>
<entry><literal>windows_1256_to_utf8</literal></entry>
<entry><literal>WIN1256</literal></entry>
<entry><literal>UTF8</literal></entry>