List:Commits« Previous MessageNext Message »
From:paul Date:January 20 2006 4:33am
Subject:svn commit - mysqldoc@docsrva: r944 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-01-20 05:33:42 +0100 (Fri, 20 Jan 2006)
New Revision: 944

Log:
 r6472@frost:  paul | 2006-01-19 22:32:24 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/functions.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-common/fixedchars.ent


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6471
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2335
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6472
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2335

Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml	2006-01-20 04:33:02 UTC (rev 943)
+++ trunk/refman-4.1/functions.xml	2006-01-20 04:33:42 UTC (rev 944)
@@ -350,7 +350,7 @@
         (<literal>TRUE</literal>), <literal>0</literal>
         (<literal>FALSE</literal>), or <literal>NULL</literal>. However,
         the value they return is based on comparison operations
-        performed as described by the rules in
+        performed according to the rules described in
         <xref linkend="type-conversion"/>.
       </para>
 
@@ -788,10 +788,11 @@
             <replaceable>expr</replaceable> &lt;=
             <replaceable>max</replaceable>)</literal> if all the
             arguments are of the same type. Otherwise type conversion
-            takes place according to the rules described at the
-            beginning of this section, but applied to all the three
-            arguments. <emphasis role="bold">Note</emphasis>: Before
-            MySQL 4.0.5, arguments were converted to the type of
+            takes place according to the rules described in
+            <xref
+linkend="type-conversion"/>, but applied to all the
+            three arguments. <emphasis role="bold">Note</emphasis>:
+            Before MySQL 4.0.5, arguments were converted to the type of
             <replaceable>expr</replaceable> instead.
           </para>
 
@@ -961,8 +962,8 @@
             <literal>IN</literal> is very quick if the
             <literal>IN</literal> value list consists entirely of
             constants. Otherwise, type conversion takes place according
-            to the rules described at the beginning of this section, but
-            applied to all the arguments.
+            to the rules described in <xref linkend="type-conversion"/>,
+            but applied to all the arguments.
           </para>
 
           <remark role="help-description-end"/>
@@ -1061,8 +1062,11 @@
 </programlisting>
 
           <para>
-            A comparison of <literal>NULL</literal> values using
-            <literal>=</literal> is always false.
+            <literal>ISNULL()</literal> can be used instead of
+            <literal>=</literal> to test whether a value is
+            <literal>NULL</literal>. (Comparing a value to
+            <literal>NULL</literal> using <literal>=</literal> always
+            yields false.)
           </para>
 
           <para>
@@ -1478,10 +1482,6 @@
 
       </itemizedlist>
 
-      <para>
-        See also <xref linkend="operator-precedence"/>.
-      </para>
-
     </section>
 
   </section>
@@ -1518,9 +1518,9 @@
           </indexterm>
 
           <literal>CASE <replaceable>value</replaceable> WHEN
