diff --git a/reference/msql/functions/msql-affected-rows.xml b/reference/msql/functions/msql-affected-rows.xml
index 762a906072..9987061f4e 100644
--- a/reference/msql/functions/msql-affected-rows.xml
+++ b/reference/msql/functions/msql-affected-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-affected-rows">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>msql_affected_rows</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns number of affected ("touched") rows by a specific query
diff --git a/reference/msql/functions/msql-close.xml b/reference/msql/functions/msql-close.xml
index 7f66ab08cb..68888e7d63 100644
--- a/reference/msql/functions/msql-close.xml
+++ b/reference/msql/functions/msql-close.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-close">
    <refnamediv>
@@ -10,17 +10,17 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>msql_close</methodname>
-      <methodparam><type>int</type><parameter>link_identifier</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
-    <para>
-     Returns &true; on success, &false; on error.
-    </para>
     <para>
      <function>msql_close</function> closes the link to a mSQL
      database that's associated with the specified link identifier.
      If the link identifier isn't specified, the last opened link is
      assumed.
     </para>
+    <para>
+     &return.success;
+    </para>
     <para>
      Note that this isn't usually necessary, as non-persistent open
      links are automatically closed at the end of the script's
@@ -31,7 +31,8 @@
      generated by <function>msql_pconnect</function>.
     </para>
     <para>
-     See also: <function>msql_connect</function> and
+     See also:
+     <function>msql_connect</function> and
      <function>msql_pconnect</function>.
     </para>
    </refsect1>
diff --git a/reference/msql/functions/msql-connect.xml b/reference/msql/functions/msql-connect.xml
index b3c21ce041..b04c4ccf02 100644
--- a/reference/msql/functions/msql-connect.xml
+++ b/reference/msql/functions/msql-connect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-connect">
    <refnamediv>
@@ -10,18 +10,10 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>msql_connect</methodname>
-      <methodparam choice="opt"><type>string</type><parameter>
-        hostname
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>
-        server
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>
-        username
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>
-        password
-       </parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>hostname</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>server</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_connect</function> establishes a connection to a
diff --git a/reference/msql/functions/msql-create-db.xml b/reference/msql/functions/msql-create-db.xml
index 191ec0cb35..5f0850d4e3 100644
--- a/reference/msql/functions/msql-create-db.xml
+++ b/reference/msql/functions/msql-create-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-create-db">
    <refnamediv>
@@ -9,13 +9,16 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_create_db</methodname>
+      <type>bool</type><methodname>msql_create_db</methodname>
       <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>link_identifier</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_create_db</function> attempts to create a new database on the server
-     associated with the specified link identifier.
+     associated with the specified <parameter>link_identifier</parameter>.
+    </para>
+    <para>
+     &return.success;
     </para>
     <para> 
      See also
diff --git a/reference/msql/functions/msql-createdb.xml b/reference/msql/functions/msql-createdb.xml
index 961ba965d7..e4a8698d96 100644
--- a/reference/msql/functions/msql-createdb.xml
+++ b/reference/msql/functions/msql-createdb.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-createdb">
    <refnamediv>
     <refname>msql_createdb</refname>
-    <refpurpose>Create mSQL database</refpurpose>
+    <refpurpose>Alias of <function>msql_create_db</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msql_createdb</methodname>
-      <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>link_identifier</parameter></methodparam>
-     </methodsynopsis>
     <para>
-     Identical to <function>msql_create_db</function>.
+     This function is an alias of <function>msql_create_db</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-data-seek.xml b/reference/msql/functions/msql-data-seek.xml
index 20a852f686..3e412724a9 100644
--- a/reference/msql/functions/msql-data-seek.xml
+++ b/reference/msql/functions/msql-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/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-data-seek">
    <refnamediv>
@@ -9,8 +9,8 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_data_seek</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <type>bool</type><methodname>msql_data_seek</methodname>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
       <methodparam><type>int</type><parameter>row_number</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/msql/functions/msql-db-query.xml b/reference/msql/functions/msql-db-query.xml
new file mode 100644
index 0000000000..78812dbee4
--- /dev/null
+++ b/reference/msql/functions/msql-db-query.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+  <refentry id="function.msql-db-query">
+   <refnamediv>
+    <refname>msql</refname>
+    <refpurpose>Send mSQL query</refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+     <methodsynopsis>
+      <type>resouce</type><methodname>msql_db_query</methodname>
+      <methodparam><type>string</type><parameter>database</parameter></methodparam>
+      <methodparam><type>string</type><parameter>query</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
+     </methodsynopsis>
+    <para> 
+     Returns a positive mSQL query identifier to the query result, or
+     &false; on error.
+    </para>  
+    <para>
+     <function>msql_db_query</function> selects a database and executes a query
+     on it.  If the optional <parameter>link_identifier</parameter>
+     is not specified, the function will try to find an open link to the mSQL
+     server; if no such link is found it will try to create one as if
+     <function>msql_connect</function> was called with no arguments.
+    </para>
+    <para>
+     See also <function>msql_connect</function>.
+    </para>
+   </refsect1>
+  </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
\ No newline at end of file
diff --git a/reference/msql/functions/msql-dbname.xml b/reference/msql/functions/msql-dbname.xml
index 770c8c1fab..eb8bcab446 100644
--- a/reference/msql/functions/msql-dbname.xml
+++ b/reference/msql/functions/msql-dbname.xml
@@ -1,24 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-dbname">
    <refnamediv>
     <refname>msql_dbname</refname>
