diff --git a/functions/msql.xml b/functions/msql.xml
index 299a344171..9b7937e71d 100644
--- a/functions/msql.xml
+++ b/functions/msql.xml
@@ -87,7 +87,7 @@
      Returns true on success, false on error.
     </para>
     <para>
-     <function>Msql_close</function> closes the link to a mSQL
+     <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.
@@ -118,7 +118,26 @@
     <funcsynopsis>
      <funcprototype>
       <funcdef>int <function>msql_connect</function></funcdef>
-      <paramdef>string <parameter>hostname</parameter></paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>hostname</optional>
+       </parameter>
+      </paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>hostname<optional>:port</optional></optional>
+       </parameter>
+      </paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>username</optional>
+       </parameter>
+      </paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>password</optional>
+       </parameter>
+      </paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -126,7 +145,7 @@
      error.
     </para>
     <para>
-     <function>Msql_connect</function> establishes a connection to a
+     <function>msql_connect</function> establishes a connection to a
      mSQL server.  The hostname argument is optional, and if it's
      missing, localhost is assumed.
     </para>
@@ -213,7 +232,7 @@
      Returns true on success, false on failure.
     </para>
     <para>
-     <function>Msql_data_seek</function> moves the internal row
+     <function>msql_data_seek</function> moves the internal row
      pointer of the mSQL result associated with the specified query
      identifier to pointer to the specifyed row number.  The next call
      to <function>msql_fetch_row</function> would return that
@@ -240,7 +259,7 @@
      </funcprototype>
     </funcsynopsis>
     <para> 
-     <function>Msql_dbname</function> returns the database name stored
+     <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
@@ -267,7 +286,7 @@
      Returns true on success, false on failure.
     </para>
     <para>
-     <function>Msql_drop_db</function> attempts to drop (remove) an
+     <function>msql_drop_db</function> attempts to drop (remove) an
      entire database from the server associated with the specified
      link identifier.
     </para>
@@ -378,7 +397,7 @@
      Returns an object containing field information
     </para>
     <para>  
-     <function>Msql_fetch_field</function> can be used in order to
+     <function>msql_fetch_field</function> can be used in order to
      obtain information about fields in a certain query result.  If
      the field offset isn't specified, the next field that wasn't yet
      retreived by <function>msql_fetch_field</function> is retreived.
@@ -487,7 +506,7 @@
      there are no more rows.
     </para>
     <para>
-     <function>Msql_fetch_row</function> fetches one row of data from
+     <function>msql_fetch_row</function> fetches one row of data from
      the result associated with the specified query identifier.  The
      row is returned as an array.  Each result column is stored in an
      array offset, starting at offset 0.
@@ -521,7 +540,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_fieldname</function> returns the name of the
+     <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
@@ -592,7 +611,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_fieldtype</function> is similar to the
+     <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", "string" or "real".
@@ -637,7 +656,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_fieldlen</function> returns the length of the
+     <function>msql_fieldlen</function> returns the length of the
      specified field.
     </para>
    </refsect1>
@@ -657,7 +676,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_free_result</function> frees the memory associated
+     <function>msql_free_result</function> frees the memory associated
      with <parameter>query_identifier</parameter>.  When PHP completes a
      request, this memory is freed automatically, so you only need to
      call this function when you want to make sure you don't use too
@@ -693,7 +712,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_list_fields</function> retrieves information about
+     <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>,
@@ -774,7 +793,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_list_tables</function> takes a database name and
+     <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
@@ -810,7 +829,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_num_fields</function> returns the number of fields
+     <function>msql_num_fields</function> returns the number of fields
      in a result set.
     </para>
     <para>
@@ -895,7 +914,26 @@
     <funcsynopsis>
      <funcprototype>
       <funcdef>int <function>msql_pconnect</function></funcdef>
-      <paramdef>string <parameter>hostname</parameter></paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>hostname</optional>
+       </parameter>
+      </paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>hostname<optional>:port</optional></optional>
+       </parameter>
+      </paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>username</optional>
+       </parameter>
+      </paramdef>
+      <paramdef>string
+       <parameter>
+        <optional>password</optional>
+       </parameter>
+      </paramdef>
      </funcprototype>
     </funcsynopsis>
     <para>
@@ -903,7 +941,7 @@
      false on error.
     </para>
     <para> 
-     <function>Msql_pconnect</function> acts very much like
+     <function>msql_pconnect</function> acts very much like
      <function>msql_connect</function> with two major differences.
     </para>
     <para> 
@@ -939,7 +977,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
-     <function>Msql_query</function> sends a query to the currently
+     <function>msql_query</function> sends a query to the currently
      active database on the server that's associated with the
      specified link identifier.  If the link identifier isn't
      specified, the last opened link is assumed.  If no link is open,
@@ -992,7 +1030,7 @@
      specified mSQL result set.
     </para>  
     <para> 
-     <function>Msql_result</function> returns the contents of one cell
+     <function>msql_result</function> returns the contents of one cell
      from a mSQL result set.  The field argument can be the field's
      offset, or the field's name, or the field's table dot field's
      name (fieldname.tablename).  If the column name has been aliased
@@ -1035,7 +1073,7 @@
      Returns true on success, false on error.
     </para>
     <para>  
-     <function>Msql_select_db</function> sets the current active
+     <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
@@ -1081,13 +1119,13 @@
      </funcprototype>
     </funcsynopsis>
     <para>    
-     <function>Msql_tablename</function> takes a result pointer
+     <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>
+      <title><function>msql_tablename</function> example</title>
       <programlisting role="php">
 &lt;?php 
 msql_connect ("localhost");