List:Internals« Previous MessageNext Message »
From:paul Date:September 11 2005 10:07pm
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3534)
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.3534 05/09/11 17:07:22 paul@stripped +4 -0
  Move incorrectly-placed help tags.

  refman/functions.xml
    1.47 05/09/11 17:07:18 paul@stripped +2340 -1013
    Move incorrectly-placed help tags.

  refman-5.1/functions.xml
    1.27 05/09/11 17:07:18 paul@stripped +399 -399
    Move incorrectly-placed help tags.

  refman-5.0/functions.xml
    1.41 05/09/11 17:07:17 paul@stripped +399 -399
    Move incorrectly-placed help tags.

  refman-4.1/functions.xml
    1.62 05/09/11 17:07:17 paul@stripped +390 -390
    Move incorrectly-placed help 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.26/refman-5.1/functions.xml	2005-09-10 18:54:00 -05:00
+++ 1.27/refman-5.1/functions.xml	2005-09-11 17:07:18 -05:00
@@ -6,7 +6,7 @@
     %fixedchars.entities;
     <!ENTITY % title.entities         SYSTEM "refman-common/titles.en.ent">
     %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
+    <!ENTITY % versions.entities      SYSTEM "versions.ent">
     %versions.entities;
 ]>
 <chapter id="functions">
@@ -338,11 +338,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic =
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic =
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>= (equal)</primary>
@@ -379,13 +379,13 @@
 mysql&gt; <userinput>SELECT '.01' = 0.01;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;lt;=&amp;gt;
+            description_for_help_topic &lt;=&gt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>NULL</literal></primary>
@@ -413,7 +413,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;=&amp;gt;
+            example_for_help_topic &lt;=&gt;
           </remark>
 
 <programlisting>
@@ -422,13 +422,13 @@
 mysql&gt; <userinput>SELECT 1 = 1, NULL = NULL, 1 = NULL;</userinput>
         -&gt; 1, NULL, NULL
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic != &amp;lt;&amp;gt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&lt;&gt; (not equal)</primary>
@@ -469,13 +469,13 @@
 mysql&gt; <userinput>SELECT 'zapp' &lt;&gt; 'zappp';</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;lt;=
+            description_for_help_topic &lt;=
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&lt;= (less than or equal)</primary>
@@ -497,20 +497,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;=
+            example_for_help_topic &lt;=
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 0.1 &lt;= 2;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;lt;
+            description_for_help_topic &lt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&lt; (less than)</primary>
@@ -532,20 +532,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;
+            example_for_help_topic &lt;
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &lt; 2;</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;gt;=
+            description_for_help_topic &gt;=
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&gt;= (greater than or equal)</primary>
@@ -567,20 +567,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;gt;=
+            example_for_help_topic &gt;=
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &gt;= 2;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;gt;
+            description_for_help_topic &gt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&gt; (greater than)</primary>
@@ -609,13 +609,13 @@
 mysql&gt; <userinput>SELECT 2 &gt; 2;</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic IS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>TRUE</literal></primary>
@@ -673,13 +673,13 @@
             <replaceable>boolean_value</replaceable></literal> syntax
             was added in MySQL 5.0.2.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic IS NULL NULL IS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>NULL</literal></primary>
@@ -773,13 +773,13 @@
             </listitem>
 
           </itemizedlist>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic BETWEEN AND BETWEEN AND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>BETWEEN ... AND</primary>
@@ -825,13 +825,13 @@
 mysql&gt; <userinput>SELECT 2 BETWEEN 2 AND 'x-3';</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT BETWEEN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT BETWEEN</primary>
@@ -852,13 +852,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic COALESCE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>NULL</literal></primary>
@@ -891,13 +891,13 @@
 mysql&gt; <userinput>SELECT COALESCE(NULL,NULL,NULL);</userinput>
         -&gt; NULL
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic GREATEST
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>GREATEST()</primary>
@@ -934,13 +934,13 @@
             <literal>NULL</literal> if any argument is
             <literal>NULL</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic IN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>IN</primary>
@@ -1000,13 +1000,13 @@
             certain types of subqueries. See
             <xref linkend="any-in-some-subqueries"/>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT IN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT IN</primary>
@@ -1025,13 +1025,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ISNULL
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ISNULL()</primary>
@@ -1072,13 +1072,13 @@
             behaviors with the <literal>IS NULL</literal> comparison
             operator. See the description of <literal>IS NULL</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic INTERVAL
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>INTERVAL()</primary>
@@ -1118,13 +1118,13 @@
 mysql&gt; <userinput>SELECT INTERVAL(22, 23, 30, 44, 200);</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LEAST
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LEAST()</primary>
@@ -1247,11 +1247,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic ! NOT
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic ! NOT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT</primary>
@@ -1298,13 +1298,13 @@
             expression evaluates the same way as
             <literal>(!1)+1</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;amp;&amp;amp; AND
+            description_for_help_topic &amp;&amp; AND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>AND</primary>
@@ -1330,7 +1330,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;amp;&amp;amp;
+            example_for_help_topic &amp;&amp;
           </remark>
 
 <programlisting>
@@ -1362,13 +1362,13 @@
         the optimization wherever possible.
       </para>
 -->
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic || OR
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>OR</primary>
@@ -1412,13 +1412,13 @@
 mysql&gt; <userinput>SELECT 1 || NULL;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic XOR
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>XOR</primary>
@@ -1485,11 +1485,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic CASE WHEN THEN ELSE END
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic CASE WHEN THEN ELSE END
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CASE</primary>
@@ -1546,13 +1546,13 @@
           string. If used in a numeric context, then the result is
           returned as a decimal, real, or integer value.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic IF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>IF()</primary>
@@ -1656,13 +1656,13 @@
           strings, the result is case sensitive if either string is case
           sensitive.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic IFNULL
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm>
             <primary><literal>NULL</literal></primary>
@@ -1723,13 +1723,13 @@
           In this example, the type of the <literal>test</literal>
           column is <literal>CHAR(4)</literal>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic NULLIF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>NULLIF()</primary>
@@ -1808,11 +1808,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic ASCII
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic ASCII
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ASCII()</primary>
@@ -1850,13 +1850,13 @@
         <para>
           See also the <literal>ORD()</literal> function.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic BIN
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>BIN()</primary>
@@ -1887,13 +1887,13 @@
 mysql&gt; <userinput>SELECT BIN(12);</userinput>
         -&gt; '1100'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic BIT_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>BIT_LENGTH()</primary>
@@ -1919,13 +1919,13 @@
 mysql&gt; <userinput>SELECT BIT_LENGTH('text');</userinput>
         -&gt; 32
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CHAR function
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CHAR()</primary>
@@ -1955,13 +1955,13 @@
 mysql&gt; <userinput>SELECT CHAR(77,77.3,'77.3');</userinput>
         -&gt; 'MMM'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CHAR_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CHAR_LENGTH()</primary>
@@ -1983,13 +1983,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CHARACTER_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CHARACTER_LENGTH()</primary>
@@ -2006,13 +2006,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic COMPRESS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>COMPRESS()</primary>
@@ -2076,13 +2076,13 @@
           </listitem>
 
         </itemizedlist>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONCAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONCAT()</primary>
@@ -2120,13 +2120,13 @@
 mysql&gt; <userinput>SELECT CONCAT(14.3);</userinput>
         -&gt; '14.3'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONCAT_WS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONCAT_WS()</primary>
@@ -2167,13 +2167,13 @@
           not skip empty strings. (However, it does skip
           <literal>NULL</literal>s.)
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONV
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONV()</primary>
@@ -2218,13 +2218,13 @@
 mysql&gt; <userinput>SELECT CONV(10+'10'+'10'+0xa,10,10);</userinput>
         -&gt; '40'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic ELT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>ELT()</primary>
@@ -2259,13 +2259,13 @@
 mysql&gt; <userinput>SELECT ELT(4, 'ej', 'Heja', 'hej', 'foo');</userinput>
         -&gt; 'foo'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic EXPORT_SET
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>EXPORT_SET()</primary>
@@ -2302,13 +2302,13 @@
 mysql&gt; <userinput>SELECT EXPORT_SET(6,'1','0',',',10);</userinput>
         -&gt; '0,1,1,0,0,0,0,0,0,0'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FIELD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FIELD()</primary>
@@ -2355,13 +2355,13 @@
 mysql&gt; <userinput>SELECT FIELD('fo', 'Hej', 'ej', 'Heja', 'hej', 'foo');</userinput>
         -&gt; 0
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FIND_IN_SET
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FIND_IN_SET()</primary>
@@ -2402,13 +2402,13 @@
 mysql&gt; <userinput>SELECT FIND_IN_SET('b','a,b,c,d');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic HEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>HEX()</primary>
@@ -2450,13 +2450,13 @@
 mysql&gt; <userinput>SELECT HEX('abc');</userinput>
         -&gt; 616263
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic INSERT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>INSERT()</primary>
@@ -2498,13 +2498,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic INSTR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>INSTR()</primary>
@@ -2541,13 +2541,13 @@
           it is case sensitive only if at least one argument is a binary
           string.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LCASE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LCASE()</primary>
@@ -2564,13 +2564,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LEFT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LEFT()</primary>
@@ -2596,13 +2596,13 @@
 mysql&gt; <userinput>SELECT LEFT('foobarbar', 5);</userinput>
         -&gt; 'fooba'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LENGTH()</primary>
@@ -2632,13 +2632,13 @@
 mysql&gt; <userinput>SELECT LENGTH('text');</userinput>
         -&gt; 4
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOAD_FILE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FILE</primary>
@@ -2693,13 +2693,13 @@
     available at <ulink url="http://dev.mysql.com/doc/"/>.
    </para>
 -->
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOCATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOCATE()</primary>
@@ -2744,13 +2744,13 @@
           it is case-sensitive only if either argument is a binary
           string.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOWER
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOWER()</primary>
@@ -2781,13 +2781,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LPAD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LPAD()</primary>
@@ -2819,13 +2819,13 @@
 mysql&gt; <userinput>SELECT LPAD('hi',1,'??');</userinput>
         -&gt; 'h'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LTRIM
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LTRIM()</primary>
@@ -2855,13 +2855,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MAKE_SET
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MAKE_SET()</primary>
@@ -2901,13 +2901,13 @@
 mysql&gt; <userinput>SELECT MAKE_SET(0,'a','b','c');</userinput>
         -&gt; ''
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MID
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MID()</primary>
@@ -2925,13 +2925,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic OCT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>OCT()</primary>
@@ -2962,13 +2962,13 @@
 mysql&gt; <userinput>SELECT OCT(12);</userinput>
         -&gt; '14'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic OCTETLENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>OCTET_LENGTH()</primary>
@@ -2985,13 +2985,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic ORD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>ORD()</primary>
@@ -3031,13 +3031,13 @@
 mysql&gt; <userinput>SELECT ORD('2');</userinput>
         -&gt; 50
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic POSITION
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>POSITION()</primary>
@@ -3056,13 +3056,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic QUOTE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>QUOTE()</primary>
@@ -3096,13 +3096,13 @@
 mysql&gt; <userinput>SELECT QUOTE(NULL);</userinput>
         -&gt; NULL
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic REPEAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>REPEAT()</primary>
@@ -3133,13 +3133,13 @@
 mysql&gt; <userinput>SELECT REPEAT('MySQL', 3);</userinput>
         -&gt; 'MySQLMySQLMySQL'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic REPLACE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>REPLACE()</primary>
@@ -3170,13 +3170,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic REVERSE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>REVERSE()</primary>
@@ -3206,13 +3206,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic RIGHT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>RIGHT()</primary>
@@ -3242,13 +3242,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic RPAD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>RPAD()</primary>
@@ -3284,13 +3284,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic RTRIM
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>RTRIM()</primary>
@@ -3320,13 +3320,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SOUNDEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SOUNDEX()</primary>
@@ -3371,13 +3371,13 @@
           then duplicates, whereas the enhanced version discards
           duplicates first and then vowels.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SOUNDS LIKE SOUNDS LIKE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SOUNDS LIKE</primary>
@@ -3396,13 +3396,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SPACE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SPACE()</primary>
@@ -3428,13 +3428,13 @@
 mysql&gt; <userinput>SELECT SPACE(6);</userinput>
         -&gt; '      '
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBSTRING
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBSTRING()</primary>
@@ -3507,13 +3507,13 @@
           <literal>SUBSTR()</literal> is a synonym for
           <literal>SUBSTRING()</literal>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBSTRING_INDEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBSTRING_INDEX()</primary>
@@ -3552,13 +3552,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TRIM BOTH LEADING TRAILING FROM
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TRIM()</primary>
@@ -3603,13 +3603,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UCASE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UCASE()</primary>
@@ -3626,13 +3626,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNCOMPRESS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNCOMPRESS()</primary>
@@ -3664,13 +3664,13 @@
 mysql&gt; <userinput>SELECT UNCOMPRESS('any string');</userinput>
         -&gt; NULL
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNCOMPRESSED_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNCOMPRESSED_LENGTH()</primary>
@@ -3695,13 +3695,13 @@
 mysql&gt; <userinput>SELECT UNCOMPRESSED_LENGTH(COMPRESS(REPEAT('a',30)));</userinput>
         -&gt; 30
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNHEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNHEX()</primary>
@@ -3737,13 +3737,13 @@
 mysql&gt; <userinput>SELECT HEX(UNHEX('1267'));</userinput>
         -&gt; '1267'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UPPER
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UPPER()</primary>
@@ -3838,11 +3838,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic LIKE ESCAPE
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic LIKE ESCAPE
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LIKE</primary>
@@ -3992,13 +3992,13 @@
             the pattern match is made, leaving a single backslash to be
             matched against.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT LIKE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT LIKE</primary>
@@ -4019,13 +4019,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT REGEXP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT REGEXP</primary>
@@ -4046,13 +4046,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic RLIKE REGEXP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary>mSQL compatibility</primary>
@@ -4139,13 +4139,13 @@
             <emphasis role="bold">Warning</emphasis>: These operators
             are not multi-byte safe.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic STRCMP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>STRCMP()</primary>
@@ -4229,11 +4229,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic +
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic +
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>+ (addition)</primary>
@@ -4262,13 +4262,13 @@
 mysql&gt; <userinput>SELECT 3+5;</userinput>
         -&gt; 8
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic - binary
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>- (subtraction)</primary>
@@ -4297,13 +4297,13 @@
 mysql&gt; <userinput>SELECT 3-5;</userinput>
         -&gt; -2
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic - unary
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>- (unary minus)</primary>
@@ -4345,13 +4345,13 @@
             avoid using <literal>-</literal> on integers that may be
             equal to -2<superscript>63</superscript> or less.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic *
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>* (multiplication)</primary>
@@ -4391,13 +4391,13 @@
             range of <literal>BIGINT</literal> calculations. (See
             <xref linkend="numeric-types"/>.)
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic /
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>/ (division)</primary>
@@ -4444,6 +4444,10 @@
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DIV FLOOR BIGINT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>DIV</primary>
@@ -4452,10 +4456,6 @@
             <literal>DIV</literal>
           </para>
 
-          <remark>
-            description_for_help_topic DIV FLOOR BIGINT
-          </remark>
-
           <para>
             Integer division. Similar to <literal>FLOOR()</literal> but
             safe with <literal>BIGINT</literal> values.
@@ -4499,11 +4499,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic ABS
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic ABS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ABS()</primary>
@@ -4535,13 +4535,13 @@
             This function is safe to use with <literal>BIGINT</literal>
             values.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ACOS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ACOS()</primary>