-    <refpurpose>Get current mSQL database name</refpurpose>
+    <refpurpose>Alias of <function>msql_result</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msql_dbname</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>i</parameter></methodparam>
-     </methodsynopsis>
     <para> 
-     <function>msql_dbname</function> returns the database name stored
-     in position <parameter>i</parameter> of the result pointer
-     returned from the <function>msql_listdbs</function> function. The
-     <function>msql_numrows</function> function can be used to
-     determine how many database names are available.
+     This function is an alias of <function>msql_result</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-drop-db.xml b/reference/msql/functions/msql-drop-db.xml
index a6701f3cca..0fdebb2da9 100644
--- a/reference/msql/functions/msql-drop-db.xml
+++ b/reference/msql/functions/msql-drop-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-drop-db">
    <refnamediv>
@@ -11,7 +11,7 @@
      <methodsynopsis>
       <type>int</type><methodname>msql_drop_db</methodname>
       <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>int</type><parameter>link_identifier</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      &return.success;
diff --git a/reference/msql/functions/msql-dropdb.xml b/reference/msql/functions/msql-dropdb.xml
index 926e7947a5..63bd87ae4f 100644
--- a/reference/msql/functions/msql-dropdb.xml
+++ b/reference/msql/functions/msql-dropdb.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-dropdb">
    <refnamediv>
     <refname>msql_dropdb</refname>
-    <refpurpose>Drop (delete) mSQL database</refpurpose>
+    <refpurpose>Alias of <function>msql_drop_db</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <para>
-     See <function>msql_drop_db</function>.
+     This function is an alias of <function>msql_drop_db</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-error.xml b/reference/msql/functions/msql-error.xml
index 8af5d651e9..683d9766b1 100644
--- a/reference/msql/functions/msql-error.xml
+++ b/reference/msql/functions/msql-error.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-error">
    <refnamediv>
@@ -10,11 +10,11 @@
     <title>Description</title>
      <methodsynopsis>
       <type>string</type><methodname>msql_error</methodname>
-      <methodparam choice="opt"><type>int</type><parameter>link_identifier</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      Errors coming back from the mSQL database backend no longer
-     issue warnings. Instead, use these functions to retrieve the
+     issue warnings. Instead, use this functions to retrieve the
      error string.
     </para>
    </refsect1>
diff --git a/reference/msql/functions/msql-fetch-array.xml b/reference/msql/functions/msql-fetch-array.xml
index 98d5cae411..8de2b84a7d 100644
--- a/reference/msql/functions/msql-fetch-array.xml
+++ b/reference/msql/functions/msql-fetch-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fetch-array">
    <refnamediv>
@@ -26,7 +26,8 @@
     <para>
      The second optional argument <parameter>result_type</parameter>
      in <function>msql_fetch_array</function> is a constant and can
-     take the following values: MSQL_ASSOC, MSQL_NUM, and MSQL_BOTH.
+     take the following values: MSQL_ASSOC, MSQL_NUM, and MSQL_BOTH with
+     MYSQL_BOTH being the default.
     </para>
     <para>
      Be careful if you are retrieving results from a query that may
@@ -41,7 +42,8 @@
     </para>  
     <para>
      See also
-     <function>msql_fetch_row</function>.
+     <function>msql_fetch_row</function> and
+     <function>msql_fetch_object</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-fetch-field.xml b/reference/msql/functions/msql-fetch-field.xml
index 3b9d2c45d6..b55df06ae0 100644
--- a/reference/msql/functions/msql-fetch-field.xml
+++ b/reference/msql/functions/msql-fetch-field.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fetch-field">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>object</type><methodname>msql_fetch_field</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
       <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/msql/functions/msql-fetch-object.xml b/reference/msql/functions/msql-fetch-object.xml
index dc22655447..e5f9f2d4cf 100644
--- a/reference/msql/functions/msql-fetch-object.xml
+++ b/reference/msql/functions/msql-fetch-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fetch-object">
    <refnamediv>
