List:Internals« Previous MessageNext Message »
From:paul Date:August 16 2005 8:23pm
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3302)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3302 05/08/16 15:23:06 paul@stripped +13 -0
  Move indexing tags.

  refman/sql-syntax.xml
    1.47 05/08/16 15:23:03 paul@stripped +14 -12
    Move indexing tags.

  refman/mysql-database-administration.xml
    1.54 05/08/16 15:23:03 paul@stripped +4 -4
    Move indexing tags.

  refman/introduction.xml
    1.32 05/08/16 15:23:03 paul@stripped +3 -4
    Move indexing tags.

  refman/functions.xml
    1.28 05/08/16 15:23:02 paul@stripped +728 -1090
    Move indexing tags.

  refman-5.1/sql-syntax.xml
    1.18 05/08/16 15:23:02 paul@stripped +14 -12
    Move indexing tags.

  refman-5.1/mysql-database-administration.xml
    1.13 05/08/16 15:23:02 paul@stripped +4 -4
    Move indexing tags.

  refman-5.1/introduction.xml
    1.10 05/08/16 15:23:02 paul@stripped +3 -4
    Move indexing tags.

  refman-5.1/functions.xml
    1.8 05/08/16 15:23:01 paul@stripped +728 -1090
    Move indexing tags.

  refman-5.0/sql-syntax.xml
    1.20 05/08/16 15:23:00 paul@stripped +14 -12
    Move indexing tags.

  refman-5.0/mysql-database-administration.xml
    1.14 05/08/16 15:23:00 paul@stripped +4 -4
    Move indexing tags.

  refman-5.0/introduction.xml
    1.12 05/08/16 15:23:00 paul@stripped +3 -4
    Move indexing tags.

  refman-4.1/sql-syntax.xml
    1.41 05/08/16 15:23:00 paul@stripped +14 -12
    Move indexing tags.

  refman-4.1/mysql-database-administration.xml
    1.45 05/08/16 15:22:59 paul@stripped +4 -4
    Move indexing tags.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.7/refman-5.1/functions.xml	2005-08-15 21:15:32 -05:00
+++ 1.8/refman-5.1/functions.xml	2005-08-16 15:23:01 -05:00
@@ -729,15 +729,13 @@
           </itemizedlist>
 
 <!--  description_for_help_topic BETWEEN AND  BETWEEN AND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BETWEEN ... AND</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BETWEEN ... AND</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> BETWEEN
             <replaceable>min</replaceable> AND
@@ -777,15 +775,13 @@
 </programlisting>
 
 <!--  description_for_help_topic NOT BETWEEN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT BETWEEN</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT BETWEEN</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT BETWEEN
             <replaceable>min</replaceable> AND
@@ -837,15 +833,13 @@
 </programlisting>
 
 <!--  description_for_help_topic GREATEST -->
-
-          <para>
-            <indexterm type="function">
-              <primary>GREATEST()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>GREATEST()</primary>
+          </indexterm>
+
           <para>
             <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
@@ -870,15 +864,13 @@
 </programlisting>
 
 <!--  description_for_help_topic IN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>IN</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>IN</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> IN
             (<replaceable>value</replaceable>,...)</literal>
@@ -932,15 +924,13 @@
           </para>
 
 <!--  description_for_help_topic NOT IN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT IN</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT IN</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT IN
             (<replaceable>value</replaceable>,...)</literal>
@@ -955,15 +945,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ISNULL -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ISNULL()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ISNULL()</primary>
+          </indexterm>
+
           <para>
             <literal>ISNULL(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -999,15 +987,13 @@
           </para>
 
 <!--  description_for_help_topic INTERVAL -->
-
-          <para>
-            <indexterm type="function">
-              <primary>INTERVAL()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>INTERVAL()</primary>
+          </indexterm>
+
           <para>
             <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,...)</literal>
           </para>
@@ -1041,15 +1027,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LEAST -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LEAST()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LEAST()</primary>
+          </indexterm>
+
           <para>
             <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
@@ -1430,15 +1414,13 @@
         </para>
 
 <!--  description_for_help_topic IF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>IF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>IF()</primary>
+        </indexterm>
+
         <para>
           <literal>IF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>,<replaceable>expr3</replaceable>)</literal>
         </para>
@@ -1599,15 +1581,13 @@
         </para>
 
 <!--  description_for_help_topic NULLIF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>NULLIF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>NULLIF()</primary>
+        </indexterm>
+
         <para>
           <literal>NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -1712,15 +1692,13 @@
         </para>
 
 <!--  description_for_help_topic BIN -->
-
-        <para>
-          <indexterm type="function">
-            <primary>BIN()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>BIN()</primary>
+        </indexterm>
+
         <para>
           <literal>BIN(<replaceable>N</replaceable>)</literal>
         </para>
@@ -1745,15 +1723,13 @@
 </programlisting>
 
 <!--  description_for_help_topic BIT_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>BIT_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>BIT_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>BIT_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -1773,15 +1749,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CHAR function -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CHAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CHAR()</primary>
+        </indexterm>
+
         <para>
           <literal>CHAR(<replaceable>N</replaceable>,...)</literal>
         </para>
@@ -1805,15 +1779,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CHAR_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CHAR_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CHAR_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>CHAR_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -1831,15 +1803,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic CHARACTER_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CHARACTER_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CHARACTER_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>CHARACTER_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -1852,15 +1822,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic COMPRESS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>COMPRESS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>COMPRESS()</primary>
+        </indexterm>
+
         <para>
           <literal>COMPRESS(<replaceable>string_to_compress</replaceable>)</literal>
         </para>
@@ -1918,15 +1886,13 @@
         </itemizedlist>
 
 <!--  description_for_help_topic CONCAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONCAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONCAT()</primary>
+        </indexterm>
+
         <para>
           <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
@@ -1958,15 +1924,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CONCAT_WS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONCAT_WS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONCAT_WS()</primary>
+        </indexterm>
+
         <para>
           <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
@@ -2001,15 +1965,13 @@
         </para>
 
 <!--  description_for_help_topic CONV -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONV()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONV()</primary>
+        </indexterm>
+
         <para>
           <literal>CONV(<replaceable>N</replaceable>,<replaceable>from_base</replaceable>,<replaceable>to_base</replaceable>)</literal>
         </para>
@@ -2048,15 +2010,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ELT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>ELT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>ELT()</primary>
+        </indexterm>
+
         <para>
           <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
@@ -2085,15 +2045,13 @@
 </programlisting>
 
 <!--  description_for_help_topic EXPORT_SET -->
-
-        <para>
-          <indexterm type="function">
-            <primary>EXPORT_SET()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>EXPORT_SET()</primary>
+        </indexterm>
+
         <para>
           <literal>EXPORT_SET(<replaceable>bits</replaceable>,<replaceable>on</replaceable>,<replaceable>off</replaceable>[,<replaceable>separator</replaceable>[,<replaceable>number_of_bits</replaceable>]])</literal>
         </para>
@@ -2124,15 +2082,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FIELD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FIELD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FIELD()</primary>
+        </indexterm>
+
         <para>
           <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
@@ -2173,15 +2129,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FIND_IN_SET -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FIND_IN_SET()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FIND_IN_SET()</primary>
+        </indexterm>
+
         <para>
           <literal>FIND_IN_SET(<replaceable>str</replaceable>,<replaceable>strlist</replaceable>)</literal>
         </para>
@@ -2216,15 +2170,13 @@
 </programlisting>
 
 <!--  description_for_help_topic HEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>HEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>HEX()</primary>
+        </indexterm>
+
         <para>
           <literal>HEX(<replaceable>N_or_S</replaceable>)</literal>
         </para>
@@ -2260,15 +2212,13 @@
 </programlisting>
 
 <!--  description_for_help_topic INSERT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>INSERT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>INSERT()</primary>
+        </indexterm>
+
         <para>
           <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>
         </para>
@@ -2304,15 +2254,13 @@
         </para>
 
 <!--  description_for_help_topic INSTR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>INSTR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>INSTR()</primary>
+        </indexterm>
+
         <para>
           <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>
         </para>
@@ -2342,15 +2290,13 @@
         </para>
 
 <!--  description_for_help_topic LCASE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LCASE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LCASE()</primary>
+        </indexterm>
+
         <para>
           <literal>LCASE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2363,15 +2309,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic LEFT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LEFT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LEFT()</primary>
+        </indexterm>
+
         <para>
           <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
         </para>
@@ -2391,15 +2335,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2478,15 +2420,13 @@
 -->
 
 <!--  description_for_help_topic LOCATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOCATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOCATE()</primary>
+        </indexterm>
+
         <para>
           <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>
           ,
@@ -2524,15 +2464,13 @@
         </para>
 
 <!--  description_for_help_topic LOWER -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOWER()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOWER()</primary>