@@ -4577,13 +4577,13 @@
 mysql&gt; <userinput>SELECT ACOS(0);</userinput>
         -&gt; 1.5707963267949
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ASIN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ASIN()</primary>
@@ -4617,13 +4617,13 @@
 mysql&gt; <userinput>SELECT ASIN('foo');</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ATAN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ATAN()</primary>
@@ -4655,13 +4655,13 @@
 mysql&gt; <userinput>SELECT ATAN(-2);</userinput>
         -&gt; -1.1071487177941
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ATAN2
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ATAN2()</primary>
@@ -4700,13 +4700,13 @@
 mysql&gt; <userinput>SELECT ATAN2(PI(),0);</userinput>
         -&gt; 1.5707963267949
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic CEILING CEIL
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>CEILING()</primary>
@@ -4740,13 +4740,13 @@
             These two functions are synonymous. Note that the return
             value is converted to a <literal>BIGINT</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic COS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>COS()</primary>
@@ -4776,13 +4776,13 @@
 mysql&gt; <userinput>SELECT COS(PI());</userinput>
         -&gt; -1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic COT
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>COT()</primary>
@@ -4813,13 +4813,13 @@
 mysql&gt; <userinput>SELECT COT(0);</userinput>
         -&gt; NULL
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic CRC32
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>CRC32()</primary>
@@ -4888,13 +4888,13 @@
 mysql&gt; <userinput>SELECT DEGREES(PI() / 2);</userinput>
         -&gt; 90
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic EXP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>EXP()</primary>
@@ -4927,13 +4927,13 @@
 mysql&gt; <userinput>SELECT EXP(-2);</userinput>
         -&gt; 0.13533528323661
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic FLOOR
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>FLOOR()</primary>
@@ -4966,13 +4966,13 @@
             Note that the return value is converted to a
             <literal>BIGINT</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LN()</primary>
@@ -5007,13 +5007,13 @@
             This function is synonymous with
             <literal>LOG(<replaceable>X</replaceable>)</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LOG
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LOG()</primary>
@@ -5061,13 +5061,13 @@
             is equivalent to <literal>LOG(<replaceable>X</replaceable>)
             / LOG(<replaceable>B</replaceable>)</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LOG2
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LOG2()</primary>
@@ -5103,13 +5103,13 @@
             <literal>LOG(<replaceable>X</replaceable>) /
             LOG(2)</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LOG10
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LOG10()</primary>
@@ -5149,13 +5149,13 @@
             equivalent to
             <literal>LOG(10,<replaceable>X</replaceable>)</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic % MOD
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>MOD()</primary>
@@ -5224,13 +5224,13 @@
 mysql&gt; <userinput>SELECT MOD(34.5,3);</userinput>
         -&gt; 1.5
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic PI
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>PI()</primary>
@@ -5259,13 +5259,13 @@
 mysql&gt; <userinput>SELECT PI()+0.000000000000000000;</userinput>
         -&gt; 3.141592653589793116
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic POWER POW
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>POW()</primary>
@@ -5303,13 +5303,13 @@
 mysql&gt; <userinput>SELECT POW(2,-2);</userinput>
         -&gt; 0.25
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic RADIANS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>RADIANS()</primary>
@@ -5340,13 +5340,13 @@
 mysql&gt; <userinput>SELECT RADIANS(90);</userinput>
         -&gt; 1.5707963267949
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic RAND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>RAND()</primary>
@@ -5427,13 +5427,13 @@
             hoc random numbers that is portable between platforms for
             the same MySQL version.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ROUND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ROUND()</primary>
@@ -5545,13 +5545,13 @@
           <para>
             For more information, see <xref linkend="precision-math"/>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic SIGN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>SIGN()</primary>
@@ -5583,13 +5583,13 @@
 mysql&gt; <userinput>SELECT SIGN(234);</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic SIN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>SIN()</primary>
@@ -5617,13 +5617,13 @@
 mysql&gt; <userinput>SELECT ROUND(SIN(PI()));</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic SQRT
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>SQRT()</primary>
@@ -5663,13 +5663,13 @@
 mysql&gt; <userinput>SELECT SQRT(-16);</userinput>
         -&gt; NULL        
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic TAN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>TAN()</primary>
@@ -5701,13 +5701,13 @@
 mysql&gt; <userinput>SELECT TAN(PI()+1);</userinput>
         -&gt; 1.5574077246549
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic TRUNCATE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>TRUNCATE()</primary>
@@ -5869,11 +5869,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic ADDDATE
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic ADDDATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ADDDATE()</primary>
@@ -5920,13 +5920,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic ADDTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>ADDTIME()</primary>
@@ -5967,13 +5967,13 @@
 mysql&gt; <userinput>SELECT ADDTIME('01:00:00.999999', '02:00:00.999998');</userinput>
         -&gt; '03:00:01.999997'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONVERT_TZ
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONVERT_TZ()</primary>
@@ -6022,13 +6022,13 @@
           be properly set up. See <xref linkend="time-zone-support"/>
           for instructions.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURDATE()</primary>
@@ -6058,13 +6058,13 @@
 mysql&gt; <userinput>SELECT CURDATE() + 0;</userinput>
         -&gt; 19971215
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURRENT_DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURRENT_DATE</primary>
@@ -6083,13 +6083,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURTIME()</primary>
@@ -6119,13 +6119,13 @@
 mysql&gt; <userinput>SELECT CURTIME() + 0;</userinput>
         -&gt; 235026
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURRENT_TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURRENT_TIME</primary>
@@ -6144,13 +6144,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURRENT_TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURRENT_TIMESTAMP</primary>
@@ -6168,13 +6168,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATE function DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATE()</primary>
@@ -6243,16 +6243,16 @@
 mysql&gt; <userinput>SELECT DATEDIFF('1997-11-30 23:59:59','1997-12-31');</userinput>
         -&gt; -31
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATE OPERATIONS DATE DATE_ADD
           DATE_SUB SECOND MINUTE HOUR DAY MONTH YEAR MINUTE_SECOND
           HOUR_MINUTE DAY_HOUR YEAR_MONTH HOUR_SECOND DAY_MINUTE
           DAY_SECOND INTERVAL
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATE_ADD()</primary>
@@ -6522,13 +6522,13 @@
 mysql&gt; <userinput>SELECT DATE_ADD('1998-01-30', INTERVAL 1 MONTH);</userinput>
         -&gt; '1998-02-28'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATE_FORMAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATE_FORMAT()</primary>
@@ -6734,13 +6734,13 @@
 mysql&gt; <userinput>SELECT DATE_FORMAT('1999-01-01', '%X %V');</userinput>
         -&gt; '1998 52'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAY
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAY()</primary>
@@ -6757,13 +6757,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYNAME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYNAME()</primary>
@@ -6789,13 +6789,13 @@
 mysql&gt; <userinput>SELECT DAYNAME('1998-02-05');</userinput>
         -&gt; 'Thursday'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYOFMONTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYOFMONTH()</primary>
@@ -6822,13 +6822,13 @@
 mysql&gt; <userinput>SELECT DAYOFMONTH('1998-02-03');</userinput>
         -&gt; 3
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYOFWEEK
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYOFWEEK()</primary>
@@ -6855,13 +6855,13 @@
 mysql&gt; <userinput>SELECT DAYOFWEEK('1998-02-03');</userinput>
         -&gt; 3
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYOFYEAR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYOFYEAR()</primary>
@@ -6887,13 +6887,13 @@
 mysql&gt; <userinput>SELECT DAYOFYEAR('1998-02-03');</userinput>
         -&gt; 34
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic EXTRACT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>EXTRACT()</primary>
@@ -6929,13 +6929,13 @@
     -&gt;                <userinput>FROM '2003-01-02 10:30:00.00123');</userinput>
         -&gt; 123
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FROM_DAYS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FROM_DAYS()</primary>
@@ -6968,13 +6968,13 @@
           of the Gregorian calendar (1582). See
           <xref linkend="mysql-calendar"/>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FROM_UNIXTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FROM_UNIXTIME()</primary>
@@ -7025,13 +7025,13 @@
     -&gt;                      <userinput>'%Y %D %M %h:%i:%s %x');</userinput>
         -&gt; '2003 6th August 06:22:58 2003'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic GET_FORMAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>GET_FORMAT()</primary>
@@ -7185,13 +7185,13 @@
         <remark>
           INSERT STOP
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic HOUR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>HOUR()</primary>
@@ -7229,13 +7229,13 @@
 mysql&gt; <userinput>SELECT HOUR('272:59:59');</userinput>
         -&gt; 272
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LAST_DAY
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LAST_DAY()</primary>
@@ -7268,13 +7268,13 @@
 mysql&gt; <userinput>SELECT LAST_DAY('2003-03-32');</userinput>
         -&gt; NULL
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOCALTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOCALTIME</primary>
@@ -7292,13 +7292,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOCALTIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOCALTIMESTAMP</primary>
@@ -7317,13 +7317,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MAKEDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MAKEDATE()</primary>
@@ -7354,13 +7354,13 @@
 mysql&gt; <userinput>SELECT MAKEDATE(2001,0);</userinput>
         -&gt; NULL
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MAKETIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MAKETIME()</primary>
@@ -7388,13 +7388,13 @@
 mysql&gt; <userinput>SELECT MAKETIME(12,15,30);</userinput>
         -&gt; '12:15:30'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MICROSECOND
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MICROSECOND()</primary>
@@ -7423,13 +7423,13 @@
 mysql&gt; <userinput>SELECT MICROSECOND('1997-12-31 23:59:59.000010');</userinput>
         -&gt; 10
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MINUTE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MINUTE()</primary>
@@ -7455,13 +7455,13 @@
 mysql&gt; <userinput>SELECT MINUTE('98-02-03 10:05:03');</userinput>
         -&gt; 5
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MONTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MONTH()</primary>
@@ -7487,13 +7487,13 @@
 mysql&gt; <userinput>SELECT MONTH('1998-02-03');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MONTHNAME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MONTHNAME()</primary>
@@ -7519,13 +7519,13 @@
 mysql&gt; <userinput>SELECT MONTHNAME('1998-02-05');</userinput>
         -&gt; 'February'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic NOW
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>NOW()</primary>
@@ -7562,13 +7562,13 @@
           routine or triggering statement began to execute. This differs
           from the behavior for <literal>SYSDATE()</literal>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic PERIOD_ADD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>PERIOD_ADD()</primary>
@@ -7598,13 +7598,13 @@
 mysql&gt; <userinput>SELECT PERIOD_ADD(9801,2);</userinput>
         -&gt; 199803
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic PERIOD_DIFF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>PERIOD_DIFF()</primary>
@@ -7636,13 +7636,13 @@
 mysql&gt; <userinput>SELECT PERIOD_DIFF(9802,199703);</userinput>
         -&gt; 11
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic QUARTER
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>QUARTER()</primary>
@@ -7669,13 +7669,13 @@
 mysql&gt; <userinput>SELECT QUARTER('98-04-01');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SECOND
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SECOND()</primary>
@@ -7701,13 +7701,13 @@
 mysql&gt; <userinput>SELECT SECOND('10:05:03');</userinput>
         -&gt; 3
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SEC_TO_TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SEC_TO_TIME()</primary>
@@ -7742,13 +7742,13 @@
         <remark>
           INSERT START
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic STR_TO_DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>STR_TO_DATE()</primary>
@@ -7841,13 +7841,13 @@
 mysql&gt; <userinput>SELECT STR_TO_DATE('04/31/2004', '%m/%d/%Y');</userinput>
         -&gt; '2004-04-31'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBDATE()</primary>
@@ -7903,13 +7903,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBTIME()</primary>
@@ -7945,13 +7945,13 @@
 mysql&gt; <userinput>SELECT SUBTIME('01:00:00.999999', '02:00:00.999998');</userinput>
         -&gt; '-00:59:59.999999'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SYSDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SYSDATE()</primary>
@@ -7978,13 +7978,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIME function TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIME()</primary>
@@ -8012,13 +8012,13 @@
 mysql&gt; <userinput>SELECT TIME('2003-12-31 01:02:03.000123');</userinput>
         -&gt; '01:02:03.000123'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIMEDIFF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIMEDIFF()</primary>
@@ -8056,13 +8056,13 @@
     -&gt;                 <userinput>'1997-12-30 01:01:01.000002');</userinput>
         -&gt; '46:58:57.999999'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIMESTAMP function TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIMESTAMP()</primary>
@@ -8096,13 +8096,13 @@
 mysql&gt; <userinput>SELECT TIMESTAMP('2003-12-31 12:00:00','12:00:00');</userinput>
         -&gt; '2004-01-01 00:00:00'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIMESTAMPADD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIMESTAMPADD()</primary>
@@ -8151,13 +8151,13 @@
           <literal>TIMESTAMPADD()</literal> is available as of MySQL
           5.0.0.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIMESTAMPDIFF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIMESTAMPDIFF()</primary>
@@ -8196,13 +8196,13 @@
           <literal>TIMESTAMPDIFF()</literal> is available as of MySQL
           5.0.0.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIME_FORMAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIME_FORMAT()</primary>
@@ -8236,13 +8236,13 @@
 mysql&gt; <userinput>SELECT TIME_FORMAT('100:00:00', '%H %k %h %I %l');</userinput>
         -&gt; '100 100 04 04 4'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIME_TO_SEC
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIME_TO_SEC()</primary>
@@ -8270,13 +8270,13 @@
 mysql&gt; <userinput>SELECT TIME_TO_SEC('00:39:38');</userinput>
         -&gt; 2378
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TO_DAYS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TO_DAYS()</primary>
@@ -8331,13 +8331,13 @@
           locales), results from this function are not reliable. See
           <xref linkend="mysql-calendar"/> for details.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNIX_TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNIX_TIMESTAMP()</primary>
@@ -8395,13 +8395,13 @@
           columns, you might want to cast the result to signed integers.
           See <xref linkend="cast-functions"/>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UTC_DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UTC_DATE()</primary>
@@ -8429,13 +8429,13 @@
 mysql&gt; <userinput>SELECT UTC_DATE(), UTC_DATE() + 0;</userinput>
         -&gt; '2003-08-14', 20030814
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UTC_TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UTC_TIME()</primary>
@@ -8463,13 +8463,13 @@
 mysql&gt; <userinput>SELECT UTC_TIME(), UTC_TIME() + 0;</userinput>
         -&gt; '18:07:53', 180753
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UTC_TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UTC_TIMESTAMP()</primary>
@@ -8498,13 +8498,13 @@
 mysql&gt; <userinput>SELECT UTC_TIMESTAMP(), UTC_TIMESTAMP() + 0;</userinput>
         -&gt; '2003-08-14 18:08:04', 20030814180804
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic WEEK
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>WEEK()</primary>
@@ -8669,13 +8669,13 @@
 mysql&gt; <userinput>SELECT MID(YEARWEEK('2000-01-01'),5,2);</userinput>
         -&gt; '52'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic WEEKDAY
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>WEEKDAY()</primary>
@@ -8704,13 +8704,13 @@
 mysql&gt; <userinput>SELECT WEEKDAY('1997-11-05');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic WEEKOFYEAR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>WEEKOFYEAR()</primary>
@@ -8738,13 +8738,13 @@
 mysql&gt; <userinput>SELECT WEEKOFYEAR('1998-02-20');</userinput>
         -&gt; 8
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic YEAR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>YEAR()</primary>
@@ -8770,13 +8770,13 @@
 mysql&gt; <userinput>SELECT YEAR('98-02-03');</userinput>
         -&gt; 1998
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic YEARWEEK
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>YEARWEEK()</primary>
@@ -8948,6 +8948,11 @@
     <itemizedlist>
 
       <listitem>