@@ -11,7 +11,6 @@
      <methodsynopsis>
       <type>int</type><methodname>msql_fetch_object</methodname>
       <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam choice="opt"><type>int</type><parameter>result_type</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns an object with properties that correspond to the fetched
@@ -24,18 +23,14 @@
      that you can only access the data by the field names, and not by
      their offsets (numbers are illegal property names).
     </para>  
-    <para>
-     The optional second argument <parameter>result_type</parameter>
-     in <function>msql_fetch_array</function> is a constant and can
-     take the following values: MSQL_ASSOC, MSQL_NUM, and MSQL_BOTH.
-    </para>
     <para>
      Speed-wise, the function is identical to
      <function>msql_fetch_array</function>, and almost as quick as
      <function>msql_fetch_row</function> (the difference is
      insignificant).
     </para>  
-    <para> See also:
+    <para>
+     See also:
      <function>msql_fetch_array</function> and
      <function>msql_fetch_row</function>.
     </para>
diff --git a/reference/msql/functions/msql-fetch-row.xml b/reference/msql/functions/msql-fetch-row.xml
index 231324985a..867f83d1da 100644
--- a/reference/msql/functions/msql-fetch-row.xml
+++ b/reference/msql/functions/msql-fetch-row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fetch-row">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>msql_fetch_row</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns an array that corresponds to the fetched row, or &false; if
diff --git a/reference/msql/functions/msql-field-flags.xml b/reference/msql/functions/msql-field-flags.xml
new file mode 100644
index 0000000000..d9a69d29bf
--- /dev/null
+++ b/reference/msql/functions/msql-field-flags.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+  <refentry id="function.msql-field-flags">
+   <refnamediv>
+    <refname>msql_field_flags</refname>
+    <refpurpose>Get field flags</refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+     <methodsynopsis>
+      <type>string</type><methodname>msql_field_flags</methodname>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
+     </methodsynopsis>
+    <para>
+     <function>msql_field_flags</function> returns the field flags of
+     the specified field.  Currently this is either, "not &null;",
+     "primary key", a combination of the two or "" (an empty string).
+    </para>
+   </refsect1>
+  </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/msql/functions/msql-field-len.xml b/reference/msql/functions/msql-field-len.xml
new file mode 100644
index 0000000000..10692804b5
--- /dev/null
+++ b/reference/msql/functions/msql-field-len.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+  <refentry id="function.msql-field-len">
+   <refnamediv>
+    <refname>msql_field_len</refname>
+    <refpurpose>Get field length</refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+     <methodsynopsis>
+      <type>int</type><methodname>msql_field_len</methodname>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
+     </methodsynopsis>
+    <para>
+     <function>msql_field_len</function> returns the length of the
+     specified field or &false; on error.
+    </para>
+   </refsect1>
+  </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/msql/functions/msql-field-name.xml b/reference/msql/functions/msql-field-name.xml
new file mode 100644
index 0000000000..e3b15d6108
--- /dev/null
+++ b/reference/msql/functions/msql-field-name.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+  <refentry id="function.msql-field-name">
+   <refnamediv>
+    <refname>msql_field_name</refname>
+    <refpurpose>Get field name</refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+     <methodsynopsis>
+      <type>string</type><methodname>msql_field_name</methodname>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter>field</parameter></methodparam>
+     </methodsynopsis>
+    <para>
+     <function>msql_field_name</function> returns the name of the
+     specified <parameter>field</parameter> from the result resource 
+     <parameter>query_identifier</parameter>.
+     <literal>msql_field_name($result, 2);</literal> will
+     return the name of the second field in the result set associated with
+     the result identifier.
+    </para>
+   </refsect1>
+  </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/msql/functions/msql-field-seek.xml b/reference/msql/functions/msql-field-seek.xml
index b46dd44907..0fdd211c36 100644
--- a/reference/msql/functions/msql-field-seek.xml
+++ b/reference/msql/functions/msql-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/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-field-seek">
    <refnamediv>
@@ -18,6 +18,9 @@
      <function>msql_fetch_field</function> won't include a field
      offset, this field would be returned.
     </para>
+    <para>
+     This function returns &false; on failure.
+    </para>
     <para> 
      See also: <function>msql_fetch_field</function>.
     </para>
