diff --git a/reference/mysql/functions/mysql-affected-rows.xml b/reference/mysql/functions/mysql-affected-rows.xml
index 1f8e510e86..e672aabf00 100644
--- a/reference/mysql/functions/mysql-affected-rows.xml
+++ b/reference/mysql/functions/mysql-affected-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-affected-rows">
    <refnamediv>
@@ -73,13 +73,13 @@
       </programlisting>
       <para>
       The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 Records deleted: 10
 Records deleted: 0
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
      <example>
       <title>Update-Query</title>
@@ -100,17 +100,17 @@ mysql_query("COMMIT");
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 Updated Records: 10
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example> 
     </para>
     <para>
-     See also: <function>mysql_num_rows</function>,
-               <function>mysql_info</function>.
+     See also <function>mysql_num_rows</function>,
+     <function>mysql_info</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-client-encoding.xml b/reference/mysql/functions/mysql-client-encoding.xml
index 7fef0f016c..3255b7ebd8 100644
--- a/reference/mysql/functions/mysql-client-encoding.xml
+++ b/reference/mysql/functions/mysql-client-encoding.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.100 -->
   <refentry id="function.mysql-client-encoding">
    <refnamediv>
@@ -16,6 +16,7 @@
      <function>mysql_client_encoding</function> returns the default
      character set name for the current connection.
     </para>
+    <para>
      <example>
       <title><function>mysql_client_encoding</function> example</title>
       <programlisting role="php">
@@ -29,15 +30,16 @@ printf ("current character set is %s\n", $charset);
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 current character set is latin1
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
+    </para>
     <para>
-     See also:
+     See also
      <function>mysql_real_escape_string</function>
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-close.xml b/reference/mysql/functions/mysql-close.xml
index 7d7ae4ed00..5373df9662 100644
--- a/reference/mysql/functions/mysql-close.xml
+++ b/reference/mysql/functions/mysql-close.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-close">
    <refnamediv>
@@ -35,9 +35,10 @@
       created by <function>mysql_pconnect</function>.
      </para>
     </note>
-    <example>
-     <title>MySQL close example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title>MySQL close example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     $link = mysql_connect("localhost", "mysql_user", "mysql_password")
@@ -46,10 +47,11 @@
     mysql_close($link);
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_connect</function>, and
+     See also <function>mysql_connect</function> and
      <function>mysql_pconnect</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml
index aa1d499d63..22282f2684 100644
--- a/reference/mysql/functions/mysql-connect.xml
+++ b/reference/mysql/functions/mysql-connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-connect">
    <refnamediv>
@@ -93,9 +93,10 @@
      the script ends, unless it's closed earlier by explicitly calling
      <function>mysql_close</function>.
     </para>
-    <example>
-     <title>MySQL connect example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_connect</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     $link = mysql_connect("localhost", "mysql_user", "mysql_password")
@@ -104,9 +105,11 @@
     mysql_close($link);
 ?>
 ]]>
-     </programlisting>
-    </example>
-    <para> See also
+      </programlisting>
+     </example>
+    </para>
+    <para> 
+     See also
      <function>mysql_pconnect</function> and
      <function>mysql_close</function>.
     </para>
diff --git a/reference/mysql/functions/mysql-create-db.xml b/reference/mysql/functions/mysql-create-db.xml
index e6e8b3be6e..62559fdaa6 100644
--- a/reference/mysql/functions/mysql-create-db.xml
+++ b/reference/mysql/functions/mysql-create-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-create-db">
    <refnamediv>
@@ -23,9 +23,10 @@
     <para>
      &return.success;
     </para>
-    <example>
-     <title>MySQL create database example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title>MySQL create database example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     $link = mysql_pconnect("localhost", "mysql_user", "mysql_password")
@@ -38,8 +39,9 @@
     }
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
      For downwards compatibility <function>mysql_createdb</function>
      can also be used. This is deprecated, however.
@@ -58,8 +60,9 @@
      </para> 
     </warning>
     <para>
-     See also: <function>mysql_drop_db</function>,
-               <function>mysql_query</function>.
+     See also 
+     <function>mysql_drop_db</function> and
+     <function>mysql_query</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-data-seek.xml b/reference/mysql/functions/mysql-data-seek.xml
index 53fbee450c..55bb72e610 100644
--- a/reference/mysql/functions/mysql-data-seek.xml
+++ b/reference/mysql/functions/mysql-data-seek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-data-seek">
    <refnamediv>