+        <remark>
+          description_for_help_topic MATCH AGAINST MATCH AGAINST BOOLEAN
+          IN MODE MATCH AGAINST QUERY EXPANSION WITH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>MATCH ... AGAINST()</primary>
@@ -8959,11 +8964,6 @@
           WITH QUERY EXPANSION])</literal>
         </para>
 
-        <remark>
-          description_for_help_topic MATCH AGAINST MATCH AGAINST BOOLEAN
-          IN MODE MATCH AGAINST QUERY EXPANSION WITH
-        </remark>
-
         <para>
           MySQL has support for full-text indexing and searching. A
           full-text index in MySQL is an index of type
@@ -10024,11 +10024,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic BINARY operator
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic BINARY operator
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>BINARY</primary>
@@ -10113,6 +10113,11 @@
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CAST CONVERT SIGNED UNSIGNED BINARY
+          CHAR DATE DATETIME TIME
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CAST</primary>
@@ -10129,11 +10134,6 @@
           <replaceable>transcoding_name</replaceable>)</literal>
         </para>
 
-        <remark>
-          description_for_help_topic CAST CONVERT SIGNED UNSIGNED BINARY
-          CHAR DATE DATETIME TIME
-        </remark>
-
         <para>
           The <literal>CAST()</literal> and <literal>CONVERT()</literal>
           functions can be used to take a value of one type and produce
@@ -10415,7 +10415,7 @@
 
         <listitem>
           <remark>
-            description_for_help_topic &amp;amp;
+            description_for_help_topic &amp;
           </remark>
 
           <para>
@@ -10451,13 +10451,13 @@
           <para>
             The result is an unsigned 64-bit integer.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ^
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>^ (bitwise XOR)</primary>
@@ -10499,7 +10499,7 @@
 
         <listitem>
           <remark>
-            description_for_help_topic &amp;lt;&amp;lt;
+            description_for_help_topic &lt;&lt;
           </remark>
 
           <para>
@@ -10520,7 +10520,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;&amp;lt;
+            example_for_help_topic &lt;&lt;
           </remark>
 
 <programlisting>
@@ -10535,7 +10535,7 @@
 
         <listitem>
           <remark>
-            description_for_help_topic &amp;gt;&amp;gt;
+            description_for_help_topic &gt;&gt;
           </remark>
 
           <para>
@@ -10556,7 +10556,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;gt;&amp;gt;
+            example_for_help_topic &gt;&gt;
           </remark>
 
 <programlisting>
@@ -10768,13 +10768,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ENCODE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ENCODE()</primary>
@@ -11581,6 +11581,10 @@
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DATABASE
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>DATABASE()</primary>
@@ -11589,10 +11593,6 @@
             <literal>DATABASE()</literal>
           </para>
 
-          <remark>
-            description_for_help_topic DATABASE
-          </remark>
-
           <para>
             Returns the default (current) database name. In MySQL
             &current-series;, the string has the <literal>utf8</literal>
@@ -11620,6 +11620,10 @@
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic FOUND_ROWS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>FOUND_ROWS()</primary>
@@ -11631,10 +11635,6 @@
 
             <literal>FOUND_ROWS()</literal>
           </para>
-
-          <remark>
-            description_for_help_topic FOUND_ROWS
-          </remark>
 
           <para>
             A <literal>SELECT</literal> statement may include a

--- 1.61/refman-4.1/functions.xml	2005-09-10 18:53:55 -05:00
+++ 1.62/refman-4.1/functions.xml	2005-09-11 17:07:17 -05:00
@@ -6,7 +6,7 @@
     %fixedchars.entities;
     <!ENTITY % title.entities         SYSTEM "refman-common/titles.en.ent">
     %title.entities;
-    <!ENTITY % versions.entities   SYSTEM "versions.ent">
+    <!ENTITY % versions.entities      SYSTEM "versions.ent">
     %versions.entities;
 ]>
 <chapter id="functions">
@@ -329,11 +329,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic =
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic =
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>= (equal)</primary>
@@ -370,13 +370,13 @@
 mysql&gt; <userinput>SELECT '.01' = 0.01;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;lt;=&amp;gt;
+            description_for_help_topic &lt;=&gt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>NULL</literal></primary>
@@ -405,7 +405,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;=&amp;gt;
+            example_for_help_topic &lt;=&gt;
           </remark>
 
 <programlisting>
@@ -418,13 +418,13 @@
           <para>
             <literal>&lt;=&gt;</literal> was added in MySQL 3.23.0.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic != &amp;lt;&amp;gt;
+            description_for_help_topic != &lt;&gt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&lt;&gt; (not equal)</primary>
@@ -465,13 +465,13 @@
 mysql&gt; <userinput>SELECT 'zapp' &lt;&gt; 'zappp';</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;lt;=
+            description_for_help_topic &lt;=
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&lt;= (less than or equal)</primary>
@@ -493,20 +493,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;=
+            example_for_help_topic &lt;=
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 0.1 &lt;= 2;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;lt;
+            description_for_help_topic &lt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&lt; (less than)</primary>
@@ -528,20 +528,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;
+            example_for_help_topic &lt;
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &lt; 2;</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;gt;=
+            description_for_help_topic &gt;=
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&gt;= (greater than or equal)</primary>
@@ -563,20 +563,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;gt;=
+            example_for_help_topic &gt;=
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &gt;= 2;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;gt;
+            description_for_help_topic &gt;
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>&gt; (greater than)</primary>
@@ -598,20 +598,20 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;gt;
+            example_for_help_topic &gt;
           </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &gt; 2;</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic IS NULL NULL IS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>NULL</literal></primary>
@@ -705,13 +705,13 @@
             </listitem>
 
           </itemizedlist>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic BETWEEN AND BETWEEN AND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>BETWEEN ... AND</primary>
@@ -759,13 +759,13 @@
 mysql&gt; <userinput>SELECT 2 BETWEEN 2 AND 'x-3';</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT BETWEEN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT BETWEEN</primary>
@@ -786,13 +786,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic COALESCE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary><literal>NULL</literal></primary>
@@ -829,13 +829,13 @@
           <para>
             <literal>COALESCE()</literal> was added in MySQL 3.23.3.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic GREATEST
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>GREATEST()</primary>
@@ -877,13 +877,13 @@
             Before MySQL 3.22.5, you can use <literal>MAX()</literal>
             instead of <literal>GREATEST()</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic IN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>IN</primary>
@@ -943,13 +943,13 @@
             used to write certain types of subqueries. See
             <xref linkend="any-in-some-subqueries"/>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT IN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT IN</primary>
@@ -968,13 +968,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ISNULL
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ISNULL()</primary>
@@ -1015,13 +1015,13 @@
             behaviors with the <literal>IS NULL</literal> comparison
             operator. See the description of <literal>IS NULL</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic INTERVAL
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>INTERVAL()</primary>
@@ -1061,13 +1061,13 @@
 mysql&gt; <userinput>SELECT INTERVAL(22, 23, 30, 44, 200);</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LEAST
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LEAST()</primary>
@@ -1193,11 +1193,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic ! NOT
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic ! NOT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT</primary>
@@ -1244,13 +1244,13 @@
             expression evaluates the same way as
             <literal>(!1)+1</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
-            description_for_help_topic &amp;amp;&amp;amp; AND
+            description_for_help_topic &amp;&amp; AND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>AND</primary>
@@ -1277,7 +1277,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;amp;&amp;amp;
+            example_for_help_topic &amp;&amp;
           </remark>
 
 <programlisting>
@@ -1304,13 +1304,13 @@
             result is always as prescribed by the SQL standards while
             still using the optimization wherever possible.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic || OR
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>OR</primary>
@@ -1356,13 +1356,13 @@
 mysql&gt; <userinput>SELECT 1 || NULL;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic XOR
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>XOR</primary>
@@ -1434,11 +1434,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic CASE WHEN THEN ELSE END
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic CASE WHEN THEN ELSE END
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CASE</primary>
@@ -1479,12 +1479,12 @@
 <programlisting>
 mysql&gt; <userinput>SELECT CASE 1 WHEN 1 THEN 'one'</userinput>
     -&gt;     <userinput>WHEN 2 THEN 'two' ELSE 'more' END;</userinput>
-    -&gt; <userinput>'one'</userinput>
+        -&gt; 'one'
 mysql&gt; <userinput>SELECT CASE WHEN 1&gt;0 THEN 'true' ELSE 'false' END;</userinput>
         -&gt; 'true'
 mysql&gt; <userinput>SELECT CASE BINARY 'B'</userinput>
     -&gt;     <userinput>WHEN 'a' THEN 1 WHEN 'b' THEN 2 END;</userinput>
-    -&gt; <userinput>NULL</userinput>
+        -&gt; NULL
 </programlisting>
 
         <para>
@@ -1507,13 +1507,13 @@
         <para>
           <literal>CASE</literal> was added in MySQL 3.23.3.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic IF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>IF()</primary>
@@ -1622,13 +1622,13 @@
           is case sensitive if either string is case sensitive (starting
           from MySQL 3.23.51).
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic IFNULL
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm>
             <primary><literal>NULL</literal></primary>
@@ -1690,13 +1690,13 @@
           column is <literal>CHAR(4)</literal>, whereas in earlier
           versions the type would be <literal>BIGINT</literal>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic NULLIF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>NULLIF()</primary>
@@ -1779,11 +1779,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic ASCII
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic ASCII
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ASCII()</primary>
@@ -1822,13 +1822,13 @@
         <para>
           See also the <literal>ORD()</literal> function.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic BIN
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>BIN()</primary>
@@ -1859,13 +1859,13 @@
 mysql&gt; <userinput>SELECT BIN(12);</userinput>
         -&gt; '1100'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic BIT_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>BIT_LENGTH()</primary>
@@ -1895,13 +1895,13 @@
         <para>
           <literal>BIT_LENGTH()</literal> was added in MySQL 4.0.2.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CHAR function
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CHAR()</primary>
@@ -1931,13 +1931,13 @@
 mysql&gt; <userinput>SELECT CHAR(77,77.3,'77.3');</userinput>
         -&gt; 'MMM'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CHAR_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CHAR_LENGTH()</primary>
@@ -1959,13 +1959,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CHARACTER_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CHARACTER_LENGTH()</primary>
@@ -1982,13 +1982,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic COMPRESS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>COMPRESS()</primary>
@@ -2056,13 +2056,13 @@
         <para>
           <literal>COMPRESS()</literal> was added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONCAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONCAT()</primary>
@@ -2100,13 +2100,13 @@
 mysql&gt; <userinput>SELECT CONCAT(14.3);</userinput>
         -&gt; '14.3'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONCAT_WS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONCAT_WS()</primary>
@@ -2146,13 +2146,13 @@
           Before MySQL 4.0.14, <literal>CONCAT_WS()</literal> skips
           empty strings as well as <literal>NULL</literal> values.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONV
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONV()</primary>
@@ -2197,13 +2197,13 @@
 mysql&gt; <userinput>SELECT CONV(10+'10'+'10'+0xa,10,10);</userinput>
         -&gt; '40'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic ELT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>ELT()</primary>
@@ -2238,13 +2238,13 @@
 mysql&gt; <userinput>SELECT ELT(4, 'ej', 'Heja', 'hej', 'foo');</userinput>
         -&gt; 'foo'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic EXPORT_SET
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>EXPORT_SET()</primary>
@@ -2281,13 +2281,13 @@
 mysql&gt; <userinput>SELECT EXPORT_SET(6,'1','0',',',10);</userinput>
         -&gt; '0,1,1,0,0,0,0,0,0,0'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FIELD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FIELD()</primary>
@@ -2334,13 +2334,13 @@
 mysql&gt; <userinput>SELECT FIELD('fo', 'Hej', 'ej', 'Heja', 'hej', 'foo');</userinput>
         -&gt; 0
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FIND_IN_SET
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FIND_IN_SET()</primary>
@@ -2382,13 +2382,13 @@
 mysql&gt; <userinput>SELECT FIND_IN_SET('b','a,b,c,d');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic HEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>HEX()</primary>
@@ -2430,13 +2430,13 @@
 mysql&gt; <userinput>SELECT HEX('abc');</userinput>
         -&gt; 616263
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic INSERT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>INSERT()</primary>
@@ -2478,13 +2478,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic INSTR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>INSTR()</primary>
@@ -2521,13 +2521,13 @@
           is case sensitive. For 4.0 on, it is case sensitive only if
           either argument is a binary string.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LCASE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LCASE()</primary>
@@ -2544,13 +2544,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LEFT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LEFT()</primary>
@@ -2576,13 +2576,13 @@
 mysql&gt; <userinput>SELECT LEFT('foobarbar', 5);</userinput>
         -&gt; 'fooba'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LENGTH()</primary>
@@ -2613,13 +2613,13 @@
 mysql&gt; <userinput>SELECT LENGTH('text');</userinput>
         -&gt; 4
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOAD_FILE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FILE</primary>
@@ -2669,13 +2669,13 @@
           the MySQL++ manual, available at
           <ulink url="http://tangentsoft.net/mysql++/doc/"/>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOCATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOCATE()</primary>
@@ -2720,13 +2720,13 @@
           is case sensitive. For 4.0 on, it is case sensitive only if
           either argument is a binary string.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOWER
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOWER()</primary>
@@ -2757,13 +2757,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LPAD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LPAD()</primary>
@@ -2795,13 +2795,13 @@
 mysql&gt; <userinput>SELECT LPAD('hi',1,'??');</userinput>
         -&gt; 'h'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LTRIM
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LTRIM()</primary>
@@ -2831,13 +2831,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MAKE_SET
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MAKE_SET()</primary>
@@ -2877,13 +2877,13 @@
 mysql&gt; <userinput>SELECT MAKE_SET(0,'a','b','c');</userinput>
         -&gt; ''
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MID
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MID()</primary>
@@ -2901,13 +2901,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic OCT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>OCT()</primary>
@@ -2938,13 +2938,13 @@
 mysql&gt; <userinput>SELECT OCT(12);</userinput>
         -&gt; '14'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic OCTETLENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>OCTET_LENGTH()</primary>
@@ -2961,13 +2961,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic ORD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>ORD()</primary>
@@ -3007,13 +3007,13 @@
 mysql&gt; <userinput>SELECT ORD('2');</userinput>
         -&gt; 50
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic POSITION
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>POSITION()</primary>
@@ -3032,13 +3032,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic QUOTE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>QUOTE()</primary>
@@ -3074,13 +3074,13 @@
 mysql&gt; <userinput>SELECT QUOTE(NULL);</userinput>
         -&gt; NULL
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic REPEAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>REPEAT()</primary>
@@ -3111,13 +3111,13 @@
 mysql&gt; <userinput>SELECT REPEAT('MySQL', 3);</userinput>
         -&gt; 'MySQLMySQLMySQL'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic REPLACE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>REPLACE()</primary>
@@ -3148,13 +3148,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic REVERSE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>REVERSE()</primary>
@@ -3184,13 +3184,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic RIGHT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>RIGHT()</primary>
@@ -3220,13 +3220,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic RPAD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>RPAD()</primary>
@@ -3262,13 +3262,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic RTRIM
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>RTRIM()</primary>
@@ -3298,13 +3298,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SOUNDEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SOUNDEX()</primary>
@@ -3348,13 +3348,13 @@
           then duplicates, whereas the enhanced version discards
           duplicates first and then vowels.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SOUNDS LIKE SOUNDS LIKE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SOUNDS LIKE</primary>