diff --git a/reference/msql/functions/msql-field-table.xml b/reference/msql/functions/msql-field-table.xml
new file mode 100644
index 0000000000..bce12c954a
--- /dev/null
+++ b/reference/msql/functions/msql-field-table.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+  <refentry id="function.msql-field-table">
+   <refnamediv>
+    <refname>msql_field_table</refname>
+    <refpurpose>Get table name for field</refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+     <methodsynopsis>
+      <type>int</type><methodname>msql_field_table</methodname>
+      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter>field</parameter></methodparam>
+     </methodsynopsis>
+    <para>
+     Returns the name of the table <parameter>field</parameter> was
+     fetched from.
+    </para>
+    <para>
+     This function returns &false; on failure.
+    </para>
+   </refsect1>
+  </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/msql/functions/msql-field-type.xml b/reference/msql/functions/msql-field-type.xml
new file mode 100644
index 0000000000..8cbdfa263c
--- /dev/null
+++ b/reference/msql/functions/msql-field-type.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.1 $ -->
+  <refentry id="function.msql-field-type">
+   <refnamediv>
+    <refname>msql_field_type</refname>
+    <refpurpose>Get field type</refpurpose>
+   </refnamediv>
+   <refsect1>
+    <title>Description</title>
+     <methodsynopsis>
+      <type>string</type><methodname>msql_field_type</methodname>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
+     </methodsynopsis>
+    <para>
+     <function>msql_field_type</function> is similar to the
+     <function>msql_field_name</function> function.  The arguments are
+     identical, but the field type is returned.  This will be one of
+     "int", "char" or "real".
+    </para>
+    <para>
+     This function returns &false; on failure.
+    </para>
+   </refsect1>
+  </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/msql/functions/msql-fieldflags.xml b/reference/msql/functions/msql-fieldflags.xml
index d85f54047b..37c6630fa5 100644
--- a/reference/msql/functions/msql-fieldflags.xml
+++ b/reference/msql/functions/msql-fieldflags.xml
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fieldflags">
    <refnamediv>
     <refname>msql_fieldflags</refname>
-    <refpurpose>Get field flags</refpurpose>
+    <refpurpose>Alias of <function>msql_field_flags</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msql_fieldflags</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>i</parameter></methodparam>
-     </methodsynopsis>
     <para>
-     <function>msql_fieldflags</function> returns the field flags of
-     the specified field. Currently this is either, "not &null;",
-     "primary key", a combination of the two or "" (an empty string).
+     This function is an alias of <function>msql_field_flags</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-fieldlen.xml b/reference/msql/functions/msql-fieldlen.xml
index ece49a9ee8..ca5bf8d442 100644
--- a/reference/msql/functions/msql-fieldlen.xml
+++ b/reference/msql/functions/msql-fieldlen.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fieldlen">
    <refnamediv>
     <refname>msql_fieldlen</refname>
-    <refpurpose>Get field length</refpurpose>
+    <refpurpose>Alias of <function>msql_field_len</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msql_fieldlen</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>i</parameter></methodparam>
-     </methodsynopsis>
     <para>
-     <function>msql_fieldlen</function> returns the length of the
-     specified field.
+     This function is an alias of <function>msql_field_len</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-fieldname.xml b/reference/msql/functions/msql-fieldname.xml
index 32519e0e7e..37a06abee8 100644
--- a/reference/msql/functions/msql-fieldname.xml
+++ b/reference/msql/functions/msql-fieldname.xml
@@ -1,25 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fieldname">
    <refnamediv>
     <refname>msql_fieldname</refname>
-    <refpurpose>Get field name</refpurpose>
+    <refpurpose>Alias of <function>msql_field_name</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msql_fieldname</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>field</parameter></methodparam>
-     </methodsynopsis>
     <para>
-     <function>msql_fieldname</function> returns the name of the
-     specified field.  <parameter>query_identifier</parameter> is the
-     query identifier, and <parameter>field</parameter> is the field
-     index.  <literal>msql_fieldname($result, 2);</literal> will
-     return the name of the second field in the result associated with
-     the result identifier.
+     This function is an alias of <function>msql_field_name</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-fieldtable.xml b/reference/msql/functions/msql-fieldtable.xml
index a6cd30a8f0..a5efd7280b 100644
--- a/reference/msql/functions/msql-fieldtable.xml
+++ b/reference/msql/functions/msql-fieldtable.xml
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fieldtable">
    <refnamediv>
     <refname>msql_fieldtable</refname>
-    <refpurpose>Get table name for field</refpurpose>
+    <refpurpose>Alias of <function>msql_field_table</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msql_fieldtable</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>field</parameter></methodparam>
-     </methodsynopsis>
     <para>
-     Returns the name of the table <parameter>field</parameter> was
-     fetched from.
+     This function is an alias of <function>msql_field_table</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-fieldtype.xml b/reference/msql/functions/msql-fieldtype.xml
index 90dc26a0c3..cc17f12ede 100644
--- a/reference/msql/functions/msql-fieldtype.xml
+++ b/reference/msql/functions/msql-fieldtype.xml
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-fieldtype">
    <refnamediv>
     <refname>msql_fieldtype</refname>
-    <refpurpose>Get field type</refpurpose>
+    <refpurpose>Alias of <function>msql_field_type</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msql_fieldtype</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>i</parameter></methodparam>
-     </methodsynopsis>
     <para>