@@ -34,9 +34,10 @@
       <function>mysql_unbuffered_query</function>. 
      </para>
     </note>
-    <example>
-     <title>MySQL data seek example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_data_seek</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     $link = mysql_pconnect("localhost", "mysql_user", "mysql_password")
@@ -65,11 +66,13 @@
     mysql_free_result($result);
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_query</function>,
-               <function>mysql_num_rows</function>.
+     See also
+     <function>mysql_query</function> and
+     <function>mysql_num_rows</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-db-name.xml b/reference/mysql/functions/mysql-db-name.xml
index 996b4ec582..49d659c602 100644
--- a/reference/mysql/functions/mysql-db-name.xml
+++ b/reference/mysql/functions/mysql-db-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.23 -->
   <refentry id="function.mysql-db-name">
    <refnamediv>
@@ -29,9 +29,10 @@
      <function>mysql_error</function> to determine the nature of the
      error.
     </para>
-    <example>
-     <title><function>mysql_db_name</function> example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_db_name</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     error_reporting(E_ALL);
@@ -47,8 +48,9 @@
     }
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
      For backward compatibility, <function>mysql_dbname</function> is
      also accepted. This is deprecated, however.
diff --git a/reference/mysql/functions/mysql-drop-db.xml b/reference/mysql/functions/mysql-drop-db.xml
index 9b690c5091..b2d5ce4188 100644
--- a/reference/mysql/functions/mysql-drop-db.xml
+++ b/reference/mysql/functions/mysql-drop-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-drop-db">
    <refnamediv>
@@ -41,7 +41,8 @@
      </para>
     </warning>
     <para>
-     See also <function>mysql_create_db</function>, and
+     See also 
+     <function>mysql_create_db</function> and
      <function>mysql_query</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-errno.xml b/reference/mysql/functions/mysql-errno.xml
index aed6075d5c..46bab9b050 100644
--- a/reference/mysql/functions/mysql-errno.xml
+++ b/reference/mysql/functions/mysql-errno.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-errno">
    <refnamediv>
@@ -65,7 +65,7 @@
      </para>
     </note>
     <para>
-     See also: <function>mysql_error</function>
+     See also <function>mysql_error</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-error.xml b/reference/mysql/functions/mysql-error.xml
index dcbc685501..1de2420f97 100644
--- a/reference/mysql/functions/mysql-error.xml
+++ b/reference/mysql/functions/mysql-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-error">
    <refnamediv>
@@ -64,7 +64,7 @@
      </para>
     </note>
     <para>
-     See also: <function>mysql_errno</function>
+     See also <function>mysql_errno</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-escape-string.xml b/reference/mysql/functions/mysql-escape-string.xml
index c4b6feacd1..bd05f275d5 100644
--- a/reference/mysql/functions/mysql-escape-string.xml
+++ b/reference/mysql/functions/mysql-escape-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-escape-string">
    <refnamediv>
@@ -31,9 +31,10 @@
       connection argument and does not respect the current charset setting.  
      </simpara>
     </note>
-    <example>
-     <title><function>mysql_escape_string</function> example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_escape_string</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     $item = "Zak's Laptop";
@@ -41,20 +42,21 @@
     printf ("Escaped string: %s\n", $escaped_item);
 ?>
 ]]>
-     </programlisting>
-     <para>
-      The above example would produce the following output:
+      </programlisting>
+      <para>
+       The above example would produce the following output:
+      </para>
       <screen>
 <![CDATA[
 Escaped string: Zak\'s Laptop
 ]]>
       </screen>
-     </para>
-    </example>
+     </example>
+    </para>
     <para>
-     See also:
+     See also
      <function>mysql_real_escape_string</function>,
-     <function>addslashes</function>, and the
+     <function>addslashes</function> and the
      <link linkend="ini.magic-quotes-gpc">magic_quotes_gpc</link>
      directive.
     </para>
