diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/func.sgml | 27 | ||||
| -rw-r--r-- | doc/src/sgml/ref/create_conversion.sgml | 6 |
2 files changed, 9 insertions, 24 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 5b5f961426b..ca9c5355293 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.397 2007/09/19 03:13:57 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.398 2007/09/24 01:29:27 adunstan Exp $ --> <chapter id="functions"> <title>Functions and Operators</title> @@ -1023,9 +1023,6 @@ <primary>char_length</primary> </indexterm> <indexterm> - <primary>convert</primary> - </indexterm> - <indexterm> <primary>lower</primary> </indexterm> <indexterm> @@ -1120,22 +1117,6 @@ </row> <row> - <entry><literal><function>convert</function>(<parameter>string</parameter> - using <parameter>conversion_name</parameter>)</literal></entry> - <entry><type>bytea</type></entry> - <entry> - Change encoding using specified conversion name. Conversions - can be defined by <command>CREATE CONVERSION</command>. Also - there are some pre-defined conversion names. See <xref - linkend="conversion-names"> for available conversion - names. The <parameter>string</parameter> must be valid in the - source encoding. - </entry> - <entry><literal>convert('PostgreSQL' using iso_8859_1_to_utf8)</literal></entry> - <entry><literal>'PostgreSQL'</literal> in UTF8 (Unicode, 8-bit) encoding</entry> - </row> - - <row> <entry><literal><function>lower</function>(<parameter>string</parameter>)</literal></entry> <entry><type>text</type></entry> <entry>Convert string to lower case</entry> @@ -1246,6 +1227,9 @@ <primary>chr</primary> </indexterm> <indexterm> + <primary>convert</primary> + </indexterm> + <indexterm> <primary>convert_from</primary> </indexterm> <indexterm> @@ -1374,6 +1358,9 @@ original encoding is specified by <parameter>src_encoding</parameter>. The <parameter>string</parameter> must be valid in this encoding. + Conversions can be defined by <command>CREATE CONVERSION</command>. + Also there are some pre-defined conversions. See <xref + linkend="conversion-names"> for available conversions. </entry> <entry><literal>convert( 'text_in_utf8', 'UTF8', 'LATIN1')</literal></entry> <entry><literal>text_in_utf8</literal> represented in ISO 8859-1 encoding</entry> diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml index 8454abbd21b..b606f44d3e4 100644 --- a/doc/src/sgml/ref/create_conversion.sgml +++ b/doc/src/sgml/ref/create_conversion.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.19 2007/01/31 23:26:03 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.20 2007/09/24 01:29:28 adunstan Exp $ --> <refentry id="SQL-CREATECONVERSION"> <refmeta> @@ -27,9 +27,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable> <para> <command>CREATE CONVERSION</command> defines a new conversion between - character set encodings. Conversion names can be used in the - <function>convert</function> function - to specify a particular encoding conversion. Also, conversions that + character set encodings. Also, conversions that are marked <literal>DEFAULT</> can be used for automatic encoding conversion between client and server. For this purpose, two conversions, from encoding A to |