@@ -3374,13 +3374,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SPACE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SPACE()</primary>
@@ -3406,13 +3406,13 @@
 mysql&gt; <userinput>SELECT SPACE(6);</userinput>
         -&gt; '      '
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBSTRING
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBSTRING()</primary>
@@ -3485,13 +3485,13 @@
           <literal>SUBSTR()</literal> is a synonym for
           <literal>SUBSTRING()</literal>, added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBSTRING_INDEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBSTRING_INDEX()</primary>
@@ -3530,13 +3530,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TRIM BOTH LEADING TRAILING FROM
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TRIM()</primary>
@@ -3581,13 +3581,13 @@
         <para>
           This function is multi-byte safe.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UCASE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UCASE()</primary>
@@ -3604,13 +3604,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNCOMPRESS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNCOMPRESS()</primary>
@@ -3646,13 +3646,13 @@
         <para>
           <literal>UNCOMPRESS()</literal> was added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNCOMPRESSED_LENGTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNCOMPRESSED_LENGTH()</primary>
@@ -3682,13 +3682,13 @@
           <literal>UNCOMPRESSED_LENGTH()</literal> was added in MySQL
           4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNHEX
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNHEX()</primary>
@@ -3728,13 +3728,13 @@
         <para>
           <literal>UNHEX()</literal> was added in MySQL 4.1.2.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UPPER
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UPPER()</primary>
@@ -3837,11 +3837,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic LIKE ESCAPE
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic LIKE ESCAPE
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LIKE</primary>
@@ -3991,13 +3991,13 @@
             pattern match is done, leaving a single backslash to be
             matched).
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT LIKE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT LIKE</primary>
@@ -4018,13 +4018,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic NOT REGEXP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>NOT REGEXP</primary>
@@ -4045,13 +4045,13 @@
           <remark>
             end_description_for_help_topic
           </remark>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic RLIKE REGEXP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm>
               <primary>mSQL compatibility</primary>
@@ -4139,13 +4139,13 @@
             deciding the type of a character. However, these operators
             are not multi-byte safe.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic STRCMP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>STRCMP()</primary>
@@ -4232,11 +4232,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic +
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic +
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>+ (addition)</primary>
@@ -4265,13 +4265,13 @@
 mysql&gt; <userinput>SELECT 3+5;</userinput>
         -&gt; 8
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic - binary
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>- (subtraction)</primary>
@@ -4300,13 +4300,13 @@
 mysql&gt; <userinput>SELECT 3-5;</userinput>
         -&gt; -2
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic - unary
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>- (unary minus)</primary>
@@ -4348,13 +4348,13 @@
             using <literal>-</literal> on integers that may have the
             value of <literal>-2<superscript>63</superscript></literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic *
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>* (multiplication)</primary>
@@ -4393,13 +4393,13 @@
             result of the integer multiplication exceeds the 64-bit
             range of <literal>BIGINT</literal> calculations.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic /
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>/ (division)</primary>
@@ -4446,6 +4446,10 @@
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DIV FLOOR BIGINT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>DIV</primary>
@@ -4454,10 +4458,6 @@
             <literal>DIV</literal>
           </para>
 
-          <remark>
-            description_for_help_topic DIV FLOOR BIGINT
-          </remark>
-
           <para>
             Integer division. Similar to <literal>FLOOR()</literal> but
             safe with <literal>BIGINT</literal> values.
@@ -4505,11 +4505,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic ABS
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic ABS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ABS()</primary>
@@ -4541,13 +4541,13 @@
             This function is safe to use with <literal>BIGINT</literal>
             values.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ACOS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ACOS()</primary>
@@ -4580,13 +4580,13 @@
 mysql&gt; <userinput>SELECT ACOS(0);</userinput>
         -&gt; 1.570796
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ASIN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ASIN()</primary>
@@ -4617,13 +4617,13 @@
 mysql&gt; <userinput>SELECT ASIN('foo');</userinput>
         -&gt; 0.000000
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ATAN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ATAN()</primary>
@@ -4652,13 +4652,13 @@
 mysql&gt; <userinput>SELECT ATAN(-2);</userinput>
         -&gt; -1.107149
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ATAN2
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ATAN2()</primary>
@@ -4693,13 +4693,13 @@
 mysql&gt; <userinput>SELECT ATAN2(PI(),0);</userinput>
         -&gt; 1.570796
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic CEILING CEIL
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>CEILING()</primary>
@@ -4738,13 +4738,13 @@
             The <literal>CEIL()</literal> alias was added in MySQL
             4.0.6.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic COS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>COS()</primary>
@@ -4770,13 +4770,13 @@
 mysql&gt; <userinput>SELECT COS(PI());</userinput>
         -&gt; -1.000000
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic COT
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>COT()</primary>
@@ -4803,13 +4803,13 @@
 mysql&gt; <userinput>SELECT COT(0);</userinput>
         -&gt; NULL
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic CRC32
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>CRC32()</primary>
@@ -4841,13 +4841,13 @@
           <para>
             <literal>CRC32()</literal> is available as of MySQL 4.1.0.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic DEGREES
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>DEGREES()</primary>
@@ -4873,13 +4873,13 @@
 mysql&gt; <userinput>SELECT DEGREES(PI());</userinput>
         -&gt; 180.000000
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic EXP
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>EXP()</primary>
@@ -4908,13 +4908,13 @@
 mysql&gt; <userinput>SELECT EXP(-2);</userinput>
         -&gt; 0.135335
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic FLOOR
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>FLOOR()</primary>
@@ -4947,13 +4947,13 @@
             Note that the return value is converted to a
             <literal>BIGINT</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LN()</primary>
@@ -4987,13 +4987,13 @@
             with <literal>LOG(<replaceable>X</replaceable>)</literal> in
             MySQL.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LOG
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LOG()</primary>
@@ -5042,13 +5042,13 @@
             is equivalent to
             <literal>LOG(<replaceable>X</replaceable>)/LOG(<replaceable>B</replaceable>)</literal>.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LOG2
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LOG2()</primary>
@@ -5084,13 +5084,13 @@
             <literal>LOG(<replaceable>X</replaceable>)/LOG(2)</literal>
             instead.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic LOG10
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>LOG10()</primary>
@@ -5120,13 +5120,13 @@
 mysql&gt; <userinput>SELECT LOG10(-100);</userinput>
         -&gt; NULL
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic % MOD
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>MOD()</primary>
@@ -5208,13 +5208,13 @@
 mysql&gt; <userinput>SELECT MOD(34.5,3);</userinput>
         -&gt; 2
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic PI
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>PI()</primary>
@@ -5243,13 +5243,13 @@
 mysql&gt; <userinput>SELECT PI()+0.000000000000000000;</userinput>
         -&gt; 3.141592653589793116
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic POWER POW
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>POW()</primary>
@@ -5283,13 +5283,13 @@
 mysql&gt; <userinput>SELECT POW(2,-2);</userinput>
         -&gt; 0.250000
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic RADIANS
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>RADIANS()</primary>
@@ -5315,13 +5315,13 @@
 mysql&gt; <userinput>SELECT RADIANS(90);</userinput>
         -&gt; 1.570796
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic RAND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>RAND()</primary>
@@ -5395,13 +5395,13 @@
             <emphasis>ad hoc</emphasis> random numbers that is portable
             between platforms for the same MySQL version.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic ROUND
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>ROUND()</primary>
@@ -5461,13 +5461,13 @@
             <literal>TRUNCATE()</literal> or <literal>FLOOR()</literal>
             instead.
           </para>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic SIGN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>SIGN()</primary>
@@ -5499,13 +5499,13 @@
 mysql&gt; <userinput>SELECT SIGN(234);</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic SIN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>SIN()</primary>
@@ -5531,13 +5531,13 @@
 mysql&gt; <userinput>SELECT SIN(PI());</userinput>
         -&gt; 0.000000
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic SQRT
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>SQRT()</primary>
@@ -5565,13 +5565,13 @@
 mysql&gt; <userinput>SELECT SQRT(20);</userinput>
         -&gt; 4.472136
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic TAN
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>TAN()</primary>
@@ -5597,13 +5597,13 @@
 mysql&gt; <userinput>SELECT TAN(PI()+1);</userinput>
         -&gt; 1.557408
 </programlisting>
+        </listitem>
 
+        <listitem>
           <remark>
             description_for_help_topic TRUNCATE
           </remark>
-        </listitem>
 
-        <listitem>
           <para>
             <indexterm type="function">
               <primary>TRUNCATE()</primary>
@@ -5740,11 +5740,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic ADDDATE
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic ADDDATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ADDDATE()</primary>
@@ -5788,13 +5788,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic ADDTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>ADDTIME()</primary>
@@ -5835,13 +5835,13 @@
         <para>
           <literal>ADDTIME()</literal> was added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CONVERT_TZ
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CONVERT_TZ()</primary>
@@ -5893,13 +5893,13 @@
         <para>
           <literal>CONVERT_TZ()</literal> was added in MySQL 4.1.3.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURDATE()</primary>
@@ -5929,13 +5929,13 @@
 mysql&gt; <userinput>SELECT CURDATE() + 0;</userinput>
         -&gt; 19971215
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURRENT_DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURRENT_DATE</primary>
@@ -5954,13 +5954,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURTIME()</primary>
@@ -5990,13 +5990,13 @@
 mysql&gt; <userinput>SELECT CURTIME() + 0;</userinput>
         -&gt; 235026
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURRENT_TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURRENT_TIME</primary>
@@ -6015,13 +6015,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic CURRENT_TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>CURRENT_TIMESTAMP</primary>
@@ -6040,13 +6040,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATE function DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATE()</primary>
@@ -6076,13 +6076,13 @@
         <para>
           <literal>DATE()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATEDIFF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATEDIFF()</primary>
@@ -6123,16 +6123,16 @@
         <para>
           <literal>DATEDIFF()</literal> was added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATE OPERATIONS DATE DATE_ADD
           DATE_SUB SECOND MINUTE HOUR DAY MONTH YEAR MINUTE_SECOND
           HOUR_MINUTE DAY_HOUR YEAR_MONTH HOUR_SECOND DAY_MINUTE
           DAY_SECOND INTERVAL
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATE_ADD()</primary>
@@ -6407,13 +6407,13 @@
 mysql&gt; <userinput>SELECT DATE_ADD('1998-01-30', INTERVAL 1 MONTH);</userinput>
         -&gt; '1998-02-28'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DATE_FORMAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DATE_FORMAT()</primary>
@@ -6628,13 +6628,13 @@
 mysql&gt; <userinput>SELECT DATE_FORMAT('1999-01-01', '%X %V');</userinput>
         -&gt; '1998 52'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAY
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAY()</primary>
@@ -6652,13 +6652,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYNAME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYNAME()</primary>
@@ -6684,13 +6684,13 @@
 mysql&gt; <userinput>SELECT DAYNAME('1998-02-05');</userinput>
         -&gt; 'Thursday'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYOFMONTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYOFMONTH()</primary>
@@ -6717,13 +6717,13 @@
 mysql&gt; <userinput>SELECT DAYOFMONTH('1998-02-03');</userinput>
         -&gt; 3
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYOFWEEK
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYOFWEEK()</primary>
@@ -6751,13 +6751,13 @@
 mysql&gt; <userinput>SELECT DAYOFWEEK('1998-02-03');</userinput>
         -&gt; 3
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic DAYOFYEAR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>DAYOFYEAR()</primary>
@@ -6784,13 +6784,13 @@
 mysql&gt; <userinput>SELECT DAYOFYEAR('1998-02-03');</userinput>
         -&gt; 34
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic EXTRACT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>EXTRACT()</primary>
@@ -6830,13 +6830,13 @@
         <para>
           <literal>EXTRACT()</literal> was added in MySQL 3.23.0.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FROM_DAYS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FROM_DAYS()</primary>
@@ -6869,13 +6869,13 @@
           of the Gregorian calendar (1582). See
           <xref linkend="mysql-calendar"/>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic FROM_UNIXTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>FROM_UNIXTIME()</primary>
@@ -6926,13 +6926,13 @@
     -&gt;                      <userinput>'%Y %D %M %h:%i:%s %x');</userinput>
         -&gt; '2003 6th August 06:22:58 2003'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic GET_FORMAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>GET_FORMAT()</primary>
@@ -7080,13 +7080,13 @@
         <remark>
           INSERT STOP
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic HOUR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>HOUR()</primary>
@@ -7124,13 +7124,13 @@
 mysql&gt; <userinput>SELECT HOUR('272:59:59');</userinput>
         -&gt; 272
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LAST_DAY
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LAST_DAY()</primary>
@@ -7167,13 +7167,13 @@
         <para>
           <literal>LAST_DAY()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOCALTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOCALTIME</primary>
@@ -7195,13 +7195,13 @@
         <para>
           They were added in MySQL 4.0.6.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic LOCALTIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>LOCALTIMESTAMP</primary>
@@ -7224,13 +7224,13 @@
         <para>
           They were added in MySQL 4.0.6.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MAKEDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MAKEDATE()</primary>
@@ -7265,13 +7265,13 @@
         <para>
           <literal>MAKEDATE()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MAKETIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MAKETIME()</primary>
@@ -7303,13 +7303,13 @@
         <para>
           <literal>MAKETIME()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MICROSECOND
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MICROSECOND()</primary>
@@ -7343,13 +7343,13 @@
           <literal>MICROSECOND()</literal> is available as of MySQL
           4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MINUTE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MINUTE()</primary>
@@ -7375,13 +7375,13 @@
 mysql&gt; <userinput>SELECT MINUTE('98-02-03 10:05:03');</userinput>
         -&gt; 5
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MONTH
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MONTH()</primary>
@@ -7407,13 +7407,13 @@
 mysql&gt; <userinput>SELECT MONTH('1998-02-03');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic MONTHNAME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>MONTHNAME()</primary>
@@ -7439,13 +7439,13 @@
 mysql&gt; <userinput>SELECT MONTHNAME('1998-02-05');</userinput>
         -&gt; 'February'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic NOW
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>NOW()</primary>
@@ -7475,13 +7475,13 @@
 mysql&gt; <userinput>SELECT NOW() + 0;</userinput>
         -&gt; 19971215235026
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic PERIOD_ADD
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>PERIOD_ADD()</primary>
@@ -7511,13 +7511,13 @@
 mysql&gt; <userinput>SELECT PERIOD_ADD(9801,2);</userinput>
         -&gt; 199803
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic PERIOD_DIFF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>PERIOD_DIFF()</primary>
@@ -7549,13 +7549,13 @@
 mysql&gt; <userinput>SELECT PERIOD_DIFF(9802,199703);</userinput>
         -&gt; 11
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic QUARTER
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>QUARTER()</primary>
@@ -7582,13 +7582,13 @@
 mysql&gt; <userinput>SELECT QUARTER('98-04-01');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SECOND
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SECOND()</primary>
@@ -7614,13 +7614,13 @@
 mysql&gt; <userinput>SELECT SECOND('10:05:03');</userinput>
         -&gt; 3
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SEC_TO_TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SEC_TO_TIME()</primary>
@@ -7655,13 +7655,13 @@
         <remark>
           INSERT START
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic STR_TO_DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>STR_TO_DATE()</primary>
@@ -7752,13 +7752,13 @@
           <literal>STR_TO_DATE()</literal> is available as of MySQL
           4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBDATE()</primary>