diff --git a/reference/mysql/functions/mysql-fetch-array.xml b/reference/mysql/functions/mysql-fetch-array.xml
index 700b40f78e..bca0f79b7d 100644
--- a/reference/mysql/functions/mysql-fetch-array.xml
+++ b/reference/mysql/functions/mysql-fetch-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.27 -->
   <refentry id="function.mysql-fetch-array">
    <refnamediv>
@@ -64,9 +64,10 @@ select table1.field as foo, table2.field as bar from table1, table2
      <function>mysql_fetch_row</function> works).
     </para>
     &database.field-case;
-    <example>
-     <title>mysql_fetch_array with MYSQL_NUM</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_fetch_array</function> with MYSQL_NUM</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -82,11 +83,11 @@ select table1.field as foo, table2.field as bar from table1, table2
     mysql_free_result($result);
 ?>
 ]]>
-     </programlisting>
-    </example>
-    <example>
-     <title>mysql_fetch_array with MYSQL_ASSOC</title>
-     <programlisting role="php">
+      </programlisting>
+     </example>
+     <example>
+      <title><function>mysql_fetch_array</function> with MYSQL_ASSOC</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -102,11 +103,11 @@ select table1.field as foo, table2.field as bar from table1, table2
     mysql_free_result($result);
 ?>
 ]]>
-     </programlisting>
-    </example>
-    <example>
-     <title>mysql_fetch_array with MYSQL_BOTH</title>
-     <programlisting role="php">
+      </programlisting>
+     </example>
+     <example>
+      <title><function>mysql_fetch_array</function> with MYSQL_BOTH</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -122,8 +123,9 @@ select table1.field as foo, table2.field as bar from table1, table2
     mysql_free_result($result);
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
      See also
      <function>mysql_fetch_row</function> and
diff --git a/reference/mysql/functions/mysql-fetch-assoc.xml b/reference/mysql/functions/mysql-fetch-assoc.xml
index b62e17353a..637227440f 100644
--- a/reference/mysql/functions/mysql-fetch-assoc.xml
+++ b/reference/mysql/functions/mysql-fetch-assoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.45 -->
   <refentry id="function.mysql-fetch-assoc">
    <refnamediv>
@@ -42,9 +42,10 @@
      provides a significant added value.
     </para>
     &database.field-case;
-    <example>
-     <title>An expanded <function>mysql_fetch_assoc</function> example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title>An expanded <function>mysql_fetch_assoc</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
 
@@ -90,13 +91,14 @@
 
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
      See also 
      <function>mysql_fetch_row</function>,
      <function>mysql_fetch_array</function>,
-     <function>mysql_query</function>, and
+     <function>mysql_query</function> and
      <function>mysql_error</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-fetch-field.xml b/reference/mysql/functions/mysql-fetch-field.xml
index cdd55063dc..96319f4d65 100644
--- a/reference/mysql/functions/mysql-fetch-field.xml
+++ b/reference/mysql/functions/mysql-fetch-field.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-fetch-field">
    <refnamediv>
@@ -92,9 +92,10 @@
      </itemizedlist>
     </para>
     &database.field-case;
-    <example>
-     <title><function>mysql_fetch_field</function></title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_fetch_field</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
 mysql_connect('localhost:3306', $user, $password)
@@ -129,8 +130,9 @@ zerofill:     $meta->zerofill
 mysql_free_result($result);
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
      See also <function>mysql_field_seek</function>.
     </para>
diff --git a/reference/mysql/functions/mysql-fetch-lengths.xml b/reference/mysql/functions/mysql-fetch-lengths.xml
index 562a3bf1c5..225c950262 100644
--- a/reference/mysql/functions/mysql-fetch-lengths.xml
+++ b/reference/mysql/functions/mysql-fetch-lengths.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-fetch-lengths">
    <refnamediv>
@@ -28,7 +28,7 @@
      offset 0.
     </para>
     <para>
-     See also: <function>mysql_fetch_row</function>.
+     See also <function>mysql_fetch_row</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-fetch-object.xml b/reference/mysql/functions/mysql-fetch-object.xml
index 74e6b62651..329b667e31 100644
--- a/reference/mysql/functions/mysql-fetch-object.xml
+++ b/reference/mysql/functions/mysql-fetch-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-fetch-object">
    <refnamediv>