-     <function>msql_fieldtype</function> is similar to the
-     <function>msql_fieldname</function> function.  The arguments are
-     identical, but the field type is returned.  This will be one of
-     "int", "char" or "real".
+     This function is an alias of <function>msql_field_type</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-free-result.xml b/reference/msql/functions/msql-free-result.xml
index c66b8a62c9..f3acf35b4c 100644
--- a/reference/msql/functions/msql-free-result.xml
+++ b/reference/msql/functions/msql-free-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-free-result">
    <refnamediv>
@@ -10,7 +10,7 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>msql_free_result</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_free_result</function> frees the memory associated
@@ -19,6 +19,11 @@
      call this function when you want to make sure you don't use too
      much memory while the script is running.
     </para>
+    <para>
+     For downward compatibility, the alias named
+     <function>msql_freeresult</function> may be used. This, however, is
+     deprecated and not recommended.
+    </para>
    </refsect1>
   </refentry>
 
diff --git a/reference/msql/functions/msql-freeresult.xml b/reference/msql/functions/msql-freeresult.xml
index 393f84ca81..860063c193 100644
--- a/reference/msql/functions/msql-freeresult.xml
+++ b/reference/msql/functions/msql-freeresult.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-freeresult">
    <refnamediv>
     <refname>msql_freeresult</refname>
-    <refpurpose>Free result memory</refpurpose>
+    <refpurpose>Alias of <function>msql_free_result</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-    <para>See <function>msql_free_result</function></para>
+    <para>
+     This function is an alias of <function>msql_free_result</function>.
+    </para>
    </refsect1>
   </refentry>
 
diff --git a/reference/msql/functions/msql-list-dbs.xml b/reference/msql/functions/msql-list-dbs.xml
index 69686bcffa..0f5263239c 100644
--- a/reference/msql/functions/msql-list-dbs.xml
+++ b/reference/msql/functions/msql-list-dbs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-list-dbs">
    <refnamediv>
@@ -9,15 +9,20 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_list_dbs</methodname>
-      <void/>
+      <type>resource</type><methodname>msql_list_dbs</methodname>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_list_dbs</function> will return a result pointer
      containing the databases available from the current msql
-     daemon. Use the <function>msql_dbname</function> function to
+     daemon. Use the <function>msql_result</function> function to
      traverse this result pointer.
     </para>
+    <para>
+     For downward compatibility, the alias named
+     <function>msql_listtables</function> may be used. This, however, is
+     deprecated and not recommended.
+    </para>
    </refsect1>
   </refentry>
 
diff --git a/reference/msql/functions/msql-list-fields.xml b/reference/msql/functions/msql-list-fields.xml
index 31c762b5b8..06b2e010d9 100644
--- a/reference/msql/functions/msql-list-fields.xml
+++ b/reference/msql/functions/msql-list-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-list-fields">
    <refnamediv>
@@ -9,26 +9,24 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_list_fields</methodname>
+      <type>resource</type><methodname>msql_list_fields</methodname>
       <methodparam><type>string</type><parameter>database</parameter></methodparam>
       <methodparam><type>string</type><parameter>tablename</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_list_fields</function> retrieves information about
-     the given tablename. Arguments are the database name and the
-     table name. A result pointer is returned which can be used with
-     <function>msql_fieldflags</function>,
-     <function>msql_fieldlen</function>,
-     <function>msql_fieldname</function>, and
-     <function>msql_fieldtype</function>.  A query identifier is a
-     positive integer. The function returns <literal>-1</literal> if a
-     error occurs. A string describing the error will be placed in
-     <literal>$phperrmsg</literal>, and unless the function was called
-     as <literal>@msql_list_fields()</literal> then this error string
-     will also be printed out.
+     the given <parameter>tablename</parameter>.  The returned result set can
+     be traversed with any function that fetches result sets, such as
+     <function>msql_fetch_array</function>.
     </para>
     <para>
-     See also <function>msql_error</function>.
+     This function returns &false; on failure.
+    </para>
+    <para>
+     For downward compatibility, the alias named
+     <function>msql_listfields</function> may be used. This, however, is
+     deprecated and not recommended.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-list-tables.xml b/reference/msql/functions/msql-list-tables.xml
index 37192743fb..7c00914e68 100644
--- a/reference/msql/functions/msql-list-tables.xml
+++ b/reference/msql/functions/msql-list-tables.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-list-tables">
    <refnamediv>
@@ -9,15 +9,23 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_list_tables</methodname>
+      <type>resource</type><methodname>msql_list_tables</methodname>
       <methodparam><type>string</type><parameter>database</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
