Make function param_name/type documentation more consistent.

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 1c6738b..a9d1a3b 100644 (file)
--- 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.316 2006/04/30 21:15:32 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.317 2006/05/18 00:50:08 momjian Exp $ -->
 
  <chapter id="functions">
   <title>Functions and Operators</title>
@@ -1244,7 +1244,7 @@
 
      <tbody>
       <row>
-       <entry><literal><function>ascii</function>(<type>text</type>)</literal></entry>
+       <entry><literal><function>ascii</function>(<type>string</type>)</literal></entry>
        <entry><type>int</type></entry>
        <entry><acronym>ASCII</acronym> code of the first byte of the argument</entry>
        <entry><literal>ascii('x')</literal></entry>
@@ -1274,8 +1274,7 @@
 
       <row>
        <entry>
-        <literal><function>convert</function>(<parameter>string</parameter>
-        <type>text</type>,
+        <literal><function>convert</function>(<parameter>string</parameter> <type>text</type>,
         <optional><parameter>src_encoding</parameter> <type>name</type>,</optional>
         <parameter>dest_encoding</parameter> <type>name</type>)</literal>
        </entry>
@@ -1320,7 +1319,7 @@
       </row>       
 
       <row>
-       <entry><literal><function>initcap</function>(<type>text</type>)</literal></entry>
+       <entry><literal><function>initcap</function>(<type>string</type>)</literal></entry>
        <entry><type>text</type></entry>
        <entry>
         Convert the first letter of each word to uppercase and the
@@ -1332,7 +1331,7 @@
       </row>
 
       <row>
-       <entry><literal><function>length</function>(<parameter>string</parameter> <type>text</type>)</literal></entry>
+       <entry><literal><function>length</function>(<parameter>string</parameter>)</literal></entry>
        <entry><type>int</type></entry>
        <entry>
         Number of characters in <parameter>string</parameter>
@@ -1375,7 +1374,7 @@
       </row>
 
       <row>
-       <entry><literal><function>md5</function>(<parameter>string</parameter> <type>text</type>)</literal></entry>
+       <entry><literal><function>md5</function>(<parameter>string</parameter>)</literal></entry>
        <entry><type>text</type></entry>
        <entry>
         Calculates the MD5 hash of <parameter>string</parameter>,
@@ -1396,7 +1395,7 @@
       </row>
 
       <row>
-       <entry><literal><function>quote_ident</function>(<parameter>string</parameter> text)</literal></entry>
+       <entry><literal><function>quote_ident</function>(<parameter>string</parameter>)</literal></entry>
        <entry><type>text</type></entry>
        <entry>
         Return the given string suitably quoted to be used as an identifier
@@ -1410,7 +1409,7 @@
       </row>
 
       <row>
-       <entry><literal><function>quote_literal</function>(<parameter>string</parameter> text)</literal></entry>
+       <entry><literal><function>quote_literal</function>(<parameter>string</parameter>)</literal></entry>
        <entry><type>text</type></entry>
        <entry>
         Return the given string suitably quoted to be used as a string literal
@@ -1511,12 +1510,12 @@
       </row>
 
       <row>
-       <entry><literal><function>to_ascii</function>(<type>text</type>
-        <optional>, <parameter>encoding</parameter></optional>)</literal></entry>
+       <entry><literal><function>to_ascii</function>(<parameter>string</parameter> <type>text</type>
+        <optional>, <parameter>encoding</parameter> <type>text</type></optional>)</literal></entry>
        <entry><type>text</type></entry>
 
        <entry>
-       Convert <parameter>text</parameter> to <acronym>ASCII</acronym> from another encoding
+       Convert <parameter>string</parameter> to <acronym>ASCII</acronym> from another encoding
        <footnote>
         <para>
          The <function>to_ascii</function> function supports conversion from
@@ -1543,8 +1542,7 @@
 
       <row>
        <entry>
-        <literal><function>translate</function>(<parameter>string</parameter>
-        <type>text</type>,
+        <literal><function>translate</function>(<parameter>string</parameter> <type>text</type>,
         <parameter>from</parameter> <type>text</type>,
         <parameter>to</parameter> <type>text</type>)</literal>
        </entry>