@@ -62,7 +62,9 @@ mysql_free_result($result);
      </example>
     </para>
     <para>
-     See also: <function>mysql_fetch_array</function> and
+     See also 
+     <function>mysql_fetch_array</function>,
+     <function>mysql_fetch_assoc</function> and
      <function>mysql_fetch_row</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-fetch-row.xml b/reference/mysql/functions/mysql-fetch-row.xml
index 9ab6111105..0828814222 100644
--- a/reference/mysql/functions/mysql-fetch-row.xml
+++ b/reference/mysql/functions/mysql-fetch-row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-fetch-row">
    <refnamediv>
@@ -29,10 +29,12 @@
     </para>
     &database.field-case;
     <para>
-     See also: <function>mysql_fetch_array</function>,
+     See also 
+     <function>mysql_fetch_array</function>,
+     <function>mysql_fetch_assoc</function>,
      <function>mysql_fetch_object</function>,
      <function>mysql_data_seek</function>,
-     <function>mysql_fetch_lengths</function>, and
+     <function>mysql_fetch_lengths</function> and
      <function>mysql_result</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-field-name.xml b/reference/mysql/functions/mysql-field-name.xml
index 19222509cf..4d79c2b5d7 100644
--- a/reference/mysql/functions/mysql-field-name.xml
+++ b/reference/mysql/functions/mysql-field-name.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-field-name">
    <refnamediv>
@@ -53,13 +53,13 @@ echo mysql_field_name($res, 2);
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 user_id
 password
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
     </para>
     <para>
diff --git a/reference/mysql/functions/mysql-field-seek.xml b/reference/mysql/functions/mysql-field-seek.xml
index e48ab16e04..5ac7d8dd55 100644
--- a/reference/mysql/functions/mysql-field-seek.xml
+++ b/reference/mysql/functions/mysql-field-seek.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-field-seek">
    <refnamediv>
@@ -22,7 +22,7 @@
      <function>mysql_field_seek</function> will be returned.
     </para>
     <para>
-     See also: <function>mysql_fetch_field</function>.
+     See also <function>mysql_fetch_field</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-field-type.xml b/reference/mysql/functions/mysql-field-type.xml
index bfaffe4017..82920afae9 100644
--- a/reference/mysql/functions/mysql-field-type.xml
+++ b/reference/mysql/functions/mysql-field-type.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-field-type">
    <refnamediv>
@@ -23,7 +23,7 @@
      detailed in the <ulink url="&url.mysql.docs;">MySQL
      documentation</ulink>.
      <example>
-      <title>MySQL field types</title>
+      <title><function>mysql_field_type</function> example</title>
       <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/mysql/functions/mysql-get-client-info.xml b/reference/mysql/functions/mysql-get-client-info.xml
index b76d02226b..53dcf6f4b0 100644
--- a/reference/mysql/functions/mysql-get-client-info.xml
+++ b/reference/mysql/functions/mysql-get-client-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-get-client-info">
    <refnamediv>
@@ -16,28 +16,31 @@
      <function>mysql_get_client_info</function> returns a string that
      represents the client library version.
     </para>
-    <example>
-     <title>mysql_get_client_info Example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_get_client_info</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     printf ("MySQL client info: %s\n", mysql_get_client_info());
 ?>
 ]]>
-     </programlisting>
-     <para>
-      The above example would produce the following output:
-     </para>
-     <screen>
+      </programlisting>
+      <para>
+       The above example would produce the following output:
+      </para>
+      <screen>
 <![CDATA[
 MySQL client info: 3.23.39
 ]]>
-     </screen>
-    </example>
+      </screen>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_get_host_info</function>,
-               <function>mysql_get_proto_info</function> and
-               <function>mysql_get_server_info</function>.
+     See also
+     <function>mysql_get_host_info</function>,
+     <function>mysql_get_proto_info</function> and
+     <function>mysql_get_server_info</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-get-host-info.xml b/reference/mysql/functions/mysql-get-host-info.xml
index ade0304ef2..0b0de5cb99 100644
--- a/reference/mysql/functions/mysql-get-host-info.xml
+++ b/reference/mysql/functions/mysql-get-host-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-get-host-info">
    <refnamediv>