@@ -7814,13 +7814,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SUBTIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SUBTIME()</primary>
@@ -7861,13 +7861,13 @@
         <para>
           <literal>SUBTIME()</literal> was added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic SYSDATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>SYSDATE()</primary>
@@ -7886,13 +7886,13 @@
         <remark>
           end_description_for_help_topic
         </remark>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIME function TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIME()</primary>
@@ -7924,13 +7924,13 @@
         <para>
           <literal>TIME()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIMEDIFF
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIMEDIFF()</primary>
@@ -7972,13 +7972,13 @@
         <para>
           <literal>TIMEDIFF()</literal> was added in MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIMESTAMP function TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIMESTAMP()</primary>
@@ -8016,13 +8016,13 @@
         <para>
           <literal>TIMESTAMP()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIME_FORMAT
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIME_FORMAT()</primary>
@@ -8056,13 +8056,13 @@
 mysql&gt; <userinput>SELECT TIME_FORMAT('100:00:00', '%H %k %h %I %l');</userinput>
         -&gt; '100 100 04 04 4'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TIME_TO_SEC
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TIME_TO_SEC()</primary>
@@ -8090,13 +8090,13 @@
 mysql&gt; <userinput>SELECT TIME_TO_SEC('00:39:38');</userinput>
         -&gt; 2378
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic TO_DAYS
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>TO_DAYS()</primary>
@@ -8149,13 +8149,13 @@
           For other dates before 1582, results from this function are
           undefined.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UNIX_TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UNIX_TIMESTAMP()</primary>
@@ -8213,13 +8213,13 @@
           columns, you might want to cast the result to signed integers.
           See <xref linkend="cast-functions"/>.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UTC_DATE
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UTC_DATE()</primary>
@@ -8251,13 +8251,13 @@
         <para>
           <literal>UTC_DATE()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UTC_TIME
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UTC_TIME()</primary>
@@ -8289,13 +8289,13 @@
         <para>
           <literal>UTC_TIME()</literal> is available as of MySQL 4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic UTC_TIMESTAMP
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>UTC_TIMESTAMP()</primary>
@@ -8329,13 +8329,13 @@
           <literal>UTC_TIMESTAMP()</literal> is available as of MySQL
           4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic WEEK
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>WEEK()</primary>
@@ -8518,13 +8518,13 @@
 mysql&gt; <userinput>SELECT MID(YEARWEEK('2000-01-01'),5,2);</userinput>
         -&gt; '52'
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic WEEKDAY
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>WEEKDAY()</primary>
@@ -8553,13 +8553,13 @@
 mysql&gt; <userinput>SELECT WEEKDAY('1997-11-05');</userinput>
         -&gt; 2
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic WEEKOFYEAR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>WEEKOFYEAR()</primary>
@@ -8592,13 +8592,13 @@
           <literal>WEEKOFYEAR()</literal> is available as of MySQL
           4.1.1.
         </para>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic YEAR
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>YEAR()</primary>
@@ -8624,13 +8624,13 @@
 mysql&gt; <userinput>SELECT YEAR('98-02-03');</userinput>
         -&gt; 1998
 </programlisting>
+      </listitem>
 
+      <listitem>
         <remark>
           description_for_help_topic YEARWEEK
         </remark>
-      </listitem>
 
-      <listitem>
         <para>
           <indexterm type="function">
             <primary>YEARWEEK()</primary>
@@ -8805,6 +8805,11 @@
     <itemizedlist>
 
       <listitem>
+        <remark>
+          description_for_help_topic MATCH AGAINST MATCH AGAINST BOOLEAN
+          IN MODE MATCH AGAINST QUERY EXPANSION WITH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>MATCH ... AGAINST()</primary>
@@ -8816,11 +8821,6 @@
           WITH QUERY EXPANSION])</literal>
         </para>
 
-        <remark>
-          description_for_help_topic MATCH AGAINST MATCH AGAINST BOOLEAN
-          IN MODE MATCH AGAINST QUERY EXPANSION WITH
-        </remark>
-
         <para>
           As of MySQL 3.23.23, MySQL has support for full-text indexing
           and searching. A full-text index in MySQL is an index of type
@@ -9817,11 +9817,11 @@
 
     <itemizedlist>
 
-      <remark>
-        description_for_help_topic BINARY operator
-      </remark>
-
       <listitem>
+        <remark>
+          description_for_help_topic BINARY operator
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>BINARY</primary>
@@ -9935,6 +9935,11 @@
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CAST CONVERT SIGNED UNSIGNED BINARY
+          CHAR DATE DATETIME TIME
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CAST</primary>
@@ -9951,11 +9956,6 @@
           <replaceable>transcoding_name</replaceable>)</literal>
         </para>
 
-        <remark>
-          description_for_help_topic CAST CONVERT SIGNED UNSIGNED BINARY
-          CHAR DATE DATETIME TIME
-        </remark>
-
         <para>
           The <literal>CAST()</literal> and <literal>CONVERT()</literal>
           functions can be used to take a value of one type and produce
@@ -10281,7 +10281,7 @@
 
         <listitem>
           <remark>
-            description_for_help_topic &amp;amp;
+            description_for_help_topic &amp;
           </remark>
 
           <para>
@@ -10306,7 +10306,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;amp;
+            example_for_help_topic &amp;
           </remark>
 
 <programlisting>
@@ -10369,7 +10369,7 @@
 
         <listitem>
           <remark>
-            description_for_help_topic &amp;lt;&amp;lt;
+            description_for_help_topic &lt;&lt;
           </remark>
 
           <para>
@@ -10390,7 +10390,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;lt;&amp;lt;
+            example_for_help_topic &lt;&lt;
           </remark>
 
 <programlisting>
@@ -10405,7 +10405,7 @@
 
         <listitem>
           <remark>
-            description_for_help_topic &amp;gt;&amp;gt;
+            description_for_help_topic &gt;&gt;
           </remark>
 
           <para>
@@ -10426,7 +10426,7 @@
           </remark>
 
           <remark>
-            example_for_help_topic &amp;gt;&amp;gt;
+            example_for_help_topic &gt;&gt;
           </remark>
 
 <programlisting>

--- 1.46/refman/functions.xml	2005-09-11 15:49:21 -05:00
+++ 1.47/refman/functions.xml	2005-09-11 17:07:18 -05:00
@@ -6,6 +6,8 @@
     %fixedchars.entities;
     <!ENTITY % title.entities         SYSTEM "refman-common/titles.en.ent">
     %title.entities;
+    <!ENTITY % versions.entities      SYSTEM "versions.ent">
+    %versions.entities;
 ]>
 <chapter id="functions">
 
@@ -24,7 +26,9 @@
     <primary>operators</primary>
   </indexterm>
 
-<!--  help_category Functions -->
+  <remark>
+    help_category Functions
+  </remark>
 
   <para>
     Expressions can be used at several points in SQL statements, such as
@@ -186,7 +190,9 @@
         <primary>comparison operators</primary>
       </indexterm>
 
-<!--  help_category Comparison operators@Functions -->
+      <remark>
+        help_category Comparison operators@Functions
+      </remark>
 
       <indexterm>
         <primary>casts</primary>
@@ -330,9 +336,11 @@
 
       <itemizedlist>
 
-<!--  description_for_help_topic = -->
-
         <listitem>
+          <remark>
+            description_for_help_topic =
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>= (equal)</primary>
@@ -349,9 +357,13 @@
             Equal:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic = -->
+          <remark>
+            example_for_help_topic =
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 = 0;</userinput>
@@ -365,8 +377,12 @@
 mysql&gt; <userinput>SELECT '.01' = 0.01;</userinput>
         -&gt; 1
 </programlisting>
+        </listitem>
 
-<!--  description_for_help_topic &lt;=&gt; -->
+        <listitem>
+          <remark>
+            description_for_help_topic &lt;=&gt;
+          </remark>
 
           <para>
             <indexterm>
@@ -377,11 +393,7 @@
             <indexterm type="function">
               <primary>&lt;=&gt; (equal to)</primary>
             </indexterm>
-          </para>
-        </listitem>
 
-        <listitem>
-          <para>
             <literal>&lt;=&gt;</literal>
           </para>
 
@@ -395,9 +407,13 @@
             <literal>NULL</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic &lt;=&gt; -->
+          <remark>
+            example_for_help_topic &lt;=&gt;
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 &lt;=&gt; 1, NULL &lt;=&gt; NULL, 1 &lt;=&gt; NULL;</userinput>
@@ -409,11 +425,13 @@
           <para>
             <literal>&lt;=&gt;</literal> was added in MySQL 3.23.0.
           </para>
-
-<!--  description_for_help_topic !=  &lt;&gt; -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic != &lt;&gt;
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>&lt;&gt; (not equal)</primary>
@@ -438,9 +456,13 @@
             Not equal:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic != -->
+          <remark>
+            example_for_help_topic !=
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT '.01' &lt;&gt; '0.01';</userinput>
@@ -450,11 +472,13 @@
 mysql&gt; <userinput>SELECT 'zapp' &lt;&gt; 'zappp';</userinput>
         -&gt; 1
 </programlisting>
-
-<!--  description_for_help_topic &lt;= -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic &lt;=
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>&lt;= (less than or equal)</primary>
@@ -471,19 +495,25 @@
             Less than or equal:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic &lt;= -->
+          <remark>
+            example_for_help_topic &lt;=
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 0.1 &lt;= 2;</userinput>
         -&gt; 1
 </programlisting>
-
-<!--  description_for_help_topic &lt; -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic &lt;
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>&lt; (less than)</primary>
@@ -500,19 +530,25 @@
             Less than:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic &lt; -->
+          <remark>
+            example_for_help_topic &lt;
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &lt; 2;</userinput>
         -&gt; 0
 </programlisting>
-
-<!--  description_for_help_topic &gt;= -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic &gt;=
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>&gt;= (greater than or equal)</primary>
@@ -529,19 +565,25 @@
             Greater than or equal:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic &gt;= -->
+          <remark>
+            example_for_help_topic &gt;=
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &gt;= 2;</userinput>
         -&gt; 1
 </programlisting>
-
-<!--  description_for_help_topic &gt; -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic &gt;
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>&gt; (greater than)</primary>
@@ -558,16 +600,24 @@
             Greater than:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic &gt; -->
+          <remark>
+            example_for_help_topic &gt;
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 &gt; 2;</userinput>
         -&gt; 0
 </programlisting>
+        </listitem>
 
-<!--  description_for_help_topic IS -->
+        <listitem>
+          <remark>
+            description_for_help_topic IS
+          </remark>
 
           <para>
             <indexterm>
@@ -592,11 +642,7 @@
             <indexterm type="function">
               <primary>IS NOT boolean_value</primary>
             </indexterm>
-          </para>
-        </listitem>
 
-        <listitem>
-          <para>
             <literal>IS
             <replaceable>boolean_value</replaceable></literal> ,
             <literal>IS NOT
@@ -610,9 +656,13 @@
             <literal>UNKNOWN</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic IS -->
+          <remark>
+            example_for_help_topic IS
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 IS TRUE, 0 IS FALSE, NULL IS UNKNOWN;</userinput>
@@ -626,8 +676,12 @@
             <replaceable>boolean_value</replaceable></literal> syntax
             was added in MySQL 5.0.2.
           </para>
+        </listitem>
 
-<!--  description_for_help_topic IS NULL  NULL IS -->
+        <listitem>
+          <remark>
+            description_for_help_topic IS NULL NULL IS
+          </remark>
 
           <para>
             <indexterm>
@@ -642,11 +696,7 @@
             <indexterm type="function">
               <primary>IS NOT NULL</primary>
             </indexterm>
-          </para>
-        </listitem>
 
-        <listitem>
-          <para>
             <literal>IS NULL</literal> , <literal>IS NOT NULL</literal>
           </para>
 
@@ -654,9 +704,13 @@
             Tests whether a value is or is not <literal>NULL</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic IS NULL -->
+          <remark>
+            example_for_help_topic IS NULL
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 IS NULL, 0 IS NULL, NULL IS NULL;</userinput>
@@ -722,11 +776,13 @@
             </listitem>
 
           </itemizedlist>
-
-<!--  description_for_help_topic BETWEEN AND  BETWEEN AND -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic BETWEEN AND BETWEEN AND
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>BETWEEN ... AND</primary>
@@ -756,9 +812,13 @@
             <replaceable>expr</replaceable> instead.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic BETWEEN AND -->
+          <remark>
+            example_for_help_topic BETWEEN AND
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 BETWEEN 2 AND 3;</userinput>
@@ -770,11 +830,13 @@
 mysql&gt; <userinput>SELECT 2 BETWEEN 2 AND 'x-3';</userinput>
         -&gt; 0
 </programlisting>
-
-<!--  description_for_help_topic NOT BETWEEN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic NOT BETWEEN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT BETWEEN</primary>
@@ -792,9 +854,15 @@
             <replaceable>max</replaceable>)</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
+        </listitem>
 
-<!--  description_for_help_topic COALESCE -->
+        <listitem>
+          <remark>
+            description_for_help_topic COALESCE
+          </remark>
 
           <para>
             <indexterm>
@@ -805,11 +873,7 @@
             <indexterm type="function">
               <primary>COALESCE()</primary>
             </indexterm>
-          </para>
-        </listitem>
 
-        <listitem>
-          <para>
             <literal>COALESCE(<replaceable>value</replaceable>,...)</literal>
           </para>
 
@@ -818,9 +882,13 @@
             list.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic COALESCE -->
+          <remark>
+            example_for_help_topic COALESCE
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT COALESCE(NULL,1);</userinput>
@@ -832,11 +900,13 @@
           <para>
             <literal>COALESCE()</literal> was added in MySQL 3.23.3.
           </para>
-
-<!--  description_for_help_topic GREATEST -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic GREATEST
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>GREATEST()</primary>
@@ -851,9 +921,13 @@
             the same rules as for <literal>LEAST()</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic GREATEST -->
+          <remark>
+            example_for_help_topic GREATEST
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT GREATEST(2,0);</userinput>
@@ -876,11 +950,13 @@
             Before MySQL 3.22.5, you can use <literal>MAX()</literal>
             instead of <literal>GREATEST()</literal>.
           </para>
-
-<!--  description_for_help_topic IN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic IN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>IN</primary>
@@ -905,9 +981,13 @@
             performed in case-sensitive fashion.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic IN -->
+          <remark>
+            example_for_help_topic IN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 2 IN (0,3,5,'wefwf');</userinput>
@@ -936,11 +1016,13 @@
             used to write certain types of subqueries. See
             <xref linkend="any-in-some-subqueries"/>.
           </para>
-
-<!--  description_for_help_topic NOT IN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic NOT IN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT IN</primary>
@@ -956,12 +1038,16 @@
             (<replaceable>value</replaceable>,...))</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic ISNULL -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic ISNULL
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ISNULL()</primary>
@@ -977,9 +1063,13 @@
             <literal>0</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ISNULL -->
+          <remark>
+            example_for_help_topic ISNULL
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ISNULL(1+1);</userinput>
@@ -998,11 +1088,13 @@
             behaviors with the <literal>IS NULL</literal> comparison
             operator. See the description of <literal>IS NULL</literal>.
           </para>