-          [<replaceable>compare-value</replaceable>] THEN
+          [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
-          [<replaceable>compare-value</replaceable>] THEN
+          [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
@@ -1540,7 +1540,7 @@
         <para>
           The first version returns the
           <replaceable>result</replaceable> where
-          <literal><replaceable>value</replaceable>=<replaceable>compare-value</replaceable></literal>.
+          <literal><replaceable>value</replaceable>=<replaceable>compare_value</replaceable></literal>.
           The second version returns the result for the first condition
           that is true. If there was no matching result value, the
           result after <literal>ELSE</literal> is returned, or
@@ -1607,7 +1607,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          If <replaceable>expr1</replaceable> is TRUE
+          If <replaceable>expr1</replaceable> is <literal>TRUE</literal>
           (<literal><replaceable>expr1</replaceable> &lt;&gt;
           0</literal> and <literal><replaceable>expr1</replaceable>
           &lt;&gt; NULL</literal>) then <literal>IF()</literal> returns
@@ -1762,7 +1762,13 @@
         </para>
 
 <programlisting>
-CREATE TABLE tmp SELECT IFNULL(1,'test') AS test;
+mysql&gt; <userinput>CREATE TABLE tmp SELECT IFNULL(1,'test') AS test;</userinput>
+mysql&gt; <userinput>DESCRIBE tmp;</userinput>
++-------+---------+------+-----+---------+-------+
+| Field | Type    | Null | Key | Default | Extra |
++-------+---------+------+-----+---------+-------+
+| test  | char(4) |      |     |         |       |
++-------+---------+------+-----+---------+-------+
 </programlisting>
 
         <para>
@@ -1811,8 +1817,8 @@
 </programlisting>
 
         <para>
-          Note that MySQL evaluates <literal>expr1</literal> twice if
-          the arguments are not equal.
+          Note that MySQL evaluates <replaceable>expr1</replaceable>
+          twice if the arguments are not equal.
         </para>
 
         <para>
@@ -2105,11 +2111,12 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Compresses a string. This function requires MySQL to have been
-          compiled with a compression library such as
-          <literal>zlib</literal>. Otherwise, the return value is always
-          <literal>NULL</literal>. The compressed string can be
-          uncompressed with <literal>UNCOMPRESS()</literal>.
+          Compresses a string and returns the result as a binary string.
+          This function requires MySQL to have been compiled with a
+          compression library such as <literal>zlib</literal>.
+          Otherwise, the return value is always <literal>NULL</literal>.
+          The compressed string can be uncompressed with
+          <literal>UNCOMPRESS()</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2180,17 +2187,23 @@
 
         <para>
           Returns the string that results from concatenating the
-          arguments. Returns <literal>NULL</literal> if any argument is
-          <literal>NULL</literal>. May have one or more arguments. If
-          all arguments are non-binary strings, the result is a
-          non-binary string. If the arguments include any binary
-          strings, the result is a binary string. A numeric argument is
-          converted to its equivalent binary string form; if you want to
-          avoid that you can use explicit type cast, like in this
-          example: <literal>SELECT CONCAT(CAST(int_col AS CHAR),
-          char_col)</literal>
+          arguments. May have one or more arguments. If all arguments
+          are non-binary strings, the result is a non-binary string. If
+          the arguments include any binary strings, the result is a
+          binary string. A numeric argument is converted to its
+          equivalent binary string form; if you want to avoid that, you
+          can use an explicit type cast, as in this example:
         </para>
 
+<programlisting>
+SELECT CONCAT(CAST(<replaceable>int_col</replaceable> AS CHAR), <replaceable>char_col</replaceable>);
+</programlisting>
+
+        <para>
+          <literal>CONCAT()</literal> returns <literal>NULL</literal> if
+          any argument is <literal>NULL</literal>.
+        </para>
+
         <remark role="help-description-end"/>
 
         <remark role="help-example"/>
@@ -2223,15 +2236,14 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>CONCAT_WS()</literal> stands for CONCAT With
+          <literal>CONCAT_WS()</literal> stands for Concatenate With
           Separator and is a special form of
           <literal>CONCAT()</literal>. The first argument is the
           separator for the rest of the arguments. The separator is
           added between the strings to be concatenated. The separator
-          can be a string as can the rest of the arguments. If the
+          can be a string, as can the rest of the arguments. If the
           separator is <literal>NULL</literal>, the result is
-          <literal>NULL</literal>. The function skips any
-          <literal>NULL</literal> values after the separator argument.
+          <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2246,6 +2258,8 @@
 </programlisting>
 
         <para>
+          <literal>CONCAT_WS()</literal> skips any
+          <literal>NULL</literal> values after the separator argument.
           Before MySQL 4.0.14, <literal>CONCAT_WS()</literal> skips
           empty strings as well as <literal>NULL</literal> values.
         </para>
@@ -2361,9 +2375,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns a string in which for every bit set in the value
+          Returns a string such that for every bit set in the value
           <replaceable>bits</replaceable>, you get an
-          <replaceable>on</replaceable> string and for every reset bit
+          <replaceable>on</replaceable> string and for every reset bit,
           you get an <replaceable>off</replaceable> string. Bits in
           <replaceable>bits</replaceable> are examined from right to
           left (from low-order to high-order bits). Strings are added to
@@ -2404,8 +2418,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns the index of <replaceable>str</replaceable> in the
-          <replaceable>str1</replaceable>,
+          Returns the index (position) of <replaceable>str</replaceable>
+          in the <replaceable>str1</replaceable>,
           <replaceable>str2</replaceable>,
           <replaceable>str3</replaceable>, <literal>...</literal> list.
           Returns <literal>0</literal> if <replaceable>str</replaceable>
@@ -2488,23 +2502,43 @@
       </listitem>
 
       <listitem>
-        <remark role="note">
-          Do not add help-table markup to this FORMAT entry. The entry
-          that has such markup is in the miscellaneous functions
-          section.
-        </remark>
+        <remark role="help-topic" condition="FORMAT"/>
 
+        <remark role="help-syntax-begin"/>
+
         <para>
+          <indexterm type="function">
+            <primary>FORMAT()</primary>
+          </indexterm>
+
           <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
         </para>
 
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
         <para>
           Formats the number <replaceable>X</replaceable> to a format
           like <literal>'#,###,###.##'</literal>, rounded to
-          <replaceable>D</replaceable> decimals, and returns the result
-          as a string. See For details, see
-          <xref linkend="miscellaneous-functions"/>.
+          <replaceable>D</replaceable> decimal places, and returns the
+          result as a string. If <replaceable>D</replaceable> is
+          <literal>0</literal>, the result has no decimal point or
+          fractional part.
         </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SELECT FORMAT(12332.123456, 4);</userinput>
+        -&gt; '12,332.1235'
+mysql&gt; <userinput>SELECT FORMAT(12332.1,4);</userinput>
+        -&gt; '12,332.1000'
+mysql&gt; <userinput>SELECT FORMAT(12332.2,0);</userinput>
+        -&gt; '12,332'
+</programlisting>
       </listitem>
 
       <listitem>
@@ -2525,7 +2559,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          If <replaceable>N_OR_S</replaceable> is a number, returns a
+          If <replaceable>N_or_S</replaceable> is a number, returns a
           string representation of the hexadecimal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
@@ -2534,10 +2568,10 @@
         </para>
 
         <para>
-          From MySQL 4.0.1 and up, if <replaceable>N_OR_S</replaceable>
+          From MySQL 4.0.1 and up, if <replaceable>N_or_S</replaceable>
           is a string, returns a hexadecimal string representation of
-          <replaceable>N_OR_S</replaceable> where each character in
-          <replaceable>N_OR_S</replaceable> is converted to two
+          <replaceable>N_or_S</replaceable> where each character in
+          <replaceable>N_or_S</replaceable> is converted to two
           hexadecimal digits.
         </para>
 
@@ -2582,7 +2616,7 @@
           string from position <replaceable>pos</replaceable> is
           <replaceable>len</replaceable> is not within the length of the
           rest of the string. Returns <literal>NULL</literal> if any
-          argument is null.
+          argument is <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2762,11 +2796,11 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Reads the file and returns the file contents as a string. The
-          file must be located on the server, you must specify the full
-          pathname to the file, and you must have the
-          <literal>FILE</literal> privilege. The file must be readable
-          by all and its size less than
+          Reads the file and returns the file contents as a string. To
+          use this function, the file must be located on the server
+          host, you must specify the full pathname to the file, and you
+          must have the <literal>FILE</literal> privilege. The file must
+          be readable by all and its size less than
           <literal>max_allowed_packet</literal> bytes.
         </para>
 
@@ -2781,9 +2815,9 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE <replaceable>tbl_name</replaceable></userinput>
-           SET <replaceable>blob_column</replaceable>=LOAD_FILE('/tmp/picture')
-           WHERE id=1;
+mysql&gt; <userinput>UPDATE t</userinput>
+          <userinput>  SET blob_col=LOAD_FILE('/tmp/picture')</userinput>
+          <userinput>  WHERE id=1;</userinput>
 </programlisting>
 
         <para>
@@ -2835,7 +2869,7 @@
         -&gt; 4
 mysql&gt; <userinput>SELECT LOCATE('xbar', 'foobar');</userinput>
         -&gt; 0
-mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar',5);</userinput>
+mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar', 5);</userinput>
         -&gt; 7
 </programlisting>
 
@@ -3051,10 +3085,10 @@
           Returns a string representation of the octal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
-          (<literal>BIGINT</literal>)number. This is equivalent to
-          <literal>CONV(N,10,8)</literal>. Returns
-          <literal>NULL</literal> if <replaceable>N</replaceable> is
-          <literal>NULL</literal>.
+          (<literal>BIGINT</literal>) number. This is equivalent to
+          <literal>CONV(<replaceable>N</replaceable>,10,8)</literal>.
+          Returns <literal>NULL</literal> if
+          <replaceable>N</replaceable> is <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -3185,12 +3219,12 @@
         <para>
           Quotes a string to produce a result that can be used as a
           properly escaped data value in an SQL statement. The string is
-          returned surrounded by single quotes and with each instance of
+          returned enclosed by single quotes and with each instance of
           single quote (&lsquo;<literal>'</literal>&rsquo;), backslash
           (&lsquo;<literal>\</literal>&rsquo;), ASCII
           <literal>NUL</literal>, and Control-Z preceded by a backslash.
           If the argument is <literal>NULL</literal>, the return value
-          is the word <quote>NULL</quote> without surrounding single
+          is the word <quote>NULL</quote> without enclosing single
           quotes. The <literal>QUOTE()</literal> function was added in
           MySQL 4.0.3.
         </para>
@@ -3228,8 +3262,8 @@
           Returns a string consisting of the string
           <replaceable>str</replaceable> repeated
           <replaceable>count</replaceable> times. If
-          <literal><replaceable>count</replaceable> &lt;= 0</literal>,
-          returns an empty string. Returns <literal>NULL</literal> if
+          <replaceable>count</replaceable> is less than 1, returns an
+          empty string. Returns <literal>NULL</literal> if
           <replaceable>str</replaceable> or
           <replaceable>count</replaceable> are <literal>NULL</literal>.
         </para>
@@ -3479,8 +3513,8 @@
           implements the original Soundex algorithm, not the more
           popular enhanced version (also described by D. Knuth). The
           difference is that original version discards vowels first and
-          then duplicates, whereas the enhanced version discards
-          duplicates first and then vowels.
+          duplicates second, whereas the enhanced version discards
+          duplicates first and vowels second.
         </para>
       </listitem>
 
@@ -3616,9 +3650,8 @@
         </para>
 
         <para>
-          Note that if you use a value less than 1 for
-          <replaceable>len</replaceable>, the result is always an empty
-          string.
+          If <replaceable>len</replaceable> is less than 1, the result
+          is the empty string.
         </para>
 
         <para>
@@ -3814,7 +3847,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns the length of a compressed string before compression.
+          Returns the length that the compressed string had before being
+          compressed.
         </para>
 
         <remark role="help-description-end"/>
@@ -3850,7 +3884,7 @@
         </para>
 
         <para>
-          Performs the opposite operation from
+          Performs the inverse operation of
           <literal>HEX(<replaceable>str</replaceable>)</literal>. That
           is, it interprets each pair of hexadecimal digits in the
           argument as a number and converts it to the character
@@ -3974,7 +4008,7 @@
 
             <literal><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -4000,8 +4034,8 @@
 
           <para>
             Per the SQL standard, <literal>LIKE</literal> performs
-            matching on a per-character basis, thus it can have
-            different results than the <literal>=</literal> comparison
+            matching on a per-character basis, thus it can produce
+            results different from the <literal>=</literal> comparison
             operator:
           </para>
 
@@ -4057,8 +4091,8 @@
 
           <para>
             To test for literal instances of a wildcard character,
-            precede the character with the escape character. If you do
-            not specify the <literal>ESCAPE</literal> character,
+            precede it by the escape character. If you do not specify
+            the <literal>ESCAPE</literal> character,
             &lsquo;<literal>\</literal>&rsquo; is assumed.
           </para>
 
@@ -4153,7 +4187,7 @@
 
             <literal><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -4164,7 +4198,7 @@
             This is the same as <literal>NOT
             (<replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>'])</literal>.
+            '<replaceable>escape_char</replaceable>'])</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -4485,7 +4519,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Unary minus. Changes the sign of the argument.
+            Unary minus. This operator changes the sign of the argument.
           </para>
 
           <remark role="help-description-end"/>
@@ -4502,8 +4536,7 @@
             used with a <literal>BIGINT</literal>, the return value is
             also a <literal>BIGINT</literal>. This means that you should
             avoid using <literal>&minus;</literal> on integers that may
-            have the value of
-            <literal>&minus;2<superscript>63</superscript></literal>.
+            have the value of &minus;2<superscript>63</superscript>.
           </para>
         </listitem>
 
@@ -4625,8 +4658,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Integer division. Similar to <literal>FLOOR()</literal> but
-            safe with <literal>BIGINT</literal> values.
+            Integer division. Similar to <literal>FLOOR()</literal>, but
+            is safe with <literal>BIGINT</literal> values.
           </para>
 
           <remark role="help-description-end"/>
@@ -5061,7 +5094,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the value of <literal>e</literal> (the base of
+            Returns the value of <emphasis>e</emphasis> (the base of
             natural logarithms) raised to the power of
             <replaceable>X</replaceable>.
           </para>
@@ -5120,8 +5153,7 @@
         <listitem>
           <remark role="note">
             Do not add help-table markup to this FORMAT entry. The entry
-            that has such markup is in the miscellaneous functions
-            section.
+            that has such markup is in the string functions section.
           </remark>
 
           <para>
@@ -5131,9 +5163,9 @@
           <para>
             Formats the number <replaceable>X</replaceable> to a format
             like <literal>'#,###,###.##'</literal>, rounded to
-            <replaceable>D</replaceable> decimals, and returns the
-            result as a string. See For details, see
-            <xref linkend="miscellaneous-functions"/>.
+            <replaceable>D</replaceable> decimal places, and returns the
+            result as a string. For details, see
+            <xref linkend="string-functions"/>.
           </para>
         </listitem>
 
@@ -5156,9 +5188,9 @@
 
           <para>
             Returns the natural logarithm of
-            <replaceable>X</replaceable>, that is, the logarithm of
-            <replaceable>X</replaceable> to the base
-            <literal>e</literal>.
+            <replaceable>X</replaceable>, that is, the
+            base-<emphasis>e</emphasis> logarithm of
+            <replaceable>X</replaceable>.
           </para>
 
           <remark role="help-description-end"/>
@@ -5382,8 +5414,8 @@
 
           <para>
             As of MySQL 4.1.7, <literal>MOD()</literal> works on values
-            with a fractional part and returns the exact remainder after
-            division:
+            that have a fractional part and returns the exact remainder
+            after division:
           </para>
 
 <programlisting>
@@ -5422,8 +5454,8 @@
 
           <para>
             Returns the value of &pi; (pi). The default number of
-            decimals displayed is five, but MySQL internally uses the
-            full double-precision value.
+            decimal places displayed is five, but MySQL uses the full
+            double-precision value internally.
           </para>
 
           <remark role="help-description-end"/>
@@ -5596,8 +5628,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT * FROM table1, table2 WHERE a=b AND c&lt;d</userinput>
-    -&gt; <userinput>ORDER BY RAND() LIMIT 1000;</userinput>
+mysql&gt; <userinput>SELECT * FROM table1, table2 WHERE a=b AND c&lt;d</userinput> -&gt; <userinput>ORDER BY RAND() LIMIT 1000;</userinput>
 </programlisting>
 
           <para>
@@ -5636,10 +5667,11 @@
             Returns the argument <replaceable>X</replaceable>, rounded
             to the nearest integer. With two arguments, returns
             <replaceable>X</replaceable> rounded to
-            <replaceable>D</replaceable> decimals.
-            <replaceable>D</replaceable> can be negative in order to
-            round <replaceable>D</replaceable> digits left of the
-            decimal point of the value <replaceable>X</replaceable>.
+            <replaceable>D</replaceable> decimal places.
+            <replaceable>D</replaceable> can be negative to cause
+            <replaceable>D</replaceable> digits left of the decimal
+            point of the value <replaceable>X</replaceable> to become
+            zero.
           </para>
 
           <remark role="help-description-end"/>
@@ -5665,7 +5697,7 @@
             The return type is the same type as that of the first
             argument (assuming that it is integer, double, or decimal).
             This means that for an integer argument, the result is an
-            integer (no decimals).
+            integer (no decimal places).
           </para>
 
           <para>
@@ -5841,13 +5873,13 @@
 
           <para>
             Returns the number <replaceable>X</replaceable>, truncated
-            to <replaceable>D</replaceable> decimals. If
+            to <replaceable>D</replaceable> decimal places. If
             <replaceable>D</replaceable> is <literal>0</literal>, the
             result has no decimal point or fractional part.
-            <replaceable>D</replaceable> can be negative in order to
-            truncate (make zero) <replaceable>D</replaceable> digits
-            left of the decimal point of the value
-            <replaceable>X</replaceable>.
+            <replaceable>D</replaceable> can be negative to cause
+            <replaceable>D</replaceable> digits left of the decimal
+            point of the value <replaceable>X</replaceable> to become
+            zero.
           </para>
 
           <remark role="help-description-end"/>
@@ -13200,43 +13232,22 @@
         </listitem>
 
         <listitem>
-          <remark role="help-topic" condition="FORMAT"/>
+          <remark role="note">
+            Do not add help-table markup to this FORMAT entry. The entry
+            that has such markup is in the string functions section.
+          </remark>
 
-          <remark role="help-syntax-begin"/>
-
           <para>
-            <indexterm type="function">
-              <primary>FORMAT()</primary>
-            </indexterm>
-
             <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
 
-          <remark role="help-syntax-end"/>
-
-          <remark role="help-description-begin"/>
-
           <para>
             Formats the number <replaceable>X</replaceable> to a format
             like <literal>'#,###,###.##'</literal>, rounded to
-            <replaceable>D</replaceable> decimals, and returns the
-            result as a string. If <replaceable>D</replaceable> is
-            <literal>0</literal>, the result has no decimal point or
-            fractional part.
+            <replaceable>D</replaceable> decimal places, and returns the
+            result as a string. For details, see
+            <xref linkend="string-functions"/>.
           </para>
-
-          <remark role="help-description-end"/>
-
-          <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SELECT FORMAT(12332.123456, 4);</userinput>
-        -&gt; '12,332.1235'
-mysql&gt; <userinput>SELECT FORMAT(12332.1,4);</userinput>
-        -&gt; '12,332.1000'
-mysql&gt; <userinput>SELECT FORMAT(12332.2,0);</userinput>
-        -&gt; '12,332'
-</programlisting>
         </listitem>
 
         <listitem>

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-01-20 04:33:02 UTC (rev 943)
+++ trunk/refman-5.0/functions.xml	2006-01-20 04:33:42 UTC (rev 944)
@@ -369,7 +369,7 @@
         (<literal>TRUE</literal>), <literal>0</literal>
         (<literal>FALSE</literal>), or <literal>NULL</literal>. However,
         the value they return is based on comparison operations
-        performed as described by the rules in
+        performed according to the rules described in
         <xref linkend="type-conversion"/>.
       </para>
 
@@ -457,8 +457,8 @@
             operator, but returns <literal>1</literal> rather than
             <literal>NULL</literal> if both operands are
             <literal>NULL</literal>, and <literal>0</literal> rather
-            than <literal>NULL</literal> if one operand
-            is<literal>NULL</literal>.
+            than <literal>NULL</literal> if one operand is
+            <literal>NULL</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -867,9 +867,9 @@
             <replaceable>expr</replaceable> &lt;=
             <replaceable>max</replaceable>)</literal> if all the
             arguments are of the same type. Otherwise type conversion
-            takes place according to the rules described at the
-            beginning of this section, but applied to all the three
-            arguments.
+            takes place according to the rules described in
+            <xref linkend="type-conversion"/>, but applied to all the
+            three arguments.
           </para>
 
           <remark role="help-description-end"/>
@@ -1031,8 +1031,8 @@
             <literal>IN</literal> is very quick if the
             <literal>IN</literal> value list consists entirely of
             constants. Otherwise, type conversion takes place according
-            to the rules described at the beginning of this section, but
-            applied to all the arguments.
+            to the rules described in <xref linkend="type-conversion"/>,
+            but applied to all the arguments.
           </para>
 
           <remark role="help-description-end"/>
@@ -1131,8 +1131,11 @@
 </programlisting>
 
           <para>
-            A comparison of <literal>NULL</literal> values using
-            <literal>=</literal> is always false.
+            <literal>ISNULL()</literal> can be used instead of
+            <literal>=</literal> to test whether a value is
+            <literal>NULL</literal>. (Comparing a value to
+            <literal>NULL</literal> using <literal>=</literal> always
+            yields false.)
           </para>
 
           <para>
@@ -1536,10 +1539,6 @@
 
       </itemizedlist>
 
-      <para>
-        See also <xref linkend="operator-precedence"/>.
-      </para>
-
     </section>
 
   </section>
@@ -1576,9 +1575,9 @@
           </indexterm>
 
           <literal>CASE <replaceable>value</replaceable> WHEN
-          [<replaceable>compare-value</replaceable>] THEN
+          [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
-          [<replaceable>compare-value</replaceable>] THEN
+          [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
@@ -1598,7 +1597,7 @@
         <para>
           The first version returns the
           <replaceable>result</replaceable> where
-          <literal><replaceable>value</replaceable>=<replaceable>compare-value</replaceable></literal>.
+          <literal><replaceable>value</replaceable>=<replaceable>compare_value</replaceable></literal>.
           The second version returns the result for the first condition
           that is true. If there was no matching result value, the
           result after <literal>ELSE</literal> is returned, or
@@ -1636,8 +1635,8 @@
           here differs slightly from that of the SQL
           <literal>CASE</literal> <emphasis>statement</emphasis>
           described in <xref linkend="case-statement"/>, for use inside
-          stored routines. . The <literal>CASE</literal> statement
-          cannot have an <literal>ELSE NULL</literal> clause, and it is
+          stored routines. The <literal>CASE</literal> statement cannot
+          have an <literal>ELSE NULL</literal> clause, and it is
           terminated with <literal>END CASE</literal> instead of
           <literal>END</literal>.
         </para>
@@ -1665,7 +1664,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          If <replaceable>expr1</replaceable> is TRUE
+          If <replaceable>expr1</replaceable> is <literal>TRUE</literal>
           (<literal><replaceable>expr1</replaceable> &lt;&gt;
           0</literal> and <literal><replaceable>expr1</replaceable>
           &lt;&gt; NULL</literal>) then <literal>IF()</literal> returns
@@ -1826,7 +1825,13 @@
         </para>
 
 <programlisting>
-CREATE TABLE tmp SELECT IFNULL(1,'test') AS test;
+mysql&gt; <userinput>CREATE TABLE tmp SELECT IFNULL(1,'test') AS test;</userinput>
+mysql&gt; <userinput>DESCRIBE tmp;</userinput>
++-------+---------+------+-----+---------+-------+
+| Field | Type    | Null | Key | Default | Extra |
++-------+---------+------+-----+---------+-------+
+| test  | char(4) |      |     |         |       |
++-------+---------+------+-----+---------+-------+
 </programlisting>
 
         <para>
@@ -1874,8 +1879,8 @@
 </programlisting>
 
         <para>
-          Note that MySQL evaluates <literal>expr1</literal> twice if
-          the arguments are not equal.
+          Note that MySQL evaluates <replaceable>expr1</replaceable>
+          twice if the arguments are not equal.
         </para>
       </listitem>
 
@@ -2093,9 +2098,9 @@
 </programlisting>
 
         <para>
-          <literal>CHAR()</literal> returns a binary string. To produce
-          a string in a given character set, the optional
-          <literal>USING</literal> clause may be used:
+          By default, <literal>CHAR()</literal> returns a binary string.
+          To produce a string in a given character set, use the optional
+          <literal>USING</literal> clause:
         </para>
 
 <programlisting>
@@ -2109,8 +2114,8 @@
 
         <para>
           If <literal>USING</literal> is given and the result string is
-          illegal for the given character set, a warning is issued. Also
-          if strict SQL mode is enabled, the result from
+          illegal for the given character set, a warning is issued.
+          Also, if strict SQL mode is enabled, the result from
           <literal>CHAR()</literal> becomes <literal>NULL</literal>.
         </para>
 
@@ -2200,11 +2205,12 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Compresses a string. This function requires MySQL to have been
-          compiled with a compression library such as
-          <literal>zlib</literal>. Otherwise, the return value is always
-          <literal>NULL</literal>. The compressed string can be
-          uncompressed with <literal>UNCOMPRESS()</literal>.
+          Compresses a string and returns the result as a binary string.
+          This function requires MySQL to have been compiled with a
+          compression library such as <literal>zlib</literal>.
+          Otherwise, the return value is always <literal>NULL</literal>.
+          The compressed string can be uncompressed with
+          <literal>UNCOMPRESS()</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2271,17 +2277,23 @@
 
         <para>
           Returns the string that results from concatenating the
-          arguments. Returns <literal>NULL</literal> if any argument is
-          <literal>NULL</literal>. May have one or more arguments. If
-          all arguments are non-binary strings, the result is a
-          non-binary string. If the arguments include any binary
-          strings, the result is a binary string. A numeric argument is
-          converted to its equivalent binary string form; if you want to
-          avoid that you can use explicit type cast, like in this
-          example: <literal>SELECT CONCAT(CAST(int_col AS CHAR),
-          char_col)</literal>
+          arguments. May have one or more arguments. If all arguments
+          are non-binary strings, the result is a non-binary string. If
+          the arguments include any binary strings, the result is a
+          binary string. A numeric argument is converted to its
+          equivalent binary string form; if you want to avoid that, you
+          can use an explicit type cast, as in this example:
         </para>
 
+<programlisting>
+SELECT CONCAT(CAST(<replaceable>int_col</replaceable> AS CHAR), <replaceable>char_col</replaceable>);
+</programlisting>
+
+        <para>
+          <literal>CONCAT()</literal> returns <literal>NULL</literal> if
+          any argument is <literal>NULL</literal>.
+        </para>
+
         <remark role="help-description-end"/>
 
         <remark role="help-example"/>
@@ -2314,15 +2326,14 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>CONCAT_WS()</literal> stands for CONCAT With
+          <literal>CONCAT_WS()</literal> stands for Concatenate With
           Separator and is a special form of
           <literal>CONCAT()</literal>. The first argument is the
           separator for the rest of the arguments. The separator is
           added between the strings to be concatenated. The separator
-          can be a string as can the rest of the arguments. If the
+          can be a string, as can the rest of the arguments. If the
           separator is <literal>NULL</literal>, the result is
-          <literal>NULL</literal>. The function skips any
-          <literal>NULL</literal> values after the separator argument.
+          <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2338,7 +2349,8 @@
 
         <para>
           <literal>CONCAT_WS()</literal> does not skip empty strings.
-          (However, it does skip <literal>NULL</literal>s.)
+          However, it does skip any <literal>NULL</literal> values after
+          the separator argument.
         </para>
       </listitem>
 
@@ -2452,9 +2464,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns a string in which for every bit set in the value
+          Returns a string such that for every bit set in the value
           <replaceable>bits</replaceable>, you get an
-          <replaceable>on</replaceable> string and for every reset bit
+          <replaceable>on</replaceable> string and for every reset bit,
           you get an <replaceable>off</replaceable> string. Bits in
           <replaceable>bits</replaceable> are examined from right to
           left (from low-order to high-order bits). Strings are added to
@@ -2495,8 +2507,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns the index of <replaceable>str</replaceable> in the
-          <replaceable>str1</replaceable>,
+          Returns the index (position) of <replaceable>str</replaceable>
+          in the <replaceable>str1</replaceable>,
           <replaceable>str2</replaceable>,
           <replaceable>str3</replaceable>, <literal>...</literal> list.
           Returns <literal>0</literal> if <replaceable>str</replaceable>
@@ -2579,23 +2591,43 @@
       </listitem>
 
       <listitem>
-        <remark role="note">
-          Do not add help-table markup to this FORMAT entry. The entry
-          that has such markup is in the miscellaneous functions
-          section.
-        </remark>
+        <remark role="help-topic" condition="FORMAT"/>
 
+        <remark role="help-syntax-begin"/>
+
         <para>
+          <indexterm type="function">
+            <primary>FORMAT()</primary>
+          </indexterm>
+
           <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
         </para>
 
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
         <para>
           Formats the number <replaceable>X</replaceable> to a format
           like <literal>'#,###,###.##'</literal>, rounded to
-          <replaceable>D</replaceable> decimals, and returns the result
-          as a string. See For details, see
-          <xref linkend="miscellaneous-functions"/>.
+          <replaceable>D</replaceable> decimal places, and returns the
+          result as a string. If <replaceable>D</replaceable> is
+          <literal>0</literal>, the result has no decimal point or
+          fractional part.
         </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SELECT FORMAT(12332.123456, 4);</userinput>
+        -&gt; '12,332.1235'
+mysql&gt; <userinput>SELECT FORMAT(12332.1,4);</userinput>
+        -&gt; '12,332.1000'
+mysql&gt; <userinput>SELECT FORMAT(12332.2,0);</userinput>
+        -&gt; '12,332'
+</programlisting>
       </listitem>
 
       <listitem>
@@ -2616,7 +2648,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          If <replaceable>N_OR_S</replaceable> is a number, returns a
+          If <replaceable>N_or_S</replaceable> is a number, returns a
           string representation of the hexadecimal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
@@ -2625,10 +2657,10 @@
         </para>
 
         <para>
-          If <replaceable>N_OR_S</replaceable> is a string, returns a
+          If <replaceable>N_or_S</replaceable> is a string, returns a
           hexadecimal string representation of
-          <replaceable>N_OR_S</replaceable> where each character in
-          <replaceable>N_OR_S</replaceable> is converted to two
+          <replaceable>N_or_S</replaceable> where each character in
+          <replaceable>N_or_S</replaceable> is converted to two
           hexadecimal digits.
         </para>
 
@@ -2673,7 +2705,7 @@
           string from position <replaceable>pos</replaceable> is
           <replaceable>len</replaceable> is not within the length of the
           rest of the string. Returns <literal>NULL</literal> if any
-          argument is null.
+          argument is <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2852,11 +2884,11 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Reads the file and returns the file contents as a string. The
-          file must be located on the server, you must specify the full
-          pathname to the file, and you must have the
-          <literal>FILE</literal> privilege. The file must be readable
-          by all and its size less than
+          Reads the file and returns the file contents as a string. To
+          use this function, the file must be located on the server
+          host, you must specify the full pathname to the file, and you
+          must have the <literal>FILE</literal> privilege. The file must
+          be readable by all and its size less than
           <literal>max_allowed_packet</literal> bytes.
         </para>
 
@@ -2871,9 +2903,9 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE <replaceable>tbl_name</replaceable></userinput>
-           SET <replaceable>blob_column</replaceable>=LOAD_FILE('/tmp/picture')
-           WHERE id=1;
+mysql&gt; <userinput>UPDATE t</userinput>
+          <userinput>  SET blob_col=LOAD_FILE('/tmp/picture')</userinput>
+          <userinput>  WHERE id=1;</userinput>
 </programlisting>
       </listitem>
 
@@ -2916,7 +2948,7 @@
         -&gt; 4
 mysql&gt; <userinput>SELECT LOCATE('xbar', 'foobar');</userinput>
         -&gt; 0
-mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar',5);</userinput>
+mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar', 5);</userinput>
         -&gt; 7
 </programlisting>
 
@@ -3131,10 +3163,10 @@
           Returns a string representation of the octal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
-          (<literal>BIGINT</literal>)number. This is equivalent to
-          <literal>CONV(N,10,8)</literal>. Returns
-          <literal>NULL</literal> if <replaceable>N</replaceable> is
-          <literal>NULL</literal>.
+          (<literal>BIGINT</literal>) number. This is equivalent to
+          <literal>CONV(<replaceable>N</replaceable>,10,8)</literal>.
+          Returns <literal>NULL</literal> if
+          <replaceable>N</replaceable> is <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -3265,12 +3297,12 @@
         <para>
           Quotes a string to produce a result that can be used as a
           properly escaped data value in an SQL statement. The string is
-          returned surrounded by single quotes and with each instance of
+          returned enclosed by single quotes and with each instance of
           single quote (&lsquo;<literal>'</literal>&rsquo;), backslash
           (&lsquo;<literal>\</literal>&rsquo;), ASCII
           <literal>NUL</literal>, and Control-Z preceded by a backslash.
           If the argument is <literal>NULL</literal>, the return value
-          is the word <quote>NULL</quote> without surrounding single
+          is the word <quote>NULL</quote> without enclosing single
           quotes.
         </para>
 
@@ -3307,8 +3339,8 @@
           Returns a string consisting of the string
           <replaceable>str</replaceable> repeated
           <replaceable>count</replaceable> times. If
-          <literal><replaceable>count</replaceable> &lt;= 0</literal>,
-          returns an empty string. Returns <literal>NULL</literal> if
+          <replaceable>count</replaceable> is less than 1, returns an
+          empty string. Returns <literal>NULL</literal> if
           <replaceable>str</replaceable> or
           <replaceable>count</replaceable> are <literal>NULL</literal>.
         </para>
@@ -3558,8 +3590,8 @@
           implements the original Soundex algorithm, not the more
           popular enhanced version (also described by D. Knuth). The
           difference is that original version discards vowels first and
-          then duplicates, whereas the enhanced version discards
-          duplicates first and then vowels.
+          duplicates second, whereas the enhanced version discards
+          duplicates first and vowels second.
         </para>
       </listitem>
 
@@ -3694,9 +3726,8 @@
         </para>
 
         <para>
-          Note that if you use a value less than 1 for
-          <replaceable>len</replaceable>, the result is always an empty
-          string.
+          If <replaceable>len</replaceable> is less than 1, the result
+          is the empty string.
         </para>
 
         <para>
@@ -3888,7 +3919,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns the length of a compressed string before compression.
+          Returns the length that the compressed string had before being
+          compressed.
         </para>
 
         <remark role="help-description-end"/>
@@ -3919,7 +3951,7 @@
         </para>
 
         <para>
-          Performs the opposite operation from
+          Performs the inverse operation of
           <literal>HEX(<replaceable>str</replaceable>)</literal>. That
           is, it interprets each pair of hexadecimal digits in the
           argument as a number and converts it to the character
@@ -4039,7 +4071,7 @@
 
             <literal><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -4065,8 +4097,8 @@
 
           <para>
             Per the SQL standard, <literal>LIKE</literal> performs
-            matching on a per-character basis, thus it can have
-            different results than the <literal>=</literal> comparison
+            matching on a per-character basis, thus it can produce
+            results different from the <literal>=</literal> comparison
             operator:
           </para>
 
@@ -4122,8 +4154,8 @@
 
           <para>
             To test for literal instances of a wildcard character,
-            precede the character with the escape character. If you do
-            not specify the <literal>ESCAPE</literal> character,
+            precede it by the escape character. If you do not specify
+            the <literal>ESCAPE</literal> character,
             &lsquo;<literal>\</literal>&rsquo; is assumed.
           </para>
 
@@ -4225,7 +4257,7 @@
 
             <literal><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -4236,7 +4268,7 @@
             This is the same as <literal>NOT
             (<replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>'])</literal>.
+            '<replaceable>escape_char</replaceable>'])</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -4555,7 +4587,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Unary minus. Changes the sign of the argument.
+            Unary minus. This operator changes the sign of the argument.
           </para>
 
           <remark role="help-description-end"/>
@@ -4572,8 +4604,7 @@
             used with a <literal>BIGINT</literal>, the return value is
             also a <literal>BIGINT</literal>. This means that you should
             avoid using <literal>&minus;</literal> on integers that may
-            have the value of
-            <literal>&minus;2<superscript>63</superscript></literal>.
+            have the value of &minus;2<superscript>63</superscript>.
           </para>
         </listitem>
 
@@ -4695,8 +4726,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Integer division. Similar to <literal>FLOOR()</literal> but
-            safe with <literal>BIGINT</literal> values.
+            Integer division. Similar to <literal>FLOOR()</literal>, but
+            is safe with <literal>BIGINT</literal> values.
           </para>
 
           <remark role="help-description-end"/>
@@ -5135,7 +5166,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the value of <literal>e</literal> (the base of
+            Returns the value of <emphasis>e</emphasis> (the base of
             natural logarithms) raised to the power of
             <replaceable>X</replaceable>.
           </para>
@@ -5196,8 +5227,7 @@
         <listitem>
           <remark role="note">
             Do not add help-table markup to this FORMAT entry. The entry
-            that has such markup is in the miscellaneous functions
-            section.
+            that has such markup is in the string functions section.
           </remark>
 
           <para>
@@ -5207,9 +5237,9 @@
           <para>
             Formats the number <replaceable>X</replaceable> to a format
             like <literal>'#,###,###.##'</literal>, rounded to
-            <replaceable>D</replaceable> decimals, and returns the
-            result as a string. See For details, see
-            <xref linkend="miscellaneous-functions"/>.
+            <replaceable>D</replaceable> decimal places, and returns the
+            result as a string. For details, see
+            <xref linkend="string-functions"/>.
           </para>
         </listitem>
 
@@ -5232,9 +5262,9 @@
 
           <para>
             Returns the natural logarithm of
-            <replaceable>X</replaceable>, that is, the logarithm of
-            <replaceable>X</replaceable> to the base
-            <literal>e</literal>.
+            <replaceable>X</replaceable>, that is, the
+            base-<emphasis>e</emphasis> logarithm of
+            <replaceable>X</replaceable>.
           </para>
 
           <remark role="help-description-end"/>
@@ -5460,7 +5490,7 @@
           </para>
 
           <para>
-            <literal>MOD()</literal> also works on values with a
+            <literal>MOD()</literal> also works on values that have a
             fractional part and returns the exact remainder after
             division:
           </para>
@@ -5490,8 +5520,8 @@
 
           <para>
             Returns the value of &pi; (pi). The default number of
-            decimals displayed is seven, but MySQL internally uses the
-            full double-precision value.
+            decimal places displayed is seven, but MySQL uses the full
+            double-precision value internally.
           </para>
 
           <remark role="help-description-end"/>
@@ -5664,8 +5694,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT * FROM table1, table2 WHERE a=b AND c&lt;d</userinput>
-    -&gt; <userinput>ORDER BY RAND() LIMIT 1000;</userinput>
+mysql&gt; <userinput>SELECT * FROM table1, table2 WHERE a=b AND c&lt;d</userinput> -&gt; <userinput>ORDER BY RAND() LIMIT 1000;</userinput>
 </programlisting>
 
           <para>
@@ -5704,10 +5733,11 @@
             Returns the argument <replaceable>X</replaceable>, rounded
             to the nearest integer. With two arguments, returns
             <replaceable>X</replaceable> rounded to
-            <replaceable>D</replaceable> decimals.
-            <replaceable>D</replaceable> can be negative in order to
-            round <replaceable>D</replaceable> digits left of the
-            decimal point of the value <replaceable>X</replaceable>.
+            <replaceable>D</replaceable> decimal places.
+            <replaceable>D</replaceable> can be negative to cause
+            <replaceable>D</replaceable> digits left of the decimal
+            point of the value <replaceable>X</replaceable> to become
+            zero.
           </para>
 
           <remark role="help-description-end"/>
@@ -5733,7 +5763,7 @@
             The return type is the same type as that of the first
             argument (assuming that it is integer, double, or decimal).
             This means that for an integer argument, the result is an
-            integer (no decimals).
+            integer (no decimal places).
           </para>
 
           <para>
@@ -5962,13 +5992,13 @@
 
           <para>
             Returns the number <replaceable>X</replaceable>, truncated
-            to <replaceable>D</replaceable> decimals. If
+            to <replaceable>D</replaceable> decimal places. If
             <replaceable>D</replaceable> is <literal>0</literal>, the
             result has no decimal point or fractional part.
-            <replaceable>D</replaceable> can be negative in order to
-            truncate (make zero) <replaceable>D</replaceable> digits
-            left of the decimal point of the value
-            <replaceable>X</replaceable>.
+            <replaceable>D</replaceable> can be negative to cause
+            <replaceable>D</replaceable> digits left of the decimal
+            point of the value <replaceable>X</replaceable> to become
+            zero.
           </para>
 
           <remark role="help-description-end"/>
@@ -13252,43 +13282,22 @@
         </listitem>
 
         <listitem>
-          <remark role="help-topic" condition="FORMAT"/>
+          <remark role="note">
+            Do not add help-table markup to this FORMAT entry. The entry
+            that has such markup is in the string functions section.
+          </remark>
 
-          <remark role="help-syntax-begin"/>
-
           <para>
-            <indexterm type="function">
-              <primary>FORMAT()</primary>
-            </indexterm>
-
             <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
 
-          <remark role="help-syntax-end"/>
-
-          <remark role="help-description-begin"/>
-
           <para>
             Formats the number <replaceable>X</replaceable> to a format
             like <literal>'#,###,###.##'</literal>, rounded to
-            <replaceable>D</replaceable> decimals, and returns the
-            result as a string. If <replaceable>D</replaceable> is
-            <literal>0</literal>, the result has no decimal point or
-            fractional part.
+            <replaceable>D</replaceable> decimal places, and returns the
+            result as a string. For details, see
+            <xref linkend="string-functions"/>.
           </para>
-
-          <remark role="help-description-end"/>
-
-          <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SELECT FORMAT(12332.123456, 4);</userinput>
-        -&gt; '12,332.1235'
-mysql&gt; <userinput>SELECT FORMAT(12332.1,4);</userinput>
-        -&gt; '12,332.1000'
-mysql&gt; <userinput>SELECT FORMAT(12332.2,0);</userinput>
-        -&gt; '12,332'
-</programlisting>
         </listitem>
 
         <listitem>

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-01-20 04:33:02 UTC (rev 943)
+++ trunk/refman-5.1/functions.xml	2006-01-20 04:33:42 UTC (rev 944)
@@ -368,7 +368,7 @@
         (<literal>TRUE</literal>), <literal>0</literal>
         (<literal>FALSE</literal>), or <literal>NULL</literal>. However,
         the value they return is based on comparison operations
-        performed as described by the rules in
+        performed according to the rules described in
         <xref linkend="type-conversion"/>.
       </para>
 
@@ -456,8 +456,8 @@
             operator, but returns <literal>1</literal> rather than
             <literal>NULL</literal> if both operands are
             <literal>NULL</literal>, and <literal>0</literal> rather
-            than <literal>NULL</literal> if one operand
-            is<literal>NULL</literal>.
+            than <literal>NULL</literal> if one operand is
+            <literal>NULL</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -860,9 +860,9 @@
             <replaceable>expr</replaceable> &lt;=
             <replaceable>max</replaceable>)</literal> if all the
             arguments are of the same type. Otherwise type conversion
-            takes place according to the rules described at the
-            beginning of this section, but applied to all the three
-            arguments.
+            takes place according to the rules described in
+            <xref linkend="type-conversion"/>, but applied to all the
+            three arguments.
           </para>
 
           <remark role="help-description-end"/>
@@ -1022,8 +1022,8 @@
             <literal>IN</literal> is very quick if the
             <literal>IN</literal> value list consists entirely of
             constants. Otherwise, type conversion takes place according
-            to the rules described at the beginning of this section, but
-            applied to all the arguments.
+            to the rules described in <xref linkend="type-conversion"/>,
+            but applied to all the arguments.
           </para>
 
           <remark role="help-description-end"/>
@@ -1122,8 +1122,11 @@
 </programlisting>
 
           <para>
-            A comparison of <literal>NULL</literal> values using
-            <literal>=</literal> is always false.
+            <literal>ISNULL()</literal> can be used instead of
+            <literal>=</literal> to test whether a value is
+            <literal>NULL</literal>. (Comparing a value to
+            <literal>NULL</literal> using <literal>=</literal> always
+            yields false.)
           </para>
 
           <para>
@@ -1518,10 +1521,6 @@
 
       </itemizedlist>
 
-      <para>
-        See also <xref linkend="operator-precedence"/>.
-      </para>
-
     </section>
 
   </section>
@@ -1558,9 +1557,9 @@
           </indexterm>
 
           <literal>CASE <replaceable>value</replaceable> WHEN
-          [<replaceable>compare-value</replaceable>] THEN
+          [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> [WHEN
-          [<replaceable>compare-value</replaceable>] THEN
+          [<replaceable>compare_value</replaceable>] THEN
           <replaceable>result</replaceable> ...] [ELSE
           <replaceable>result</replaceable>] END</literal>
         </para>
@@ -1580,7 +1579,7 @@
         <para>
           The first version returns the
           <replaceable>result</replaceable> where
-          <literal><replaceable>value</replaceable>=<replaceable>compare-value</replaceable></literal>.
+          <literal><replaceable>value</replaceable>=<replaceable>compare_value</replaceable></literal>.
           The second version returns the result for the first condition
           that is true. If there was no matching result value, the
           result after <literal>ELSE</literal> is returned, or
@@ -1618,8 +1617,8 @@
           here differs slightly from that of the SQL
           <literal>CASE</literal> <emphasis>statement</emphasis>
           described in <xref linkend="case-statement"/>, for use inside
-          stored routines. . The <literal>CASE</literal> statement
-          cannot have an <literal>ELSE NULL</literal> clause, and it is
+          stored routines. The <literal>CASE</literal> statement cannot
+          have an <literal>ELSE NULL</literal> clause, and it is
           terminated with <literal>END CASE</literal> instead of
           <literal>END</literal>.
         </para>
@@ -1647,7 +1646,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          If <replaceable>expr1</replaceable> is TRUE
+          If <replaceable>expr1</replaceable> is <literal>TRUE</literal>
           (<literal><replaceable>expr1</replaceable> &lt;&gt;
           0</literal> and <literal><replaceable>expr1</replaceable>
           &lt;&gt; NULL</literal>) then <literal>IF()</literal> returns
@@ -1808,7 +1807,13 @@
         </para>
 
 <programlisting>
-CREATE TABLE tmp SELECT IFNULL(1,'test') AS test;
+mysql&gt; <userinput>CREATE TABLE tmp SELECT IFNULL(1,'test') AS test;</userinput>
+mysql&gt; <userinput>DESCRIBE tmp;</userinput>
++-------+---------+------+-----+---------+-------+
+| Field | Type    | Null | Key | Default | Extra |
++-------+---------+------+-----+---------+-------+
+| test  | char(4) |      |     |         |       |
++-------+---------+------+-----+---------+-------+
 </programlisting>
 
         <para>
@@ -1856,8 +1861,8 @@
 </programlisting>
 
         <para>
-          Note that MySQL evaluates <literal>expr1</literal> twice if
-          the arguments are not equal.
+          Note that MySQL evaluates <replaceable>expr1</replaceable>
+          twice if the arguments are not equal.
         </para>
       </listitem>
 
@@ -2075,9 +2080,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>CHAR()</literal> returns a binary string. To produce
-          a string in a given character set, the optional
-          <literal>USING</literal> clause may be used:
+          By default, <literal>CHAR()</literal> returns a binary string.
+          To produce a string in a given character set, use the optional
+          <literal>USING</literal> clause:
         </para>
 
 <programlisting>
@@ -2091,8 +2096,8 @@
 
         <para>
           If <literal>USING</literal> is given and the result string is
-          illegal for the given character set, a warning is issued. Also
-          if strict SQL mode is enabled, the result from
+          illegal for the given character set, a warning is issued.
+          Also, if strict SQL mode is enabled, the result from
           <literal>CHAR()</literal> becomes <literal>NULL</literal>.
         </para>
 
@@ -2172,11 +2177,12 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Compresses a string. This function requires MySQL to have been
-          compiled with a compression library such as
-          <literal>zlib</literal>. Otherwise, the return value is always
-          <literal>NULL</literal>. The compressed string can be
-          uncompressed with <literal>UNCOMPRESS()</literal>.
+          Compresses a string and returns the result as a binary string.
+          This function requires MySQL to have been compiled with a
+          compression library such as <literal>zlib</literal>.
+          Otherwise, the return value is always <literal>NULL</literal>.
+          The compressed string can be uncompressed with
+          <literal>UNCOMPRESS()</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2243,17 +2249,23 @@
 
         <para>
           Returns the string that results from concatenating the
-          arguments. Returns <literal>NULL</literal> if any argument is
-          <literal>NULL</literal>. May have one or more arguments. If
-          all arguments are non-binary strings, the result is a
-          non-binary string. If the arguments include any binary
-          strings, the result is a binary string. A numeric argument is
-          converted to its equivalent binary string form; if you want to
-          avoid that you can use explicit type cast, like in this
-          example: <literal>SELECT CONCAT(CAST(int_col AS CHAR),
-          char_col)</literal>
+          arguments. May have one or more arguments. If all arguments
+          are non-binary strings, the result is a non-binary string. If
+          the arguments include any binary strings, the result is a
+          binary string. A numeric argument is converted to its
+          equivalent binary string form; if you want to avoid that, you
+          can use an explicit type cast, as in this example:
         </para>
 
+<programlisting>
+SELECT CONCAT(CAST(<replaceable>int_col</replaceable> AS CHAR), <replaceable>char_col</replaceable>);
+</programlisting>
+
+        <para>
+          <literal>CONCAT()</literal> returns <literal>NULL</literal> if
+          any argument is <literal>NULL</literal>.
+        </para>
+
         <remark role="help-description-end"/>
 
         <remark role="help-example"/>
@@ -2286,15 +2298,14 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>CONCAT_WS()</literal> stands for CONCAT With
+          <literal>CONCAT_WS()</literal> stands for Concatenate With
           Separator and is a special form of
           <literal>CONCAT()</literal>. The first argument is the
           separator for the rest of the arguments. The separator is
           added between the strings to be concatenated. The separator
-          can be a string as can the rest of the arguments. If the
+          can be a string, as can the rest of the arguments. If the
           separator is <literal>NULL</literal>, the result is
-          <literal>NULL</literal>. The function skips any
-          <literal>NULL</literal> values after the separator argument.
+          <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2310,7 +2321,8 @@
 
         <para>
           <literal>CONCAT_WS()</literal> does not skip empty strings.
-          (However, it does skip <literal>NULL</literal>s.)
+          However, it does skip any <literal>NULL</literal> values after
+          the separator argument.
         </para>
       </listitem>
 
@@ -2424,9 +2436,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns a string in which for every bit set in the value
+          Returns a string such that for every bit set in the value
           <replaceable>bits</replaceable>, you get an
-          <replaceable>on</replaceable> string and for every reset bit
+          <replaceable>on</replaceable> string and for every reset bit,
           you get an <replaceable>off</replaceable> string. Bits in
           <replaceable>bits</replaceable> are examined from right to
           left (from low-order to high-order bits). Strings are added to
@@ -2467,8 +2479,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns the index of <replaceable>str</replaceable> in the
-          <replaceable>str1</replaceable>,
+          Returns the index (position) of <replaceable>str</replaceable>
+          in the <replaceable>str1</replaceable>,
           <replaceable>str2</replaceable>,
           <replaceable>str3</replaceable>, <literal>...</literal> list.
           Returns <literal>0</literal> if <replaceable>str</replaceable>
@@ -2551,23 +2563,43 @@
       </listitem>
 
       <listitem>
-        <remark role="note">
-          Do not add help-table markup to this FORMAT entry. The entry
-          that has such markup is in the miscellaneous functions
-          section.
-        </remark>
+        <remark role="help-topic" condition="FORMAT"/>
 
+        <remark role="help-syntax-begin"/>
+
         <para>
+          <indexterm type="function">
+            <primary>FORMAT()</primary>
+          </indexterm>
+
           <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
         </para>
 
+        <remark role="help-syntax-end"/>
+
+        <remark role="help-description-begin"/>
+
         <para>
           Formats the number <replaceable>X</replaceable> to a format
           like <literal>'#,###,###.##'</literal>, rounded to
-          <replaceable>D</replaceable> decimals, and returns the result
-          as a string. See For details, see
-          <xref linkend="miscellaneous-functions"/>.
+          <replaceable>D</replaceable> decimal places, and returns the
+          result as a string. If <replaceable>D</replaceable> is
+          <literal>0</literal>, the result has no decimal point or
+          fractional part.
         </para>
+
+        <remark role="help-description-end"/>
+
+        <remark role="help-example"/>
+
+<programlisting>
+mysql&gt; <userinput>SELECT FORMAT(12332.123456, 4);</userinput>
+        -&gt; '12,332.1235'
+mysql&gt; <userinput>SELECT FORMAT(12332.1,4);</userinput>
+        -&gt; '12,332.1000'
+mysql&gt; <userinput>SELECT FORMAT(12332.2,0);</userinput>
+        -&gt; '12,332'
+</programlisting>
       </listitem>
 
       <listitem>
@@ -2588,7 +2620,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          If <replaceable>N_OR_S</replaceable> is a number, returns a
+          If <replaceable>N_or_S</replaceable> is a number, returns a
           string representation of the hexadecimal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
@@ -2597,10 +2629,10 @@
         </para>
 
         <para>
-          If <replaceable>N_OR_S</replaceable> is a string, returns a
+          If <replaceable>N_or_S</replaceable> is a string, returns a
           hexadecimal string representation of
-          <replaceable>N_OR_S</replaceable> where each character in
-          <replaceable>N_OR_S</replaceable> is converted to two
+          <replaceable>N_or_S</replaceable> where each character in
+          <replaceable>N_or_S</replaceable> is converted to two
           hexadecimal digits.
         </para>
 
@@ -2645,7 +2677,7 @@
           string from position <replaceable>pos</replaceable> is
           <replaceable>len</replaceable> is not within the length of the
           rest of the string. Returns <literal>NULL</literal> if any
-          argument is null.
+          argument is <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -2824,11 +2856,11 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Reads the file and returns the file contents as a string. The
-          file must be located on the server, you must specify the full
-          pathname to the file, and you must have the
-          <literal>FILE</literal> privilege. The file must be readable
-          by all and its size less than
+          Reads the file and returns the file contents as a string. To
+          use this function, the file must be located on the server
+          host, you must specify the full pathname to the file, and you
+          must have the <literal>FILE</literal> privilege. The file must
+          be readable by all and its size less than
           <literal>max_allowed_packet</literal> bytes.
         </para>
 
@@ -2843,9 +2875,9 @@
         <remark role="help-example"/>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE <replaceable>tbl_name</replaceable></userinput>
-           SET <replaceable>blob_column</replaceable>=LOAD_FILE('/tmp/picture')
-           WHERE id=1;
+mysql&gt; <userinput>UPDATE t</userinput>
+          <userinput>  SET blob_col=LOAD_FILE('/tmp/picture')</userinput>
+          <userinput>  WHERE id=1;</userinput>
 </programlisting>
       </listitem>
 
@@ -2888,7 +2920,7 @@
         -&gt; 4
 mysql&gt; <userinput>SELECT LOCATE('xbar', 'foobar');</userinput>
         -&gt; 0
-mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar',5);</userinput>
+mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar', 5);</userinput>
         -&gt; 7
 </programlisting>
 
@@ -3103,10 +3135,10 @@
           Returns a string representation of the octal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
-          (<literal>BIGINT</literal>)number. This is equivalent to
-          <literal>CONV(N,10,8)</literal>. Returns
-          <literal>NULL</literal> if <replaceable>N</replaceable> is
-          <literal>NULL</literal>.
+          (<literal>BIGINT</literal>) number. This is equivalent to
+          <literal>CONV(<replaceable>N</replaceable>,10,8)</literal>.
+          Returns <literal>NULL</literal> if
+          <replaceable>N</replaceable> is <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -3237,12 +3269,12 @@
         <para>
           Quotes a string to produce a result that can be used as a
           properly escaped data value in an SQL statement. The string is
-          returned surrounded by single quotes and with each instance of
+          returned enclosed by single quotes and with each instance of
           single quote (&lsquo;<literal>'</literal>&rsquo;), backslash
           (&lsquo;<literal>\</literal>&rsquo;), ASCII
           <literal>NUL</literal>, and Control-Z preceded by a backslash.
           If the argument is <literal>NULL</literal>, the return value
-          is the word <quote>NULL</quote> without surrounding single
+          is the word <quote>NULL</quote> without enclosing single
           quotes.
         </para>
 
@@ -3279,8 +3311,8 @@
           Returns a string consisting of the string
           <replaceable>str</replaceable> repeated
           <replaceable>count</replaceable> times. If
-          <literal><replaceable>count</replaceable> &lt;= 0</literal>,
-          returns an empty string. Returns <literal>NULL</literal> if
+          <replaceable>count</replaceable> is less than 1, returns an
+          empty string. Returns <literal>NULL</literal> if
           <replaceable>str</replaceable> or
           <replaceable>count</replaceable> are <literal>NULL</literal>.
         </para>
@@ -3530,8 +3562,8 @@
           implements the original Soundex algorithm, not the more
           popular enhanced version (also described by D. Knuth). The
           difference is that original version discards vowels first and
-          then duplicates, whereas the enhanced version discards
-          duplicates first and then vowels.
+          duplicates second, whereas the enhanced version discards
+          duplicates first and vowels second.
         </para>
       </listitem>
 
@@ -3666,9 +3698,8 @@
         </para>
 
         <para>
-          Note that if you use a value less than 1 for
-          <replaceable>len</replaceable>, the result is always an empty
-          string.
+          If <replaceable>len</replaceable> is less than 1, the result
+          is the empty string.
         </para>
 
         <para>
@@ -3860,7 +3891,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Returns the length of a compressed string before compression.
+          Returns the length that the compressed string had before being
+          compressed.
         </para>
 
         <remark role="help-description-end"/>
@@ -3891,7 +3923,7 @@
         </para>
 
         <para>
-          Performs the opposite operation from
+          Performs the inverse operation of
           <literal>HEX(<replaceable>str</replaceable>)</literal>. That
           is, it interprets each pair of hexadecimal digits in the
           argument as a number and converts it to the character
@@ -4011,7 +4043,7 @@
 
             <literal><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -4037,8 +4069,8 @@
 
           <para>
             Per the SQL standard, <literal>LIKE</literal> performs
-            matching on a per-character basis, thus it can have
-            different results than the <literal>=</literal> comparison
+            matching on a per-character basis, thus it can produce
+            results different from the <literal>=</literal> comparison
             operator:
           </para>
 
@@ -4094,8 +4126,8 @@
 
           <para>
             To test for literal instances of a wildcard character,
-            precede the character with the escape character. If you do
-            not specify the <literal>ESCAPE</literal> character,
+            precede it by the escape character. If you do not specify
+            the <literal>ESCAPE</literal> character,
             &lsquo;<literal>\</literal>&rsquo; is assumed.
           </para>
 
@@ -4197,7 +4229,7 @@
 
             <literal><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</literal>
           </para>
 
           <remark role="help-syntax-end"/>
@@ -4208,7 +4240,7 @@
             This is the same as <literal>NOT
             (<replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape-char</replaceable>'])</literal>.
+            '<replaceable>escape_char</replaceable>'])</literal>.
           </para>
 
           <remark role="help-description-end"/>
@@ -4527,7 +4559,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Unary minus. Changes the sign of the argument.
+            Unary minus. This operator changes the sign of the argument.
           </para>
 
           <remark role="help-description-end"/>
@@ -4544,8 +4576,7 @@
             used with a <literal>BIGINT</literal>, the return value is
             also a <literal>BIGINT</literal>. This means that you should
             avoid using <literal>&minus;</literal> on integers that may
-            have the value of
-            <literal>&minus;2<superscript>63</superscript></literal>.
+            have the value of &minus;2<superscript>63</superscript>.
           </para>
         </listitem>
 
@@ -4667,8 +4698,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Integer division. Similar to <literal>FLOOR()</literal> but
-            safe with <literal>BIGINT</literal> values.
+            Integer division. Similar to <literal>FLOOR()</literal>, but
+            is safe with <literal>BIGINT</literal> values.
           </para>
 
           <remark role="help-description-end"/>
@@ -5107,7 +5138,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the value of <literal>e</literal> (the base of
+            Returns the value of <emphasis>e</emphasis> (the base of
             natural logarithms) raised to the power of
             <replaceable>X</replaceable>.
           </para>
@@ -5168,8 +5199,7 @@
         <listitem>
           <remark role="note">
             Do not add help-table markup to this FORMAT entry. The entry
-            that has such markup is in the miscellaneous functions
-            section.
+            that has such markup is in the string functions section.
           </remark>
 
           <para>
@@ -5179,9 +5209,9 @@
           <para>
             Formats the number <replaceable>X</replaceable> to a format
             like <literal>'#,###,###.##'</literal>, rounded to
-            <replaceable>D</replaceable> decimals, and returns the
-            result as a string. See For details, see
-            <xref linkend="miscellaneous-functions"/>.
+            <replaceable>D</replaceable> decimal places, and returns the
+            result as a string. For details, see
+            <xref linkend="string-functions"/>.
           </para>
         </listitem>
 
@@ -5204,9 +5234,9 @@
 
           <para>
             Returns the natural logarithm of
-            <replaceable>X</replaceable>, that is, the logarithm of
-            <replaceable>X</replaceable> to the base
-            <literal>e</literal>.
+            <replaceable>X</replaceable>, that is, the
+            base-<emphasis>e</emphasis> logarithm of
+            <replaceable>X</replaceable>.
           </para>
 
           <remark role="help-description-end"/>
@@ -5432,7 +5462,7 @@
           </para>
 
           <para>
-            <literal>MOD()</literal> also works on values with a
+            <literal>MOD()</literal> also works on values that have a
             fractional part and returns the exact remainder after
             division:
           </para>
@@ -5462,8 +5492,8 @@
 
           <para>
             Returns the value of &pi; (pi). The default number of
-            decimals displayed is seven, but MySQL internally uses the
-            full double-precision value.
+            decimal places displayed is seven, but MySQL uses the full
+            double-precision value internally.
           </para>
 
           <remark role="help-description-end"/>
@@ -5636,8 +5666,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>SELECT * FROM table1, table2 WHERE a=b AND c&lt;d</userinput>
-    -&gt; <userinput>ORDER BY RAND() LIMIT 1000;</userinput>
+mysql&gt; <userinput>SELECT * FROM table1, table2 WHERE a=b AND c&lt;d</userinput> -&gt; <userinput>ORDER BY RAND() LIMIT 1000;</userinput>
 </programlisting>
 
           <para>
@@ -5676,10 +5705,11 @@
             Returns the argument <replaceable>X</replaceable>, rounded
             to the nearest integer. With two arguments, returns
             <replaceable>X</replaceable> rounded to
-            <replaceable>D</replaceable> decimals.
-            <replaceable>D</replaceable> can be negative in order to
-            round <replaceable>D</replaceable> digits left of the
-            decimal point of the value <replaceable>X</replaceable>.
+            <replaceable>D</replaceable> decimal places.
+            <replaceable>D</replaceable> can be negative to cause
+            <replaceable>D</replaceable> digits left of the decimal
+            point of the value <replaceable>X</replaceable> to become
+            zero.
           </para>
 
           <remark role="help-description-end"/>
@@ -5705,7 +5735,7 @@
             The return type is the same type as that of the first
             argument (assuming that it is integer, double, or decimal).
             This means that for an integer argument, the result is an
-            integer (no decimals).
+            integer (no decimal places).
           </para>
 
           <para>
@@ -5922,13 +5952,13 @@
 
           <para>
             Returns the number <replaceable>X</replaceable>, truncated
-            to <replaceable>D</replaceable> decimals. If
+            to <replaceable>D</replaceable> decimal places. If
             <replaceable>D</replaceable> is <literal>0</literal>, the
             result has no decimal point or fractional part.
-            <replaceable>D</replaceable> can be negative in order to
-            truncate (make zero) <replaceable>D</replaceable> digits
-            left of the decimal point of the value
-            <replaceable>X</replaceable>.
+            <replaceable>D</replaceable> can be negative to cause
+            <replaceable>D</replaceable> digits left of the decimal
+            point of the value <replaceable>X</replaceable> to become
+            zero.
           </para>
 
           <remark role="help-description-end"/>
@@ -13627,43 +13657,22 @@
         </listitem>
 
         <listitem>
-          <remark role="help-topic" condition="FORMAT"/>
+          <remark role="note">
+            Do not add help-table markup to this FORMAT entry. The entry
+            that has such markup is in the string functions section.
+          </remark>
 
-          <remark role="help-syntax-begin"/>
-
           <para>
-            <indexterm type="function">
-              <primary>FORMAT()</primary>
-            </indexterm>
-
             <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
 
-          <remark role="help-syntax-end"/>
-
-          <remark role="help-description-begin"/>
-
           <para>
             Formats the number <replaceable>X</replaceable> to a format
             like <literal>'#,###,###.##'</literal>, rounded to
-            <replaceable>D</replaceable> decimals, and returns the
-            result as a string. If <replaceable>D</replaceable> is
-            <literal>0</literal>, the result has no decimal point or
-            fractional part.
+            <replaceable>D</replaceable> decimal places, and returns the
+            result as a string. For details, see
+            <xref linkend="string-functions"/>.
           </para>
-
-          <remark role="help-description-end"/>
-
-          <remark role="help-example"/>
-
-<programlisting>
-mysql&gt; <userinput>SELECT FORMAT(12332.123456, 4);</userinput>
-        -&gt; '12,332.1235'
-mysql&gt; <userinput>SELECT FORMAT(12332.1,4);</userinput>
-        -&gt; '12,332.1000'
-mysql&gt; <userinput>SELECT FORMAT(12332.2,0);</userinput>
-        -&gt; '12,332'
-</programlisting>
         </listitem>
 
         <listitem>

Modified: trunk/refman-common/fixedchars.ent
===================================================================
--- trunk/refman-common/fixedchars.ent	2006-01-20 04:33:02 UTC (rev 943)
+++ trunk/refman-common/fixedchars.ent	2006-01-20 04:33:42 UTC (rev 944)
@@ -239,7 +239,7 @@
         <!ENTITY drcrop "&#x230C;">
         <!ENTITY ulcrop "&#x230F;">
         <!ENTITY urcrop "&#x230E;">
-        <!ENTITY pi     "&#x03D6;">
+        <!ENTITY pi     "&#x03C0;">
         <!ENTITY euro   "&#x20AC;">
         <!ENTITY le     "&#x2264;">
         <!ENTITY ge     "&#x2265;">

Thread
svn commit - mysqldoc@docsrva: r944 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-commonpaul20 Jan