@@ -19,9 +19,10 @@
      name.  If <parameter>link_identifier</parameter> is omitted, the
      last opened connection will be used.
     </para>
-    <example>
-     <title>mysql_get_host_info Example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_get_host_info</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -29,20 +30,22 @@
     printf ("MySQL host info: %s\n", mysql_get_host_info());
 ?>
 ]]>
-     </programlisting>
-     <para>
-      The above example would produce the following output:
-     </para>
-     <screen>
+      </programlisting>
+      <para>
+       The above example would produce the following output:
+      </para>
+      <screen>
 <![CDATA[
 MySQL host info: Localhost via UNIX socket
 ]]>
-     </screen>
-    </example>
+      </screen>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_get_client_info</function>,
-               <function>mysql_get_proto_info</function> and
-               <function>mysql_get_server_info</function>.
+     See also 
+     <function>mysql_get_client_info</function>,
+     <function>mysql_get_proto_info</function> and
+     <function>mysql_get_server_info</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-get-proto-info.xml b/reference/mysql/functions/mysql-get-proto-info.xml
index 091a52ff8d..f0fcbf656e 100644
--- a/reference/mysql/functions/mysql-get-proto-info.xml
+++ b/reference/mysql/functions/mysql-get-proto-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-get-proto-info">
    <refnamediv>
@@ -19,9 +19,10 @@
      <parameter>link_identifier</parameter> is omitted, the last opened
      connection will be used.
     </para>
-    <example>
-     <title>mysql_get_proto_info Example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_get_proto_info</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -29,20 +30,22 @@
     printf ("MySQL protocol version: %s\n", mysql_get_proto_info());
 ?>
 ]]>
-     </programlisting>
-     <para>
-      The above example would produce the following output:
-     </para>
-     <screen>
+      </programlisting>
+      <para>
+       The above example would produce the following output:
+      </para>
+      <screen>
 <![CDATA[
 MySQL protocol version: 10
 ]]>
-     </screen>
-    </example>
+      </screen>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_get_client_info</function>,
-               <function>mysql_get_host_info</function> and
-               <function>mysql_get_server_info</function>.
+     See also 
+     <function>mysql_get_client_info</function>,
+     <function>mysql_get_host_info</function> and
+     <function>mysql_get_server_info</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-get-server-info.xml b/reference/mysql/functions/mysql-get-server-info.xml
index 5b6ed19427..6a222447f3 100644
--- a/reference/mysql/functions/mysql-get-server-info.xml
+++ b/reference/mysql/functions/mysql-get-server-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.96 -->
   <refentry id="function.mysql-get-server-info">
    <refnamediv>
@@ -19,9 +19,10 @@
      <parameter>link_identifier</parameter> is omitted, the last opened
      connection will be used.
     </para>
-    <example>
-     <title>mysql_get_server_info Example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_get_server_info</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -29,20 +30,22 @@
     printf ("MySQL server version: %s\n", mysql_get_server_info());
 ?>
 ]]>
-     </programlisting>
-     <para>
-      The above example would produce the following output:
-     </para>
-     <screen>
+      </programlisting>
+      <para>
+       The above example would produce the following output:
+      </para>
+      <screen>
 <![CDATA[
 MySQL server version: 4.0.1-alpha
 ]]>
-     </screen>
-    </example>
+      </screen>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_get_client_info</function>,
-               <function>mysql_get_host_info</function> and
-               <function>mysql_get_proto_info</function>.
+     See also 
+     <function>mysql_get_client_info</function>,
+     <function>mysql_get_host_info</function> and
+     <function>mysql_get_proto_info</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-info.xml b/reference/mysql/functions/mysql-info.xml
index a88a12ef60..dee0d01bc2 100644
--- a/reference/mysql/functions/mysql-info.xml
+++ b/reference/mysql/functions/mysql-info.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-info">
    <refnamediv>
@@ -54,7 +54,7 @@ String format: Rows matched: 65 Changed: 65 Warnings: 0
     </para>
     </note>
     <para>
-     See also: <function>mysql_affected_rows</function>
+     See also <function>mysql_affected_rows</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-insert-id.xml b/reference/mysql/functions/mysql-insert-id.xml
index c846b7201c..59a0c95558 100644
--- a/reference/mysql/functions/mysql-insert-id.xml
+++ b/reference/mysql/functions/mysql-insert-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-insert-id">
    <refnamediv>