-
-<!--  description_for_help_topic INTERVAL -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic INTERVAL
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>INTERVAL()</primary>
@@ -1026,9 +1118,13 @@
             fast).
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic INTERVAL -->
+          <remark>
+            example_for_help_topic INTERVAL
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT INTERVAL(23, 1, 15, 17, 30, 44, 200);</userinput>
@@ -1038,11 +1134,13 @@
 mysql&gt; <userinput>SELECT INTERVAL(22, 23, 30, 44, 200);</userinput>
         -&gt; 0
 </programlisting>
-
-<!--  description_for_help_topic LEAST -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic LEAST
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LEAST()</primary>
@@ -1091,9 +1189,13 @@
 
           </itemizedlist>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic LEAST -->
+          <remark>
+            example_for_help_topic LEAST
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LEAST(2,0);</userinput>
@@ -1152,7 +1254,9 @@
         <secondary>logical</secondary>
       </indexterm>
 
-<!--  help_category Logical operators@Functions -->
+      <remark>
+        help_category Logical operators@Functions
+      </remark>
 
       <para>
         In SQL, all logical operators evaluate to TRUE, FALSE, or
@@ -1165,9 +1269,11 @@
 
       <itemizedlist>
 
-<!--  description_for_help_topic !  NOT -->
-
         <listitem>
+          <remark>
+            description_for_help_topic ! NOT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT</primary>
@@ -1188,9 +1294,13 @@
             returns <literal>NULL</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ! -->
+          <remark>
+            example_for_help_topic !
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT NOT 10;</userinput>
@@ -1210,11 +1320,13 @@
             expression evaluates the same way as
             <literal>(!1)+1</literal>.
           </para>
-
-<!--  description_for_help_topic &amp;&amp;  AND -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic &amp;&amp; AND
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>AND</primary>
@@ -1236,9 +1348,13 @@
             returned.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic &amp;&amp; -->
+          <remark>
+            example_for_help_topic &amp;&amp;
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 &amp;&amp; 1;</userinput>
@@ -1264,11 +1380,13 @@
             result is always as prescribed by the SQL standards while
             still using the optimization wherever possible.
           </para>
-
-<!--  description_for_help_topic ||  OR -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic || OR
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>OR</primary>
@@ -1294,9 +1412,13 @@
             <literal>NULL</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic || -->
+          <remark>
+            example_for_help_topic ||
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 || 1;</userinput>
@@ -1310,11 +1432,13 @@
 mysql&gt; <userinput>SELECT 1 || NULL;</userinput>
         -&gt; 1
 </programlisting>
-
-<!--  description_for_help_topic XOR -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic XOR
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>XOR</primary>
@@ -1332,9 +1456,13 @@
             non-zero, otherwise <literal>0</literal> is returned.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic XOR -->
+          <remark>
+            example_for_help_topic XOR
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 1 XOR 1;</userinput>
@@ -1376,13 +1504,17 @@
       <secondary>control flow</secondary>
     </indexterm>
 
-<!--  help_category Control flow functions@Functions -->
+    <remark>
+      help_category Control flow functions@Functions
+    </remark>
 
     <itemizedlist>
 
-<!--  description_for_help_topic CASE  WHEN THEN ELSE END -->
-
       <listitem>
+        <remark>
+          description_for_help_topic CASE WHEN THEN ELSE END
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CASE</primary>
@@ -1412,9 +1544,13 @@
           part.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CASE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CASE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CASE 1 WHEN 1 THEN 'one'</userinput>
@@ -1447,11 +1583,13 @@
         <para>
           <literal>CASE</literal> was added in MySQL 3.23.3.
         </para>
-
-<!--  description_for_help_topic IF -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic IF
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>IF()</primary>
@@ -1471,9 +1609,13 @@
           which it is used.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic IF -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic IF
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT IF(1&gt;2,2,3);</userinput>
@@ -1553,8 +1695,12 @@
           strings, the result is case sensitive if either string is case
           sensitive (starting from MySQL 3.23.51).
         </para>
+      </listitem>
 
-<!--  description_for_help_topic IFNULL -->
+      <listitem>
+        <remark>
+          description_for_help_topic IFNULL
+        </remark>
 
         <para>
           <indexterm>
@@ -1565,11 +1711,7 @@
           <indexterm type="function">
             <primary>IFNULL()</primary>
           </indexterm>
-        </para>
-      </listitem>
 
-      <listitem>
-        <para>
           <literal>IFNULL(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
         </para>
 
@@ -1582,9 +1724,13 @@
           which it is used.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic IFNULL -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic IFNULL
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT IFNULL(1,0);</userinput>
@@ -1617,11 +1763,13 @@
           column is <literal>CHAR(4)</literal>, whereas in earlier
           versions the type would be <literal>BIGINT</literal>.
         </para>
-
-<!--  description_for_help_topic NULLIF -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic NULLIF
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>NULLIF()</primary>
@@ -1640,9 +1788,13 @@
           <replaceable>expr1</replaceable> END</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic NULLIF -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic NULLIF
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT NULLIF(1,1);</userinput>
@@ -1680,7 +1832,9 @@
       <secondary>string</secondary>
     </indexterm>
 
-<!--  help_category String Functions@Functions -->
+    <remark>
+      help_category String Functions@Functions
+    </remark>
 
     <para>
       String-valued functions return <literal>NULL</literal> if the
@@ -1696,9 +1850,11 @@
 
     <itemizedlist>
 
-<!--  description_for_help_topic ASCII -->
-
       <listitem>
+        <remark>
+          description_for_help_topic ASCII
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ASCII()</primary>
@@ -1717,9 +1873,13 @@
           values from <literal>0</literal> to <literal>255</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic ASCII -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic ASCII
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ASCII('2');</userinput>
@@ -1733,11 +1893,13 @@
         <para>
           See also the <literal>ORD()</literal> function.
         </para>
-
-<!--  description_for_help_topic BIN -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic BIN
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>BIN()</primary>
@@ -1756,19 +1918,25 @@
           <replaceable>N</replaceable> is <literal>NULL</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic BIN -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic BIN
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT BIN(12);</userinput>
         -&gt; '1100'
 </programlisting>
-
-<!--  description_for_help_topic BIT_LENGTH -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic BIT_LENGTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>BIT_LENGTH()</primary>
@@ -1782,9 +1950,13 @@
           <replaceable>str</replaceable> in bits.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic BIT_LENGTH -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic BIT_LENGTH
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT BIT_LENGTH('text');</userinput>
@@ -1794,11 +1966,13 @@
         <para>
           <literal>BIT_LENGTH()</literal> was added in MySQL 4.0.2.
         </para>
-
-<!--  description_for_help_topic CHAR function -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CHAR function
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CHAR()</primary>
@@ -1814,9 +1988,13 @@
           are skipped.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CHAR function -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CHAR function
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CHAR(77,121,83,81,'76');</userinput>
@@ -1824,11 +2002,13 @@
 mysql&gt; <userinput>SELECT CHAR(77,77.3,'77.3');</userinput>
         -&gt; 'MMM'
 </programlisting>
-
-<!--  description_for_help_topic CHAR_LENGTH -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CHAR_LENGTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CHAR_LENGTH()</primary>
@@ -1847,12 +2027,16 @@
           <literal>5</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic CHARACTER_LENGTH -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CHARACTER_LENGTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CHARACTER_LENGTH()</primary>
@@ -1866,12 +2050,16 @@
           <literal>CHAR_LENGTH()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic COMPRESS -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic COMPRESS
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>COMPRESS()</primary>
@@ -1888,9 +2076,13 @@
           uncompressed with <literal>UNCOMPRESS()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic COMPRESS -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic COMPRESS
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LENGTH(COMPRESS(REPEAT('a',1000)));</userinput>
@@ -1935,11 +2127,13 @@
         <para>
           <literal>COMPRESS()</literal> was added in MySQL 4.1.1.
         </para>
-
-<!--  description_for_help_topic CONCAT -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CONCAT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CONCAT()</primary>
@@ -1961,9 +2155,13 @@
           char_col)</literal>
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CONCAT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CONCAT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CONCAT('My', 'S', 'QL');</userinput>
@@ -1973,11 +2171,13 @@
 mysql&gt; <userinput>SELECT CONCAT(14.3);</userinput>
         -&gt; '14.3'
 </programlisting>
-
-<!--  description_for_help_topic CONCAT_WS -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CONCAT_WS
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CONCAT_WS()</primary>
@@ -1998,9 +2198,13 @@
           <literal>NULL</literal> values after the separator argument.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CONCAT_WS -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CONCAT_WS
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CONCAT_WS(',','First name','Second name','Last Name');</userinput>
@@ -2013,11 +2217,13 @@
           Before MySQL 4.0.14, <literal>CONCAT_WS()</literal> skips
           empty strings as well as <literal>NULL</literal> values.
         </para>
-
-<!--  description_for_help_topic CONV -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CONV
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CONV()</primary>
@@ -2044,9 +2250,13 @@
           64-bit precision.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CONV -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CONV
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CONV('a',16,2);</userinput>
@@ -2058,11 +2268,13 @@
 mysql&gt; <userinput>SELECT CONV(10+'10'+'10'+0xa,10,10);</userinput>
         -&gt; '40'
 </programlisting>
-
-<!--  description_for_help_topic ELT -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic ELT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ELT()</primary>
@@ -2083,9 +2295,13 @@
           <literal>FIELD()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic ELT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic ELT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ELT(1, 'ej', 'Heja', 'hej', 'foo');</userinput>
@@ -2093,11 +2309,13 @@
 mysql&gt; <userinput>SELECT ELT(4, 'ej', 'Heja', 'hej', 'foo');</userinput>
         -&gt; 'foo'
 </programlisting>
-
-<!--  description_for_help_topic EXPORT_SET -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic EXPORT_SET
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>EXPORT_SET()</primary>
@@ -2120,9 +2338,13 @@
           (default 64).
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic EXPORT_SET -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic EXPORT_SET
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT EXPORT_SET(5,'Y','N',',',4);</userinput>
@@ -2130,11 +2352,13 @@
 mysql&gt; <userinput>SELECT EXPORT_SET(6,'1','0',',',10);</userinput>
         -&gt; '0,1,1,0,0,0,0,0,0,0'
 </programlisting>
-
-<!--  description_for_help_topic FIELD -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic FIELD
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>FIELD()</primary>
@@ -2167,9 +2391,13 @@
           <literal>ELT()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic FIELD -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic FIELD
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT FIELD('ej', 'Hej', 'ej', 'Heja', 'hej', 'foo');</userinput>
@@ -2177,11 +2405,13 @@
 mysql&gt; <userinput>SELECT FIELD('fo', 'Hej', 'ej', 'Heja', 'hej', 'foo');</userinput>
         -&gt; 0
 </programlisting>
-
-<!--  description_for_help_topic FIND_IN_SET -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic FIND_IN_SET
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>FIND_IN_SET()</primary>
@@ -2211,19 +2441,25 @@
           (&lsquo;<literal>,</literal>&rsquo;) character.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic FIND_IN_SET -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic FIND_IN_SET
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT FIND_IN_SET('b','a,b,c,d');</userinput>
         -&gt; 2
 </programlisting>
-
-<!--  description_for_help_topic HEX -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic HEX
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>HEX()</primary>
@@ -2249,9 +2485,13 @@
           hexadecimal digits.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic HEX -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic HEX
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT HEX(255);</userinput>
@@ -2261,11 +2501,13 @@
 mysql&gt; <userinput>SELECT HEX('abc');</userinput>
         -&gt; 616263
 </programlisting>
-
-<!--  description_for_help_topic INSERT -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic INSERT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>INSERT()</primary>
@@ -2287,9 +2529,13 @@
           argument is null.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic INSERT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic INSERT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT INSERT('Quadratic', 3, 4, 'What');</userinput>
@@ -2303,11 +2549,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic INSTR -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic INSTR
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>INSTR()</primary>
@@ -2324,9 +2572,13 @@
           the arguments are swapped.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic INSTR -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic INSTR
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT INSTR('foobarbar', 'bar');</userinput>
@@ -2340,11 +2592,13 @@
           is case sensitive. For 4.0 on, it is case sensitive only if
           either argument is a binary string.
         </para>
-
-<!--  description_for_help_topic LCASE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LCASE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LCASE()</primary>
@@ -2358,12 +2612,16 @@
           <literal>LOWER()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic LEFT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LEFT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LEFT()</primary>
@@ -2377,19 +2635,25 @@
           from the string <replaceable>str</replaceable>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic LEFT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic LEFT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LEFT('foobarbar', 5);</userinput>
         -&gt; 'fooba'
 </programlisting>
-
-<!--  description_for_help_topic LENGTH -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LENGTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LENGTH()</primary>
@@ -2408,19 +2672,25 @@
           <literal>5</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic LENGTH -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic LENGTH
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LENGTH('text');</userinput>
         -&gt; 4
 </programlisting>
-
-<!--  description_for_help_topic LOAD_FILE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LOAD_FILE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>FILE</primary>
@@ -2448,9 +2718,13 @@
           <literal>NULL</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic LOAD_FILE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic LOAD_FILE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>UPDATE <replaceable>tbl_name</replaceable></userinput>
@@ -2466,11 +2740,13 @@
           the MySQL++ manual, available at
           <ulink url="http://dev.mysql.com/doc/"/>.
         </para>
-
-<!--  description_for_help_topic LOCATE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LOCATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LOCATE()</primary>
@@ -2493,9 +2769,13 @@
           <replaceable>str</replaceable>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic POSITION -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic POSITION
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LOCATE('bar', 'foobarbar');</userinput>
@@ -2511,11 +2791,13 @@
           is case sensitive. For 4.0 on, it is case sensitive only if
           either argument is a binary string.
         </para>
-
-<!--  description_for_help_topic LOWER -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LOWER
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LOWER()</primary>
@@ -2530,9 +2812,13 @@
           character set mapping (the default is cp1252 Latin1).
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic LOWER -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic LOWER
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LOWER('QUADRATICALLY');</userinput>
@@ -2542,11 +2828,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic LPAD -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LPAD
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LPAD()</primary>
@@ -2564,9 +2852,13 @@
           to <replaceable>len</replaceable> characters.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic LPAD -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic LPAD
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LPAD('hi',4,'??');</userinput>
@@ -2574,11 +2866,13 @@
 mysql&gt; <userinput>SELECT LPAD('hi',1,'??');</userinput>
         -&gt; 'h'
 </programlisting>
-
-<!--  description_for_help_topic LTRIM -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic LTRIM
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>LTRIM()</primary>
@@ -2592,9 +2886,13 @@
           space characters removed.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic LTRIM -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic LTRIM
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LTRIM('  barbar');</userinput>
@@ -2604,11 +2902,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic MAKE_SET -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic MAKE_SET
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>MAKE_SET()</primary>
@@ -2630,9 +2930,13 @@
           not appended to the result.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic MAKE_SET -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic MAKE_SET
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT MAKE_SET(1,'a','b','c');</userinput>
@@ -2644,11 +2948,13 @@
 mysql&gt; <userinput>SELECT MAKE_SET(0,'a','b','c');</userinput>
         -&gt; ''
 </programlisting>
-
-<!--  description_for_help_topic MID -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic MID
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>MID()</primary>
@@ -2663,12 +2969,16 @@
           <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic OCT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic OCT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>OCT()</primary>
@@ -2687,19 +2997,25 @@
           <literal>NULL</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic OCT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic OCT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT OCT(12);</userinput>
         -&gt; '14'
 </programlisting>