-     <function>msql_list_tables</function> takes a database name and
-     result pointer much like the <function>msql</function>
-     function. The <function>msql_tablename</function> function should
-     be used to extract the actual table names from the result
-     pointer.
+     <function>msql_list_tables</function> lists the tables on the specified
+     <function>database</function>.  It returns a result set which may be
+     traversed with any function that fetches result sets, such as
+     <function>msql_fetch_array</function>.
+    </para>
+    <para>
+     This function returns &false; on failure.
+    </para>
+    <para>
+     For downward compatibility, the alias named
+     <function>msql_listtables</function> may be used. This, however, is
+     deprecated and not recommended.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-listdbs.xml b/reference/msql/functions/msql-listdbs.xml
index 41295f349b..8e29f6e913 100644
--- a/reference/msql/functions/msql-listdbs.xml
+++ b/reference/msql/functions/msql-listdbs.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-listdbs">
    <refnamediv>
     <refname>msql_listdbs</refname>
-    <refpurpose>List mSQL databases on server</refpurpose>
+    <refpurpose>Alias of <function>msql_list_dbs</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <para>
-     See <function>msql_list_dbs</function>.
+     This function is an alias of <function>msql_list_dbs</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-listfields.xml b/reference/msql/functions/msql-listfields.xml
index bc9a39b1a5..ffdb082c6c 100644
--- a/reference/msql/functions/msql-listfields.xml
+++ b/reference/msql/functions/msql-listfields.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-listfields">
    <refnamediv>
     <refname>msql_listfields</refname>
-    <refpurpose>List result fields</refpurpose>
+    <refpurpose>Alias of <function>msql_list_fields</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <para>
-     See <function>msql_list_fields</function>.
+     This function is an alias of <function>msql_list_fields</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-listtables.xml b/reference/msql/functions/msql-listtables.xml
index c7568e5388..0019c01327 100644
--- a/reference/msql/functions/msql-listtables.xml
+++ b/reference/msql/functions/msql-listtables.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-listtables">
    <refnamediv>
     <refname>msql_listtables</refname>
-    <refpurpose>List tables in an mSQL database</refpurpose>
+    <refpurpose>Alias of <function>msql_list_tables</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
     <para>
-     See <function>msql_list_tables</function>.
+     This function is an alias of <function>msql_list_tables</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-num-fields.xml b/reference/msql/functions/msql-num-fields.xml
index 8c2d4156d8..3f4dccde75 100644
--- a/reference/msql/functions/msql-num-fields.xml
+++ b/reference/msql/functions/msql-num-fields.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-num-fields">
    <refnamediv>
@@ -10,15 +10,19 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>msql_num_fields</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_num_fields</function> returns the number of fields
      in a result set.
     </para>
     <para>
-     See also: <function>msql</function>,
-     <function>msql_query</function>,
+     For downwards compatability, the alias named
+     <function>msql_numfields</function> may be used.  This, however, is
+     deprecated and not recommended.
+    </para>
+    <para>
+     See also: <function>msql_query</function>,
      <function>msql_fetch_field</function>, and
      <function>msql_num_rows</function>.
     </para>
diff --git a/reference/msql/functions/msql-num-rows.xml b/reference/msql/functions/msql-num-rows.xml
index 9e2fd1b595..ea42f91f2a 100644
--- a/reference/msql/functions/msql-num-rows.xml
+++ b/reference/msql/functions/msql-num-rows.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-num-rows">
    <refnamediv>
@@ -17,9 +17,13 @@
      a result set.
     </para>
     <para>
-     See also: <function>msql</function>,
-     <function>msql_query</function>, and
-     <function>msql_fetch_row</function>.
+     For downwards compatability, the alias named
+     <function>msql_numrows</function> may be used.  This, however is
+     deprecated and not recommended.
+    </para>
+    <para>
+     See also: <function>msql_db_query</function> and
+     <function>msql_query</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-numfields.xml b/reference/msql/functions/msql-numfields.xml
index f5d6ec909b..c546dba784 100644
--- a/reference/msql/functions/msql-numfields.xml
+++ b/reference/msql/functions/msql-numfields.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-numfields">
    <refnamediv>
     <refname>msql_numfields</refname>
-    <refpurpose>Get number of fields in result</refpurpose>
+    <refpurpose>Alias of <function>msql_num_fields</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msql_numfields</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-     </methodsynopsis>
     <para>  
-     Identical to <function>msql_num_fields</function>.
+     This function is an alias of <function>msql_num_fields</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-numrows.xml b/reference/msql/functions/msql-numrows.xml
index a9eaf6402c..ddb469cfdf 100644
--- a/reference/msql/functions/msql-numrows.xml
+++ b/reference/msql/functions/msql-numrows.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-numrows">
    <refnamediv>
     <refname>msql_numrows</refname>
-    <refpurpose>Get number of rows in result</refpurpose>
+    <refpurpose>Alias of <function>msql_num_rows</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msql_numrows</methodname>
-      <void/>
-     </methodsynopsis>
     <para>  