@@ -50,9 +50,10 @@
       <literal>LAST_INSERT_ID()</literal> in an SQL query.
      </para>
     </warning>
-    <example>
-     <title>mysql_insert_id Example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_insert_id</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     mysql_connect("localhost", "mysql_user", "mysql_password") or
@@ -63,10 +64,11 @@
     printf ("Last inserted record has id %d\n", mysql_insert_id());
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
-     See also: <function>mysql_query</function>.
+     See also <function>mysql_query</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-list-dbs.xml b/reference/mysql/functions/mysql-list-dbs.xml
index d29e5a0f0e..b8fa48098f 100644
--- a/reference/mysql/functions/mysql-list-dbs.xml
+++ b/reference/mysql/functions/mysql-list-dbs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.16 -->
   <refentry id="function.mysql-list-dbs">
    <refnamediv>
@@ -40,15 +40,15 @@ while ($row = mysql_fetch_object($db_list)) {
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 database1
 database2
 database3
 ...
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
     </para>
     <note>
diff --git a/reference/mysql/functions/mysql-list-fields.xml b/reference/mysql/functions/mysql-list-fields.xml
index cfa44b5f7e..9eb723b11a 100644
--- a/reference/mysql/functions/mysql-list-fields.xml
+++ b/reference/mysql/functions/mysql-list-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-list-fields">
    <refnamediv>
@@ -43,15 +43,15 @@ for ($i = 0; $i < $columns; $i++) {
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 field1
 field2
 field3
 ...
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
     </para>
     <para>
diff --git a/reference/mysql/functions/mysql-list-processes.xml b/reference/mysql/functions/mysql-list-processes.xml
index e67e6c8750..4df78066d2 100644
--- a/reference/mysql/functions/mysql-list-processes.xml
+++ b/reference/mysql/functions/mysql-list-processes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.96 -->
   <refentry id="function.mysql-list-processes">
    <refnamediv>
@@ -37,18 +37,18 @@ mysql_free_result ($result);
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 1 localhost test Processlist 0
 4 localhost mysql sleep 5
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
     </para>
     <para>
-     See also:
-     <function>mysql_thread_id</function>
+     See also
+     <function>mysql_thread_id</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-list-tables.xml b/reference/mysql/functions/mysql-list-tables.xml
index 5c4098115c..1af4183d1e 100644
--- a/reference/mysql/functions/mysql-list-tables.xml
+++ b/reference/mysql/functions/mysql-list-tables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-list-tables">
    <refnamediv>
@@ -41,9 +41,10 @@
       </simpara>
      </note>
     </para>
-    <example>
-     <title><function>mysql_list_tables</function> example</title>
-     <programlisting role="php">
+    <para>
+     <example>
+      <title><function>mysql_list_tables</function> example</title>
+      <programlisting role="php">
 <![CDATA[
 <?php
     $dbname = 'mysql_dbname';
@@ -68,11 +69,13 @@
     mysql_free_result($result);
 ?>
 ]]>
-     </programlisting>
-    </example>
+      </programlisting>
+     </example>
+    </para>
     <para>
-    See also: <function>mysql_list_dbs</function>,
-    and <function>mysql_tablename</function>.
+     See also
+     <function>mysql_list_dbs</function> and
+     <function>mysql_tablename</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-num-fields.xml b/reference/mysql/functions/mysql-num-fields.xml
index 9a7848c2f8..0937ee6cbc 100644
--- a/reference/mysql/functions/mysql-num-fields.xml
+++ b/reference/mysql/functions/mysql-num-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-num-fields">
    <refnamediv>
@@ -20,8 +20,9 @@
      See also
      <function>mysql_select_db</function>,
      <function>mysql_query</function>,
-     <function>mysql_fetch_field</function>, and
-     <function>mysql_num_rows</function>.</para>
+     <function>mysql_fetch_field</function> and
+     <function>mysql_num_rows</function>.
+    </para>
     <para>
      For downward compatibility <function>mysql_numfields</function>
      can also be used. This is deprecated however.
diff --git a/reference/mysql/functions/mysql-num-rows.xml b/reference/mysql/functions/mysql-num-rows.xml
index ae54415d62..a33f91bc1d 100644
--- a/reference/mysql/functions/mysql-num-rows.xml
+++ b/reference/mysql/functions/mysql-num-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-num-rows">
    <refnamediv>
@@ -49,7 +49,7 @@ echo "$num_rows Rows\n";
      <function>mysql_affected_rows</function>,
      <function>mysql_connect</function>,
      <function>mysql_data_seek</function>,
-     <function>mysql_select_db</function>, and
+     <function>mysql_select_db</function> and
      <function>mysql_query</function>.
     </para>
     <para>
diff --git a/reference/mysql/functions/mysql-ping.xml b/reference/mysql/functions/mysql-ping.xml
index c59bb419ec..2479682aab 100644
--- a/reference/mysql/functions/mysql-ping.xml
+++ b/reference/mysql/functions/mysql-ping.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.100 -->
   <refentry id="function.mysql-ping">
    <refnamediv>
@@ -24,8 +24,8 @@
      server is working, otherwise &false;.
     </para>
     <para>
-     See also:
-     <function>mysql_thread_id</function>,
+     See also
+     <function>mysql_thread_id</function> and
      <function>mysql_list_processes</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-query.xml b/reference/mysql/functions/mysql-query.xml
index 5d9206bf92..099dd182bd 100644
--- a/reference/mysql/functions/mysql-query.xml
+++ b/reference/mysql/functions/mysql-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-query">
    <refnamediv>
@@ -43,7 +43,7 @@
      The following query is syntactically invalid, so
      <function>mysql_query</function> fails and returns &false;:
      <example>
-      <title><function>mysql_query</function></title>
+      <title><function>mysql_query</function> example</title>
       <programlisting role="php">
 <![CDATA[
 <php
@@ -96,7 +96,8 @@ $result = mysql_query("SELECT my_col FROM my_tbl")
      execution.
     </para>
     <para>
-     See also: <function>mysql_num_rows</function>,
+     See also 
+     <function>mysql_num_rows</function>,
      <function>mysql_affected_rows</function>,
      <function>mysql_unbuffered_query</function>,
      <function>mysql_free_result</function>,
@@ -104,7 +105,7 @@ $result = mysql_query("SELECT my_col FROM my_tbl")
      <function>mysql_fetch_row</function>,
      <function>mysql_fetch_assoc</function>,
      <function>mysql_result</function>,
-     <function>mysql_select_db</function>, and
+     <function>mysql_select_db</function> and
      <function>mysql_connect</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-real-escape-string.xml b/reference/mysql/functions/mysql-real-escape-string.xml
index 956361f106..600c2124dc 100644
--- a/reference/mysql/functions/mysql-real-escape-string.xml
+++ b/reference/mysql/functions/mysql-real-escape-string.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.100 -->
   <refentry id="function.mysql-real-escape-string">
    <refnamediv>
@@ -27,6 +27,7 @@
       <literal>%</literal> and <literal>_</literal>.
      </simpara>
     </note>
+    <para>
      <example>
       <title><function>mysql_real_escape_string</function> example</title>
       <programlisting role="php">
@@ -40,16 +41,17 @@ printf ("Escaped string: %s\n", $escaped_item);
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 Escaped string: Zak\'s and Derick\'s Laptop
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
+    </para>
     <para>
-     See also:
-     <function>mysql_escape_string</function>,
+     See also
+     <function>mysql_escape_string</function> and
      <function>mysql_character_set_name</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-result.xml b/reference/mysql/functions/mysql-result.xml
index 26386de7d1..d6fcf2a7a2 100644
--- a/reference/mysql/functions/mysql-result.xml
+++ b/reference/mysql/functions/mysql-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-result">
    <refnamediv>
@@ -38,9 +38,30 @@
      with calls to other functions that deal with the result set.
     </para>
     <para>
-     Recommended high-performance alternatives:
+     <example>
+      <title><function>mysql_result</function> example</title>
+      <programlisting role="php">
+<![CDATA[
+<?php
+    $link = mysql_connect("localhost", "mysql_user", "mysql_password")
+            or die("Could not connect: " . mysql_error());
+ 
+    $result = mysql_query("SELECT name FROM work.employee")
+            or die("Could not query: . mysql_error());
+            
+    echo mysql_result($result,2); // outputs third employee's name
+    
+    mysql_close($link);
+?>
+]]>
+      </programlisting>
+     </example>
+    </para>
+    <para>
+     Recommended high-performance alternatives :
      <function>mysql_fetch_row</function>,
-     <function>mysql_fetch_array</function>, and
+     <function>mysql_fetch_array</function>,
+     <function>mysql_fetch_assoc</function> and
      <function>mysql_fetch_object</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-select-db.xml b/reference/mysql/functions/mysql-select-db.xml
index 732de3184d..a0f6af56da 100644
--- a/reference/mysql/functions/mysql-select-db.xml
+++ b/reference/mysql/functions/mysql-select-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-select-db">
    <refnamediv>
@@ -30,9 +30,10 @@
      Every subsequent call to <function>mysql_query</function> will be
      made on the active database.
     </para>
-    <para> See also:
+    <para>
+     See also
      <function>mysql_connect</function>,
-     <function>mysql_pconnect</function>, and
+     <function>mysql_pconnect</function> and
      <function>mysql_query</function>.
     </para>
     <para>
diff --git a/reference/mysql/functions/mysql-stat.xml b/reference/mysql/functions/mysql-stat.xml
index 08963a82b8..fb0bde64a3 100644
--- a/reference/mysql/functions/mysql-stat.xml
+++ b/reference/mysql/functions/mysql-stat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.62 -->
   <refentry id="function.mysql-stat">
    <refnamediv>
@@ -37,7 +37,8 @@ print_r($status);
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 Array
 (
@@ -51,8 +52,7 @@ Array
     [7] => Queries per second avg: 245.595
 )
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-tablename.xml b/reference/mysql/functions/mysql-tablename.xml
index ef0286e71c..92569912f2 100644
--- a/reference/mysql/functions/mysql-tablename.xml
+++ b/reference/mysql/functions/mysql-tablename.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-tablename">
    <refnamediv>
@@ -23,7 +23,7 @@
      traverse this result pointer, or any function for result tables,
      such as <function>mysql_fetch_array</function>.
      <example>
-      <title><function>mysql_tablename</function> Example</title>
+      <title><function>mysql_tablename</function> example</title>
       <programlisting role="php">
 <![CDATA[
 <?php
@@ -40,7 +40,8 @@
      </example>
     </para>
     <para>
-     See also: <function>mysql_list_tables</function>.
+     See also
+     <function>mysql_list_tables</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/mysql/functions/mysql-thread-id.xml b/reference/mysql/functions/mysql-thread-id.xml
index 56f163b314..5b3ff26c58 100644
--- a/reference/mysql/functions/mysql-thread-id.xml
+++ b/reference/mysql/functions/mysql-thread-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.100 -->
   <refentry id="function.mysql-thread-id">
    <refnamediv>
@@ -19,6 +19,7 @@
      you should not get the thread ID and store it for later. You should get
      it when you need it.
     </para>
+    <para>
      <example>
       <title><function>mysql_thread_id</function> example</title>
       <programlisting role="php">
@@ -34,16 +35,17 @@ if ($thread_id){
       </programlisting>
       <para>
        The above example would produce the following output:
-       <screen>
+      </para>
+      <screen>
 <![CDATA[
 current thread id is 73
 ]]>
-       </screen>
-      </para>
+      </screen>
      </example>
+    </para>
     <para>
-     See also:
-     <function>mysql_ping</function>,
+     See also
+     <function>mysql_ping</function> and
      <function>mysql_list_processes</function>.
     </para>
    </refsect1>
diff --git a/reference/mysql/functions/mysql-unbuffered-query.xml b/reference/mysql/functions/mysql-unbuffered-query.xml
index f10695fcf1..66bfe03363 100644
--- a/reference/mysql/functions/mysql-unbuffered-query.xml
+++ b/reference/mysql/functions/mysql-unbuffered-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
   <refentry id="function.mysql-unbuffered-query">
    <refnamediv>
@@ -40,7 +40,7 @@
      </para>
     </note>
     <para>
-     See also: <function>mysql_query</function>.
+     See also <function>mysql_query</function>.
     </para>
    </refsect1>
   </refentry>