-
-<!--  description_for_help_topic OCTETLENGTH -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic OCTETLENGTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>OCTET_LENGTH()</primary>
@@ -2713,12 +3029,16 @@
           <literal>LENGTH()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic ORD -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic ORD
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ORD()</primary>
@@ -2746,19 +3066,25 @@
           <literal>ASCII()</literal> function.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic ORD -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic ORD
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ORD('2');</userinput>
         -&gt; 50
 </programlisting>
-
-<!--  description_for_help_topic POSITION -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic POSITION
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>POSITION()</primary>
@@ -2774,12 +3100,16 @@
           <literal>LOCATE(<replaceable>substr</replaceable>,<replaceable>str</replaceable>)</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic QUOTE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic QUOTE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>QUOTE()</primary>
@@ -2800,9 +3130,13 @@
           <literal>QUOTE()</literal> function was added in MySQL 4.0.3.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic QUOTE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic QUOTE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT QUOTE('Don\'t!');</userinput>
@@ -2810,11 +3144,13 @@
 mysql&gt; <userinput>SELECT QUOTE(NULL);</userinput>
         -&gt; NULL
 </programlisting>
-
-<!--  description_for_help_topic REPEAT -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic REPEAT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>REPEAT()</primary>
@@ -2833,19 +3169,25 @@
           <replaceable>count</replaceable> are <literal>NULL</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic REPEAT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic REPEAT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT REPEAT('MySQL', 3);</userinput>
         -&gt; 'MySQLMySQLMySQL'
 </programlisting>
-
-<!--  description_for_help_topic REPLACE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic REPLACE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>REPLACE()</primary>
@@ -2860,9 +3202,13 @@
           replaced by the string <replaceable>to_str</replaceable>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic REPLACE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic REPLACE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT REPLACE('www.mysql.com', 'w', 'Ww');</userinput>
@@ -2872,11 +3218,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic REVERSE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic REVERSE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>REVERSE()</primary>
@@ -2890,9 +3238,13 @@
           order of the characters reversed.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic REVERSE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic REVERSE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT REVERSE('abc');</userinput>
@@ -2902,11 +3254,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic RIGHT -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic RIGHT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>RIGHT()</primary>
@@ -2920,9 +3274,13 @@
           characters from the string <replaceable>str</replaceable>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic RIGHT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic RIGHT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT RIGHT('foobarbar', 4);</userinput>
@@ -2932,11 +3290,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic RPAD -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic RPAD
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>RPAD()</primary>
@@ -2954,9 +3314,13 @@
           to <replaceable>len</replaceable> characters.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic RPAD -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic RPAD
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT RPAD('hi',5,'?');</userinput>
@@ -2968,11 +3332,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic RTRIM -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic RTRIM
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>RTRIM()</primary>
@@ -2986,9 +3352,13 @@
           trailing space characters removed.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic RTRIM -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic RTRIM
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT RTRIM('barbar   ');</userinput>
@@ -2998,11 +3368,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic SOUNDEX -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic SOUNDEX
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>SOUNDEX()</primary>
@@ -3023,9 +3395,13 @@
           outside the A-Z range are treated as vowels.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic SOUNDEX -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic SOUNDEX
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SOUNDEX('Hello');</userinput>
@@ -3042,11 +3418,13 @@
           then duplicates, whereas the enhanced version discards
           duplicates first and then vowels.
         </para>
-
-<!--  description_for_help_topic SOUNDS LIKE  SOUNDS LIKE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic SOUNDS LIKE SOUNDS LIKE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>SOUNDS LIKE</primary>
@@ -3063,12 +3441,16 @@
           available only in MySQL 4.1 or later.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic SPACE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic SPACE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>SPACE()</primary>
@@ -3082,19 +3464,25 @@
           space characters.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic SPACE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic SPACE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SPACE(6);</userinput>
         -&gt; '      '
 </programlisting>
-
-<!--  description_for_help_topic SUBSTRING -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic SUBSTRING
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>SUBSTRING()</primary>
@@ -3130,9 +3518,13 @@
           in any of the forms of this function.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic SUBSTRING -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic SUBSTRING
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SUBSTRING('Quadratically',5);</userinput>
@@ -3163,11 +3555,13 @@
           <literal>SUBSTR()</literal> is a synonym for
           <literal>SUBSTRING()</literal>, added in MySQL 4.1.1.
         </para>
-
-<!--  description_for_help_topic SUBSTRING_INDEX -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic SUBSTRING_INDEX
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>SUBSTRING_INDEX()</primary>
@@ -3188,9 +3582,13 @@
           the right) is returned.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic SUBSTRING_INDEX -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic SUBSTRING_INDEX
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SUBSTRING_INDEX('www.mysql.com', '.', 2);</userinput>
@@ -3202,11 +3600,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic TRIM  BOTH LEADING TRAILING FROM -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic TRIM BOTH LEADING TRAILING FROM
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>TRIM()</primary>
@@ -3229,9 +3629,13 @@
           specified, spaces are removed.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic TRIM -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic TRIM
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT TRIM('  bar   ');</userinput>
@@ -3247,11 +3651,13 @@
         <para>
           This function is multi-byte safe.
         </para>
-
-<!--  description_for_help_topic UCASE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic UCASE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>UCASE()</primary>
@@ -3265,12 +3671,16 @@
           <literal>UPPER()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic UNCOMPRESS -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic UNCOMPRESS
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>UNCOMPRESS()</primary>
@@ -3288,9 +3698,13 @@
           Otherwise, the return value is always <literal>NULL</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic UNCOMPRESS -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic UNCOMPRESS
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT UNCOMPRESS(COMPRESS('any string'));</userinput>
@@ -3302,11 +3716,13 @@
         <para>
           <literal>UNCOMPRESS()</literal> was added in MySQL 4.1.1.
         </para>
-
-<!--  description_for_help_topic UNCOMPRESSED_LENGTH -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic UNCOMPRESSED_LENGTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>UNCOMPRESSED_LENGTH()</primary>
@@ -3319,9 +3735,13 @@
           Returns the length of a compressed string before compression.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic UNCOMPRESSED_LENGTH -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic UNCOMPRESSED_LENGTH
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT UNCOMPRESSED_LENGTH(COMPRESS(REPEAT('a',30)));</userinput>
@@ -3332,11 +3752,13 @@
           <literal>UNCOMPRESSED_LENGTH()</literal> was added in MySQL
           4.1.1.
         </para>
-
-<!--  description_for_help_topic UNHEX -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic UNHEX
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>UNHEX()</primary>
@@ -3354,9 +3776,13 @@
           returned as a binary string.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic UNHEX -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic UNHEX
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT UNHEX('4D7953514C');</userinput>
@@ -3372,11 +3798,13 @@
         <para>
           <literal>UNHEX()</literal> was added in MySQL 4.1.2.
         </para>
-
-<!--  description_for_help_topic UPPER -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic UPPER
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>UPPER()</primary>
@@ -3391,9 +3819,13 @@
           character set mapping (the default is cp1252 Latin1).
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic UPPER -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic UPPER
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT UPPER('Hej');</userinput>
@@ -3475,9 +3907,11 @@
 
       <itemizedlist>
 
-<!--  description_for_help_topic LIKE  ESCAPE -->
-
         <listitem>
+          <remark>
+            description_for_help_topic LIKE ESCAPE
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LIKE</primary>
@@ -3528,9 +3962,13 @@
             </tgroup>
           </informaltable>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic LIKE -->
+          <remark>
+            example_for_help_topic LIKE
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'David!' LIKE 'David_';</userinput>
@@ -3622,11 +4060,13 @@
             pattern match is done, leaving a single backslash to be
             matched).
           </para>
-
-<!--  description_for_help_topic NOT LIKE -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic NOT LIKE
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT LIKE</primary>
@@ -3644,12 +4084,16 @@
             '<replaceable>escape-char</replaceable>'])</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic NOT REGEXP -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic NOT REGEXP
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>NOT REGEXP</primary>
@@ -3667,7 +4111,15 @@
             <replaceable>pat</replaceable>)</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
+        </listitem>
+
+        <listitem>
+          <remark>
+            description_for_help_topic RLIKE REGEXP
+          </remark>
 
           <para>
             <indexterm>
@@ -3687,12 +4139,6 @@
               <primary>RLIKE</primary>
             </indexterm>
 
-<!--  description_for_help_topic RLIKE  REGEXP -->
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal><replaceable>expr</replaceable> REGEXP
             <replaceable>pat</replaceable></literal> ,
             <literal><replaceable>expr</replaceable> RLIKE
@@ -3735,9 +4181,13 @@
             sensitive for normal (not binary) strings.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic RLIKE -->
+          <remark>
+            example_for_help_topic RLIKE
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 'Monty!' REGEXP 'm%y%%';</userinput>
@@ -3758,11 +4208,13 @@
             deciding the type of a character. However, these operators
             are not multi-byte safe.
           </para>
-
-<!--  description_for_help_topic STRCMP -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic STRCMP
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>STRCMP()</primary>
@@ -3778,9 +4230,13 @@
             sort order, and <literal>1</literal> otherwise.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic STRCMP -->
+          <remark>
+            example_for_help_topic STRCMP
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT STRCMP('text', 'text2');</userinput>
@@ -3811,7 +4267,9 @@
 
     <title id="title-numeric-functions">&title-numeric-functions;</title>
 
-<!--  help_category Numeric Functions@Functions -->
+    <remark>
+      help_category Numeric Functions@Functions
+    </remark>
 
     <section id="arithmetic-functions">
 
@@ -3843,9 +4301,11 @@
 
       <itemizedlist>
 
-<!--  description_for_help_topic + -->
-
         <listitem>
+          <remark>
+            description_for_help_topic +
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>+ (addition)</primary>
@@ -3862,19 +4322,25 @@
             Addition:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic + -->
+          <remark>
+            example_for_help_topic +
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 3+5;</userinput>
         -&gt; 8
 </programlisting>
-
-<!--  description_for_help_topic - binary -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic - binary
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>- (subtraction)</primary>
@@ -3891,19 +4357,25 @@
             Subtraction:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic - binary -->
+          <remark>
+            example_for_help_topic - binary
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 3-5;</userinput>
         -&gt; -2
 </programlisting>
-
-<!--  description_for_help_topic - unary -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic - unary
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>- (unary minus)</primary>
@@ -3925,9 +4397,13 @@
             Unary minus. Changes the sign of the argument.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic - unary -->
+          <remark>
+            example_for_help_topic - unary
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT - 2;</userinput>
@@ -3941,11 +4417,13 @@
             using <literal>-</literal> on integers that may have the
             value of <literal>-2<superscript>63</superscript></literal>!
           </para>
-
-<!--  description_for_help_topic * -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic *
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>* (multiplication)</primary>
@@ -3962,9 +4440,13 @@
             Multiplication:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic * -->
+          <remark>
+            example_for_help_topic *
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 3*5;</userinput>
@@ -3980,11 +4462,13 @@
             result of the integer multiplication exceeds the 64-bit
             range of <literal>BIGINT</literal> calculations.
           </para>
-
-<!--  description_for_help_topic / -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic /
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>/ (division)</primary>
@@ -4001,9 +4485,13 @@
             Division:
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic / -->
+          <remark>
+            example_for_help_topic /
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 3/5;</userinput>
@@ -4027,6 +4515,10 @@
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DIV FLOOR BIGINT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>DIV</primary>
@@ -4035,16 +4527,18 @@
             <literal>DIV</literal>
           </para>
 
-<!--  description_for_help_topic DIV  FLOOR BIGINT -->
-
           <para>
             Integer division. Similar to <literal>FLOOR()</literal> but
             safe with <literal>BIGINT</literal> values.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic DIV -->
+          <remark>
+            example_for_help_topic DIV
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT 5 DIV 2;</userinput>
@@ -4080,9 +4574,11 @@
 
       <itemizedlist>
 
-<!--  description_for_help_topic ABS -->
-
         <listitem>
+          <remark>
+            description_for_help_topic ABS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ABS()</primary>
@@ -4095,9 +4591,13 @@
             Returns the absolute value of <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ABS -->
+          <remark>
+            example_for_help_topic ABS
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ABS(2);</userinput>
@@ -4110,11 +4610,13 @@
             This function is safe to use with <literal>BIGINT</literal>
             values.
           </para>
-
-<!--  description_for_help_topic ACOS -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic ACOS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ACOS()</primary>
@@ -4131,9 +4633,13 @@
             <literal>-1</literal> to <literal>1</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ACOS -->
+          <remark>
+            example_for_help_topic ACOS
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ACOS(1);</userinput>
@@ -4143,11 +4649,13 @@
 mysql&gt; <userinput>SELECT ACOS(0);</userinput>
         -&gt; 1.570796
 </programlisting>
-
-<!--  description_for_help_topic ASIN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic ASIN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ASIN()</primary>
@@ -4164,9 +4672,13 @@
             <literal>-1</literal> to <literal>1</literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ASIN -->
+          <remark>
+            example_for_help_topic ASIN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ASIN(0.2);</userinput>
@@ -4174,11 +4686,13 @@
 mysql&gt; <userinput>SELECT ASIN('foo');</userinput>
         -&gt; 0.000000
 </programlisting>
-
-<!--  description_for_help_topic ATAN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic ATAN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ATAN()</primary>
@@ -4193,9 +4707,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ATAN -->
+          <remark>
+            example_for_help_topic ATAN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ATAN(2);</userinput>
@@ -4203,11 +4721,13 @@
 mysql&gt; <userinput>SELECT ATAN(-2);</userinput>
         -&gt; -1.107149
 </programlisting>
-
-<!--  description_for_help_topic ATAN2 -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic ATAN2
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ATAN2()</primary>
@@ -4228,9 +4748,13 @@
             of the result.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ATAN2 -->
+          <remark>
+            example_for_help_topic ATAN2
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ATAN(-2,2);</userinput>
@@ -4238,11 +4762,13 @@
 mysql&gt; <userinput>SELECT ATAN2(PI(),0);</userinput>
         -&gt; 1.570796
 </programlisting>
-
-<!--  description_for_help_topic CEILING  CEIL -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic CEILING CEIL
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>CEILING()</primary>
@@ -4257,9 +4783,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic CEILING -->
+          <remark>
+            example_for_help_topic CEILING
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CEILING(1.23);</userinput>
@@ -4277,11 +4807,13 @@
             The <literal>CEIL()</literal> alias was added in MySQL
             4.0.6.
           </para>
-
-<!--  description_for_help_topic COS -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic COS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>COS()</primary>
@@ -4295,19 +4827,25 @@
             <replaceable>X</replaceable> is given in radians.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic COS -->
+          <remark>
+            example_for_help_topic COS
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT COS(PI());</userinput>
         -&gt; -1.000000
 </programlisting>
-
-<!--  description_for_help_topic COT -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic COT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>COT()</primary>
@@ -4320,9 +4858,13 @@
             Returns the cotangent of <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic COT -->
+          <remark>
+            example_for_help_topic COT
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT COT(12);</userinput>
@@ -4330,11 +4872,13 @@
 mysql&gt; <userinput>SELECT COT(0);</userinput>
         -&gt; NULL
 </programlisting>
-
-<!--  description_for_help_topic CRC32 -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic CRC32
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>CRC32()</primary>
@@ -4350,9 +4894,13 @@
             expected be a string and is treated as one if it is not.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic CRC32 -->
+          <remark>
+            example_for_help_topic CRC32
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CRC32('MySQL');</userinput>
@@ -4362,11 +4910,13 @@
           <para>
             <literal>CRC32()</literal> is available as of MySQL 4.1.0.
           </para>