-     Identical to <function>msql_num_rows</function>.
+     This function is an alias of <function>msql_num_rows</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-pconnect.xml b/reference/msql/functions/msql-pconnect.xml
index 6859a9b388..a47863f8b4 100644
--- a/reference/msql/functions/msql-pconnect.xml
+++ b/reference/msql/functions/msql-pconnect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-pconnect">
    <refnamediv>
@@ -10,15 +10,9 @@
     <title>Description</title>
      <methodsynopsis>
       <type>int</type><methodname>msql_pconnect</methodname>
-      <methodparam choice="opt"><type>string</type><parameter>
-        server
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>
-        username
-       </parameter></methodparam>
-      <methodparam choice="opt"><type>string</type><parameter>
-        password
-       </parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>server</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
+      <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
      </methodsynopsis>
     <para> 
      <function>msql_pconnect</function> acts very much like
@@ -40,9 +34,6 @@
      Returns a positive mSQL persistent link identifier on success, or
      &false; on error.
     </para>
-    <para> 
-     This type of links is therefore called 'persistent'.
-    </para>
    </refsect1>
   </refentry>
 
diff --git a/reference/msql/functions/msql-query.xml b/reference/msql/functions/msql-query.xml
index 7bfad6b1c2..33ccb58b81 100644
--- a/reference/msql/functions/msql-query.xml
+++ b/reference/msql/functions/msql-query.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-query">
    <refnamediv>
@@ -9,9 +9,9 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_query</methodname>
+      <type>resource</type><methodname>msql_query</methodname>
       <methodparam><type>string</type><parameter>query</parameter></methodparam>
-      <methodparam><type>int</type><parameter>link_identifier</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
     <para>
      <function>msql_query</function> sends a query to the currently