+        </indexterm>
+
         <para>
           <literal>LOWER(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2557,15 +2495,13 @@
         </para>
 
 <!--  description_for_help_topic LPAD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LPAD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LPAD()</primary>
+        </indexterm>
+
         <para>
           <literal>LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
         </para>
@@ -2591,15 +2527,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LTRIM -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LTRIM()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LTRIM()</primary>
+        </indexterm>
+
         <para>
           <literal>LTRIM(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2623,15 +2557,13 @@
         </para>
 
 <!--  description_for_help_topic MAKE_SET -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MAKE_SET()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MAKE_SET()</primary>
+        </indexterm>
+
         <para>
           <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
@@ -2665,15 +2597,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MID -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MID()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MID()</primary>
+        </indexterm>
+
         <para>
           <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
         </para>
@@ -2687,15 +2617,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic OCT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>OCT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>OCT()</primary>
+        </indexterm>
+
         <para>
           <literal>OCT(<replaceable>N</replaceable>)</literal>
         </para>
@@ -2720,15 +2648,13 @@
 </programlisting>
 
 <!--  description_for_help_topic OCTETLENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>OCTET_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>OCTET_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>OCTET_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2741,15 +2667,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ORD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>ORD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>ORD()</primary>
+        </indexterm>
+
         <para>
           <literal>ORD(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2783,15 +2707,13 @@
 </programlisting>
 
 <!--  description_for_help_topic POSITION -->
-
-        <para>
-          <indexterm type="function">
-            <primary>POSITION()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>POSITION()</primary>
+        </indexterm>
+
         <para>
           <literal>POSITION(<replaceable>substr</replaceable> IN
           <replaceable>str</replaceable>)</literal>
@@ -2806,15 +2728,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic QUOTE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>QUOTE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>QUOTE()</primary>
+        </indexterm>
+
         <para>
           <literal>QUOTE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2842,15 +2762,13 @@
 </programlisting>
 
 <!--  description_for_help_topic REPEAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>REPEAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>REPEAT()</primary>
+        </indexterm>
+
         <para>
           <literal>REPEAT(<replaceable>str</replaceable>,<replaceable>count</replaceable>)</literal>
         </para>
@@ -2875,15 +2793,13 @@
 </programlisting>
 
 <!--  description_for_help_topic REPLACE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>REPLACE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>REPLACE()</primary>
+        </indexterm>
+
         <para>
           <literal>REPLACE(<replaceable>str</replaceable>,<replaceable>from_str</replaceable>,<replaceable>to_str</replaceable>)</literal>
         </para>
@@ -2908,15 +2824,13 @@
         </para>
 
 <!--  description_for_help_topic REVERSE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>REVERSE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>REVERSE()</primary>
+        </indexterm>
+
         <para>
           <literal>REVERSE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2940,15 +2854,13 @@
         </para>
 
 <!--  description_for_help_topic RIGHT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>RIGHT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>RIGHT()</primary>
+        </indexterm>
+
         <para>
           <literal>RIGHT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
         </para>
@@ -2972,15 +2884,13 @@
         </para>
 
 <!--  description_for_help_topic RPAD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>RPAD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>RPAD()</primary>
+        </indexterm>
+
         <para>
           <literal>RPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
         </para>
@@ -3010,15 +2920,13 @@
         </para>
 
 <!--  description_for_help_topic RTRIM -->
-
-        <para>
-          <indexterm type="function">
-            <primary>RTRIM()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>RTRIM()</primary>
+        </indexterm>
+
         <para>
           <literal>RTRIM(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3042,15 +2950,13 @@
         </para>
 
 <!--  description_for_help_topic SOUNDEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SOUNDEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SOUNDEX()</primary>
+        </indexterm>
+
         <para>
           <literal>SOUNDEX(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3089,15 +2995,13 @@
         </para>
 
 <!--  description_for_help_topic SOUNDS LIKE  SOUNDS LIKE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SOUNDS LIKE</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SOUNDS LIKE</primary>
+        </indexterm>
+
         <para>
           <literal><replaceable>expr1</replaceable> SOUNDS LIKE
           <replaceable>expr2</replaceable></literal>
@@ -3112,15 +3016,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic SPACE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SPACE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SPACE()</primary>
+        </indexterm>
+
         <para>
           <literal>SPACE(<replaceable>N</replaceable>)</literal>
         </para>
@@ -3215,15 +3117,13 @@
         </para>
 
 <!--  description_for_help_topic SUBSTRING_INDEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SUBSTRING_INDEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SUBSTRING_INDEX()</primary>
+        </indexterm>
+
         <para>
           <literal>SUBSTRING_INDEX(<replaceable>str</replaceable>,<replaceable>delim</replaceable>,<replaceable>count</replaceable>)</literal>
         </para>
@@ -3256,15 +3156,13 @@
         </para>
 
 <!--  description_for_help_topic TRIM  BOTH LEADING TRAILING FROM -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TRIM()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TRIM()</primary>
+        </indexterm>
+
         <para>
           <literal>TRIM([{BOTH | LEADING | TRAILING}
           [<replaceable>remstr</replaceable>] FROM]
@@ -3303,15 +3201,13 @@
         </para>
 
 <!--  description_for_help_topic UCASE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UCASE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UCASE()</primary>
+        </indexterm>
+
         <para>
           <literal>UCASE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3324,15 +3220,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic UNCOMPRESS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNCOMPRESS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNCOMPRESS()</primary>
+        </indexterm>
+
         <para>
           <literal>UNCOMPRESS(<replaceable>string_to_uncompress</replaceable>)</literal>
         </para>
@@ -3358,15 +3252,13 @@
 </programlisting>
 
 <!--  description_for_help_topic UNCOMPRESSED_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNCOMPRESSED_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNCOMPRESSED_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>UNCOMPRESSED_LENGTH(<replaceable>compressed_string</replaceable>)</literal>
         </para>
@@ -3385,15 +3277,13 @@
 </programlisting>
 
 <!--  description_for_help_topic UNHEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNHEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNHEX()</primary>
+        </indexterm>
+
         <para>
           <literal>UNHEX(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3423,15 +3313,13 @@
 </programlisting>
 
 <!--  description_for_help_topic UPPER -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UPPER()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UPPER()</primary>
+        </indexterm>
+
         <para>
           <literal>UPPER(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3668,15 +3556,13 @@
           </para>
 
 <!--  description_for_help_topic NOT LIKE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT LIKE</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT LIKE</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
@@ -3693,15 +3579,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic NOT REGEXP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT REGEXP</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT REGEXP</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT REGEXP
             <replaceable>pat</replaceable></literal> ,
@@ -3807,15 +3691,13 @@
           </para>
 
 <!--  description_for_help_topic STRCMP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>STRCMP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>STRCMP()</primary>
+          </indexterm>
+
           <para>
             <literal>STRCMP(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
           </para>
@@ -4079,15 +3961,13 @@
             arithmetic only if performed in a context where its result
             is converted to an integer.
           </para>
-
-          <para>
-            <indexterm type="function">
-              <primary>DIV</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DIV</primary>
+          </indexterm>
+
           <para>
             <literal>DIV</literal>
           </para>
@@ -4165,15 +4045,13 @@
           </para>
 
 <!--  description_for_help_topic ACOS -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ACOS()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ACOS()</primary>
+          </indexterm>
+
           <para>
             <literal>ACOS(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4201,15 +4079,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ASIN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ASIN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ASIN()</primary>
+          </indexterm>
+
           <para>
             <literal>ASIN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4235,15 +4111,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ATAN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ATAN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ATAN()</primary>
+          </indexterm>
+
           <para>
             <literal>ATAN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4267,15 +4141,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ATAN2 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ATAN2()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ATAN2()</primary>
+          </indexterm>
+
           <para>
             <literal>ATAN(<replaceable>Y</replaceable>,<replaceable>X</replaceable>)</literal>
             ,
@@ -4306,15 +4178,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CEILING  CEIL -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CEILING()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CEILING()</primary>
+          </indexterm>
+
           <para>
             <literal>CEILING(<replaceable>X</replaceable>)</literal> ,
             <literal>CEIL(<replaceable>X</replaceable>)</literal>
@@ -4342,15 +4212,13 @@
           </para>
 
 <!--  description_for_help_topic COS -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COS()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COS()</primary>
+          </indexterm>
+
           <para>
             <literal>COS(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4372,15 +4240,13 @@
 </programlisting>
 
 <!--  description_for_help_topic COT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COT()</primary>
+          </indexterm>
+
           <para>
             <literal>COT(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4403,15 +4269,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CRC32 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CRC32()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CRC32()</primary>
+          </indexterm>
+
           <para>
             <literal>CRC32(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -4436,15 +4300,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DEGREES -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DEGREES()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DEGREES()</primary>
+          </indexterm>
+
           <para>
             <literal>DEGREES(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4468,15 +4330,13 @@
 </programlisting>
 
 <!--  description_for_help_topic EXP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>EXP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>EXP()</primary>
+          </indexterm>
+
           <para>
             <literal>EXP(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4501,15 +4361,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FLOOR -->
-
-          <para>
-            <indexterm type="function">
-              <primary>FLOOR()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>FLOOR()</primary>
+          </indexterm>
+
           <para>
             <literal>FLOOR(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4536,15 +4394,13 @@
           </para>
 
 <!--  description_for_help_topic LN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LN()</primary>
+          </indexterm>
+
           <para>
             <literal>LN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4573,15 +4429,13 @@
           </para>
 
 <!--  description_for_help_topic LOG -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LOG()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LOG()</primary>
+          </indexterm>
+
           <para>
             <literal>LOG(<replaceable>X</replaceable>)</literal> ,
             <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
@@ -4623,15 +4477,13 @@
           </para>
 
 <!--  description_for_help_topic LOG2 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LOG2()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LOG2()</primary>
+          </indexterm>
+
           <para>
             <literal>LOG2(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4661,15 +4513,13 @@
           </para>
 
 <!--  description_for_help_topic LOG10 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LOG10()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LOG10()</primary>
+          </indexterm>
+
           <para>
             <literal>LOG10(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4772,15 +4622,13 @@
 </programlisting>
 
 <!--  description_for_help_topic PI -->
-
-          <para>
-            <indexterm type="function">
-              <primary>PI()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>PI()</primary>
+          </indexterm>
+
           <para>
             <literal>PI()</literal>
           </para>
@@ -4841,15 +4689,13 @@
 </programlisting>
 
 <!--  description_for_help_topic RADIANS -->
-
-          <para>
-            <indexterm type="function">
-              <primary>RADIANS()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>RADIANS()</primary>
+          </indexterm>
+
           <para>
             <literal>RADIANS(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4872,15 +4718,13 @@
 </programlisting>
 
 <!--  description_for_help_topic RAND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>RAND()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>RAND()</primary>
+          </indexterm>
+
           <para>
             <literal>RAND()</literal> ,
             <literal>RAND(<replaceable>N</replaceable>)</literal>
@@ -4955,15 +4799,13 @@
           </para>
 
 <!--  description_for_help_topic ROUND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ROUND()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ROUND()</primary>
+          </indexterm>
+
           <para>
             <literal>ROUND(<replaceable>X</replaceable>)</literal> ,
             <literal>ROUND(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
@@ -5069,15 +4911,13 @@
           </para>
 
 <!--  description_for_help_topic SIGN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SIGN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SIGN()</primary>
+          </indexterm>
+
           <para>
             <literal>SIGN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5103,15 +4943,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SIN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SIN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SIN()</primary>
+          </indexterm>
+
           <para>
             <literal>SIN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5133,15 +4971,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SQRT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SQRT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SQRT()</primary>
+          </indexterm>
+
           <para>
             <literal>SQRT(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5172,15 +5008,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TAN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>TAN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>TAN()</primary>
+          </indexterm>
+
           <para>
             <literal>TAN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5204,15 +5038,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TRUNCATE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>TRUNCATE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>TRUNCATE()</primary>
+          </indexterm>
+
           <para>
             <literal>TRUNCATE(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
@@ -5408,15 +5240,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ADDTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>ADDTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>ADDTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>ADDTIME(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -5447,15 +5277,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CONVERT_TZ -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONVERT_TZ()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONVERT_TZ()</primary>
+        </indexterm>
+
         <para>
           <literal>CONVERT_TZ(<replaceable>dt</replaceable>,<replaceable>from_tz</replaceable>,<replaceable>to_tz</replaceable>)</literal>
         </para>
@@ -5498,15 +5326,13 @@
         </para>
 
 <!--  description_for_help_topic CURDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>CURDATE()</literal>
         </para>
@@ -5530,15 +5356,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CURRENT_DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURRENT_DATE</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURRENT_DATE</primary>
+        </indexterm>
+
         <para>
           <literal>CURRENT_DATE</literal> ,
           <literal>CURRENT_DATE()</literal>
@@ -5553,15 +5377,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic CURTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>CURTIME()</literal>
         </para>
@@ -5585,15 +5407,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CURRENT_TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURRENT_TIME</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURRENT_TIME</primary>
+        </indexterm>
+
         <para>
           <literal>CURRENT_TIME</literal> ,
           <literal>CURRENT_TIME()</literal>
@@ -5608,15 +5428,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic CURRENT_TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURRENT_TIMESTAMP</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURRENT_TIMESTAMP</primary>
+        </indexterm>
+
         <para>
           <literal>CURRENT_TIMESTAMP</literal> ,
           <literal>CURRENT_TIMESTAMP()</literal>
@@ -5630,15 +5448,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DATE function  DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DATE()</primary>
+        </indexterm>
+
         <para>
           <literal>DATE(<replaceable>expr</replaceable>)</literal>
         </para>
@@ -5658,15 +5474,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DATEDIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DATEDIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DATEDIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>DATEDIFF(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -5944,15 +5758,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DATE_FORMAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DATE_FORMAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DATE_FORMAT()</primary>
+        </indexterm>
+
         <para>
           <literal>DATE_FORMAT(<replaceable>date</replaceable>,<replaceable>format</replaceable>)</literal>
         </para>
@@ -6152,15 +5964,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAY -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAY()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAY()</primary>
+        </indexterm>
+
         <para>
           <literal>DAY(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6173,15 +5983,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DAYNAME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYNAME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYNAME()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYNAME(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6201,15 +6009,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAYOFMONTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYOFMONTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYOFMONTH()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYOFMONTH(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6230,15 +6036,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAYOFWEEK -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYOFWEEK()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYOFWEEK()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYOFWEEK(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6259,15 +6063,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAYOFYEAR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYOFYEAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYOFYEAR()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYOFYEAR(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6287,15 +6089,13 @@
 </programlisting>
 
 <!--  description_for_help_topic EXTRACT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>EXTRACT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>EXTRACT()</primary>
+        </indexterm>
+
         <para>
           <literal>EXTRACT(<replaceable>type</replaceable> FROM
           <replaceable>date</replaceable>)</literal>
@@ -6325,15 +6125,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FROM_DAYS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FROM_DAYS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FROM_DAYS()</primary>
+        </indexterm>
+
         <para>
           <literal>FROM_DAYS(<replaceable>N</replaceable>)</literal>
         </para>
@@ -6360,15 +6158,13 @@
         </para>
 
 <!--  description_for_help_topic FROM_UNIXTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FROM_UNIXTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FROM_UNIXTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>FROM_UNIXTIME(<replaceable>unix_timestamp</replaceable>)</literal>
           ,
@@ -6411,15 +6207,13 @@
 </programlisting>
 
 <!--  description_for_help_topic GET_FORMAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>GET_FORMAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>GET_FORMAT()</primary>
+        </indexterm>
+
         <para>
           <literal>GET_FORMAT(DATE|TIME|DATETIME,
           'EUR'|'USA'|'JIS'|'ISO'|'INTERNAL')</literal>
@@ -6563,15 +6357,13 @@
 <!--  INSERT STOP -->
 
 <!--  description_for_help_topic HOUR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>HOUR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>HOUR()</primary>
+        </indexterm>
+
         <para>
           <literal>HOUR(<replaceable>time</replaceable>)</literal>
         </para>
@@ -6603,15 +6395,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LAST_DAY -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LAST_DAY()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LAST_DAY()</primary>
+        </indexterm>
+
         <para>
           <literal>LAST_DAY(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6638,15 +6428,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LOCALTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOCALTIME</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOCALTIME</primary>
+        </indexterm>
+
         <para>
           <literal>LOCALTIME</literal> , <literal>LOCALTIME()</literal>
         </para>
@@ -6660,15 +6448,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic LOCALTIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOCALTIMESTAMP</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOCALTIMESTAMP</primary>
+        </indexterm>
+
         <para>
           <literal>LOCALTIMESTAMP</literal> ,
           <literal>LOCALTIMESTAMP()</literal>
@@ -6683,15 +6469,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic MAKEDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MAKEDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MAKEDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</literal>
         </para>
@@ -6716,15 +6500,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MAKETIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MAKETIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MAKETIME()</primary>
+        </indexterm>
+
         <para>
           <literal>MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</literal>
         </para>
@@ -6746,15 +6528,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MICROSECOND -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MICROSECOND()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MICROSECOND()</primary>
+        </indexterm>
+
         <para>
           <literal>MICROSECOND(<replaceable>expr</replaceable>)</literal>
         </para>
@@ -6777,15 +6557,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MINUTE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MINUTE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MINUTE()</primary>
+        </indexterm>
+
         <para>
           <literal>MINUTE(<replaceable>time</replaceable>)</literal>
         </para>
@@ -6805,15 +6583,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MONTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MONTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MONTH()</primary>
+        </indexterm>
+
         <para>
           <literal>MONTH(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6833,15 +6609,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MONTHNAME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MONTHNAME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MONTHNAME()</primary>
+        </indexterm>
+
         <para>
           <literal>MONTHNAME(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6861,15 +6635,13 @@
 </programlisting>
 
 <!--  description_for_help_topic NOW -->
-
-        <para>
-          <indexterm type="function">
-            <primary>NOW()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>NOW()</primary>
+        </indexterm>
+
         <para>
           <literal>NOW()</literal>
         </para>
@@ -6893,15 +6665,13 @@
 </programlisting>
 
 <!--  description_for_help_topic PERIOD_ADD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>PERIOD_ADD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>PERIOD_ADD()</primary>
+        </indexterm>
+
         <para>
           <literal>PERIOD_ADD(<replaceable>P</replaceable>,<replaceable>N</replaceable>)</literal>
         </para>
@@ -6925,15 +6695,13 @@
 </programlisting>
 
 <!--  description_for_help_topic PERIOD_DIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>PERIOD_DIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>PERIOD_DIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>PERIOD_DIFF(<replaceable>P1</replaceable>,<replaceable>P2</replaceable>)</literal>
         </para>
@@ -6959,15 +6727,13 @@
 </programlisting>
 
 <!--  description_for_help_topic QUARTER -->
-
-        <para>
-          <indexterm type="function">
-            <primary>QUARTER()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>QUARTER()</primary>
+        </indexterm>
+
         <para>
           <literal>QUARTER(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6988,15 +6754,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SECOND -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SECOND()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SECOND()</primary>
+        </indexterm>
+
         <para>
           <literal>SECOND(<replaceable>time</replaceable>)</literal>
         </para>
@@ -7016,15 +6780,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SEC_TO_TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SEC_TO_TIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SEC_TO_TIME()</primary>
+        </indexterm>
+
         <para>
           <literal>SEC_TO_TIME(<replaceable>seconds</replaceable>)</literal>
         </para>
@@ -7051,15 +6813,13 @@
 <!--  INSERT START -->
 
 <!--  description_for_help_topic STR_TO_DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>STR_TO_DATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>STR_TO_DATE()</primary>
+        </indexterm>
+
         <para>
           <literal>STR_TO_DATE(<replaceable>str</replaceable>,<replaceable>format</replaceable>)</literal>
         </para>
@@ -7145,15 +6905,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SUBDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SUBDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SUBDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>SUBDATE(<replaceable>date</replaceable>,INTERVAL
           <replaceable>expr</replaceable>
@@ -7205,15 +6963,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic SUBTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SUBTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SUBTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>SUBTIME(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -7241,15 +6997,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SYSDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SYSDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SYSDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>SYSDATE()</literal>
         </para>
@@ -7262,15 +7016,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic TIME function  TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIME()</primary>
+        </indexterm>
+
         <para>
           <literal>TIME(<replaceable>expr</replaceable>)</literal>
         </para>
@@ -7292,15 +7044,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TIMEDIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMEDIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMEDIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMEDIFF(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -7330,15 +7080,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TIMESTAMP function  TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMESTAMP()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMESTAMP()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMESTAMP(<replaceable>expr</replaceable>)</literal>
           ,
@@ -7366,15 +7114,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TIMESTAMPADD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMESTAMPADD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMESTAMPADD()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMESTAMPADD(<replaceable>interval</replaceable>,<replaceable>int_expr</replaceable>,<replaceable>datetime_expr</replaceable>)</literal>
         </para>
@@ -7417,15 +7163,13 @@
         </para>
 
 <!--  description_for_help_topic TIMESTAMPDIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMESTAMPDIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMESTAMPDIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMESTAMPDIFF(<replaceable>interval</replaceable>,<replaceable>datetime_expr1</replaceable>,<replaceable>datetime_expr2</replaceable>)</literal>
         </para>
@@ -7458,15 +7202,13 @@
         </para>
 
 <!--  description_for_help_topic TIME_FORMAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIME_FORMAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIME_FORMAT()</primary>
+        </indexterm>
+
         <para>
           <literal>TIME_FORMAT(<replaceable>time</replaceable>,<replaceable>format</replaceable>)</literal>
         </para>
@@ -7496,15 +7238,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TIME_TO_SEC -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIME_TO_SEC()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIME_TO_SEC()</primary>
+        </indexterm>
+
         <para>
           <literal>TIME_TO_SEC(<replaceable>time</replaceable>)</literal>
         </para>
@@ -7526,15 +7266,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TO_DAYS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TO_DAYS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TO_DAYS()</primary>
+        </indexterm>
+
         <para>
           <literal>TO_DAYS(<replaceable>date</replaceable>)</literal>
         </para>
@@ -7583,15 +7321,13 @@
         </para>
 
 <!--  description_for_help_topic UNIX_TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNIX_TIMESTAMP()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNIX_TIMESTAMP()</primary>
+        </indexterm>
+
         <para>
           <literal>UNIX_TIMESTAMP()</literal> ,
           <literal>UNIX_TIMESTAMP(<replaceable>date</replaceable>)</literal>
@@ -7643,15 +7379,13 @@
         </para>
 
 <!--  description_for_help_topic UTC_DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UTC_DATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UTC_DATE()</primary>
+        </indexterm>
+
         <para>
           <literal>UTC_DATE</literal> , <literal>UTC_DATE()</literal>
         </para>
@@ -7673,15 +7407,13 @@
 </programlisting>
 
 <!--  description_for_help_topic UTC_TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UTC_TIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UTC_TIME()</primary>
+        </indexterm>
+
         <para>
           <literal>UTC_TIME</literal> , <literal>UTC_TIME()</literal>
         </para>
@@ -7703,15 +7435,13 @@
 </programlisting>
 
 <!--  description_for_help_topic UTC_TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UTC_TIMESTAMP()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UTC_TIMESTAMP()</primary>
+        </indexterm>
+
         <para>
           <literal>UTC_TIMESTAMP</literal> ,
           <literal>UTC_TIMESTAMP()</literal>
@@ -7734,15 +7464,13 @@
 </programlisting>
 
 <!--  description_for_help_topic WEEK -->
-
-        <para>
-          <indexterm type="function">
-            <primary>WEEK()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>WEEK()</primary>
+        </indexterm>
+
         <para>
           <literal>WEEK(<replaceable>date</replaceable>[,<replaceable>mode</replaceable>])</literal>
         </para>
@@ -7901,15 +7629,13 @@
 </programlisting>
 
 <!--  description_for_help_topic WEEKDAY -->
-
-        <para>
-          <indexterm type="function">
-            <primary>WEEKDAY()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>WEEKDAY()</primary>
+        </indexterm>
+
         <para>
           <literal>WEEKDAY(<replaceable>date</replaceable>)</literal>
         </para>
@@ -7932,15 +7658,13 @@
 </programlisting>
 
 <!--  description_for_help_topic WEEKOFYEAR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>WEEKOFYEAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>WEEKOFYEAR()</primary>
+        </indexterm>
+
         <para>
           <literal>WEEKOFYEAR(<replaceable>date</replaceable>)</literal>
         </para>
@@ -7962,15 +7686,13 @@
 </programlisting>
 
 <!--  description_for_help_topic YEAR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>YEAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>YEAR()</primary>
+        </indexterm>
+
         <para>
           <literal>YEAR(<replaceable>date</replaceable>)</literal>
         </para>
@@ -7990,15 +7712,13 @@
 </programlisting>
 
 <!--  description_for_help_topic YEARWEEK -->
-
-        <para>
-          <indexterm type="function">
-            <primary>YEARWEEK()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>YEARWEEK()</primary>
+        </indexterm>
+
         <para>
           <literal>YEARWEEK(<replaceable>date</replaceable>)</literal> ,
           <literal>YEARWEEK(<replaceable>date</replaceable>,<replaceable>start</replaceable>)</literal>
@@ -8160,11 +7880,11 @@
 
     <itemizedlist>
 
-      <indexterm type="function">
-        <primary>MATCH ... AGAINST()</primary>
-      </indexterm>
-
       <listitem>
+        <indexterm type="function">
+          <primary>MATCH ... AGAINST()</primary>
+        </indexterm>
+
         <para>
           <literal>MATCH
           (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
@@ -9702,15 +9422,13 @@
           </para>
 
 <!--  description_for_help_topic &gt;&gt; -->
-
-          <para>
-            <indexterm type="function">
-              <primary>&gt;&gt; (right shift)</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>&gt;&gt; (right shift)</primary>
+          </indexterm>
+
           <para>
             <literal>&gt;&gt;</literal>
           </para>
@@ -9734,15 +9452,13 @@
           </para>
 
 <!--  description_for_help_topic ~ -->
-
-          <para>
-            <indexterm type="function">
-              <primary>~</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>~</primary>
+          </indexterm>
+
           <para>
             <literal>~</literal>
           </para>
@@ -9765,15 +9481,13 @@
           </para>
 
 <!--  description_for_help_topic BIT_COUNT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_COUNT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_COUNT()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_COUNT(<replaceable>N</replaceable>)</literal>
           </para>
@@ -9905,15 +9619,13 @@
           </para>
 
 <!--  description_for_help_topic DECODE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DECODE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DECODE()</primary>
+          </indexterm>
+
           <para>
             <literal>DECODE(<replaceable>crypt_str</replaceable>,<replaceable>pass_str</replaceable>)</literal>
           </para>
@@ -9929,15 +9641,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ENCODE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ENCODE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ENCODE()</primary>
+          </indexterm>
+
           <para>
             <literal>ENCODE(<replaceable>str</replaceable>,<replaceable>pass_str</replaceable>)</literal>
           </para>
@@ -9957,15 +9667,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DES_DECRYPT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DES_DECRYPT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DES_DECRYPT()</primary>
+          </indexterm>
+
           <para>
             <literal>DES_DECRYPT(<replaceable>crypt_str</replaceable>[,<replaceable>key_str</replaceable>])</literal>
           </para>
@@ -10008,15 +9716,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DES_ENCRYPT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DES_ENCRYPT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DES_ENCRYPT()</primary>
+          </indexterm>
+
           <para>
             <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,(<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>)])</literal>
           </para>
@@ -10129,15 +9835,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ENCRYPT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ENCRYPT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ENCRYPT()</primary>
+          </indexterm>
+
           <para>
             <literal>ENCRYPT(<replaceable>str</replaceable>[,<replaceable>salt</replaceable>])</literal>
           </para>
@@ -10179,15 +9883,13 @@
           </para>
 
 <!--  description_for_help_topic MD5 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>MD5()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>MD5()</primary>
+          </indexterm>
+
           <para>
             <literal>MD5(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10222,15 +9924,13 @@
           </para>
 
 <!--  description_for_help_topic OLD_PASSWORD -->
-
-          <para>
-            <indexterm type="function">
-              <primary>OLD_PASSWORD()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>OLD_PASSWORD()</primary>
+          </indexterm>
+
           <para>
             <literal>OLD_PASSWORD(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10248,15 +9948,13 @@
           </para>
 
 <!--  description_for_help_topic PASSWORD -->
-
-          <para>
-            <indexterm type="function">
-              <primary>PASSWORD()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>PASSWORD()</primary>
+          </indexterm>
+
           <para>
             <literal>PASSWORD(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10418,15 +10116,13 @@
           </para>
 
 <!--  description_for_help_topic CHARSET -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CHARSET()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CHARSET()</primary>
+          </indexterm>
+
           <para>
             <literal>CHARSET(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10449,15 +10145,13 @@
 </programlisting>
 
 <!--  description_for_help_topic COERCIBILITY -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COERCIBILITY()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COERCIBILITY()</primary>
+          </indexterm>
+
           <para>
             <literal>COERCIBILITY(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10576,15 +10270,13 @@
           </para>
 
 <!--  description_for_help_topic COLLATION -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COLLATION()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COLLATION()</primary>
+          </indexterm>
+
           <para>
             <literal>COLLATION(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10606,15 +10298,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CONNECTION_ID -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CONNECTION_ID()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CONNECTION_ID()</primary>
+          </indexterm>
+
           <para>
             <literal>CONNECTION_ID()</literal>
           </para>
@@ -10634,15 +10324,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CURRENT_USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CURRENT_USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CURRENT_USER()</primary>
+          </indexterm>
+
           <para>
             <literal>CURRENT_USER()</literal>
           </para>
@@ -10687,15 +10375,13 @@
           </para>
 
 <!--  description_for_help_topic DATABASE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DATABASE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DATABASE()</primary>
+          </indexterm>
+
           <para>
             <literal>DATABASE()</literal>
           </para>
@@ -10847,15 +10533,13 @@
           </itemizedlist>
 
 <!--  description_for_help_topic LAST_INSERT_ID -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LAST_INSERT_ID([<replaceable>expr</replaceable>])</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LAST_INSERT_ID([<replaceable>expr</replaceable>])</primary>
+          </indexterm>
+
           <para>
             <literal>LAST_INSERT_ID()</literal> ,
             <literal>LAST_INSERT_ID(<replaceable>expr</replaceable>)</literal>
@@ -10989,15 +10673,13 @@
           </para>
 
 <!--  description_for_help_topic ROW_COUNT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ROW_COUNT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ROW_COUNT()</primary>
+          </indexterm>
+
           <para>
             <literal>ROW_COUNT()</literal>
           </para>
@@ -11044,15 +10726,13 @@
           </para>
 
 <!--  description_for_help_topic SESSION_USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SESSION_USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SESSION_USER()</primary>
+          </indexterm>
+
           <para>
             <literal>SESSION_USER()</literal>
           </para>
@@ -11065,15 +10745,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic SYSTEM_USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SYSTEM_USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SYSTEM_USER()</primary>
+          </indexterm>
+
           <para>
             <literal>SYSTEM_USER()</literal>
           </para>
@@ -11086,15 +10764,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>USER()</primary>
+          </indexterm>
+
           <para>
             <literal>USER()</literal>
           </para>
@@ -11141,15 +10817,13 @@
 </programlisting>
 
 <!--  description_for_help_topic VERSION -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VERSION()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VERSION()</primary>
+          </indexterm>
+
           <para>
             <literal>VERSION()</literal>
           </para>
@@ -11221,15 +10895,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FORMAT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>FORMAT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>FORMAT()</primary>
+          </indexterm>
+
           <para>
             <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
@@ -11334,15 +11006,13 @@
           </para>
 
 <!--  description_for_help_topic INET_ATON -->
-
-          <para>
-            <indexterm type="function">
-              <primary>INET_ATON()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>INET_ATON()</primary>
+          </indexterm>
+
           <para>
             <literal>INET_ATON(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11392,15 +11062,13 @@
           </para>
 
 <!--  description_for_help_topic INET_NTOA -->
-
-          <para>
-            <indexterm type="function">
-              <primary>INET_NTOA()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>INET_NTOA()</primary>
+          </indexterm>
+
           <para>
             <literal>INET_NTOA(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11420,15 +11088,13 @@
 </programlisting>
 
 <!--  description_for_help_topic IS_FREE_LOCK -->
-
-          <para>
-            <indexterm type="function">
-              <primary>IS_FREE_LOCK()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>IS_FREE_LOCK()</primary>
+          </indexterm>
+
           <para>
             <literal>IS_FREE_LOCK(<replaceable>str</replaceable>)</literal>
           </para>
@@ -11445,15 +11111,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic IS_USED_LOCK -->
-
-          <para>
-            <indexterm type="function">
-              <primary>IS_USED_LOCK()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>IS_USED_LOCK()</primary>
+          </indexterm>
+
           <para>
             <literal>IS_USED_LOCK(<replaceable>str</replaceable>)</literal>
           </para>
@@ -11468,15 +11132,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic MASTER_POS_WAIT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>MASTER_POS_WAIT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>MASTER_POS_WAIT()</primary>
+          </indexterm>
+
           <para>
             <literal>MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</literal>
           </para>
@@ -11510,15 +11172,13 @@
           </para>
 
 <!--  description_for_help_topic RELEASE_LOCK -->
-
-          <para>
-            <indexterm type="function">
-              <primary>RELEASE_LOCK()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>RELEASE_LOCK()</primary>
+          </indexterm>
+
           <para>
             <literal>RELEASE_LOCK(<replaceable>str</replaceable>)</literal>
           </para>
@@ -11544,15 +11204,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic UUID -->
-
-          <para>
-            <indexterm type="function">
-              <primary>UUID()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>UUID()</primary>
+          </indexterm>
+
           <para>
             <literal>UUID()</literal>
           </para>
@@ -11705,15 +11363,13 @@
 </programlisting>
 
 <!--  description_for_help_topic BIT_AND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_AND()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_AND()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_AND(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11734,15 +11390,13 @@
           </para>
 
 <!--  description_for_help_topic BIT_OR -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_OR()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_OR()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_OR(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11761,15 +11415,13 @@
           </para>
 
 <!--  description_for_help_topic BIT_XOR -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_XOR()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_XOR()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_XOR(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11788,15 +11440,13 @@
           </para>
 
 <!--  description_for_help_topic COUNT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COUNT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COUNT()</primary>
+          </indexterm>
+
           <para>
             <literal>COUNT(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11887,15 +11537,13 @@
           </para>
 
 <!--  description_for_help_topic GROUP_CONCAT  DISTINCT SEPARATOR ORDER BY ASC DESC -->
-
-          <para>
-            <indexterm type="function">
-              <primary>GROUP_CONCAT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>GROUP_CONCAT()</primary>
+          </indexterm>
+
           <para>
             <literal>GROUP_CONCAT(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12094,15 +11742,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic STDDEV_POP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>STDDEV_POP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>STDDEV_POP()</primary>
+          </indexterm>
+
           <para>
             <literal>STDDEV_POP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12119,15 +11765,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic STDDEV_SAMP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>STDDEV_SAMP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>STDDEV_SAMP()</primary>
+          </indexterm>
+
           <para>
             <literal>STDDEV_SAMP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12175,15 +11819,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic VAR_POP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VAR_POP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VAR_POP()</primary>
+          </indexterm>
+
           <para>
             <literal>VAR_POP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12201,15 +11843,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic VAR_SAMP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VAR_SAMP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VAR_SAMP()</primary>
+          </indexterm>
+
           <para>
             <literal>VAR_SAMP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12224,15 +11864,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic VARIANCE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VARIANCE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VARIANCE()</primary>
+          </indexterm>
+
           <para>
             <literal>VARIANCE(<replaceable>expr</replaceable>)</literal>
           </para>

--- 1.9/refman-5.1/introduction.xml	2005-08-16 11:25:51 -05:00
+++ 1.10/refman-5.1/introduction.xml	2005-08-16 15:23:02 -05:00
@@ -1949,10 +1949,9 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Storage Engines</emphasis>: 
-            New storage engines include <literal>ARCHIVE</literal> and
-            <literal>FEDERATED</literal>.
-            See
+            <emphasis role="bold">Storage Engines</emphasis>: New
+            storage engines include <literal>ARCHIVE</literal> and
+            <literal>FEDERATED</literal>. See
             <xref linkend="archive-storage-engine"/> and
             <xref linkend="federated-storage-engine"/>.
           </para>

--- 1.12/refman-5.1/mysql-database-administration.xml	2005-08-15 21:15:33 -05:00
+++ 1.13/refman-5.1/mysql-database-administration.xml	2005-08-16 15:23:02 -05:00
@@ -13123,11 +13123,11 @@
 
       <itemizedlist>
 
-        <indexterm type="type">
-          <primary>.my.cnf file</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="type">
+            <primary>.my.cnf file</primary>
+          </indexterm>
+
           <para>
             You can specify connection parameters in the
             <literal>[client]</literal> section of an option file. The

--- 1.17/refman-5.1/sql-syntax.xml	2005-08-16 07:57:57 -05:00
+++ 1.18/refman-5.1/sql-syntax.xml	2005-08-16 15:23:02 -05:00
@@ -6329,8 +6329,8 @@
             The <literal>LIMIT</literal> clause can be used to constrain
             the number of rows returned by the <literal>SELECT</literal>
             statement. <literal>LIMIT</literal> takes one or two numeric
-            arguments, which must both be non-negative integer
-            constants (except when using prepared statements).
+            arguments, which must both be non-negative integer constants
+            (except when using prepared statements).
           </para>
 
           <para>
@@ -6376,17 +6376,19 @@
           </para>
 
           <para>
-            For prepared statements, you can use placeholders
-            (supported as of MySQL version 5.0.7).
-            The following statements will return one row from the
-            <literal>tbl</literal> table:
+            For prepared statements, you can use placeholders (supported
+            as of MySQL version 5.0.7). The following statements will
+            return one row from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @a=1;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?";</userinput>
 mysql&gt; <userinput>EXECUTE STMT USING @a;</userinput>
 </programlisting>
-            The following statements will return the second to sixth
-            row from the <literal>tbl</literal> table:
+
+            The following statements will return the second to sixth row
+            from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @skip=1; SET @numrows=5;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?, ?";</userinput>
@@ -6612,11 +6614,11 @@
 
       <itemizedlist>
 
-        <indexterm type="function">
-          <primary>HIGH_PRIORITY</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="function">
+            <primary>HIGH_PRIORITY</primary>
+          </indexterm>
+
           <para>
             <literal>HIGH_PRIORITY</literal> gives the
             <literal>SELECT</literal> higher priority than a statement

--- 1.44/refman-4.1/mysql-database-administration.xml	2005-08-15 21:15:25 -05:00
+++ 1.45/refman-4.1/mysql-database-administration.xml	2005-08-16 15:22:59 -05:00
@@ -11237,11 +11237,11 @@
 
       <itemizedlist>
 
-        <indexterm type="type">
-          <primary>.my.cnf file</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="type">
+            <primary>.my.cnf file</primary>
+          </indexterm>
+
           <para>
             You can specify connection parameters in the
             <literal>[client]</literal> section of an option file. The

--- 1.40/refman-4.1/sql-syntax.xml	2005-08-16 08:11:05 -05:00
+++ 1.41/refman-4.1/sql-syntax.xml	2005-08-16 15:23:00 -05:00
@@ -6232,8 +6232,8 @@
             The <literal>LIMIT</literal> clause can be used to constrain
             the number of rows returned by the <literal>SELECT</literal>
             statement. <literal>LIMIT</literal> takes one or two numeric
-            arguments, which must both be non-negative integer
-            constants (except when using prepared statements).
+            arguments, which must both be non-negative integer constants
+            (except when using prepared statements).
           </para>
 
           <para>
@@ -6279,17 +6279,19 @@
           </para>
 
           <para>
-            For prepared statements, you can use placeholders
-            (supported as of MySQL version 5.0.7).
-            The following statements will return one row from the
-            <literal>tbl</literal> table:
+            For prepared statements, you can use placeholders (supported
+            as of MySQL version 5.0.7). The following statements will
+            return one row from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @a=1;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?";</userinput>
 mysql&gt; <userinput>EXECUTE STMT USING @a;</userinput>
 </programlisting>
-            The following statements will return the second to sixth
-            row from the <literal>tbl</literal> table:
+
+            The following statements will return the second to sixth row
+            from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @skip=1; SET @numrows=5;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?, ?";</userinput>
@@ -6516,11 +6518,11 @@
 
       <itemizedlist>
 
-        <indexterm type="function">
-          <primary>HIGH_PRIORITY</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="function">
+            <primary>HIGH_PRIORITY</primary>
+          </indexterm>
+
           <para>
             <literal>HIGH_PRIORITY</literal> gives the
             <literal>SELECT</literal> higher priority than a statement

--- 1.27/refman/functions.xml	2005-08-15 21:15:37 -05:00
+++ 1.28/refman/functions.xml	2005-08-16 15:23:02 -05:00
@@ -734,15 +734,13 @@
           </itemizedlist>
 
 <!--  description_for_help_topic BETWEEN AND  BETWEEN AND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BETWEEN ... AND</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BETWEEN ... AND</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> BETWEEN
             <replaceable>min</replaceable> AND
@@ -784,15 +782,13 @@
 </programlisting>
 
 <!--  description_for_help_topic NOT BETWEEN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT BETWEEN</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT BETWEEN</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT BETWEEN
             <replaceable>min</replaceable> AND
@@ -848,15 +844,13 @@
           </para>
 
 <!--  description_for_help_topic GREATEST -->
-
-          <para>
-            <indexterm type="function">
-              <primary>GREATEST()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>GREATEST()</primary>
+          </indexterm>
+
           <para>
             <literal>GREATEST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
@@ -886,15 +880,13 @@
           </para>
 
 <!--  description_for_help_topic IN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>IN</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>IN</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> IN
             (<replaceable>value</replaceable>,...)</literal>
@@ -948,15 +940,13 @@
           </para>
 
 <!--  description_for_help_topic NOT IN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT IN</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT IN</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT IN
             (<replaceable>value</replaceable>,...)</literal>
@@ -971,15 +961,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ISNULL -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ISNULL()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ISNULL()</primary>
+          </indexterm>
+
           <para>
             <literal>ISNULL(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -1015,15 +1003,13 @@
           </para>
 
 <!--  description_for_help_topic INTERVAL -->
-
-          <para>
-            <indexterm type="function">
-              <primary>INTERVAL()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>INTERVAL()</primary>
+          </indexterm>
+
           <para>
             <literal>INTERVAL(<replaceable>N</replaceable>,<replaceable>N1</replaceable>,<replaceable>N2</replaceable>,<replaceable>N3</replaceable>,...)</literal>
           </para>
@@ -1057,15 +1043,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LEAST -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LEAST()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LEAST()</primary>
+          </indexterm>
+
           <para>
             <literal>LEAST(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,...)</literal>
           </para>
@@ -1466,15 +1450,13 @@
         </para>
 
 <!--  description_for_help_topic IF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>IF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>IF()</primary>
+        </indexterm>
+
         <para>
           <literal>IF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>,<replaceable>expr3</replaceable>)</literal>
         </para>
@@ -1638,15 +1620,13 @@
         </para>
 
 <!--  description_for_help_topic NULLIF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>NULLIF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>NULLIF()</primary>
+        </indexterm>
+
         <para>
           <literal>NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -1756,15 +1736,13 @@
         </para>
 
 <!--  description_for_help_topic BIN -->
-
-        <para>
-          <indexterm type="function">
-            <primary>BIN()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>BIN()</primary>
+        </indexterm>
+
         <para>
           <literal>BIN(<replaceable>N</replaceable>)</literal>
         </para>
@@ -1789,15 +1767,13 @@
 </programlisting>
 
 <!--  description_for_help_topic BIT_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>BIT_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>BIT_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>BIT_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -1821,15 +1797,13 @@
         </para>
 
 <!--  description_for_help_topic CHAR function -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CHAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CHAR()</primary>
+        </indexterm>
+
         <para>
           <literal>CHAR(<replaceable>N</replaceable>,...)</literal>
         </para>
@@ -1853,15 +1827,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CHAR_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CHAR_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CHAR_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>CHAR_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -1879,15 +1851,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic CHARACTER_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CHARACTER_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CHARACTER_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>CHARACTER_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -1900,15 +1870,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic COMPRESS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>COMPRESS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>COMPRESS()</primary>
+        </indexterm>
+
         <para>
           <literal>COMPRESS(<replaceable>string_to_compress</replaceable>)</literal>
         </para>
@@ -1970,15 +1938,13 @@
         </para>
 
 <!--  description_for_help_topic CONCAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONCAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONCAT()</primary>
+        </indexterm>
+
         <para>
           <literal>CONCAT(<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
@@ -2010,15 +1976,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CONCAT_WS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONCAT_WS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONCAT_WS()</primary>
+        </indexterm>
+
         <para>
           <literal>CONCAT_WS(<replaceable>separator</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
@@ -2052,15 +2016,13 @@
         </para>
 
 <!--  description_for_help_topic CONV -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONV()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONV()</primary>
+        </indexterm>
+
         <para>
           <literal>CONV(<replaceable>N</replaceable>,<replaceable>from_base</replaceable>,<replaceable>to_base</replaceable>)</literal>
         </para>
@@ -2099,15 +2061,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ELT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>ELT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>ELT()</primary>
+        </indexterm>
+
         <para>
           <literal>ELT(<replaceable>N</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
@@ -2136,15 +2096,13 @@
 </programlisting>
 
 <!--  description_for_help_topic EXPORT_SET -->
-
-        <para>
-          <indexterm type="function">
-            <primary>EXPORT_SET()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>EXPORT_SET()</primary>
+        </indexterm>
+
         <para>
           <literal>EXPORT_SET(<replaceable>bits</replaceable>,<replaceable>on</replaceable>,<replaceable>off</replaceable>[,<replaceable>separator</replaceable>[,<replaceable>number_of_bits</replaceable>]])</literal>
         </para>
@@ -2175,15 +2133,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FIELD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FIELD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FIELD()</primary>
+        </indexterm>
+
         <para>
           <literal>FIELD(<replaceable>str</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,<replaceable>str3</replaceable>,...)</literal>
         </para>
@@ -2224,15 +2180,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FIND_IN_SET -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FIND_IN_SET()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FIND_IN_SET()</primary>
+        </indexterm>
+
         <para>
           <literal>FIND_IN_SET(<replaceable>str</replaceable>,<replaceable>strlist</replaceable>)</literal>
         </para>
@@ -2268,15 +2222,13 @@
 </programlisting>
 
 <!--  description_for_help_topic HEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>HEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>HEX()</primary>
+        </indexterm>
+
         <para>
           <literal>HEX(<replaceable>N_or_S</replaceable>)</literal>
         </para>
@@ -2312,15 +2264,13 @@
 </programlisting>
 
 <!--  description_for_help_topic INSERT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>INSERT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>INSERT()</primary>
+        </indexterm>
+
         <para>
           <literal>INSERT(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>,<replaceable>newstr</replaceable>)</literal>
         </para>
@@ -2356,15 +2306,13 @@
         </para>
 
 <!--  description_for_help_topic INSTR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>INSTR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>INSTR()</primary>
+        </indexterm>
+
         <para>
           <literal>INSTR(<replaceable>str</replaceable>,<replaceable>substr</replaceable>)</literal>
         </para>
@@ -2395,15 +2343,13 @@
         </para>
 
 <!--  description_for_help_topic LCASE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LCASE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LCASE()</primary>
+        </indexterm>
+
         <para>
           <literal>LCASE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2416,15 +2362,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic LEFT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LEFT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LEFT()</primary>
+        </indexterm>
+
         <para>
           <literal>LEFT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
         </para>
@@ -2444,15 +2388,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2529,15 +2471,13 @@
         </para>
 
 <!--  description_for_help_topic LOCATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOCATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOCATE()</primary>
+        </indexterm>
+
         <para>
           <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>
           ,
@@ -2576,15 +2516,13 @@
         </para>
 
 <!--  description_for_help_topic LOWER -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOWER()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOWER()</primary>
+        </indexterm>
+
         <para>
           <literal>LOWER(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2609,15 +2547,13 @@
         </para>
 
 <!--  description_for_help_topic LPAD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LPAD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LPAD()</primary>
+        </indexterm>
+
         <para>
           <literal>LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
         </para>
@@ -2643,15 +2579,13 @@
 </programlisting>
 
 <!--  description_for_help_topic LTRIM -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LTRIM()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LTRIM()</primary>
+        </indexterm>
+
         <para>
           <literal>LTRIM(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2675,15 +2609,13 @@
         </para>
 
 <!--  description_for_help_topic MAKE_SET -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MAKE_SET()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MAKE_SET()</primary>
+        </indexterm>
+
         <para>
           <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
         </para>
@@ -2717,15 +2649,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MID -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MID()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MID()</primary>
+        </indexterm>
+
         <para>
           <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
         </para>
@@ -2739,15 +2669,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic OCT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>OCT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>OCT()</primary>
+        </indexterm>
+
         <para>
           <literal>OCT(<replaceable>N</replaceable>)</literal>
         </para>
@@ -2772,15 +2700,13 @@
 </programlisting>
 
 <!--  description_for_help_topic OCTETLENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>OCTET_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>OCTET_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>OCTET_LENGTH(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2793,15 +2719,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ORD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>ORD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>ORD()</primary>
+        </indexterm>
+
         <para>
           <literal>ORD(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2835,15 +2759,13 @@
 </programlisting>
 
 <!--  description_for_help_topic POSITION -->
-
-        <para>
-          <indexterm type="function">
-            <primary>POSITION()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>POSITION()</primary>
+        </indexterm>
+
         <para>
           <literal>POSITION(<replaceable>substr</replaceable> IN
           <replaceable>str</replaceable>)</literal>
@@ -2858,15 +2780,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic QUOTE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>QUOTE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>QUOTE()</primary>
+        </indexterm>
+
         <para>
           <literal>QUOTE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2895,15 +2815,13 @@
 </programlisting>
 
 <!--  description_for_help_topic REPEAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>REPEAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>REPEAT()</primary>
+        </indexterm>
+
         <para>
           <literal>REPEAT(<replaceable>str</replaceable>,<replaceable>count</replaceable>)</literal>
         </para>
@@ -2928,15 +2846,13 @@
 </programlisting>
 
 <!--  description_for_help_topic REPLACE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>REPLACE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>REPLACE()</primary>
+        </indexterm>
+
         <para>
           <literal>REPLACE(<replaceable>str</replaceable>,<replaceable>from_str</replaceable>,<replaceable>to_str</replaceable>)</literal>
         </para>
@@ -2961,15 +2877,13 @@
         </para>
 
 <!--  description_for_help_topic REVERSE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>REVERSE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>REVERSE()</primary>
+        </indexterm>
+
         <para>
           <literal>REVERSE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -2993,15 +2907,13 @@
         </para>
 
 <!--  description_for_help_topic RIGHT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>RIGHT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>RIGHT()</primary>
+        </indexterm>
+
         <para>
           <literal>RIGHT(<replaceable>str</replaceable>,<replaceable>len</replaceable>)</literal>
         </para>
@@ -3025,15 +2937,13 @@
         </para>
 
 <!--  description_for_help_topic RPAD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>RPAD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>RPAD()</primary>
+        </indexterm>
+
         <para>
           <literal>RPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
         </para>
@@ -3063,15 +2973,13 @@
         </para>
 
 <!--  description_for_help_topic RTRIM -->
-
-        <para>
-          <indexterm type="function">
-            <primary>RTRIM()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>RTRIM()</primary>
+        </indexterm>
+
         <para>
           <literal>RTRIM(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3095,15 +3003,13 @@
         </para>
 
 <!--  description_for_help_topic SOUNDEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SOUNDEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SOUNDEX()</primary>
+        </indexterm>
+
         <para>
           <literal>SOUNDEX(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3141,15 +3047,13 @@
         </para>
 
 <!--  description_for_help_topic SOUNDS LIKE  SOUNDS LIKE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SOUNDS LIKE</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SOUNDS LIKE</primary>
+        </indexterm>
+
         <para>
           <literal><replaceable>expr1</replaceable> SOUNDS LIKE
           <replaceable>expr2</replaceable></literal>
@@ -3165,15 +3069,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic SPACE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SPACE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SPACE()</primary>
+        </indexterm>
+
         <para>
           <literal>SPACE(<replaceable>N</replaceable>)</literal>
         </para>
@@ -3268,15 +3170,13 @@
         </para>
 
 <!--  description_for_help_topic SUBSTRING_INDEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SUBSTRING_INDEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SUBSTRING_INDEX()</primary>
+        </indexterm>
+
         <para>
           <literal>SUBSTRING_INDEX(<replaceable>str</replaceable>,<replaceable>delim</replaceable>,<replaceable>count</replaceable>)</literal>
         </para>
@@ -3309,15 +3209,13 @@
         </para>
 
 <!--  description_for_help_topic TRIM  BOTH LEADING TRAILING FROM -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TRIM()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TRIM()</primary>
+        </indexterm>
+
         <para>
           <literal>TRIM([{BOTH | LEADING | TRAILING}
           [<replaceable>remstr</replaceable>] FROM]
@@ -3356,15 +3254,13 @@
         </para>
 
 <!--  description_for_help_topic UCASE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UCASE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UCASE()</primary>
+        </indexterm>
+
         <para>
           <literal>UCASE(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3377,15 +3273,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic UNCOMPRESS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNCOMPRESS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNCOMPRESS()</primary>
+        </indexterm>
+
         <para>
           <literal>UNCOMPRESS(<replaceable>string_to_uncompress</replaceable>)</literal>
         </para>
@@ -3415,15 +3309,13 @@
         </para>
 
 <!--  description_for_help_topic UNCOMPRESSED_LENGTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNCOMPRESSED_LENGTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNCOMPRESSED_LENGTH()</primary>
+        </indexterm>
+
         <para>
           <literal>UNCOMPRESSED_LENGTH(<replaceable>compressed_string</replaceable>)</literal>
         </para>
@@ -3447,15 +3339,13 @@
         </para>
 
 <!--  description_for_help_topic UNHEX -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNHEX()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNHEX()</primary>
+        </indexterm>
+
         <para>
           <literal>UNHEX(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3489,15 +3379,13 @@
         </para>
 
 <!--  description_for_help_topic UPPER -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UPPER()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UPPER()</primary>
+        </indexterm>
+
         <para>
           <literal>UPPER(<replaceable>str</replaceable>)</literal>
         </para>
@@ -3741,15 +3629,13 @@
           </para>
 
 <!--  description_for_help_topic NOT LIKE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT LIKE</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT LIKE</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
@@ -3766,15 +3652,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic NOT REGEXP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>NOT REGEXP</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>NOT REGEXP</primary>
+          </indexterm>
+
           <para>
             <literal><replaceable>expr</replaceable> NOT REGEXP
             <replaceable>pat</replaceable></literal> ,
@@ -3881,15 +3765,13 @@
           </para>
 
 <!--  description_for_help_topic STRCMP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>STRCMP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>STRCMP()</primary>
+          </indexterm>
+
           <para>
             <literal>STRCMP(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
           </para>
@@ -4155,15 +4037,13 @@
             arithmetic only if performed in a context where its result
             are converted to an integer.
           </para>
-
-          <para>
-            <indexterm type="function">
-              <primary>DIV</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DIV</primary>
+          </indexterm>
+
           <para>
             <literal>DIV</literal>
           </para>
@@ -4245,15 +4125,13 @@
           </para>
 
 <!--  description_for_help_topic ACOS -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ACOS()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ACOS()</primary>
+          </indexterm>
+
           <para>
             <literal>ACOS(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4280,15 +4158,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ASIN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ASIN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ASIN()</primary>
+          </indexterm>
+
           <para>
             <literal>ASIN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4313,15 +4189,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ATAN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ATAN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ATAN()</primary>
+          </indexterm>
+
           <para>
             <literal>ATAN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4344,15 +4218,13 @@
 </programlisting>
 
 <!--  description_for_help_topic ATAN2 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ATAN2()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ATAN2()</primary>
+          </indexterm>
+
           <para>
             <literal>ATAN(<replaceable>Y</replaceable>,<replaceable>X</replaceable>)</literal>
             ,
@@ -4381,15 +4253,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CEILING  CEIL -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CEILING()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CEILING()</primary>
+          </indexterm>
+
           <para>
             <literal>CEILING(<replaceable>X</replaceable>)</literal> ,
             <literal>CEIL(<replaceable>X</replaceable>)</literal>
@@ -4422,15 +4292,13 @@
           </para>
 
 <!--  description_for_help_topic COS -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COS()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COS()</primary>
+          </indexterm>
+
           <para>
             <literal>COS(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4450,15 +4318,13 @@
 </programlisting>
 
 <!--  description_for_help_topic COT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COT()</primary>
+          </indexterm>
+
           <para>
             <literal>COT(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4479,15 +4345,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CRC32 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CRC32()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CRC32()</primary>
+          </indexterm>
+
           <para>
             <literal>CRC32(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -4513,15 +4377,13 @@
           </para>
 
 <!--  description_for_help_topic DEGREES -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DEGREES()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DEGREES()</primary>
+          </indexterm>
+
           <para>
             <literal>DEGREES(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4541,15 +4403,13 @@
 </programlisting>
 
 <!--  description_for_help_topic EXP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>EXP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>EXP()</primary>
+          </indexterm>
+
           <para>
             <literal>EXP(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4572,15 +4432,13 @@
 </programlisting>
 
 <!--  description_for_help_topic FLOOR -->
-
-          <para>
-            <indexterm type="function">
-              <primary>FLOOR()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>FLOOR()</primary>
+          </indexterm>
+
           <para>
             <literal>FLOOR(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4607,15 +4465,13 @@
           </para>
 
 <!--  description_for_help_topic LN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LN()</primary>
+          </indexterm>
+
           <para>
             <literal>LN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4643,15 +4499,13 @@
           </para>
 
 <!--  description_for_help_topic LOG -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LOG()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LOG()</primary>
+          </indexterm>
+
           <para>
             <literal>LOG(<replaceable>X</replaceable>)</literal> ,
             <literal>LOG(<replaceable>B</replaceable>,<replaceable>X</replaceable>)</literal>
@@ -4694,15 +4548,13 @@
           </para>
 
 <!--  description_for_help_topic LOG2 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LOG2()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LOG2()</primary>
+          </indexterm>
+
           <para>
             <literal>LOG2(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4732,15 +4584,13 @@
           </para>
 
 <!--  description_for_help_topic LOG10 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LOG10()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LOG10()</primary>
+          </indexterm>
+
           <para>
             <literal>LOG10(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4848,15 +4698,13 @@
 </programlisting>
 
 <!--  description_for_help_topic PI -->
-
-          <para>
-            <indexterm type="function">
-              <primary>PI()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>PI()</primary>
+          </indexterm>
+
           <para>
             <literal>PI()</literal>
           </para>
@@ -4915,15 +4763,13 @@
 </programlisting>
 
 <!--  description_for_help_topic RADIANS -->
-
-          <para>
-            <indexterm type="function">
-              <primary>RADIANS()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>RADIANS()</primary>
+          </indexterm>
+
           <para>
             <literal>RADIANS(<replaceable>X</replaceable>)</literal>
           </para>
@@ -4943,15 +4789,13 @@
 </programlisting>
 
 <!--  description_for_help_topic RAND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>RAND()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>RAND()</primary>
+          </indexterm>
+
           <para>
             <literal>RAND()</literal> ,
             <literal>RAND(<replaceable>N</replaceable>)</literal>
@@ -5019,15 +4863,13 @@
           </para>
 
 <!--  description_for_help_topic ROUND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ROUND()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ROUND()</primary>
+          </indexterm>
+
           <para>
             <literal>ROUND(<replaceable>X</replaceable>)</literal> ,
             <literal>ROUND(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
@@ -5133,15 +4975,13 @@
           </para>
 
 <!--  description_for_help_topic SIGN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SIGN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SIGN()</primary>
+          </indexterm>
+
           <para>
             <literal>SIGN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5167,15 +5007,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SIN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SIN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SIN()</primary>
+          </indexterm>
+
           <para>
             <literal>SIN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5195,15 +5033,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SQRT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SQRT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SQRT()</primary>
+          </indexterm>
+
           <para>
             <literal>SQRT(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5225,15 +5061,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TAN -->
-
-          <para>
-            <indexterm type="function">
-              <primary>TAN()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>TAN()</primary>
+          </indexterm>
+
           <para>
             <literal>TAN(<replaceable>X</replaceable>)</literal>
           </para>
@@ -5253,15 +5087,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TRUNCATE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>TRUNCATE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>TRUNCATE()</primary>
+          </indexterm>
+
           <para>
             <literal>TRUNCATE(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
@@ -5455,15 +5287,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ADDTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>ADDTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>ADDTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>ADDTIME(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -5496,15 +5326,13 @@
         </para>
 
 <!--  description_for_help_topic CONVERT_TZ -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CONVERT_TZ()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CONVERT_TZ()</primary>
+        </indexterm>
+
         <para>
           <literal>CONVERT_TZ(<replaceable>dt</replaceable>,<replaceable>from_tz</replaceable>,<replaceable>to_tz</replaceable>)</literal>
         </para>
@@ -5550,15 +5378,13 @@
         </para>
 
 <!--  description_for_help_topic CURDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>CURDATE()</literal>
         </para>
@@ -5582,15 +5408,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CURRENT_DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURRENT_DATE</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURRENT_DATE</primary>
+        </indexterm>
+
         <para>
           <literal>CURRENT_DATE</literal> ,
           <literal>CURRENT_DATE()</literal>
@@ -5605,15 +5429,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic CURTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>CURTIME()</literal>
         </para>
@@ -5637,15 +5459,13 @@
 </programlisting>
 
 <!--  description_for_help_topic CURRENT_TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURRENT_TIME</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURRENT_TIME</primary>
+        </indexterm>
+
         <para>
           <literal>CURRENT_TIME</literal> ,
           <literal>CURRENT_TIME()</literal>
@@ -5660,15 +5480,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic CURRENT_TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>CURRENT_TIMESTAMP</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>CURRENT_TIMESTAMP</primary>
+        </indexterm>
+
         <para>
           <literal>CURRENT_TIMESTAMP</literal> ,
           <literal>CURRENT_TIMESTAMP()</literal>
@@ -5683,15 +5501,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DATE function  DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DATE()</primary>
+        </indexterm>
+
         <para>
           <literal>DATE(<replaceable>expr</replaceable>)</literal>
         </para>
@@ -5715,15 +5531,13 @@
         </para>
 
 <!--  description_for_help_topic DATEDIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DATEDIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DATEDIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>DATEDIFF(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -6012,15 +5826,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DATE_FORMAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DATE_FORMAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DATE_FORMAT()</primary>
+        </indexterm>
+
         <para>
           <literal>DATE_FORMAT(<replaceable>date</replaceable>,<replaceable>format</replaceable>)</literal>
         </para>
@@ -6229,15 +6041,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAY -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAY()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAY()</primary>
+        </indexterm>
+
         <para>
           <literal>DAY(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6251,15 +6061,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DAYNAME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYNAME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYNAME()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYNAME(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6279,15 +6087,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAYOFMONTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYOFMONTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYOFMONTH()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYOFMONTH(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6308,15 +6114,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAYOFWEEK -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYOFWEEK()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYOFWEEK()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYOFWEEK(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6338,15 +6142,13 @@
 </programlisting>
 
 <!--  description_for_help_topic DAYOFYEAR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>DAYOFYEAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>DAYOFYEAR()</primary>
+        </indexterm>
+
         <para>
           <literal>DAYOFYEAR(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6367,15 +6169,13 @@
 </programlisting>
 
 <!--  description_for_help_topic EXTRACT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>EXTRACT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>EXTRACT()</primary>
+        </indexterm>
+
         <para>
           <literal>EXTRACT(<replaceable>type</replaceable> FROM
           <replaceable>date</replaceable>)</literal>
@@ -6409,15 +6209,13 @@
         </para>
 
 <!--  description_for_help_topic FROM_DAYS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FROM_DAYS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FROM_DAYS()</primary>
+        </indexterm>
+
         <para>
           <literal>FROM_DAYS(<replaceable>N</replaceable>)</literal>
         </para>
@@ -6444,15 +6242,13 @@
         </para>
 
 <!--  description_for_help_topic FROM_UNIXTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>FROM_UNIXTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>FROM_UNIXTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>FROM_UNIXTIME(<replaceable>unix_timestamp</replaceable>)</literal>
           ,
@@ -6495,15 +6291,13 @@
 </programlisting>
 
 <!--  description_for_help_topic GET_FORMAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>GET_FORMAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>GET_FORMAT()</primary>
+        </indexterm>
+
         <para>
           <literal>GET_FORMAT(DATE|TIME|DATETIME,
           'EUR'|'USA'|'JIS'|'ISO'|'INTERNAL')</literal>
@@ -6645,15 +6439,13 @@
 <!--  INSERT STOP -->
 
 <!--  description_for_help_topic HOUR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>HOUR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>HOUR()</primary>
+        </indexterm>
+
         <para>
           <literal>HOUR(<replaceable>time</replaceable>)</literal>
         </para>
@@ -6685,15 +6477,13 @@
         </para>
 
 <!--  description_for_help_topic LAST_DAY -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LAST_DAY()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LAST_DAY()</primary>
+        </indexterm>
+
         <para>
           <literal>LAST_DAY(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6724,15 +6514,13 @@
         </para>
 
 <!--  description_for_help_topic LOCALTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOCALTIME</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOCALTIME</primary>
+        </indexterm>
+
         <para>
           <literal>LOCALTIME</literal> , <literal>LOCALTIME()</literal>
         </para>
@@ -6750,15 +6538,13 @@
         </para>
 
 <!--  description_for_help_topic LOCALTIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>LOCALTIMESTAMP</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>LOCALTIMESTAMP</primary>
+        </indexterm>
+
         <para>
           <literal>LOCALTIMESTAMP</literal> ,
           <literal>LOCALTIMESTAMP()</literal>
@@ -6777,15 +6563,13 @@
         </para>
 
 <!--  description_for_help_topic MAKEDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MAKEDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MAKEDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</literal>
         </para>
@@ -6814,15 +6598,13 @@
         </para>
 
 <!--  description_for_help_topic MAKETIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MAKETIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MAKETIME()</primary>
+        </indexterm>
+
         <para>
           <literal>MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</literal>
         </para>
@@ -6848,15 +6630,13 @@
         </para>
 
 <!--  description_for_help_topic MICROSECOND -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MICROSECOND()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MICROSECOND()</primary>
+        </indexterm>
+
         <para>
           <literal>MICROSECOND(<replaceable>expr</replaceable>)</literal>
         </para>
@@ -6884,15 +6664,13 @@
         </para>
 
 <!--  description_for_help_topic MINUTE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MINUTE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MINUTE()</primary>
+        </indexterm>
+
         <para>
           <literal>MINUTE(<replaceable>time</replaceable>)</literal>
         </para>
@@ -6912,15 +6690,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MONTH -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MONTH()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MONTH()</primary>
+        </indexterm>
+
         <para>
           <literal>MONTH(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6940,15 +6716,13 @@
 </programlisting>
 
 <!--  description_for_help_topic MONTHNAME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>MONTHNAME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>MONTHNAME()</primary>
+        </indexterm>
+
         <para>
           <literal>MONTHNAME(<replaceable>date</replaceable>)</literal>
         </para>
@@ -6968,15 +6742,13 @@
 </programlisting>
 
 <!--  description_for_help_topic NOW -->
-
-        <para>
-          <indexterm type="function">
-            <primary>NOW()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>NOW()</primary>
+        </indexterm>
+
         <para>
           <literal>NOW()</literal>
         </para>
@@ -7000,15 +6772,13 @@
 </programlisting>
 
 <!--  description_for_help_topic PERIOD_ADD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>PERIOD_ADD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>PERIOD_ADD()</primary>
+        </indexterm>
+
         <para>
           <literal>PERIOD_ADD(<replaceable>P</replaceable>,<replaceable>N</replaceable>)</literal>
         </para>
@@ -7032,15 +6802,13 @@
 </programlisting>
 
 <!--  description_for_help_topic PERIOD_DIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>PERIOD_DIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>PERIOD_DIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>PERIOD_DIFF(<replaceable>P1</replaceable>,<replaceable>P2</replaceable>)</literal>
         </para>
@@ -7066,15 +6834,13 @@
 </programlisting>
 
 <!--  description_for_help_topic QUARTER -->
-
-        <para>
-          <indexterm type="function">
-            <primary>QUARTER()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>QUARTER()</primary>
+        </indexterm>
+
         <para>
           <literal>QUARTER(<replaceable>date</replaceable>)</literal>
         </para>
@@ -7095,15 +6861,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SECOND -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SECOND()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SECOND()</primary>
+        </indexterm>
+
         <para>
           <literal>SECOND(<replaceable>time</replaceable>)</literal>
         </para>
@@ -7123,15 +6887,13 @@
 </programlisting>
 
 <!--  description_for_help_topic SEC_TO_TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SEC_TO_TIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SEC_TO_TIME()</primary>
+        </indexterm>
+
         <para>
           <literal>SEC_TO_TIME(<replaceable>seconds</replaceable>)</literal>
         </para>
@@ -7158,15 +6920,13 @@
 <!--  INSERT START -->
 
 <!--  description_for_help_topic STR_TO_DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>STR_TO_DATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>STR_TO_DATE()</primary>
+        </indexterm>
+
         <para>
           <literal>STR_TO_DATE(<replaceable>str</replaceable>,<replaceable>format</replaceable>)</literal>
         </para>
@@ -7257,15 +7017,13 @@
         </para>
 
 <!--  description_for_help_topic SUBDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SUBDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SUBDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>SUBDATE(<replaceable>date</replaceable>,INTERVAL
           <replaceable>expr</replaceable>
@@ -7317,15 +7075,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic SUBTIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SUBTIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SUBTIME()</primary>
+        </indexterm>
+
         <para>
           <literal>SUBTIME(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -7358,15 +7114,13 @@
         </para>
 
 <!--  description_for_help_topic SYSDATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>SYSDATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>SYSDATE()</primary>
+        </indexterm>
+
         <para>
           <literal>SYSDATE()</literal>
         </para>
@@ -7379,15 +7133,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic TIME function  TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIME()</primary>
+        </indexterm>
+
         <para>
           <literal>TIME(<replaceable>expr</replaceable>)</literal>
         </para>
@@ -7413,15 +7165,13 @@
         </para>
 
 <!--  description_for_help_topic TIMEDIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMEDIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMEDIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMEDIFF(<replaceable>expr</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
@@ -7455,15 +7205,13 @@
         </para>
 
 <!--  description_for_help_topic TIMESTAMP function  TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMESTAMP()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMESTAMP()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMESTAMP(<replaceable>expr</replaceable>)</literal>
           ,
@@ -7495,15 +7243,13 @@
         </para>
 
 <!--  description_for_help_topic TIMESTAMPADD -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMESTAMPADD()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMESTAMPADD()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMESTAMPADD(<replaceable>interval</replaceable>,<replaceable>int_expr</replaceable>,<replaceable>datetime_expr</replaceable>)</literal>
         </para>
@@ -7546,15 +7292,13 @@
         </para>
 
 <!--  description_for_help_topic TIMESTAMPDIFF -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIMESTAMPDIFF()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIMESTAMPDIFF()</primary>
+        </indexterm>
+
         <para>
           <literal>TIMESTAMPDIFF(<replaceable>interval</replaceable>,<replaceable>datetime_expr1</replaceable>,<replaceable>datetime_expr2</replaceable>)</literal>
         </para>
@@ -7587,15 +7331,13 @@
         </para>
 
 <!--  description_for_help_topic TIME_FORMAT -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIME_FORMAT()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIME_FORMAT()</primary>
+        </indexterm>
+
         <para>
           <literal>TIME_FORMAT(<replaceable>time</replaceable>,<replaceable>format</replaceable>)</literal>
         </para>
@@ -7625,15 +7367,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TIME_TO_SEC -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TIME_TO_SEC()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TIME_TO_SEC()</primary>
+        </indexterm>
+
         <para>
           <literal>TIME_TO_SEC(<replaceable>time</replaceable>)</literal>
         </para>
@@ -7655,15 +7395,13 @@
 </programlisting>
 
 <!--  description_for_help_topic TO_DAYS -->
-
-        <para>
-          <indexterm type="function">
-            <primary>TO_DAYS()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>TO_DAYS()</primary>
+        </indexterm>
+
         <para>
           <literal>TO_DAYS(<replaceable>date</replaceable>)</literal>
         </para>
@@ -7710,15 +7448,13 @@
         </para>
 
 <!--  description_for_help_topic UNIX_TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UNIX_TIMESTAMP()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UNIX_TIMESTAMP()</primary>
+        </indexterm>
+
         <para>
           <literal>UNIX_TIMESTAMP()</literal> ,
           <literal>UNIX_TIMESTAMP(<replaceable>date</replaceable>)</literal>
@@ -7770,15 +7506,13 @@
         </para>
 
 <!--  description_for_help_topic UTC_DATE -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UTC_DATE()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UTC_DATE()</primary>
+        </indexterm>
+
         <para>
           <literal>UTC_DATE</literal> , <literal>UTC_DATE()</literal>
         </para>
@@ -7804,15 +7538,13 @@
         </para>
 
 <!--  description_for_help_topic UTC_TIME -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UTC_TIME()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UTC_TIME()</primary>
+        </indexterm>
+
         <para>
           <literal>UTC_TIME</literal> , <literal>UTC_TIME()</literal>
         </para>
@@ -7838,15 +7570,13 @@
         </para>
 
 <!--  description_for_help_topic UTC_TIMESTAMP -->
-
-        <para>
-          <indexterm type="function">
-            <primary>UTC_TIMESTAMP()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>UTC_TIMESTAMP()</primary>
+        </indexterm>
+
         <para>
           <literal>UTC_TIMESTAMP</literal> ,
           <literal>UTC_TIMESTAMP()</literal>
@@ -7874,15 +7604,13 @@
         </para>
 
 <!--  description_for_help_topic WEEK -->
-
-        <para>
-          <indexterm type="function">
-            <primary>WEEK()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>WEEK()</primary>
+        </indexterm>
+
         <para>
           <literal>WEEK(<replaceable>date</replaceable>[,<replaceable>mode</replaceable>])</literal>
         </para>
@@ -8059,15 +7787,13 @@
 </programlisting>
 
 <!--  description_for_help_topic WEEKDAY -->
-
-        <para>
-          <indexterm type="function">
-            <primary>WEEKDAY()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>WEEKDAY()</primary>
+        </indexterm>
+
         <para>
           <literal>WEEKDAY(<replaceable>date</replaceable>)</literal>
         </para>
@@ -8090,15 +7816,13 @@
 </programlisting>
 
 <!--  description_for_help_topic WEEKOFYEAR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>WEEKOFYEAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>WEEKOFYEAR()</primary>
+        </indexterm>
+
         <para>
           <literal>WEEKOFYEAR(<replaceable>date</replaceable>)</literal>
         </para>
@@ -8125,15 +7849,13 @@
         </para>
 
 <!--  description_for_help_topic YEAR -->
-
-        <para>
-          <indexterm type="function">
-            <primary>YEAR()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>YEAR()</primary>
+        </indexterm>
+
         <para>
           <literal>YEAR(<replaceable>date</replaceable>)</literal>
         </para>
@@ -8153,15 +7875,13 @@
 </programlisting>
 
 <!--  description_for_help_topic YEARWEEK -->
-
-        <para>
-          <indexterm type="function">
-            <primary>YEARWEEK()</primary>
-          </indexterm>
-        </para>
       </listitem>
 
       <listitem>
+        <indexterm type="function">
+          <primary>YEARWEEK()</primary>
+        </indexterm>
+
         <para>
           <literal>YEARWEEK(<replaceable>date</replaceable>)</literal> ,
           <literal>YEARWEEK(<replaceable>date</replaceable>,<replaceable>start</replaceable>)</literal>
@@ -8324,11 +8044,11 @@
 
     <itemizedlist>
 
-      <indexterm type="function">
-        <primary>MATCH ... AGAINST()</primary>
-      </indexterm>
-
       <listitem>
+        <indexterm type="function">
+          <primary>MATCH ... AGAINST()</primary>
+        </indexterm>
+
         <para>
           <literal>MATCH
           (<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
@@ -9975,15 +9695,13 @@
           </para>
 
 <!--  description_for_help_topic &gt;&gt; -->
-
-          <para>
-            <indexterm type="function">
-              <primary>&gt;&gt; (right shift)</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>&gt;&gt; (right shift)</primary>
+          </indexterm>
+
           <para>
             <literal>&gt;&gt;</literal>
           </para>
@@ -10007,15 +9725,13 @@
           </para>
 
 <!--  description_for_help_topic ~ -->
-
-          <para>
-            <indexterm type="function">
-              <primary>~</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>~</primary>
+          </indexterm>
+
           <para>
             <literal>~</literal>
           </para>
@@ -10038,15 +9754,13 @@
           </para>
 
 <!--  description_for_help_topic BIT_COUNT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_COUNT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_COUNT()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_COUNT(<replaceable>N</replaceable>)</literal>
           </para>
@@ -10177,15 +9891,13 @@
           </para>
 
 <!--  description_for_help_topic DECODE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DECODE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DECODE()</primary>
+          </indexterm>
+
           <para>
             <literal>DECODE(<replaceable>crypt_str</replaceable>,<replaceable>pass_str</replaceable>)</literal>
           </para>
@@ -10201,15 +9913,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic ENCODE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ENCODE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ENCODE()</primary>
+          </indexterm>
+
           <para>
             <literal>ENCODE(<replaceable>str</replaceable>,<replaceable>pass_str</replaceable>)</literal>
           </para>
@@ -10229,15 +9939,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic DES_DECRYPT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DES_DECRYPT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DES_DECRYPT()</primary>
+          </indexterm>
+
           <para>
             <literal>DES_DECRYPT(<replaceable>crypt_str</replaceable>[,<replaceable>key_str</replaceable>])</literal>
           </para>
@@ -10284,15 +9992,13 @@
           </para>
 
 <!--  description_for_help_topic DES_ENCRYPT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DES_ENCRYPT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DES_ENCRYPT()</primary>
+          </indexterm>
+
           <para>
             <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,(<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>)])</literal>
           </para>
@@ -10409,15 +10115,13 @@
           </para>
 
 <!--  description_for_help_topic ENCRYPT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ENCRYPT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ENCRYPT()</primary>
+          </indexterm>
+
           <para>
             <literal>ENCRYPT(<replaceable>str</replaceable>[,<replaceable>salt</replaceable>])</literal>
           </para>
@@ -10459,15 +10163,13 @@
           </para>
 
 <!--  description_for_help_topic MD5 -->
-
-          <para>
-            <indexterm type="function">
-              <primary>MD5()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>MD5()</primary>
+          </indexterm>
+
           <para>
             <literal>MD5(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10506,15 +10208,13 @@
           </para>
 
 <!--  description_for_help_topic OLD_PASSWORD -->
-
-          <para>
-            <indexterm type="function">
-              <primary>OLD_PASSWORD()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>OLD_PASSWORD()</primary>
+          </indexterm>
+
           <para>
             <literal>OLD_PASSWORD(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10530,15 +10230,13 @@
           </para>
 
 <!--  description_for_help_topic PASSWORD -->
-
-          <para>
-            <indexterm type="function">
-              <primary>PASSWORD()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>PASSWORD()</primary>
+          </indexterm>
+
           <para>
             <literal>PASSWORD(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10700,15 +10398,13 @@
           </para>
 
 <!--  description_for_help_topic CHARSET -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CHARSET()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CHARSET()</primary>
+          </indexterm>
+
           <para>
             <literal>CHARSET(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10735,15 +10431,13 @@
           </para>
 
 <!--  description_for_help_topic COERCIBILITY -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COERCIBILITY()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COERCIBILITY()</primary>
+          </indexterm>
+
           <para>
             <literal>COERCIBILITY(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10866,15 +10560,13 @@
           </para>
 
 <!--  description_for_help_topic COLLATION -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COLLATION()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COLLATION()</primary>
+          </indexterm>
+
           <para>
             <literal>COLLATION(<replaceable>str</replaceable>)</literal>
           </para>
@@ -10900,15 +10592,13 @@
           </para>
 
 <!--  description_for_help_topic CONNECTION_ID -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CONNECTION_ID()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CONNECTION_ID()</primary>
+          </indexterm>
+
           <para>
             <literal>CONNECTION_ID()</literal>
           </para>
@@ -10933,15 +10623,13 @@
           </para>
 
 <!--  description_for_help_topic CURRENT_USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>CURRENT_USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>CURRENT_USER()</primary>
+          </indexterm>
+
           <para>
             <literal>CURRENT_USER()</literal>
           </para>
@@ -10986,15 +10674,13 @@
           </para>
 
 <!--  description_for_help_topic DATABASE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>DATABASE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>DATABASE()</primary>
+          </indexterm>
+
           <para>
             <literal>DATABASE()</literal>
           </para>
@@ -11154,15 +10840,13 @@
           </para>
 
 <!--  description_for_help_topic LAST_INSERT_ID -->
-
-          <para>
-            <indexterm type="function">
-              <primary>LAST_INSERT_ID([<replaceable>expr</replaceable>])</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>LAST_INSERT_ID([<replaceable>expr</replaceable>])</primary>
+          </indexterm>
+
           <para>
             <literal>LAST_INSERT_ID()</literal> ,
             <literal>LAST_INSERT_ID(<replaceable>expr</replaceable>)</literal>
@@ -11296,15 +10980,13 @@
           </para>
 
 <!--  description_for_help_topic ROW_COUNT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>ROW_COUNT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>ROW_COUNT()</primary>
+          </indexterm>
+
           <para>
             <literal>ROW_COUNT()</literal>
           </para>
@@ -11351,15 +11033,13 @@
           </para>
 
 <!--  description_for_help_topic SESSION_USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SESSION_USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SESSION_USER()</primary>
+          </indexterm>
+
           <para>
             <literal>SESSION_USER()</literal>
           </para>
@@ -11372,15 +11052,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic SYSTEM_USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>SYSTEM_USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>SYSTEM_USER()</primary>
+          </indexterm>
+
           <para>
             <literal>SYSTEM_USER()</literal>
           </para>
@@ -11393,15 +11071,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic USER -->
-
-          <para>
-            <indexterm type="function">
-              <primary>USER()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>USER()</primary>
+          </indexterm>
+
           <para>
             <literal>USER()</literal>
           </para>
@@ -11451,15 +11127,13 @@
 </programlisting>
 
 <!--  description_for_help_topic VERSION -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VERSION()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VERSION()</primary>
+          </indexterm>
+
           <para>
             <literal>VERSION()</literal>
           </para>
@@ -11536,15 +11210,13 @@
           </para>
 
 <!--  description_for_help_topic FORMAT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>FORMAT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>FORMAT()</primary>
+          </indexterm>
+
           <para>
             <literal>FORMAT(<replaceable>X</replaceable>,<replaceable>D</replaceable>)</literal>
           </para>
@@ -11649,15 +11321,13 @@
           </para>
 
 <!--  description_for_help_topic INET_ATON -->
-
-          <para>
-            <indexterm type="function">
-              <primary>INET_ATON()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>INET_ATON()</primary>
+          </indexterm>
+
           <para>
             <literal>INET_ATON(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11711,15 +11381,13 @@
           </para>
 
 <!--  description_for_help_topic INET_NTOA -->
-
-          <para>
-            <indexterm type="function">
-              <primary>INET_NTOA()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>INET_NTOA()</primary>
+          </indexterm>
+
           <para>
             <literal>INET_NTOA(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -11743,15 +11411,13 @@
           </para>
 
 <!--  description_for_help_topic IS_FREE_LOCK -->
-
-          <para>
-            <indexterm type="function">
-              <primary>IS_FREE_LOCK()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>IS_FREE_LOCK()</primary>
+          </indexterm>
+
           <para>
             <literal>IS_FREE_LOCK(<replaceable>str</replaceable>)</literal>
           </para>
@@ -11772,15 +11438,13 @@
           </para>
 
 <!--  description_for_help_topic IS_USED_LOCK -->
-
-          <para>
-            <indexterm type="function">
-              <primary>IS_USED_LOCK()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>IS_USED_LOCK()</primary>
+          </indexterm>
+
           <para>
             <literal>IS_USED_LOCK(<replaceable>str</replaceable>)</literal>
           </para>
@@ -11799,15 +11463,13 @@
           </para>
 
 <!--  description_for_help_topic MASTER_POS_WAIT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>MASTER_POS_WAIT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>MASTER_POS_WAIT()</primary>
+          </indexterm>
+
           <para>
             <literal>MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</literal>
           </para>
@@ -11847,15 +11509,13 @@
           </para>
 
 <!--  description_for_help_topic RELEASE_LOCK -->
-
-          <para>
-            <indexterm type="function">
-              <primary>RELEASE_LOCK()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>RELEASE_LOCK()</primary>
+          </indexterm>
+
           <para>
             <literal>RELEASE_LOCK(<replaceable>str</replaceable>)</literal>
           </para>
@@ -11881,15 +11541,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic UUID -->
-
-          <para>
-            <indexterm type="function">
-              <primary>UUID()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>UUID()</primary>
+          </indexterm>
+
           <para>
             <literal>UUID()</literal>
           </para>
@@ -12046,15 +11704,13 @@
 </programlisting>
 
 <!--  description_for_help_topic BIT_AND -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_AND()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_AND()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_AND(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12077,15 +11733,13 @@
           </para>
 
 <!--  description_for_help_topic BIT_OR -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_OR()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_OR()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_OR(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12104,15 +11758,13 @@
           </para>
 
 <!--  description_for_help_topic BIT_XOR -->
-
-          <para>
-            <indexterm type="function">
-              <primary>BIT_XOR()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>BIT_XOR()</primary>
+          </indexterm>
+
           <para>
             <literal>BIT_XOR(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12135,15 +11787,13 @@
           </para>
 
 <!--  description_for_help_topic COUNT -->
-
-          <para>
-            <indexterm type="function">
-              <primary>COUNT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>COUNT()</primary>
+          </indexterm>
+
           <para>
             <literal>COUNT(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12240,15 +11890,13 @@
           </para>
 
 <!--  description_for_help_topic GROUP_CONCAT  DISTINCT SEPARATOR ORDER BY ASC DESC -->
-
-          <para>
-            <indexterm type="function">
-              <primary>GROUP_CONCAT()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>GROUP_CONCAT()</primary>
+          </indexterm>
+
           <para>
             <literal>GROUP_CONCAT(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12459,15 +12107,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic STDDEV_POP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>STDDEV_POP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>STDDEV_POP()</primary>
+          </indexterm>
+
           <para>
             <literal>STDDEV_POP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12484,15 +12130,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic STDDEV_SAMP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>STDDEV_SAMP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>STDDEV_SAMP()</primary>
+          </indexterm>
+
           <para>
             <literal>STDDEV_SAMP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12540,15 +12184,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic VAR_POP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VAR_POP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VAR_POP()</primary>
+          </indexterm>
+
           <para>
             <literal>VAR_POP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12566,15 +12208,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic VAR_SAMP -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VAR_SAMP()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VAR_SAMP()</primary>
+          </indexterm>
+
           <para>
             <literal>VAR_SAMP(<replaceable>expr</replaceable>)</literal>
           </para>
@@ -12589,15 +12229,13 @@
 <!--  end_description_for_help_topic -->
 
 <!--  description_for_help_topic VARIANCE -->
-
-          <para>
-            <indexterm type="function">
-              <primary>VARIANCE()</primary>
-            </indexterm>
-          </para>
         </listitem>
 
         <listitem>
+          <indexterm type="function">
+            <primary>VARIANCE()</primary>
+          </indexterm>
+
           <para>
             <literal>VARIANCE(<replaceable>expr</replaceable>)</literal>
           </para>

--- 1.31/refman/introduction.xml	2005-08-16 11:25:11 -05:00
+++ 1.32/refman/introduction.xml	2005-08-16 15:23:03 -05:00
@@ -2488,10 +2488,9 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Storage Engines</emphasis>: 
-            New storage engines include <literal>ARCHIVE</literal> and
-            <literal>FEDERATED</literal>.
-            See
+            <emphasis role="bold">Storage Engines</emphasis>: New
+            storage engines include <literal>ARCHIVE</literal> and
+            <literal>FEDERATED</literal>. See
             <xref linkend="archive-storage-engine"/> and
             <xref linkend="federated-storage-engine"/>.
           </para>

--- 1.53/refman/mysql-database-administration.xml	2005-08-15 21:15:38 -05:00
+++ 1.54/refman/mysql-database-administration.xml	2005-08-16 15:23:03 -05:00
@@ -13512,11 +13512,11 @@
 
       <itemizedlist>
 
-        <indexterm type="type">
-          <primary>.my.cnf file</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="type">
+            <primary>.my.cnf file</primary>
+          </indexterm>
+
           <para>
             You can specify connection parameters in the
             <literal>[client]</literal> section of an option file. The

--- 1.46/refman/sql-syntax.xml	2005-08-16 08:10:33 -05:00
+++ 1.47/refman/sql-syntax.xml	2005-08-16 15:23:03 -05:00
@@ -6541,8 +6541,8 @@
             The <literal>LIMIT</literal> clause can be used to constrain
             the number of rows returned by the <literal>SELECT</literal>
             statement. <literal>LIMIT</literal> takes one or two numeric
-            arguments, which must both be non-negative integer
-            constants (except when using prepared statements).
+            arguments, which must both be non-negative integer constants
+            (except when using prepared statements).
           </para>
 
           <para>
@@ -6588,17 +6588,19 @@
           </para>
 
           <para>
-            For prepared statements, you can use placeholders
-            (supported as of MySQL version 5.0.7).
-            The following statements will return one row from the
-            <literal>tbl</literal> table:
+            For prepared statements, you can use placeholders (supported
+            as of MySQL version 5.0.7). The following statements will
+            return one row from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @a=1;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?";</userinput>
 mysql&gt; <userinput>EXECUTE STMT USING @a;</userinput>
 </programlisting>
-            The following statements will return the second to sixth
-            row from the <literal>tbl</literal> table:
+
+            The following statements will return the second to sixth row
+            from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @skip=1; SET @numrows=5;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?, ?";</userinput>
@@ -6824,11 +6826,11 @@
 
       <itemizedlist>
 
-        <indexterm type="function">
-          <primary>HIGH_PRIORITY</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="function">
+            <primary>HIGH_PRIORITY</primary>
+          </indexterm>
+
           <para>
             <literal>HIGH_PRIORITY</literal> gives the
             <literal>SELECT</literal> higher priority than a statement

--- 1.11/refman-5.0/introduction.xml	2005-08-16 11:25:50 -05:00
+++ 1.12/refman-5.0/introduction.xml	2005-08-16 15:23:00 -05:00
@@ -1945,10 +1945,9 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Storage Engines</emphasis>: 
-            New storage engines include <literal>ARCHIVE</literal> and
-            <literal>FEDERATED</literal>.
-            See
+            <emphasis role="bold">Storage Engines</emphasis>: New
+            storage engines include <literal>ARCHIVE</literal> and
+            <literal>FEDERATED</literal>. See
             <xref linkend="archive-storage-engine"/> and
             <xref linkend="federated-storage-engine"/>.
           </para>

--- 1.13/refman-5.0/mysql-database-administration.xml	2005-08-15 21:15:30 -05:00
+++ 1.14/refman-5.0/mysql-database-administration.xml	2005-08-16 15:23:00 -05:00
@@ -13123,11 +13123,11 @@
 
       <itemizedlist>
 
-        <indexterm type="type">
-          <primary>.my.cnf file</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="type">
+            <primary>.my.cnf file</primary>
+          </indexterm>
+
           <para>
             You can specify connection parameters in the
             <literal>[client]</literal> section of an option file. The

--- 1.19/refman-5.0/sql-syntax.xml	2005-08-16 07:57:56 -05:00
+++ 1.20/refman-5.0/sql-syntax.xml	2005-08-16 15:23:00 -05:00
@@ -6329,8 +6329,8 @@
             The <literal>LIMIT</literal> clause can be used to constrain
             the number of rows returned by the <literal>SELECT</literal>
             statement. <literal>LIMIT</literal> takes one or two numeric
-            arguments, which must both be non-negative integer
-            constants (except when using prepared statements).
+            arguments, which must both be non-negative integer constants
+            (except when using prepared statements).
           </para>
 
           <para>
@@ -6376,17 +6376,19 @@
           </para>
 
           <para>
-            For prepared statements, you can use placeholders
-            (supported as of MySQL version 5.0.7).
-            The following statements will return one row from the
-            <literal>tbl</literal> table:
+            For prepared statements, you can use placeholders (supported
+            as of MySQL version 5.0.7). The following statements will
+            return one row from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @a=1;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?";</userinput>
 mysql&gt; <userinput>EXECUTE STMT USING @a;</userinput>
 </programlisting>
-            The following statements will return the second to sixth
-            row from the <literal>tbl</literal> table:
+
+            The following statements will return the second to sixth row
+            from the <literal>tbl</literal> table:
+
 <programlisting>
 mysql&gt; <userinput>SET @skip=1; SET @numrows=5;</userinput>
 mysql&gt; <userinput>PREPARE STMT FROM "SELECT * FROM tbl LIMIT ?, ?";</userinput>
@@ -6612,11 +6614,11 @@
 
       <itemizedlist>
 
-        <indexterm type="function">
-          <primary>HIGH_PRIORITY</primary>
-        </indexterm>
-
         <listitem>
+          <indexterm type="function">
+            <primary>HIGH_PRIORITY</primary>
+          </indexterm>
+
           <para>
             <literal>HIGH_PRIORITY</literal> gives the
             <literal>SELECT</literal> higher priority than a statement
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3302)paul16 Aug