-
-<!--  description_for_help_topic DEGREES -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DEGREES
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>DEGREES()</primary>
@@ -4380,19 +4930,25 @@
             from radians to degrees.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic DEGREES -->
+          <remark>
+            example_for_help_topic DEGREES
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DEGREES(PI());</userinput>
         -&gt; 180.000000
 </programlisting>
-
-<!--  description_for_help_topic EXP -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic EXP
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>EXP()</primary>
@@ -4407,9 +4963,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic EXP -->
+          <remark>
+            example_for_help_topic EXP
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT EXP(2);</userinput>
@@ -4417,11 +4977,13 @@
 mysql&gt; <userinput>SELECT EXP(-2);</userinput>
         -&gt; 0.135335
 </programlisting>
-
-<!--  description_for_help_topic FLOOR -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic FLOOR
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>FLOOR()</primary>
@@ -4435,9 +4997,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic FLOOR -->
+          <remark>
+            example_for_help_topic FLOOR
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT FLOOR(1.23);</userinput>
@@ -4450,11 +5016,13 @@
             Note that the return value is converted to a
             <literal>BIGINT</literal>!
           </para>
-
-<!--  description_for_help_topic LN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic LN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LN()</primary>
@@ -4468,9 +5036,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic LN -->
+          <remark>
+            example_for_help_topic LN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LN(2);</userinput>
@@ -4484,11 +5056,13 @@
             with <literal>LOG(<replaceable>X</replaceable>)</literal> in
             MySQL.
           </para>
-
-<!--  description_for_help_topic LOG -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic LOG
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LOG()</primary>
@@ -4503,9 +5077,13 @@
             natural logarithm of <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic LOG -->
+          <remark>
+            example_for_help_topic LOG
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LOG(2);</userinput>
@@ -4533,11 +5111,13 @@
             is equivalent to
             <literal>LOG(<replaceable>X</replaceable>)/LOG(<replaceable>B</replaceable>)</literal>.
           </para>
-
-<!--  description_for_help_topic LOG2 -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic LOG2
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LOG2()</primary>
@@ -4551,9 +5131,13 @@
             <literal><replaceable>X</replaceable></literal>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic LOG2 -->
+          <remark>
+            example_for_help_topic LOG2
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LOG2(65536);</userinput>
@@ -4569,11 +5153,13 @@
             <literal>LOG(<replaceable>X</replaceable>)/LOG(2)</literal>
             instead.
           </para>
-
-<!--  description_for_help_topic LOG10 -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic LOG10
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>LOG10()</primary>
@@ -4587,9 +5173,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic LOG10 -->
+          <remark>
+            example_for_help_topic LOG10
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT LOG10(2);</userinput>
@@ -4599,11 +5189,13 @@
 mysql&gt; <userinput>SELECT LOG10(-100);</userinput>
         -&gt; NULL
 </programlisting>
-
-<!--  description_for_help_topic %  MOD -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic % MOD
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>MOD()</primary>
@@ -4638,9 +5230,13 @@
             <replaceable>M</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic % -->
+          <remark>
+            example_for_help_topic %
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT MOD(234, 10);</userinput>
@@ -4681,11 +5277,13 @@
 mysql&gt; <userinput>SELECT MOD(34.5,3);</userinput>
         -&gt; 2
 </programlisting>
-
-<!--  description_for_help_topic PI -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic PI
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>PI()</primary>
@@ -4700,9 +5298,13 @@
             double-precision value for PI.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic PI -->
+          <remark>
+            example_for_help_topic PI
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT PI();</userinput>
@@ -4710,11 +5312,13 @@
 mysql&gt; <userinput>SELECT PI()+0.000000000000000000;</userinput>
         -&gt; 3.141592653589793116
 </programlisting>
-
-<!--  description_for_help_topic POWER  POW -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic POWER POW
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>POW()</primary>
@@ -4734,9 +5338,13 @@
             the power of <replaceable>Y</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic POWER -->
+          <remark>
+            example_for_help_topic POWER
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT POW(2,2);</userinput>
@@ -4744,11 +5352,13 @@
 mysql&gt; <userinput>SELECT POW(2,-2);</userinput>
         -&gt; 0.250000
 </programlisting>
-
-<!--  description_for_help_topic RADIANS -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic RADIANS
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>RADIANS()</primary>
@@ -4762,19 +5372,25 @@
             from degrees to radians.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic RADIANS -->
+          <remark>
+            example_for_help_topic RADIANS
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT RADIANS(90);</userinput>
         -&gt; 1.570796
 </programlisting>
-
-<!--  description_for_help_topic RAND -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic RAND
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>RAND()</primary>
@@ -4792,9 +5408,13 @@
             sequence).
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic RAND -->
+          <remark>
+            example_for_help_topic RAND
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT RAND();</userinput>
@@ -4844,11 +5464,13 @@
             random numbers that is portable between platforms for the
             same MySQL version.
           </para>
-
-<!--  description_for_help_topic ROUND -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic ROUND
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>ROUND()</primary>
@@ -4868,9 +5490,13 @@
             point of the value <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic ROUND -->
+          <remark>
+            example_for_help_topic ROUND
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ROUND(-1.23);</userinput>
@@ -4956,11 +5582,13 @@
           <para>
             For more information, see <xref linkend="precision-math"/>.
           </para>
-
-<!--  description_for_help_topic SIGN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic SIGN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>SIGN()</primary>
@@ -4976,9 +5604,13 @@
             positive.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic SIGN -->
+          <remark>
+            example_for_help_topic SIGN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SIGN(-32);</userinput>
@@ -4988,11 +5620,13 @@
 mysql&gt; <userinput>SELECT SIGN(234);</userinput>
         -&gt; 1
 </programlisting>
-
-<!--  description_for_help_topic SIN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic SIN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>SIN()</primary>
@@ -5006,19 +5640,25 @@
             <replaceable>X</replaceable> is given in radians.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic SIN -->
+          <remark>
+            example_for_help_topic SIN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SIN(PI());</userinput>
         -&gt; 0.000000
 </programlisting>
-
-<!--  description_for_help_topic SQRT -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic SQRT
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>SQRT()</primary>
@@ -5032,9 +5672,13 @@
             <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic SQRT -->
+          <remark>
+            example_for_help_topic SQRT
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT SQRT(4);</userinput>
@@ -5042,11 +5686,13 @@
 mysql&gt; <userinput>SELECT SQRT(20);</userinput>
         -&gt; 4.472136
 </programlisting>
-
-<!--  description_for_help_topic TAN -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic TAN
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>TAN()</primary>
@@ -5060,19 +5706,25 @@
             <replaceable>X</replaceable> is given in radians.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic TAN -->
+          <remark>
+            example_for_help_topic TAN
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT TAN(PI()+1);</userinput>
         -&gt; 1.557408
 </programlisting>
-
-<!--  description_for_help_topic TRUNCATE -->
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic TRUNCATE
+          </remark>
+
           <para>
             <indexterm type="function">
               <primary>TRUNCATE()</primary>
@@ -5091,9 +5743,13 @@
             decimal point of the value <replaceable>X</replaceable>.
           </para>
 
-<!--  end_description_for_help_topic -->
+          <remark>
+            end_description_for_help_topic
+          </remark>
 
-<!--  example_for_help_topic TRUNCATE -->
+          <remark>
+            example_for_help_topic TRUNCATE
+          </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT TRUNCATE(1.223,1);</userinput>
@@ -5145,7 +5801,9 @@
 
     <title id="title-date-and-time-functions">&title-date-and-time-functions;</title>
 
-<!--  help_category Date and Time Functions@Functions -->
+    <remark>
+      help_category Date and Time Functions@Functions
+    </remark>
 
     <indexterm type="function">
       <primary>date and time functions</primary>
@@ -5224,9 +5882,11 @@
 
     <itemizedlist>
 
-<!--  description_for_help_topic ADDDATE -->
-
       <listitem>
+        <remark>
+          description_for_help_topic ADDDATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ADDDATE()</primary>
@@ -5267,12 +5927,16 @@
         -&gt; '1998-02-02'
 </programlisting>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic ADDTIME -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic ADDTIME
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>ADDTIME()</primary>
@@ -5292,9 +5956,13 @@
           expression.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic ADDTIME -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic ADDTIME
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT ADDTIME('1997-12-31 23:59:59.999999',</userinput>
@@ -5307,11 +5975,13 @@
         <para>
           <literal>ADDTIME()</literal> was added in MySQL 4.1.1.
         </para>
-
-<!--  description_for_help_topic CONVERT_TZ -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CONVERT_TZ
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CONVERT_TZ()</primary>
@@ -5330,7 +6000,9 @@
           <literal>NULL</literal> if the arguments are invalid.
         </para>
 
-<!--  end_description_for_help_topic -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
 
         <para>
           If the value falls out of the supported range of the
@@ -5340,7 +6012,9 @@
           <xref linkend="date-and-time-type-overview"/>.
         </para>
 
-<!--  example_for_help_topic CONVERT_TZ -->
+        <remark>
+          example_for_help_topic CONVERT_TZ
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CONVERT_TZ('2004-01-01 12:00:00','GMT','MET');</userinput>
@@ -5359,11 +6033,13 @@
         <para>
           <literal>CONVERT_TZ()</literal> was added in MySQL 4.1.3.
         </para>
-
-<!--  description_for_help_topic CURDATE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CURDATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CURDATE()</primary>
@@ -5379,9 +6055,13 @@
           or numeric context.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CURDATE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CURDATE
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CURDATE();</userinput>
@@ -5389,11 +6069,13 @@
 mysql&gt; <userinput>SELECT CURDATE() + 0;</userinput>
         -&gt; 19971215
 </programlisting>
-
-<!--  description_for_help_topic CURRENT_DATE -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CURRENT_DATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CURRENT_DATE</primary>
@@ -5409,12 +6091,16 @@
           <literal>CURDATE()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic CURTIME -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CURTIME
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CURTIME()</primary>
@@ -5430,9 +6116,13 @@
           or numeric context.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic CURTIME -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic CURTIME
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT CURTIME();</userinput>
@@ -5440,11 +6130,13 @@
 mysql&gt; <userinput>SELECT CURTIME() + 0;</userinput>
         -&gt; 235026
 </programlisting>
-
-<!--  description_for_help_topic CURRENT_TIME -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CURRENT_TIME
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CURRENT_TIME</primary>
@@ -5460,12 +6152,16 @@
           <literal>CURTIME()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic CURRENT_TIMESTAMP -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic CURRENT_TIMESTAMP
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>CURRENT_TIMESTAMP</primary>
@@ -5481,12 +6177,16 @@
           <literal>NOW()</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic DATE function  DATE -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DATE function DATE
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DATE()</primary>
@@ -5500,9 +6200,13 @@
           <replaceable>expr</replaceable>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DATE function -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic DATE function
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DATE('2003-12-31 01:02:03');</userinput>
@@ -5512,11 +6216,13 @@
         <para>
           <literal>DATE()</literal> is available as of MySQL 4.1.1.
         </para>
-
-<!--  description_for_help_topic DATEDIFF -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DATEDIFF
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DATEDIFF()</primary>
@@ -5537,9 +6243,13 @@
           calculation.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DATEDIFF -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic DATEDIFF
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DATEDIFF('1997-12-31 23:59:59','1997-12-30');</userinput>
@@ -5551,11 +6261,16 @@
         <para>
           <literal>DATEDIFF()</literal> was added in MySQL 4.1.1.
         </para>
-
-<!--  description_for_help_topic DATE OPERATIONS  DATE DATE_ADD DATE_SUB SECOND MINUTE HOUR DAY MONTH YEAR MINUTE_SECOND HOUR_MINUTE DAY_HOUR YEAR_MONTH HOUR_SECOND DAY_MINUTE DAY_SECOND INTERVAL -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DATE OPERATIONS DATE DATE_ADD
+          DATE_SUB SECOND MINUTE HOUR DAY MONTH YEAR MINUTE_SECOND
+          HOUR_MINUTE DAY_HOUR YEAR_MONTH HOUR_SECOND DAY_MINUTE
+          DAY_SECOND INTERVAL
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DATE_ADD()</primary>
@@ -5586,7 +6301,9 @@
           the expression should be interpreted.
         </para>
 
-<!--  end_description_for_help_topic -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
 
         <para>
           The <literal>INTERVAL</literal> keyword and the
@@ -5752,7 +6469,9 @@
           or datetime value from an interval. (See examples below.)
         </para>
 
-<!--  example_for_help_topic DATE OPERATIONS -->
+        <remark>
+          example_for_help_topic DATE OPERATIONS
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT '1997-12-31 23:59:59' + INTERVAL 1 SECOND;</userinput>
@@ -5827,11 +6546,13 @@
 mysql&gt; <userinput>SELECT DATE_ADD('1998-01-30', INTERVAL 1 MONTH);</userinput>
         -&gt; '1998-02-28'
 </programlisting>
-
-<!--  description_for_help_topic DATE_FORMAT -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DATE_FORMAT
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DATE_FORMAT()</primary>
@@ -6024,9 +6745,13 @@
           <literal>'2004-00-00'</literal> to be stored as of MySQL 3.23.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DATE_FORMAT -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic DATE_FORMAT
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DATE_FORMAT('1997-10-04 22:23:00', '%W %M %Y');</userinput>
@@ -6042,11 +6767,13 @@
 mysql&gt; <userinput>SELECT DATE_FORMAT('1999-01-01', '%X %V');</userinput>
         -&gt; '1998 52'
 </programlisting>
-
-<!--  description_for_help_topic DAY -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DAY
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DAY()</primary>
@@ -6061,12 +6788,16 @@
           4.1.1.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic DAYNAME -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DAYNAME
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DAYNAME()</primary>
@@ -6080,19 +6811,25 @@
           <replaceable>date</replaceable>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DAYNAME -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic DAYNAME
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DAYNAME('1998-02-05');</userinput>
         -&gt; 'Thursday'
 </programlisting>
-
-<!--  description_for_help_topic DAYOFMONTH -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DAYOFMONTH
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DAYOFMONTH()</primary>
@@ -6107,19 +6844,25 @@
           <literal>1</literal> to <literal>31</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DAYOFMONTH -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic DAYOFMONTH
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DAYOFMONTH('1998-02-03');</userinput>
         -&gt; 3
 </programlisting>
-
-<!--  description_for_help_topic DAYOFWEEK -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DAYOFWEEK
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DAYOFWEEK()</primary>
@@ -6135,19 +6878,25 @@
           correspond to the ODBC standard.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DAYOFWEEK -->
+        <remark>
+          end_description_for_help_topic
+        </remark>
+
+        <remark>
+          example_for_help_topic DAYOFWEEK
+        </remark>
 
 <programlisting>
 mysql&gt; <userinput>SELECT DAYOFWEEK('1998-02-03');</userinput>
         -&gt; 3
 </programlisting>
-
-<!--  description_for_help_topic DAYOFYEAR -->
       </listitem>
 
       <listitem>
+        <remark>
+          description_for_help_topic DAYOFYEAR
+        </remark>
+
         <para>
           <indexterm type="function">
             <primary>DAYOFYEAR()</primary>
@@ -6162,19 +6911,25 @@
           <literal>1</literal> to <literal>366</literal>.
         </para>
 
-<!--  end_description_for_help_topic -->
-
-<!--  example_for_help_topic DAYOFYEAR -->
+        <remark>
+          end_description_for_help_topic
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3534)paul12 Sep