@@ -49,7 +49,7 @@ while ($row = msql_fetch_array($result)) {
     </example>
     <para>
      See also 
-     <function>msql</function>,
+     <function>msql_db_query</function>,
      <function>msql_select_db</function>, and
      <function>msql_connect</function>.
     </para>
diff --git a/reference/msql/functions/msql-regcase.xml b/reference/msql/functions/msql-regcase.xml
index 692ff2926a..c87756b6ac 100644
--- a/reference/msql/functions/msql-regcase.xml
+++ b/reference/msql/functions/msql-regcase.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-regcase">
    <refnamediv>
     <refname>msql_regcase</refname>
-    <refpurpose>
-     Make regular expression for case insensitive match
-    </refpurpose>
+    <refpurpose>Alias of <function>sql_regcase</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-    <para>See <function>sql_regcase</function>.
+    <para>
+     This function is an alias of <function>sql_regcase</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-result.xml b/reference/msql/functions/msql-result.xml
index abae7e43a6..07a201e42c 100644
--- a/reference/msql/functions/msql-result.xml
+++ b/reference/msql/functions/msql-result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-result">
    <refnamediv>
@@ -9,10 +9,10 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_result</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>i</parameter></methodparam>
-      <methodparam><type>mixed</type><parameter>field</parameter></methodparam>
+      <type>string</type><methodname>msql_result</methodname>
+      <methodparam><type>resource</type><parameter>query_identifier</parameter></methodparam>
+      <methodparam><type>int</type><parameter>row</parameter></methodparam>
+      <methodparam choice="opt"><type>mixed</type><parameter>field</parameter></methodparam>
      </methodsynopsis>
     <para>
      Returns the contents of the cell at the row and offset in the
@@ -30,7 +30,7 @@
      When working on large result sets, you should consider using one
      of the functions that fetch an entire row (specified below).  As
      these functions return the contents of multiple cells in one
-     function call, they're MUCH quicker than
+     function call, they are often much quicker than
      <function>msql_result</function>.  Also, note that specifying a
      numeric offset for the field argument is much quicker than
      specifying a fieldname or tablename.fieldname argument.
@@ -41,6 +41,12 @@
      <function>msql_fetch_array</function>, and
      <function>msql_fetch_object</function>.
     </para>
+    <para>
+     For downward compatibility, the aliases named
+     <function>msql</function>, <function>msql_tablename</function>, and
+     <function>msql_dbname</function> may be used. This, however, is
+     deprecated and not recommended.
+    </para>
    </refsect1>
   </refentry>
 
diff --git a/reference/msql/functions/msql-select-db.xml b/reference/msql/functions/msql-select-db.xml
index 7f1dcdf63f..ccfdd53c25 100644
--- a/reference/msql/functions/msql-select-db.xml
+++ b/reference/msql/functions/msql-select-db.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-select-db">
    <refnamediv>
@@ -9,25 +9,30 @@
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
-      <type>int</type><methodname>msql_select_db</methodname>
+      <type>bool</type><methodname>msql_select_db</methodname>
       <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-      <methodparam><type>int</type><parameter>link_identifier</parameter></methodparam>
+      <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
      </methodsynopsis>
-    <para>
-     Returns &true; on success, &false; on error.
-    </para>
     <para>  
      <function>msql_select_db</function> sets the current active
-     database on the server that's associated with the specified link
-     identifier.  If no link identifier is specified, the last opened
-     link is assumed.  If no link is open, the function will try to
-     establish a link as if <function>msql_connect</function> was
-     called, and use it.
+     database on the server that's associated with the specified
+     <parameter>link_identifier</parameter>.  If no link identifier is
+     specified, the last opened link is assumed.  If no link is open, the
+     function will try to establish a link as if
+     <function>msql_connect</function> was called, and use it.
+    </para>
+    <para>
+     &return.success;
     </para>
     <para> 
-     Every subsequent call to <function>msql_query</function> will be
+     Subsequent calls to <function>msql_query</function> will be
      made on the active database.
     </para>
+    <para>
+     For downward compatibility, the alias named
+     <function>msql_selectdb</function> may be used. This, however, is
+     deprecated and not recommended.
+    </para>
     <para>
      See also 
      <function>msql_connect</function>,
diff --git a/reference/msql/functions/msql-selectdb.xml b/reference/msql/functions/msql-selectdb.xml
index 00946c092e..a71ebeae19 100644
--- a/reference/msql/functions/msql-selectdb.xml
+++ b/reference/msql/functions/msql-selectdb.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-selectdb">
    <refnamediv>
     <refname>msql_selectdb</refname>
-    <refpurpose>Select mSQL database</refpurpose>
+    <refpurpose>Alias of <function>msql_select_db</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-    <para>See <function>msql_select_db</function>.
+    <para>
+     This function is an alias of <function>msql_select_db</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql-tablename.xml b/reference/msql/functions/msql-tablename.xml
index 1c7d7b5ad5..2f5a771a6a 100644
--- a/reference/msql/functions/msql-tablename.xml
+++ b/reference/msql/functions/msql-tablename.xml
@@ -1,41 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql-tablename">
    <refnamediv>
     <refname>msql_tablename</refname>
-    <refpurpose>Get table name of field</refpurpose>
+    <refpurpose>Alias of <function>msql_result</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>string</type><methodname>msql_tablename</methodname>
-      <methodparam><type>int</type><parameter>query_identifier</parameter></methodparam>
-      <methodparam><type>int</type><parameter>field</parameter></methodparam>
-     </methodsynopsis>
-    <para>    
-     <function>msql_tablename</function> takes a result pointer
-     returned by the <function>msql_list_tables</function> function as
-     well as an integer index and returns the name of a table. The
-     <function>msql_numrows</function> function may be used to
-     determine the number of tables in the result pointer.
-     <example>
-      <title><function>msql_tablename</function> example</title>
-      <programlisting role="php">
-<![CDATA[
-<?php 
-msql_connect("localhost");
-$result = msql_list_tables("wisconsin");
-$i = 0;
-while ($i < msql_numrows($result)) {
-    $tb_names[$i] = msql_tablename($result, $i);
-    echo $tb_names[$i] . "<br />";
-    $i++; 
-}
-?>
-]]>
-      </programlisting>
-     </example>
+    <para>
+     This function is an alias of <function>msql_result</function>.
     </para>
    </refsect1>
   </refentry>
diff --git a/reference/msql/functions/msql.xml b/reference/msql/functions/msql.xml
index 86174b35c9..76bce5735b 100644
--- a/reference/msql/functions/msql.xml
+++ b/reference/msql/functions/msql.xml
@@ -1,30 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- splitted from ./en/functions/msql.xml, last change in rev 1.2 -->
   <refentry id="function.msql">
    <refnamediv>
     <refname>msql</refname>
-    <refpurpose>Send mSQL query</refpurpose>
+    <refpurpose>Alias of <function>msql_db_query</function></refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
-      <type>int</type><methodname>msql</methodname>
-      <methodparam><type>string</type><parameter>database</parameter></methodparam>
-      <methodparam><type>string</type><parameter>query</parameter></methodparam>
-      <methodparam><type>int</type><parameter>link_identifier</parameter></methodparam>
-     </methodsynopsis>
-    <para> 
-     Returns a positive mSQL query identifier to the query result, or
-     &false; on error.
-    </para>  
     <para>
-     <function>msql</function> selects a database and executes a query
-     on it.  If the optional link identifier isn't specified, the
-     function will try to find an open link to the mSQL server and if
-     no such link is found it'll try to create one as if
-     <function>msql_connect</function> was called with no arguments
-     (see <function>msql_connect</function>).
+     This function is an alias of <function>msql_db_query</function>.
     </para>
    </refsect1>
   </refentry>